From 0e4e3d91d5fc9d7a412d6f6e1a562c20d8cdf070 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 15 Oct 2018 21:49:44 +0000 Subject: [PATCH 1/6] Generated from 663fe8f24bfa51bd8ea47b8e047d1c7d27dd776d rebase and resolve conflict --- .../containerservicesManagement/README.md | 6 +- .../lib/containerServiceClient.d.ts | 1 - .../lib/containerServiceClient.js | 1 - .../lib/models/index.d.ts | 281 +----- .../lib/models/index.js | 17 +- .../lib/models/managedCluster.js | 1 - .../lib/models/managedClusterAADProfile.js | 4 +- .../models/managedClusterAgentPoolProfile.js | 50 +- .../lib/operations/index.d.ts | 857 +----------------- .../lib/operations/index.js | 1 - .../lib/operations/managedClusters.js | 290 +----- .../lib/operations/operations.js | 2 +- 12 files changed, 89 insertions(+), 1422 deletions(-) diff --git a/lib/services/containerservicesManagement/README.md b/lib/services/containerservicesManagement/README.md index 2a1bd6ba5d..bcda4fd300 100644 --- a/lib/services/containerservicesManagement/README.md +++ b/lib/services/containerservicesManagement/README.md @@ -18,7 +18,7 @@ npm install azure-arm-containerservice ## How to use -### Authentication, client creation and get openShiftManagedClusters as an example. +### Authentication, client creation and list containerServices as an example. ```javascript const msRestAzure = require("ms-rest-azure"); @@ -26,9 +26,7 @@ const ContainerServiceClient = require("azure-arm-containerservice"); msRestAzure.interactiveLogin().then((creds) => { const subscriptionId = ""; const client = new ContainerServiceClient(creds, subscriptionId); - const resourceGroupName = "testresourceGroupName"; - const resourceName = "testresourceName"; - return client.openShiftManagedClusters.get(resourceGroupName, resourceName).then((result) => { + return client.containerServices.list().then((result) => { console.log("The result is:"); console.log(result); }); diff --git a/lib/services/containerservicesManagement/lib/containerServiceClient.d.ts b/lib/services/containerservicesManagement/lib/containerServiceClient.d.ts index 988e12858e..67db569fd8 100644 --- a/lib/services/containerservicesManagement/lib/containerServiceClient.d.ts +++ b/lib/services/containerservicesManagement/lib/containerServiceClient.d.ts @@ -54,7 +54,6 @@ export default class ContainerServiceClient extends AzureServiceClient { generateClientRequestId: boolean; // Operation groups - openShiftManagedClusters: operations.OpenShiftManagedClusters; containerServices: operations.ContainerServices; operations: operations.Operations; managedClusters: operations.ManagedClusters; diff --git a/lib/services/containerservicesManagement/lib/containerServiceClient.js b/lib/services/containerservicesManagement/lib/containerServiceClient.js index 142bb2aa12..23e4792c0e 100644 --- a/lib/services/containerservicesManagement/lib/containerServiceClient.js +++ b/lib/services/containerservicesManagement/lib/containerServiceClient.js @@ -71,7 +71,6 @@ class ContainerServiceClient extends ServiceClient { if(options.generateClientRequestId !== null && options.generateClientRequestId !== undefined) { this.generateClientRequestId = options.generateClientRequestId; } - this.openShiftManagedClusters = new operations.OpenShiftManagedClusters(this); this.containerServices = new operations.ContainerServices(this); this.operations = new operations.Operations(this); this.managedClusters = new operations.ManagedClusters(this); diff --git a/lib/services/containerservicesManagement/lib/models/index.d.ts b/lib/services/containerservicesManagement/lib/models/index.d.ts index 401777381b..7a4fcbd20f 100644 --- a/lib/services/containerservicesManagement/lib/models/index.d.ts +++ b/lib/services/containerservicesManagement/lib/models/index.d.ts @@ -36,238 +36,6 @@ export interface Resource extends BaseResource { tags?: { [propertyName: string]: string }; } -/** - * @class - * Initializes a new instance of the PurchasePlan class. - * @constructor - * Used for establishing the purchase context of any 3rd Party artifact through - * MarketPlace. - * - * @member {string} [name] The plan ID. - * @member {string} [product] Specifies the product of the image from the - * marketplace. This is the same value as Offer under the imageReference - * element. - * @member {string} [promotionCode] The promotion code. - * @member {string} [publisher] The plan ID. - */ -export interface PurchasePlan { - name?: string; - product?: string; - promotionCode?: string; - publisher?: string; -} - -/** - * @class - * Initializes a new instance of the OpenShiftRouterProfile class. - * @constructor - * Represents an OpenShift router - * - * @member {string} [name] Name of the router profile. - * @member {string} [publicSubdomain] DNS subdomain for openshift router. - * @member {string} [fqdn] Auto-allocated FQDN for the OpenShift router. - */ -export interface OpenShiftRouterProfile { - name?: string; - publicSubdomain?: string; - readonly fqdn?: string; -} - -/** - * @class - * Initializes a new instance of the NetworkProfile class. - * @constructor - * Represents the OpenShift networking configuration - * - * @member {string} [vnetCidr] CIDR for the OpenShift Vnet. Default value: - * '10.0.0.0/8' . - * @member {string} [peerVnetId] CIDR of the Vnet to peer. - */ -export interface NetworkProfile { - vnetCidr?: string; - peerVnetId?: string; -} - -/** - * @class - * Initializes a new instance of the OpenShiftManagedClusterMasterPoolProfile class. - * @constructor - * OpenShiftManagedClusterMaterPoolProfile contains configuration for OpenShift - * master VMs. - * - * @member {string} [name] Unique name of the master pool profile in the - * context of the subscription and resource group. - * @member {number} count Number of masters (VMs) to host docker containers. - * The default value is 3. Default value: 3 . - * @member {string} vmSize Size of agent VMs. Possible values include: - * 'Standard_D2s_v3', 'Standard_D4s_v3' - * @member {string} [subnetCidr] Subnet CIDR for the peering. - * @member {string} [osType] OsType to be used to specify os type. Choose from - * Linux and Windows. Default to Linux. Possible values include: 'Linux', - * 'Windows'. Default value: 'Linux' . - */ -export interface OpenShiftManagedClusterMasterPoolProfile { - name?: string; - count: number; - vmSize: string; - subnetCidr?: string; - osType?: string; -} - -/** - * @class - * Initializes a new instance of the OpenShiftManagedClusterAgentPoolProfile class. - * @constructor - * Defines the configuration of the OpenShift cluster VMs. - * - * @member {string} name Unique name of the pool profile in the context of the - * subscription and resource group. - * @member {number} count Number of agents (VMs) to host docker containers. - * Allowed values must be in the range of 1 to 5 (inclusive). The default value - * is 2. . Default value: 2 . - * @member {string} vmSize Size of agent VMs. Possible values include: - * 'Standard_D2s_v3', 'Standard_D4s_v3' - * @member {string} [subnetCidr] Subnet CIDR for the peering. Default value: - * '10.0.0.0/24' . - * @member {string} [osType] OsType to be used to specify os type. Choose from - * Linux and Windows. Default to Linux. Possible values include: 'Linux', - * 'Windows'. Default value: 'Linux' . - * @member {string} [role] Define the role of the AgentPoolProfile. Possible - * values include: 'compute', 'infra' - */ -export interface OpenShiftManagedClusterAgentPoolProfile { - name: string; - count: number; - vmSize: string; - subnetCidr?: string; - osType?: string; - role?: string; -} - -/** - * @class - * Initializes a new instance of the OpenShiftManagedClusterBaseIdentityProvider class. - * @constructor - * Structure for any Identity provider. - * - * @member {string} kind Polymorphic Discriminator - */ -export interface OpenShiftManagedClusterBaseIdentityProvider { - kind: string; -} - -/** - * @class - * Initializes a new instance of the OpenShiftManagedClusterIdentityProvider class. - * @constructor - * Defines the configuration of the identity providers to be used in the - * OpenShift cluster. - * - * @member {string} [name] Name of the provider. - * @member {object} [provider] Configuration of the provider. - * @member {string} [provider.kind] Polymorphic Discriminator - */ -export interface OpenShiftManagedClusterIdentityProvider { - name?: string; - provider?: OpenShiftManagedClusterBaseIdentityProvider; -} - -/** - * @class - * Initializes a new instance of the OpenShiftManagedClusterAuthProfile class. - * @constructor - * Defines all possible authentication profiles for the OpenShift cluster. - * - * @member {array} [identityProviders] Type of authentication profile to use. - */ -export interface OpenShiftManagedClusterAuthProfile { - identityProviders?: OpenShiftManagedClusterIdentityProvider[]; -} - -/** - * @class - * Initializes a new instance of the OpenShiftManagedCluster class. - * @constructor - * OpenShift Managed cluster. - * - * @member {object} [plan] Define the resource plan as required by ARM for - * billing purposes - * @member {string} [plan.name] The plan ID. - * @member {string} [plan.product] Specifies the product of the image from the - * marketplace. This is the same value as Offer under the imageReference - * element. - * @member {string} [plan.promotionCode] The promotion code. - * @member {string} [plan.publisher] The plan ID. - * @member {string} [provisioningState] The current deployment or provisioning - * state, which only appears in the response. - * @member {string} openShiftVersion Version of OpenShift specified when - * creating the cluster. - * @member {string} [publicHostname] Optional user-specified FQDN for OpenShift - * API server. - * @member {string} [fqdn] User-specified FQDN for OpenShift API server - * loadbalancer internal hostname. - * @member {object} [networkProfile] Configuration for OpenShift networking. - * @member {string} [networkProfile.vnetCidr] CIDR for the OpenShift Vnet. - * @member {string} [networkProfile.peerVnetId] CIDR of the Vnet to peer. - * @member {array} [routerProfiles] Configuration for OpenShift router(s). - * @member {object} [masterPoolProfile] Configuration for OpenShift master VMs. - * @member {string} [masterPoolProfile.name] Unique name of the master pool - * profile in the context of the subscription and resource group. - * @member {number} [masterPoolProfile.count] Number of masters (VMs) to host - * docker containers. The default value is 3. - * @member {string} [masterPoolProfile.vmSize] Size of agent VMs. Possible - * values include: 'Standard_D2s_v3', 'Standard_D4s_v3' - * @member {string} [masterPoolProfile.subnetCidr] Subnet CIDR for the peering. - * @member {string} [masterPoolProfile.osType] OsType to be used to specify os - * type. Choose from Linux and Windows. Default to Linux. Possible values - * include: 'Linux', 'Windows' - * @member {array} [agentPoolProfiles] Configuration of OpenShift cluster VMs. - * @member {object} [authProfile] Configures OpenShift authentication. - * @member {array} [authProfile.identityProviders] Type of authentication - * profile to use. - */ -export interface OpenShiftManagedCluster extends Resource { - plan?: PurchasePlan; - readonly provisioningState?: string; - openShiftVersion: string; - publicHostname?: string; - fqdn?: string; - networkProfile?: NetworkProfile; - routerProfiles?: OpenShiftRouterProfile[]; - masterPoolProfile?: OpenShiftManagedClusterMasterPoolProfile; - agentPoolProfiles?: OpenShiftManagedClusterAgentPoolProfile[]; - authProfile?: OpenShiftManagedClusterAuthProfile; -} - -/** - * @class - * Initializes a new instance of the OpenShiftManagedClusterAADIdentityProvider class. - * @constructor - * Defines the Identity provider for MS AAD. - * - * @member {string} [clientId] The clientId password associated with the - * provider. - * @member {string} [secret] The secret password associated with the provider. - * @member {string} [tenantId] The tenantId associated with the provider. - */ -export interface OpenShiftManagedClusterAADIdentityProvider extends OpenShiftManagedClusterBaseIdentityProvider { - clientId?: string; - secret?: string; - tenantId?: string; -} - -/** - * @class - * Initializes a new instance of the TagsObject class. - * @constructor - * Tags object for patch operations. - * - * @member {object} [tags] Resource tags. - */ -export interface TagsObject { - tags?: { [propertyName: string]: string }; -} - /** * @class * Initializes a new instance of the ContainerServiceCustomProfile class. @@ -773,6 +541,18 @@ export interface OperationValue { readonly provider?: string; } +/** + * @class + * Initializes a new instance of the TagsObject class. + * @constructor + * Tags object for patch operations. + * + * @member {object} [tags] Resource tags. + */ +export interface TagsObject { + tags?: { [propertyName: string]: string }; +} + /** * @class * Initializes a new instance of the ManagedClusterServicePrincipalProfile class. @@ -797,7 +577,7 @@ export interface ManagedClusterServicePrincipalProfile { * * @member {string} name Unique name of the agent pool profile in the context * of the subscription and resource group. - * @member {number} [count] Number of agents (VMs) to host docker containers. + * @member {number} count Number of agents (VMs) to host docker containers. * Allowed values must be in the range of 1 to 100 (inclusive). The default * value is 1. . Default value: 1 . * @member {string} vmSize Size of agent VMs. Possible values include: @@ -853,25 +633,31 @@ export interface ManagedClusterServicePrincipalProfile { * @member {number} [osDiskSizeGB] OS Disk Size in GB to be used to specify the * disk size for every machine in this master/agent pool. If you specify 0, it * will apply the default osDisk size according to the vmSize specified. - * @member {string} [storageProfile] Storage profile specifies what kind of - * storage used. Defaults to ManagedDisks. Possible values include: - * 'StorageAccount', 'ManagedDisks' * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet * identifier. * @member {number} [maxPods] Maximum number of pods that can run on a node. * @member {string} [osType] OsType to be used to specify os type. Choose from * Linux and Windows. Default to Linux. Possible values include: 'Linux', * 'Windows'. Default value: 'Linux' . + * @member {number} [maxCount] Maximun number of nodes for auto-scaling + * @member {number} [minCount] Minimun number of nodes for auto-scaling + * @member {boolean} [enableAutoScaling] Wheter to enable auto-scaler + * @member {string} [type] AgentPoolType represents types of agentpool. + * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'. + * Default value: 'VirtualMachineScaleSets' . */ export interface ManagedClusterAgentPoolProfile { name: string; - count?: number; + count: number; vmSize: string; osDiskSizeGB?: number; - readonly storageProfile?: string; vnetSubnetID?: string; maxPods?: number; osType?: string; + maxCount?: number; + minCount?: number; + enableAutoScaling?: boolean; + type?: string; } /** @@ -928,14 +714,14 @@ export interface ManagedClusterAddonProfile { * * @member {string} clientAppID The client AAD application ID. * @member {string} serverAppID The server AAD application ID. - * @member {string} [serverAppSecret] The server AAD application secret. + * @member {string} serverAppSecret The server AAD application secret. * @member {string} [tenantID] The AAD tenant ID to use for authentication. If * not specified, will use the tenant of the deployment subscription. */ export interface ManagedClusterAADProfile { clientAppID: string; serverAppID: string; - serverAppSecret?: string; + serverAppSecret: string; tenantID?: string; } @@ -952,8 +738,7 @@ export interface ManagedClusterAADProfile { * @member {string} [dnsPrefix] DNS prefix specified when creating the managed * cluster. * @member {string} [fqdn] FDQN for the master pool. - * @member {array} [agentPoolProfiles] Properties of the agent pool. Currently - * only one agent pool can exist. + * @member {array} [agentPoolProfiles] Properties of the agent pool. * @member {object} [linuxProfile] Profile for Linux VMs in the container * service cluster. * @member {string} [linuxProfile.adminUsername] The administrator username to @@ -1029,18 +814,6 @@ export interface OrchestratorProfile { orchestratorVersion: string; } -/** - * @class - * Initializes a new instance of the ManagedClusterAccessProfile class. - * @constructor - * Managed cluster Access Profile. - * - * @member {buffer} [kubeConfig] Base64-encoded Kubernetes configuration file. - */ -export interface ManagedClusterAccessProfile extends Resource { - kubeConfig?: Buffer; -} - /** * @class * Initializes a new instance of the ManagedClusterPoolUpgradeProfile class. diff --git a/lib/services/containerservicesManagement/lib/models/index.js b/lib/services/containerservicesManagement/lib/models/index.js index fea896dbeb..c51f44f99b 100644 --- a/lib/services/containerservicesManagement/lib/models/index.js +++ b/lib/services/containerservicesManagement/lib/models/index.js @@ -19,17 +19,6 @@ var msRestAzure = require('ms-rest-azure'); exports.BaseResource = msRestAzure.BaseResource; exports.CloudError = msRestAzure.CloudError; exports.Resource = require('./resource'); -exports.PurchasePlan = require('./purchasePlan'); -exports.OpenShiftRouterProfile = require('./openShiftRouterProfile'); -exports.NetworkProfile = require('./networkProfile'); -exports.OpenShiftManagedClusterMasterPoolProfile = require('./openShiftManagedClusterMasterPoolProfile'); -exports.OpenShiftManagedClusterAgentPoolProfile = require('./openShiftManagedClusterAgentPoolProfile'); -exports.OpenShiftManagedClusterBaseIdentityProvider = require('./openShiftManagedClusterBaseIdentityProvider'); -exports.OpenShiftManagedClusterIdentityProvider = require('./openShiftManagedClusterIdentityProvider'); -exports.OpenShiftManagedClusterAuthProfile = require('./openShiftManagedClusterAuthProfile'); -exports.OpenShiftManagedCluster = require('./openShiftManagedCluster'); -exports.OpenShiftManagedClusterAADIdentityProvider = require('./openShiftManagedClusterAADIdentityProvider'); -exports.TagsObject = require('./tagsObject'); exports.ContainerServiceCustomProfile = require('./containerServiceCustomProfile'); exports.KeyVaultSecretRef = require('./keyVaultSecretRef'); exports.ContainerServiceServicePrincipalProfile = require('./containerServiceServicePrincipalProfile'); @@ -44,6 +33,7 @@ exports.ContainerServiceVMDiagnostics = require('./containerServiceVMDiagnostics exports.ContainerServiceDiagnosticsProfile = require('./containerServiceDiagnosticsProfile'); exports.ContainerService = require('./containerService'); exports.OperationValue = require('./operationValue'); +exports.TagsObject = require('./tagsObject'); exports.ManagedClusterServicePrincipalProfile = require('./managedClusterServicePrincipalProfile'); exports.ManagedClusterAgentPoolProfile = require('./managedClusterAgentPoolProfile'); exports.ContainerServiceNetworkProfile = require('./containerServiceNetworkProfile'); @@ -51,7 +41,6 @@ exports.ManagedClusterAddonProfile = require('./managedClusterAddonProfile'); exports.ManagedClusterAADProfile = require('./managedClusterAADProfile'); exports.ManagedCluster = require('./managedCluster'); exports.OrchestratorProfile = require('./orchestratorProfile'); -exports.ManagedClusterAccessProfile = require('./managedClusterAccessProfile'); exports.ManagedClusterPoolUpgradeProfile = require('./managedClusterPoolUpgradeProfile'); exports.ManagedClusterUpgradeProfile = require('./managedClusterUpgradeProfile'); exports.CredentialResult = require('./credentialResult'); @@ -61,7 +50,3 @@ exports.OrchestratorVersionProfileListResult = require('./orchestratorVersionPro exports.ContainerServiceListResult = require('./containerServiceListResult'); exports.OperationListResult = require('./operationListResult'); exports.ManagedClusterListResult = require('./managedClusterListResult'); -exports.discriminators = { - 'OpenShiftManagedClusterBaseIdentityProvider' : exports.OpenShiftManagedClusterBaseIdentityProvider, - 'OpenShiftManagedClusterBaseIdentityProvider.AADIdentityProvider' : exports.OpenShiftManagedClusterAADIdentityProvider -}; diff --git a/lib/services/containerservicesManagement/lib/models/managedCluster.js b/lib/services/containerservicesManagement/lib/models/managedCluster.js index 158deed57e..7d0c528534 100644 --- a/lib/services/containerservicesManagement/lib/models/managedCluster.js +++ b/lib/services/containerservicesManagement/lib/models/managedCluster.js @@ -28,7 +28,6 @@ class ManagedCluster extends models['Resource'] { * managed cluster. * @member {string} [fqdn] FDQN for the master pool. * @member {array} [agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * @member {object} [linuxProfile] Profile for Linux VMs in the container * service cluster. * @member {string} [linuxProfile.adminUsername] The administrator username diff --git a/lib/services/containerservicesManagement/lib/models/managedClusterAADProfile.js b/lib/services/containerservicesManagement/lib/models/managedClusterAADProfile.js index 6647d93681..8f76641400 100644 --- a/lib/services/containerservicesManagement/lib/models/managedClusterAADProfile.js +++ b/lib/services/containerservicesManagement/lib/models/managedClusterAADProfile.js @@ -19,7 +19,7 @@ class ManagedClusterAADProfile { * Create a ManagedClusterAADProfile. * @member {string} clientAppID The client AAD application ID. * @member {string} serverAppID The server AAD application ID. - * @member {string} [serverAppSecret] The server AAD application secret. + * @member {string} serverAppSecret The server AAD application secret. * @member {string} [tenantID] The AAD tenant ID to use for authentication. * If not specified, will use the tenant of the deployment subscription. */ @@ -55,7 +55,7 @@ class ManagedClusterAADProfile { } }, serverAppSecret: { - required: false, + required: true, serializedName: 'serverAppSecret', type: { name: 'String' diff --git a/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js b/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js index 9164a04bab..3c9387c3eb 100644 --- a/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js +++ b/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js @@ -19,7 +19,7 @@ class ManagedClusterAgentPoolProfile { * Create a ManagedClusterAgentPoolProfile. * @member {string} name Unique name of the agent pool profile in the context * of the subscription and resource group. - * @member {number} [count] Number of agents (VMs) to host docker containers. + * @member {number} count Number of agents (VMs) to host docker containers. * Allowed values must be in the range of 1 to 100 (inclusive). The default * value is 1. . Default value: 1 . * @member {string} vmSize Size of agent VMs. Possible values include: @@ -77,15 +77,18 @@ class ManagedClusterAgentPoolProfile { * the disk size for every machine in this master/agent pool. If you specify * 0, it will apply the default osDisk size according to the vmSize * specified. - * @member {string} [storageProfile] Storage profile specifies what kind of - * storage used. Defaults to ManagedDisks. Possible values include: - * 'StorageAccount', 'ManagedDisks' * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet * identifier. * @member {number} [maxPods] Maximum number of pods that can run on a node. * @member {string} [osType] OsType to be used to specify os type. Choose * from Linux and Windows. Default to Linux. Possible values include: * 'Linux', 'Windows'. Default value: 'Linux' . + * @member {number} [maxCount] Maximun number of nodes for auto-scaling + * @member {number} [minCount] Minimun number of nodes for auto-scaling + * @member {boolean} [enableAutoScaling] Wheter to enable auto-scaler + * @member {string} [type] AgentPoolType represents types of agentpool. + * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'. + * Default value: 'VirtualMachineScaleSets' . */ constructor() { } @@ -112,7 +115,7 @@ class ManagedClusterAgentPoolProfile { } }, count: { - required: false, + required: true, serializedName: 'count', defaultValue: 1, constraints: { @@ -137,14 +140,6 @@ class ManagedClusterAgentPoolProfile { name: 'Number' } }, - storageProfile: { - required: false, - readOnly: true, - serializedName: 'storageProfile', - type: { - name: 'String' - } - }, vnetSubnetID: { required: false, serializedName: 'vnetSubnetID', @@ -166,6 +161,35 @@ class ManagedClusterAgentPoolProfile { type: { name: 'String' } + }, + maxCount: { + required: false, + serializedName: 'maxCount', + type: { + name: 'Number' + } + }, + minCount: { + required: false, + serializedName: 'minCount', + type: { + name: 'Number' + } + }, + enableAutoScaling: { + required: false, + serializedName: 'enableAutoScaling', + type: { + name: 'Boolean' + } + }, + type: { + required: false, + serializedName: 'type', + defaultValue: 'VirtualMachineScaleSets', + type: { + name: 'String' + } } } } diff --git a/lib/services/containerservicesManagement/lib/operations/index.d.ts b/lib/services/containerservicesManagement/lib/operations/index.d.ts index 850f1bab13..761e394c65 100644 --- a/lib/services/containerservicesManagement/lib/operations/index.d.ts +++ b/lib/services/containerservicesManagement/lib/operations/index.d.ts @@ -12,779 +12,6 @@ import { ServiceClientOptions, RequestOptions, ServiceCallback, HttpOperationRes import * as models from '../models'; -/** - * @class - * OpenShiftManagedClusters - * __NOTE__: An instance of this class is automatically created for an - * instance of the ContainerServiceClient. - */ -export interface OpenShiftManagedClusters { - - - /** - * @summary Gets a openshift managed cluster. - * - * Gets the details of the managed openshift cluster with a specified resource - * group and name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - */ - getWithHttpOperationResponse(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; - - /** - * @summary Gets a openshift managed cluster. - * - * Gets the details of the managed openshift cluster with a specified resource - * group and name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {ServiceCallback} [optionalCallback] - The optional callback. - * - * @returns {ServiceCallback|Promise} If a callback was passed as the last - * parameter then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned. - * - * @resolve {OpenShiftManagedCluster} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - * - * {ServiceCallback} optionalCallback(err, result, request, response) - * - * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. - * - * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. - * See {@link OpenShiftManagedCluster} for more - * information. - * - * {WebResource} [request] - The HTTP Request object if an error did not occur. - * - * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. - */ - get(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - get(resourceGroupName: string, resourceName: string, callback: ServiceCallback): void; - get(resourceGroupName: string, resourceName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; - - - /** - * @summary Creates or updates an openshift managed cluster. - * - * Creates or updates a openshift managed cluster with the specified - * configuration for agents and OpenShift version. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} parameters Parameters supplied to the Create or Update an - * OpenShift Managed Cluster operation. - * - * @param {object} [parameters.plan] Define the resource plan as required by - * ARM for billing purposes - * - * @param {string} [parameters.plan.name] The plan ID. - * - * @param {string} [parameters.plan.product] Specifies the product of the image - * from the marketplace. This is the same value as Offer under the - * imageReference element. - * - * @param {string} [parameters.plan.promotionCode] The promotion code. - * - * @param {string} [parameters.plan.publisher] The plan ID. - * - * @param {string} parameters.openShiftVersion Version of OpenShift specified - * when creating the cluster. - * - * @param {string} [parameters.publicHostname] Optional user-specified FQDN for - * OpenShift API server. - * - * @param {string} [parameters.fqdn] User-specified FQDN for OpenShift API - * server loadbalancer internal hostname. - * - * @param {object} [parameters.networkProfile] Configuration for OpenShift - * networking. - * - * @param {string} [parameters.networkProfile.vnetCidr] CIDR for the OpenShift - * Vnet. - * - * @param {string} [parameters.networkProfile.peerVnetId] CIDR of the Vnet to - * peer. - * - * @param {array} [parameters.routerProfiles] Configuration for OpenShift - * router(s). - * - * @param {object} [parameters.masterPoolProfile] Configuration for OpenShift - * master VMs. - * - * @param {string} [parameters.masterPoolProfile.name] Unique name of the - * master pool profile in the context of the subscription and resource group. - * - * @param {number} parameters.masterPoolProfile.count Number of masters (VMs) - * to host docker containers. The default value is 3. - * - * @param {string} parameters.masterPoolProfile.vmSize Size of agent VMs. - * Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3' - * - * @param {string} [parameters.masterPoolProfile.subnetCidr] Subnet CIDR for - * the peering. - * - * @param {string} [parameters.masterPoolProfile.osType] OsType to be used to - * specify os type. Choose from Linux and Windows. Default to Linux. Possible - * values include: 'Linux', 'Windows' - * - * @param {array} [parameters.agentPoolProfiles] Configuration of OpenShift - * cluster VMs. - * - * @param {object} [parameters.authProfile] Configures OpenShift - * authentication. - * - * @param {array} [parameters.authProfile.identityProviders] Type of - * authentication profile to use. - * - * @param {string} parameters.location Resource location - * - * @param {object} [parameters.tags] Resource tags - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - */ - createOrUpdateWithHttpOperationResponse(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; - - /** - * @summary Creates or updates an openshift managed cluster. - * - * Creates or updates a openshift managed cluster with the specified - * configuration for agents and OpenShift version. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} parameters Parameters supplied to the Create or Update an - * OpenShift Managed Cluster operation. - * - * @param {object} [parameters.plan] Define the resource plan as required by - * ARM for billing purposes - * - * @param {string} [parameters.plan.name] The plan ID. - * - * @param {string} [parameters.plan.product] Specifies the product of the image - * from the marketplace. This is the same value as Offer under the - * imageReference element. - * - * @param {string} [parameters.plan.promotionCode] The promotion code. - * - * @param {string} [parameters.plan.publisher] The plan ID. - * - * @param {string} parameters.openShiftVersion Version of OpenShift specified - * when creating the cluster. - * - * @param {string} [parameters.publicHostname] Optional user-specified FQDN for - * OpenShift API server. - * - * @param {string} [parameters.fqdn] User-specified FQDN for OpenShift API - * server loadbalancer internal hostname. - * - * @param {object} [parameters.networkProfile] Configuration for OpenShift - * networking. - * - * @param {string} [parameters.networkProfile.vnetCidr] CIDR for the OpenShift - * Vnet. - * - * @param {string} [parameters.networkProfile.peerVnetId] CIDR of the Vnet to - * peer. - * - * @param {array} [parameters.routerProfiles] Configuration for OpenShift - * router(s). - * - * @param {object} [parameters.masterPoolProfile] Configuration for OpenShift - * master VMs. - * - * @param {string} [parameters.masterPoolProfile.name] Unique name of the - * master pool profile in the context of the subscription and resource group. - * - * @param {number} parameters.masterPoolProfile.count Number of masters (VMs) - * to host docker containers. The default value is 3. - * - * @param {string} parameters.masterPoolProfile.vmSize Size of agent VMs. - * Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3' - * - * @param {string} [parameters.masterPoolProfile.subnetCidr] Subnet CIDR for - * the peering. - * - * @param {string} [parameters.masterPoolProfile.osType] OsType to be used to - * specify os type. Choose from Linux and Windows. Default to Linux. Possible - * values include: 'Linux', 'Windows' - * - * @param {array} [parameters.agentPoolProfiles] Configuration of OpenShift - * cluster VMs. - * - * @param {object} [parameters.authProfile] Configures OpenShift - * authentication. - * - * @param {array} [parameters.authProfile.identityProviders] Type of - * authentication profile to use. - * - * @param {string} parameters.location Resource location - * - * @param {object} [parameters.tags] Resource tags - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {ServiceCallback} [optionalCallback] - The optional callback. - * - * @returns {ServiceCallback|Promise} If a callback was passed as the last - * parameter then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned. - * - * @resolve {OpenShiftManagedCluster} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - * - * {ServiceCallback} optionalCallback(err, result, request, response) - * - * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. - * - * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. - * See {@link OpenShiftManagedCluster} for more - * information. - * - * {WebResource} [request] - The HTTP Request object if an error did not occur. - * - * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. - */ - createOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - createOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, callback: ServiceCallback): void; - createOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; - - - /** - * @summary Updates tags on an openshift managed cluster. - * - * Updates an openshift managed cluster with the specified tags. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} parameters Parameters supplied to the Update OpenShift - * Managed Cluster Tags operation. - * - * @param {object} [parameters.tags] Resource tags. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - */ - updateTagsWithHttpOperationResponse(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; - - /** - * @summary Updates tags on an openshift managed cluster. - * - * Updates an openshift managed cluster with the specified tags. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} parameters Parameters supplied to the Update OpenShift - * Managed Cluster Tags operation. - * - * @param {object} [parameters.tags] Resource tags. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {ServiceCallback} [optionalCallback] - The optional callback. - * - * @returns {ServiceCallback|Promise} If a callback was passed as the last - * parameter then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned. - * - * @resolve {OpenShiftManagedCluster} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - * - * {ServiceCallback} optionalCallback(err, result, request, response) - * - * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. - * - * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. - * See {@link OpenShiftManagedCluster} for more - * information. - * - * {WebResource} [request] - The HTTP Request object if an error did not occur. - * - * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. - */ - updateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - updateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, callback: ServiceCallback): void; - updateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; - - - /** - * @summary Deletes an openshift managed cluster. - * - * Deletes the openshift managed cluster with a specified resource group and - * name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - */ - deleteMethodWithHttpOperationResponse(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; - - /** - * @summary Deletes an openshift managed cluster. - * - * Deletes the openshift managed cluster with a specified resource group and - * name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {ServiceCallback} [optionalCallback] - The optional callback. - * - * @returns {ServiceCallback|Promise} If a callback was passed as the last - * parameter then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned. - * - * @resolve {null} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - * - * {ServiceCallback} optionalCallback(err, result, request, response) - * - * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. - * - * {null} [result] - The deserialized result object if an error did not occur. - * - * {WebResource} [request] - The HTTP Request object if an error did not occur. - * - * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. - */ - deleteMethod(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - deleteMethod(resourceGroupName: string, resourceName: string, callback: ServiceCallback): void; - deleteMethod(resourceGroupName: string, resourceName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; - - - /** - * @summary Creates or updates an openshift managed cluster. - * - * Creates or updates a openshift managed cluster with the specified - * configuration for agents and OpenShift version. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} parameters Parameters supplied to the Create or Update an - * OpenShift Managed Cluster operation. - * - * @param {object} [parameters.plan] Define the resource plan as required by - * ARM for billing purposes - * - * @param {string} [parameters.plan.name] The plan ID. - * - * @param {string} [parameters.plan.product] Specifies the product of the image - * from the marketplace. This is the same value as Offer under the - * imageReference element. - * - * @param {string} [parameters.plan.promotionCode] The promotion code. - * - * @param {string} [parameters.plan.publisher] The plan ID. - * - * @param {string} parameters.openShiftVersion Version of OpenShift specified - * when creating the cluster. - * - * @param {string} [parameters.publicHostname] Optional user-specified FQDN for - * OpenShift API server. - * - * @param {string} [parameters.fqdn] User-specified FQDN for OpenShift API - * server loadbalancer internal hostname. - * - * @param {object} [parameters.networkProfile] Configuration for OpenShift - * networking. - * - * @param {string} [parameters.networkProfile.vnetCidr] CIDR for the OpenShift - * Vnet. - * - * @param {string} [parameters.networkProfile.peerVnetId] CIDR of the Vnet to - * peer. - * - * @param {array} [parameters.routerProfiles] Configuration for OpenShift - * router(s). - * - * @param {object} [parameters.masterPoolProfile] Configuration for OpenShift - * master VMs. - * - * @param {string} [parameters.masterPoolProfile.name] Unique name of the - * master pool profile in the context of the subscription and resource group. - * - * @param {number} parameters.masterPoolProfile.count Number of masters (VMs) - * to host docker containers. The default value is 3. - * - * @param {string} parameters.masterPoolProfile.vmSize Size of agent VMs. - * Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3' - * - * @param {string} [parameters.masterPoolProfile.subnetCidr] Subnet CIDR for - * the peering. - * - * @param {string} [parameters.masterPoolProfile.osType] OsType to be used to - * specify os type. Choose from Linux and Windows. Default to Linux. Possible - * values include: 'Linux', 'Windows' - * - * @param {array} [parameters.agentPoolProfiles] Configuration of OpenShift - * cluster VMs. - * - * @param {object} [parameters.authProfile] Configures OpenShift - * authentication. - * - * @param {array} [parameters.authProfile.identityProviders] Type of - * authentication profile to use. - * - * @param {string} parameters.location Resource location - * - * @param {object} [parameters.tags] Resource tags - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - */ - beginCreateOrUpdateWithHttpOperationResponse(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; - - /** - * @summary Creates or updates an openshift managed cluster. - * - * Creates or updates a openshift managed cluster with the specified - * configuration for agents and OpenShift version. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} parameters Parameters supplied to the Create or Update an - * OpenShift Managed Cluster operation. - * - * @param {object} [parameters.plan] Define the resource plan as required by - * ARM for billing purposes - * - * @param {string} [parameters.plan.name] The plan ID. - * - * @param {string} [parameters.plan.product] Specifies the product of the image - * from the marketplace. This is the same value as Offer under the - * imageReference element. - * - * @param {string} [parameters.plan.promotionCode] The promotion code. - * - * @param {string} [parameters.plan.publisher] The plan ID. - * - * @param {string} parameters.openShiftVersion Version of OpenShift specified - * when creating the cluster. - * - * @param {string} [parameters.publicHostname] Optional user-specified FQDN for - * OpenShift API server. - * - * @param {string} [parameters.fqdn] User-specified FQDN for OpenShift API - * server loadbalancer internal hostname. - * - * @param {object} [parameters.networkProfile] Configuration for OpenShift - * networking. - * - * @param {string} [parameters.networkProfile.vnetCidr] CIDR for the OpenShift - * Vnet. - * - * @param {string} [parameters.networkProfile.peerVnetId] CIDR of the Vnet to - * peer. - * - * @param {array} [parameters.routerProfiles] Configuration for OpenShift - * router(s). - * - * @param {object} [parameters.masterPoolProfile] Configuration for OpenShift - * master VMs. - * - * @param {string} [parameters.masterPoolProfile.name] Unique name of the - * master pool profile in the context of the subscription and resource group. - * - * @param {number} parameters.masterPoolProfile.count Number of masters (VMs) - * to host docker containers. The default value is 3. - * - * @param {string} parameters.masterPoolProfile.vmSize Size of agent VMs. - * Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3' - * - * @param {string} [parameters.masterPoolProfile.subnetCidr] Subnet CIDR for - * the peering. - * - * @param {string} [parameters.masterPoolProfile.osType] OsType to be used to - * specify os type. Choose from Linux and Windows. Default to Linux. Possible - * values include: 'Linux', 'Windows' - * - * @param {array} [parameters.agentPoolProfiles] Configuration of OpenShift - * cluster VMs. - * - * @param {object} [parameters.authProfile] Configures OpenShift - * authentication. - * - * @param {array} [parameters.authProfile.identityProviders] Type of - * authentication profile to use. - * - * @param {string} parameters.location Resource location - * - * @param {object} [parameters.tags] Resource tags - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {ServiceCallback} [optionalCallback] - The optional callback. - * - * @returns {ServiceCallback|Promise} If a callback was passed as the last - * parameter then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned. - * - * @resolve {OpenShiftManagedCluster} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - * - * {ServiceCallback} optionalCallback(err, result, request, response) - * - * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. - * - * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. - * See {@link OpenShiftManagedCluster} for more - * information. - * - * {WebResource} [request] - The HTTP Request object if an error did not occur. - * - * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. - */ - beginCreateOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - beginCreateOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, callback: ServiceCallback): void; - beginCreateOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; - - - /** - * @summary Updates tags on an openshift managed cluster. - * - * Updates an openshift managed cluster with the specified tags. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} parameters Parameters supplied to the Update OpenShift - * Managed Cluster Tags operation. - * - * @param {object} [parameters.tags] Resource tags. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - */ - beginUpdateTagsWithHttpOperationResponse(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; - - /** - * @summary Updates tags on an openshift managed cluster. - * - * Updates an openshift managed cluster with the specified tags. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} parameters Parameters supplied to the Update OpenShift - * Managed Cluster Tags operation. - * - * @param {object} [parameters.tags] Resource tags. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {ServiceCallback} [optionalCallback] - The optional callback. - * - * @returns {ServiceCallback|Promise} If a callback was passed as the last - * parameter then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned. - * - * @resolve {OpenShiftManagedCluster} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - * - * {ServiceCallback} optionalCallback(err, result, request, response) - * - * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. - * - * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. - * See {@link OpenShiftManagedCluster} for more - * information. - * - * {WebResource} [request] - The HTTP Request object if an error did not occur. - * - * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. - */ - beginUpdateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - beginUpdateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, callback: ServiceCallback): void; - beginUpdateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; - - - /** - * @summary Deletes an openshift managed cluster. - * - * Deletes the openshift managed cluster with a specified resource group and - * name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - */ - beginDeleteMethodWithHttpOperationResponse(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; - - /** - * @summary Deletes an openshift managed cluster. - * - * Deletes the openshift managed cluster with a specified resource group and - * name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the openshift managed cluster - * resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {ServiceCallback} [optionalCallback] - The optional callback. - * - * @returns {ServiceCallback|Promise} If a callback was passed as the last - * parameter then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned. - * - * @resolve {null} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - * - * {ServiceCallback} optionalCallback(err, result, request, response) - * - * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. - * - * {null} [result] - The deserialized result object if an error did not occur. - * - * {WebResource} [request] - The HTTP Request object if an error did not occur. - * - * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. - */ - beginDeleteMethod(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - beginDeleteMethod(resourceGroupName: string, resourceName: string, callback: ServiceCallback): void; - beginDeleteMethod(resourceGroupName: string, resourceName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; -} - /** * @class * ContainerServices @@ -2372,78 +1599,6 @@ export interface ManagedClusters { getUpgradeProfile(resourceGroupName: string, resourceName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; - /** - * @summary Gets an access profile of a managed cluster. - * - * Gets the accessProfile for the specified role name of the managed cluster - * with a specified resource group and name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the managed cluster resource. - * - * @param {string} roleName The name of the role for managed cluster - * accessProfile resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - */ - getAccessProfileWithHttpOperationResponse(resourceGroupName: string, resourceName: string, roleName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; - - /** - * @summary Gets an access profile of a managed cluster. - * - * Gets the accessProfile for the specified role name of the managed cluster - * with a specified resource group and name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the managed cluster resource. - * - * @param {string} roleName The name of the role for managed cluster - * accessProfile resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {ServiceCallback} [optionalCallback] - The optional callback. - * - * @returns {ServiceCallback|Promise} If a callback was passed as the last - * parameter then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned. - * - * @resolve {ManagedClusterAccessProfile} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - * - * {ServiceCallback} optionalCallback(err, result, request, response) - * - * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. - * - * {ManagedClusterAccessProfile} [result] - The deserialized result object if an error did not occur. - * See {@link ManagedClusterAccessProfile} for more - * information. - * - * {WebResource} [request] - The HTTP Request object if an error did not occur. - * - * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. - */ - getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, callback: ServiceCallback): void; - getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; - - /** * @summary Gets clusteradmin credential of a managed cluster. * @@ -2659,7 +1814,6 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -2724,7 +1878,7 @@ export interface ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -2768,7 +1922,6 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -2833,7 +1986,7 @@ export interface ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -3031,7 +2184,6 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3096,7 +2248,7 @@ export interface ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -3140,7 +2292,6 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3205,7 +2356,7 @@ export interface ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use diff --git a/lib/services/containerservicesManagement/lib/operations/index.js b/lib/services/containerservicesManagement/lib/operations/index.js index dda2cf2c5c..da31241c46 100644 --- a/lib/services/containerservicesManagement/lib/operations/index.js +++ b/lib/services/containerservicesManagement/lib/operations/index.js @@ -14,7 +14,6 @@ 'use strict'; -exports.OpenShiftManagedClusters = require('./openShiftManagedClusters'); exports.ContainerServices = require('./containerServices'); exports.Operations = require('./operations'); exports.ManagedClusters = require('./managedClusters'); diff --git a/lib/services/containerservicesManagement/lib/operations/managedClusters.js b/lib/services/containerservicesManagement/lib/operations/managedClusters.js index fa9d0c11ea..a2c6481b7f 100644 --- a/lib/services/containerservicesManagement/lib/operations/managedClusters.js +++ b/lib/services/containerservicesManagement/lib/operations/managedClusters.js @@ -49,7 +49,7 @@ function _list(options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -187,7 +187,7 @@ function _listByResourceGroup(resourceGroupName, options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -330,7 +330,7 @@ function _getUpgradeProfile(resourceGroupName, resourceName, options, callback) if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -438,160 +438,6 @@ function _getUpgradeProfile(resourceGroupName, resourceName, options, callback) }); } -/** - * @summary Gets an access profile of a managed cluster. - * - * Gets the accessProfile for the specified role name of the managed cluster - * with a specified resource group and name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the managed cluster resource. - * - * @param {string} roleName The name of the role for managed cluster - * accessProfile resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {function} callback - The callback. - * - * @returns {function} callback(err, result, request, response) - * - * {Error} err - The Error object if an error occurred, null otherwise. - * - * {object} [result] - The deserialized result object if an error did not occur. - * See {@link ManagedClusterAccessProfile} for more - * information. - * - * {object} [request] - The HTTP Request object if an error did not occur. - * - * {stream} [response] - The HTTP Response stream if an error did not occur. - */ -function _getAccessProfile(resourceGroupName, resourceName, roleName, options, callback) { - /* jshint validthis: true */ - let client = this.client; - if(!callback && typeof options === 'function') { - callback = options; - options = null; - } - if (!callback) { - throw new Error('callback cannot be null.'); - } - let apiVersion = '2018-03-31'; - // Validate - try { - if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { - throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.'); - } - if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') { - throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.'); - } - if (resourceName === null || resourceName === undefined || typeof resourceName.valueOf() !== 'string') { - throw new Error('resourceName cannot be null or undefined and it must be of type string.'); - } - if (roleName === null || roleName === undefined || typeof roleName.valueOf() !== 'string') { - throw new Error('roleName cannot be null or undefined and it must be of type string.'); - } - if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') { - throw new Error('this.client.acceptLanguage must be of type string.'); - } - } catch (error) { - return callback(error); - } - - // Construct URL - let baseUrl = this.client.baseUri; - let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}/listCredential'; - requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId)); - requestUrl = requestUrl.replace('{resourceGroupName}', encodeURIComponent(resourceGroupName)); - requestUrl = requestUrl.replace('{resourceName}', encodeURIComponent(resourceName)); - requestUrl = requestUrl.replace('{roleName}', encodeURIComponent(roleName)); - let queryParameters = []; - queryParameters.push('api-version=' + encodeURIComponent(apiVersion)); - if (queryParameters.length > 0) { - requestUrl += '?' + queryParameters.join('&'); - } - - // Create HTTP transport objects - let httpRequest = new WebResource(); - httpRequest.method = 'POST'; - httpRequest.url = requestUrl; - httpRequest.headers = {}; - // Set Headers - httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8'; - if (this.client.generateClientRequestId) { - httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid(); - } - if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) { - httpRequest.headers['accept-language'] = this.client.acceptLanguage; - } - if(options) { - for(let headerName in options['customHeaders']) { - if (options['customHeaders'].hasOwnProperty(headerName)) { - httpRequest.headers[headerName] = options['customHeaders'][headerName]; - } - } - } - httpRequest.body = null; - // Send Request - return client.pipeline(httpRequest, (err, response, responseBody) => { - if (err) { - return callback(err); - } - let statusCode = response.statusCode; - if (statusCode !== 200) { - let error = new Error(responseBody); - error.statusCode = response.statusCode; - error.request = msRest.stripRequest(httpRequest); - error.response = msRest.stripResponse(response); - if (responseBody === '') responseBody = null; - let parsedErrorResponse; - try { - parsedErrorResponse = JSON.parse(responseBody); - if (parsedErrorResponse) { - if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error; - if (parsedErrorResponse.code) error.code = parsedErrorResponse.code; - if (parsedErrorResponse.message) error.message = parsedErrorResponse.message; - } - if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) { - let resultMapper = new client.models['CloudError']().mapper(); - error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body'); - } - } catch (defaultError) { - error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` + - `- "${responseBody}" for the default response.`; - return callback(error); - } - return callback(error); - } - // Create Result - let result = null; - if (responseBody === '') responseBody = null; - // Deserialize Response - if (statusCode === 200) { - let parsedResponse = null; - try { - parsedResponse = JSON.parse(responseBody); - result = JSON.parse(responseBody); - if (parsedResponse !== null && parsedResponse !== undefined) { - let resultMapper = new client.models['ManagedClusterAccessProfile']().mapper(); - result = client.deserialize(resultMapper, parsedResponse, 'result'); - } - } catch (error) { - let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`); - deserializationError.request = msRest.stripRequest(httpRequest); - deserializationError.response = msRest.stripResponse(response); - return callback(deserializationError); - } - } - - return callback(null, result, httpRequest, response); - }); -} - /** * @summary Gets clusteradmin credential of a managed cluster. * @@ -630,7 +476,7 @@ function _listClusterAdminCredentials(resourceGroupName, resourceName, options, if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -776,7 +622,7 @@ function _listClusterUserCredentials(resourceGroupName, resourceName, options, c if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -922,7 +768,7 @@ function _get(resourceGroupName, resourceName, options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -1051,7 +897,6 @@ function _get(resourceGroupName, resourceName, options, callback) { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -1116,7 +961,7 @@ function _get(resourceGroupName, resourceName, options, callback) { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -1367,7 +1212,6 @@ function _deleteMethod(resourceGroupName, resourceName, options, callback) { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -1432,7 +1276,7 @@ function _deleteMethod(resourceGroupName, resourceName, options, callback) { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -1471,7 +1315,7 @@ function _beginCreateOrUpdate(resourceGroupName, resourceName, parameters, optio if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -1655,7 +1499,7 @@ function _beginUpdateTags(resourceGroupName, resourceName, parameters, options, if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -1816,7 +1660,7 @@ function _beginDeleteMethod(resourceGroupName, resourceName, options, callback) if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -2181,7 +2025,6 @@ class ManagedClusters { this._list = _list; this._listByResourceGroup = _listByResourceGroup; this._getUpgradeProfile = _getUpgradeProfile; - this._getAccessProfile = _getAccessProfile; this._listClusterAdminCredentials = _listClusterAdminCredentials; this._listClusterUserCredentials = _listClusterUserCredentials; this._get = _get; @@ -2464,105 +2307,6 @@ class ManagedClusters { } } - /** - * @summary Gets an access profile of a managed cluster. - * - * Gets the accessProfile for the specified role name of the managed cluster - * with a specified resource group and name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the managed cluster resource. - * - * @param {string} roleName The name of the role for managed cluster - * accessProfile resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error} - The error object. - */ - getAccessProfileWithHttpOperationResponse(resourceGroupName, resourceName, roleName, options) { - let client = this.client; - let self = this; - return new Promise((resolve, reject) => { - self._getAccessProfile(resourceGroupName, resourceName, roleName, options, (err, result, request, response) => { - let httpOperationResponse = new msRest.HttpOperationResponse(request, response); - httpOperationResponse.body = result; - if (err) { reject(err); } - else { resolve(httpOperationResponse); } - return; - }); - }); - } - - /** - * @summary Gets an access profile of a managed cluster. - * - * Gets the accessProfile for the specified role name of the managed cluster - * with a specified resource group and name. - * - * @param {string} resourceGroupName The name of the resource group. - * - * @param {string} resourceName The name of the managed cluster resource. - * - * @param {string} roleName The name of the role for managed cluster - * accessProfile resource. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {function} [optionalCallback] - The optional callback. - * - * @returns {function|Promise} If a callback was passed as the last parameter - * then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned - * - * @resolve {ManagedClusterAccessProfile} - The deserialized result object. - * - * @reject {Error} - The error object. - * - * {function} optionalCallback(err, result, request, response) - * - * {Error} err - The Error object if an error occurred, null otherwise. - * - * {object} [result] - The deserialized result object if an error did not occur. - * See {@link ManagedClusterAccessProfile} for more - * information. - * - * {object} [request] - The HTTP Request object if an error did not occur. - * - * {stream} [response] - The HTTP Response stream if an error did not occur. - */ - getAccessProfile(resourceGroupName, resourceName, roleName, options, optionalCallback) { - let client = this.client; - let self = this; - if (!optionalCallback && typeof options === 'function') { - optionalCallback = options; - options = null; - } - if (!optionalCallback) { - return new Promise((resolve, reject) => { - self._getAccessProfile(resourceGroupName, resourceName, roleName, options, (err, result, request, response) => { - if (err) { reject(err); } - else { resolve(result); } - return; - }); - }); - } else { - return self._getAccessProfile(resourceGroupName, resourceName, roleName, options, optionalCallback); - } - } - /** * @summary Gets clusteradmin credential of a managed cluster. * @@ -2859,7 +2603,6 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -2924,7 +2667,7 @@ class ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -2980,7 +2723,6 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3045,7 +2787,7 @@ class ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -3312,7 +3054,6 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3377,7 +3118,7 @@ class ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -3433,7 +3174,6 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3498,7 +3238,7 @@ class ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD + * @param {string} parameters.aadProfile.serverAppSecret The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use diff --git a/lib/services/containerservicesManagement/lib/operations/operations.js b/lib/services/containerservicesManagement/lib/operations/operations.js index 1ffa97face..8cf8e3a30d 100644 --- a/lib/services/containerservicesManagement/lib/operations/operations.js +++ b/lib/services/containerservicesManagement/lib/operations/operations.js @@ -45,7 +45,7 @@ function _list(options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') { From 4925f8f5acce4476b3228d00f7d1bf0994bc2a9c Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 15 Oct 2018 22:16:21 +0000 Subject: [PATCH 2/6] Generated from 902f5cc7a0d60d80fd13c9cf75c5081aac3e69d9 add osMC resource in the readme --- .../containerservicesManagement/README.md | 6 +- .../lib/containerServiceClient.d.ts | 1 + .../lib/containerServiceClient.js | 1 + .../lib/models/index.d.ts | 244 +++++- .../lib/models/index.js | 16 +- .../lib/operations/index.d.ts | 773 ++++++++++++++++++ .../lib/operations/index.js | 1 + 7 files changed, 1027 insertions(+), 15 deletions(-) diff --git a/lib/services/containerservicesManagement/README.md b/lib/services/containerservicesManagement/README.md index bcda4fd300..2a1bd6ba5d 100644 --- a/lib/services/containerservicesManagement/README.md +++ b/lib/services/containerservicesManagement/README.md @@ -18,7 +18,7 @@ npm install azure-arm-containerservice ## How to use -### Authentication, client creation and list containerServices as an example. +### Authentication, client creation and get openShiftManagedClusters as an example. ```javascript const msRestAzure = require("ms-rest-azure"); @@ -26,7 +26,9 @@ const ContainerServiceClient = require("azure-arm-containerservice"); msRestAzure.interactiveLogin().then((creds) => { const subscriptionId = ""; const client = new ContainerServiceClient(creds, subscriptionId); - return client.containerServices.list().then((result) => { + const resourceGroupName = "testresourceGroupName"; + const resourceName = "testresourceName"; + return client.openShiftManagedClusters.get(resourceGroupName, resourceName).then((result) => { console.log("The result is:"); console.log(result); }); diff --git a/lib/services/containerservicesManagement/lib/containerServiceClient.d.ts b/lib/services/containerservicesManagement/lib/containerServiceClient.d.ts index 67db569fd8..988e12858e 100644 --- a/lib/services/containerservicesManagement/lib/containerServiceClient.d.ts +++ b/lib/services/containerservicesManagement/lib/containerServiceClient.d.ts @@ -54,6 +54,7 @@ export default class ContainerServiceClient extends AzureServiceClient { generateClientRequestId: boolean; // Operation groups + openShiftManagedClusters: operations.OpenShiftManagedClusters; containerServices: operations.ContainerServices; operations: operations.Operations; managedClusters: operations.ManagedClusters; diff --git a/lib/services/containerservicesManagement/lib/containerServiceClient.js b/lib/services/containerservicesManagement/lib/containerServiceClient.js index 23e4792c0e..142bb2aa12 100644 --- a/lib/services/containerservicesManagement/lib/containerServiceClient.js +++ b/lib/services/containerservicesManagement/lib/containerServiceClient.js @@ -71,6 +71,7 @@ class ContainerServiceClient extends ServiceClient { if(options.generateClientRequestId !== null && options.generateClientRequestId !== undefined) { this.generateClientRequestId = options.generateClientRequestId; } + this.openShiftManagedClusters = new operations.OpenShiftManagedClusters(this); this.containerServices = new operations.ContainerServices(this); this.operations = new operations.Operations(this); this.managedClusters = new operations.ManagedClusters(this); diff --git a/lib/services/containerservicesManagement/lib/models/index.d.ts b/lib/services/containerservicesManagement/lib/models/index.d.ts index 7a4fcbd20f..d6090e4adf 100644 --- a/lib/services/containerservicesManagement/lib/models/index.d.ts +++ b/lib/services/containerservicesManagement/lib/models/index.d.ts @@ -36,6 +36,238 @@ export interface Resource extends BaseResource { tags?: { [propertyName: string]: string }; } +/** + * @class + * Initializes a new instance of the PurchasePlan class. + * @constructor + * Used for establishing the purchase context of any 3rd Party artifact through + * MarketPlace. + * + * @member {string} [name] The plan ID. + * @member {string} [product] Specifies the product of the image from the + * marketplace. This is the same value as Offer under the imageReference + * element. + * @member {string} [promotionCode] The promotion code. + * @member {string} [publisher] The plan ID. + */ +export interface PurchasePlan { + name?: string; + product?: string; + promotionCode?: string; + publisher?: string; +} + +/** + * @class + * Initializes a new instance of the OpenShiftRouterProfile class. + * @constructor + * Represents an OpenShift router + * + * @member {string} [name] Name of the router profile. + * @member {string} [publicSubdomain] DNS subdomain for openshift router. + * @member {string} [fqdn] Auto-allocated FQDN for the OpenShift router. + */ +export interface OpenShiftRouterProfile { + name?: string; + publicSubdomain?: string; + readonly fqdn?: string; +} + +/** + * @class + * Initializes a new instance of the NetworkProfile class. + * @constructor + * Represents the OpenShift networking configuration + * + * @member {string} [vnetCidr] CIDR for the OpenShift Vnet. Default value: + * '10.0.0.0/8' . + * @member {string} [peerVnetId] CIDR of the Vnet to peer. + */ +export interface NetworkProfile { + vnetCidr?: string; + peerVnetId?: string; +} + +/** + * @class + * Initializes a new instance of the OpenShiftManagedClusterMasterPoolProfile class. + * @constructor + * OpenShiftManagedClusterMaterPoolProfile contains configuration for OpenShift + * master VMs. + * + * @member {string} [name] Unique name of the master pool profile in the + * context of the subscription and resource group. + * @member {number} count Number of masters (VMs) to host docker containers. + * The default value is 3. Default value: 3 . + * @member {string} vmSize Size of agent VMs. Possible values include: + * 'Standard_D2s_v3', 'Standard_D4s_v3' + * @member {string} [subnetCidr] Subnet CIDR for the peering. + * @member {string} [osType] OsType to be used to specify os type. Choose from + * Linux and Windows. Default to Linux. Possible values include: 'Linux', + * 'Windows'. Default value: 'Linux' . + */ +export interface OpenShiftManagedClusterMasterPoolProfile { + name?: string; + count: number; + vmSize: string; + subnetCidr?: string; + osType?: string; +} + +/** + * @class + * Initializes a new instance of the OpenShiftManagedClusterAgentPoolProfile class. + * @constructor + * Defines the configuration of the OpenShift cluster VMs. + * + * @member {string} name Unique name of the pool profile in the context of the + * subscription and resource group. + * @member {number} count Number of agents (VMs) to host docker containers. + * Allowed values must be in the range of 1 to 5 (inclusive). The default value + * is 2. . Default value: 2 . + * @member {string} vmSize Size of agent VMs. Possible values include: + * 'Standard_D2s_v3', 'Standard_D4s_v3' + * @member {string} [subnetCidr] Subnet CIDR for the peering. Default value: + * '10.0.0.0/24' . + * @member {string} [osType] OsType to be used to specify os type. Choose from + * Linux and Windows. Default to Linux. Possible values include: 'Linux', + * 'Windows'. Default value: 'Linux' . + * @member {string} [role] Define the role of the AgentPoolProfile. Possible + * values include: 'compute', 'infra' + */ +export interface OpenShiftManagedClusterAgentPoolProfile { + name: string; + count: number; + vmSize: string; + subnetCidr?: string; + osType?: string; + role?: string; +} + +/** + * @class + * Initializes a new instance of the OpenShiftManagedClusterBaseIdentityProvider class. + * @constructor + * Structure for any Identity provider. + * + * @member {string} kind Polymorphic Discriminator + */ +export interface OpenShiftManagedClusterBaseIdentityProvider { + kind: string; +} + +/** + * @class + * Initializes a new instance of the OpenShiftManagedClusterIdentityProvider class. + * @constructor + * Defines the configuration of the identity providers to be used in the + * OpenShift cluster. + * + * @member {string} [name] Name of the provider. + * @member {object} [provider] Configuration of the provider. + * @member {string} [provider.kind] Polymorphic Discriminator + */ +export interface OpenShiftManagedClusterIdentityProvider { + name?: string; + provider?: OpenShiftManagedClusterBaseIdentityProvider; +} + +/** + * @class + * Initializes a new instance of the OpenShiftManagedClusterAuthProfile class. + * @constructor + * Defines all possible authentication profiles for the OpenShift cluster. + * + * @member {array} [identityProviders] Type of authentication profile to use. + */ +export interface OpenShiftManagedClusterAuthProfile { + identityProviders?: OpenShiftManagedClusterIdentityProvider[]; +} + +/** + * @class + * Initializes a new instance of the OpenShiftManagedCluster class. + * @constructor + * OpenShift Managed cluster. + * + * @member {object} [plan] Define the resource plan as required by ARM for + * billing purposes + * @member {string} [plan.name] The plan ID. + * @member {string} [plan.product] Specifies the product of the image from the + * marketplace. This is the same value as Offer under the imageReference + * element. + * @member {string} [plan.promotionCode] The promotion code. + * @member {string} [plan.publisher] The plan ID. + * @member {string} [provisioningState] The current deployment or provisioning + * state, which only appears in the response. + * @member {string} openShiftVersion Version of OpenShift specified when + * creating the cluster. + * @member {string} [publicHostname] Optional user-specified FQDN for OpenShift + * API server. + * @member {string} [fqdn] User-specified FQDN for OpenShift API server + * loadbalancer internal hostname. + * @member {object} [networkProfile] Configuration for OpenShift networking. + * @member {string} [networkProfile.vnetCidr] CIDR for the OpenShift Vnet. + * @member {string} [networkProfile.peerVnetId] CIDR of the Vnet to peer. + * @member {array} [routerProfiles] Configuration for OpenShift router(s). + * @member {object} [masterPoolProfile] Configuration for OpenShift master VMs. + * @member {string} [masterPoolProfile.name] Unique name of the master pool + * profile in the context of the subscription and resource group. + * @member {number} [masterPoolProfile.count] Number of masters (VMs) to host + * docker containers. The default value is 3. + * @member {string} [masterPoolProfile.vmSize] Size of agent VMs. Possible + * values include: 'Standard_D2s_v3', 'Standard_D4s_v3' + * @member {string} [masterPoolProfile.subnetCidr] Subnet CIDR for the peering. + * @member {string} [masterPoolProfile.osType] OsType to be used to specify os + * type. Choose from Linux and Windows. Default to Linux. Possible values + * include: 'Linux', 'Windows' + * @member {array} [agentPoolProfiles] Configuration of OpenShift cluster VMs. + * @member {object} [authProfile] Configures OpenShift authentication. + * @member {array} [authProfile.identityProviders] Type of authentication + * profile to use. + */ +export interface OpenShiftManagedCluster extends Resource { + plan?: PurchasePlan; + readonly provisioningState?: string; + openShiftVersion: string; + publicHostname?: string; + fqdn?: string; + networkProfile?: NetworkProfile; + routerProfiles?: OpenShiftRouterProfile[]; + masterPoolProfile?: OpenShiftManagedClusterMasterPoolProfile; + agentPoolProfiles?: OpenShiftManagedClusterAgentPoolProfile[]; + authProfile?: OpenShiftManagedClusterAuthProfile; +} + +/** + * @class + * Initializes a new instance of the OpenShiftManagedClusterAADIdentityProvider class. + * @constructor + * Defines the Identity provider for MS AAD. + * + * @member {string} [clientId] The clientId password associated with the + * provider. + * @member {string} [secret] The secret password associated with the provider. + * @member {string} [tenantId] The tenantId associated with the provider. + */ +export interface OpenShiftManagedClusterAADIdentityProvider extends OpenShiftManagedClusterBaseIdentityProvider { + clientId?: string; + secret?: string; + tenantId?: string; +} + +/** + * @class + * Initializes a new instance of the TagsObject class. + * @constructor + * Tags object for patch operations. + * + * @member {object} [tags] Resource tags. + */ +export interface TagsObject { + tags?: { [propertyName: string]: string }; +} + /** * @class * Initializes a new instance of the ContainerServiceCustomProfile class. @@ -541,18 +773,6 @@ export interface OperationValue { readonly provider?: string; } -/** - * @class - * Initializes a new instance of the TagsObject class. - * @constructor - * Tags object for patch operations. - * - * @member {object} [tags] Resource tags. - */ -export interface TagsObject { - tags?: { [propertyName: string]: string }; -} - /** * @class * Initializes a new instance of the ManagedClusterServicePrincipalProfile class. diff --git a/lib/services/containerservicesManagement/lib/models/index.js b/lib/services/containerservicesManagement/lib/models/index.js index c51f44f99b..d83a977c3b 100644 --- a/lib/services/containerservicesManagement/lib/models/index.js +++ b/lib/services/containerservicesManagement/lib/models/index.js @@ -19,6 +19,17 @@ var msRestAzure = require('ms-rest-azure'); exports.BaseResource = msRestAzure.BaseResource; exports.CloudError = msRestAzure.CloudError; exports.Resource = require('./resource'); +exports.PurchasePlan = require('./purchasePlan'); +exports.OpenShiftRouterProfile = require('./openShiftRouterProfile'); +exports.NetworkProfile = require('./networkProfile'); +exports.OpenShiftManagedClusterMasterPoolProfile = require('./openShiftManagedClusterMasterPoolProfile'); +exports.OpenShiftManagedClusterAgentPoolProfile = require('./openShiftManagedClusterAgentPoolProfile'); +exports.OpenShiftManagedClusterBaseIdentityProvider = require('./openShiftManagedClusterBaseIdentityProvider'); +exports.OpenShiftManagedClusterIdentityProvider = require('./openShiftManagedClusterIdentityProvider'); +exports.OpenShiftManagedClusterAuthProfile = require('./openShiftManagedClusterAuthProfile'); +exports.OpenShiftManagedCluster = require('./openShiftManagedCluster'); +exports.OpenShiftManagedClusterAADIdentityProvider = require('./openShiftManagedClusterAADIdentityProvider'); +exports.TagsObject = require('./tagsObject'); exports.ContainerServiceCustomProfile = require('./containerServiceCustomProfile'); exports.KeyVaultSecretRef = require('./keyVaultSecretRef'); exports.ContainerServiceServicePrincipalProfile = require('./containerServiceServicePrincipalProfile'); @@ -33,7 +44,6 @@ exports.ContainerServiceVMDiagnostics = require('./containerServiceVMDiagnostics exports.ContainerServiceDiagnosticsProfile = require('./containerServiceDiagnosticsProfile'); exports.ContainerService = require('./containerService'); exports.OperationValue = require('./operationValue'); -exports.TagsObject = require('./tagsObject'); exports.ManagedClusterServicePrincipalProfile = require('./managedClusterServicePrincipalProfile'); exports.ManagedClusterAgentPoolProfile = require('./managedClusterAgentPoolProfile'); exports.ContainerServiceNetworkProfile = require('./containerServiceNetworkProfile'); @@ -50,3 +60,7 @@ exports.OrchestratorVersionProfileListResult = require('./orchestratorVersionPro exports.ContainerServiceListResult = require('./containerServiceListResult'); exports.OperationListResult = require('./operationListResult'); exports.ManagedClusterListResult = require('./managedClusterListResult'); +exports.discriminators = { + 'OpenShiftManagedClusterBaseIdentityProvider' : exports.OpenShiftManagedClusterBaseIdentityProvider, + 'OpenShiftManagedClusterBaseIdentityProvider.AADIdentityProvider' : exports.OpenShiftManagedClusterAADIdentityProvider +}; diff --git a/lib/services/containerservicesManagement/lib/operations/index.d.ts b/lib/services/containerservicesManagement/lib/operations/index.d.ts index 761e394c65..ae72e1ea7d 100644 --- a/lib/services/containerservicesManagement/lib/operations/index.d.ts +++ b/lib/services/containerservicesManagement/lib/operations/index.d.ts @@ -12,6 +12,779 @@ import { ServiceClientOptions, RequestOptions, ServiceCallback, HttpOperationRes import * as models from '../models'; +/** + * @class + * OpenShiftManagedClusters + * __NOTE__: An instance of this class is automatically created for an + * instance of the ContainerServiceClient. + */ +export interface OpenShiftManagedClusters { + + + /** + * @summary Gets a openshift managed cluster. + * + * Gets the details of the managed openshift cluster with a specified resource + * group and name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @returns {Promise} A promise is returned + * + * @resolve {HttpOperationResponse} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + */ + getWithHttpOperationResponse(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + + /** + * @summary Gets a openshift managed cluster. + * + * Gets the details of the managed openshift cluster with a specified resource + * group and name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {ServiceCallback} [optionalCallback] - The optional callback. + * + * @returns {ServiceCallback|Promise} If a callback was passed as the last + * parameter then it returns the callback else returns a Promise. + * + * {Promise} A promise is returned. + * + * @resolve {OpenShiftManagedCluster} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + * + * {ServiceCallback} optionalCallback(err, result, request, response) + * + * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. + * + * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. + * See {@link OpenShiftManagedCluster} for more + * information. + * + * {WebResource} [request] - The HTTP Request object if an error did not occur. + * + * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. + */ + get(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + get(resourceGroupName: string, resourceName: string, callback: ServiceCallback): void; + get(resourceGroupName: string, resourceName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + + + /** + * @summary Creates or updates an openshift managed cluster. + * + * Creates or updates a openshift managed cluster with the specified + * configuration for agents and OpenShift version. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} parameters Parameters supplied to the Create or Update an + * OpenShift Managed Cluster operation. + * + * @param {object} [parameters.plan] Define the resource plan as required by + * ARM for billing purposes + * + * @param {string} [parameters.plan.name] The plan ID. + * + * @param {string} [parameters.plan.product] Specifies the product of the image + * from the marketplace. This is the same value as Offer under the + * imageReference element. + * + * @param {string} [parameters.plan.promotionCode] The promotion code. + * + * @param {string} [parameters.plan.publisher] The plan ID. + * + * @param {string} parameters.openShiftVersion Version of OpenShift specified + * when creating the cluster. + * + * @param {string} [parameters.publicHostname] Optional user-specified FQDN for + * OpenShift API server. + * + * @param {string} [parameters.fqdn] User-specified FQDN for OpenShift API + * server loadbalancer internal hostname. + * + * @param {object} [parameters.networkProfile] Configuration for OpenShift + * networking. + * + * @param {string} [parameters.networkProfile.vnetCidr] CIDR for the OpenShift + * Vnet. + * + * @param {string} [parameters.networkProfile.peerVnetId] CIDR of the Vnet to + * peer. + * + * @param {array} [parameters.routerProfiles] Configuration for OpenShift + * router(s). + * + * @param {object} [parameters.masterPoolProfile] Configuration for OpenShift + * master VMs. + * + * @param {string} [parameters.masterPoolProfile.name] Unique name of the + * master pool profile in the context of the subscription and resource group. + * + * @param {number} parameters.masterPoolProfile.count Number of masters (VMs) + * to host docker containers. The default value is 3. + * + * @param {string} parameters.masterPoolProfile.vmSize Size of agent VMs. + * Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3' + * + * @param {string} [parameters.masterPoolProfile.subnetCidr] Subnet CIDR for + * the peering. + * + * @param {string} [parameters.masterPoolProfile.osType] OsType to be used to + * specify os type. Choose from Linux and Windows. Default to Linux. Possible + * values include: 'Linux', 'Windows' + * + * @param {array} [parameters.agentPoolProfiles] Configuration of OpenShift + * cluster VMs. + * + * @param {object} [parameters.authProfile] Configures OpenShift + * authentication. + * + * @param {array} [parameters.authProfile.identityProviders] Type of + * authentication profile to use. + * + * @param {string} parameters.location Resource location + * + * @param {object} [parameters.tags] Resource tags + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @returns {Promise} A promise is returned + * + * @resolve {HttpOperationResponse} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + */ + createOrUpdateWithHttpOperationResponse(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + + /** + * @summary Creates or updates an openshift managed cluster. + * + * Creates or updates a openshift managed cluster with the specified + * configuration for agents and OpenShift version. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} parameters Parameters supplied to the Create or Update an + * OpenShift Managed Cluster operation. + * + * @param {object} [parameters.plan] Define the resource plan as required by + * ARM for billing purposes + * + * @param {string} [parameters.plan.name] The plan ID. + * + * @param {string} [parameters.plan.product] Specifies the product of the image + * from the marketplace. This is the same value as Offer under the + * imageReference element. + * + * @param {string} [parameters.plan.promotionCode] The promotion code. + * + * @param {string} [parameters.plan.publisher] The plan ID. + * + * @param {string} parameters.openShiftVersion Version of OpenShift specified + * when creating the cluster. + * + * @param {string} [parameters.publicHostname] Optional user-specified FQDN for + * OpenShift API server. + * + * @param {string} [parameters.fqdn] User-specified FQDN for OpenShift API + * server loadbalancer internal hostname. + * + * @param {object} [parameters.networkProfile] Configuration for OpenShift + * networking. + * + * @param {string} [parameters.networkProfile.vnetCidr] CIDR for the OpenShift + * Vnet. + * + * @param {string} [parameters.networkProfile.peerVnetId] CIDR of the Vnet to + * peer. + * + * @param {array} [parameters.routerProfiles] Configuration for OpenShift + * router(s). + * + * @param {object} [parameters.masterPoolProfile] Configuration for OpenShift + * master VMs. + * + * @param {string} [parameters.masterPoolProfile.name] Unique name of the + * master pool profile in the context of the subscription and resource group. + * + * @param {number} parameters.masterPoolProfile.count Number of masters (VMs) + * to host docker containers. The default value is 3. + * + * @param {string} parameters.masterPoolProfile.vmSize Size of agent VMs. + * Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3' + * + * @param {string} [parameters.masterPoolProfile.subnetCidr] Subnet CIDR for + * the peering. + * + * @param {string} [parameters.masterPoolProfile.osType] OsType to be used to + * specify os type. Choose from Linux and Windows. Default to Linux. Possible + * values include: 'Linux', 'Windows' + * + * @param {array} [parameters.agentPoolProfiles] Configuration of OpenShift + * cluster VMs. + * + * @param {object} [parameters.authProfile] Configures OpenShift + * authentication. + * + * @param {array} [parameters.authProfile.identityProviders] Type of + * authentication profile to use. + * + * @param {string} parameters.location Resource location + * + * @param {object} [parameters.tags] Resource tags + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {ServiceCallback} [optionalCallback] - The optional callback. + * + * @returns {ServiceCallback|Promise} If a callback was passed as the last + * parameter then it returns the callback else returns a Promise. + * + * {Promise} A promise is returned. + * + * @resolve {OpenShiftManagedCluster} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + * + * {ServiceCallback} optionalCallback(err, result, request, response) + * + * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. + * + * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. + * See {@link OpenShiftManagedCluster} for more + * information. + * + * {WebResource} [request] - The HTTP Request object if an error did not occur. + * + * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. + */ + createOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + createOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, callback: ServiceCallback): void; + createOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + + + /** + * @summary Updates tags on an openshift managed cluster. + * + * Updates an openshift managed cluster with the specified tags. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} parameters Parameters supplied to the Update OpenShift + * Managed Cluster Tags operation. + * + * @param {object} [parameters.tags] Resource tags. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @returns {Promise} A promise is returned + * + * @resolve {HttpOperationResponse} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + */ + updateTagsWithHttpOperationResponse(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + + /** + * @summary Updates tags on an openshift managed cluster. + * + * Updates an openshift managed cluster with the specified tags. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} parameters Parameters supplied to the Update OpenShift + * Managed Cluster Tags operation. + * + * @param {object} [parameters.tags] Resource tags. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {ServiceCallback} [optionalCallback] - The optional callback. + * + * @returns {ServiceCallback|Promise} If a callback was passed as the last + * parameter then it returns the callback else returns a Promise. + * + * {Promise} A promise is returned. + * + * @resolve {OpenShiftManagedCluster} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + * + * {ServiceCallback} optionalCallback(err, result, request, response) + * + * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. + * + * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. + * See {@link OpenShiftManagedCluster} for more + * information. + * + * {WebResource} [request] - The HTTP Request object if an error did not occur. + * + * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. + */ + updateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + updateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, callback: ServiceCallback): void; + updateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + + + /** + * @summary Deletes an openshift managed cluster. + * + * Deletes the openshift managed cluster with a specified resource group and + * name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @returns {Promise} A promise is returned + * + * @resolve {HttpOperationResponse} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + */ + deleteMethodWithHttpOperationResponse(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + + /** + * @summary Deletes an openshift managed cluster. + * + * Deletes the openshift managed cluster with a specified resource group and + * name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {ServiceCallback} [optionalCallback] - The optional callback. + * + * @returns {ServiceCallback|Promise} If a callback was passed as the last + * parameter then it returns the callback else returns a Promise. + * + * {Promise} A promise is returned. + * + * @resolve {null} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + * + * {ServiceCallback} optionalCallback(err, result, request, response) + * + * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. + * + * {null} [result] - The deserialized result object if an error did not occur. + * + * {WebResource} [request] - The HTTP Request object if an error did not occur. + * + * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. + */ + deleteMethod(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + deleteMethod(resourceGroupName: string, resourceName: string, callback: ServiceCallback): void; + deleteMethod(resourceGroupName: string, resourceName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + + + /** + * @summary Creates or updates an openshift managed cluster. + * + * Creates or updates a openshift managed cluster with the specified + * configuration for agents and OpenShift version. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} parameters Parameters supplied to the Create or Update an + * OpenShift Managed Cluster operation. + * + * @param {object} [parameters.plan] Define the resource plan as required by + * ARM for billing purposes + * + * @param {string} [parameters.plan.name] The plan ID. + * + * @param {string} [parameters.plan.product] Specifies the product of the image + * from the marketplace. This is the same value as Offer under the + * imageReference element. + * + * @param {string} [parameters.plan.promotionCode] The promotion code. + * + * @param {string} [parameters.plan.publisher] The plan ID. + * + * @param {string} parameters.openShiftVersion Version of OpenShift specified + * when creating the cluster. + * + * @param {string} [parameters.publicHostname] Optional user-specified FQDN for + * OpenShift API server. + * + * @param {string} [parameters.fqdn] User-specified FQDN for OpenShift API + * server loadbalancer internal hostname. + * + * @param {object} [parameters.networkProfile] Configuration for OpenShift + * networking. + * + * @param {string} [parameters.networkProfile.vnetCidr] CIDR for the OpenShift + * Vnet. + * + * @param {string} [parameters.networkProfile.peerVnetId] CIDR of the Vnet to + * peer. + * + * @param {array} [parameters.routerProfiles] Configuration for OpenShift + * router(s). + * + * @param {object} [parameters.masterPoolProfile] Configuration for OpenShift + * master VMs. + * + * @param {string} [parameters.masterPoolProfile.name] Unique name of the + * master pool profile in the context of the subscription and resource group. + * + * @param {number} parameters.masterPoolProfile.count Number of masters (VMs) + * to host docker containers. The default value is 3. + * + * @param {string} parameters.masterPoolProfile.vmSize Size of agent VMs. + * Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3' + * + * @param {string} [parameters.masterPoolProfile.subnetCidr] Subnet CIDR for + * the peering. + * + * @param {string} [parameters.masterPoolProfile.osType] OsType to be used to + * specify os type. Choose from Linux and Windows. Default to Linux. Possible + * values include: 'Linux', 'Windows' + * + * @param {array} [parameters.agentPoolProfiles] Configuration of OpenShift + * cluster VMs. + * + * @param {object} [parameters.authProfile] Configures OpenShift + * authentication. + * + * @param {array} [parameters.authProfile.identityProviders] Type of + * authentication profile to use. + * + * @param {string} parameters.location Resource location + * + * @param {object} [parameters.tags] Resource tags + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @returns {Promise} A promise is returned + * + * @resolve {HttpOperationResponse} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + */ + beginCreateOrUpdateWithHttpOperationResponse(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + + /** + * @summary Creates or updates an openshift managed cluster. + * + * Creates or updates a openshift managed cluster with the specified + * configuration for agents and OpenShift version. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} parameters Parameters supplied to the Create or Update an + * OpenShift Managed Cluster operation. + * + * @param {object} [parameters.plan] Define the resource plan as required by + * ARM for billing purposes + * + * @param {string} [parameters.plan.name] The plan ID. + * + * @param {string} [parameters.plan.product] Specifies the product of the image + * from the marketplace. This is the same value as Offer under the + * imageReference element. + * + * @param {string} [parameters.plan.promotionCode] The promotion code. + * + * @param {string} [parameters.plan.publisher] The plan ID. + * + * @param {string} parameters.openShiftVersion Version of OpenShift specified + * when creating the cluster. + * + * @param {string} [parameters.publicHostname] Optional user-specified FQDN for + * OpenShift API server. + * + * @param {string} [parameters.fqdn] User-specified FQDN for OpenShift API + * server loadbalancer internal hostname. + * + * @param {object} [parameters.networkProfile] Configuration for OpenShift + * networking. + * + * @param {string} [parameters.networkProfile.vnetCidr] CIDR for the OpenShift + * Vnet. + * + * @param {string} [parameters.networkProfile.peerVnetId] CIDR of the Vnet to + * peer. + * + * @param {array} [parameters.routerProfiles] Configuration for OpenShift + * router(s). + * + * @param {object} [parameters.masterPoolProfile] Configuration for OpenShift + * master VMs. + * + * @param {string} [parameters.masterPoolProfile.name] Unique name of the + * master pool profile in the context of the subscription and resource group. + * + * @param {number} parameters.masterPoolProfile.count Number of masters (VMs) + * to host docker containers. The default value is 3. + * + * @param {string} parameters.masterPoolProfile.vmSize Size of agent VMs. + * Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3' + * + * @param {string} [parameters.masterPoolProfile.subnetCidr] Subnet CIDR for + * the peering. + * + * @param {string} [parameters.masterPoolProfile.osType] OsType to be used to + * specify os type. Choose from Linux and Windows. Default to Linux. Possible + * values include: 'Linux', 'Windows' + * + * @param {array} [parameters.agentPoolProfiles] Configuration of OpenShift + * cluster VMs. + * + * @param {object} [parameters.authProfile] Configures OpenShift + * authentication. + * + * @param {array} [parameters.authProfile.identityProviders] Type of + * authentication profile to use. + * + * @param {string} parameters.location Resource location + * + * @param {object} [parameters.tags] Resource tags + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {ServiceCallback} [optionalCallback] - The optional callback. + * + * @returns {ServiceCallback|Promise} If a callback was passed as the last + * parameter then it returns the callback else returns a Promise. + * + * {Promise} A promise is returned. + * + * @resolve {OpenShiftManagedCluster} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + * + * {ServiceCallback} optionalCallback(err, result, request, response) + * + * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. + * + * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. + * See {@link OpenShiftManagedCluster} for more + * information. + * + * {WebResource} [request] - The HTTP Request object if an error did not occur. + * + * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. + */ + beginCreateOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + beginCreateOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, callback: ServiceCallback): void; + beginCreateOrUpdate(resourceGroupName: string, resourceName: string, parameters: models.OpenShiftManagedCluster, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + + + /** + * @summary Updates tags on an openshift managed cluster. + * + * Updates an openshift managed cluster with the specified tags. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} parameters Parameters supplied to the Update OpenShift + * Managed Cluster Tags operation. + * + * @param {object} [parameters.tags] Resource tags. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @returns {Promise} A promise is returned + * + * @resolve {HttpOperationResponse} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + */ + beginUpdateTagsWithHttpOperationResponse(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + + /** + * @summary Updates tags on an openshift managed cluster. + * + * Updates an openshift managed cluster with the specified tags. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} parameters Parameters supplied to the Update OpenShift + * Managed Cluster Tags operation. + * + * @param {object} [parameters.tags] Resource tags. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {ServiceCallback} [optionalCallback] - The optional callback. + * + * @returns {ServiceCallback|Promise} If a callback was passed as the last + * parameter then it returns the callback else returns a Promise. + * + * {Promise} A promise is returned. + * + * @resolve {OpenShiftManagedCluster} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + * + * {ServiceCallback} optionalCallback(err, result, request, response) + * + * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. + * + * {OpenShiftManagedCluster} [result] - The deserialized result object if an error did not occur. + * See {@link OpenShiftManagedCluster} for more + * information. + * + * {WebResource} [request] - The HTTP Request object if an error did not occur. + * + * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. + */ + beginUpdateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + beginUpdateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, callback: ServiceCallback): void; + beginUpdateTags(resourceGroupName: string, resourceName: string, parameters: models.TagsObject, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + + + /** + * @summary Deletes an openshift managed cluster. + * + * Deletes the openshift managed cluster with a specified resource group and + * name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @returns {Promise} A promise is returned + * + * @resolve {HttpOperationResponse} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + */ + beginDeleteMethodWithHttpOperationResponse(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + + /** + * @summary Deletes an openshift managed cluster. + * + * Deletes the openshift managed cluster with a specified resource group and + * name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the openshift managed cluster + * resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {ServiceCallback} [optionalCallback] - The optional callback. + * + * @returns {ServiceCallback|Promise} If a callback was passed as the last + * parameter then it returns the callback else returns a Promise. + * + * {Promise} A promise is returned. + * + * @resolve {null} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + * + * {ServiceCallback} optionalCallback(err, result, request, response) + * + * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. + * + * {null} [result] - The deserialized result object if an error did not occur. + * + * {WebResource} [request] - The HTTP Request object if an error did not occur. + * + * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. + */ + beginDeleteMethod(resourceGroupName: string, resourceName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + beginDeleteMethod(resourceGroupName: string, resourceName: string, callback: ServiceCallback): void; + beginDeleteMethod(resourceGroupName: string, resourceName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; +} + /** * @class * ContainerServices diff --git a/lib/services/containerservicesManagement/lib/operations/index.js b/lib/services/containerservicesManagement/lib/operations/index.js index da31241c46..dda2cf2c5c 100644 --- a/lib/services/containerservicesManagement/lib/operations/index.js +++ b/lib/services/containerservicesManagement/lib/operations/index.js @@ -14,6 +14,7 @@ 'use strict'; +exports.OpenShiftManagedClusters = require('./openShiftManagedClusters'); exports.ContainerServices = require('./containerServices'); exports.Operations = require('./operations'); exports.ManagedClusters = require('./managedClusters'); From 4aad842baf361d99d15855a82fb50b8c4cfa43b7 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 17 Oct 2018 21:17:54 +0000 Subject: [PATCH 3/6] Generated from 3f9220b29a0180bf1a037013514ea859e6a0bf22 add listcredential api back --- .../lib/models/index.d.ts | 12 + .../lib/models/index.js | 1 + .../lib/operations/index.d.ts | 72 +++++ .../lib/operations/managedClusters.js | 254 ++++++++++++++++++ 4 files changed, 339 insertions(+) diff --git a/lib/services/containerservicesManagement/lib/models/index.d.ts b/lib/services/containerservicesManagement/lib/models/index.d.ts index d6090e4adf..e0aa6e5d5c 100644 --- a/lib/services/containerservicesManagement/lib/models/index.d.ts +++ b/lib/services/containerservicesManagement/lib/models/index.d.ts @@ -1034,6 +1034,18 @@ export interface OrchestratorProfile { orchestratorVersion: string; } +/** + * @class + * Initializes a new instance of the ManagedClusterAccessProfile class. + * @constructor + * Managed cluster Access Profile. + * + * @member {buffer} [kubeConfig] Base64-encoded Kubernetes configuration file. + */ +export interface ManagedClusterAccessProfile extends Resource { + kubeConfig?: Buffer; +} + /** * @class * Initializes a new instance of the ManagedClusterPoolUpgradeProfile class. diff --git a/lib/services/containerservicesManagement/lib/models/index.js b/lib/services/containerservicesManagement/lib/models/index.js index d83a977c3b..fea896dbeb 100644 --- a/lib/services/containerservicesManagement/lib/models/index.js +++ b/lib/services/containerservicesManagement/lib/models/index.js @@ -51,6 +51,7 @@ exports.ManagedClusterAddonProfile = require('./managedClusterAddonProfile'); exports.ManagedClusterAADProfile = require('./managedClusterAADProfile'); exports.ManagedCluster = require('./managedCluster'); exports.OrchestratorProfile = require('./orchestratorProfile'); +exports.ManagedClusterAccessProfile = require('./managedClusterAccessProfile'); exports.ManagedClusterPoolUpgradeProfile = require('./managedClusterPoolUpgradeProfile'); exports.ManagedClusterUpgradeProfile = require('./managedClusterUpgradeProfile'); exports.CredentialResult = require('./credentialResult'); diff --git a/lib/services/containerservicesManagement/lib/operations/index.d.ts b/lib/services/containerservicesManagement/lib/operations/index.d.ts index ae72e1ea7d..f6e07b6500 100644 --- a/lib/services/containerservicesManagement/lib/operations/index.d.ts +++ b/lib/services/containerservicesManagement/lib/operations/index.d.ts @@ -2372,6 +2372,78 @@ export interface ManagedClusters { getUpgradeProfile(resourceGroupName: string, resourceName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + /** + * @summary Gets an access profile of a managed cluster. + * + * Gets the accessProfile for the specified role name of the managed cluster + * with a specified resource group and name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the managed cluster resource. + * + * @param {string} roleName The name of the role for managed cluster + * accessProfile resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @returns {Promise} A promise is returned + * + * @resolve {HttpOperationResponse} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + */ + getAccessProfileWithHttpOperationResponse(resourceGroupName: string, resourceName: string, roleName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + + /** + * @summary Gets an access profile of a managed cluster. + * + * Gets the accessProfile for the specified role name of the managed cluster + * with a specified resource group and name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the managed cluster resource. + * + * @param {string} roleName The name of the role for managed cluster + * accessProfile resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {ServiceCallback} [optionalCallback] - The optional callback. + * + * @returns {ServiceCallback|Promise} If a callback was passed as the last + * parameter then it returns the callback else returns a Promise. + * + * {Promise} A promise is returned. + * + * @resolve {ManagedClusterAccessProfile} - The deserialized result object. + * + * @reject {Error|ServiceError} - The error object. + * + * {ServiceCallback} optionalCallback(err, result, request, response) + * + * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. + * + * {ManagedClusterAccessProfile} [result] - The deserialized result object if an error did not occur. + * See {@link ManagedClusterAccessProfile} for more + * information. + * + * {WebResource} [request] - The HTTP Request object if an error did not occur. + * + * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. + */ + getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, callback: ServiceCallback): void; + getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + + /** * @summary Gets clusteradmin credential of a managed cluster. * diff --git a/lib/services/containerservicesManagement/lib/operations/managedClusters.js b/lib/services/containerservicesManagement/lib/operations/managedClusters.js index a2c6481b7f..ced7ebfdad 100644 --- a/lib/services/containerservicesManagement/lib/operations/managedClusters.js +++ b/lib/services/containerservicesManagement/lib/operations/managedClusters.js @@ -438,6 +438,160 @@ function _getUpgradeProfile(resourceGroupName, resourceName, options, callback) }); } +/** + * @summary Gets an access profile of a managed cluster. + * + * Gets the accessProfile for the specified role name of the managed cluster + * with a specified resource group and name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the managed cluster resource. + * + * @param {string} roleName The name of the role for managed cluster + * accessProfile resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {function} callback - The callback. + * + * @returns {function} callback(err, result, request, response) + * + * {Error} err - The Error object if an error occurred, null otherwise. + * + * {object} [result] - The deserialized result object if an error did not occur. + * See {@link ManagedClusterAccessProfile} for more + * information. + * + * {object} [request] - The HTTP Request object if an error did not occur. + * + * {stream} [response] - The HTTP Response stream if an error did not occur. + */ +function _getAccessProfile(resourceGroupName, resourceName, roleName, options, callback) { + /* jshint validthis: true */ + let client = this.client; + if(!callback && typeof options === 'function') { + callback = options; + options = null; + } + if (!callback) { + throw new Error('callback cannot be null.'); + } + let apiVersion = '2018-08-01-preview'; + // Validate + try { + if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { + throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.'); + } + if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') { + throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.'); + } + if (resourceName === null || resourceName === undefined || typeof resourceName.valueOf() !== 'string') { + throw new Error('resourceName cannot be null or undefined and it must be of type string.'); + } + if (roleName === null || roleName === undefined || typeof roleName.valueOf() !== 'string') { + throw new Error('roleName cannot be null or undefined and it must be of type string.'); + } + if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') { + throw new Error('this.client.acceptLanguage must be of type string.'); + } + } catch (error) { + return callback(error); + } + + // Construct URL + let baseUrl = this.client.baseUri; + let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}/listCredential'; + requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId)); + requestUrl = requestUrl.replace('{resourceGroupName}', encodeURIComponent(resourceGroupName)); + requestUrl = requestUrl.replace('{resourceName}', encodeURIComponent(resourceName)); + requestUrl = requestUrl.replace('{roleName}', encodeURIComponent(roleName)); + let queryParameters = []; + queryParameters.push('api-version=' + encodeURIComponent(apiVersion)); + if (queryParameters.length > 0) { + requestUrl += '?' + queryParameters.join('&'); + } + + // Create HTTP transport objects + let httpRequest = new WebResource(); + httpRequest.method = 'POST'; + httpRequest.url = requestUrl; + httpRequest.headers = {}; + // Set Headers + httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8'; + if (this.client.generateClientRequestId) { + httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid(); + } + if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) { + httpRequest.headers['accept-language'] = this.client.acceptLanguage; + } + if(options) { + for(let headerName in options['customHeaders']) { + if (options['customHeaders'].hasOwnProperty(headerName)) { + httpRequest.headers[headerName] = options['customHeaders'][headerName]; + } + } + } + httpRequest.body = null; + // Send Request + return client.pipeline(httpRequest, (err, response, responseBody) => { + if (err) { + return callback(err); + } + let statusCode = response.statusCode; + if (statusCode !== 200) { + let error = new Error(responseBody); + error.statusCode = response.statusCode; + error.request = msRest.stripRequest(httpRequest); + error.response = msRest.stripResponse(response); + if (responseBody === '') responseBody = null; + let parsedErrorResponse; + try { + parsedErrorResponse = JSON.parse(responseBody); + if (parsedErrorResponse) { + if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error; + if (parsedErrorResponse.code) error.code = parsedErrorResponse.code; + if (parsedErrorResponse.message) error.message = parsedErrorResponse.message; + } + if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) { + let resultMapper = new client.models['CloudError']().mapper(); + error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body'); + } + } catch (defaultError) { + error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` + + `- "${responseBody}" for the default response.`; + return callback(error); + } + return callback(error); + } + // Create Result + let result = null; + if (responseBody === '') responseBody = null; + // Deserialize Response + if (statusCode === 200) { + let parsedResponse = null; + try { + parsedResponse = JSON.parse(responseBody); + result = JSON.parse(responseBody); + if (parsedResponse !== null && parsedResponse !== undefined) { + let resultMapper = new client.models['ManagedClusterAccessProfile']().mapper(); + result = client.deserialize(resultMapper, parsedResponse, 'result'); + } + } catch (error) { + let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`); + deserializationError.request = msRest.stripRequest(httpRequest); + deserializationError.response = msRest.stripResponse(response); + return callback(deserializationError); + } + } + + return callback(null, result, httpRequest, response); + }); +} + /** * @summary Gets clusteradmin credential of a managed cluster. * @@ -2025,6 +2179,7 @@ class ManagedClusters { this._list = _list; this._listByResourceGroup = _listByResourceGroup; this._getUpgradeProfile = _getUpgradeProfile; + this._getAccessProfile = _getAccessProfile; this._listClusterAdminCredentials = _listClusterAdminCredentials; this._listClusterUserCredentials = _listClusterUserCredentials; this._get = _get; @@ -2307,6 +2462,105 @@ class ManagedClusters { } } + /** + * @summary Gets an access profile of a managed cluster. + * + * Gets the accessProfile for the specified role name of the managed cluster + * with a specified resource group and name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the managed cluster resource. + * + * @param {string} roleName The name of the role for managed cluster + * accessProfile resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @returns {Promise} A promise is returned + * + * @resolve {HttpOperationResponse} - The deserialized result object. + * + * @reject {Error} - The error object. + */ + getAccessProfileWithHttpOperationResponse(resourceGroupName, resourceName, roleName, options) { + let client = this.client; + let self = this; + return new Promise((resolve, reject) => { + self._getAccessProfile(resourceGroupName, resourceName, roleName, options, (err, result, request, response) => { + let httpOperationResponse = new msRest.HttpOperationResponse(request, response); + httpOperationResponse.body = result; + if (err) { reject(err); } + else { resolve(httpOperationResponse); } + return; + }); + }); + } + + /** + * @summary Gets an access profile of a managed cluster. + * + * Gets the accessProfile for the specified role name of the managed cluster + * with a specified resource group and name. + * + * @param {string} resourceGroupName The name of the resource group. + * + * @param {string} resourceName The name of the managed cluster resource. + * + * @param {string} roleName The name of the role for managed cluster + * accessProfile resource. + * + * @param {object} [options] Optional Parameters. + * + * @param {object} [options.customHeaders] Headers that will be added to the + * request + * + * @param {function} [optionalCallback] - The optional callback. + * + * @returns {function|Promise} If a callback was passed as the last parameter + * then it returns the callback else returns a Promise. + * + * {Promise} A promise is returned + * + * @resolve {ManagedClusterAccessProfile} - The deserialized result object. + * + * @reject {Error} - The error object. + * + * {function} optionalCallback(err, result, request, response) + * + * {Error} err - The Error object if an error occurred, null otherwise. + * + * {object} [result] - The deserialized result object if an error did not occur. + * See {@link ManagedClusterAccessProfile} for more + * information. + * + * {object} [request] - The HTTP Request object if an error did not occur. + * + * {stream} [response] - The HTTP Response stream if an error did not occur. + */ + getAccessProfile(resourceGroupName, resourceName, roleName, options, optionalCallback) { + let client = this.client; + let self = this; + if (!optionalCallback && typeof options === 'function') { + optionalCallback = options; + options = null; + } + if (!optionalCallback) { + return new Promise((resolve, reject) => { + self._getAccessProfile(resourceGroupName, resourceName, roleName, options, (err, result, request, response) => { + if (err) { reject(err); } + else { resolve(result); } + return; + }); + }); + } else { + return self._getAccessProfile(resourceGroupName, resourceName, roleName, options, optionalCallback); + } + } + /** * @summary Gets clusteradmin credential of a managed cluster. * From a38dc2a017c3d2e344b0b913008150b23c3d4219 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 18 Oct 2018 23:24:07 +0000 Subject: [PATCH 4/6] Generated from de4b057ff9497a76da9201e5a339fa4f90022320 Merge branch 'support-two-apiversion' of github.com:zqingqing1/azure-rest-api-specs into support-two-apiversion --- .../lib/models/index.d.ts | 13 ++++++------- .../lib/models/managedClusterAADProfile.js | 4 ++-- .../lib/models/managedClusterAgentPoolProfile.js | 10 ++++------ .../lib/operations/index.d.ts | 8 ++++---- .../lib/operations/managedClusters.js | 12 ++++++------ 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/lib/services/containerservicesManagement/lib/models/index.d.ts b/lib/services/containerservicesManagement/lib/models/index.d.ts index e0aa6e5d5c..fd01ccbd07 100644 --- a/lib/services/containerservicesManagement/lib/models/index.d.ts +++ b/lib/services/containerservicesManagement/lib/models/index.d.ts @@ -859,12 +859,11 @@ export interface ManagedClusterServicePrincipalProfile { * @member {string} [osType] OsType to be used to specify os type. Choose from * Linux and Windows. Default to Linux. Possible values include: 'Linux', * 'Windows'. Default value: 'Linux' . - * @member {number} [maxCount] Maximun number of nodes for auto-scaling - * @member {number} [minCount] Minimun number of nodes for auto-scaling - * @member {boolean} [enableAutoScaling] Wheter to enable auto-scaler + * @member {number} [maxCount] Maximum number of nodes for auto-scaling + * @member {number} [minCount] Minimum number of nodes for auto-scaling + * @member {boolean} [enableAutoScaling] Whether to enable auto-scaler * @member {string} [type] AgentPoolType represents types of agentpool. - * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'. - * Default value: 'VirtualMachineScaleSets' . + * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet' */ export interface ManagedClusterAgentPoolProfile { name: string; @@ -934,14 +933,14 @@ export interface ManagedClusterAddonProfile { * * @member {string} clientAppID The client AAD application ID. * @member {string} serverAppID The server AAD application ID. - * @member {string} serverAppSecret The server AAD application secret. + * @member {string} [serverAppSecret] The server AAD application secret. * @member {string} [tenantID] The AAD tenant ID to use for authentication. If * not specified, will use the tenant of the deployment subscription. */ export interface ManagedClusterAADProfile { clientAppID: string; serverAppID: string; - serverAppSecret: string; + serverAppSecret?: string; tenantID?: string; } diff --git a/lib/services/containerservicesManagement/lib/models/managedClusterAADProfile.js b/lib/services/containerservicesManagement/lib/models/managedClusterAADProfile.js index 8f76641400..6647d93681 100644 --- a/lib/services/containerservicesManagement/lib/models/managedClusterAADProfile.js +++ b/lib/services/containerservicesManagement/lib/models/managedClusterAADProfile.js @@ -19,7 +19,7 @@ class ManagedClusterAADProfile { * Create a ManagedClusterAADProfile. * @member {string} clientAppID The client AAD application ID. * @member {string} serverAppID The server AAD application ID. - * @member {string} serverAppSecret The server AAD application secret. + * @member {string} [serverAppSecret] The server AAD application secret. * @member {string} [tenantID] The AAD tenant ID to use for authentication. * If not specified, will use the tenant of the deployment subscription. */ @@ -55,7 +55,7 @@ class ManagedClusterAADProfile { } }, serverAppSecret: { - required: true, + required: false, serializedName: 'serverAppSecret', type: { name: 'String' diff --git a/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js b/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js index 3c9387c3eb..b4ba2c9366 100644 --- a/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js +++ b/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js @@ -83,12 +83,11 @@ class ManagedClusterAgentPoolProfile { * @member {string} [osType] OsType to be used to specify os type. Choose * from Linux and Windows. Default to Linux. Possible values include: * 'Linux', 'Windows'. Default value: 'Linux' . - * @member {number} [maxCount] Maximun number of nodes for auto-scaling - * @member {number} [minCount] Minimun number of nodes for auto-scaling - * @member {boolean} [enableAutoScaling] Wheter to enable auto-scaler + * @member {number} [maxCount] Maximum number of nodes for auto-scaling + * @member {number} [minCount] Minimum number of nodes for auto-scaling + * @member {boolean} [enableAutoScaling] Whether to enable auto-scaler * @member {string} [type] AgentPoolType represents types of agentpool. - * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'. - * Default value: 'VirtualMachineScaleSets' . + * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet' */ constructor() { } @@ -186,7 +185,6 @@ class ManagedClusterAgentPoolProfile { type: { required: false, serializedName: 'type', - defaultValue: 'VirtualMachineScaleSets', type: { name: 'String' } diff --git a/lib/services/containerservicesManagement/lib/operations/index.d.ts b/lib/services/containerservicesManagement/lib/operations/index.d.ts index f6e07b6500..1f60bdf48e 100644 --- a/lib/services/containerservicesManagement/lib/operations/index.d.ts +++ b/lib/services/containerservicesManagement/lib/operations/index.d.ts @@ -2723,7 +2723,7 @@ export interface ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -2831,7 +2831,7 @@ export interface ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -3093,7 +3093,7 @@ export interface ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -3201,7 +3201,7 @@ export interface ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use diff --git a/lib/services/containerservicesManagement/lib/operations/managedClusters.js b/lib/services/containerservicesManagement/lib/operations/managedClusters.js index ced7ebfdad..00592e6094 100644 --- a/lib/services/containerservicesManagement/lib/operations/managedClusters.js +++ b/lib/services/containerservicesManagement/lib/operations/managedClusters.js @@ -1115,7 +1115,7 @@ function _get(resourceGroupName, resourceName, options, callback) { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -1430,7 +1430,7 @@ function _deleteMethod(resourceGroupName, resourceName, options, callback) { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -2921,7 +2921,7 @@ class ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -3041,7 +3041,7 @@ class ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -3372,7 +3372,7 @@ class ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use @@ -3492,7 +3492,7 @@ class ManagedClusters { * @param {string} parameters.aadProfile.serverAppID The server AAD application * ID. * - * @param {string} parameters.aadProfile.serverAppSecret The server AAD + * @param {string} [parameters.aadProfile.serverAppSecret] The server AAD * application secret. * * @param {string} [parameters.aadProfile.tenantID] The AAD tenant ID to use From e71f6e63f42f99f92e67d8f3aa6652e39b7a05c9 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 18 Oct 2018 23:46:28 +0000 Subject: [PATCH 5/6] Generated from feb703f2baba9455e3f4e671fc7ef0479111392f change default tag to 2018-09-30-preview --- .../lib/models/index.d.ts | 20 ++++---- .../lib/models/managedCluster.js | 1 + .../models/managedClusterAgentPoolProfile.js | 48 +++++-------------- .../lib/operations/index.d.ts | 4 ++ .../lib/operations/managedClusters.js | 26 ++++++---- .../lib/operations/operations.js | 2 +- 6 files changed, 43 insertions(+), 58 deletions(-) diff --git a/lib/services/containerservicesManagement/lib/models/index.d.ts b/lib/services/containerservicesManagement/lib/models/index.d.ts index fd01ccbd07..401777381b 100644 --- a/lib/services/containerservicesManagement/lib/models/index.d.ts +++ b/lib/services/containerservicesManagement/lib/models/index.d.ts @@ -797,7 +797,7 @@ export interface ManagedClusterServicePrincipalProfile { * * @member {string} name Unique name of the agent pool profile in the context * of the subscription and resource group. - * @member {number} count Number of agents (VMs) to host docker containers. + * @member {number} [count] Number of agents (VMs) to host docker containers. * Allowed values must be in the range of 1 to 100 (inclusive). The default * value is 1. . Default value: 1 . * @member {string} vmSize Size of agent VMs. Possible values include: @@ -853,30 +853,25 @@ export interface ManagedClusterServicePrincipalProfile { * @member {number} [osDiskSizeGB] OS Disk Size in GB to be used to specify the * disk size for every machine in this master/agent pool. If you specify 0, it * will apply the default osDisk size according to the vmSize specified. + * @member {string} [storageProfile] Storage profile specifies what kind of + * storage used. Defaults to ManagedDisks. Possible values include: + * 'StorageAccount', 'ManagedDisks' * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet * identifier. * @member {number} [maxPods] Maximum number of pods that can run on a node. * @member {string} [osType] OsType to be used to specify os type. Choose from * Linux and Windows. Default to Linux. Possible values include: 'Linux', * 'Windows'. Default value: 'Linux' . - * @member {number} [maxCount] Maximum number of nodes for auto-scaling - * @member {number} [minCount] Minimum number of nodes for auto-scaling - * @member {boolean} [enableAutoScaling] Whether to enable auto-scaler - * @member {string} [type] AgentPoolType represents types of agentpool. - * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet' */ export interface ManagedClusterAgentPoolProfile { name: string; - count: number; + count?: number; vmSize: string; osDiskSizeGB?: number; + readonly storageProfile?: string; vnetSubnetID?: string; maxPods?: number; osType?: string; - maxCount?: number; - minCount?: number; - enableAutoScaling?: boolean; - type?: string; } /** @@ -957,7 +952,8 @@ export interface ManagedClusterAADProfile { * @member {string} [dnsPrefix] DNS prefix specified when creating the managed * cluster. * @member {string} [fqdn] FDQN for the master pool. - * @member {array} [agentPoolProfiles] Properties of the agent pool. + * @member {array} [agentPoolProfiles] Properties of the agent pool. Currently + * only one agent pool can exist. * @member {object} [linuxProfile] Profile for Linux VMs in the container * service cluster. * @member {string} [linuxProfile.adminUsername] The administrator username to diff --git a/lib/services/containerservicesManagement/lib/models/managedCluster.js b/lib/services/containerservicesManagement/lib/models/managedCluster.js index 7d0c528534..158deed57e 100644 --- a/lib/services/containerservicesManagement/lib/models/managedCluster.js +++ b/lib/services/containerservicesManagement/lib/models/managedCluster.js @@ -28,6 +28,7 @@ class ManagedCluster extends models['Resource'] { * managed cluster. * @member {string} [fqdn] FDQN for the master pool. * @member {array} [agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * @member {object} [linuxProfile] Profile for Linux VMs in the container * service cluster. * @member {string} [linuxProfile.adminUsername] The administrator username diff --git a/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js b/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js index b4ba2c9366..9164a04bab 100644 --- a/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js +++ b/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js @@ -19,7 +19,7 @@ class ManagedClusterAgentPoolProfile { * Create a ManagedClusterAgentPoolProfile. * @member {string} name Unique name of the agent pool profile in the context * of the subscription and resource group. - * @member {number} count Number of agents (VMs) to host docker containers. + * @member {number} [count] Number of agents (VMs) to host docker containers. * Allowed values must be in the range of 1 to 100 (inclusive). The default * value is 1. . Default value: 1 . * @member {string} vmSize Size of agent VMs. Possible values include: @@ -77,17 +77,15 @@ class ManagedClusterAgentPoolProfile { * the disk size for every machine in this master/agent pool. If you specify * 0, it will apply the default osDisk size according to the vmSize * specified. + * @member {string} [storageProfile] Storage profile specifies what kind of + * storage used. Defaults to ManagedDisks. Possible values include: + * 'StorageAccount', 'ManagedDisks' * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet * identifier. * @member {number} [maxPods] Maximum number of pods that can run on a node. * @member {string} [osType] OsType to be used to specify os type. Choose * from Linux and Windows. Default to Linux. Possible values include: * 'Linux', 'Windows'. Default value: 'Linux' . - * @member {number} [maxCount] Maximum number of nodes for auto-scaling - * @member {number} [minCount] Minimum number of nodes for auto-scaling - * @member {boolean} [enableAutoScaling] Whether to enable auto-scaler - * @member {string} [type] AgentPoolType represents types of agentpool. - * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet' */ constructor() { } @@ -114,7 +112,7 @@ class ManagedClusterAgentPoolProfile { } }, count: { - required: true, + required: false, serializedName: 'count', defaultValue: 1, constraints: { @@ -139,6 +137,14 @@ class ManagedClusterAgentPoolProfile { name: 'Number' } }, + storageProfile: { + required: false, + readOnly: true, + serializedName: 'storageProfile', + type: { + name: 'String' + } + }, vnetSubnetID: { required: false, serializedName: 'vnetSubnetID', @@ -160,34 +166,6 @@ class ManagedClusterAgentPoolProfile { type: { name: 'String' } - }, - maxCount: { - required: false, - serializedName: 'maxCount', - type: { - name: 'Number' - } - }, - minCount: { - required: false, - serializedName: 'minCount', - type: { - name: 'Number' - } - }, - enableAutoScaling: { - required: false, - serializedName: 'enableAutoScaling', - type: { - name: 'Boolean' - } - }, - type: { - required: false, - serializedName: 'type', - type: { - name: 'String' - } } } } diff --git a/lib/services/containerservicesManagement/lib/operations/index.d.ts b/lib/services/containerservicesManagement/lib/operations/index.d.ts index 1f60bdf48e..850f1bab13 100644 --- a/lib/services/containerservicesManagement/lib/operations/index.d.ts +++ b/lib/services/containerservicesManagement/lib/operations/index.d.ts @@ -2659,6 +2659,7 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -2767,6 +2768,7 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3029,6 +3031,7 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3137,6 +3140,7 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. diff --git a/lib/services/containerservicesManagement/lib/operations/managedClusters.js b/lib/services/containerservicesManagement/lib/operations/managedClusters.js index 00592e6094..fa9d0c11ea 100644 --- a/lib/services/containerservicesManagement/lib/operations/managedClusters.js +++ b/lib/services/containerservicesManagement/lib/operations/managedClusters.js @@ -49,7 +49,7 @@ function _list(options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -187,7 +187,7 @@ function _listByResourceGroup(resourceGroupName, options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -330,7 +330,7 @@ function _getUpgradeProfile(resourceGroupName, resourceName, options, callback) if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -480,7 +480,7 @@ function _getAccessProfile(resourceGroupName, resourceName, roleName, options, c if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -630,7 +630,7 @@ function _listClusterAdminCredentials(resourceGroupName, resourceName, options, if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -776,7 +776,7 @@ function _listClusterUserCredentials(resourceGroupName, resourceName, options, c if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -922,7 +922,7 @@ function _get(resourceGroupName, resourceName, options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -1051,6 +1051,7 @@ function _get(resourceGroupName, resourceName, options, callback) { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -1366,6 +1367,7 @@ function _deleteMethod(resourceGroupName, resourceName, options, callback) { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -1469,7 +1471,7 @@ function _beginCreateOrUpdate(resourceGroupName, resourceName, parameters, optio if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -1653,7 +1655,7 @@ function _beginUpdateTags(resourceGroupName, resourceName, parameters, options, if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -1814,7 +1816,7 @@ function _beginDeleteMethod(resourceGroupName, resourceName, options, callback) if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -2857,6 +2859,7 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -2977,6 +2980,7 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3308,6 +3312,7 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3428,6 +3433,7 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. + * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. diff --git a/lib/services/containerservicesManagement/lib/operations/operations.js b/lib/services/containerservicesManagement/lib/operations/operations.js index 8cf8e3a30d..1ffa97face 100644 --- a/lib/services/containerservicesManagement/lib/operations/operations.js +++ b/lib/services/containerservicesManagement/lib/operations/operations.js @@ -45,7 +45,7 @@ function _list(options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-08-01-preview'; + let apiVersion = '2018-03-31'; // Validate try { if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') { From 2ba0d4b9fe8e6c9ce801923127424192d9a4f465 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 19 Oct 2018 20:15:24 +0000 Subject: [PATCH 6/6] Generated from 6da165da530980a01c317254a5807602731621df udpate tag to lastest version --- .../lib/models/index.d.ts | 20 ++++---- .../lib/models/managedCluster.js | 1 - .../models/managedClusterAgentPoolProfile.js | 48 ++++++++++++++----- .../lib/operations/index.d.ts | 4 -- .../lib/operations/managedClusters.js | 26 ++++------ .../lib/operations/operations.js | 2 +- 6 files changed, 58 insertions(+), 43 deletions(-) diff --git a/lib/services/containerservicesManagement/lib/models/index.d.ts b/lib/services/containerservicesManagement/lib/models/index.d.ts index 401777381b..fd01ccbd07 100644 --- a/lib/services/containerservicesManagement/lib/models/index.d.ts +++ b/lib/services/containerservicesManagement/lib/models/index.d.ts @@ -797,7 +797,7 @@ export interface ManagedClusterServicePrincipalProfile { * * @member {string} name Unique name of the agent pool profile in the context * of the subscription and resource group. - * @member {number} [count] Number of agents (VMs) to host docker containers. + * @member {number} count Number of agents (VMs) to host docker containers. * Allowed values must be in the range of 1 to 100 (inclusive). The default * value is 1. . Default value: 1 . * @member {string} vmSize Size of agent VMs. Possible values include: @@ -853,25 +853,30 @@ export interface ManagedClusterServicePrincipalProfile { * @member {number} [osDiskSizeGB] OS Disk Size in GB to be used to specify the * disk size for every machine in this master/agent pool. If you specify 0, it * will apply the default osDisk size according to the vmSize specified. - * @member {string} [storageProfile] Storage profile specifies what kind of - * storage used. Defaults to ManagedDisks. Possible values include: - * 'StorageAccount', 'ManagedDisks' * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet * identifier. * @member {number} [maxPods] Maximum number of pods that can run on a node. * @member {string} [osType] OsType to be used to specify os type. Choose from * Linux and Windows. Default to Linux. Possible values include: 'Linux', * 'Windows'. Default value: 'Linux' . + * @member {number} [maxCount] Maximum number of nodes for auto-scaling + * @member {number} [minCount] Minimum number of nodes for auto-scaling + * @member {boolean} [enableAutoScaling] Whether to enable auto-scaler + * @member {string} [type] AgentPoolType represents types of agentpool. + * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet' */ export interface ManagedClusterAgentPoolProfile { name: string; - count?: number; + count: number; vmSize: string; osDiskSizeGB?: number; - readonly storageProfile?: string; vnetSubnetID?: string; maxPods?: number; osType?: string; + maxCount?: number; + minCount?: number; + enableAutoScaling?: boolean; + type?: string; } /** @@ -952,8 +957,7 @@ export interface ManagedClusterAADProfile { * @member {string} [dnsPrefix] DNS prefix specified when creating the managed * cluster. * @member {string} [fqdn] FDQN for the master pool. - * @member {array} [agentPoolProfiles] Properties of the agent pool. Currently - * only one agent pool can exist. + * @member {array} [agentPoolProfiles] Properties of the agent pool. * @member {object} [linuxProfile] Profile for Linux VMs in the container * service cluster. * @member {string} [linuxProfile.adminUsername] The administrator username to diff --git a/lib/services/containerservicesManagement/lib/models/managedCluster.js b/lib/services/containerservicesManagement/lib/models/managedCluster.js index 158deed57e..7d0c528534 100644 --- a/lib/services/containerservicesManagement/lib/models/managedCluster.js +++ b/lib/services/containerservicesManagement/lib/models/managedCluster.js @@ -28,7 +28,6 @@ class ManagedCluster extends models['Resource'] { * managed cluster. * @member {string} [fqdn] FDQN for the master pool. * @member {array} [agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * @member {object} [linuxProfile] Profile for Linux VMs in the container * service cluster. * @member {string} [linuxProfile.adminUsername] The administrator username diff --git a/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js b/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js index 9164a04bab..b4ba2c9366 100644 --- a/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js +++ b/lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js @@ -19,7 +19,7 @@ class ManagedClusterAgentPoolProfile { * Create a ManagedClusterAgentPoolProfile. * @member {string} name Unique name of the agent pool profile in the context * of the subscription and resource group. - * @member {number} [count] Number of agents (VMs) to host docker containers. + * @member {number} count Number of agents (VMs) to host docker containers. * Allowed values must be in the range of 1 to 100 (inclusive). The default * value is 1. . Default value: 1 . * @member {string} vmSize Size of agent VMs. Possible values include: @@ -77,15 +77,17 @@ class ManagedClusterAgentPoolProfile { * the disk size for every machine in this master/agent pool. If you specify * 0, it will apply the default osDisk size according to the vmSize * specified. - * @member {string} [storageProfile] Storage profile specifies what kind of - * storage used. Defaults to ManagedDisks. Possible values include: - * 'StorageAccount', 'ManagedDisks' * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet * identifier. * @member {number} [maxPods] Maximum number of pods that can run on a node. * @member {string} [osType] OsType to be used to specify os type. Choose * from Linux and Windows. Default to Linux. Possible values include: * 'Linux', 'Windows'. Default value: 'Linux' . + * @member {number} [maxCount] Maximum number of nodes for auto-scaling + * @member {number} [minCount] Minimum number of nodes for auto-scaling + * @member {boolean} [enableAutoScaling] Whether to enable auto-scaler + * @member {string} [type] AgentPoolType represents types of agentpool. + * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet' */ constructor() { } @@ -112,7 +114,7 @@ class ManagedClusterAgentPoolProfile { } }, count: { - required: false, + required: true, serializedName: 'count', defaultValue: 1, constraints: { @@ -137,14 +139,6 @@ class ManagedClusterAgentPoolProfile { name: 'Number' } }, - storageProfile: { - required: false, - readOnly: true, - serializedName: 'storageProfile', - type: { - name: 'String' - } - }, vnetSubnetID: { required: false, serializedName: 'vnetSubnetID', @@ -166,6 +160,34 @@ class ManagedClusterAgentPoolProfile { type: { name: 'String' } + }, + maxCount: { + required: false, + serializedName: 'maxCount', + type: { + name: 'Number' + } + }, + minCount: { + required: false, + serializedName: 'minCount', + type: { + name: 'Number' + } + }, + enableAutoScaling: { + required: false, + serializedName: 'enableAutoScaling', + type: { + name: 'Boolean' + } + }, + type: { + required: false, + serializedName: 'type', + type: { + name: 'String' + } } } } diff --git a/lib/services/containerservicesManagement/lib/operations/index.d.ts b/lib/services/containerservicesManagement/lib/operations/index.d.ts index 850f1bab13..1f60bdf48e 100644 --- a/lib/services/containerservicesManagement/lib/operations/index.d.ts +++ b/lib/services/containerservicesManagement/lib/operations/index.d.ts @@ -2659,7 +2659,6 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -2768,7 +2767,6 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3031,7 +3029,6 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3140,7 +3137,6 @@ export interface ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. diff --git a/lib/services/containerservicesManagement/lib/operations/managedClusters.js b/lib/services/containerservicesManagement/lib/operations/managedClusters.js index fa9d0c11ea..00592e6094 100644 --- a/lib/services/containerservicesManagement/lib/operations/managedClusters.js +++ b/lib/services/containerservicesManagement/lib/operations/managedClusters.js @@ -49,7 +49,7 @@ function _list(options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -187,7 +187,7 @@ function _listByResourceGroup(resourceGroupName, options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -330,7 +330,7 @@ function _getUpgradeProfile(resourceGroupName, resourceName, options, callback) if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -480,7 +480,7 @@ function _getAccessProfile(resourceGroupName, resourceName, roleName, options, c if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -630,7 +630,7 @@ function _listClusterAdminCredentials(resourceGroupName, resourceName, options, if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -776,7 +776,7 @@ function _listClusterUserCredentials(resourceGroupName, resourceName, options, c if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -922,7 +922,7 @@ function _get(resourceGroupName, resourceName, options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -1051,7 +1051,6 @@ function _get(resourceGroupName, resourceName, options, callback) { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -1367,7 +1366,6 @@ function _deleteMethod(resourceGroupName, resourceName, options, callback) { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -1471,7 +1469,7 @@ function _beginCreateOrUpdate(resourceGroupName, resourceName, parameters, optio if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -1655,7 +1653,7 @@ function _beginUpdateTags(resourceGroupName, resourceName, parameters, options, if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -1816,7 +1814,7 @@ function _beginDeleteMethod(resourceGroupName, resourceName, options, callback) if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') { @@ -2859,7 +2857,6 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -2980,7 +2977,6 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3312,7 +3308,6 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. @@ -3433,7 +3428,6 @@ class ManagedClusters { * the managed cluster. * * @param {array} [parameters.agentPoolProfiles] Properties of the agent pool. - * Currently only one agent pool can exist. * * @param {object} [parameters.linuxProfile] Profile for Linux VMs in the * container service cluster. diff --git a/lib/services/containerservicesManagement/lib/operations/operations.js b/lib/services/containerservicesManagement/lib/operations/operations.js index 1ffa97face..8cf8e3a30d 100644 --- a/lib/services/containerservicesManagement/lib/operations/operations.js +++ b/lib/services/containerservicesManagement/lib/operations/operations.js @@ -45,7 +45,7 @@ function _list(options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } - let apiVersion = '2018-03-31'; + let apiVersion = '2018-08-01-preview'; // Validate try { if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {