From 5920d376e8771e7dd245a0d1d0341952ca15e41d Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Thu, 25 Jun 2020 12:49:04 -0700
Subject: [PATCH] fix: combine billing/v1 grpc_service_config files

This combines the cloud_catalog_grpc_service_config.json methodConfig(s)
with the cloud_billing_grpc_service_config.json, and removes the
cloud_catalog_grpc_service_config.json file.

PiperOrigin-RevId: 318328852
---
 .../v1/cloud_billing_grpc_service_config.json   | 13 +++++++++++++
 .../v1/cloud_catalog_grpc_service_config.json   | 17 -----------------
 2 files changed, 13 insertions(+), 17 deletions(-)
 delete mode 100644 google/cloud/billing/v1/cloud_catalog_grpc_service_config.json

diff --git a/google/cloud/billing/v1/cloud_billing_grpc_service_config.json b/google/cloud/billing/v1/cloud_billing_grpc_service_config.json
index c78eb4d6..b39f3305 100644
--- a/google/cloud/billing/v1/cloud_billing_grpc_service_config.json
+++ b/google/cloud/billing/v1/cloud_billing_grpc_service_config.json
@@ -59,6 +59,19 @@
           "UNAVAILABLE"
         ]
       }
+    },
+    {
+      "name": [
+        {
+          "service": "google.cloud.billing.v1.CloudCatalog",
+          "method": "ListServices"
+        },
+        {
+          "service": "google.cloud.billing.v1.CloudCatalog",
+          "method": "ListSkus"
+        }
+      ],
+      "timeout": "60s"
     }
   ]
 }
diff --git a/google/cloud/billing/v1/cloud_catalog_grpc_service_config.json b/google/cloud/billing/v1/cloud_catalog_grpc_service_config.json
deleted file mode 100644
index 188fd047..00000000
--- a/google/cloud/billing/v1/cloud_catalog_grpc_service_config.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "methodConfig": [
-    {
-      "name": [
-        {
-          "service": "google.cloud.billing.v1.CloudCatalog",
-          "method": "ListServices"
-        },
-        {
-          "service": "google.cloud.billing.v1.CloudCatalog",
-          "method": "ListSkus"
-        }
-      ],
-      "timeout": "60s"
-    }
-  ]
-}