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

Merge a8eb5c205f7eb241eae0fc9f8512266288363fdc into 1eca31ca34684ba4ba1e57a1e2b3fb82c7e20ec4

sdk/containerservice/arm-containerservice/README.md

@@ -15,7 +15,7 @@ npm install @azure/arm-containerservice
 
 ### How to use
 
-#### nodejs - Authentication, client creation and list openShiftManagedClusters as an example written in TypeScript.
+#### nodejs - client creation and list operations as an example written in TypeScript.
 
 ##### Install @azure/ms-rest-nodeauth
 
@@ -26,16 +26,15 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"
 
 ##### Sample code
 
+While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
 ```typescript
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
-import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
-import { ContainerServiceClient, ContainerServiceModels, ContainerServiceMappers } from "@azure/arm-containerservice";
+const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
+const { ContainerServiceClient } = require("@azure/arm-containerservice");
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
 
 msRestNodeAuth.interactiveLogin().then((creds) => {
   const client = new ContainerServiceClient(creds, subscriptionId);
-  client.openShiftManagedClusters.list().then((result) => {
+  client.operations.list().then((result) => {
     console.log("The result is:");
     console.log(result);
   });
@@ -44,7 +43,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => {
 });
 ```
 
-#### browser - Authentication, client creation and list openShiftManagedClusters as an example written in JavaScript.
+#### browser - Authentication, client creation and list operations as an example written in JavaScript.
 
 ##### Install @azure/ms-rest-browserauth
 
@@ -78,7 +77,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
           authManager.login();
         }
         const client = new Azure.ArmContainerservice.ContainerServiceClient(res.creds, subscriptionId);
-        client.openShiftManagedClusters.list().then((result) => {
+        client.operations.list().then((result) => {
           console.log("The result is:");
           console.log(result);
         }).catch((err) => {

sdk/containerservice/arm-containerservice/package.json

@@ -2,7 +2,7 @@
   "name": "@azure/arm-containerservice",
   "author": "Microsoft Corporation",
   "description": "ContainerServiceClient Library with typescript type definitions for node.js and browser.",
-  "version": "11.2.0",
+  "version": "12.0.0",
   "dependencies": {
     "@azure/ms-rest-azure-js": "^2.0.1",
     "@azure/ms-rest-js": "^2.0.4",

sdk/containerservice/arm-containerservice/rollup.config.js

@@ -21,8 +21,8 @@ const config = {
       "@azure/ms-rest-azure-js": "msRestAzure"
     },
     banner: `/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/containerservice/arm-containerservice/src/containerServiceClient.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is
@@ -17,12 +16,13 @@ import { ContainerServiceClientContext } from "./containerServiceClientContext";
 
 class ContainerServiceClient extends ContainerServiceClientContext {
   // Operation groups
-  openShiftManagedClusters: operations.OpenShiftManagedClusters;
-  containerServices: operations.ContainerServices;
   operations: operations.Operations;
   managedClusters: operations.ManagedClusters;
+  maintenanceConfigurations: operations.MaintenanceConfigurations;
   agentPools: operations.AgentPools;
   privateEndpointConnections: operations.PrivateEndpointConnections;
+  privateLinkResources: operations.PrivateLinkResources;
+  resolvePrivateLinkServiceId: operations.ResolvePrivateLinkServiceId;
 
   /**
    * Initializes a new instance of the ContainerServiceClient class.
@@ -33,12 +33,13 @@ class ContainerServiceClient extends ContainerServiceClientContext {
    */
   constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ContainerServiceClientOptions) {
     super(credentials, subscriptionId, options);
-    this.openShiftManagedClusters = new operations.OpenShiftManagedClusters(this);
-    this.containerServices = new operations.ContainerServices(this);
     this.operations = new operations.Operations(this);
     this.managedClusters = new operations.ManagedClusters(this);
+    this.maintenanceConfigurations = new operations.MaintenanceConfigurations(this);
     this.agentPools = new operations.AgentPools(this);
     this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
+    this.privateLinkResources = new operations.PrivateLinkResources(this);
+    this.resolvePrivateLinkServiceId = new operations.ResolvePrivateLinkServiceId(this);
   }
 }
 

sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is
@@ -13,11 +12,12 @@ import * as msRest from "@azure/ms-rest-js";
 import * as msRestAzure from "@azure/ms-rest-azure-js";
 
 const packageName = "@azure/arm-containerservice";
-const packageVersion = "11.2.0";
+const packageVersion = "12.0.0";
 
 export class ContainerServiceClientContext extends msRestAzure.AzureServiceClient {
   credentials: msRest.ServiceClientCredentials;
   subscriptionId: string;
+  apiVersion?: string;
 
   /**
    * Initializes a new instance of the ContainerServiceClient class.
@@ -37,24 +37,25 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien
     if (!options) {
       options = {};
     }
-    if (!options.userAgent) {
+    if(!options.userAgent) {
       const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
       options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
     }
 
     super(credentials, options);
 
+    this.apiVersion = '2020-12-01';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
     this.requestContentType = "application/json; charset=utf-8";
     this.credentials = credentials;
     this.subscriptionId = subscriptionId;
 
-    if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
+    if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
       this.acceptLanguage = options.acceptLanguage;
     }
-    if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
+    if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
       this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
     }
   }

sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts

@@ -1,13 +1,12 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
 export {
-  discriminators,
   AgentPool,
   AgentPoolAvailableVersions,
   AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem,
@@ -17,20 +16,13 @@ export {
   AgentPoolUpgradeSettings,
   BaseResource,
   CloudError,
-  ContainerService,
-  ContainerServiceAgentPoolProfile,
-  ContainerServiceCustomProfile,
-  ContainerServiceDiagnosticsProfile,
   ContainerServiceLinuxProfile,
-  ContainerServiceMasterProfile,
   ContainerServiceNetworkProfile,
-  ContainerServiceOrchestratorProfile,
-  ContainerServiceServicePrincipalProfile,
   ContainerServiceSshConfiguration,
   ContainerServiceSshPublicKey,
-  ContainerServiceVMDiagnostics,
-  ContainerServiceWindowsProfile,
-  KeyVaultSecretRef,
+  KubeletConfig,
+  LinuxOSConfig,
+  MaintenanceConfiguration,
   ManagedCluster,
   ManagedClusterAADProfile,
   ManagedClusterAccessProfile,
@@ -39,32 +31,32 @@ export {
   ManagedClusterAgentPoolProfile,
   ManagedClusterAgentPoolProfileProperties,
   ManagedClusterAPIServerAccessProfile,
+  ManagedClusterAutoUpgradeProfile,
   ManagedClusterIdentity,
   ManagedClusterIdentityUserAssignedIdentitiesValue,
   ManagedClusterLoadBalancerProfile,
   ManagedClusterLoadBalancerProfileManagedOutboundIPs,
   ManagedClusterLoadBalancerProfileOutboundIPPrefixes,
   ManagedClusterLoadBalancerProfileOutboundIPs,
+  ManagedClusterPodIdentity,
+  ManagedClusterPodIdentityException,
+  ManagedClusterPodIdentityProfile,
+  ManagedClusterPodIdentityProvisioningInfo,
   ManagedClusterPropertiesAutoScalerProfile,
   ManagedClusterPropertiesIdentityProfileValue,
   ManagedClusterServicePrincipalProfile,
   ManagedClusterSKU,
   ManagedClusterWindowsProfile,
-  NetworkProfile,
-  OpenShiftManagedCluster,
-  OpenShiftManagedClusterAADIdentityProvider,
-  OpenShiftManagedClusterAgentPoolProfile,
-  OpenShiftManagedClusterAuthProfile,
-  OpenShiftManagedClusterBaseIdentityProvider,
-  OpenShiftManagedClusterIdentityProvider,
-  OpenShiftManagedClusterMasterPoolProfile,
-  OpenShiftRouterProfile,
+  PowerState,
   PrivateEndpoint,
   PrivateEndpointConnection,
   PrivateLinkServiceConnectionState,
-  PurchasePlan,
   Resource,
   ResourceReference,
   SubResource,
+  SysctlConfig,
+  SystemData,
+  TimeInWeek,
+  TimeSpan,
   UserAssignedIdentity
 } from "../models/mappers";

sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts

@@ -58,6 +58,7 @@ export {
   OrchestratorProfile,
   OrchestratorVersionProfile,
   OrchestratorVersionProfileListResult,
+  PowerState,
   PrivateEndpoint,
   PrivateEndpointConnection,
   PrivateLinkServiceConnectionState,