diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/CHANGELOG.md b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/CHANGELOG.md
index 2b46365eb3b8..bf4fa8dd13cc 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/CHANGELOG.md
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/CHANGELOG.md
@@ -1,6 +1,8 @@
# Release History
-## 1.0.0-beta.4 (Unreleased)
+## 1.0.0-beta.1 (2022-11-01)
+
+- Azure Resource Manager SourceControlConfiguration client library for Java. This package contains Microsoft Azure SDK for SourceControlConfiguration Management SDK. KubernetesConfiguration Client. Package tag package-2022-11. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
### Features Added
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/README.md b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/README.md
index 1b3c2e1cec2e..33fa554867a1 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/README.md
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/README.md
@@ -2,7 +2,7 @@
Azure Resource Manager SourceControlConfiguration client library for Java.
-This package contains Microsoft Azure SDK for SourceControlConfiguration Management SDK. KubernetesConfiguration Client. Package tag package-2022-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for SourceControlConfiguration Management SDK. KubernetesConfiguration Client. Package tag package-2022-11. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
## We'd love to hear your feedback
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
com.azure.resourcemanagerazure-resourcemanager-kubernetesconfiguration
- 1.0.0-beta.3
+ 1.0.0-beta.4
```
[//]: # ({x-version-update-end})
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/SAMPLE.md b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/SAMPLE.md
index e1c0104532f6..d1b46d812341 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/SAMPLE.md
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/SAMPLE.md
@@ -41,6 +41,7 @@
```java
import com.azure.core.util.Context;
import com.azure.resourcemanager.kubernetesconfiguration.fluent.models.ExtensionInner;
+import com.azure.resourcemanager.kubernetesconfiguration.models.Plan;
import com.azure.resourcemanager.kubernetesconfiguration.models.Scope;
import com.azure.resourcemanager.kubernetesconfiguration.models.ScopeCluster;
import java.util.HashMap;
@@ -49,7 +50,7 @@ import java.util.Map;
/** Samples for Extensions Create. */
public final class ExtensionsCreateSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/CreateExtension.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/CreateExtension.json
*/
/**
* Sample code: Create Extension.
@@ -81,6 +82,36 @@ public final class ExtensionsCreateSamples {
Context.NONE);
}
+ /*
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/CreateExtensionWithPlan.json
+ */
+ /**
+ * Sample code: Create Extension with Plan.
+ *
+ * @param manager Entry point to SourceControlConfigurationManager.
+ */
+ public static void createExtensionWithPlan(
+ com.azure.resourcemanager.kubernetesconfiguration.SourceControlConfigurationManager manager) {
+ manager
+ .extensions()
+ .create(
+ "rg1",
+ "Microsoft.Kubernetes",
+ "connectedClusters",
+ "clusterName1",
+ "azureVote",
+ new ExtensionInner()
+ .withPlan(
+ new Plan()
+ .withName("azure-vote-standard")
+ .withPublisher("Microsoft")
+ .withProduct("azure-vote-standard-offer-id"))
+ .withExtensionType("azure-vote")
+ .withAutoUpgradeMinorVersion(true)
+ .withReleaseTrain("Preview"),
+ Context.NONE);
+ }
+
@SuppressWarnings("unchecked")
private static Map mapOf(Object... inputs) {
Map map = new HashMap<>();
@@ -102,7 +133,7 @@ import com.azure.core.util.Context;
/** Samples for Extensions Delete. */
public final class ExtensionsDeleteSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/DeleteExtension.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/DeleteExtension.json
*/
/**
* Sample code: Delete Extension.
@@ -133,7 +164,23 @@ import com.azure.core.util.Context;
/** Samples for Extensions Get. */
public final class ExtensionsGetSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/GetExtension.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/GetExtensionWithPlan.json
+ */
+ /**
+ * Sample code: Get Extension with Plan.
+ *
+ * @param manager Entry point to SourceControlConfigurationManager.
+ */
+ public static void getExtensionWithPlan(
+ com.azure.resourcemanager.kubernetesconfiguration.SourceControlConfigurationManager manager) {
+ manager
+ .extensions()
+ .getWithResponse(
+ "rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", "azureVote", Context.NONE);
+ }
+
+ /*
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/GetExtension.json
*/
/**
* Sample code: Get Extension.
@@ -158,7 +205,7 @@ import com.azure.core.util.Context;
/** Samples for Extensions List. */
public final class ExtensionsListSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/ListExtensions.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/ListExtensions.json
*/
/**
* Sample code: List Extensions.
@@ -183,7 +230,7 @@ import java.util.Map;
/** Samples for Extensions Update. */
public final class ExtensionsUpdateSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/PatchExtension.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/PatchExtension.json
*/
/**
* Sample code: Update Extension.
@@ -234,7 +281,7 @@ import com.azure.core.util.Context;
/** Samples for FluxConfigOperationStatus Get. */
public final class FluxConfigOperationStatusGetSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/GetFluxConfigurationAsyncOperationStatus.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/GetFluxConfigurationAsyncOperationStatus.json
*/
/**
* Sample code: FluxConfigurationAsyncOperationStatus Get.
@@ -275,7 +322,7 @@ import java.util.Map;
/** Samples for FluxConfigurations CreateOrUpdate. */
public final class FluxConfigurationsCreateOrUpdateSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/CreateFluxConfiguration.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/CreateFluxConfiguration.json
*/
/**
* Sample code: Create Flux Configuration.
@@ -324,7 +371,7 @@ public final class FluxConfigurationsCreateOrUpdateSamples {
}
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/CreateFluxConfigurationWithBucket.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/CreateFluxConfigurationWithBucket.json
*/
/**
* Sample code: Create Flux Configuration with Bucket Source Kind.
@@ -393,7 +440,7 @@ import com.azure.core.util.Context;
/** Samples for FluxConfigurations Delete. */
public final class FluxConfigurationsDeleteSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/DeleteFluxConfiguration.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/DeleteFluxConfiguration.json
*/
/**
* Sample code: Delete Flux Configuration.
@@ -424,7 +471,7 @@ import com.azure.core.util.Context;
/** Samples for FluxConfigurations Get. */
public final class FluxConfigurationsGetSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/GetFluxConfiguration.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/GetFluxConfiguration.json
*/
/**
* Sample code: Get Flux Configuration.
@@ -449,7 +496,7 @@ import com.azure.core.util.Context;
/** Samples for FluxConfigurations List. */
public final class FluxConfigurationsListSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/ListFluxConfigurations.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/ListFluxConfigurations.json
*/
/**
* Sample code: List Flux Configuration.
@@ -478,7 +525,7 @@ import java.util.Map;
/** Samples for FluxConfigurations Update. */
public final class FluxConfigurationsUpdateSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/PatchFluxConfiguration.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/PatchFluxConfiguration.json
*/
/**
* Sample code: Patch Flux Configuration.
@@ -536,7 +583,7 @@ import com.azure.core.util.Context;
/** Samples for OperationStatus Get. */
public final class OperationStatusGetSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/GetExtensionAsyncOperationStatus.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/GetExtensionAsyncOperationStatus.json
*/
/**
* Sample code: ExtensionAsyncOperationStatus Get.
@@ -567,7 +614,7 @@ import com.azure.core.util.Context;
/** Samples for OperationStatus List. */
public final class OperationStatusListSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/ListAsyncOperationStatus.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/ListAsyncOperationStatus.json
*/
/**
* Sample code: AsyncOperationStatus List.
@@ -591,7 +638,7 @@ import com.azure.core.util.Context;
/** Samples for Operations List. */
public final class OperationsListSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/OperationsList.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/OperationsList.json
*/
/**
* Sample code: BatchAccountDelete.
@@ -619,7 +666,7 @@ import java.util.Map;
/** Samples for SourceControlConfigurations CreateOrUpdate. */
public final class SourceControlConfigurationsCreateOrUpdateSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/CreateSourceControlConfiguration.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/CreateSourceControlConfiguration.json
*/
/**
* Sample code: Create Source Control Configuration.
@@ -676,7 +723,7 @@ import com.azure.core.util.Context;
/** Samples for SourceControlConfigurations Delete. */
public final class SourceControlConfigurationsDeleteSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/DeleteSourceControlConfiguration.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/DeleteSourceControlConfiguration.json
*/
/**
* Sample code: Delete Source Control Configuration.
@@ -701,7 +748,7 @@ import com.azure.core.util.Context;
/** Samples for SourceControlConfigurations Get. */
public final class SourceControlConfigurationsGetSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/GetSourceControlConfiguration.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/GetSourceControlConfiguration.json
*/
/**
* Sample code: Get Source Control Configuration.
@@ -726,7 +773,7 @@ import com.azure.core.util.Context;
/** Samples for SourceControlConfigurations List. */
public final class SourceControlConfigurationsListSamples {
/*
- * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-03-01/examples/ListSourceControlConfiguration.json
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/ListSourceControlConfiguration.json
*/
/**
* Sample code: List Source Control Configuration.
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml
index 3577631102d7..e3228a65fa3c 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml
@@ -13,7 +13,7 @@
jarMicrosoft Azure SDK for SourceControlConfiguration Management
- This package contains Microsoft Azure SDK for SourceControlConfiguration Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. KubernetesConfiguration Client. Package tag package-2022-03.
+ This package contains Microsoft Azure SDK for SourceControlConfiguration Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. KubernetesConfiguration Client. Package tag package-2022-11.https://github.com/Azure/azure-sdk-for-java
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/SourceControlConfigurationManager.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/SourceControlConfigurationManager.java
index 94e2546db198..c6793051e08b 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/SourceControlConfigurationManager.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/SourceControlConfigurationManager.java
@@ -10,11 +10,13 @@
import com.azure.core.http.HttpPipelineBuilder;
import com.azure.core.http.HttpPipelinePosition;
import com.azure.core.http.policy.AddDatePolicy;
+import com.azure.core.http.policy.AddHeadersFromContextPolicy;
import com.azure.core.http.policy.HttpLogOptions;
import com.azure.core.http.policy.HttpLoggingPolicy;
import com.azure.core.http.policy.HttpPipelinePolicy;
import com.azure.core.http.policy.HttpPolicyProviders;
import com.azure.core.http.policy.RequestIdPolicy;
+import com.azure.core.http.policy.RetryOptions;
import com.azure.core.http.policy.RetryPolicy;
import com.azure.core.http.policy.UserAgentPolicy;
import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
@@ -84,6 +86,19 @@ public static SourceControlConfigurationManager authenticate(TokenCredential cre
return configure().authenticate(credential, profile);
}
+ /**
+ * Creates an instance of SourceControlConfiguration service API entry point.
+ *
+ * @param httpPipeline the {@link HttpPipeline} configured with Azure authentication credential.
+ * @param profile the Azure profile for client.
+ * @return the SourceControlConfiguration service API instance.
+ */
+ public static SourceControlConfigurationManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
+ Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
+ Objects.requireNonNull(profile, "'profile' cannot be null.");
+ return new SourceControlConfigurationManager(httpPipeline, profile, null);
+ }
+
/**
* Gets a Configurable instance that can be used to create SourceControlConfigurationManager with optional
* configuration.
@@ -103,6 +118,7 @@ public static final class Configurable {
private final List policies = new ArrayList<>();
private final List scopes = new ArrayList<>();
private RetryPolicy retryPolicy;
+ private RetryOptions retryOptions;
private Duration defaultPollInterval;
private Configurable() {
@@ -163,6 +179,19 @@ public Configurable withRetryPolicy(RetryPolicy retryPolicy) {
return this;
}
+ /**
+ * Sets the retry options for the HTTP pipeline retry policy.
+ *
+ *
This setting has no effect, if retry policy is set via {@link #withRetryPolicy(RetryPolicy)}.
+ *
+ * @param retryOptions the retry options for the HTTP pipeline retry policy.
+ * @return the configurable object itself.
+ */
+ public Configurable withRetryOptions(RetryOptions retryOptions) {
+ this.retryOptions = Objects.requireNonNull(retryOptions, "'retryOptions' cannot be null.");
+ return this;
+ }
+
/**
* Sets the default poll interval, used when service does not provide "Retry-After" header.
*
@@ -196,7 +225,7 @@ public SourceControlConfigurationManager authenticate(TokenCredential credential
.append("-")
.append("com.azure.resourcemanager.kubernetesconfiguration")
.append("/")
- .append("1.0.0-beta.3");
+ .append("1.0.0-beta.1");
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
userAgentBuilder
.append(" (")
@@ -214,10 +243,15 @@ public SourceControlConfigurationManager authenticate(TokenCredential credential
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
}
if (retryPolicy == null) {
- retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
+ if (retryOptions != null) {
+ retryPolicy = new RetryPolicy(retryOptions);
+ } else {
+ retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
+ }
}
List policies = new ArrayList<>();
policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
+ policies.add(new AddHeadersFromContextPolicy());
policies.add(new RequestIdPolicy());
policies
.addAll(
@@ -248,7 +282,11 @@ public SourceControlConfigurationManager authenticate(TokenCredential credential
}
}
- /** @return Resource collection API of Extensions. */
+ /**
+ * Gets the resource collection API of Extensions.
+ *
+ * @return Resource collection API of Extensions.
+ */
public Extensions extensions() {
if (this.extensions == null) {
this.extensions = new ExtensionsImpl(clientObject.getExtensions(), this);
@@ -256,7 +294,11 @@ public Extensions extensions() {
return extensions;
}
- /** @return Resource collection API of OperationStatus. */
+ /**
+ * Gets the resource collection API of OperationStatus.
+ *
+ * @return Resource collection API of OperationStatus.
+ */
public OperationStatus operationStatus() {
if (this.operationStatus == null) {
this.operationStatus = new OperationStatusImpl(clientObject.getOperationStatus(), this);
@@ -264,7 +306,11 @@ public OperationStatus operationStatus() {
return operationStatus;
}
- /** @return Resource collection API of FluxConfigurations. */
+ /**
+ * Gets the resource collection API of FluxConfigurations.
+ *
+ * @return Resource collection API of FluxConfigurations.
+ */
public FluxConfigurations fluxConfigurations() {
if (this.fluxConfigurations == null) {
this.fluxConfigurations = new FluxConfigurationsImpl(clientObject.getFluxConfigurations(), this);
@@ -272,7 +318,11 @@ public FluxConfigurations fluxConfigurations() {
return fluxConfigurations;
}
- /** @return Resource collection API of FluxConfigOperationStatus. */
+ /**
+ * Gets the resource collection API of FluxConfigOperationStatus.
+ *
+ * @return Resource collection API of FluxConfigOperationStatus.
+ */
public FluxConfigOperationStatus fluxConfigOperationStatus() {
if (this.fluxConfigOperationStatus == null) {
this.fluxConfigOperationStatus =
@@ -281,7 +331,11 @@ public FluxConfigOperationStatus fluxConfigOperationStatus() {
return fluxConfigOperationStatus;
}
- /** @return Resource collection API of SourceControlConfigurations. */
+ /**
+ * Gets the resource collection API of SourceControlConfigurations.
+ *
+ * @return Resource collection API of SourceControlConfigurations.
+ */
public SourceControlConfigurations sourceControlConfigurations() {
if (this.sourceControlConfigurations == null) {
this.sourceControlConfigurations =
@@ -290,7 +344,11 @@ public SourceControlConfigurations sourceControlConfigurations() {
return sourceControlConfigurations;
}
- /** @return Resource collection API of Operations. */
+ /**
+ * Gets the resource collection API of Operations.
+ *
+ * @return Resource collection API of Operations.
+ */
public Operations operations() {
if (this.operations == null) {
this.operations = new OperationsImpl(clientObject.getOperations(), this);
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/ExtensionsClient.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/ExtensionsClient.java
index 0643ae0f6084..4cfb741f6e14 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/ExtensionsClient.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/ExtensionsClient.java
@@ -130,18 +130,20 @@ ExtensionInner create(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return kubernetes Cluster Extension.
+ * @return kubernetes Cluster Extension along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- ExtensionInner get(
+ Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String extensionName);
+ String extensionName,
+ Context context);
/**
* Gets Kubernetes Cluster Extension.
@@ -153,20 +155,18 @@ ExtensionInner get(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return kubernetes Cluster Extension along with {@link Response}.
+ * @return kubernetes Cluster Extension.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response getWithResponse(
+ ExtensionInner get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String extensionName,
- Context context);
+ String extensionName);
/**
* Delete a Kubernetes Cluster Extension. This will cause the Agent to Uninstall the extension from the cluster.
@@ -178,7 +178,6 @@ Response getWithResponse(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
- * @param forceDelete Delete the extension resource in Azure - not the normal asynchronous delete.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -190,8 +189,7 @@ SyncPoller, Void> beginDelete(
String clusterRp,
String clusterResourceName,
String clusterName,
- String extensionName,
- Boolean forceDelete);
+ String extensionName);
/**
* Delete a Kubernetes Cluster Extension. This will cause the Agent to Uninstall the extension from the cluster.
@@ -220,30 +218,6 @@ SyncPoller, Void> beginDelete(
Boolean forceDelete,
Context context);
- /**
- * Delete a Kubernetes Cluster Extension. This will cause the Agent to Uninstall the extension from the cluster.
- *
- * @param resourceGroupName The name of the resource group. The name is case insensitive.
- * @param clusterRp The Kubernetes cluster RP - i.e. Microsoft.ContainerService, Microsoft.Kubernetes,
- * Microsoft.HybridContainerService.
- * @param clusterResourceName The Kubernetes cluster resource name - i.e. managedClusters, connectedClusters,
- * provisionedClusters.
- * @param clusterName The name of the kubernetes cluster.
- * @param extensionName Name of the Extension.
- * @param forceDelete Delete the extension resource in Azure - not the normal asynchronous delete.
- * @throws IllegalArgumentException thrown if parameters fail the validation.
- * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
- * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- */
- @ServiceMethod(returns = ReturnType.SINGLE)
- void delete(
- String resourceGroupName,
- String clusterRp,
- String clusterResourceName,
- String clusterName,
- String extensionName,
- Boolean forceDelete);
-
/**
* Delete a Kubernetes Cluster Extension. This will cause the Agent to Uninstall the extension from the cluster.
*
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/FluxConfigOperationStatusClient.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/FluxConfigOperationStatusClient.java
index 813fe4c5623d..bbb3a1f7d127 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/FluxConfigOperationStatusClient.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/FluxConfigOperationStatusClient.java
@@ -23,19 +23,21 @@ public interface FluxConfigOperationStatusClient {
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
* @param operationId operation Id.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return async Operation status.
+ * @return async Operation status along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- OperationStatusResultInner get(
+ Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String fluxConfigurationName,
- String operationId);
+ String operationId,
+ Context context);
/**
* Get Async Operation status.
@@ -48,19 +50,17 @@ OperationStatusResultInner get(
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
* @param operationId operation Id.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return async Operation status along with {@link Response}.
+ * @return async Operation status.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response getWithResponse(
+ OperationStatusResultInner get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String fluxConfigurationName,
- String operationId,
- Context context);
+ String operationId);
}
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/FluxConfigurationsClient.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/FluxConfigurationsClient.java
index 117c7f759de5..43b4c260b768 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/FluxConfigurationsClient.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/FluxConfigurationsClient.java
@@ -26,18 +26,20 @@ public interface FluxConfigurationsClient {
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return details of the Flux Configuration.
+ * @return details of the Flux Configuration along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- FluxConfigurationInner get(
+ Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String fluxConfigurationName);
+ String fluxConfigurationName,
+ Context context);
/**
* Gets details of the Flux Configuration.
@@ -49,20 +51,18 @@ FluxConfigurationInner get(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return details of the Flux Configuration along with {@link Response}.
+ * @return details of the Flux Configuration.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response getWithResponse(
+ FluxConfigurationInner get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String fluxConfigurationName,
- Context context);
+ String fluxConfigurationName);
/**
* Create a new Kubernetes Flux Configuration.
@@ -283,7 +283,6 @@ FluxConfigurationInner update(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
- * @param forceDelete Delete the extension resource in Azure - not the normal asynchronous delete.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -295,8 +294,7 @@ SyncPoller, Void> beginDelete(
String clusterRp,
String clusterResourceName,
String clusterName,
- String fluxConfigurationName,
- Boolean forceDelete);
+ String fluxConfigurationName);
/**
* This will delete the YAML file used to set up the Flux Configuration, thus stopping future sync from the source
@@ -326,31 +324,6 @@ SyncPoller, Void> beginDelete(
Boolean forceDelete,
Context context);
- /**
- * This will delete the YAML file used to set up the Flux Configuration, thus stopping future sync from the source
- * repo.
- *
- * @param resourceGroupName The name of the resource group. The name is case insensitive.
- * @param clusterRp The Kubernetes cluster RP - i.e. Microsoft.ContainerService, Microsoft.Kubernetes,
- * Microsoft.HybridContainerService.
- * @param clusterResourceName The Kubernetes cluster resource name - i.e. managedClusters, connectedClusters,
- * provisionedClusters.
- * @param clusterName The name of the kubernetes cluster.
- * @param fluxConfigurationName Name of the Flux Configuration.
- * @param forceDelete Delete the extension resource in Azure - not the normal asynchronous delete.
- * @throws IllegalArgumentException thrown if parameters fail the validation.
- * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
- * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- */
- @ServiceMethod(returns = ReturnType.SINGLE)
- void delete(
- String resourceGroupName,
- String clusterRp,
- String clusterResourceName,
- String clusterName,
- String fluxConfigurationName,
- Boolean forceDelete);
-
/**
* This will delete the YAML file used to set up the Flux Configuration, thus stopping future sync from the source
* repo.
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/OperationStatusClient.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/OperationStatusClient.java
index 70a8eaa3a7dd..cb51a6de82e3 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/OperationStatusClient.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/OperationStatusClient.java
@@ -24,19 +24,21 @@ public interface OperationStatusClient {
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
* @param operationId operation Id.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return async Operation status.
+ * @return async Operation status along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- OperationStatusResultInner get(
+ Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String extensionName,
- String operationId);
+ String operationId,
+ Context context);
/**
* Get Async Operation status.
@@ -49,21 +51,19 @@ OperationStatusResultInner get(
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
* @param operationId operation Id.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return async Operation status along with {@link Response}.
+ * @return async Operation status.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response getWithResponse(
+ OperationStatusResultInner get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String extensionName,
- String operationId,
- Context context);
+ String operationId);
/**
* List Async Operations, currently in progress, in a cluster.
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/SourceControlConfigurationsClient.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/SourceControlConfigurationsClient.java
index 64eb81473e4f..c3a0da1f4e6a 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/SourceControlConfigurationsClient.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/SourceControlConfigurationsClient.java
@@ -25,18 +25,20 @@ public interface SourceControlConfigurationsClient {
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param sourceControlConfigurationName Name of the Source Control Configuration.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return details of the Source Control Configuration.
+ * @return details of the Source Control Configuration along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- SourceControlConfigurationInner get(
+ Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String sourceControlConfigurationName);
+ String sourceControlConfigurationName,
+ Context context);
/**
* Gets details of the Source Control Configuration.
@@ -48,20 +50,18 @@ SourceControlConfigurationInner get(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param sourceControlConfigurationName Name of the Source Control Configuration.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return details of the Source Control Configuration along with {@link Response}.
+ * @return details of the Source Control Configuration.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response getWithResponse(
+ SourceControlConfigurationInner get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String sourceControlConfigurationName,
- Context context);
+ String sourceControlConfigurationName);
/**
* Create a new Kubernetes Source Control Configuration.
@@ -74,19 +74,21 @@ Response getWithResponse(
* @param clusterName The name of the kubernetes cluster.
* @param sourceControlConfigurationName Name of the Source Control Configuration.
* @param sourceControlConfiguration Properties necessary to Create KubernetesConfiguration.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the SourceControl Configuration object returned in Get & Put response.
+ * @return the SourceControl Configuration object returned in Get & Put response along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- SourceControlConfigurationInner createOrUpdate(
+ Response createOrUpdateWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String sourceControlConfigurationName,
- SourceControlConfigurationInner sourceControlConfiguration);
+ SourceControlConfigurationInner sourceControlConfiguration,
+ Context context);
/**
* Create a new Kubernetes Source Control Configuration.
@@ -99,21 +101,19 @@ SourceControlConfigurationInner createOrUpdate(
* @param clusterName The name of the kubernetes cluster.
* @param sourceControlConfigurationName Name of the Source Control Configuration.
* @param sourceControlConfiguration Properties necessary to Create KubernetesConfiguration.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return the SourceControl Configuration object returned in Get & Put response along with {@link Response}.
+ * @return the SourceControl Configuration object returned in Get & Put response.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- Response createOrUpdateWithResponse(
+ SourceControlConfigurationInner createOrUpdate(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String sourceControlConfigurationName,
- SourceControlConfigurationInner sourceControlConfiguration,
- Context context);
+ SourceControlConfigurationInner sourceControlConfiguration);
/**
* This will delete the YAML file used to set up the Source control configuration, thus stopping future sync from
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ExtensionInner.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ExtensionInner.java
index 1cc534408584..27d3c54288ce 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ExtensionInner.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ExtensionInner.java
@@ -11,6 +11,7 @@
import com.azure.resourcemanager.kubernetesconfiguration.models.ExtensionPropertiesAksAssignedIdentity;
import com.azure.resourcemanager.kubernetesconfiguration.models.ExtensionStatus;
import com.azure.resourcemanager.kubernetesconfiguration.models.Identity;
+import com.azure.resourcemanager.kubernetesconfiguration.models.Plan;
import com.azure.resourcemanager.kubernetesconfiguration.models.ProvisioningState;
import com.azure.resourcemanager.kubernetesconfiguration.models.Scope;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -39,6 +40,16 @@ public final class ExtensionInner extends ProxyResource {
@JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
private SystemData systemData;
+ /*
+ * The plan information.
+ */
+ @JsonProperty(value = "plan")
+ private Plan plan;
+
+ /** Creates an instance of ExtensionInner class. */
+ public ExtensionInner() {
+ }
+
/**
* Get the innerProperties property: Properties of an Extension resource.
*
@@ -78,6 +89,26 @@ public SystemData systemData() {
return this.systemData;
}
+ /**
+ * Get the plan property: The plan information.
+ *
+ * @return the plan value.
+ */
+ public Plan plan() {
+ return this.plan;
+ }
+
+ /**
+ * Set the plan property: The plan information.
+ *
+ * @param plan the plan value to set.
+ * @return the ExtensionInner object itself.
+ */
+ public ExtensionInner withPlan(Plan plan) {
+ this.plan = plan;
+ return this;
+ }
+
/**
* Get the extensionType property: Type of the Extension, of which this resource is an instance of. It must be one
* of the Extension Types registered with Microsoft.KubernetesConfiguration by the Extension publisher.
@@ -252,12 +283,12 @@ public ExtensionInner withConfigurationProtectedSettings(Map con
}
/**
- * Get the installedVersion property: Installed version of the extension.
+ * Get the currentVersion property: Currently installed version of the extension.
*
- * @return the installedVersion value.
+ * @return the currentVersion value.
*/
- public String installedVersion() {
- return this.innerProperties() == null ? null : this.innerProperties().installedVersion();
+ public String currentVersion() {
+ return this.innerProperties() == null ? null : this.innerProperties().currentVersion();
}
/**
@@ -342,6 +373,15 @@ public ExtensionInner withAksAssignedIdentity(ExtensionPropertiesAksAssignedIden
return this;
}
+ /**
+ * Get the isSystemExtension property: Flag to note if this extension is a system extension.
+ *
+ * @return the isSystemExtension value.
+ */
+ public Boolean isSystemExtension() {
+ return this.innerProperties() == null ? null : this.innerProperties().isSystemExtension();
+ }
+
/**
* Validates the instance.
*
@@ -354,5 +394,8 @@ public void validate() {
if (identity() != null) {
identity().validate();
}
+ if (plan() != null) {
+ plan().validate();
+ }
}
}
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ExtensionProperties.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ExtensionProperties.java
index b82bd241e078..902af328187e 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ExtensionProperties.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ExtensionProperties.java
@@ -19,30 +19,28 @@
@Fluent
public final class ExtensionProperties {
/*
- * Type of the Extension, of which this resource is an instance of. It
- * must be one of the Extension Types registered with
- * Microsoft.KubernetesConfiguration by the Extension publisher.
+ * Type of the Extension, of which this resource is an instance of. It must be one of the Extension Types
+ * registered with Microsoft.KubernetesConfiguration by the Extension publisher.
*/
@JsonProperty(value = "extensionType")
private String extensionType;
/*
- * Flag to note if this extension participates in auto upgrade of minor
- * version, or not.
+ * Flag to note if this extension participates in auto upgrade of minor version, or not.
*/
@JsonProperty(value = "autoUpgradeMinorVersion")
private Boolean autoUpgradeMinorVersion;
/*
- * ReleaseTrain this extension participates in for auto-upgrade (e.g.
- * Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.
+ * ReleaseTrain this extension participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if
+ * autoUpgradeMinorVersion is 'true'.
*/
@JsonProperty(value = "releaseTrain")
private String releaseTrain;
/*
- * User-specified version of the extension for this extension to 'pin'. To
- * use 'version', autoUpgradeMinorVersion must be 'false'.
+ * User-specified version of the extension for this extension to 'pin'. To use 'version', autoUpgradeMinorVersion
+ * must be 'false'.
*/
@JsonProperty(value = "version")
private String version;
@@ -54,26 +52,24 @@ public final class ExtensionProperties {
private Scope scope;
/*
- * Configuration settings, as name-value pairs for configuring this
- * extension.
+ * Configuration settings, as name-value pairs for configuring this extension.
*/
@JsonProperty(value = "configurationSettings")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
private Map configurationSettings;
/*
- * Configuration settings that are sensitive, as name-value pairs for
- * configuring this extension.
+ * Configuration settings that are sensitive, as name-value pairs for configuring this extension.
*/
@JsonProperty(value = "configurationProtectedSettings")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
private Map configurationProtectedSettings;
/*
- * Installed version of the extension.
+ * Currently installed version of the extension.
*/
- @JsonProperty(value = "installedVersion", access = JsonProperty.Access.WRITE_ONLY)
- private String installedVersion;
+ @JsonProperty(value = "currentVersion", access = JsonProperty.Access.WRITE_ONLY)
+ private String currentVersion;
/*
* Status of installation of this extension.
@@ -112,6 +108,16 @@ public final class ExtensionProperties {
@JsonProperty(value = "aksAssignedIdentity")
private ExtensionPropertiesAksAssignedIdentity aksAssignedIdentity;
+ /*
+ * Flag to note if this extension is a system extension
+ */
+ @JsonProperty(value = "isSystemExtension", access = JsonProperty.Access.WRITE_ONLY)
+ private Boolean isSystemExtension;
+
+ /** Creates an instance of ExtensionProperties class. */
+ public ExtensionProperties() {
+ }
+
/**
* Get the extensionType property: Type of the Extension, of which this resource is an instance of. It must be one
* of the Extension Types registered with Microsoft.KubernetesConfiguration by the Extension publisher.
@@ -265,12 +271,12 @@ public ExtensionProperties withConfigurationProtectedSettings(Map kustomizations;
/*
- * Key-value pairs of protected configuration settings for the
- * configuration
+ * Key-value pairs of protected configuration settings for the configuration
*/
@JsonProperty(value = "configurationProtectedSettings")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
private Map configurationProtectedSettings;
+ /** Creates an instance of FluxConfigurationPatchProperties class. */
+ public FluxConfigurationPatchProperties() {
+ }
+
/**
* Get the sourceKind property: Source Kind to pull the configuration data from.
*
@@ -139,6 +147,26 @@ public FluxConfigurationPatchProperties withBucket(BucketPatchDefinition bucket)
return this;
}
+ /**
+ * Get the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @return the azureBlob value.
+ */
+ public AzureBlobPatchDefinition azureBlob() {
+ return this.azureBlob;
+ }
+
+ /**
+ * Set the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @param azureBlob the azureBlob value to set.
+ * @return the FluxConfigurationPatchProperties object itself.
+ */
+ public FluxConfigurationPatchProperties withAzureBlob(AzureBlobPatchDefinition azureBlob) {
+ this.azureBlob = azureBlob;
+ return this;
+ }
+
/**
* Get the kustomizations property: Array of kustomizations used to reconcile the artifact pulled by the source type
* on the cluster.
@@ -197,6 +225,9 @@ public void validate() {
if (bucket() != null) {
bucket().validate();
}
+ if (azureBlob() != null) {
+ azureBlob().validate();
+ }
if (kustomizations() != null) {
kustomizations()
.values()
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationProperties.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationProperties.java
index 4b0c1fbfaf12..eda7cca64071 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationProperties.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationProperties.java
@@ -5,6 +5,7 @@
package com.azure.resourcemanager.kubernetesconfiguration.fluent.models;
import com.azure.core.annotation.Fluent;
+import com.azure.resourcemanager.kubernetesconfiguration.models.AzureBlobDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.BucketDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.FluxComplianceState;
import com.azure.resourcemanager.kubernetesconfiguration.models.GitRepositoryDefinition;
@@ -29,8 +30,8 @@ public final class FluxConfigurationProperties {
private ScopeType scope;
/*
- * The namespace to which this configuration is installed to. Maximum of
- * 253 lower case alphanumeric characters, hyphen and period only.
+ * The namespace to which this configuration is installed to. Maximum of 253 lower case alphanumeric characters,
+ * hyphen and period only.
*/
@JsonProperty(value = "namespace")
private String namespace;
@@ -42,8 +43,7 @@ public final class FluxConfigurationProperties {
private SourceKindType sourceKind;
/*
- * Whether this configuration should suspend its reconciliation of its
- * kustomizations and sources.
+ * Whether this configuration should suspend its reconciliation of its kustomizations and sources.
*/
@JsonProperty(value = "suspend")
private Boolean suspend;
@@ -61,32 +61,34 @@ public final class FluxConfigurationProperties {
private BucketDefinition bucket;
/*
- * Array of kustomizations used to reconcile the artifact pulled by the
- * source type on the cluster.
+ * Parameters to reconcile to the AzureBlob source kind type.
+ */
+ @JsonProperty(value = "azureBlob")
+ private AzureBlobDefinition azureBlob;
+
+ /*
+ * Array of kustomizations used to reconcile the artifact pulled by the source type on the cluster.
*/
@JsonProperty(value = "kustomizations")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
private Map kustomizations;
/*
- * Key-value pairs of protected configuration settings for the
- * configuration
+ * Key-value pairs of protected configuration settings for the configuration
*/
@JsonProperty(value = "configurationProtectedSettings")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
private Map configurationProtectedSettings;
/*
- * Statuses of the Flux Kubernetes resources created by the
- * fluxConfiguration or created by the managed objects provisioned by the
- * fluxConfiguration.
+ * Statuses of the Flux Kubernetes resources created by the fluxConfiguration or created by the managed objects
+ * provisioned by the fluxConfiguration.
*/
@JsonProperty(value = "statuses", access = JsonProperty.Access.WRITE_ONLY)
private List statuses;
/*
- * Public Key associated with this fluxConfiguration (either generated
- * within the cluster or provided by the user).
+ * Public Key associated with this fluxConfiguration (either generated within the cluster or provided by the user).
*/
@JsonProperty(value = "repositoryPublicKey", access = JsonProperty.Access.WRITE_ONLY)
private String repositoryPublicKey;
@@ -104,15 +106,14 @@ public final class FluxConfigurationProperties {
private OffsetDateTime sourceUpdatedAt;
/*
- * Datetime the fluxConfiguration synced its status on the cluster with
- * Azure.
+ * Datetime the fluxConfiguration synced its status on the cluster with Azure.
*/
@JsonProperty(value = "statusUpdatedAt", access = JsonProperty.Access.WRITE_ONLY)
private OffsetDateTime statusUpdatedAt;
/*
- * Combined status of the Flux Kubernetes resources created by the
- * fluxConfiguration or created by the managed objects.
+ * Combined status of the Flux Kubernetes resources created by the fluxConfiguration or created by the managed
+ * objects.
*/
@JsonProperty(value = "complianceState", access = JsonProperty.Access.WRITE_ONLY)
private FluxComplianceState complianceState;
@@ -129,6 +130,10 @@ public final class FluxConfigurationProperties {
@JsonProperty(value = "errorMessage", access = JsonProperty.Access.WRITE_ONLY)
private String errorMessage;
+ /** Creates an instance of FluxConfigurationProperties class. */
+ public FluxConfigurationProperties() {
+ }
+
/**
* Get the scope property: Scope at which the operator will be installed.
*
@@ -253,6 +258,26 @@ public FluxConfigurationProperties withBucket(BucketDefinition bucket) {
return this;
}
+ /**
+ * Get the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @return the azureBlob value.
+ */
+ public AzureBlobDefinition azureBlob() {
+ return this.azureBlob;
+ }
+
+ /**
+ * Set the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @param azureBlob the azureBlob value to set.
+ * @return the FluxConfigurationProperties object itself.
+ */
+ public FluxConfigurationProperties withAzureBlob(AzureBlobDefinition azureBlob) {
+ this.azureBlob = azureBlob;
+ return this;
+ }
+
/**
* Get the kustomizations property: Array of kustomizations used to reconcile the artifact pulled by the source type
* on the cluster.
@@ -385,6 +410,9 @@ public void validate() {
if (bucket() != null) {
bucket().validate();
}
+ if (azureBlob() != null) {
+ azureBlob().validate();
+ }
if (kustomizations() != null) {
kustomizations()
.values()
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/OperationStatusResultInner.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/OperationStatusResultInner.java
index a7a34a1ffc18..1be67263e18a 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/OperationStatusResultInner.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/OperationStatusResultInner.java
@@ -45,6 +45,10 @@ public final class OperationStatusResultInner {
@JsonProperty(value = "error", access = JsonProperty.Access.WRITE_ONLY)
private ManagementError error;
+ /** Creates an instance of OperationStatusResultInner class. */
+ public OperationStatusResultInner() {
+ }
+
/**
* Get the id property: Fully qualified ID for the async operation.
*
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/PatchExtensionProperties.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/PatchExtensionProperties.java
index 681a2550def6..6ce76f0361c8 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/PatchExtensionProperties.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/PatchExtensionProperties.java
@@ -13,42 +13,43 @@
@Fluent
public final class PatchExtensionProperties {
/*
- * Flag to note if this extension participates in auto upgrade of minor
- * version, or not.
+ * Flag to note if this extension participates in auto upgrade of minor version, or not.
*/
@JsonProperty(value = "autoUpgradeMinorVersion")
private Boolean autoUpgradeMinorVersion;
/*
- * ReleaseTrain this extension participates in for auto-upgrade (e.g.
- * Stable, Preview, etc.) - only if autoUpgradeMinorVersion is 'true'.
+ * ReleaseTrain this extension participates in for auto-upgrade (e.g. Stable, Preview, etc.) - only if
+ * autoUpgradeMinorVersion is 'true'.
*/
@JsonProperty(value = "releaseTrain")
private String releaseTrain;
/*
- * Version of the extension for this extension, if it is 'pinned' to a
- * specific version. autoUpgradeMinorVersion must be 'false'.
+ * Version of the extension for this extension, if it is 'pinned' to a specific version. autoUpgradeMinorVersion
+ * must be 'false'.
*/
@JsonProperty(value = "version")
private String version;
/*
- * Configuration settings, as name-value pairs for configuring this
- * extension.
+ * Configuration settings, as name-value pairs for configuring this extension.
*/
@JsonProperty(value = "configurationSettings")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
private Map configurationSettings;
/*
- * Configuration settings that are sensitive, as name-value pairs for
- * configuring this extension.
+ * Configuration settings that are sensitive, as name-value pairs for configuring this extension.
*/
@JsonProperty(value = "configurationProtectedSettings")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
private Map configurationProtectedSettings;
+ /** Creates an instance of PatchExtensionProperties class. */
+ public PatchExtensionProperties() {
+ }
+
/**
* Get the autoUpgradeMinorVersion property: Flag to note if this extension participates in auto upgrade of minor
* version, or not.
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ResourceProviderOperationInner.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ResourceProviderOperationInner.java
index de7b5ec6590f..ab8493f57afc 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ResourceProviderOperationInner.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/ResourceProviderOperationInner.java
@@ -35,6 +35,10 @@ public final class ResourceProviderOperationInner {
@JsonProperty(value = "origin", access = JsonProperty.Access.WRITE_ONLY)
private String origin;
+ /** Creates an instance of ResourceProviderOperationInner class. */
+ public ResourceProviderOperationInner() {
+ }
+
/**
* Get the name property: Operation name, in format of {provider}/{resource}/{operation}.
*
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/SourceControlConfigurationInner.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/SourceControlConfigurationInner.java
index 241ab0e5494d..db2bcb9ea4d0 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/SourceControlConfigurationInner.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/SourceControlConfigurationInner.java
@@ -31,6 +31,10 @@ public final class SourceControlConfigurationInner extends ProxyResource {
@JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
private SystemData systemData;
+ /** Creates an instance of SourceControlConfigurationInner class. */
+ public SourceControlConfigurationInner() {
+ }
+
/**
* Get the innerProperties property: Properties to create a Source Control Configuration resource.
*
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/SourceControlConfigurationProperties.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/SourceControlConfigurationProperties.java
index 0415bff3cf90..856c56c8d10c 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/SourceControlConfigurationProperties.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/SourceControlConfigurationProperties.java
@@ -24,8 +24,8 @@ public final class SourceControlConfigurationProperties {
private String repositoryUrl;
/*
- * The namespace to which this operator is installed to. Maximum of 253
- * lower case alphanumeric characters, hyphen and period only.
+ * The namespace to which this operator is installed to. Maximum of 253 lower case alphanumeric characters, hyphen
+ * and period only.
*/
@JsonProperty(value = "operatorNamespace")
private String operatorNamespace;
@@ -49,8 +49,7 @@ public final class SourceControlConfigurationProperties {
private String operatorParams;
/*
- * Name-value pairs of protected configuration settings for the
- * configuration
+ * Name-value pairs of protected configuration settings for the configuration
*/
@JsonProperty(value = "configurationProtectedSettings")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
@@ -63,15 +62,14 @@ public final class SourceControlConfigurationProperties {
private OperatorScopeType operatorScope;
/*
- * Public Key associated with this SourceControl configuration (either
- * generated within the cluster or provided by the user).
+ * Public Key associated with this SourceControl configuration (either generated within the cluster or provided by
+ * the user).
*/
@JsonProperty(value = "repositoryPublicKey", access = JsonProperty.Access.WRITE_ONLY)
private String repositoryPublicKey;
/*
- * Base64-encoded known_hosts contents containing public SSH keys required
- * to access private Git instances
+ * Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances
*/
@JsonProperty(value = "sshKnownHostsContents")
private String sshKnownHostsContents;
@@ -100,6 +98,10 @@ public final class SourceControlConfigurationProperties {
@JsonProperty(value = "complianceStatus", access = JsonProperty.Access.WRITE_ONLY)
private ComplianceStatus complianceStatus;
+ /** Creates an instance of SourceControlConfigurationProperties class. */
+ public SourceControlConfigurationProperties() {
+ }
+
/**
* Get the repositoryUrl property: Url of the SourceControl Repository.
*
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionImpl.java
index cf7fe1877486..d564f7fc0c38 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionImpl.java
@@ -11,6 +11,7 @@
import com.azure.resourcemanager.kubernetesconfiguration.models.ExtensionPropertiesAksAssignedIdentity;
import com.azure.resourcemanager.kubernetesconfiguration.models.ExtensionStatus;
import com.azure.resourcemanager.kubernetesconfiguration.models.Identity;
+import com.azure.resourcemanager.kubernetesconfiguration.models.Plan;
import com.azure.resourcemanager.kubernetesconfiguration.models.ProvisioningState;
import com.azure.resourcemanager.kubernetesconfiguration.models.Scope;
import java.util.Collections;
@@ -49,6 +50,10 @@ public SystemData systemData() {
return this.innerModel().systemData();
}
+ public Plan plan() {
+ return this.innerModel().plan();
+ }
+
public String extensionType() {
return this.innerModel().extensionType();
}
@@ -87,8 +92,8 @@ public Map configurationProtectedSettings() {
}
}
- public String installedVersion() {
- return this.innerModel().installedVersion();
+ public String currentVersion() {
+ return this.innerModel().currentVersion();
}
public ProvisioningState provisioningState() {
@@ -125,6 +130,10 @@ public ExtensionPropertiesAksAssignedIdentity aksAssignedIdentity() {
return this.innerModel().aksAssignedIdentity();
}
+ public Boolean isSystemExtension() {
+ return this.innerModel().isSystemExtension();
+ }
+
public ExtensionInner innerModel() {
return this.innerObject;
}
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsClientImpl.java
index f60b928014c0..8c003456476b 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsClientImpl.java
@@ -130,7 +130,7 @@ Mono>> delete(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}"
+ "/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions"
+ "/{extensionName}")
- @ExpectedResponses({202})
+ @ExpectedResponses({200, 202})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono>> update(
@HostParam("$host") String endpoint,
@@ -744,14 +744,7 @@ private Mono getAsync(
String clusterName,
String extensionName) {
return getWithResponseAsync(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
@@ -764,19 +757,23 @@ private Mono getAsync(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return kubernetes Cluster Extension.
+ * @return kubernetes Cluster Extension along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public ExtensionInner get(
+ public Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String extensionName) {
- return getAsync(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName).block();
+ String extensionName,
+ Context context) {
+ return getWithResponseAsync(
+ resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, context)
+ .block();
}
/**
@@ -789,23 +786,21 @@ public ExtensionInner get(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return kubernetes Cluster Extension along with {@link Response}.
+ * @return kubernetes Cluster Extension.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public Response getWithResponse(
+ public ExtensionInner get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String extensionName,
- Context context) {
- return getWithResponseAsync(
- resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, context)
- .block();
+ String extensionName) {
+ return getWithResponse(
+ resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, Context.NONE)
+ .getValue();
}
/**
@@ -986,6 +981,38 @@ private PollerFlux, Void> beginDeleteAsync(
mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
}
+ /**
+ * Delete a Kubernetes Cluster Extension. This will cause the Agent to Uninstall the extension from the cluster.
+ *
+ * @param resourceGroupName The name of the resource group. The name is case insensitive.
+ * @param clusterRp The Kubernetes cluster RP - i.e. Microsoft.ContainerService, Microsoft.Kubernetes,
+ * Microsoft.HybridContainerService.
+ * @param clusterResourceName The Kubernetes cluster resource name - i.e. managedClusters, connectedClusters,
+ * provisionedClusters.
+ * @param clusterName The name of the kubernetes cluster.
+ * @param extensionName Name of the Extension.
+ * @throws IllegalArgumentException thrown if parameters fail the validation.
+ * @throws ManagementException thrown if the request is rejected by server.
+ * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+ * @return the {@link PollerFlux} for polling of long-running operation.
+ */
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+ private PollerFlux, Void> beginDeleteAsync(
+ String resourceGroupName,
+ String clusterRp,
+ String clusterResourceName,
+ String clusterName,
+ String extensionName) {
+ final Boolean forceDelete = null;
+ Mono>> mono =
+ deleteWithResponseAsync(
+ resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, forceDelete);
+ return this
+ .client
+ .getLroResult(
+ mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
+ }
+
/**
* Delete a Kubernetes Cluster Extension. This will cause the Agent to Uninstall the extension from the cluster.
*
@@ -1031,7 +1058,6 @@ private PollerFlux, Void> beginDeleteAsync(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
- * @param forceDelete Delete the extension resource in Azure - not the normal asynchronous delete.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1043,8 +1069,8 @@ public SyncPoller, Void> beginDelete(
String clusterRp,
String clusterResourceName,
String clusterName,
- String extensionName,
- Boolean forceDelete) {
+ String extensionName) {
+ final Boolean forceDelete = null;
return beginDeleteAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, forceDelete)
.getSyncPoller();
@@ -1172,32 +1198,6 @@ private Mono deleteAsync(
.flatMap(this.client::getLroFinalResultOrError);
}
- /**
- * Delete a Kubernetes Cluster Extension. This will cause the Agent to Uninstall the extension from the cluster.
- *
- * @param resourceGroupName The name of the resource group. The name is case insensitive.
- * @param clusterRp The Kubernetes cluster RP - i.e. Microsoft.ContainerService, Microsoft.Kubernetes,
- * Microsoft.HybridContainerService.
- * @param clusterResourceName The Kubernetes cluster resource name - i.e. managedClusters, connectedClusters,
- * provisionedClusters.
- * @param clusterName The name of the kubernetes cluster.
- * @param extensionName Name of the Extension.
- * @param forceDelete Delete the extension resource in Azure - not the normal asynchronous delete.
- * @throws IllegalArgumentException thrown if parameters fail the validation.
- * @throws ManagementException thrown if the request is rejected by server.
- * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- */
- @ServiceMethod(returns = ReturnType.SINGLE)
- public void delete(
- String resourceGroupName,
- String clusterRp,
- String clusterResourceName,
- String clusterName,
- String extensionName,
- Boolean forceDelete) {
- deleteAsync(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, forceDelete).block();
- }
-
/**
* Delete a Kubernetes Cluster Extension. This will cause the Agent to Uninstall the extension from the cluster.
*
@@ -1891,7 +1891,8 @@ public PagedIterable list(
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1927,7 +1928,8 @@ private Mono> listNextSinglePageAsync(String nextL
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsImpl.java
index 26b763114022..a934cfb974f5 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsImpl.java
@@ -67,21 +67,6 @@ public Extension create(
}
}
- public Extension get(
- String resourceGroupName,
- String clusterRp,
- String clusterResourceName,
- String clusterName,
- String extensionName) {
- ExtensionInner inner =
- this.serviceClient().get(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName);
- if (inner != null) {
- return new ExtensionImpl(inner, this.manager());
- } else {
- return null;
- }
- }
-
public Response getWithResponse(
String resourceGroupName,
String clusterRp,
@@ -105,16 +90,19 @@ public Response getWithResponse(
}
}
- public void delete(
+ public Extension get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String extensionName,
- Boolean forceDelete) {
- this
- .serviceClient()
- .delete(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, forceDelete);
+ String extensionName) {
+ ExtensionInner inner =
+ this.serviceClient().get(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName);
+ if (inner != null) {
+ return new ExtensionImpl(inner, this.manager());
+ } else {
+ return null;
+ }
}
public void delete(
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusClientImpl.java
index 7dee5d2f41c6..15d98beefba4 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusClientImpl.java
@@ -253,14 +253,7 @@ private Mono getAsync(
String operationId) {
return getWithResponseAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, operationId)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
@@ -274,21 +267,29 @@ private Mono getAsync(
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
* @param operationId operation Id.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return async Operation status.
+ * @return async Operation status along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public OperationStatusResultInner get(
+ public Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String fluxConfigurationName,
- String operationId) {
- return getAsync(
- resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, operationId)
+ String operationId,
+ Context context) {
+ return getWithResponseAsync(
+ resourceGroupName,
+ clusterRp,
+ clusterResourceName,
+ clusterName,
+ fluxConfigurationName,
+ operationId,
+ context)
.block();
}
@@ -303,29 +304,27 @@ public OperationStatusResultInner get(
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
* @param operationId operation Id.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return async Operation status along with {@link Response}.
+ * @return async Operation status.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public Response getWithResponse(
+ public OperationStatusResultInner get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String fluxConfigurationName,
- String operationId,
- Context context) {
- return getWithResponseAsync(
+ String operationId) {
+ return getWithResponse(
resourceGroupName,
clusterRp,
clusterResourceName,
clusterName,
fluxConfigurationName,
operationId,
- context)
- .block();
+ Context.NONE)
+ .getValue();
}
}
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusImpl.java
index 5372e3afdb0e..27114eaed289 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusImpl.java
@@ -27,25 +27,6 @@ public FluxConfigOperationStatusImpl(
this.serviceManager = serviceManager;
}
- public OperationStatusResult get(
- String resourceGroupName,
- String clusterRp,
- String clusterResourceName,
- String clusterName,
- String fluxConfigurationName,
- String operationId) {
- OperationStatusResultInner inner =
- this
- .serviceClient()
- .get(
- resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, operationId);
- if (inner != null) {
- return new OperationStatusResultImpl(inner, this.manager());
- } else {
- return null;
- }
- }
-
public Response getWithResponse(
String resourceGroupName,
String clusterRp,
@@ -76,6 +57,25 @@ public Response getWithResponse(
}
}
+ public OperationStatusResult get(
+ String resourceGroupName,
+ String clusterRp,
+ String clusterResourceName,
+ String clusterName,
+ String fluxConfigurationName,
+ String operationId) {
+ OperationStatusResultInner inner =
+ this
+ .serviceClient()
+ .get(
+ resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, operationId);
+ if (inner != null) {
+ return new OperationStatusResultImpl(inner, this.manager());
+ } else {
+ return null;
+ }
+ }
+
private FluxConfigOperationStatusClient serviceClient() {
return this.innerClient;
}
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationImpl.java
index 3a489ff31668..f3d5621de245 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationImpl.java
@@ -6,6 +6,7 @@
import com.azure.core.management.SystemData;
import com.azure.resourcemanager.kubernetesconfiguration.fluent.models.FluxConfigurationInner;
+import com.azure.resourcemanager.kubernetesconfiguration.models.AzureBlobDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.BucketDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.FluxComplianceState;
import com.azure.resourcemanager.kubernetesconfiguration.models.FluxConfiguration;
@@ -72,6 +73,10 @@ public BucketDefinition bucket() {
return this.innerModel().bucket();
}
+ public AzureBlobDefinition azureBlob() {
+ return this.innerModel().azureBlob();
+ }
+
public Map kustomizations() {
Map inner = this.innerModel().kustomizations();
if (inner != null) {
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsClientImpl.java
index 231fdeabd1bc..f7808b745977 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsClientImpl.java
@@ -110,7 +110,7 @@ Mono>> createOrUpdate(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}"
+ "/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/fluxConfigurations"
+ "/{fluxConfigurationName}")
- @ExpectedResponses({202})
+ @ExpectedResponses({200, 202})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono>> update(
@HostParam("$host") String endpoint,
@@ -338,14 +338,7 @@ private Mono getAsync(
String fluxConfigurationName) {
return getWithResponseAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
@@ -358,19 +351,23 @@ private Mono getAsync(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return details of the Flux Configuration.
+ * @return details of the Flux Configuration along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public FluxConfigurationInner get(
+ public Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String fluxConfigurationName) {
- return getAsync(resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName).block();
+ String fluxConfigurationName,
+ Context context) {
+ return getWithResponseAsync(
+ resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, context)
+ .block();
}
/**
@@ -383,23 +380,21 @@ public FluxConfigurationInner get(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return details of the Flux Configuration along with {@link Response}.
+ * @return details of the Flux Configuration.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public Response getWithResponse(
+ public FluxConfigurationInner get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String fluxConfigurationName,
- Context context) {
- return getWithResponseAsync(
- resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, context)
- .block();
+ String fluxConfigurationName) {
+ return getWithResponse(
+ resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, Context.NONE)
+ .getValue();
}
/**
@@ -1519,6 +1514,39 @@ private PollerFlux, Void> beginDeleteAsync(
mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
}
+ /**
+ * This will delete the YAML file used to set up the Flux Configuration, thus stopping future sync from the source
+ * repo.
+ *
+ * @param resourceGroupName The name of the resource group. The name is case insensitive.
+ * @param clusterRp The Kubernetes cluster RP - i.e. Microsoft.ContainerService, Microsoft.Kubernetes,
+ * Microsoft.HybridContainerService.
+ * @param clusterResourceName The Kubernetes cluster resource name - i.e. managedClusters, connectedClusters,
+ * provisionedClusters.
+ * @param clusterName The name of the kubernetes cluster.
+ * @param fluxConfigurationName Name of the Flux Configuration.
+ * @throws IllegalArgumentException thrown if parameters fail the validation.
+ * @throws ManagementException thrown if the request is rejected by server.
+ * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+ * @return the {@link PollerFlux} for polling of long-running operation.
+ */
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+ private PollerFlux, Void> beginDeleteAsync(
+ String resourceGroupName,
+ String clusterRp,
+ String clusterResourceName,
+ String clusterName,
+ String fluxConfigurationName) {
+ final Boolean forceDelete = null;
+ Mono>> mono =
+ deleteWithResponseAsync(
+ resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, forceDelete);
+ return this
+ .client
+ .getLroResult(
+ mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
+ }
+
/**
* This will delete the YAML file used to set up the Flux Configuration, thus stopping future sync from the source
* repo.
@@ -1572,7 +1600,6 @@ private PollerFlux, Void> beginDeleteAsync(
* provisionedClusters.
* @param clusterName The name of the kubernetes cluster.
* @param fluxConfigurationName Name of the Flux Configuration.
- * @param forceDelete Delete the extension resource in Azure - not the normal asynchronous delete.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1584,8 +1611,8 @@ public SyncPoller, Void> beginDelete(
String clusterRp,
String clusterResourceName,
String clusterName,
- String fluxConfigurationName,
- Boolean forceDelete) {
+ String fluxConfigurationName) {
+ final Boolean forceDelete = null;
return beginDeleteAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, forceDelete)
.getSyncPoller();
@@ -1729,34 +1756,6 @@ private Mono deleteAsync(
.flatMap(this.client::getLroFinalResultOrError);
}
- /**
- * This will delete the YAML file used to set up the Flux Configuration, thus stopping future sync from the source
- * repo.
- *
- * @param resourceGroupName The name of the resource group. The name is case insensitive.
- * @param clusterRp The Kubernetes cluster RP - i.e. Microsoft.ContainerService, Microsoft.Kubernetes,
- * Microsoft.HybridContainerService.
- * @param clusterResourceName The Kubernetes cluster resource name - i.e. managedClusters, connectedClusters,
- * provisionedClusters.
- * @param clusterName The name of the kubernetes cluster.
- * @param fluxConfigurationName Name of the Flux Configuration.
- * @param forceDelete Delete the extension resource in Azure - not the normal asynchronous delete.
- * @throws IllegalArgumentException thrown if parameters fail the validation.
- * @throws ManagementException thrown if the request is rejected by server.
- * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- */
- @ServiceMethod(returns = ReturnType.SINGLE)
- public void delete(
- String resourceGroupName,
- String clusterRp,
- String clusterResourceName,
- String clusterName,
- String fluxConfigurationName,
- Boolean forceDelete) {
- deleteAsync(resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, forceDelete)
- .block();
- }
-
/**
* This will delete the YAML file used to set up the Flux Configuration, thus stopping future sync from the source
* repo.
@@ -2050,7 +2049,8 @@ public PagedIterable list(
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -2086,7 +2086,8 @@ private Mono> listNextSinglePageAsync(Stri
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsImpl.java
index db1a4e7a1fac..143916f663de 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsImpl.java
@@ -29,41 +29,41 @@ public FluxConfigurationsImpl(
this.serviceManager = serviceManager;
}
- public FluxConfiguration get(
+ public Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String fluxConfigurationName) {
- FluxConfigurationInner inner =
+ String fluxConfigurationName,
+ Context context) {
+ Response inner =
this
.serviceClient()
- .get(resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName);
+ .getWithResponse(
+ resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, context);
if (inner != null) {
- return new FluxConfigurationImpl(inner, this.manager());
+ return new SimpleResponse<>(
+ inner.getRequest(),
+ inner.getStatusCode(),
+ inner.getHeaders(),
+ new FluxConfigurationImpl(inner.getValue(), this.manager()));
} else {
return null;
}
}
- public Response getWithResponse(
+ public FluxConfiguration get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
- String fluxConfigurationName,
- Context context) {
- Response inner =
+ String fluxConfigurationName) {
+ FluxConfigurationInner inner =
this
.serviceClient()
- .getWithResponse(
- resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, context);
+ .get(resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName);
if (inner != null) {
- return new SimpleResponse<>(
- inner.getRequest(),
- inner.getStatusCode(),
- inner.getHeaders(),
- new FluxConfigurationImpl(inner.getValue(), this.manager()));
+ return new FluxConfigurationImpl(inner, this.manager());
} else {
return null;
}
@@ -169,18 +169,6 @@ public FluxConfiguration update(
}
}
- public void delete(
- String resourceGroupName,
- String clusterRp,
- String clusterResourceName,
- String clusterName,
- String fluxConfigurationName,
- Boolean forceDelete) {
- this
- .serviceClient()
- .delete(resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, forceDelete);
- }
-
public void delete(
String resourceGroupName,
String clusterRp,
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusClientImpl.java
index 21c3c3f1a5f1..96606ff7172e 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusClientImpl.java
@@ -281,14 +281,7 @@ private Mono getAsync(
String operationId) {
return getWithResponseAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, operationId)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
@@ -302,20 +295,23 @@ private Mono getAsync(
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
* @param operationId operation Id.
+ * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return async Operation status.
+ * @return async Operation status along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public OperationStatusResultInner get(
+ public Response getWithResponse(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String extensionName,
- String operationId) {
- return getAsync(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, operationId)
+ String operationId,
+ Context context) {
+ return getWithResponseAsync(
+ resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, operationId, context)
.block();
}
@@ -330,24 +326,28 @@ public OperationStatusResultInner get(
* @param clusterName The name of the kubernetes cluster.
* @param extensionName Name of the Extension.
* @param operationId operation Id.
- * @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return async Operation status along with {@link Response}.
+ * @return async Operation status.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
- public Response getWithResponse(
+ public OperationStatusResultInner get(
String resourceGroupName,
String clusterRp,
String clusterResourceName,
String clusterName,
String extensionName,
- String operationId,
- Context context) {
- return getWithResponseAsync(
- resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, operationId, context)
- .block();
+ String operationId) {
+ return getWithResponse(
+ resourceGroupName,
+ clusterRp,
+ clusterResourceName,
+ clusterName,
+ extensionName,
+ operationId,
+ Context.NONE)
+ .getValue();
}
/**
@@ -579,7 +579,8 @@ public PagedIterable list(
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -615,7 +616,8 @@ private Mono> listNextSinglePageAsync(
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusImpl.java
index 990034199492..00bd33353cee 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusImpl.java
@@ -28,24 +28,6 @@ public OperationStatusImpl(
this.serviceManager = serviceManager;
}
- public OperationStatusResult get(
- String resourceGroupName,
- String clusterRp,
- String clusterResourceName,
- String clusterName,
- String extensionName,
- String operationId) {
- OperationStatusResultInner inner =
- this
- .serviceClient()
- .get(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, operationId);
- if (inner != null) {
- return new OperationStatusResultImpl(inner, this.manager());
- } else {
- return null;
- }
- }
-
public Response getWithResponse(
String resourceGroupName,
String clusterRp,
@@ -76,6 +58,24 @@ public Response getWithResponse(
}
}
+ public OperationStatusResult get(
+ String resourceGroupName,
+ String clusterRp,
+ String clusterResourceName,
+ String clusterName,
+ String extensionName,
+ String operationId) {
+ OperationStatusResultInner inner =
+ this
+ .serviceClient()
+ .get(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, operationId);
+ if (inner != null) {
+ return new OperationStatusResultImpl(inner, this.manager());
+ } else {
+ return null;
+ }
+ }
+
public PagedIterable list(
String resourceGroupName, String clusterRp, String clusterResourceName, String clusterName) {
PagedIterable inner =
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationsClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationsClientImpl.java
index 60e4105a9a08..02e2c84c7ecc 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationsClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationsClientImpl.java
@@ -198,7 +198,8 @@ public PagedIterable list(Context context) {
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -234,7 +235,8 @@ private Mono> listNextSinglePageAs
/**
* Get the next page of items.
*
- * @param nextLink The nextLink parameter.
+ * @param nextLink The URL to get the next list of items
+ *
The nextLink parameter.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws ManagementException thrown if the request is rejected by server.
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientBuilder.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientBuilder.java
index 752d006aea87..5992b14a97f1 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientBuilder.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientBuilder.java
@@ -7,7 +7,6 @@
import com.azure.core.annotation.ServiceClientBuilder;
import com.azure.core.http.HttpPipeline;
import com.azure.core.http.HttpPipelineBuilder;
-import com.azure.core.http.policy.CookiePolicy;
import com.azure.core.http.policy.RetryPolicy;
import com.azure.core.http.policy.UserAgentPolicy;
import com.azure.core.management.AzureEnvironment;
@@ -67,34 +66,34 @@ public SourceControlConfigurationClientBuilder environment(AzureEnvironment envi
}
/*
- * The default poll interval for long-running operation
+ * The HTTP pipeline to send requests through
*/
- private Duration defaultPollInterval;
+ private HttpPipeline pipeline;
/**
- * Sets The default poll interval for long-running operation.
+ * Sets The HTTP pipeline to send requests through.
*
- * @param defaultPollInterval the defaultPollInterval value.
+ * @param pipeline the pipeline value.
* @return the SourceControlConfigurationClientBuilder.
*/
- public SourceControlConfigurationClientBuilder defaultPollInterval(Duration defaultPollInterval) {
- this.defaultPollInterval = defaultPollInterval;
+ public SourceControlConfigurationClientBuilder pipeline(HttpPipeline pipeline) {
+ this.pipeline = pipeline;
return this;
}
/*
- * The HTTP pipeline to send requests through
+ * The default poll interval for long-running operation
*/
- private HttpPipeline pipeline;
+ private Duration defaultPollInterval;
/**
- * Sets The HTTP pipeline to send requests through.
+ * Sets The default poll interval for long-running operation.
*
- * @param pipeline the pipeline value.
+ * @param defaultPollInterval the defaultPollInterval value.
* @return the SourceControlConfigurationClientBuilder.
*/
- public SourceControlConfigurationClientBuilder pipeline(HttpPipeline pipeline) {
- this.pipeline = pipeline;
+ public SourceControlConfigurationClientBuilder defaultPollInterval(Duration defaultPollInterval) {
+ this.defaultPollInterval = defaultPollInterval;
return this;
}
@@ -120,27 +119,26 @@ public SourceControlConfigurationClientBuilder serializerAdapter(SerializerAdapt
* @return an instance of SourceControlConfigurationClientImpl.
*/
public SourceControlConfigurationClientImpl buildClient() {
- if (endpoint == null) {
- this.endpoint = "https://management.azure.com";
- }
- if (environment == null) {
- this.environment = AzureEnvironment.AZURE;
- }
- if (defaultPollInterval == null) {
- this.defaultPollInterval = Duration.ofSeconds(30);
- }
- if (pipeline == null) {
- this.pipeline =
- new HttpPipelineBuilder()
- .policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy())
- .build();
- }
- if (serializerAdapter == null) {
- this.serializerAdapter = SerializerFactory.createDefaultManagementSerializerAdapter();
- }
+ String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
+ AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
+ HttpPipeline localPipeline =
+ (pipeline != null)
+ ? pipeline
+ : new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build();
+ Duration localDefaultPollInterval =
+ (defaultPollInterval != null) ? defaultPollInterval : Duration.ofSeconds(30);
+ SerializerAdapter localSerializerAdapter =
+ (serializerAdapter != null)
+ ? serializerAdapter
+ : SerializerFactory.createDefaultManagementSerializerAdapter();
SourceControlConfigurationClientImpl client =
new SourceControlConfigurationClientImpl(
- pipeline, serializerAdapter, defaultPollInterval, environment, subscriptionId, endpoint);
+ localPipeline,
+ localSerializerAdapter,
+ localDefaultPollInterval,
+ localEnvironment,
+ subscriptionId,
+ localEndpoint);
return client;
}
}
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientImpl.java
index 92ed100101ea..42e845560db2 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientImpl.java
@@ -15,6 +15,7 @@
import com.azure.core.management.polling.PollResult;
import com.azure.core.management.polling.PollerFactory;
import com.azure.core.util.Context;
+import com.azure.core.util.CoreUtils;
import com.azure.core.util.logging.ClientLogger;
import com.azure.core.util.polling.AsyncPollResponse;
import com.azure.core.util.polling.LongRunningOperationStatus;
@@ -34,7 +35,6 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
-import java.util.Map;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -207,7 +207,7 @@ public OperationsClient getOperations() {
this.defaultPollInterval = defaultPollInterval;
this.subscriptionId = subscriptionId;
this.endpoint = endpoint;
- this.apiVersion = "2022-03-01";
+ this.apiVersion = "2022-11-01";
this.extensions = new ExtensionsClientImpl(this);
this.operationStatus = new OperationStatusClientImpl(this);
this.fluxConfigurations = new FluxConfigurationsClientImpl(this);
@@ -232,10 +232,7 @@ public Context getContext() {
* @return the merged context.
*/
public Context mergeContext(Context context) {
- for (Map.Entry