Skip to content

Commit ef3d3cc

Browse files
dbolducdbolduc
authored
refactor: bazel gapics d* (#14176)
1 parent 9346064 commit ef3d3cc

14 files changed

Lines changed: 128 additions & 724 deletions

File tree

‎google/cloud/datacatalog/BUILD.bazel‎

Lines changed: 10 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@google_cloud_cpp//bazel:gapic.bzl", "cc_gapic_library")
16+
1517
package(default_visibility = ["//visibility:private"])
1618

1719
licenses(["notice"]) # Apache 2.0
@@ -22,59 +24,13 @@ service_dirs = [
2224
"v1/",
2325
]
2426

25-
src_dirs = service_dirs + [d + "internal/" for d in service_dirs]
26-
27-
filegroup(
28-
name = "srcs",
29-
srcs = glob([d + "*.cc" for d in src_dirs]),
30-
)
31-
32-
filegroup(
33-
name = "hdrs",
34-
srcs = glob([d + "*.h" for d in src_dirs]),
35-
)
36-
37-
filegroup(
38-
name = "public_hdrs",
39-
srcs = glob([d + "*.h" for d in service_dirs]),
40-
visibility = ["//:__pkg__"],
41-
)
42-
43-
filegroup(
44-
name = "mocks",
45-
srcs = glob([d + "mocks/*.h" for d in service_dirs]),
46-
visibility = ["//:__pkg__"],
47-
)
48-
49-
cc_library(
50-
name = "google_cloud_cpp_datacatalog",
51-
srcs = [":srcs"],
52-
hdrs = [":hdrs"],
53-
visibility = ["//:__pkg__"],
54-
deps = [
55-
"//:common",
56-
"//:grpc_utils",
57-
"@com_google_googleapis//google/cloud/datacatalog/lineage/v1:lineage_cc_grpc",
58-
"@com_google_googleapis//google/cloud/datacatalog/v1:datacatalog_cc_grpc",
59-
],
60-
)
27+
googleapis_deps = [
28+
"@com_google_googleapis//google/cloud/datacatalog/lineage/v1:lineage_cc_grpc",
29+
"@com_google_googleapis//google/cloud/datacatalog/v1:datacatalog_cc_grpc",
30+
]
6131

62-
cc_library(
63-
name = "google_cloud_cpp_datacatalog_mocks",
64-
hdrs = [":mocks"],
65-
visibility = ["//:__pkg__"],
66-
deps = [
67-
":google_cloud_cpp_datacatalog",
68-
"@com_google_googletest//:gtest",
69-
],
32+
cc_gapic_library(
33+
name = "datacatalog",
34+
googleapis_deps = googleapis_deps,
35+
service_dirs = service_dirs,
7036
)
71-
72-
[cc_test(
73-
name = sample.replace("/", "_").replace(".cc", ""),
74-
srcs = [sample],
75-
tags = ["integration-test"],
76-
deps = [
77-
"//:datacatalog",
78-
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
79-
],
80-
) for sample in glob([d + "samples/*.cc" for d in service_dirs])]

‎google/cloud/datafusion/BUILD.bazel‎

Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -12,64 +12,20 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@google_cloud_cpp//bazel:gapic.bzl", "cc_gapic_library")
16+
1517
package(default_visibility = ["//visibility:private"])
1618

1719
licenses(["notice"]) # Apache 2.0
1820

1921
service_dirs = ["v1/"]
2022

21-
src_dirs = service_dirs + [d + "internal/" for d in service_dirs]
22-
23-
filegroup(
24-
name = "srcs",
25-
srcs = glob([d + "*.cc" for d in src_dirs]),
26-
)
27-
28-
filegroup(
29-
name = "hdrs",
30-
srcs = glob([d + "*.h" for d in src_dirs]),
31-
)
32-
33-
filegroup(
34-
name = "public_hdrs",
35-
srcs = glob([d + "*.h" for d in service_dirs]),
36-
visibility = ["//:__pkg__"],
37-
)
38-
39-
filegroup(
40-
name = "mocks",
41-
srcs = glob([d + "mocks/*.h" for d in service_dirs]),
42-
visibility = ["//:__pkg__"],
43-
)
23+
googleapis_deps = [
24+
"@com_google_googleapis//google/cloud/datafusion/v1:datafusion_cc_grpc",
25+
]
4426

45-
cc_library(
46-
name = "google_cloud_cpp_datafusion",
47-
srcs = [":srcs"],
48-
hdrs = [":hdrs"],
49-
visibility = ["//:__pkg__"],
50-
deps = [
51-
"//:common",
52-
"//:grpc_utils",
53-
"@com_google_googleapis//google/cloud/datafusion/v1:datafusion_cc_grpc",
54-
],
27+
cc_gapic_library(
28+
name = "datafusion",
29+
googleapis_deps = googleapis_deps,
30+
service_dirs = service_dirs,
5531
)
56-
57-
cc_library(
58-
name = "google_cloud_cpp_datafusion_mocks",
59-
hdrs = [":mocks"],
60-
visibility = ["//:__pkg__"],
61-
deps = [
62-
":google_cloud_cpp_datafusion",
63-
"@com_google_googletest//:gtest",
64-
],
65-
)
66-
67-
[cc_test(
68-
name = sample.replace("/", "_").replace(".cc", ""),
69-
srcs = [sample],
70-
tags = ["integration-test"],
71-
deps = [
72-
"//:datafusion",
73-
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
74-
],
75-
) for sample in glob([d + "samples/*.cc" for d in service_dirs])]

‎google/cloud/datamigration/BUILD.bazel‎

Lines changed: 10 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@google_cloud_cpp//bazel:gapic.bzl", "cc_gapic_library")
16+
1517
package(default_visibility = ["//visibility:private"])
1618

1719
licenses(["notice"]) # Apache 2.0
@@ -21,59 +23,13 @@ service_dirs = [
2123
"v1/",
2224
]
2325

24-
src_dirs = service_dirs + [d + "internal/" for d in service_dirs]
25-
26-
filegroup(
27-
name = "srcs",
28-
srcs = glob([d + "*.cc" for d in src_dirs]),
29-
)
30-
31-
filegroup(
32-
name = "hdrs",
33-
srcs = glob([d + "*.h" for d in src_dirs]),
34-
)
35-
36-
filegroup(
37-
name = "public_hdrs",
38-
srcs = glob([d + "*.h" for d in service_dirs]),
39-
visibility = ["//:__pkg__"],
40-
)
41-
42-
filegroup(
43-
name = "mocks",
44-
srcs = glob([d + "mocks/*.h" for d in service_dirs]),
45-
visibility = ["//:__pkg__"],
46-
)
47-
48-
cc_library(
49-
name = "google_cloud_cpp_datamigration",
50-
srcs = [":srcs"],
51-
hdrs = [":hdrs"],
52-
visibility = ["//:__pkg__"],
53-
deps = [
54-
"//:common",
55-
"//:grpc_utils",
56-
"@com_google_googleapis//google/cloud/clouddms/logging/v1:logging_cc_grpc",
57-
"@com_google_googleapis//google/cloud/clouddms/v1:clouddms_cc_grpc",
58-
],
59-
)
26+
googleapis_deps = [
27+
"@com_google_googleapis//google/cloud/clouddms/logging/v1:logging_cc_grpc",
28+
"@com_google_googleapis//google/cloud/clouddms/v1:clouddms_cc_grpc",
29+
]
6030

61-
cc_library(
62-
name = "google_cloud_cpp_datamigration_mocks",
63-
hdrs = [":mocks"],
64-
visibility = ["//:__pkg__"],
65-
deps = [
66-
":google_cloud_cpp_datamigration",
67-
"@com_google_googletest//:gtest",
68-
],
31+
cc_gapic_library(
32+
name = "datamigration",
33+
googleapis_deps = googleapis_deps,
34+
service_dirs = service_dirs,
6935
)
70-
71-
[cc_test(
72-
name = sample.replace("/", "_").replace(".cc", ""),
73-
srcs = [sample],
74-
tags = ["integration-test"],
75-
deps = [
76-
"//:datamigration",
77-
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
78-
],
79-
) for sample in glob([d + "samples/*.cc" for d in service_dirs])]

‎google/cloud/dataplex/BUILD.bazel‎

Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@google_cloud_cpp//bazel:gapic.bzl", "cc_gapic_library")
16+
1517
package(default_visibility = ["//visibility:private"])
1618

1719
licenses(["notice"]) # Apache 2.0
@@ -21,58 +23,12 @@ service_dirs = [
2123
"v1/",
2224
]
2325

24-
src_dirs = service_dirs + [d + "internal/" for d in service_dirs]
25-
26-
filegroup(
27-
name = "srcs",
28-
srcs = glob([d + "*.cc" for d in src_dirs]),
29-
)
30-
31-
filegroup(
32-
name = "hdrs",
33-
srcs = glob([d + "*.h" for d in src_dirs]),
34-
)
35-
36-
filegroup(
37-
name = "public_hdrs",
38-
srcs = glob([d + "*.h" for d in service_dirs]),
39-
visibility = ["//:__pkg__"],
40-
)
41-
42-
filegroup(
43-
name = "mocks",
44-
srcs = glob([d + "mocks/*.h" for d in service_dirs]),
45-
visibility = ["//:__pkg__"],
46-
)
47-
48-
cc_library(
49-
name = "google_cloud_cpp_dataplex",
50-
srcs = [":srcs"],
51-
hdrs = [":hdrs"],
52-
visibility = ["//:__pkg__"],
53-
deps = [
54-
"//:common",
55-
"//:grpc_utils",
56-
"@com_google_googleapis//google/cloud/dataplex/v1:dataplex_cc_grpc",
57-
],
58-
)
26+
googleapis_deps = [
27+
"@com_google_googleapis//google/cloud/dataplex/v1:dataplex_cc_grpc",
28+
]
5929

60-
cc_library(
61-
name = "google_cloud_cpp_dataplex_mocks",
62-
hdrs = [":mocks"],
63-
visibility = ["//:__pkg__"],
64-
deps = [
65-
":google_cloud_cpp_dataplex",
66-
"@com_google_googletest//:gtest",
67-
],
30+
cc_gapic_library(
31+
name = "dataplex",
32+
googleapis_deps = googleapis_deps,
33+
service_dirs = service_dirs,
6834
)
69-
70-
[cc_test(
71-
name = sample.replace("/", "_").replace(".cc", ""),
72-
srcs = [sample],
73-
tags = ["integration-test"],
74-
deps = [
75-
"//:dataplex",
76-
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
77-
],
78-
) for sample in glob([d + "samples/*.cc" for d in service_dirs])]

‎google/cloud/dataproc/BUILD.bazel‎

Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@google_cloud_cpp//bazel:gapic.bzl", "cc_gapic_library")
16+
1517
package(default_visibility = ["//visibility:private"])
1618

1719
licenses(["notice"]) # Apache 2.0
@@ -21,58 +23,12 @@ service_dirs = [
2123
"v1/",
2224
]
2325

24-
src_dirs = service_dirs + [d + "internal/" for d in service_dirs]
25-
26-
filegroup(
27-
name = "srcs",
28-
srcs = glob([d + "*.cc" for d in src_dirs]),
29-
)
30-
31-
filegroup(
32-
name = "hdrs",
33-
srcs = glob([d + "*.h" for d in src_dirs]),
34-
)
35-
36-
filegroup(
37-
name = "public_hdrs",
38-
srcs = glob([d + "*.h" for d in service_dirs]),
39-
visibility = ["//:__pkg__"],
40-
)
41-
42-
filegroup(
43-
name = "mocks",
44-
srcs = glob([d + "mocks/*.h" for d in service_dirs]),
45-
visibility = ["//:__pkg__"],
46-
)
47-
48-
cc_library(
49-
name = "google_cloud_cpp_dataproc",
50-
srcs = [":srcs"],
51-
hdrs = [":hdrs"],
52-
visibility = ["//:__pkg__"],
53-
deps = [
54-
"//:common",
55-
"//:grpc_utils",
56-
"@com_google_googleapis//google/cloud/dataproc/v1:dataproc_cc_grpc",
57-
],
58-
)
26+
googleapis_deps = [
27+
"@com_google_googleapis//google/cloud/dataproc/v1:dataproc_cc_grpc",
28+
]
5929

60-
cc_library(
61-
name = "google_cloud_cpp_dataproc_mocks",
62-
hdrs = [":mocks"],
63-
visibility = ["//:__pkg__"],
64-
deps = [
65-
":google_cloud_cpp_dataproc",
66-
"@com_google_googletest//:gtest",
67-
],
30+
cc_gapic_library(
31+
name = "dataproc",
32+
googleapis_deps = googleapis_deps,
33+
service_dirs = service_dirs,
6834
)
69-
70-
[cc_test(
71-
name = sample.replace("/", "_").replace(".cc", ""),
72-
srcs = [sample],
73-
tags = ["integration-test"],
74-
deps = [
75-
"//:dataproc",
76-
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
77-
],
78-
) for sample in glob([d + "samples/*.cc" for d in service_dirs])]

0 commit comments

Comments
 (0)