CodeGen from PR 25576 in Azure/azure-rest-api-specs

Merge eaa351eba077a5f8d714abee52f48d37d83f3b39 into 3e3098d6b9302e166b611ce72b3392786d3ea0f7
azure-sdk · Aug 30, 2023 · 3be3444 · 3be3444
1 parent 75674e1
commit 3be3444
Show file tree

Hide file tree

Showing 10 changed files with 224 additions and 40 deletions.
diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/CHANGELOG.md b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/CHANGELOG.md
@@ -1,15 +1,19 @@
 # Release History
+
+## 6.1.0 (2023-08-30)
+
+**Features**
 
-## 6.0.1 (Unreleased)
-
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
-
+  - Added Interface PostBuildDefinition
+  - Added Interface SubstituteFromDefinition
+  - Interface FluxConfiguration has a new optional parameter reconciliationWaitDuration
+  - Interface FluxConfiguration has a new optional parameter waitForReconciliation
+  - Interface KustomizationDefinition has a new optional parameter postBuild
+  - Interface KustomizationDefinition has a new optional parameter wait
+  - Interface KustomizationPatchDefinition has a new optional parameter postBuild
+  - Interface KustomizationPatchDefinition has a new optional parameter wait
+    
+    
 ## 6.0.0 (2023-05-11)
 
 **Features**

diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/_meta.json b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/_meta.json
@@ -1,8 +1,8 @@
 {
-  "commit": "fb9c8e2ca33e9723c2b2fc849f627329067feb54",
+  "commit": "d432a01ad660ae9bd2cab94d75f1b0f57b52caf3",
   "readme": "specification/kubernetesconfiguration/resource-manager/readme.md",
-  "autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\kubernetesconfiguration\\resource-manager\\readme.md --use=@autorest/typescript@6.0.1 --generate-sample=true",
+  "autorest_command": "autorest --version=3.9.7 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/kubernetesconfiguration/resource-manager/readme.md --use=@autorest/typescript@^6.0.4",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "release_tool": "@azure-tools/js-sdk-release-tools@2.6.2",
-  "use": "@autorest/typescript@6.0.1"
+  "release_tool": "@azure-tools/js-sdk-release-tools@2.7.2",
+  "use": "@autorest/typescript@^6.0.4"
 }
diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/package.json b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/package.json
@@ -3,17 +3,17 @@
   "sdk-type": "mgmt",
   "author": "Microsoft Corporation",
   "description": "A generated SDK for SourceControlConfigurationClient.",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "engines": {
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@azure/core-lro": "^2.5.0",
+    "@azure/core-lro": "^2.5.4",
     "@azure/abort-controller": "^1.0.0",
     "@azure/core-paging": "^1.2.0",
     "@azure/core-client": "^1.7.0",
     "@azure/core-auth": "^1.3.0",
-    "@azure/core-rest-pipeline": "^1.8.0",
+    "@azure/core-rest-pipeline": "^1.12.0",
     "tslib": "^2.2.0"
   },
   "keywords": [
@@ -48,8 +48,8 @@
     "chai": "^4.2.0",
     "cross-env": "^7.0.2",
     "@types/node": "^14.0.0",
-    "@azure/dev-tool": "^1.0.0",
-    "ts-node": "^10.0.0"
+    "ts-node": "^10.0.0",
+    "@azure/dev-tool": "^1.0.0"
   },
   "repository": {
     "type": "git",
@@ -112,13 +112,5 @@
     ]
   },
   "autoPublish": true,
-  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/kubernetesconfiguration/arm-kubernetesconfiguration",
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-kubernetesconfiguration?view=azure-node-preview"
-  }
-}
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/kubernetesconfiguration/arm-kubernetesconfiguration"
+}
diff --git a/...iguration/arm-kubernetesconfiguration/review/arm-kubernetesconfiguration.api.md b/...iguration/arm-kubernetesconfiguration/review/arm-kubernetesconfiguration.api.md
@@ -233,6 +233,7 @@ export interface FluxConfiguration extends ProxyResource {
     };
     namespace?: string;
     readonly provisioningState?: ProvisioningState;
+    reconciliationWaitDuration?: string;
     readonly repositoryPublicKey?: string;
     scope?: ScopeType;
     sourceKind?: SourceKindType;
@@ -242,6 +243,7 @@ export interface FluxConfiguration extends ProxyResource {
     readonly statusUpdatedAt?: Date;
     suspend?: boolean;
     readonly systemData?: SystemData;
+    waitForReconciliation?: boolean;
 }
 
 // @public
@@ -468,21 +470,25 @@ export interface KustomizationDefinition {
     force?: boolean;
     readonly name?: string;
     path?: string;
+    postBuild?: PostBuildDefinition;
     prune?: boolean;
     retryIntervalInSeconds?: number;
     syncIntervalInSeconds?: number;
     timeoutInSeconds?: number;
+    wait?: boolean;
 }
 
 // @public
 export interface KustomizationPatchDefinition {
     dependsOn?: string[];
     force?: boolean;
     path?: string;
+    postBuild?: PostBuildDefinition;
     prune?: boolean;
     retryIntervalInSeconds?: number;
     syncIntervalInSeconds?: number;
     timeoutInSeconds?: number;
+    wait?: boolean;
 }
 
 // @public
@@ -621,6 +627,14 @@ export interface Plan {
     version?: string;
 }
 
+// @public
+export interface PostBuildDefinition {
+    substitute?: {
+        [propertyName: string]: string;
+    };
+    substituteFrom?: (SubstituteFromDefinition | null)[];
+}
+
 // @public
 export type ProvisioningState = string;
 
@@ -809,6 +823,13 @@ export type SourceControlConfigurationsListResponse = SourceControlConfiguration
 // @public
 export type SourceKindType = string;
 
+// @public
+export interface SubstituteFromDefinition {
+    kind?: string;
+    name?: string;
+    optional?: boolean;
+}
+
 // @public
 export interface SystemData {
     createdAt?: Date;

diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/index.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/index.ts
@@ -332,6 +332,28 @@ export interface KustomizationDefinition {
   prune?: boolean;
   /** Enable/disable re-creating Kubernetes resources on the cluster when patching fails due to an immutable field change. */
   force?: boolean;
+  /** Enable/disable health check for all Kubernetes objects created by this Kustomization. */
+  wait?: boolean;
+  /** Used for variable substitution for this Kustomization after kustomize build. */
+  postBuild?: PostBuildDefinition;
+}
+
+/** The postBuild definitions defining variable substitutions for this Kustomization after kustomize build. */
+export interface PostBuildDefinition {
+  /** Key/value pairs holding the variables to be substituted in this Kustomization. */
+  substitute?: { [propertyName: string]: string };
+  /** Array of ConfigMaps/Secrets from which the variables are substituted for this Kustomization. */
+  substituteFrom?: (SubstituteFromDefinition | null)[];
+}
+
+/** Array of ConfigMaps/Secrets from which the variables are substituted for this Kustomization. */
+export interface SubstituteFromDefinition {
+  /** Define whether it is ConfigMap or Secret that holds the variables to be used in substitution. */
+  kind?: string;
+  /** Name of the ConfigMap/Secret that holds the variables to be used in substitution. */
+  name?: string;
+  /** Set to True to proceed without ConfigMap/Secret, if it is not present. */
+  optional?: boolean;
 }
 
 /** Statuses of objects deployed by the user-specified kustomizations from the git repository. */
@@ -506,6 +528,10 @@ export interface KustomizationPatchDefinition {
   prune?: boolean;
   /** Enable/disable re-creating Kubernetes resources on the cluster when patching fails due to an immutable field change. */
   force?: boolean;
+  /** Enable/disable health check for all Kubernetes objects created by this Kustomization. */
+  wait?: boolean;
+  /** Used for variable substitution for this Kustomization after kustomize build. */
+  postBuild?: PostBuildDefinition;
 }
 
 /** Result of the request to list Flux Configurations.  It contains a list of FluxConfiguration objects and a URL link to get the next set of results. */
@@ -728,6 +754,10 @@ export interface FluxConfiguration extends ProxyResource {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly statusUpdatedAt?: Date;
+  /** Whether flux configuration deployment should wait for cluster to reconcile the kustomizations. */
+  waitForReconciliation?: boolean;
+  /** Maximum duration to wait for flux configuration reconciliation. E.g PT1H, PT5M, P1D */
+  reconciliationWaitDuration?: string;
   /**
    * Combined status of the Flux Kubernetes resources created by the fluxConfiguration or created by the managed objects.
    * NOTE: This property will not be serialized. It can only be populated by the server.

diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/mappers.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/mappers.ts
@@ -863,6 +863,78 @@ export const KustomizationDefinition: coreClient.CompositeMapper = {
         type: {
           name: "Boolean"
         }
+      },
+      wait: {
+        defaultValue: true,
+        serializedName: "wait",
+        type: {
+          name: "Boolean"
+        }
+      },
+      postBuild: {
+        serializedName: "postBuild",
+        type: {
+          name: "Composite",
+          className: "PostBuildDefinition"
+        }
+      }
+    }
+  }
+};
+
+export const PostBuildDefinition: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "PostBuildDefinition",
+    modelProperties: {
+      substitute: {
+        serializedName: "substitute",
+        nullable: true,
+        type: {
+          name: "Dictionary",
+          value: { type: { name: "String" } }
+        }
+      },
+      substituteFrom: {
+        serializedName: "substituteFrom",
+        nullable: true,
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "SubstituteFromDefinition"
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
+export const SubstituteFromDefinition: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "SubstituteFromDefinition",
+    modelProperties: {
+      kind: {
+        serializedName: "kind",
+        type: {
+          name: "String"
+        }
+      },
+      name: {
+        serializedName: "name",
+        type: {
+          name: "String"
+        }
+      },
+      optional: {
+        defaultValue: false,
+        serializedName: "optional",
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -1417,6 +1489,20 @@ export const KustomizationPatchDefinition: coreClient.CompositeMapper = {
         type: {
           name: "Boolean"
         }
+      },
+      wait: {
+        serializedName: "wait",
+        nullable: true,
+        type: {
+          name: "Boolean"
+        }
+      },
+      postBuild: {
+        serializedName: "postBuild",
+        type: {
+          name: "Composite",
+          className: "PostBuildDefinition"
+        }
       }
     }
   }
@@ -1944,6 +2030,20 @@ export const FluxConfiguration: coreClient.CompositeMapper = {
           name: "DateTime"
         }
       },
+      waitForReconciliation: {
+        serializedName: "properties.waitForReconciliation",
+        nullable: true,
+        type: {
+          name: "Boolean"
+        }
+      },
+      reconciliationWaitDuration: {
+        serializedName: "properties.reconciliationWaitDuration",
+        nullable: true,
+        type: {
+          name: "String"
+        }
+      },
       complianceState: {
         defaultValue: "Unknown",
         serializedName: "properties.complianceState",

diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/parameters.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/parameters.ts
@@ -136,7 +136,7 @@ export const extensionName: OperationURLParameter = {
 export const apiVersion: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2022-11-01",
+    defaultValue: "2023-05-01",
     isConstant: true,
     serializedName: "api-version",
     type: {

diff --git a/...bernetesconfiguration/arm-kubernetesconfiguration/src/sourceControlConfigurationClient.ts b/...bernetesconfiguration/arm-kubernetesconfiguration/src/sourceControlConfigurationClient.ts
@@ -64,7 +64,7 @@ export class SourceControlConfigurationClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-kubernetesconfiguration/6.0.1`;
+    const packageDetails = `azsdk-js-arm-kubernetesconfiguration/6.1.0`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -117,7 +117,7 @@ export class SourceControlConfigurationClient extends coreClient.ServiceClient {
 
     // Assigning values to Constant parameters
     this.$host = options.$host || "https://management.azure.com";
-    this.apiVersion = options.apiVersion || "2022-11-01";
+    this.apiVersion = options.apiVersion || "2023-05-01";
     this.extensions = new ExtensionsImpl(this);
     this.operationStatus = new OperationStatusImpl(this);
     this.fluxConfigurations = new FluxConfigurationsImpl(this);