chore: migrate java-os-login to the Java microgenerator

Committer: @miraleung
PiperOrigin-RevId: 344845744
This commit is contained in:
Google APIs 2020-11-30 10:54:41 -08:00 committed by Copybara-Service
parent d04af09f76
commit ff715bf31a
2 changed files with 16 additions and 41 deletions

View File

@ -33,20 +33,20 @@ proto_library_with_info(
deps = [
":oslogin_proto",
"//google/cloud:common_resources_proto",
],
] + _PROTO_SUBPACKAGE_DEPS,
)
##############################################################################
# Java
# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
##############################################################################
load(
"@com_google_googleapis_imports//:imports.bzl",
"java_gapic_assembly_gradle_pkg",
"java_gapic_library",
"java_gapic_test",
"java_grpc_library",
"java_proto_library",
"java_resource_name_proto_library",
java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
java_gapic_library = "java_gapic_library2",
java_gapic_test = "java_gapic_test2",
)
_JAVA_PROTO_SUBPACKAGE_DEPS = [
@ -68,29 +68,17 @@ java_grpc_library(
deps = [":oslogin_java_proto"] + _JAVA_PROTO_SUBPACKAGE_DEPS,
)
java_resource_name_proto_library(
name = "oslogin_java_gapic_resource_name",
gapic_yaml = "//google/cloud/oslogin/v1:oslogin_gapic.yaml",
deps = [
":oslogin_proto",
"//google/cloud:common_resources_proto",
] + _PROTO_SUBPACKAGE_DEPS,
)
java_gapic_library(
name = "oslogin_java_gapic",
src = ":oslogin_proto_with_info",
srcs = [":oslogin_proto_with_info"],
gapic_yaml = "oslogin_gapic.yaml",
gen_resource_name = False,
grpc_service_config = "oslogin_grpc_service_config.json",
package = "google.cloud.oslogin.v1",
service_yaml = ":oslogin_v1.yaml",
test_deps = [
":oslogin_java_grpc",
] + _JAVA_GRPC_SUBPACKAGE_DEPS,
deps = [
":oslogin_java_proto",
":oslogin_java_gapic_resource_name",
] + _JAVA_PROTO_SUBPACKAGE_DEPS,
)
@ -110,7 +98,6 @@ java_gapic_assembly_gradle_pkg(
":oslogin_java_grpc",
":oslogin_java_proto",
":oslogin_proto",
":oslogin_java_gapic_resource_name",
] + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS + _JAVA_GRPC_SUBPACKAGE_DEPS,
)
@ -189,7 +176,7 @@ py_gapic_assembly_pkg(
name = "oslogin-v1-py",
deps = [
":oslogin_py_gapic",
"//google/cloud/oslogin/common:common_py_gapic"
"//google/cloud/oslogin/common:common_py_gapic",
],
)
@ -349,8 +336,8 @@ csharp_grpc_library(
csharp_gapic_library(
name = "oslogin_csharp_gapic",
srcs = [":oslogin_proto_with_info"],
grpc_service_config = "oslogin_grpc_service_config.json",
common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
grpc_service_config = "oslogin_grpc_service_config.json",
deps = [
":oslogin_csharp_grpc",
":oslogin_csharp_proto",

View File

@ -32,20 +32,20 @@ proto_library_with_info(
deps = [
":oslogin_proto",
"//google/cloud:common_resources_proto",
],
] + _PROTO_SUBPACKAGE_DEPS,
)
##############################################################################
# Java
# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
##############################################################################
load(
"@com_google_googleapis_imports//:imports.bzl",
"java_gapic_assembly_gradle_pkg",
"java_gapic_library",
"java_gapic_test",
"java_grpc_library",
"java_proto_library",
"java_resource_name_proto_library",
java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
java_gapic_library = "java_gapic_library2",
java_gapic_test = "java_gapic_test2",
)
_JAVA_PROTO_SUBPACKAGE_DEPS = [
@ -67,26 +67,14 @@ java_grpc_library(
deps = [":oslogin_java_proto"] + _JAVA_PROTO_SUBPACKAGE_DEPS,
)
java_resource_name_proto_library(
name = "oslogin_java_gapic_resource_name",
gapic_yaml = "//google/cloud/oslogin/v1:oslogin_gapic.yaml",
deps = [
":oslogin_proto",
"//google/cloud:common_resources_proto",
] + _PROTO_SUBPACKAGE_DEPS,
)
java_gapic_library(
name = "oslogin_java_gapic",
src = ":oslogin_proto_with_info",
srcs = [":oslogin_proto_with_info"],
gapic_yaml = "oslogin_gapic.yaml",
gen_resource_name = False,
grpc_service_config = "oslogin_grpc_service_config.json",
service_yaml = "//google/cloud/oslogin:oslogin_v1beta.yaml",
test_deps = [":oslogin_java_grpc"],
deps = [
":oslogin_java_proto",
":oslogin_java_gapic_resource_name",
] + _JAVA_PROTO_SUBPACKAGE_DEPS,
)
@ -184,7 +172,7 @@ py_gapic_assembly_pkg(
name = "oslogin-v1beta-py",
deps = [
":oslogin_py_gapic",
"//google/cloud/oslogin/common:common_py_gapic"
"//google/cloud/oslogin/common:common_py_gapic",
],
)
@ -344,8 +332,8 @@ csharp_grpc_library(
csharp_gapic_library(
name = "oslogin_csharp_gapic",
srcs = [":oslogin_proto_with_info"],
grpc_service_config = "oslogin_grpc_service_config.json",
common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
grpc_service_config = "oslogin_grpc_service_config.json",
deps = [
":oslogin_csharp_grpc",
":oslogin_csharp_proto",