Skip to content

Commit 07daa3d

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
chore: rename gapic.yaml and service.yaml files for better consistency
PiperOrigin-RevId: 756767540
1 parent 98e83d1 commit 07daa3d

10 files changed

Lines changed: 36 additions & 153 deletions

File tree

‎google/area120/tables/v1alpha1/BUILD.bazel‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
# * extra_protoc_file_parameters
1010
# The complete list of preserved parameters can be found in the source code.
1111

12-
##############################################################################
13-
# Common
14-
##############################################################################
15-
load("@rules_proto//proto:defs.bzl", "proto_library")
1612
load(
1713
"@com_google_googleapis_imports//:imports.bzl",
1814
"csharp_gapic_assembly_pkg",
@@ -42,6 +38,11 @@ load(
4238
"ruby_proto_library",
4339
)
4440

41+
##############################################################################
42+
# Common
43+
##############################################################################
44+
load("@rules_proto//proto:defs.bzl", "proto_library")
45+
4546
# This is an API workspace, having public visibility by default makes perfect sense.
4647
package(default_visibility = ["//visibility:public"])
4748

@@ -83,7 +84,7 @@ java_grpc_library(
8384
java_gapic_library(
8485
name = "tables_java_gapic",
8586
srcs = [":tables_proto_with_info"],
86-
gapic_yaml = "language_gapic.yaml",
87+
gapic_yaml = "area120tables_gapic.yaml",
8788
grpc_service_config = "tables_grpc_service_config.json",
8889
rest_numeric_enums = True,
8990
service_yaml = "area120tables_v1alpha1.yaml",

google/area120/tables/v1alpha1/language_gapic.yaml renamed to google/area120/tables/v1alpha1/area120tables_gapic.yaml

File renamed without changes.

‎google/cloud/bigquery/connection/v1/BUILD.bazel‎

Lines changed: 6 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# This file was automatically generated by BuildFileGenerator
22

3-
# This is an API workspace, having public visibility by default makes perfect sense.
4-
package(default_visibility = ["//visibility:public"])
3+
load("@com_google_googleapis_imports//:imports.bzl", "cc_grpc_library", "cc_proto_library", "csharp_gapic_assembly_pkg", "csharp_gapic_library", "csharp_grpc_library", "csharp_proto_library", "go_gapic_assembly_pkg", "go_gapic_library", "go_proto_library", "java_gapic_assembly_gradle_pkg", "java_gapic_library", "java_gapic_test", "java_grpc_library", "java_proto_library", "nodejs_gapic_assembly_pkg", "nodejs_gapic_library", "php_gapic_assembly_pkg", "php_gapic_library", "php_proto_library", "proto_library_with_info", "py_gapic_assembly_pkg", "py_gapic_library", "py_test", "ruby_cloud_gapic_library", "ruby_gapic_assembly_pkg", "ruby_grpc_library", "ruby_proto_library")
54

65
##############################################################################
76
# Common
87
##############################################################################
98
load("@rules_proto//proto:defs.bzl", "proto_library")
10-
load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
9+
10+
# This is an API workspace, having public visibility by default makes perfect sense.
11+
package(default_visibility = ["//visibility:public"])
1112

1213
proto_library(
1314
name = "connection_proto",
@@ -35,18 +36,6 @@ proto_library_with_info(
3536
],
3637
)
3738

38-
##############################################################################
39-
# Java
40-
##############################################################################
41-
load(
42-
"@com_google_googleapis_imports//:imports.bzl",
43-
"java_gapic_assembly_gradle_pkg",
44-
"java_gapic_library",
45-
"java_gapic_test",
46-
"java_grpc_library",
47-
"java_proto_library",
48-
)
49-
5039
java_proto_library(
5140
name = "connection_java_proto",
5241
deps = [":connection_proto"],
@@ -61,7 +50,7 @@ java_grpc_library(
6150
java_gapic_library(
6251
name = "connection_java_gapic",
6352
srcs = [":connection_proto_with_info"],
64-
gapic_yaml = "connection_gapic.yaml",
53+
gapic_yaml = "bigqueryconnection_gapic.yaml",
6554
grpc_service_config = "bigqueryconnection_grpc_service_config.json",
6655
rest_numeric_enums = True,
6756
service_yaml = "bigqueryconnection_v1.yaml",
@@ -98,16 +87,6 @@ java_gapic_assembly_gradle_pkg(
9887
],
9988
)
10089

101-
##############################################################################
102-
# Go
103-
##############################################################################
104-
load(
105-
"@com_google_googleapis_imports//:imports.bzl",
106-
"go_gapic_assembly_pkg",
107-
"go_gapic_library",
108-
"go_proto_library",
109-
)
110-
11190
go_proto_library(
11291
name = "connection_go_proto",
11392
compilers = ["@io_bazel_rules_go//proto:go_grpc"],
@@ -146,16 +125,6 @@ go_gapic_assembly_pkg(
146125
],
147126
)
148127

149-
##############################################################################
150-
# Python
151-
##############################################################################
152-
load(
153-
"@com_google_googleapis_imports//:imports.bzl",
154-
"py_gapic_assembly_pkg",
155-
"py_gapic_library",
156-
"py_test",
157-
)
158-
159128
py_gapic_library(
160129
name = "connection_py_gapic",
161130
srcs = [":connection_proto"],
@@ -190,16 +159,6 @@ py_gapic_assembly_pkg(
190159
],
191160
)
192161

193-
##############################################################################
194-
# PHP
195-
##############################################################################
196-
load(
197-
"@com_google_googleapis_imports//:imports.bzl",
198-
"php_gapic_assembly_pkg",
199-
"php_gapic_library",
200-
"php_proto_library",
201-
)
202-
203162
php_proto_library(
204163
name = "connection_php_proto",
205164
deps = [":connection_proto"],
@@ -225,21 +184,12 @@ php_gapic_assembly_pkg(
225184
],
226185
)
227186

228-
##############################################################################
229-
# Node.js
230-
##############################################################################
231-
load(
232-
"@com_google_googleapis_imports//:imports.bzl",
233-
"nodejs_gapic_assembly_pkg",
234-
"nodejs_gapic_library",
235-
)
236-
237187
nodejs_gapic_library(
238188
name = "connection_nodejs_gapic",
239189
package_name = "@google-cloud/bigquery-connection",
240190
src = ":connection_proto_with_info",
241191
extra_protoc_parameters = ["metadata"],
242-
gapic_yaml = "connection_gapic.yaml",
192+
gapic_yaml = "bigqueryconnection_gapic.yaml",
243193
grpc_service_config = "bigqueryconnection_grpc_service_config.json",
244194
package = "google.cloud.bigquery.connection.v1",
245195
rest_numeric_enums = True,
@@ -256,17 +206,6 @@ nodejs_gapic_assembly_pkg(
256206
],
257207
)
258208

259-
##############################################################################
260-
# Ruby
261-
##############################################################################
262-
load(
263-
"@com_google_googleapis_imports//:imports.bzl",
264-
"ruby_cloud_gapic_library",
265-
"ruby_gapic_assembly_pkg",
266-
"ruby_grpc_library",
267-
"ruby_proto_library",
268-
)
269-
270209
ruby_proto_library(
271210
name = "connection_ruby_proto",
272211
deps = [":connection_proto"],
@@ -310,17 +249,6 @@ ruby_gapic_assembly_pkg(
310249
],
311250
)
312251

313-
##############################################################################
314-
# C#
315-
##############################################################################
316-
load(
317-
"@com_google_googleapis_imports//:imports.bzl",
318-
"csharp_gapic_assembly_pkg",
319-
"csharp_gapic_library",
320-
"csharp_grpc_library",
321-
"csharp_proto_library",
322-
)
323-
324252
csharp_proto_library(
325253
name = "connection_csharp_proto",
326254
deps = [":connection_proto"],
@@ -356,15 +284,6 @@ csharp_gapic_assembly_pkg(
356284
],
357285
)
358286

359-
##############################################################################
360-
# C++
361-
##############################################################################
362-
load(
363-
"@com_google_googleapis_imports//:imports.bzl",
364-
"cc_grpc_library",
365-
"cc_proto_library",
366-
)
367-
368287
cc_proto_library(
369288
name = "connection_cc_proto",
370289
deps = [":connection_proto"],

google/cloud/bigquery/connection/v1/connection_gapic.yaml renamed to google/cloud/bigquery/connection/v1/bigqueryconnection_gapic.yaml

File renamed without changes.

‎google/spanner/admin/database/v1/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ java_grpc_library(
9595
java_gapic_library(
9696
name = "database_java_gapic",
9797
srcs = [":database_proto_with_info"],
98-
gapic_yaml = "spanner_admin_database_gapic.yaml",
98+
gapic_yaml = "spanner_gapic.yaml",
9999
grpc_service_config = "spanner_admin_database_grpc_service_config.json",
100100
rest_numeric_enums = True,
101101
service_yaml = "spanner.yaml",
@@ -216,12 +216,12 @@ php_proto_library(
216216
php_gapic_library(
217217
name = "database_php_gapic",
218218
srcs = [":database_proto_with_info"],
219-
gapic_yaml = "spanner_admin_database_gapic.yaml",
219+
gapic_yaml = "spanner_gapic.yaml",
220220
grpc_service_config = "spanner_admin_database_grpc_service_config.json",
221+
migration_mode = "MIGRATING",
221222
rest_numeric_enums = True,
222223
service_yaml = "spanner.yaml",
223224
transport = "grpc+rest",
224-
migration_mode = "MIGRATING",
225225
deps = [":database_php_proto"],
226226
)
227227

google/spanner/admin/database/v1/spanner_admin_database_gapic.yaml renamed to google/spanner/admin/database/v1/spanner_gapic.yaml

File renamed without changes.

‎google/spanner/admin/instance/v1/BUILD.bazel‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# This file was automatically generated by BuildFileGenerator
22

3-
##############################################################################
4-
# Common
5-
##############################################################################
6-
load("@rules_proto//proto:defs.bzl", "proto_library")
73
load(
84
"@com_google_googleapis_imports//:imports.bzl",
95
"cc_grpc_library",
@@ -35,6 +31,11 @@ load(
3531
"ruby_proto_library",
3632
)
3733

34+
##############################################################################
35+
# Common
36+
##############################################################################
37+
load("@rules_proto//proto:defs.bzl", "proto_library")
38+
3839
# This is an API workspace, having public visibility by default makes perfect sense.
3940
package(default_visibility = ["//visibility:public"])
4041

@@ -80,7 +81,7 @@ java_grpc_library(
8081
java_gapic_library(
8182
name = "instance_java_gapic",
8283
srcs = [":instance_proto_with_info"],
83-
gapic_yaml = "spanner_admin_instance_gapic.yaml",
84+
gapic_yaml = "spanner_gapic.yaml",
8485
grpc_service_config = "spanner_admin_instance_grpc_service_config.json",
8586
rest_numeric_enums = True,
8687
service_yaml = "spanner_admin_instance.yaml",
@@ -200,12 +201,12 @@ php_proto_library(
200201
php_gapic_library(
201202
name = "instance_php_gapic",
202203
srcs = [":instance_proto_with_info"],
203-
gapic_yaml = "spanner_admin_instance_gapic.yaml",
204+
gapic_yaml = "spanner_gapic.yaml",
204205
grpc_service_config = "spanner_admin_instance_grpc_service_config.json",
206+
migration_mode = "MIGRATING",
205207
rest_numeric_enums = True,
206208
service_yaml = "spanner_admin_instance.yaml",
207209
transport = "grpc+rest",
208-
migration_mode = "MIGRATING",
209210
deps = [":instance_php_proto"],
210211
)
211212

google/spanner/admin/instance/v1/spanner_admin_instance_gapic.yaml renamed to google/spanner/admin/instance/v1/spanner_gapic.yaml

File renamed without changes.

0 commit comments

Comments
 (0)