From c4c531913567714ccd355c7e566183d22baf2f2e Mon Sep 17 00:00:00 2001 From: Google APIs Date: Mon, 12 Apr 2021 12:21:24 -0700 Subject: [PATCH] chore: migrate osconfig/{v1, v1beta} to the PHP microgenerator Committer: @miraleung PiperOrigin-RevId: 368057750 --- google/cloud/osconfig/v1/BUILD.bazel | 16 +++++++--------- google/cloud/osconfig/v1/osconfig_gapic.yaml | 17 ----------------- google/cloud/osconfig/v1beta/BUILD.bazel | 14 ++++++-------- 3 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 google/cloud/osconfig/v1/osconfig_gapic.yaml diff --git a/google/cloud/osconfig/v1/BUILD.bazel b/google/cloud/osconfig/v1/BUILD.bazel index 0c3c0dd22..61e7bbf00 100644 --- a/google/cloud/osconfig/v1/BUILD.bazel +++ b/google/cloud/osconfig/v1/BUILD.bazel @@ -181,13 +181,14 @@ py_gapic_assembly_pkg( ############################################################################## # PHP +# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "php_gapic_assembly_pkg", - "php_gapic_library", - "php_grpc_library", - "php_proto_library", + php_gapic_assembly_pkg = "php_gapic_assembly_pkg2", + php_gapic_library = "php_gapic_library2", + php_grpc_library = "php_grpc_library2", + php_proto_library = "php_proto_library2", ) php_proto_library( @@ -203,11 +204,8 @@ php_grpc_library( php_gapic_library( name = "osconfig_php_gapic", - src = ":osconfig_proto_with_info", - gapic_yaml = "osconfig_gapic.yaml", + srcs = [":osconfig_proto_with_info"], grpc_service_config = "osconfig_grpc_service_config.json", - package = "google.cloud.osconfig.v1", - service_yaml = "osconfig_v1.yaml", deps = [ ":osconfig_php_grpc", ":osconfig_php_proto", @@ -258,8 +256,8 @@ nodejs_gapic_assembly_pkg( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "ruby_gapic_assembly_pkg", "ruby_cloud_gapic_library", + "ruby_gapic_assembly_pkg", "ruby_grpc_library", "ruby_proto_library", ) diff --git a/google/cloud/osconfig/v1/osconfig_gapic.yaml b/google/cloud/osconfig/v1/osconfig_gapic.yaml deleted file mode 100644 index 0ee6371d7..000000000 --- a/google/cloud/osconfig/v1/osconfig_gapic.yaml +++ /dev/null @@ -1,17 +0,0 @@ -type: com.google.api.codegen.ConfigProto -config_schema_version: 2.0.0 -# The settings of generated code in a specific language. -language_settings: - python: - package_name: google.cloud.osconfig_v1.gapic - go: - package_name: cloud.google.com/go/osconfig/apiv1 - csharp: - package_name: Google.Cloud.OsConfig.V1 - ruby: - package_name: Google::Cloud::OsConfig::V1 - php: - package_name: Google\Cloud\OsConfig\V1 - nodejs: - package_name: osconfig.v1 - domain_layer_location: google-cloud diff --git a/google/cloud/osconfig/v1beta/BUILD.bazel b/google/cloud/osconfig/v1beta/BUILD.bazel index fbd56d753..ae2d85c9d 100644 --- a/google/cloud/osconfig/v1beta/BUILD.bazel +++ b/google/cloud/osconfig/v1beta/BUILD.bazel @@ -181,13 +181,14 @@ py_gapic_assembly_pkg( ############################################################################## # PHP +# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "php_gapic_assembly_pkg", - "php_gapic_library", - "php_grpc_library", - "php_proto_library", + php_gapic_assembly_pkg = "php_gapic_assembly_pkg2", + php_gapic_library = "php_gapic_library2", + php_grpc_library = "php_grpc_library2", + php_proto_library = "php_proto_library2", ) php_proto_library( @@ -203,11 +204,8 @@ php_grpc_library( php_gapic_library( name = "osconfig_php_gapic", - src = ":osconfig_proto_with_info", - gapic_yaml = "osconfig_gapic.yaml", + srcs = [":osconfig_proto_with_info"], grpc_service_config = "osconfig_grpc_service_config.json", - package = "google.cloud.osconfig.v1beta", - service_yaml = "osconfig_v1beta.yaml", deps = [ ":osconfig_php_grpc", ":osconfig_php_proto",