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);
- * }
- * 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);
- * }
- * 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);
- * }
- * 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();
- * }
- * Sample code: - * - *
- * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
- * String projectId = "";
- * String zone = "";
- * String clusterId = "";
- * String nodePoolId = "";
- * Operation response = clusterManagerClient.deleteNodePool(projectId, zone, clusterId, nodePoolId);
- * }
- * Sample code: - * - *
- * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
- * String name = "";
- * Operation response = clusterManagerClient.deleteNodePool(name);
- * }
- * Sample code: - * - *
- * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
- * DeleteNodePoolRequest request = DeleteNodePoolRequest.newBuilder().build();
- * Operation response = clusterManagerClient.deleteNodePool(request);
- * }
- * 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();
- * }
- * 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);
+ * }
+ * 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);
+ * }
+ * 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);
+ * }
+ * 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();
+ * }
+ * Sample code: + * + *
+ * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+ * String projectId = "";
+ * String zone = "";
+ * String clusterId = "";
+ * String nodePoolId = "";
+ * Operation response = clusterManagerClient.deleteNodePool(projectId, zone, clusterId, nodePoolId);
+ * }
+ * Sample code: + * + *
+ * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+ * String name = "";
+ * Operation response = clusterManagerClient.deleteNodePool(name);
+ * }
+ * Sample code: + * + *
+ * try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
+ * DeleteNodePoolRequest request = DeleteNodePoolRequest.newBuilder().build();
+ * Operation response = clusterManagerClient.deleteNodePool(request);
+ * }
+ * 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();
+ * }
+ * 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 deleteCluster to 30 seconds: + *
For example, to set the total timeout of listClusters to 30 seconds: * *
*
* ClusterManagerSettings.Builder clusterManagerSettingsBuilder =
* ClusterManagerSettings.newBuilder();
* clusterManagerSettingsBuilder
- * .deleteClusterSettings()
+ * .listClustersSettings()
* .setRetrySettings(
- * clusterManagerSettingsBuilder.deleteClusterSettings().getRetrySettings().toBuilder()
+ * clusterManagerSettingsBuilder.listClustersSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30))
* .build());
* ClusterManagerSettings clusterManagerSettings = clusterManagerSettingsBuilder.build();
@@ -107,16 +107,6 @@
@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();
@@ -178,6 +168,11 @@ 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();
@@ -213,6 +208,11 @@ 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,16 +366,6 @@ 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() {
@@ -440,6 +430,11 @@ 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() {
@@ -478,6 +473,11 @@ 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 c9bf9d50..590986dc 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,8 +30,7 @@
* try (ClusterManagerClient clusterManagerClient = ClusterManagerClient.create()) {
* String projectId = "";
* String zone = "";
- * String clusterId = "";
- * Operation response = clusterManagerClient.deleteCluster(projectId, zone, clusterId);
+ * ListClustersResponse response = clusterManagerClient.listClusters(projectId, zone);
* }
*
*
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 9367be17..2b0757ca 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,14 +72,6 @@
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
public abstract class ClusterManagerStub implements BackgroundResource {
- public UnaryCallableThe 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 deleteCluster to 30 seconds: + *
For example, to set the total timeout of listClusters to 30 seconds: * *
*
* ClusterManagerStubSettings.Builder clusterManagerSettingsBuilder =
* ClusterManagerStubSettings.newBuilder();
* clusterManagerSettingsBuilder
- * .deleteClusterSettings()
+ * .listClustersSettings()
* .setRetrySettings(
- * clusterManagerSettingsBuilder.deleteClusterSettings().getRetrySettings().toBuilder()
+ * clusterManagerSettingsBuilder.listClustersSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30))
* .build());
* ClusterManagerStubSettings clusterManagerSettings = clusterManagerSettingsBuilder.build();
@@ -127,8 +127,6 @@ 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;
@@ -143,6 +141,7 @@ 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;
@@ -152,6 +151,7 @@ public class ClusterManagerStubSettings extends StubSettings getNodePoolSettings;
private final UnaryCallSettings createNodePoolSettings;
+ private final UnaryCallSettings deleteNodePoolSettings;
private final UnaryCallSettings
rollbackNodePoolUpgradeSettings;
private final UnaryCallSettings
@@ -170,16 +170,6 @@ 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;
@@ -241,6 +231,11 @@ 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;
@@ -276,6 +271,11 @@ 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,8 +401,6 @@ 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();
@@ -415,6 +413,7 @@ 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();
@@ -422,6 +421,7 @@ 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,9 +503,6 @@ 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;
@@ -524,6 +521,7 @@ 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;
@@ -535,6 +533,8 @@ 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
@@ -564,11 +564,13 @@ public static class Builder extends StubSettings.Builder> definitions =
ImmutableMap.builder();
definitions.put(
- "idempotent",
+ "retry_policy_1_codes",
ImmutableSet.copyOf(
Lists.newArrayList(
- StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
- definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList()));
+ StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
+ definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.newArrayList()));
+ definitions.put(
+ "no_retry_1_codes", ImmutableSet.copyOf(Lists.newArrayList()));
RETRYABLE_CODE_DEFINITIONS = definitions.build();
}
@@ -585,9 +587,19 @@ public static class Builder extends StubSettings.Builder>of(
- deleteClusterSettings,
- deleteNodePoolSettings,
listClustersSettings,
getClusterSettings,
createClusterSettings,
@@ -677,6 +687,7 @@ protected Builder(ClientContext clientContext) {
setLocationsSettings,
updateMasterSettings,
setMasterAuthSettings,
+ deleteClusterSettings,
listOperationsSettings,
getOperationSettings,
cancelOperationSettings,
@@ -684,6 +695,7 @@ protected Builder(ClientContext clientContext) {
listNodePoolsSettings,
getNodePoolSettings,
createNodePoolSettings,
+ deleteNodePoolSettings,
rollbackNodePoolUpgradeSettings,
setNodePoolManagementSettings,
setLabelsSettings,
@@ -709,160 +721,160 @@ 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"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
builder
.getClusterSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
builder
.createClusterSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.updateClusterSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.updateNodePoolSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setNodePoolAutoscalingSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setLoggingServiceSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setMonitoringServiceSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setAddonsConfigSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setLocationsSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.updateMasterSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setMasterAuthSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+ builder
+ .deleteClusterSettings()
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
builder
.listOperationsSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
builder
.getOperationSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
builder
.cancelOperationSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.getServerConfigSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
builder
.listNodePoolsSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
builder
.getNodePoolSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
builder
.createNodePoolSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+ builder
+ .deleteNodePoolSettings()
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
builder
.rollbackNodePoolUpgradeSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setNodePoolManagementSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setLabelsSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setLegacyAbacSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.startIPRotationSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.completeIPRotationSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setNodePoolSizeSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setNetworkPolicySettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.setMaintenancePolicySettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
builder
.listUsableSubnetworksSettings()
- .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
- .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+ .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
+ .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
return builder;
}
@@ -870,8 +882,6 @@ 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();
@@ -884,6 +894,7 @@ 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();
@@ -891,6 +902,7 @@ 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,8 +916,6 @@ protected Builder(ClusterManagerStubSettings settings) {
unaryMethodSettingsBuilders =
ImmutableList.>of(
- deleteClusterSettings,
- deleteNodePoolSettings,
listClustersSettings,
getClusterSettings,
createClusterSettings,
@@ -918,6 +928,7 @@ protected Builder(ClusterManagerStubSettings settings) {
setLocationsSettings,
updateMasterSettings,
setMasterAuthSettings,
+ deleteClusterSettings,
listOperationsSettings,
getOperationSettings,
cancelOperationSettings,
@@ -925,6 +936,7 @@ protected Builder(ClusterManagerStubSettings settings) {
listNodePoolsSettings,
getNodePoolSettings,
createNodePoolSettings,
+ deleteNodePoolSettings,
rollbackNodePoolUpgradeSettings,
setNodePoolManagementSettings,
setLabelsSettings,
@@ -953,16 +965,6 @@ 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() {
@@ -1027,6 +1029,11 @@ 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() {
@@ -1065,6 +1072,11 @@ 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 f5d214cd..133fef89 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,24 +83,6 @@
@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()
@@ -205,6 +187,15 @@ 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()
@@ -267,6 +258,15 @@ 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,8 +359,6 @@ 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;
@@ -374,6 +372,7 @@ 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;
@@ -381,6 +380,7 @@ 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,32 +438,6 @@ 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)
@@ -621,6 +595,19 @@ 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()
@@ -713,6 +700,19 @@ 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,12 +848,6 @@ 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);
@@ -896,6 +890,9 @@ 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);
@@ -917,6 +914,9 @@ 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,14 +966,6 @@ 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;
}
@@ -1022,6 +1014,10 @@ public UnaryCallable setMasterAuthCallable() {
return setMasterAuthCallable;
}
+ public UnaryCallable deleteClusterCallable() {
+ return deleteClusterCallable;
+ }
+
public UnaryCallable listOperationsCallable() {
return listOperationsCallable;
}
@@ -1050,6 +1046,10 @@ 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 75ef96ee..2522bf17 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,268 +128,6 @@ 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() {
@@ -1438,7 +1176,141 @@ public void setAddonsConfigTest2() {
Assert.assertEquals(projectId, actualRequest.getProjectId());
Assert.assertEquals(zone, actualRequest.getZone());
Assert.assertEquals(clusterId, actualRequest.getClusterId());
- Assert.assertEquals(addonsConfig, actualRequest.getAddonsConfig());
+ 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.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1447,7 +1319,7 @@ public void setAddonsConfigTest2() {
@Test
@SuppressWarnings("all")
- public void setAddonsConfigExceptionTest2() throws Exception {
+ public void setLocationsExceptionTest2() throws Exception {
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
mockClusterManager.addException(exception);
@@ -1455,9 +1327,9 @@ public void setAddonsConfigExceptionTest2() throws Exception {
String projectId = "projectId-1969970175";
String zone = "zone3744684";
String clusterId = "clusterId240280960";
- AddonsConfig addonsConfig = AddonsConfig.newBuilder().build();
+ List locations = new ArrayList<>();
- client.setAddonsConfig(projectId, zone, clusterId, addonsConfig);
+ client.setLocations(projectId, zone, clusterId, locations);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
// Expected exception
@@ -1466,7 +1338,7 @@ public void setAddonsConfigExceptionTest2() throws Exception {
@Test
@SuppressWarnings("all")
- public void setLocationsTest() {
+ public void updateMasterTest() {
String name = "name3373707";
String zone2 = "zone2-696322977";
String detail = "detail-1335224239";
@@ -1493,19 +1365,19 @@ public void setLocationsTest() {
String projectId = "projectId-1969970175";
String zone = "zone3744684";
String clusterId = "clusterId240280960";
- List locations = new ArrayList<>();
+ String masterVersion = "masterVersion-2139460613";
- Operation actualResponse = client.setLocations(projectId, zone, clusterId, locations);
+ Operation actualResponse = client.updateMaster(projectId, zone, clusterId, masterVersion);
Assert.assertEquals(expectedResponse, actualResponse);
List actualRequests = mockClusterManager.getRequests();
Assert.assertEquals(1, actualRequests.size());
- SetLocationsRequest actualRequest = (SetLocationsRequest) 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(locations, actualRequest.getLocationsList());
+ Assert.assertEquals(masterVersion, actualRequest.getMasterVersion());
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1514,7 +1386,7 @@ public void setLocationsTest() {
@Test
@SuppressWarnings("all")
- public void setLocationsExceptionTest() throws Exception {
+ public void updateMasterExceptionTest() throws Exception {
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
mockClusterManager.addException(exception);
@@ -1522,9 +1394,9 @@ public void setLocationsExceptionTest() throws Exception {
String projectId = "projectId-1969970175";
String zone = "zone3744684";
String clusterId = "clusterId240280960";
- List locations = new ArrayList<>();
+ String masterVersion = "masterVersion-2139460613";
- client.setLocations(projectId, zone, clusterId, locations);
+ client.updateMaster(projectId, zone, clusterId, masterVersion);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
// Expected exception
@@ -1533,7 +1405,7 @@ public void setLocationsExceptionTest() throws Exception {
@Test
@SuppressWarnings("all")
- public void setLocationsTest2() {
+ public void updateMasterTest2() {
String name = "name3373707";
String zone2 = "zone2-696322977";
String detail = "detail-1335224239";
@@ -1560,19 +1432,19 @@ public void setLocationsTest2() {
String projectId = "projectId-1969970175";
String zone = "zone3744684";
String clusterId = "clusterId240280960";
- List locations = new ArrayList<>();
+ String masterVersion = "masterVersion-2139460613";
- Operation actualResponse = client.setLocations(projectId, zone, clusterId, locations);
+ Operation actualResponse = client.updateMaster(projectId, zone, clusterId, masterVersion);
Assert.assertEquals(expectedResponse, actualResponse);
List actualRequests = mockClusterManager.getRequests();
Assert.assertEquals(1, actualRequests.size());
- SetLocationsRequest actualRequest = (SetLocationsRequest) 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(locations, actualRequest.getLocationsList());
+ Assert.assertEquals(masterVersion, actualRequest.getMasterVersion());
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1581,7 +1453,7 @@ public void setLocationsTest2() {
@Test
@SuppressWarnings("all")
- public void setLocationsExceptionTest2() throws Exception {
+ public void updateMasterExceptionTest2() throws Exception {
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
mockClusterManager.addException(exception);
@@ -1589,9 +1461,9 @@ public void setLocationsExceptionTest2() throws Exception {
String projectId = "projectId-1969970175";
String zone = "zone3744684";
String clusterId = "clusterId240280960";
- List locations = new ArrayList<>();
+ String masterVersion = "masterVersion-2139460613";
- client.setLocations(projectId, zone, clusterId, locations);
+ client.updateMaster(projectId, zone, clusterId, masterVersion);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
// Expected exception
@@ -1600,9 +1472,9 @@ public void setLocationsExceptionTest2() throws Exception {
@Test
@SuppressWarnings("all")
- public void updateMasterTest() {
+ 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";
@@ -1613,7 +1485,7 @@ public void updateMasterTest() {
Operation expectedResponse =
Operation.newBuilder()
.setName(name)
- .setZone(zone2)
+ .setZone(zone)
.setDetail(detail)
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
@@ -1624,22 +1496,20 @@ public void updateMasterTest() {
.build();
mockClusterManager.addResponse(expectedResponse);
- String projectId = "projectId-1969970175";
- String zone = "zone3744684";
- String clusterId = "clusterId240280960";
- String masterVersion = "masterVersion-2139460613";
+ SetMasterAuthRequest.Action action = SetMasterAuthRequest.Action.UNKNOWN;
+ MasterAuth update = MasterAuth.newBuilder().build();
+ SetMasterAuthRequest request =
+ SetMasterAuthRequest.newBuilder().setAction(action).setUpdate(update).build();
- Operation actualResponse = client.updateMaster(projectId, zone, clusterId, masterVersion);
+ Operation actualResponse = client.setMasterAuth(request);
Assert.assertEquals(expectedResponse, actualResponse);
List actualRequests = mockClusterManager.getRequests();
Assert.assertEquals(1, actualRequests.size());
- UpdateMasterRequest actualRequest = (UpdateMasterRequest) 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(masterVersion, actualRequest.getMasterVersion());
+ Assert.assertEquals(action, actualRequest.getAction());
+ Assert.assertEquals(update, actualRequest.getUpdate());
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1648,17 +1518,17 @@ public void updateMasterTest() {
@Test
@SuppressWarnings("all")
- public void updateMasterExceptionTest() 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";
- String masterVersion = "masterVersion-2139460613";
+ SetMasterAuthRequest.Action action = SetMasterAuthRequest.Action.UNKNOWN;
+ MasterAuth update = MasterAuth.newBuilder().build();
+ SetMasterAuthRequest request =
+ SetMasterAuthRequest.newBuilder().setAction(action).setUpdate(update).build();
- client.updateMaster(projectId, zone, clusterId, masterVersion);
+ client.setMasterAuth(request);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
// Expected exception
@@ -1667,7 +1537,7 @@ public void updateMasterExceptionTest() throws Exception {
@Test
@SuppressWarnings("all")
- public void updateMasterTest2() {
+ public void deleteClusterTest() {
String name = "name3373707";
String zone2 = "zone2-696322977";
String detail = "detail-1335224239";
@@ -1694,19 +1564,17 @@ public void updateMasterTest2() {
String projectId = "projectId-1969970175";
String zone = "zone3744684";
String clusterId = "clusterId240280960";
- String masterVersion = "masterVersion-2139460613";
- Operation actualResponse = client.updateMaster(projectId, zone, clusterId, masterVersion);
+ Operation actualResponse = client.deleteCluster(projectId, zone, clusterId);
Assert.assertEquals(expectedResponse, actualResponse);
List actualRequests = mockClusterManager.getRequests();
Assert.assertEquals(1, actualRequests.size());
- UpdateMasterRequest actualRequest = (UpdateMasterRequest) actualRequests.get(0);
+ DeleteClusterRequest actualRequest = (DeleteClusterRequest) 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(),
@@ -1715,7 +1583,7 @@ public void updateMasterTest2() {
@Test
@SuppressWarnings("all")
- public void updateMasterExceptionTest2() throws Exception {
+ public void deleteClusterExceptionTest() throws Exception {
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
mockClusterManager.addException(exception);
@@ -1723,9 +1591,8 @@ public void updateMasterExceptionTest2() throws Exception {
String projectId = "projectId-1969970175";
String zone = "zone3744684";
String clusterId = "clusterId240280960";
- String masterVersion = "masterVersion-2139460613";
- client.updateMaster(projectId, zone, clusterId, masterVersion);
+ client.deleteCluster(projectId, zone, clusterId);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
// Expected exception
@@ -1734,9 +1601,9 @@ public void updateMasterExceptionTest2() throws Exception {
@Test
@SuppressWarnings("all")
- public void setMasterAuthTest() {
+ public void deleteClusterTest2() {
String name = "name3373707";
- String zone = "zone3744684";
+ String zone2 = "zone2-696322977";
String detail = "detail-1335224239";
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
@@ -1747,7 +1614,7 @@ public void setMasterAuthTest() {
Operation expectedResponse =
Operation.newBuilder()
.setName(name)
- .setZone(zone)
+ .setZone(zone2)
.setDetail(detail)
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
@@ -1758,20 +1625,20 @@ 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";
- Operation actualResponse = client.setMasterAuth(request);
+ Operation actualResponse = client.deleteCluster(projectId, zone, clusterId);
Assert.assertEquals(expectedResponse, actualResponse);
List actualRequests = mockClusterManager.getRequests();
Assert.assertEquals(1, actualRequests.size());
- SetMasterAuthRequest actualRequest = (SetMasterAuthRequest) actualRequests.get(0);
+ DeleteClusterRequest actualRequest = (DeleteClusterRequest) 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.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1780,17 +1647,16 @@ public void setMasterAuthTest() {
@Test
@SuppressWarnings("all")
- public void setMasterAuthExceptionTest() throws Exception {
+ public void deleteClusterExceptionTest2() 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";
- client.setMasterAuth(request);
+ client.deleteCluster(projectId, zone, clusterId);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
// Expected exception
@@ -2426,6 +2292,140 @@ 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 c093d72a..ddc8320c 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-container.git",
- "sha": "f40fabe0739d0181274fea359e24312cbb3e6cb4"
+ "sha": "2a706c35dcd2162467b7204c86f86332009beffc"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
- "sha": "dd244bb3a5023a4a9290b21dae6b99020c026123",
- "internalRef": "315023125"
+ "sha": "cd24bd2d870ee5b9e046a2bfa0d0d0afda29be60",
+ "internalRef": "317953021"
}
},
{