Skip to content

Commit ff715bf

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
chore: migrate java-os-login to the Java microgenerator
Committer: @miraleung PiperOrigin-RevId: 344845744
1 parent d04af09 commit ff715bf

2 files changed

Lines changed: 16 additions & 41 deletions

File tree

‎google/cloud/oslogin/v1/BUILD.bazel‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ proto_library_with_info(
3333
deps = [
3434
":oslogin_proto",
3535
"//google/cloud:common_resources_proto",
36-
],
36+
] + _PROTO_SUBPACKAGE_DEPS,
3737
)
3838

3939
##############################################################################
4040
# Java
41+
# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
4142
##############################################################################
4243
load(
4344
"@com_google_googleapis_imports//:imports.bzl",
44-
"java_gapic_assembly_gradle_pkg",
45-
"java_gapic_library",
46-
"java_gapic_test",
4745
"java_grpc_library",
4846
"java_proto_library",
49-
"java_resource_name_proto_library",
47+
java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
48+
java_gapic_library = "java_gapic_library2",
49+
java_gapic_test = "java_gapic_test2",
5050
)
5151

5252
_JAVA_PROTO_SUBPACKAGE_DEPS = [
@@ -68,29 +68,17 @@ java_grpc_library(
6868
deps = [":oslogin_java_proto"] + _JAVA_PROTO_SUBPACKAGE_DEPS,
6969
)
7070

71-
java_resource_name_proto_library(
72-
name = "oslogin_java_gapic_resource_name",
73-
gapic_yaml = "//google/cloud/oslogin/v1:oslogin_gapic.yaml",
74-
deps = [
75-
":oslogin_proto",
76-
"//google/cloud:common_resources_proto",
77-
] + _PROTO_SUBPACKAGE_DEPS,
78-
)
79-
8071
java_gapic_library(
8172
name = "oslogin_java_gapic",
82-
src = ":oslogin_proto_with_info",
73+
srcs = [":oslogin_proto_with_info"],
8374
gapic_yaml = "oslogin_gapic.yaml",
84-
gen_resource_name = False,
8575
grpc_service_config = "oslogin_grpc_service_config.json",
8676
package = "google.cloud.oslogin.v1",
87-
service_yaml = ":oslogin_v1.yaml",
8877
test_deps = [
8978
":oslogin_java_grpc",
9079
] + _JAVA_GRPC_SUBPACKAGE_DEPS,
9180
deps = [
9281
":oslogin_java_proto",
93-
":oslogin_java_gapic_resource_name",
9482
] + _JAVA_PROTO_SUBPACKAGE_DEPS,
9583
)
9684

@@ -110,7 +98,6 @@ java_gapic_assembly_gradle_pkg(
11098
":oslogin_java_grpc",
11199
":oslogin_java_proto",
112100
":oslogin_proto",
113-
":oslogin_java_gapic_resource_name",
114101
] + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS + _JAVA_GRPC_SUBPACKAGE_DEPS,
115102
)
116103

@@ -189,7 +176,7 @@ py_gapic_assembly_pkg(
189176
name = "oslogin-v1-py",
190177
deps = [
191178
":oslogin_py_gapic",
192-
"//google/cloud/oslogin/common:common_py_gapic"
179+
"//google/cloud/oslogin/common:common_py_gapic",
193180
],
194181
)
195182

@@ -349,8 +336,8 @@ csharp_grpc_library(
349336
csharp_gapic_library(
350337
name = "oslogin_csharp_gapic",
351338
srcs = [":oslogin_proto_with_info"],
352-
grpc_service_config = "oslogin_grpc_service_config.json",
353339
common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
340+
grpc_service_config = "oslogin_grpc_service_config.json",
354341
deps = [
355342
":oslogin_csharp_grpc",
356343
":oslogin_csharp_proto",

‎google/cloud/oslogin/v1beta/BUILD.bazel‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ proto_library_with_info(
3232
deps = [
3333
":oslogin_proto",
3434
"//google/cloud:common_resources_proto",
35-
],
35+
] + _PROTO_SUBPACKAGE_DEPS,
3636
)
3737

3838
##############################################################################
3939
# Java
40+
# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
4041
##############################################################################
4142
load(
4243
"@com_google_googleapis_imports//:imports.bzl",
43-
"java_gapic_assembly_gradle_pkg",
44-
"java_gapic_library",
45-
"java_gapic_test",
4644
"java_grpc_library",
4745
"java_proto_library",
48-
"java_resource_name_proto_library",
46+
java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
47+
java_gapic_library = "java_gapic_library2",
48+
java_gapic_test = "java_gapic_test2",
4949
)
5050

5151
_JAVA_PROTO_SUBPACKAGE_DEPS = [
@@ -67,26 +67,14 @@ java_grpc_library(
6767
deps = [":oslogin_java_proto"] + _JAVA_PROTO_SUBPACKAGE_DEPS,
6868
)
6969

70-
java_resource_name_proto_library(
71-
name = "oslogin_java_gapic_resource_name",
72-
gapic_yaml = "//google/cloud/oslogin/v1:oslogin_gapic.yaml",
73-
deps = [
74-
":oslogin_proto",
75-
"//google/cloud:common_resources_proto",
76-
] + _PROTO_SUBPACKAGE_DEPS,
77-
)
78-
7970
java_gapic_library(
8071
name = "oslogin_java_gapic",
81-
src = ":oslogin_proto_with_info",
72+
srcs = [":oslogin_proto_with_info"],
8273
gapic_yaml = "oslogin_gapic.yaml",
83-
gen_resource_name = False,
8474
grpc_service_config = "oslogin_grpc_service_config.json",
85-
service_yaml = "//google/cloud/oslogin:oslogin_v1beta.yaml",
8675
test_deps = [":oslogin_java_grpc"],
8776
deps = [
8877
":oslogin_java_proto",
89-
":oslogin_java_gapic_resource_name",
9078
] + _JAVA_PROTO_SUBPACKAGE_DEPS,
9179
)
9280

@@ -184,7 +172,7 @@ py_gapic_assembly_pkg(
184172
name = "oslogin-v1beta-py",
185173
deps = [
186174
":oslogin_py_gapic",
187-
"//google/cloud/oslogin/common:common_py_gapic"
175+
"//google/cloud/oslogin/common:common_py_gapic",
188176
],
189177
)
190178

@@ -344,8 +332,8 @@ csharp_grpc_library(
344332
csharp_gapic_library(
345333
name = "oslogin_csharp_gapic",
346334
srcs = [":oslogin_proto_with_info"],
347-
grpc_service_config = "oslogin_grpc_service_config.json",
348335
common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
336+
grpc_service_config = "oslogin_grpc_service_config.json",
349337
deps = [
350338
":oslogin_csharp_grpc",
351339
":oslogin_csharp_proto",

0 commit comments

Comments
 (0)