diff --git a/WORKSPACE b/WORKSPACE index 94a5d7e5..7b82debc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -97,3 +97,12 @@ gazelle_dependencies() load("@com_google_api_codegen//rules_gapic/go:go_gapic_repositories.bzl", "go_gapic_repositories") go_gapic_repositories() + +load("//:repository_rules.bzl", "enabled_rules") + +enabled_rules( + name = "com_google_googleapis_imports", + go = True, + java = True, + proto = True, +) diff --git a/google/api/BUILD.bazel b/google/api/BUILD.bazel index ff8a2cf0..efda0812 100644 --- a/google/api/BUILD.bazel +++ b/google/api/BUILD.bazel @@ -176,7 +176,7 @@ proto_library( srcs = ["resource.proto"], deps = [ "@com_google_protobuf//:descriptor_proto", - ] + ], ) proto_library( @@ -199,6 +199,7 @@ proto_library( ":monitored_resource_proto", ":monitoring_proto", ":quota_proto", + ":resource_proto", ":source_info_proto", ":system_parameter_proto", ":usage_proto", @@ -341,7 +342,10 @@ go_proto_library( name = "monitoredres_go_proto", importpath = "google.golang.org/genproto/googleapis/api/monitoredres", protos = [":monitored_resource_proto"], - deps = [":label_go_proto"], + deps = [ + ":api_go_proto", + ":label_go_proto", + ], ) go_proto_library( diff --git a/google/cloud/language/v1/BUILD.bazel b/google/cloud/language/v1/BUILD.bazel index 8d332c9b..0ec0de0a 100644 --- a/google/cloud/language/v1/BUILD.bazel +++ b/google/cloud/language/v1/BUILD.bazel @@ -4,7 +4,7 @@ package(default_visibility = ["//visibility:public"]) ############################################################################## # Common ############################################################################## -load("@com_google_api_codegen//rules_gapic:gapic.bzl", "proto_library_with_info") +load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info") proto_library( name = "language_proto", @@ -24,9 +24,13 @@ proto_library_with_info( ############################################################################## # Java ############################################################################## -load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library") -load("@com_google_api_codegen//rules_gapic/java:java_gapic.bzl", "java_gapic_library") -load("@com_google_api_codegen//rules_gapic/java:java_gapic_pkg.bzl", "java_gapic_assembly_gradle_pkg") +load( + "@com_google_googleapis_imports//:imports.bzl", + "java_grpc_library", + "java_gapic_library", + "java_gapic_assembly_gradle_pkg", + "java_test", +) _JAVA_GRPC_DEPS = [ "@com_google_api_grpc_proto_google_common_protos//jar", @@ -78,10 +82,13 @@ java_gapic_assembly_gradle_pkg( ############################################################################## # Go ############################################################################## -load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") -load("@com_google_api_codegen//rules_gapic/go:go_gapic.bzl", "go_gapic_srcjar", "go_gapic_library") -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") -load("@com_google_api_codegen//rules_gapic/go:go_gapic_pkg.bzl", "go_gapic_assembly_pkg") +load( + "@com_google_googleapis_imports//:imports.bzl", + "go_proto_library", + "go_test", + "go_gapic_library", + "go_gapic_assembly_pkg", +) go_proto_library( name = "language_go_proto", diff --git a/google/iam/v1/BUILD.bazel b/google/iam/v1/BUILD.bazel index 163a1b95..56fd31ea 100644 --- a/google/iam/v1/BUILD.bazel +++ b/google/iam/v1/BUILD.bazel @@ -14,6 +14,7 @@ proto_library( deps = [ ":policy_proto", "//google/api:annotations_proto", + "//google/api:resource_proto", ], ) @@ -22,6 +23,7 @@ proto_library( srcs = ["policy.proto"], deps = [ "//google/api:annotations_proto", + "//google/type:expr_proto", ], ) @@ -61,7 +63,10 @@ go_proto_library( compilers = ["@io_bazel_rules_go//proto:go_grpc"], importpath = "google.golang.org/genproto/googleapis/iam/v1", protos = [":iam_proto_with_info"], - deps = ["//google/api:annotations_go_proto"], + deps = [ + "//google/api:annotations_go_proto", + "//google/type:expr_go_proto", + ], ) go_gapic_assembly_pkg( @@ -69,4 +74,4 @@ go_gapic_assembly_pkg( deps = [ ":iam_go_proto", ], -) \ No newline at end of file +) diff --git a/google/type/BUILD.bazel b/google/type/BUILD.bazel index 4ab2261a..a635bfd9 100644 --- a/google/type/BUILD.bazel +++ b/google/type/BUILD.bazel @@ -4,6 +4,11 @@ package(default_visibility = ["//visibility:public"]) ############################################################################## # Common ############################################################################## +proto_library( + name = "calendar_period_proto", + srcs = ["calendar_period.proto"], +) + proto_library( name = "color_proto", srcs = ["color.proto"], @@ -22,6 +27,16 @@ proto_library( srcs = ["dayofweek.proto"], ) +proto_library( + name = "expr_proto", + srcs = ["expr.proto"], +) + +proto_library( + name = "fraction_proto", + srcs = ["fraction.proto"], +) + proto_library( name = "latlng_proto", srcs = ["latlng.proto"], @@ -37,6 +52,11 @@ proto_library( srcs = ["postal_address.proto"], ) +proto_library( + name = "quaternion_proto", + srcs = ["quaternion.proto"], +) + proto_library( name = "timeofday_proto", srcs = ["timeofday.proto"], @@ -50,12 +70,16 @@ load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library") java_proto_library( name = "type_java_proto", deps = [ + ":calendar_period_proto", ":color_proto", ":date_proto", ":dayofweek_proto", + ":expr_proto", + ":fraction_proto", ":latlng_proto", ":money_proto", ":postal_address_proto", + ":quaternion_proto", ":timeofday_proto", ], ) @@ -65,6 +89,12 @@ java_proto_library( ############################################################################## load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") +go_proto_library( + name = "calendar_period_go_proto", + importpath = "google.golang.org/genproto/googleapis/type/calendarperiod", + protos = [":calendar_period_proto"], +) + go_proto_library( name = "color_go_proto", importpath = "google.golang.org/genproto/googleapis/type/color", @@ -83,6 +113,18 @@ go_proto_library( protos = [":dayofweek_proto"], ) +go_proto_library( + name = "expr_go_proto", + importpath = "google.golang.org/genproto/googleapis/type/expr", + protos = [":expr_proto"], +) + +go_proto_library( + name = "fraction_go_proto", + importpath = "google.golang.org/genproto/googleapis/type/fraction", + protos = [":fraction_proto"], +) + go_proto_library( name = "latlng_go_proto", importpath = "google.golang.org/genproto/googleapis/type/latlng", @@ -101,6 +143,12 @@ go_proto_library( protos = [":postal_address_proto"], ) +go_proto_library( + name = "quaternion_go_proto", + importpath = "google.golang.org/genproto/googleapis/type/quaternion", + protos = [":quaternion_proto"], +) + go_proto_library( name = "timeofday_go_proto", importpath = "google.golang.org/genproto/googleapis/type/timeofday",