build: correct yaml file name to be picked by GCP developer experience team for client library generation

PiperOrigin-RevId: 626046772

2 files changed, 18 insertions, 20 deletions

diff --git a/google/shopping/merchant/conversions/v1beta/BUILD.bazel b/google/shopping/merchant/conversions/v1beta/BUILD.bazel
index 5c12ec8c5..74a0ff595 100644
--- a/google/shopping/merchant/conversions/v1beta/BUILD.bazel
+++ b/google/shopping/merchant/conversions/v1beta/BUILD.bazel
@@ -75,7 +75,7 @@ java_gapic_library(
     gapic_yaml = None,
     grpc_service_config = "conversions_grpc_service_config.json",
     rest_numeric_enums = True,
-    service_yaml = "merchantapi.yaml",
+    service_yaml = "merchantapi_v1beta.yaml",
     test_deps = [
         ":conversions_java_grpc",
     ],
@@ -98,6 +98,7 @@ java_gapic_test(
 # Open Source Packages
 java_gapic_assembly_gradle_pkg(
     name = "google-cloud-merchant-conversions-v1beta-java",
+    include_samples = True,
     transport = "grpc+rest",
     deps = [
         ":conversions_java_gapic",
@@ -105,7 +106,6 @@ java_gapic_assembly_gradle_pkg(
         ":conversions_java_proto",
         ":conversions_proto",
     ],
-    include_samples = True,
 )
 
 ##############################################################################
@@ -137,7 +137,7 @@ go_gapic_library(
     metadata = True,
     release_level = "beta",
     rest_numeric_enums = True,
-    service_yaml = "merchantapi.yaml",
+    service_yaml = "merchantapi_v1beta.yaml",
     transport = "grpc+rest",
     deps = [
         ":conversions_go_proto",
@@ -149,9 +149,9 @@ go_gapic_assembly_pkg(
     name = "gapi-cloud-merchant-conversions-v1beta-go",
     deps = [
         ":conversions_go_gapic",
-        ":conversions_go_gapic_srcjar-test.srcjar",
         ":conversions_go_gapic_srcjar-metadata.srcjar",
         ":conversions_go_gapic_srcjar-snippets.srcjar",
+        ":conversions_go_gapic_srcjar-test.srcjar",
         ":conversions_go_proto",
     ],
 )
@@ -171,13 +171,14 @@ py_gapic_library(
     name = "conversions_py_gapic",
     srcs = [":conversions_proto"],
     grpc_service_config = "conversions_grpc_service_config.json",
-    rest_numeric_enums = True,
-    service_yaml = "merchantapi.yaml",
-    transport = "grpc+rest",
-    deps = [],
     opt_args = [
-        "python-gapic-namespace=google.shopping",
         "python-gapic-name=merchant_conversions",
+        "python-gapic-namespace=google.shopping",
+    ],
+    rest_numeric_enums = True,
+    service_yaml = "merchantapi_v1beta.yaml",
+    transport = "grpc+rest",
+    deps = [
     ],
 )
 
@@ -219,9 +220,9 @@ php_gapic_library(
     name = "conversions_php_gapic",
     srcs = [":conversions_proto_with_info"],
     grpc_service_config = "conversions_grpc_service_config.json",
-    rest_numeric_enums = True,
     migration_mode = "NEW_SURFACE_ONLY",
-    service_yaml = "merchantapi.yaml",
+    rest_numeric_enums = True,
+    service_yaml = "merchantapi_v1beta.yaml",
     transport = "grpc+rest",
     deps = [
         ":conversions_php_proto",
@@ -255,7 +256,7 @@ nodejs_gapic_library(
     grpc_service_config = "conversions_grpc_service_config.json",
     package = "google.shopping.merchant.conversions.v1beta",
     rest_numeric_enums = True,
-    service_yaml = "merchantapi.yaml",
+    service_yaml = "merchantapi_v1beta.yaml",
     transport = "grpc+rest",
     deps = [],
 )
@@ -274,8 +275,8 @@ nodejs_gapic_assembly_pkg(
 # buildifier: disable=same-origin-load
 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",
 )
@@ -294,12 +295,10 @@ ruby_grpc_library(
 ruby_cloud_gapic_library(
     name = "conversions_ruby_gapic",
     srcs = [":conversions_proto_with_info"],
-    extra_protoc_parameters = [
-        "ruby-cloud-gem-name=google-cloud-merchant-conversions-v1beta",
-    ],
+    extra_protoc_parameters = ["ruby-cloud-gem-name=google-cloud-merchant-conversions-v1beta"],
     grpc_service_config = "conversions_grpc_service_config.json",
     rest_numeric_enums = True,
-    service_yaml = "merchantapi.yaml",
+    service_yaml = "merchantapi_v1beta.yaml",
     transport = "grpc+rest",
     deps = [
         ":conversions_ruby_grpc",
@@ -331,7 +330,6 @@ load(
 
 csharp_proto_library(
     name = "conversions_csharp_proto",
-    extra_opts = [],
     deps = [":conversions_proto"],
 )
 
@@ -347,7 +345,7 @@ csharp_gapic_library(
     common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
     grpc_service_config = "conversions_grpc_service_config.json",
     rest_numeric_enums = True,
-    service_yaml = "merchantapi.yaml",
+    service_yaml = "merchantapi_v1beta.yaml",
     transport = "grpc+rest",
     deps = [
         ":conversions_csharp_grpc",
@@ -385,4 +383,4 @@ cc_grpc_library(
     srcs = [":conversions_proto"],
     grpc_only = True,
     deps = [":conversions_cc_proto"],
-)
\ No newline at end of file
+)
diff --git a/google/shopping/merchant/conversions/v1beta/merchantapi.yaml b/google/shopping/merchant/conversions/v1beta/merchantapi_v1beta.yaml
index 957d1e5e3..957d1e5e3 100644
--- a/google/shopping/merchant/conversions/v1beta/merchantapi.yaml
+++ b/google/shopping/merchant/conversions/v1beta/merchantapi_v1beta.yaml