From 697949ef41ccc010f3fe221902699bbcf5ef0763 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 3 Jun 2020 12:10:06 -0700 Subject: [PATCH] fix: restore retry config for deleteCluster, deleteNode (#166) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/b94bacd6-05ee-45c2-be4d-b0f667030fab/targets PiperOrigin-RevId: 312088359 Source-Link: https://github.com/googleapis/googleapis/commit/5a90d467aa65e7f038f87585e8fbb45d74475e7c --- .../container/v1/ClusterManagerClient.java | 445 ++++++------ .../container/v1/ClusterManagerSettings.java | 46 +- .../cloud/container/v1/package-info.java | 3 +- .../container/v1/stub/ClusterManagerStub.java | 16 +- .../v1/stub/ClusterManagerStubSettings.java | 100 +-- .../v1/stub/GrpcClusterManagerStub.java | 120 ++-- .../v1/ClusterManagerClientTest.java | 652 +++++++++--------- synth.metadata | 4 +- 8 files changed, 694 insertions(+), 692 deletions(-) diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java index a1cc9dec..c27a944f 100644 --- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java +++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java @@ -90,7 +90,8 @@ * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) { * String projectId = ""; * String zone = ""; - * ListClustersResponse response = clusterManagerClient.listClusters(projectId, zone); + * String clusterId = ""; + * Operation response = clusterManagerClient.deleteCluster(projectId, zone, clusterId); * } * * @@ -199,6 +200,227 @@ public ClusterManagerStub getStub() { return stub; } + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes the cluster, including the Kubernetes endpoint and all worker nodes. + * + *

Firewalls and routes that were configured during cluster creation are also deleted. + * + *

Other Google Compute Engine resources that might be in use by the cluster, such as load + * balancer resources, are not deleted if they weren't present when the cluster was initially + * created. + * + *

Sample code: + * + * 


+   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+   *   String projectId = "";
+   *   String zone = "";
+   *   String clusterId = "";
+   *   Operation response = clusterManagerClient.deleteCluster(projectId, zone, clusterId);
+   * }
+   *
+ * + * @param projectId Deprecated. The Google Developers Console [project ID or project + * number](https://support.google.com/cloud/answer/6158840). This field has been deprecated + * and replaced by the name field. + * @param zone Deprecated. The name of the Google Compute Engine + * [zone](https://cloud.google.com/compute/docs/zones#available) in which the cluster resides. + * This field has been deprecated and replaced by the name field. + * @param clusterId Deprecated. The name of the cluster to delete. This field has been deprecated + * and replaced by the name field. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Operation deleteCluster(String projectId, String zone, String clusterId) { + DeleteClusterRequest request = + DeleteClusterRequest.newBuilder() + .setProjectId(projectId) + .setZone(zone) + .setClusterId(clusterId) + .build(); + return deleteCluster(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes the cluster, including the Kubernetes endpoint and all worker nodes. + * + *

Firewalls and routes that were configured during cluster creation are also deleted. + * + *

Other Google Compute Engine resources that might be in use by the cluster, such as load + * balancer resources, are not deleted if they weren't present when the cluster was initially + * created. + * + *

Sample code: + * + * 


+   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+   *   String name = "";
+   *   Operation response = clusterManagerClient.deleteCluster(name);
+   * }
+   *
+ * + * @param name The name (project, location, cluster) of the cluster to delete. Specified in the + * format `projects/*/locations/*/clusters/*`. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Operation deleteCluster(String name) { + DeleteClusterRequest request = DeleteClusterRequest.newBuilder().setName(name).build(); + return deleteCluster(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes the cluster, including the Kubernetes endpoint and all worker nodes. + * + *

Firewalls and routes that were configured during cluster creation are also deleted. + * + *

Other Google Compute Engine resources that might be in use by the cluster, such as load + * balancer resources, are not deleted if they weren't present when the cluster was initially + * created. + * + *

Sample code: + * + * 


+   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+   *   DeleteClusterRequest request = DeleteClusterRequest.newBuilder().build();
+   *   Operation response = clusterManagerClient.deleteCluster(request);
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Operation deleteCluster(DeleteClusterRequest request) { + return deleteClusterCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes the cluster, including the Kubernetes endpoint and all worker nodes. + * + *

Firewalls and routes that were configured during cluster creation are also deleted. + * + *

Other Google Compute Engine resources that might be in use by the cluster, such as load + * balancer resources, are not deleted if they weren't present when the cluster was initially + * created. + * + *

Sample code: + * + * 


+   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+   *   DeleteClusterRequest request = DeleteClusterRequest.newBuilder().build();
+   *   ApiFuture<Operation> future = clusterManagerClient.deleteClusterCallable().futureCall(request);
+   *   // Do something
+   *   Operation response = future.get();
+   * }
+   *
+ */ + public final UnaryCallable deleteClusterCallable() { + return stub.deleteClusterCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a node pool from a cluster. + * + *

Sample code: + * + * 


+   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+   *   String projectId = "";
+   *   String zone = "";
+   *   String clusterId = "";
+   *   String nodePoolId = "";
+   *   Operation response = clusterManagerClient.deleteNodePool(projectId, zone, clusterId, nodePoolId);
+   * }
+   *
+ * + * @param projectId Deprecated. The Google Developers Console [project ID or project + * number](https://developers.google.com/console/help/new/#projectnumber). This field has been + * deprecated and replaced by the name field. + * @param zone Deprecated. The name of the Google Compute Engine + * [zone](https://cloud.google.com/compute/docs/zones#available) in which the cluster resides. + * This field has been deprecated and replaced by the name field. + * @param clusterId Deprecated. The name of the cluster. This field has been deprecated and + * replaced by the name field. + * @param nodePoolId Deprecated. The name of the node pool to delete. This field has been + * deprecated and replaced by the name field. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Operation deleteNodePool( + String projectId, String zone, String clusterId, String nodePoolId) { + DeleteNodePoolRequest request = + DeleteNodePoolRequest.newBuilder() + .setProjectId(projectId) + .setZone(zone) + .setClusterId(clusterId) + .setNodePoolId(nodePoolId) + .build(); + return deleteNodePool(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a node pool from a cluster. + * + *

Sample code: + * + * 


+   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+   *   String name = "";
+   *   Operation response = clusterManagerClient.deleteNodePool(name);
+   * }
+   *
+ * + * @param name The name (project, location, cluster, node pool id) of the node pool to delete. + * Specified in the format `projects/*/locations/*/clusters/*/nodePools/*`. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Operation deleteNodePool(String name) { + DeleteNodePoolRequest request = DeleteNodePoolRequest.newBuilder().setName(name).build(); + return deleteNodePool(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a node pool from a cluster. + * + *

Sample code: + * + * 


+   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+   *   DeleteNodePoolRequest request = DeleteNodePoolRequest.newBuilder().build();
+   *   Operation response = clusterManagerClient.deleteNodePool(request);
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Operation deleteNodePool(DeleteNodePoolRequest request) { + return deleteNodePoolCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a node pool from a cluster. + * + *

Sample code: + * + * 


+   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+   *   DeleteNodePoolRequest request = DeleteNodePoolRequest.newBuilder().build();
+   *   ApiFuture<Operation> future = clusterManagerClient.deleteNodePoolCallable().futureCall(request);
+   *   // Do something
+   *   Operation response = future.get();
+   * }
+   *
+ */ + public final UnaryCallable deleteNodePoolCallable() { + return stub.deleteNodePoolCallable(); + } + // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Lists all clusters owned by a project in either the specified zone or all zones. @@ -1380,126 +1602,6 @@ public final UnaryCallable setMasterAuthCallabl return stub.setMasterAuthCallable(); } - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes the cluster, including the Kubernetes endpoint and all worker nodes. - * - *

Firewalls and routes that were configured during cluster creation are also deleted. - * - *

Other Google Compute Engine resources that might be in use by the cluster, such as load - * balancer resources, are not deleted if they weren't present when the cluster was initially - * created. - * - *

Sample code: - * - * 


-   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
-   *   String projectId = "";
-   *   String zone = "";
-   *   String clusterId = "";
-   *   Operation response = clusterManagerClient.deleteCluster(projectId, zone, clusterId);
-   * }
-   *
- * - * @param projectId Deprecated. The Google Developers Console [project ID or project - * number](https://support.google.com/cloud/answer/6158840). This field has been deprecated - * and replaced by the name field. - * @param zone Deprecated. The name of the Google Compute Engine - * [zone](https://cloud.google.com/compute/docs/zones#available) in which the cluster resides. - * This field has been deprecated and replaced by the name field. - * @param clusterId Deprecated. The name of the cluster to delete. This field has been deprecated - * and replaced by the name field. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final Operation deleteCluster(String projectId, String zone, String clusterId) { - DeleteClusterRequest request = - DeleteClusterRequest.newBuilder() - .setProjectId(projectId) - .setZone(zone) - .setClusterId(clusterId) - .build(); - return deleteCluster(request); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes the cluster, including the Kubernetes endpoint and all worker nodes. - * - *

Firewalls and routes that were configured during cluster creation are also deleted. - * - *

Other Google Compute Engine resources that might be in use by the cluster, such as load - * balancer resources, are not deleted if they weren't present when the cluster was initially - * created. - * - *

Sample code: - * - * 


-   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
-   *   String name = "";
-   *   Operation response = clusterManagerClient.deleteCluster(name);
-   * }
-   *
- * - * @param name The name (project, location, cluster) of the cluster to delete. Specified in the - * format `projects/*/locations/*/clusters/*`. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final Operation deleteCluster(String name) { - DeleteClusterRequest request = DeleteClusterRequest.newBuilder().setName(name).build(); - return deleteCluster(request); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes the cluster, including the Kubernetes endpoint and all worker nodes. - * - *

Firewalls and routes that were configured during cluster creation are also deleted. - * - *

Other Google Compute Engine resources that might be in use by the cluster, such as load - * balancer resources, are not deleted if they weren't present when the cluster was initially - * created. - * - *

Sample code: - * - * 


-   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
-   *   DeleteClusterRequest request = DeleteClusterRequest.newBuilder().build();
-   *   Operation response = clusterManagerClient.deleteCluster(request);
-   * }
-   *
- * - * @param request The request object containing all of the parameters for the API call. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final Operation deleteCluster(DeleteClusterRequest request) { - return deleteClusterCallable().call(request); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes the cluster, including the Kubernetes endpoint and all worker nodes. - * - *

Firewalls and routes that were configured during cluster creation are also deleted. - * - *

Other Google Compute Engine resources that might be in use by the cluster, such as load - * balancer resources, are not deleted if they weren't present when the cluster was initially - * created. - * - *

Sample code: - * - * 


-   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
-   *   DeleteClusterRequest request = DeleteClusterRequest.newBuilder().build();
-   *   ApiFuture<Operation> future = clusterManagerClient.deleteClusterCallable().futureCall(request);
-   *   // Do something
-   *   Operation response = future.get();
-   * }
-   *
- */ - public final UnaryCallable deleteClusterCallable() { - return stub.deleteClusterCallable(); - } - // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Lists all operations in a project in a specific zone or all zones. @@ -2134,107 +2236,6 @@ public final UnaryCallable createNodePoolCalla return stub.createNodePoolCallable(); } - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes a node pool from a cluster. - * - *

Sample code: - * - * 


-   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
-   *   String projectId = "";
-   *   String zone = "";
-   *   String clusterId = "";
-   *   String nodePoolId = "";
-   *   Operation response = clusterManagerClient.deleteNodePool(projectId, zone, clusterId, nodePoolId);
-   * }
-   *
- * - * @param projectId Deprecated. The Google Developers Console [project ID or project - * number](https://developers.google.com/console/help/new/#projectnumber). This field has been - * deprecated and replaced by the name field. - * @param zone Deprecated. The name of the Google Compute Engine - * [zone](https://cloud.google.com/compute/docs/zones#available) in which the cluster resides. - * This field has been deprecated and replaced by the name field. - * @param clusterId Deprecated. The name of the cluster. This field has been deprecated and - * replaced by the name field. - * @param nodePoolId Deprecated. The name of the node pool to delete. This field has been - * deprecated and replaced by the name field. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final Operation deleteNodePool( - String projectId, String zone, String clusterId, String nodePoolId) { - DeleteNodePoolRequest request = - DeleteNodePoolRequest.newBuilder() - .setProjectId(projectId) - .setZone(zone) - .setClusterId(clusterId) - .setNodePoolId(nodePoolId) - .build(); - return deleteNodePool(request); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes a node pool from a cluster. - * - *

Sample code: - * - * 


-   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
-   *   String name = "";
-   *   Operation response = clusterManagerClient.deleteNodePool(name);
-   * }
-   *
- * - * @param name The name (project, location, cluster, node pool id) of the node pool to delete. - * Specified in the format `projects/*/locations/*/clusters/*/nodePools/*`. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final Operation deleteNodePool(String name) { - DeleteNodePoolRequest request = DeleteNodePoolRequest.newBuilder().setName(name).build(); - return deleteNodePool(request); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes a node pool from a cluster. - * - *

Sample code: - * - * 


-   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
-   *   DeleteNodePoolRequest request = DeleteNodePoolRequest.newBuilder().build();
-   *   Operation response = clusterManagerClient.deleteNodePool(request);
-   * }
-   *
- * - * @param request The request object containing all of the parameters for the API call. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final Operation deleteNodePool(DeleteNodePoolRequest request) { - return deleteNodePoolCallable().call(request); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes a node pool from a cluster. - * - *

Sample code: - * - * 


-   * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
-   *   DeleteNodePoolRequest request = DeleteNodePoolRequest.newBuilder().build();
-   *   ApiFuture<Operation> future = clusterManagerClient.deleteNodePoolCallable().futureCall(request);
-   *   // Do something
-   *   Operation response = future.get();
-   * }
-   *
- */ - public final UnaryCallable deleteNodePoolCallable() { - return stub.deleteNodePoolCallable(); - } - // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Rolls back a previously Aborted or Failed NodePool upgrade. This makes no changes if the last diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java index de7f713a..53df6b43 100644 --- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java +++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java @@ -88,16 +88,16 @@ *

The builder of this class is recursive, so contained classes are themselves builders. When * build() is called, the tree of builders is called to create the complete settings object. * - *

For example, to set the total timeout of listClusters to 30 seconds: + *

For example, to set the total timeout of deleteCluster to 30 seconds: * * 

  * 
  * ClusterManagerSettings.Builder clusterManagerSettingsBuilder =
  *     ClusterManagerSettings.newBuilder();
  * clusterManagerSettingsBuilder
- *     .listClustersSettings()
+ *     .deleteClusterSettings()
  *     .setRetrySettings(
- *         clusterManagerSettingsBuilder.listClustersSettings().getRetrySettings().toBuilder()
+ *         clusterManagerSettingsBuilder.deleteClusterSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * ClusterManagerSettings clusterManagerSettings = clusterManagerSettingsBuilder.build();
@@ -107,6 +107,16 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class ClusterManagerSettings extends ClientSettings {
+  /** Returns the object with the settings used for calls to deleteCluster. */
+  public UnaryCallSettings deleteClusterSettings() {
+    return ((ClusterManagerStubSettings) getStubSettings()).deleteClusterSettings();
+  }
+
+  /** Returns the object with the settings used for calls to deleteNodePool. */
+  public UnaryCallSettings deleteNodePoolSettings() {
+    return ((ClusterManagerStubSettings) getStubSettings()).deleteNodePoolSettings();
+  }
+
   /** Returns the object with the settings used for calls to listClusters. */
   public UnaryCallSettings listClustersSettings() {
     return ((ClusterManagerStubSettings) getStubSettings()).listClustersSettings();
@@ -168,11 +178,6 @@ public UnaryCallSettings setMasterAuthSettings(
     return ((ClusterManagerStubSettings) getStubSettings()).setMasterAuthSettings();
   }
 
-  /** Returns the object with the settings used for calls to deleteCluster. */
-  public UnaryCallSettings deleteClusterSettings() {
-    return ((ClusterManagerStubSettings) getStubSettings()).deleteClusterSettings();
-  }
-
   /** Returns the object with the settings used for calls to listOperations. */
   public UnaryCallSettings listOperationsSettings() {
     return ((ClusterManagerStubSettings) getStubSettings()).listOperationsSettings();
@@ -208,11 +213,6 @@ public UnaryCallSettings createNodePoolSetting
     return ((ClusterManagerStubSettings) getStubSettings()).createNodePoolSettings();
   }
 
-  /** Returns the object with the settings used for calls to deleteNodePool. */
-  public UnaryCallSettings deleteNodePoolSettings() {
-    return ((ClusterManagerStubSettings) getStubSettings()).deleteNodePoolSettings();
-  }
-
   /** Returns the object with the settings used for calls to rollbackNodePoolUpgrade. */
   public UnaryCallSettings
       rollbackNodePoolUpgradeSettings() {
@@ -366,6 +366,16 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
+    /** Returns the builder for the settings used for calls to deleteCluster. */
+    public UnaryCallSettings.Builder deleteClusterSettings() {
+      return getStubSettingsBuilder().deleteClusterSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to deleteNodePool. */
+    public UnaryCallSettings.Builder deleteNodePoolSettings() {
+      return getStubSettingsBuilder().deleteNodePoolSettings();
+    }
+
     /** Returns the builder for the settings used for calls to listClusters. */
     public UnaryCallSettings.Builder
         listClustersSettings() {
@@ -430,11 +440,6 @@ public UnaryCallSettings.Builder setMasterAuthS
       return getStubSettingsBuilder().setMasterAuthSettings();
     }
 
-    /** Returns the builder for the settings used for calls to deleteCluster. */
-    public UnaryCallSettings.Builder deleteClusterSettings() {
-      return getStubSettingsBuilder().deleteClusterSettings();
-    }
-
     /** Returns the builder for the settings used for calls to listOperations. */
     public UnaryCallSettings.Builder
         listOperationsSettings() {
@@ -473,11 +478,6 @@ public UnaryCallSettings.Builder createNodePoo
       return getStubSettingsBuilder().createNodePoolSettings();
     }
 
-    /** Returns the builder for the settings used for calls to deleteNodePool. */
-    public UnaryCallSettings.Builder deleteNodePoolSettings() {
-      return getStubSettingsBuilder().deleteNodePoolSettings();
-    }
-
     /** Returns the builder for the settings used for calls to rollbackNodePoolUpgrade. */
     public UnaryCallSettings.Builder
         rollbackNodePoolUpgradeSettings() {
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/package-info.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/package-info.java
index 590986dc..c9bf9d50 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/package-info.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/package-info.java
@@ -30,7 +30,8 @@
  * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
  *   String projectId = "";
  *   String zone = "";
- *   ListClustersResponse response = clusterManagerClient.listClusters(projectId, zone);
+ *   String clusterId = "";
+ *   Operation response = clusterManagerClient.deleteCluster(projectId, zone, clusterId);
  * }
  * 
  *
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java index 2b0757ca..9367be17 100644 --- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java +++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java @@ -72,6 +72,14 @@ @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public abstract class ClusterManagerStub implements BackgroundResource { + public UnaryCallable deleteClusterCallable() { + throw new UnsupportedOperationException("Not implemented: deleteClusterCallable()"); + } + + public UnaryCallable deleteNodePoolCallable() { + throw new UnsupportedOperationException("Not implemented: deleteNodePoolCallable()"); + } + public UnaryCallable listClustersCallable() { throw new UnsupportedOperationException("Not implemented: listClustersCallable()"); } @@ -120,10 +128,6 @@ public UnaryCallable setMasterAuthCallable() { throw new UnsupportedOperationException("Not implemented: setMasterAuthCallable()"); } - public UnaryCallable deleteClusterCallable() { - throw new UnsupportedOperationException("Not implemented: deleteClusterCallable()"); - } - public UnaryCallable listOperationsCallable() { throw new UnsupportedOperationException("Not implemented: listOperationsCallable()"); } @@ -152,10 +156,6 @@ public UnaryCallable createNodePoolCallable() throw new UnsupportedOperationException("Not implemented: createNodePoolCallable()"); } - public UnaryCallable deleteNodePoolCallable() { - throw new UnsupportedOperationException("Not implemented: deleteNodePoolCallable()"); - } - public UnaryCallable rollbackNodePoolUpgradeCallable() { throw new UnsupportedOperationException("Not implemented: rollbackNodePoolUpgradeCallable()"); diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java index 358e92fa..e559243d 100644 --- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java +++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java @@ -104,16 +104,16 @@ *

The builder of this class is recursive, so contained classes are themselves builders. When * build() is called, the tree of builders is called to create the complete settings object. * - *

For example, to set the total timeout of listClusters to 30 seconds: + *

For example, to set the total timeout of deleteCluster to 30 seconds: * * 

  * 
  * ClusterManagerStubSettings.Builder clusterManagerSettingsBuilder =
  *     ClusterManagerStubSettings.newBuilder();
  * clusterManagerSettingsBuilder
- *     .listClustersSettings()
+ *     .deleteClusterSettings()
  *     .setRetrySettings(
- *         clusterManagerSettingsBuilder.listClustersSettings().getRetrySettings().toBuilder()
+ *         clusterManagerSettingsBuilder.deleteClusterSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * ClusterManagerStubSettings clusterManagerSettings = clusterManagerSettingsBuilder.build();
@@ -127,6 +127,8 @@ public class ClusterManagerStubSettings extends StubSettings DEFAULT_SERVICE_SCOPES =
       ImmutableList.builder().add("https://www.googleapis.com/auth/cloud-platform").build();
 
+  private final UnaryCallSettings deleteClusterSettings;
+  private final UnaryCallSettings deleteNodePoolSettings;
   private final UnaryCallSettings listClustersSettings;
   private final UnaryCallSettings getClusterSettings;
   private final UnaryCallSettings createClusterSettings;
@@ -141,7 +143,6 @@ public class ClusterManagerStubSettings extends StubSettings setLocationsSettings;
   private final UnaryCallSettings updateMasterSettings;
   private final UnaryCallSettings setMasterAuthSettings;
-  private final UnaryCallSettings deleteClusterSettings;
   private final UnaryCallSettings
       listOperationsSettings;
   private final UnaryCallSettings getOperationSettings;
@@ -151,7 +152,6 @@ public class ClusterManagerStubSettings extends StubSettings getNodePoolSettings;
   private final UnaryCallSettings createNodePoolSettings;
-  private final UnaryCallSettings deleteNodePoolSettings;
   private final UnaryCallSettings
       rollbackNodePoolUpgradeSettings;
   private final UnaryCallSettings
@@ -170,6 +170,16 @@ public class ClusterManagerStubSettings extends StubSettings
       listUsableSubnetworksSettings;
 
+  /** Returns the object with the settings used for calls to deleteCluster. */
+  public UnaryCallSettings deleteClusterSettings() {
+    return deleteClusterSettings;
+  }
+
+  /** Returns the object with the settings used for calls to deleteNodePool. */
+  public UnaryCallSettings deleteNodePoolSettings() {
+    return deleteNodePoolSettings;
+  }
+
   /** Returns the object with the settings used for calls to listClusters. */
   public UnaryCallSettings listClustersSettings() {
     return listClustersSettings;
@@ -231,11 +241,6 @@ public UnaryCallSettings setMasterAuthSettings(
     return setMasterAuthSettings;
   }
 
-  /** Returns the object with the settings used for calls to deleteCluster. */
-  public UnaryCallSettings deleteClusterSettings() {
-    return deleteClusterSettings;
-  }
-
   /** Returns the object with the settings used for calls to listOperations. */
   public UnaryCallSettings listOperationsSettings() {
     return listOperationsSettings;
@@ -271,11 +276,6 @@ public UnaryCallSettings createNodePoolSetting
     return createNodePoolSettings;
   }
 
-  /** Returns the object with the settings used for calls to deleteNodePool. */
-  public UnaryCallSettings deleteNodePoolSettings() {
-    return deleteNodePoolSettings;
-  }
-
   /** Returns the object with the settings used for calls to rollbackNodePoolUpgrade. */
   public UnaryCallSettings
       rollbackNodePoolUpgradeSettings() {
@@ -401,6 +401,8 @@ public Builder toBuilder() {
   protected ClusterManagerStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
+    deleteClusterSettings = settingsBuilder.deleteClusterSettings().build();
+    deleteNodePoolSettings = settingsBuilder.deleteNodePoolSettings().build();
     listClustersSettings = settingsBuilder.listClustersSettings().build();
     getClusterSettings = settingsBuilder.getClusterSettings().build();
     createClusterSettings = settingsBuilder.createClusterSettings().build();
@@ -413,7 +415,6 @@ protected ClusterManagerStubSettings(Builder settingsBuilder) throws IOException
     setLocationsSettings = settingsBuilder.setLocationsSettings().build();
     updateMasterSettings = settingsBuilder.updateMasterSettings().build();
     setMasterAuthSettings = settingsBuilder.setMasterAuthSettings().build();
-    deleteClusterSettings = settingsBuilder.deleteClusterSettings().build();
     listOperationsSettings = settingsBuilder.listOperationsSettings().build();
     getOperationSettings = settingsBuilder.getOperationSettings().build();
     cancelOperationSettings = settingsBuilder.cancelOperationSettings().build();
@@ -421,7 +422,6 @@ protected ClusterManagerStubSettings(Builder settingsBuilder) throws IOException
     listNodePoolsSettings = settingsBuilder.listNodePoolsSettings().build();
     getNodePoolSettings = settingsBuilder.getNodePoolSettings().build();
     createNodePoolSettings = settingsBuilder.createNodePoolSettings().build();
-    deleteNodePoolSettings = settingsBuilder.deleteNodePoolSettings().build();
     rollbackNodePoolUpgradeSettings = settingsBuilder.rollbackNodePoolUpgradeSettings().build();
     setNodePoolManagementSettings = settingsBuilder.setNodePoolManagementSettings().build();
     setLabelsSettings = settingsBuilder.setLabelsSettings().build();
@@ -503,6 +503,9 @@ public ApiFuture getFuturePagedResponse(
   public static class Builder extends StubSettings.Builder {
     private final ImmutableList> unaryMethodSettingsBuilders;
 
+    private final UnaryCallSettings.Builder deleteClusterSettings;
+    private final UnaryCallSettings.Builder
+        deleteNodePoolSettings;
     private final UnaryCallSettings.Builder
         listClustersSettings;
     private final UnaryCallSettings.Builder getClusterSettings;
@@ -521,7 +524,6 @@ public static class Builder extends StubSettings.Builder setLocationsSettings;
     private final UnaryCallSettings.Builder updateMasterSettings;
     private final UnaryCallSettings.Builder setMasterAuthSettings;
-    private final UnaryCallSettings.Builder deleteClusterSettings;
     private final UnaryCallSettings.Builder
         listOperationsSettings;
     private final UnaryCallSettings.Builder getOperationSettings;
@@ -533,8 +535,6 @@ public static class Builder extends StubSettings.Builder getNodePoolSettings;
     private final UnaryCallSettings.Builder
         createNodePoolSettings;
-    private final UnaryCallSettings.Builder
-        deleteNodePoolSettings;
     private final UnaryCallSettings.Builder
         rollbackNodePoolUpgradeSettings;
     private final UnaryCallSettings.Builder
@@ -598,6 +598,10 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
+      deleteClusterSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      deleteNodePoolSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       listClustersSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       getClusterSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -622,8 +626,6 @@ protected Builder(ClientContext clientContext) {
 
       setMasterAuthSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      deleteClusterSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       listOperationsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       getOperationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -638,8 +640,6 @@ protected Builder(ClientContext clientContext) {
 
       createNodePoolSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      deleteNodePoolSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       rollbackNodePoolUpgradeSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       setNodePoolManagementSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -663,6 +663,8 @@ protected Builder(ClientContext clientContext) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.>of(
+              deleteClusterSettings,
+              deleteNodePoolSettings,
               listClustersSettings,
               getClusterSettings,
               createClusterSettings,
@@ -675,7 +677,6 @@ protected Builder(ClientContext clientContext) {
               setLocationsSettings,
               updateMasterSettings,
               setMasterAuthSettings,
-              deleteClusterSettings,
               listOperationsSettings,
               getOperationSettings,
               cancelOperationSettings,
@@ -683,7 +684,6 @@ protected Builder(ClientContext clientContext) {
               listNodePoolsSettings,
               getNodePoolSettings,
               createNodePoolSettings,
-              deleteNodePoolSettings,
               rollbackNodePoolUpgradeSettings,
               setNodePoolManagementSettings,
               setLabelsSettings,
@@ -709,6 +709,16 @@ private static Builder createDefault() {
 
     private static Builder initDefaults(Builder builder) {
 
+      builder
+          .deleteClusterSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .deleteNodePoolSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
       builder
           .listClustersSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
@@ -769,11 +779,6 @@ private static Builder initDefaults(Builder builder) {
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
-      builder
-          .deleteClusterSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .listOperationsSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
@@ -809,11 +814,6 @@ private static Builder initDefaults(Builder builder) {
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
-      builder
-          .deleteNodePoolSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .rollbackNodePoolUpgradeSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
@@ -870,6 +870,8 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(ClusterManagerStubSettings settings) {
       super(settings);
 
+      deleteClusterSettings = settings.deleteClusterSettings.toBuilder();
+      deleteNodePoolSettings = settings.deleteNodePoolSettings.toBuilder();
       listClustersSettings = settings.listClustersSettings.toBuilder();
       getClusterSettings = settings.getClusterSettings.toBuilder();
       createClusterSettings = settings.createClusterSettings.toBuilder();
@@ -882,7 +884,6 @@ protected Builder(ClusterManagerStubSettings settings) {
       setLocationsSettings = settings.setLocationsSettings.toBuilder();
       updateMasterSettings = settings.updateMasterSettings.toBuilder();
       setMasterAuthSettings = settings.setMasterAuthSettings.toBuilder();
-      deleteClusterSettings = settings.deleteClusterSettings.toBuilder();
       listOperationsSettings = settings.listOperationsSettings.toBuilder();
       getOperationSettings = settings.getOperationSettings.toBuilder();
       cancelOperationSettings = settings.cancelOperationSettings.toBuilder();
@@ -890,7 +891,6 @@ protected Builder(ClusterManagerStubSettings settings) {
       listNodePoolsSettings = settings.listNodePoolsSettings.toBuilder();
       getNodePoolSettings = settings.getNodePoolSettings.toBuilder();
       createNodePoolSettings = settings.createNodePoolSettings.toBuilder();
-      deleteNodePoolSettings = settings.deleteNodePoolSettings.toBuilder();
       rollbackNodePoolUpgradeSettings = settings.rollbackNodePoolUpgradeSettings.toBuilder();
       setNodePoolManagementSettings = settings.setNodePoolManagementSettings.toBuilder();
       setLabelsSettings = settings.setLabelsSettings.toBuilder();
@@ -904,6 +904,8 @@ protected Builder(ClusterManagerStubSettings settings) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.>of(
+              deleteClusterSettings,
+              deleteNodePoolSettings,
               listClustersSettings,
               getClusterSettings,
               createClusterSettings,
@@ -916,7 +918,6 @@ protected Builder(ClusterManagerStubSettings settings) {
               setLocationsSettings,
               updateMasterSettings,
               setMasterAuthSettings,
-              deleteClusterSettings,
               listOperationsSettings,
               getOperationSettings,
               cancelOperationSettings,
@@ -924,7 +925,6 @@ protected Builder(ClusterManagerStubSettings settings) {
               listNodePoolsSettings,
               getNodePoolSettings,
               createNodePoolSettings,
-              deleteNodePoolSettings,
               rollbackNodePoolUpgradeSettings,
               setNodePoolManagementSettings,
               setLabelsSettings,
@@ -953,6 +953,16 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
+    /** Returns the builder for the settings used for calls to deleteCluster. */
+    public UnaryCallSettings.Builder deleteClusterSettings() {
+      return deleteClusterSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to deleteNodePool. */
+    public UnaryCallSettings.Builder deleteNodePoolSettings() {
+      return deleteNodePoolSettings;
+    }
+
     /** Returns the builder for the settings used for calls to listClusters. */
     public UnaryCallSettings.Builder
         listClustersSettings() {
@@ -1017,11 +1027,6 @@ public UnaryCallSettings.Builder setMasterAuthS
       return setMasterAuthSettings;
     }
 
-    /** Returns the builder for the settings used for calls to deleteCluster. */
-    public UnaryCallSettings.Builder deleteClusterSettings() {
-      return deleteClusterSettings;
-    }
-
     /** Returns the builder for the settings used for calls to listOperations. */
     public UnaryCallSettings.Builder
         listOperationsSettings() {
@@ -1060,11 +1065,6 @@ public UnaryCallSettings.Builder createNodePoo
       return createNodePoolSettings;
     }
 
-    /** Returns the builder for the settings used for calls to deleteNodePool. */
-    public UnaryCallSettings.Builder deleteNodePoolSettings() {
-      return deleteNodePoolSettings;
-    }
-
     /** Returns the builder for the settings used for calls to rollbackNodePoolUpgrade. */
     public UnaryCallSettings.Builder
         rollbackNodePoolUpgradeSettings() {
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
index 133fef89..f5d214cd 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
@@ -83,6 +83,24 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcClusterManagerStub extends ClusterManagerStub {
 
+  private static final MethodDescriptor
+      deleteClusterMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.container.v1.ClusterManager/DeleteCluster")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DeleteClusterRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      deleteNodePoolMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.container.v1.ClusterManager/DeleteNodePool")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DeleteNodePoolRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+              .build();
   private static final MethodDescriptor
       listClustersMethodDescriptor =
           MethodDescriptor.newBuilder()
@@ -187,15 +205,6 @@ public class GrpcClusterManagerStub extends ClusterManagerStub {
                   ProtoUtils.marshaller(SetMasterAuthRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor
-      deleteClusterMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.container.v1.ClusterManager/DeleteCluster")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(DeleteClusterRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
-              .build();
   private static final MethodDescriptor
       listOperationsMethodDescriptor =
           MethodDescriptor.newBuilder()
@@ -258,15 +267,6 @@ public class GrpcClusterManagerStub extends ClusterManagerStub {
                   ProtoUtils.marshaller(CreateNodePoolRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor
-      deleteNodePoolMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.container.v1.ClusterManager/DeleteNodePool")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(DeleteNodePoolRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
-              .build();
   private static final MethodDescriptor
       rollbackNodePoolUpgradeMethodDescriptor =
           MethodDescriptor.newBuilder()
@@ -359,6 +359,8 @@ public class GrpcClusterManagerStub extends ClusterManagerStub {
 
   private final BackgroundResource backgroundResources;
 
+  private final UnaryCallable deleteClusterCallable;
+  private final UnaryCallable deleteNodePoolCallable;
   private final UnaryCallable listClustersCallable;
   private final UnaryCallable getClusterCallable;
   private final UnaryCallable createClusterCallable;
@@ -372,7 +374,6 @@ public class GrpcClusterManagerStub extends ClusterManagerStub {
   private final UnaryCallable setLocationsCallable;
   private final UnaryCallable updateMasterCallable;
   private final UnaryCallable setMasterAuthCallable;
-  private final UnaryCallable deleteClusterCallable;
   private final UnaryCallable listOperationsCallable;
   private final UnaryCallable getOperationCallable;
   private final UnaryCallable cancelOperationCallable;
@@ -380,7 +381,6 @@ public class GrpcClusterManagerStub extends ClusterManagerStub {
   private final UnaryCallable listNodePoolsCallable;
   private final UnaryCallable getNodePoolCallable;
   private final UnaryCallable createNodePoolCallable;
-  private final UnaryCallable deleteNodePoolCallable;
   private final UnaryCallable
       rollbackNodePoolUpgradeCallable;
   private final UnaryCallable
@@ -438,6 +438,32 @@ protected GrpcClusterManagerStub(
       throws IOException {
     this.callableFactory = callableFactory;
 
+    GrpcCallSettings deleteClusterTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteClusterMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(DeleteClusterRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings deleteNodePoolTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteNodePoolMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(DeleteNodePoolRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings listClustersTransportSettings =
         GrpcCallSettings.newBuilder()
             .setMethodDescriptor(listClustersMethodDescriptor)
@@ -595,19 +621,6 @@ public Map extract(SetMasterAuthRequest request) {
                   }
                 })
             .build();
-    GrpcCallSettings deleteClusterTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(deleteClusterMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor() {
-                  @Override
-                  public Map extract(DeleteClusterRequest request) {
-                    ImmutableMap.Builder params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings
         listOperationsTransportSettings =
             GrpcCallSettings.newBuilder()
@@ -700,19 +713,6 @@ public Map extract(CreateNodePoolRequest request) {
                   }
                 })
             .build();
-    GrpcCallSettings deleteNodePoolTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(deleteNodePoolMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor() {
-                  @Override
-                  public Map extract(DeleteNodePoolRequest request) {
-                    ImmutableMap.Builder params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings
         rollbackNodePoolUpgradeTransportSettings =
             GrpcCallSettings.newBuilder()
@@ -848,6 +848,12 @@ public Map extract(ListUsableSubnetworksRequest request) {
                     })
                 .build();
 
+    this.deleteClusterCallable =
+        callableFactory.createUnaryCallable(
+            deleteClusterTransportSettings, settings.deleteClusterSettings(), clientContext);
+    this.deleteNodePoolCallable =
+        callableFactory.createUnaryCallable(
+            deleteNodePoolTransportSettings, settings.deleteNodePoolSettings(), clientContext);
     this.listClustersCallable =
         callableFactory.createUnaryCallable(
             listClustersTransportSettings, settings.listClustersSettings(), clientContext);
@@ -890,9 +896,6 @@ public Map extract(ListUsableSubnetworksRequest request) {
     this.setMasterAuthCallable =
         callableFactory.createUnaryCallable(
             setMasterAuthTransportSettings, settings.setMasterAuthSettings(), clientContext);
-    this.deleteClusterCallable =
-        callableFactory.createUnaryCallable(
-            deleteClusterTransportSettings, settings.deleteClusterSettings(), clientContext);
     this.listOperationsCallable =
         callableFactory.createUnaryCallable(
             listOperationsTransportSettings, settings.listOperationsSettings(), clientContext);
@@ -914,9 +917,6 @@ public Map extract(ListUsableSubnetworksRequest request) {
     this.createNodePoolCallable =
         callableFactory.createUnaryCallable(
             createNodePoolTransportSettings, settings.createNodePoolSettings(), clientContext);
-    this.deleteNodePoolCallable =
-        callableFactory.createUnaryCallable(
-            deleteNodePoolTransportSettings, settings.deleteNodePoolSettings(), clientContext);
     this.rollbackNodePoolUpgradeCallable =
         callableFactory.createUnaryCallable(
             rollbackNodePoolUpgradeTransportSettings,
@@ -966,6 +966,14 @@ public Map extract(ListUsableSubnetworksRequest request) {
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  public UnaryCallable deleteClusterCallable() {
+    return deleteClusterCallable;
+  }
+
+  public UnaryCallable deleteNodePoolCallable() {
+    return deleteNodePoolCallable;
+  }
+
   public UnaryCallable listClustersCallable() {
     return listClustersCallable;
   }
@@ -1014,10 +1022,6 @@ public UnaryCallable setMasterAuthCallable() {
     return setMasterAuthCallable;
   }
 
-  public UnaryCallable deleteClusterCallable() {
-    return deleteClusterCallable;
-  }
-
   public UnaryCallable listOperationsCallable() {
     return listOperationsCallable;
   }
@@ -1046,10 +1050,6 @@ public UnaryCallable createNodePoolCallable()
     return createNodePoolCallable;
   }
 
-  public UnaryCallable deleteNodePoolCallable() {
-    return deleteNodePoolCallable;
-  }
-
   public UnaryCallable
       rollbackNodePoolUpgradeCallable() {
     return rollbackNodePoolUpgradeCallable;
diff --git a/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java b/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java
index 2522bf17..75ef96ee 100644
--- a/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java
+++ b/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java
@@ -128,6 +128,268 @@ public void tearDown() throws Exception {
     client.close();
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void deleteClusterTest() {
+    String name = "name3373707";
+    String zone2 = "zone2-696322977";
+    String detail = "detail-1335224239";
+    String statusMessage = "statusMessage-239442758";
+    String selfLink = "selfLink-1691268851";
+    String targetLink = "targetLink-2084812312";
+    String location = "location1901043637";
+    String startTime = "startTime-1573145462";
+    String endTime = "endTime1725551537";
+    Operation expectedResponse =
+        Operation.newBuilder()
+            .setName(name)
+            .setZone(zone2)
+            .setDetail(detail)
+            .setStatusMessage(statusMessage)
+            .setSelfLink(selfLink)
+            .setTargetLink(targetLink)
+            .setLocation(location)
+            .setStartTime(startTime)
+            .setEndTime(endTime)
+            .build();
+    mockClusterManager.addResponse(expectedResponse);
+
+    String projectId = "projectId-1969970175";
+    String zone = "zone3744684";
+    String clusterId = "clusterId240280960";
+
+    Operation actualResponse = client.deleteCluster(projectId, zone, clusterId);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockClusterManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteClusterRequest actualRequest = (DeleteClusterRequest) actualRequests.get(0);
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(zone, actualRequest.getZone());
+    Assert.assertEquals(clusterId, actualRequest.getClusterId());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteClusterExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockClusterManager.addException(exception);
+
+    try {
+      String projectId = "projectId-1969970175";
+      String zone = "zone3744684";
+      String clusterId = "clusterId240280960";
+
+      client.deleteCluster(projectId, zone, clusterId);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteClusterTest2() {
+    String name = "name3373707";
+    String zone2 = "zone2-696322977";
+    String detail = "detail-1335224239";
+    String statusMessage = "statusMessage-239442758";
+    String selfLink = "selfLink-1691268851";
+    String targetLink = "targetLink-2084812312";
+    String location = "location1901043637";
+    String startTime = "startTime-1573145462";
+    String endTime = "endTime1725551537";
+    Operation expectedResponse =
+        Operation.newBuilder()
+            .setName(name)
+            .setZone(zone2)
+            .setDetail(detail)
+            .setStatusMessage(statusMessage)
+            .setSelfLink(selfLink)
+            .setTargetLink(targetLink)
+            .setLocation(location)
+            .setStartTime(startTime)
+            .setEndTime(endTime)
+            .build();
+    mockClusterManager.addResponse(expectedResponse);
+
+    String projectId = "projectId-1969970175";
+    String zone = "zone3744684";
+    String clusterId = "clusterId240280960";
+
+    Operation actualResponse = client.deleteCluster(projectId, zone, clusterId);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockClusterManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteClusterRequest actualRequest = (DeleteClusterRequest) actualRequests.get(0);
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(zone, actualRequest.getZone());
+    Assert.assertEquals(clusterId, actualRequest.getClusterId());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteClusterExceptionTest2() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockClusterManager.addException(exception);
+
+    try {
+      String projectId = "projectId-1969970175";
+      String zone = "zone3744684";
+      String clusterId = "clusterId240280960";
+
+      client.deleteCluster(projectId, zone, clusterId);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteNodePoolTest() {
+    String name = "name3373707";
+    String zone2 = "zone2-696322977";
+    String detail = "detail-1335224239";
+    String statusMessage = "statusMessage-239442758";
+    String selfLink = "selfLink-1691268851";
+    String targetLink = "targetLink-2084812312";
+    String location = "location1901043637";
+    String startTime = "startTime-1573145462";
+    String endTime = "endTime1725551537";
+    Operation expectedResponse =
+        Operation.newBuilder()
+            .setName(name)
+            .setZone(zone2)
+            .setDetail(detail)
+            .setStatusMessage(statusMessage)
+            .setSelfLink(selfLink)
+            .setTargetLink(targetLink)
+            .setLocation(location)
+            .setStartTime(startTime)
+            .setEndTime(endTime)
+            .build();
+    mockClusterManager.addResponse(expectedResponse);
+
+    String projectId = "projectId-1969970175";
+    String zone = "zone3744684";
+    String clusterId = "clusterId240280960";
+    String nodePoolId = "nodePoolId1043384033";
+
+    Operation actualResponse = client.deleteNodePool(projectId, zone, clusterId, nodePoolId);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockClusterManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteNodePoolRequest actualRequest = (DeleteNodePoolRequest) actualRequests.get(0);
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(zone, actualRequest.getZone());
+    Assert.assertEquals(clusterId, actualRequest.getClusterId());
+    Assert.assertEquals(nodePoolId, actualRequest.getNodePoolId());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteNodePoolExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockClusterManager.addException(exception);
+
+    try {
+      String projectId = "projectId-1969970175";
+      String zone = "zone3744684";
+      String clusterId = "clusterId240280960";
+      String nodePoolId = "nodePoolId1043384033";
+
+      client.deleteNodePool(projectId, zone, clusterId, nodePoolId);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteNodePoolTest2() {
+    String name = "name3373707";
+    String zone2 = "zone2-696322977";
+    String detail = "detail-1335224239";
+    String statusMessage = "statusMessage-239442758";
+    String selfLink = "selfLink-1691268851";
+    String targetLink = "targetLink-2084812312";
+    String location = "location1901043637";
+    String startTime = "startTime-1573145462";
+    String endTime = "endTime1725551537";
+    Operation expectedResponse =
+        Operation.newBuilder()
+            .setName(name)
+            .setZone(zone2)
+            .setDetail(detail)
+            .setStatusMessage(statusMessage)
+            .setSelfLink(selfLink)
+            .setTargetLink(targetLink)
+            .setLocation(location)
+            .setStartTime(startTime)
+            .setEndTime(endTime)
+            .build();
+    mockClusterManager.addResponse(expectedResponse);
+
+    String projectId = "projectId-1969970175";
+    String zone = "zone3744684";
+    String clusterId = "clusterId240280960";
+    String nodePoolId = "nodePoolId1043384033";
+
+    Operation actualResponse = client.deleteNodePool(projectId, zone, clusterId, nodePoolId);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockClusterManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteNodePoolRequest actualRequest = (DeleteNodePoolRequest) actualRequests.get(0);
+
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(zone, actualRequest.getZone());
+    Assert.assertEquals(clusterId, actualRequest.getClusterId());
+    Assert.assertEquals(nodePoolId, actualRequest.getNodePoolId());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteNodePoolExceptionTest2() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockClusterManager.addException(exception);
+
+    try {
+      String projectId = "projectId-1969970175";
+      String zone = "zone3744684";
+      String clusterId = "clusterId240280960";
+      String nodePoolId = "nodePoolId1043384033";
+
+      client.deleteNodePool(projectId, zone, clusterId, nodePoolId);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void listClustersTest() {
@@ -1176,141 +1438,7 @@ public void setAddonsConfigTest2() {
     Assert.assertEquals(projectId, actualRequest.getProjectId());
     Assert.assertEquals(zone, actualRequest.getZone());
     Assert.assertEquals(clusterId, actualRequest.getClusterId());
-    Assert.assertEquals(addonsConfig, actualRequest.getAddonsConfig());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void setAddonsConfigExceptionTest2() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockClusterManager.addException(exception);
-
-    try {
-      String projectId = "projectId-1969970175";
-      String zone = "zone3744684";
-      String clusterId = "clusterId240280960";
-      AddonsConfig addonsConfig = AddonsConfig.newBuilder().build();
-
-      client.setAddonsConfig(projectId, zone, clusterId, addonsConfig);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void setLocationsTest() {
-    String name = "name3373707";
-    String zone2 = "zone2-696322977";
-    String detail = "detail-1335224239";
-    String statusMessage = "statusMessage-239442758";
-    String selfLink = "selfLink-1691268851";
-    String targetLink = "targetLink-2084812312";
-    String location = "location1901043637";
-    String startTime = "startTime-1573145462";
-    String endTime = "endTime1725551537";
-    Operation expectedResponse =
-        Operation.newBuilder()
-            .setName(name)
-            .setZone(zone2)
-            .setDetail(detail)
-            .setStatusMessage(statusMessage)
-            .setSelfLink(selfLink)
-            .setTargetLink(targetLink)
-            .setLocation(location)
-            .setStartTime(startTime)
-            .setEndTime(endTime)
-            .build();
-    mockClusterManager.addResponse(expectedResponse);
-
-    String projectId = "projectId-1969970175";
-    String zone = "zone3744684";
-    String clusterId = "clusterId240280960";
-    List locations = new ArrayList<>();
-
-    Operation actualResponse = client.setLocations(projectId, zone, clusterId, locations);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockClusterManager.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    SetLocationsRequest actualRequest = (SetLocationsRequest) actualRequests.get(0);
-
-    Assert.assertEquals(projectId, actualRequest.getProjectId());
-    Assert.assertEquals(zone, actualRequest.getZone());
-    Assert.assertEquals(clusterId, actualRequest.getClusterId());
-    Assert.assertEquals(locations, actualRequest.getLocationsList());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void setLocationsExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockClusterManager.addException(exception);
-
-    try {
-      String projectId = "projectId-1969970175";
-      String zone = "zone3744684";
-      String clusterId = "clusterId240280960";
-      List locations = new ArrayList<>();
-
-      client.setLocations(projectId, zone, clusterId, locations);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void setLocationsTest2() {
-    String name = "name3373707";
-    String zone2 = "zone2-696322977";
-    String detail = "detail-1335224239";
-    String statusMessage = "statusMessage-239442758";
-    String selfLink = "selfLink-1691268851";
-    String targetLink = "targetLink-2084812312";
-    String location = "location1901043637";
-    String startTime = "startTime-1573145462";
-    String endTime = "endTime1725551537";
-    Operation expectedResponse =
-        Operation.newBuilder()
-            .setName(name)
-            .setZone(zone2)
-            .setDetail(detail)
-            .setStatusMessage(statusMessage)
-            .setSelfLink(selfLink)
-            .setTargetLink(targetLink)
-            .setLocation(location)
-            .setStartTime(startTime)
-            .setEndTime(endTime)
-            .build();
-    mockClusterManager.addResponse(expectedResponse);
-
-    String projectId = "projectId-1969970175";
-    String zone = "zone3744684";
-    String clusterId = "clusterId240280960";
-    List locations = new ArrayList<>();
-
-    Operation actualResponse = client.setLocations(projectId, zone, clusterId, locations);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockClusterManager.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    SetLocationsRequest actualRequest = (SetLocationsRequest) actualRequests.get(0);
-
-    Assert.assertEquals(projectId, actualRequest.getProjectId());
-    Assert.assertEquals(zone, actualRequest.getZone());
-    Assert.assertEquals(clusterId, actualRequest.getClusterId());
-    Assert.assertEquals(locations, actualRequest.getLocationsList());
+    Assert.assertEquals(addonsConfig, actualRequest.getAddonsConfig());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1319,7 +1447,7 @@ public void setLocationsTest2() {
 
   @Test
   @SuppressWarnings("all")
-  public void setLocationsExceptionTest2() throws Exception {
+  public void setAddonsConfigExceptionTest2() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockClusterManager.addException(exception);
 
@@ -1327,9 +1455,9 @@ public void setLocationsExceptionTest2() throws Exception {
       String projectId = "projectId-1969970175";
       String zone = "zone3744684";
       String clusterId = "clusterId240280960";
-      List locations = new ArrayList<>();
+      AddonsConfig addonsConfig = AddonsConfig.newBuilder().build();
 
-      client.setLocations(projectId, zone, clusterId, locations);
+      client.setAddonsConfig(projectId, zone, clusterId, addonsConfig);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1338,7 +1466,7 @@ public void setLocationsExceptionTest2() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void updateMasterTest() {
+  public void setLocationsTest() {
     String name = "name3373707";
     String zone2 = "zone2-696322977";
     String detail = "detail-1335224239";
@@ -1365,19 +1493,19 @@ public void updateMasterTest() {
     String projectId = "projectId-1969970175";
     String zone = "zone3744684";
     String clusterId = "clusterId240280960";
-    String masterVersion = "masterVersion-2139460613";
+    List locations = new ArrayList<>();
 
-    Operation actualResponse = client.updateMaster(projectId, zone, clusterId, masterVersion);
+    Operation actualResponse = client.setLocations(projectId, zone, clusterId, locations);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List actualRequests = mockClusterManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    UpdateMasterRequest actualRequest = (UpdateMasterRequest) actualRequests.get(0);
+    SetLocationsRequest actualRequest = (SetLocationsRequest) actualRequests.get(0);
 
     Assert.assertEquals(projectId, actualRequest.getProjectId());
     Assert.assertEquals(zone, actualRequest.getZone());
     Assert.assertEquals(clusterId, actualRequest.getClusterId());
-    Assert.assertEquals(masterVersion, actualRequest.getMasterVersion());
+    Assert.assertEquals(locations, actualRequest.getLocationsList());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1386,7 +1514,7 @@ public void updateMasterTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void updateMasterExceptionTest() throws Exception {
+  public void setLocationsExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockClusterManager.addException(exception);
 
@@ -1394,9 +1522,9 @@ public void updateMasterExceptionTest() throws Exception {
       String projectId = "projectId-1969970175";
       String zone = "zone3744684";
       String clusterId = "clusterId240280960";
-      String masterVersion = "masterVersion-2139460613";
+      List locations = new ArrayList<>();
 
-      client.updateMaster(projectId, zone, clusterId, masterVersion);
+      client.setLocations(projectId, zone, clusterId, locations);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1405,7 +1533,7 @@ public void updateMasterExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void updateMasterTest2() {
+  public void setLocationsTest2() {
     String name = "name3373707";
     String zone2 = "zone2-696322977";
     String detail = "detail-1335224239";
@@ -1432,19 +1560,19 @@ public void updateMasterTest2() {
     String projectId = "projectId-1969970175";
     String zone = "zone3744684";
     String clusterId = "clusterId240280960";
-    String masterVersion = "masterVersion-2139460613";
+    List locations = new ArrayList<>();
 
-    Operation actualResponse = client.updateMaster(projectId, zone, clusterId, masterVersion);
+    Operation actualResponse = client.setLocations(projectId, zone, clusterId, locations);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List actualRequests = mockClusterManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    UpdateMasterRequest actualRequest = (UpdateMasterRequest) actualRequests.get(0);
+    SetLocationsRequest actualRequest = (SetLocationsRequest) actualRequests.get(0);
 
     Assert.assertEquals(projectId, actualRequest.getProjectId());
     Assert.assertEquals(zone, actualRequest.getZone());
     Assert.assertEquals(clusterId, actualRequest.getClusterId());
-    Assert.assertEquals(masterVersion, actualRequest.getMasterVersion());
+    Assert.assertEquals(locations, actualRequest.getLocationsList());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1453,7 +1581,7 @@ public void updateMasterTest2() {
 
   @Test
   @SuppressWarnings("all")
-  public void updateMasterExceptionTest2() throws Exception {
+  public void setLocationsExceptionTest2() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockClusterManager.addException(exception);
 
@@ -1461,9 +1589,9 @@ public void updateMasterExceptionTest2() throws Exception {
       String projectId = "projectId-1969970175";
       String zone = "zone3744684";
       String clusterId = "clusterId240280960";
-      String masterVersion = "masterVersion-2139460613";
+      List locations = new ArrayList<>();
 
-      client.updateMaster(projectId, zone, clusterId, masterVersion);
+      client.setLocations(projectId, zone, clusterId, locations);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1472,9 +1600,9 @@ public void updateMasterExceptionTest2() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void setMasterAuthTest() {
+  public void updateMasterTest() {
     String name = "name3373707";
-    String zone = "zone3744684";
+    String zone2 = "zone2-696322977";
     String detail = "detail-1335224239";
     String statusMessage = "statusMessage-239442758";
     String selfLink = "selfLink-1691268851";
@@ -1485,7 +1613,7 @@ public void setMasterAuthTest() {
     Operation expectedResponse =
         Operation.newBuilder()
             .setName(name)
-            .setZone(zone)
+            .setZone(zone2)
             .setDetail(detail)
             .setStatusMessage(statusMessage)
             .setSelfLink(selfLink)
@@ -1496,20 +1624,22 @@ public void setMasterAuthTest() {
             .build();
     mockClusterManager.addResponse(expectedResponse);
 
-    SetMasterAuthRequest.Action action = SetMasterAuthRequest.Action.UNKNOWN;
-    MasterAuth update = MasterAuth.newBuilder().build();
-    SetMasterAuthRequest request =
-        SetMasterAuthRequest.newBuilder().setAction(action).setUpdate(update).build();
+    String projectId = "projectId-1969970175";
+    String zone = "zone3744684";
+    String clusterId = "clusterId240280960";
+    String masterVersion = "masterVersion-2139460613";
 
-    Operation actualResponse = client.setMasterAuth(request);
+    Operation actualResponse = client.updateMaster(projectId, zone, clusterId, masterVersion);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List actualRequests = mockClusterManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    SetMasterAuthRequest actualRequest = (SetMasterAuthRequest) actualRequests.get(0);
+    UpdateMasterRequest actualRequest = (UpdateMasterRequest) actualRequests.get(0);
 
-    Assert.assertEquals(action, actualRequest.getAction());
-    Assert.assertEquals(update, actualRequest.getUpdate());
+    Assert.assertEquals(projectId, actualRequest.getProjectId());
+    Assert.assertEquals(zone, actualRequest.getZone());
+    Assert.assertEquals(clusterId, actualRequest.getClusterId());
+    Assert.assertEquals(masterVersion, actualRequest.getMasterVersion());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1518,17 +1648,17 @@ public void setMasterAuthTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void setMasterAuthExceptionTest() throws Exception {
+  public void updateMasterExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockClusterManager.addException(exception);
 
     try {
-      SetMasterAuthRequest.Action action = SetMasterAuthRequest.Action.UNKNOWN;
-      MasterAuth update = MasterAuth.newBuilder().build();
-      SetMasterAuthRequest request =
-          SetMasterAuthRequest.newBuilder().setAction(action).setUpdate(update).build();
+      String projectId = "projectId-1969970175";
+      String zone = "zone3744684";
+      String clusterId = "clusterId240280960";
+      String masterVersion = "masterVersion-2139460613";
 
-      client.setMasterAuth(request);
+      client.updateMaster(projectId, zone, clusterId, masterVersion);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1537,7 +1667,7 @@ public void setMasterAuthExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteClusterTest() {
+  public void updateMasterTest2() {
     String name = "name3373707";
     String zone2 = "zone2-696322977";
     String detail = "detail-1335224239";
@@ -1564,17 +1694,19 @@ public void deleteClusterTest() {
     String projectId = "projectId-1969970175";
     String zone = "zone3744684";
     String clusterId = "clusterId240280960";
+    String masterVersion = "masterVersion-2139460613";
 
-    Operation actualResponse = client.deleteCluster(projectId, zone, clusterId);
+    Operation actualResponse = client.updateMaster(projectId, zone, clusterId, masterVersion);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List actualRequests = mockClusterManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    DeleteClusterRequest actualRequest = (DeleteClusterRequest) actualRequests.get(0);
+    UpdateMasterRequest actualRequest = (UpdateMasterRequest) actualRequests.get(0);
 
     Assert.assertEquals(projectId, actualRequest.getProjectId());
     Assert.assertEquals(zone, actualRequest.getZone());
     Assert.assertEquals(clusterId, actualRequest.getClusterId());
+    Assert.assertEquals(masterVersion, actualRequest.getMasterVersion());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1583,7 +1715,7 @@ public void deleteClusterTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteClusterExceptionTest() throws Exception {
+  public void updateMasterExceptionTest2() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockClusterManager.addException(exception);
 
@@ -1591,8 +1723,9 @@ public void deleteClusterExceptionTest() throws Exception {
       String projectId = "projectId-1969970175";
       String zone = "zone3744684";
       String clusterId = "clusterId240280960";
+      String masterVersion = "masterVersion-2139460613";
 
-      client.deleteCluster(projectId, zone, clusterId);
+      client.updateMaster(projectId, zone, clusterId, masterVersion);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1601,9 +1734,9 @@ public void deleteClusterExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteClusterTest2() {
+  public void setMasterAuthTest() {
     String name = "name3373707";
-    String zone2 = "zone2-696322977";
+    String zone = "zone3744684";
     String detail = "detail-1335224239";
     String statusMessage = "statusMessage-239442758";
     String selfLink = "selfLink-1691268851";
@@ -1614,7 +1747,7 @@ public void deleteClusterTest2() {
     Operation expectedResponse =
         Operation.newBuilder()
             .setName(name)
-            .setZone(zone2)
+            .setZone(zone)
             .setDetail(detail)
             .setStatusMessage(statusMessage)
             .setSelfLink(selfLink)
@@ -1625,20 +1758,20 @@ public void deleteClusterTest2() {
             .build();
     mockClusterManager.addResponse(expectedResponse);
 
-    String projectId = "projectId-1969970175";
-    String zone = "zone3744684";
-    String clusterId = "clusterId240280960";
+    SetMasterAuthRequest.Action action = SetMasterAuthRequest.Action.UNKNOWN;
+    MasterAuth update = MasterAuth.newBuilder().build();
+    SetMasterAuthRequest request =
+        SetMasterAuthRequest.newBuilder().setAction(action).setUpdate(update).build();
 
-    Operation actualResponse = client.deleteCluster(projectId, zone, clusterId);
+    Operation actualResponse = client.setMasterAuth(request);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List actualRequests = mockClusterManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    DeleteClusterRequest actualRequest = (DeleteClusterRequest) actualRequests.get(0);
+    SetMasterAuthRequest actualRequest = (SetMasterAuthRequest) actualRequests.get(0);
 
-    Assert.assertEquals(projectId, actualRequest.getProjectId());
-    Assert.assertEquals(zone, actualRequest.getZone());
-    Assert.assertEquals(clusterId, actualRequest.getClusterId());
+    Assert.assertEquals(action, actualRequest.getAction());
+    Assert.assertEquals(update, actualRequest.getUpdate());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1647,16 +1780,17 @@ public void deleteClusterTest2() {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteClusterExceptionTest2() throws Exception {
+  public void setMasterAuthExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockClusterManager.addException(exception);
 
     try {
-      String projectId = "projectId-1969970175";
-      String zone = "zone3744684";
-      String clusterId = "clusterId240280960";
+      SetMasterAuthRequest.Action action = SetMasterAuthRequest.Action.UNKNOWN;
+      MasterAuth update = MasterAuth.newBuilder().build();
+      SetMasterAuthRequest request =
+          SetMasterAuthRequest.newBuilder().setAction(action).setUpdate(update).build();
 
-      client.deleteCluster(projectId, zone, clusterId);
+      client.setMasterAuth(request);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -2292,140 +2426,6 @@ public void createNodePoolExceptionTest2() throws Exception {
     }
   }
 
-  @Test
-  @SuppressWarnings("all")
-  public void deleteNodePoolTest() {
-    String name = "name3373707";
-    String zone2 = "zone2-696322977";
-    String detail = "detail-1335224239";
-    String statusMessage = "statusMessage-239442758";
-    String selfLink = "selfLink-1691268851";
-    String targetLink = "targetLink-2084812312";
-    String location = "location1901043637";
-    String startTime = "startTime-1573145462";
-    String endTime = "endTime1725551537";
-    Operation expectedResponse =
-        Operation.newBuilder()
-            .setName(name)
-            .setZone(zone2)
-            .setDetail(detail)
-            .setStatusMessage(statusMessage)
-            .setSelfLink(selfLink)
-            .setTargetLink(targetLink)
-            .setLocation(location)
-            .setStartTime(startTime)
-            .setEndTime(endTime)
-            .build();
-    mockClusterManager.addResponse(expectedResponse);
-
-    String projectId = "projectId-1969970175";
-    String zone = "zone3744684";
-    String clusterId = "clusterId240280960";
-    String nodePoolId = "nodePoolId1043384033";
-
-    Operation actualResponse = client.deleteNodePool(projectId, zone, clusterId, nodePoolId);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockClusterManager.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteNodePoolRequest actualRequest = (DeleteNodePoolRequest) actualRequests.get(0);
-
-    Assert.assertEquals(projectId, actualRequest.getProjectId());
-    Assert.assertEquals(zone, actualRequest.getZone());
-    Assert.assertEquals(clusterId, actualRequest.getClusterId());
-    Assert.assertEquals(nodePoolId, actualRequest.getNodePoolId());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteNodePoolExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockClusterManager.addException(exception);
-
-    try {
-      String projectId = "projectId-1969970175";
-      String zone = "zone3744684";
-      String clusterId = "clusterId240280960";
-      String nodePoolId = "nodePoolId1043384033";
-
-      client.deleteNodePool(projectId, zone, clusterId, nodePoolId);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteNodePoolTest2() {
-    String name = "name3373707";
-    String zone2 = "zone2-696322977";
-    String detail = "detail-1335224239";
-    String statusMessage = "statusMessage-239442758";
-    String selfLink = "selfLink-1691268851";
-    String targetLink = "targetLink-2084812312";
-    String location = "location1901043637";
-    String startTime = "startTime-1573145462";
-    String endTime = "endTime1725551537";
-    Operation expectedResponse =
-        Operation.newBuilder()
-            .setName(name)
-            .setZone(zone2)
-            .setDetail(detail)
-            .setStatusMessage(statusMessage)
-            .setSelfLink(selfLink)
-            .setTargetLink(targetLink)
-            .setLocation(location)
-            .setStartTime(startTime)
-            .setEndTime(endTime)
-            .build();
-    mockClusterManager.addResponse(expectedResponse);
-
-    String projectId = "projectId-1969970175";
-    String zone = "zone3744684";
-    String clusterId = "clusterId240280960";
-    String nodePoolId = "nodePoolId1043384033";
-
-    Operation actualResponse = client.deleteNodePool(projectId, zone, clusterId, nodePoolId);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockClusterManager.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteNodePoolRequest actualRequest = (DeleteNodePoolRequest) actualRequests.get(0);
-
-    Assert.assertEquals(projectId, actualRequest.getProjectId());
-    Assert.assertEquals(zone, actualRequest.getZone());
-    Assert.assertEquals(clusterId, actualRequest.getClusterId());
-    Assert.assertEquals(nodePoolId, actualRequest.getNodePoolId());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteNodePoolExceptionTest2() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockClusterManager.addException(exception);
-
-    try {
-      String projectId = "projectId-1969970175";
-      String zone = "zone3744684";
-      String clusterId = "clusterId240280960";
-      String nodePoolId = "nodePoolId1043384033";
-
-      client.deleteNodePool(projectId, zone, clusterId, nodePoolId);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
   @Test
   @SuppressWarnings("all")
   public void rollbackNodePoolUpgradeTest() {
diff --git a/synth.metadata b/synth.metadata
index 7e83b29a..891e4aa5 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,8 +11,8 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "aed11c01e52921613b9ee469c2d85f5f33175fb7",
-        "internalRef": "310660461"
+        "sha": "5a90d467aa65e7f038f87585e8fbb45d74475e7c",
+        "internalRef": "312088359"
       }
     },
     {