From a12347ec47a7f3d18e35f2effc4295c0b0983213 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Fri, 7 Jun 2019 13:31:01 -0700 Subject: [PATCH] Synchronize new proto/yaml changes. PiperOrigin-RevId: 252108410 --- WORKSPACE | 18 +++++++++-- google/cloud/dialogflow/v2/BUILD.bazel | 43 ++++++++++++++++++++++++++ google/cloud/language/v1/BUILD.bazel | 43 ++++++++++++++++++++++++++ google/pubsub/v1/BUILD.bazel | 43 ++++++++++++++++++++++++++ repository_rules.bzl | 22 ++++++++++++- 5 files changed, 166 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 8cae7331..66d68128 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,14 +15,15 @@ switched_rules_by_language( go = True, grpc = True, java = True, + php = True, ) # Note gapic-generator contains java-specific and common code, that is why it is imported in common # section http_archive( name = "com_google_api_codegen", - strip_prefix = "gapic-generator-b465d5651c29c344e90515172cbe662fcb296dd8", - urls = ["https://github.com/googleapis/gapic-generator/archive/b465d5651c29c344e90515172cbe662fcb296dd8.zip"], + strip_prefix = "gapic-generator-5fcbd748cd68bb8ab4732511c6c07c1a87db02a3", + urls = ["https://github.com/googleapis/gapic-generator/archive/5fcbd748cd68bb8ab4732511c6c07c1a87db02a3.zip"], ) ############################################################################## @@ -137,3 +138,16 @@ load( ) com_google_gapic_generator_cpp_repositories() + +############################################################################## +# PHP +############################################################################## + +load("@com_google_api_codegen//rules_gapic/php:php_gapic_repositories.bzl", "php", "php_gapic_repositories") + +php( + name = "php", + version = "7.1.30", +) + +php_gapic_repositories() diff --git a/google/cloud/dialogflow/v2/BUILD.bazel b/google/cloud/dialogflow/v2/BUILD.bazel index aee37215..8b4325ad 100644 --- a/google/cloud/dialogflow/v2/BUILD.bazel +++ b/google/cloud/dialogflow/v2/BUILD.bazel @@ -170,3 +170,46 @@ go_gapic_assembly_pkg( ":dialogflow_go_proto", ], ) + +############################################################################## +# PHP +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "php_proto_library", + "php_grpc_library", + "php_gapic_library", + "php_gapic_assembly_pkg", +) + +php_proto_library( + name = "dialogflow_php_proto", + deps = [":dialogflow_proto"], +) + +php_grpc_library( + name = "dialogflow_php_grpc", + srcs = [":dialogflow_proto"], + deps = [":dialogflow_php_proto"], +) + +php_gapic_library( + name = "dialogflow_php_gapic", + src = ":dialogflow_proto_with_info", + gapic_yaml = "dialogflow_gapic.yaml", + service_yaml = "//google/cloud/dialogflow:dialogflow_v2.yaml", + deps = [ + ":dialogflow_php_grpc", + ":dialogflow_php_proto", + ], +) + +# Opensource Packages +php_gapic_assembly_pkg( + name = "google-cloud-dialogflow-v2-php", + deps = [ + ":dialogflow_php_gapic", + ":dialogflow_php_grpc", + ":dialogflow_php_proto", + ], +) diff --git a/google/cloud/language/v1/BUILD.bazel b/google/cloud/language/v1/BUILD.bazel index 74dd6e62..d124c76b 100644 --- a/google/cloud/language/v1/BUILD.bazel +++ b/google/cloud/language/v1/BUILD.bazel @@ -125,3 +125,46 @@ go_gapic_assembly_pkg( ":language_go_proto", ], ) + +############################################################################## +# PHP +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "php_proto_library", + "php_grpc_library", + "php_gapic_library", + "php_gapic_assembly_pkg", +) + +php_proto_library( + name = "language_php_proto", + deps = [":language_proto"], +) + +php_grpc_library( + name = "language_php_grpc", + srcs = [":language_proto"], + deps = [":language_php_proto"], +) + +php_gapic_library( + name = "language_php_gapic", + src = ":language_proto_with_info", + gapic_yaml = "language_gapic.yaml", + service_yaml = "//google/cloud/language:language_v1.yaml", + deps = [ + ":langauge_php_grpc", + ":language_php_proto", + ], +) + +# Opensource Packages +php_gapic_assembly_pkg( + name = "google-cloud-language-v1-php", + deps = [ + ":language_php_gapic", + ":language_php_grpc", + ":language_php_proto", + ], +) diff --git a/google/pubsub/v1/BUILD.bazel b/google/pubsub/v1/BUILD.bazel index 3cb10fa5..aaf3617e 100644 --- a/google/pubsub/v1/BUILD.bazel +++ b/google/pubsub/v1/BUILD.bazel @@ -149,3 +149,46 @@ go_gapic_assembly_pkg( ":pubsub_go_proto", ], ) + +############################################################################## +# PHP +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "php_proto_library", + "php_grpc_library", + "php_gapic_library", + "php_gapic_assembly_pkg", +) + +php_proto_library( + name = "pubsub_php_proto", + deps = [":pubsub_proto"], +) + +php_grpc_library( + name = "pubsub_php_grpc", + srcs = [":pubsub_proto"], + deps = [":pubsub_php_proto"], +) + +php_gapic_library( + name = "pubsub_php_gapic", + src = ":pubsub_proto_with_info", + gapic_yaml = "pubsub_gapic.yaml", + service_yaml = "//google/pubsub:pubsub.yaml", + deps = [ + ":pubsub_php_grpc", + ":pubsub_php_proto", + ], +) + +# Opensource Packages +php_gapic_assembly_pkg( + name = "google-cloud-pubsub-v1-php", + deps = [ + ":pubsub_php_gapic", + ":pubsub_php_grpc", + ":pubsub_php_proto", + ], +) diff --git a/repository_rules.bzl b/repository_rules.bzl index 3cd54b42..004f3fde 100644 --- a/repository_rules.bzl +++ b/repository_rules.bzl @@ -94,7 +94,7 @@ def switched_rules_by_language( go (bool): Enable Go specific rules. False by default. cc (bool): Enable C++ specific rules. False by default. Partially implemented. python (bool): Enable Python-specific rules. False by default. Not implemented yet. - php (bool): Enable PHP specific rules. False by default. Not implemented yet. + php (bool): Enable PHP specific rules. False by default. ruby (bool): Enable Ruby specific rules. False by default. Not implemented yet. js (bool): Enable JavaScript specific rules. False by default. Not implemented yet. csharp (bool): Enable C# specific rules. False by default. Not implemented yet. @@ -179,6 +179,26 @@ def switched_rules_by_language( "@com_google_gapic_generator_cpp//rules_gapic/cpp:cc_gapic.bzl", ) + # + # PHP + # + rules["php_proto_library"] = _switch( + php, + "@com_google_api_codegen//rules_gapic/php:php_gapic.bzl", + ) + rules["php_grpc_library"] = _switch( + php and grpc, + "@com_google_api_codegen//rules_gapic/php:php_gapic.bzl", + ) + rules["php_gapic_library"] = _switch( + php and grpc and gapic, + "@com_google_api_codegen//rules_gapic/php:php_gapic.bzl", + ) + rules["php_gapic_assembly_pkg"] = _switch( + php and grpc and gapic, + "@com_google_api_codegen//rules_gapic/php:php_gapic_pkg.bzl", + ) + rules.update(rules_override) switched_rules(