diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/CHANGELOG.md b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/CHANGELOG.md
index 2b46365eb3b83..40163c22595a8 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 (2023-02-13)
+
+- 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 1b3c2e1cec2e3..968a236865f01 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})
@@ -41,19 +41,19 @@ Various documentation is available to help you get started
Azure Management Libraries require a `TokenCredential` implementation for authentication and an `HttpClient` implementation for HTTP client.
-[Azure Identity][azure_identity] package and [Azure Core Netty HTTP][azure_core_http_netty] package provide the default implementation.
+[Azure Identity][azure_identity] and [Azure Core Netty HTTP][azure_core_http_netty] packages provide the default implementation.
### Authentication
-By default, Azure Active Directory token authentication depends on correct configure of following environment variables.
+By default, Azure Active Directory token authentication depends on correct configuration of the following environment variables.
- `AZURE_CLIENT_ID` for Azure client ID.
- `AZURE_TENANT_ID` for Azure tenant ID.
- `AZURE_CLIENT_SECRET` or `AZURE_CLIENT_CERTIFICATE_PATH` for client secret or client certificate.
-In addition, Azure subscription ID can be configured via environment variable `AZURE_SUBSCRIPTION_ID`.
+In addition, Azure subscription ID can be configured via `AZURE_SUBSCRIPTION_ID` environment variable.
-With above configuration, `azure` client can be authenticated by following code:
+With above configuration, `azure` client can be authenticated using the following code:
```java
AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
@@ -83,13 +83,13 @@ See [API design][design] for general introduction on design and key concepts on
## Contributing
-For details on contributing to this repository, see the [contributing guide](https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md).
+For details on contributing to this repository, see the [contributing guide][cg].
-1. Fork it
-1. Create your feature branch (`git checkout -b my-new-feature`)
-1. Commit your changes (`git commit -am 'Add some feature'`)
-1. Push to the branch (`git push origin my-new-feature`)
-1. Create new Pull Request
+This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit .
+
+When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repositories using our CLA.
+
+This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc_faq] or contact with any additional questions or comments.
[survey]: https://microsoft.qualtrics.com/jfe/form/SV_ehN0lIk2FKEBkwd?Q_CHL=DOCS
@@ -100,3 +100,6 @@ For details on contributing to this repository, see the [contributing guide](htt
[azure_core_http_netty]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core/azure-core-http-netty
[authenticate]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/resourcemanager/docs/AUTH.md
[design]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/resourcemanager/docs/DESIGN.md
+[cg]: https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md
+[coc]: https://opensource.microsoft.com/codeofconduct/
+[coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/SAMPLE.md b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/SAMPLE.md
index e1c0104532f64..bed1f7ef20e29 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/SAMPLE.md
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/SAMPLE.md
@@ -39,8 +39,8 @@
### Extensions_Create
```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 +49,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.
@@ -78,7 +78,37 @@ public final class ExtensionsCreateSamples {
"omsagent.secret.wsid",
"a38cef99-5a89-52ed-b6db-22095c23664b"))
.withConfigurationProtectedSettings(mapOf("omsagent.secret.key", "secretKeyValue01")),
- Context.NONE);
+ com.azure.core.util.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"),
+ com.azure.core.util.Context.NONE);
}
@SuppressWarnings("unchecked")
@@ -97,12 +127,10 @@ public final class ExtensionsCreateSamples {
### Extensions_Delete
```java
-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.
@@ -120,7 +148,7 @@ public final class ExtensionsDeleteSamples {
"clusterName1",
"ClusterMonitor",
null,
- Context.NONE);
+ com.azure.core.util.Context.NONE);
}
}
```
@@ -128,12 +156,31 @@ public final class ExtensionsDeleteSamples {
### Extensions_Get
```java
-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",
+ com.azure.core.util.Context.NONE);
+ }
+
+ /*
+ * x-ms-original-file: specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/stable/2022-11-01/examples/GetExtension.json
*/
/**
* Sample code: Get Extension.
@@ -145,7 +192,12 @@ public final class ExtensionsGetSamples {
manager
.extensions()
.getWithResponse(
- "rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", "ClusterMonitor", Context.NONE);
+ "rg1",
+ "Microsoft.Kubernetes",
+ "connectedClusters",
+ "clusterName1",
+ "ClusterMonitor",
+ com.azure.core.util.Context.NONE);
}
}
```
@@ -153,12 +205,10 @@ public final class ExtensionsGetSamples {
### Extensions_List
```java
-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.
@@ -167,7 +217,9 @@ public final class ExtensionsListSamples {
*/
public static void listExtensions(
com.azure.resourcemanager.kubernetesconfiguration.SourceControlConfigurationManager manager) {
- manager.extensions().list("rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", Context.NONE);
+ manager
+ .extensions()
+ .list("rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", com.azure.core.util.Context.NONE);
}
}
```
@@ -175,7 +227,6 @@ public final class ExtensionsListSamples {
### Extensions_Update
```java
-import com.azure.core.util.Context;
import com.azure.resourcemanager.kubernetesconfiguration.models.PatchExtension;
import java.util.HashMap;
import java.util.Map;
@@ -183,7 +234,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.
@@ -210,7 +261,7 @@ public final class ExtensionsUpdateSamples {
"omsagent.secret.wsid",
"a38cef99-5a89-52ed-b6db-22095c23664b"))
.withConfigurationProtectedSettings(mapOf("omsagent.secret.key", "secretKeyValue01")),
- Context.NONE);
+ com.azure.core.util.Context.NONE);
}
@SuppressWarnings("unchecked")
@@ -229,12 +280,10 @@ public final class ExtensionsUpdateSamples {
### FluxConfigOperationStatus_Get
```java
-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.
@@ -252,7 +301,7 @@ public final class FluxConfigOperationStatusGetSamples {
"clusterName1",
"srs-fluxconfig",
"99999999-9999-9999-9999-999999999999",
- Context.NONE);
+ com.azure.core.util.Context.NONE);
}
}
```
@@ -260,7 +309,6 @@ public final class FluxConfigOperationStatusGetSamples {
### FluxConfigurations_CreateOrUpdate
```java
-import com.azure.core.util.Context;
import com.azure.resourcemanager.kubernetesconfiguration.fluent.models.FluxConfigurationInner;
import com.azure.resourcemanager.kubernetesconfiguration.models.BucketDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.GitRepositoryDefinition;
@@ -275,7 +323,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.
@@ -320,11 +368,11 @@ public final class FluxConfigurationsCreateOrUpdateSamples {
.withSyncIntervalInSeconds(600L)
.withRetryIntervalInSeconds(600L)
.withPrune(false))),
- Context.NONE);
+ com.azure.core.util.Context.NONE);
}
/*
- * 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.
@@ -352,7 +400,7 @@ public final class FluxConfigurationsCreateOrUpdateSamples {
.withBucketName("flux")
.withTimeoutInSeconds(1000L)
.withSyncIntervalInSeconds(1000L)
- .withAccessKey("fluxminiotest"))
+ .withAccessKey("fakeTokenPlaceholder"))
.withKustomizations(
mapOf(
"srs-kustomization1",
@@ -369,7 +417,7 @@ public final class FluxConfigurationsCreateOrUpdateSamples {
.withSyncIntervalInSeconds(600L)
.withRetryIntervalInSeconds(600L)
.withPrune(false))),
- Context.NONE);
+ com.azure.core.util.Context.NONE);
}
@SuppressWarnings("unchecked")
@@ -388,12 +436,10 @@ public final class FluxConfigurationsCreateOrUpdateSamples {
### FluxConfigurations_Delete
```java
-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.
@@ -411,7 +457,7 @@ public final class FluxConfigurationsDeleteSamples {
"clusterName1",
"srs-fluxconfig",
null,
- Context.NONE);
+ com.azure.core.util.Context.NONE);
}
}
```
@@ -419,12 +465,10 @@ public final class FluxConfigurationsDeleteSamples {
### FluxConfigurations_Get
```java
-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.
@@ -436,7 +480,12 @@ public final class FluxConfigurationsGetSamples {
manager
.fluxConfigurations()
.getWithResponse(
- "rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", "srs-fluxconfig", Context.NONE);
+ "rg1",
+ "Microsoft.Kubernetes",
+ "connectedClusters",
+ "clusterName1",
+ "srs-fluxconfig",
+ com.azure.core.util.Context.NONE);
}
}
```
@@ -444,12 +493,10 @@ public final class FluxConfigurationsGetSamples {
### FluxConfigurations_List
```java
-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.
@@ -460,7 +507,7 @@ public final class FluxConfigurationsListSamples {
com.azure.resourcemanager.kubernetesconfiguration.SourceControlConfigurationManager manager) {
manager
.fluxConfigurations()
- .list("rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", Context.NONE);
+ .list("rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", com.azure.core.util.Context.NONE);
}
}
```
@@ -468,7 +515,6 @@ public final class FluxConfigurationsListSamples {
### FluxConfigurations_Update
```java
-import com.azure.core.util.Context;
import com.azure.resourcemanager.kubernetesconfiguration.models.FluxConfigurationPatch;
import com.azure.resourcemanager.kubernetesconfiguration.models.GitRepositoryPatchDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.KustomizationPatchDefinition;
@@ -478,7 +524,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.
@@ -512,7 +558,7 @@ public final class FluxConfigurationsUpdateSamples {
new KustomizationPatchDefinition()
.withPath("./test/another-path")
.withSyncIntervalInSeconds(300L))),
- Context.NONE);
+ com.azure.core.util.Context.NONE);
}
@SuppressWarnings("unchecked")
@@ -531,12 +577,10 @@ public final class FluxConfigurationsUpdateSamples {
### OperationStatus_Get
```java
-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.
@@ -554,7 +598,7 @@ public final class OperationStatusGetSamples {
"clusterName1",
"ClusterMonitor",
"99999999-9999-9999-9999-999999999999",
- Context.NONE);
+ com.azure.core.util.Context.NONE);
}
}
```
@@ -562,12 +606,10 @@ public final class OperationStatusGetSamples {
### OperationStatus_List
```java
-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.
@@ -578,7 +620,7 @@ public final class OperationStatusListSamples {
com.azure.resourcemanager.kubernetesconfiguration.SourceControlConfigurationManager manager) {
manager
.operationStatus()
- .list("rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", Context.NONE);
+ .list("rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", com.azure.core.util.Context.NONE);
}
}
```
@@ -586,12 +628,10 @@ public final class OperationStatusListSamples {
### Operations_List
```java
-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.
@@ -600,7 +640,7 @@ public final class OperationsListSamples {
*/
public static void batchAccountDelete(
com.azure.resourcemanager.kubernetesconfiguration.SourceControlConfigurationManager manager) {
- manager.operations().list(Context.NONE);
+ manager.operations().list(com.azure.core.util.Context.NONE);
}
}
```
@@ -608,7 +648,6 @@ public final class OperationsListSamples {
### SourceControlConfigurations_CreateOrUpdate
```java
-import com.azure.core.util.Context;
import com.azure.resourcemanager.kubernetesconfiguration.fluent.models.SourceControlConfigurationInner;
import com.azure.resourcemanager.kubernetesconfiguration.models.HelmOperatorProperties;
import com.azure.resourcemanager.kubernetesconfiguration.models.OperatorScopeType;
@@ -619,7 +658,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.
@@ -652,7 +691,7 @@ public final class SourceControlConfigurationsCreateOrUpdateSamples {
.withChartVersion("0.3.0")
.withChartValues(
"--set git.ssh.secretName=flux-git-deploy --set tillerNamespace=kube-system")),
- Context.NONE);
+ com.azure.core.util.Context.NONE);
}
@SuppressWarnings("unchecked")
@@ -671,12 +710,10 @@ public final class SourceControlConfigurationsCreateOrUpdateSamples {
### SourceControlConfigurations_Delete
```java
-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.
@@ -688,7 +725,12 @@ public final class SourceControlConfigurationsDeleteSamples {
manager
.sourceControlConfigurations()
.delete(
- "rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", "SRS_GitHubConfig", Context.NONE);
+ "rg1",
+ "Microsoft.Kubernetes",
+ "connectedClusters",
+ "clusterName1",
+ "SRS_GitHubConfig",
+ com.azure.core.util.Context.NONE);
}
}
```
@@ -696,12 +738,10 @@ public final class SourceControlConfigurationsDeleteSamples {
### SourceControlConfigurations_Get
```java
-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.
@@ -713,7 +753,12 @@ public final class SourceControlConfigurationsGetSamples {
manager
.sourceControlConfigurations()
.getWithResponse(
- "rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", "SRS_GitHubConfig", Context.NONE);
+ "rg1",
+ "Microsoft.Kubernetes",
+ "connectedClusters",
+ "clusterName1",
+ "SRS_GitHubConfig",
+ com.azure.core.util.Context.NONE);
}
}
```
@@ -721,12 +766,10 @@ public final class SourceControlConfigurationsGetSamples {
### SourceControlConfigurations_List
```java
-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.
@@ -737,7 +780,7 @@ public final class SourceControlConfigurationsListSamples {
com.azure.resourcemanager.kubernetesconfiguration.SourceControlConfigurationManager manager) {
manager
.sourceControlConfigurations()
- .list("rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", Context.NONE);
+ .list("rg1", "Microsoft.Kubernetes", "connectedClusters", "clusterName1", com.azure.core.util.Context.NONE);
}
}
```
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml
index ac56c852dc518..e244048798c16 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 94e2546db1985..c6793051e08b2 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 0643ae0f6084f..4cfb741f6e143 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 813fe4c5623d9..bbb3a1f7d127e 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 117c7f759de5e..43b4c260b7683 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 70a8eaa3a7ddf..cb51a6de82e3e 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 64eb81473e4f4..c3a0da1f4e6a6 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 1cc5344085846..27d3c54288ce3 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 b82bd241e0783..902af328187e5 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 4b0c1fbfaf127..eda7cca64071a 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 a7a34a1ffc188..1be67263e18ab 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 681a2550def68..6ce76f0361c8c 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 de7b5ec6590f9..ab8493f57afc8 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 241ab0e5494d9..db2bcb9ea4d0f 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 0415bff3cf908..856c56c8d10c5 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 cf7fe1877486f..d564f7fc0c38f 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 f60b928014c07..3074d2e235384 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
@@ -65,7 +65,7 @@ public final class ExtensionsClientImpl implements ExtensionsClient {
*/
@Host("{$host}")
@ServiceInterface(name = "SourceControlConfigu")
- private interface ExtensionsService {
+ public interface ExtensionsService {
@Headers({"Content-Type: application/json"})
@Put(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}"
@@ -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,
@@ -425,8 +425,8 @@ public SyncPoller, ExtensionInner> beginCreate(
String clusterName,
String extensionName,
ExtensionInner extension) {
- return beginCreateAsync(
- resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, extension)
+ return this
+ .beginCreateAsync(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, extension)
.getSyncPoller();
}
@@ -456,7 +456,8 @@ public SyncPoller, ExtensionInner> beginCreate(
String extensionName,
ExtensionInner extension,
Context context) {
- return beginCreateAsync(
+ return this
+ .beginCreateAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, extension, context)
.getSyncPoller();
}
@@ -744,14 +745,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 +758,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 +787,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 +982,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 +1059,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,9 +1070,10 @@ public SyncPoller, Void> beginDelete(
String clusterRp,
String clusterResourceName,
String clusterName,
- String extensionName,
- Boolean forceDelete) {
- return beginDeleteAsync(
+ String extensionName) {
+ final Boolean forceDelete = null;
+ return this
+ .beginDeleteAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, forceDelete)
.getSyncPoller();
}
@@ -1076,7 +1104,8 @@ public SyncPoller, Void> beginDelete(
String extensionName,
Boolean forceDelete,
Context context) {
- return beginDeleteAsync(
+ return this
+ .beginDeleteAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, forceDelete, context)
.getSyncPoller();
}
@@ -1172,32 +1201,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.
*
@@ -1504,7 +1507,8 @@ public SyncPoller, ExtensionInner> beginUpdate(
String clusterName,
String extensionName,
PatchExtension patchExtension) {
- return beginUpdateAsync(
+ return this
+ .beginUpdateAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, patchExtension)
.getSyncPoller();
}
@@ -1535,7 +1539,8 @@ public SyncPoller, ExtensionInner> beginUpdate(
String extensionName,
PatchExtension patchExtension,
Context context) {
- return beginUpdateAsync(
+ return this
+ .beginUpdateAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, patchExtension, context)
.getSyncPoller();
}
@@ -1891,7 +1896,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 +1933,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 26b7631140227..a934cfb974f5e 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 7dee5d2f41c69..ab214281a879f 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
@@ -52,7 +52,7 @@ public final class FluxConfigOperationStatusClientImpl implements FluxConfigOper
*/
@Host("{$host}")
@ServiceInterface(name = "SourceControlConfigu")
- private interface FluxConfigOperationStatusService {
+ public interface FluxConfigOperationStatusService {
@Headers({"Content-Type: application/json"})
@Get(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}"
@@ -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 5372e3afdb0ee..27114eaed2891 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 3a489ff316689..f3d5621de2450 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 231fdeabd1bcc..629b263cb1db4 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
@@ -65,7 +65,7 @@ public final class FluxConfigurationsClientImpl implements FluxConfigurationsCli
*/
@Host("{$host}")
@ServiceInterface(name = "SourceControlConfigu")
- private interface FluxConfigurationsService {
+ public interface FluxConfigurationsService {
@Headers({"Content-Type: application/json"})
@Get(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}"
@@ -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();
}
/**
@@ -675,7 +670,8 @@ public SyncPoller, FluxConfigurationInner> be
String clusterName,
String fluxConfigurationName,
FluxConfigurationInner fluxConfiguration) {
- return beginCreateOrUpdateAsync(
+ return this
+ .beginCreateOrUpdateAsync(
resourceGroupName,
clusterRp,
clusterResourceName,
@@ -711,7 +707,8 @@ public SyncPoller, FluxConfigurationInner> be
String fluxConfigurationName,
FluxConfigurationInner fluxConfiguration,
Context context) {
- return beginCreateOrUpdateAsync(
+ return this
+ .beginCreateOrUpdateAsync(
resourceGroupName,
clusterRp,
clusterResourceName,
@@ -1143,7 +1140,8 @@ public SyncPoller, FluxConfigurationInner> be
String clusterName,
String fluxConfigurationName,
FluxConfigurationPatch fluxConfigurationPatch) {
- return beginUpdateAsync(
+ return this
+ .beginUpdateAsync(
resourceGroupName,
clusterRp,
clusterResourceName,
@@ -1179,7 +1177,8 @@ public SyncPoller, FluxConfigurationInner> be
String fluxConfigurationName,
FluxConfigurationPatch fluxConfigurationPatch,
Context context) {
- return beginUpdateAsync(
+ return this
+ .beginUpdateAsync(
resourceGroupName,
clusterRp,
clusterResourceName,
@@ -1519,6 +1518,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 +1604,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,9 +1615,10 @@ public SyncPoller, Void> beginDelete(
String clusterRp,
String clusterResourceName,
String clusterName,
- String fluxConfigurationName,
- Boolean forceDelete) {
- return beginDeleteAsync(
+ String fluxConfigurationName) {
+ final Boolean forceDelete = null;
+ return this
+ .beginDeleteAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, forceDelete)
.getSyncPoller();
}
@@ -1618,7 +1650,8 @@ public SyncPoller, Void> beginDelete(
String fluxConfigurationName,
Boolean forceDelete,
Context context) {
- return beginDeleteAsync(
+ return this
+ .beginDeleteAsync(
resourceGroupName,
clusterRp,
clusterResourceName,
@@ -1729,34 +1762,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 +2055,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 +2092,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 db1a4e7a1face..143916f663de7 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 21c3c3f1a5f13..4080a729052ef 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
@@ -55,7 +55,7 @@ public final class OperationStatusClientImpl implements OperationStatusClient {
*/
@Host("{$host}")
@ServiceInterface(name = "SourceControlConfigu")
- private interface OperationStatusService {
+ public interface OperationStatusService {
@Headers({"Content-Type: application/json"})
@Get(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}"
@@ -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 9900341994922..00bd33353cee5 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 60e4105a9a08d..3ffeff9902b46 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
@@ -55,7 +55,7 @@ public final class OperationsClientImpl implements OperationsClient {
*/
@Host("{$host}")
@ServiceInterface(name = "SourceControlConfigu")
- private interface OperationsService {
+ public interface OperationsService {
@Headers({"Content-Type: application/json"})
@Get("/providers/Microsoft.KubernetesConfiguration/operations")
@ExpectedResponses({200})
@@ -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 752d006aea87a..5992b14a97f1a 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 92ed100101ea9..42e845560db22 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