From 453f61ad81f9409324f39e9b3b3778b09c8c9e01 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Tue, 3 Nov 2020 10:09:56 +0000 Subject: [PATCH] Generated from 213fbe7d8ebd6b25bddead81010d8fe62029582a --- .../arm-containerservice/README.md | 15 +- .../arm-containerservice/rollup.config.js | 4 +- .../src/containerServiceClient.ts | 13 +- .../src/containerServiceClientContext.ts | 13 +- .../src/models/agentPoolsMappers.ts | 31 +- .../src/models/containerServicesMappers.ts | 69 - .../arm-containerservice/src/models/index.ts | 1687 +++++------------ .../src/models/managedClustersMappers.ts | 31 +- .../src/models/mappers.ts | 1628 ++++++---------- .../models/openShiftManagedClustersMappers.ts | 67 - .../src/models/operationsMappers.ts | 5 +- .../src/models/parameters.ts | 101 +- .../privateEndpointConnectionsMappers.ts | 31 +- .../src/models/privateLinkResourcesMappers.ts | 13 + .../resolvePrivateLinkServiceIdMappers.ts | 12 + .../src/operations/agentPools.ts | 106 +- .../src/operations/containerServices.ts | 515 ----- .../src/operations/index.ts | 9 +- .../src/operations/managedClusters.ts | 185 +- .../operations/openShiftManagedClusters.ts | 491 ----- .../src/operations/operations.ts | 7 +- .../operations/privateEndpointConnections.ts | 29 +- .../src/operations/privateLinkResources.ts | 88 + .../operations/resolvePrivateLinkServiceId.ts | 101 + 24 files changed, 1561 insertions(+), 3690 deletions(-) delete mode 100644 sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts delete mode 100644 sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts create mode 100644 sdk/containerservice/arm-containerservice/src/models/privateLinkResourcesMappers.ts create mode 100644 sdk/containerservice/arm-containerservice/src/models/resolvePrivateLinkServiceIdMappers.ts delete mode 100644 sdk/containerservice/arm-containerservice/src/operations/containerServices.ts delete mode 100644 sdk/containerservice/arm-containerservice/src/operations/openShiftManagedClusters.ts create mode 100644 sdk/containerservice/arm-containerservice/src/operations/privateLinkResources.ts create mode 100644 sdk/containerservice/arm-containerservice/src/operations/resolvePrivateLinkServiceId.ts diff --git a/sdk/containerservice/arm-containerservice/README.md b/sdk/containerservice/arm-containerservice/README.md index 9a050d1be830..ba129c1f3b94 100644 --- a/sdk/containerservice/arm-containerservice/README.md +++ b/sdk/containerservice/arm-containerservice/README.md @@ -15,7 +15,7 @@ npm install @azure/arm-containerservice ### How to use -#### nodejs - Authentication, client creation and list openShiftManagedClusters as an example written in TypeScript. +#### nodejs - client creation and list operations as an example written in TypeScript. ##### Install @azure/ms-rest-nodeauth @@ -26,16 +26,15 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0" ##### Sample code +While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package ```typescript -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; -import { ContainerServiceClient, ContainerServiceModels, ContainerServiceMappers } from "@azure/arm-containerservice"; +const msRestNodeAuth = require("@azure/ms-rest-nodeauth"); +const { ContainerServiceClient } = require("@azure/arm-containerservice"); const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; msRestNodeAuth.interactiveLogin().then((creds) => { const client = new ContainerServiceClient(creds, subscriptionId); - client.openShiftManagedClusters.list().then((result) => { + client.operations.list().then((result) => { console.log("The result is:"); console.log(result); }); @@ -44,7 +43,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => { }); ``` -#### browser - Authentication, client creation and list openShiftManagedClusters as an example written in JavaScript. +#### browser - Authentication, client creation and list operations as an example written in JavaScript. ##### Install @azure/ms-rest-browserauth @@ -78,7 +77,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to authManager.login(); } const client = new Azure.ArmContainerservice.ContainerServiceClient(res.creds, subscriptionId); - client.openShiftManagedClusters.list().then((result) => { + client.operations.list().then((result) => { console.log("The result is:"); console.log(result); }).catch((err) => { diff --git a/sdk/containerservice/arm-containerservice/rollup.config.js b/sdk/containerservice/arm-containerservice/rollup.config.js index c52bc37c54ed..22715637a94f 100644 --- a/sdk/containerservice/arm-containerservice/rollup.config.js +++ b/sdk/containerservice/arm-containerservice/rollup.config.js @@ -21,8 +21,8 @@ const config = { "@azure/ms-rest-azure-js": "msRestAzure" }, banner: `/* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/sdk/containerservice/arm-containerservice/src/containerServiceClient.ts b/sdk/containerservice/arm-containerservice/src/containerServiceClient.ts index 1dbcf82fdbf8..7664ed93d07c 100644 --- a/sdk/containerservice/arm-containerservice/src/containerServiceClient.ts +++ b/sdk/containerservice/arm-containerservice/src/containerServiceClient.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -17,12 +16,12 @@ import { ContainerServiceClientContext } from "./containerServiceClientContext"; class ContainerServiceClient extends ContainerServiceClientContext { // Operation groups - openShiftManagedClusters: operations.OpenShiftManagedClusters; - containerServices: operations.ContainerServices; operations: operations.Operations; managedClusters: operations.ManagedClusters; agentPools: operations.AgentPools; privateEndpointConnections: operations.PrivateEndpointConnections; + privateLinkResources: operations.PrivateLinkResources; + resolvePrivateLinkServiceId: operations.ResolvePrivateLinkServiceId; /** * Initializes a new instance of the ContainerServiceClient class. @@ -33,12 +32,12 @@ class ContainerServiceClient extends ContainerServiceClientContext { */ constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.ContainerServiceClientOptions) { super(credentials, subscriptionId, options); - this.openShiftManagedClusters = new operations.OpenShiftManagedClusters(this); - this.containerServices = new operations.ContainerServices(this); this.operations = new operations.Operations(this); this.managedClusters = new operations.ManagedClusters(this); this.agentPools = new operations.AgentPools(this); this.privateEndpointConnections = new operations.PrivateEndpointConnections(this); + this.privateLinkResources = new operations.PrivateLinkResources(this); + this.resolvePrivateLinkServiceId = new operations.ResolvePrivateLinkServiceId(this); } } diff --git a/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts b/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts index 094f7fe03b6b..0275de65f4b5 100644 --- a/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts +++ b/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -18,6 +17,7 @@ const packageVersion = "11.2.0"; export class ContainerServiceClientContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials; subscriptionId: string; + apiVersion?: string; /** * Initializes a new instance of the ContainerServiceClient class. @@ -37,13 +37,14 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien if (!options) { options = {}; } - if (!options.userAgent) { + if(!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } super(credentials, options); + this.apiVersion = '2020-11-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; @@ -51,10 +52,10 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien this.credentials = credentials; this.subscriptionId = subscriptionId; - if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) { + if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) { this.acceptLanguage = options.acceptLanguage; } - if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { + if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout; } } diff --git a/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts b/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts index 62cdcb830b7d..fa2d628e9888 100644 --- a/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts @@ -1,13 +1,12 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { - discriminators, AgentPool, AgentPoolAvailableVersions, AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem, @@ -17,20 +16,10 @@ export { AgentPoolUpgradeSettings, BaseResource, CloudError, - ContainerService, - ContainerServiceAgentPoolProfile, - ContainerServiceCustomProfile, - ContainerServiceDiagnosticsProfile, ContainerServiceLinuxProfile, - ContainerServiceMasterProfile, ContainerServiceNetworkProfile, - ContainerServiceOrchestratorProfile, - ContainerServiceServicePrincipalProfile, ContainerServiceSshConfiguration, ContainerServiceSshPublicKey, - ContainerServiceVMDiagnostics, - ContainerServiceWindowsProfile, - KeyVaultSecretRef, ManagedCluster, ManagedClusterAADProfile, ManagedClusterAccessProfile, @@ -39,30 +28,26 @@ export { ManagedClusterAgentPoolProfile, ManagedClusterAgentPoolProfileProperties, ManagedClusterAPIServerAccessProfile, + ManagedClusterAutoUpgradeProfile, ManagedClusterIdentity, ManagedClusterIdentityUserAssignedIdentitiesValue, ManagedClusterLoadBalancerProfile, ManagedClusterLoadBalancerProfileManagedOutboundIPs, ManagedClusterLoadBalancerProfileOutboundIPPrefixes, ManagedClusterLoadBalancerProfileOutboundIPs, + ManagedClusterPodIdentity, + ManagedClusterPodIdentityException, + ManagedClusterPodIdentityProfile, + ManagedClusterPodIdentityProvisioningInfo, ManagedClusterPropertiesAutoScalerProfile, ManagedClusterPropertiesIdentityProfileValue, ManagedClusterServicePrincipalProfile, ManagedClusterSKU, ManagedClusterWindowsProfile, - NetworkProfile, - OpenShiftManagedCluster, - OpenShiftManagedClusterAADIdentityProvider, - OpenShiftManagedClusterAgentPoolProfile, - OpenShiftManagedClusterAuthProfile, - OpenShiftManagedClusterBaseIdentityProvider, - OpenShiftManagedClusterIdentityProvider, - OpenShiftManagedClusterMasterPoolProfile, - OpenShiftRouterProfile, + PowerState, PrivateEndpoint, PrivateEndpointConnection, PrivateLinkServiceConnectionState, - PurchasePlan, Resource, ResourceReference, SubResource, diff --git a/sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts b/sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts deleted file mode 100644 index 67faee88ab17..000000000000 --- a/sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - * - * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is regenerated. - */ - -export { - discriminators, - AgentPool, - AgentPoolUpgradeSettings, - BaseResource, - CloudError, - ContainerService, - ContainerServiceAgentPoolProfile, - ContainerServiceCustomProfile, - ContainerServiceDiagnosticsProfile, - ContainerServiceLinuxProfile, - ContainerServiceListResult, - ContainerServiceMasterProfile, - ContainerServiceNetworkProfile, - ContainerServiceOrchestratorProfile, - ContainerServiceServicePrincipalProfile, - ContainerServiceSshConfiguration, - ContainerServiceSshPublicKey, - ContainerServiceVMDiagnostics, - ContainerServiceWindowsProfile, - KeyVaultSecretRef, - ManagedCluster, - ManagedClusterAADProfile, - ManagedClusterAccessProfile, - ManagedClusterAddonProfile, - ManagedClusterAddonProfileIdentity, - ManagedClusterAgentPoolProfile, - ManagedClusterAgentPoolProfileProperties, - ManagedClusterAPIServerAccessProfile, - ManagedClusterIdentity, - ManagedClusterIdentityUserAssignedIdentitiesValue, - ManagedClusterLoadBalancerProfile, - ManagedClusterLoadBalancerProfileManagedOutboundIPs, - ManagedClusterLoadBalancerProfileOutboundIPPrefixes, - ManagedClusterLoadBalancerProfileOutboundIPs, - ManagedClusterPropertiesAutoScalerProfile, - ManagedClusterPropertiesIdentityProfileValue, - ManagedClusterServicePrincipalProfile, - ManagedClusterSKU, - ManagedClusterWindowsProfile, - NetworkProfile, - OpenShiftManagedCluster, - OpenShiftManagedClusterAADIdentityProvider, - OpenShiftManagedClusterAgentPoolProfile, - OpenShiftManagedClusterAuthProfile, - OpenShiftManagedClusterBaseIdentityProvider, - OpenShiftManagedClusterIdentityProvider, - OpenShiftManagedClusterMasterPoolProfile, - OpenShiftRouterProfile, - OrchestratorProfile, - OrchestratorVersionProfile, - OrchestratorVersionProfileListResult, - PrivateEndpoint, - PrivateEndpointConnection, - PrivateLinkServiceConnectionState, - PurchasePlan, - Resource, - ResourceReference, - SubResource, - UserAssignedIdentity -} from "../models/mappers"; diff --git a/sdk/containerservice/arm-containerservice/src/models/index.ts b/sdk/containerservice/arm-containerservice/src/models/index.ts index e9b76961ba3f..8fc70a479c97 100644 --- a/sdk/containerservice/arm-containerservice/src/models/index.ts +++ b/sdk/containerservice/arm-containerservice/src/models/index.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -12,284 +12,90 @@ import * as msRest from "@azure/ms-rest-js"; export { BaseResource, CloudError }; /** - * The Resource model definition. + * Describes the properties of a Compute Operation value. */ -export interface Resource extends BaseResource { +export interface OperationValue { /** - * Resource Id + * The origin of the compute operation. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly id?: string; + readonly origin?: string; /** - * Resource name + * The name of the compute operation. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly name?: string; /** - * Resource type + * The display name of the compute operation. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly type?: string; - /** - * Resource location - */ - location: string; - /** - * Resource tags - */ - tags?: { [propertyName: string]: string }; -} - -/** - * Used for establishing the purchase context of any 3rd Party artifact through MarketPlace. - */ -export interface PurchasePlan { - /** - * The plan ID. - */ - name?: string; - /** - * Specifies the product of the image from the marketplace. This is the same value as Offer under - * the imageReference element. - */ - product?: string; - /** - * The promotion code. - */ - promotionCode?: string; - /** - * The plan ID. - */ - publisher?: string; -} - -/** - * Represents an OpenShift router - */ -export interface OpenShiftRouterProfile { - /** - * Name of the router profile. - */ - name?: string; + readonly operation?: string; /** - * DNS subdomain for OpenShift router. + * The display name of the resource the operation applies to. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly publicSubdomain?: string; + readonly resource?: string; /** - * Auto-allocated FQDN for the OpenShift router. + * The description of the operation. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly fqdn?: string; -} - -/** - * Represents the OpenShift networking configuration - */ -export interface NetworkProfile { - /** - * CIDR for the OpenShift Vnet. Default value: '10.0.0.0/8'. - */ - vnetCidr?: string; - /** - * CIDR of the Vnet to peer. - */ - peerVnetId?: string; - /** - * ID of the Vnet created for OSA cluster. - */ - vnetId?: string; -} - -/** - * OpenShiftManagedClusterMaterPoolProfile contains configuration for OpenShift master VMs. - */ -export interface OpenShiftManagedClusterMasterPoolProfile { - /** - * Unique name of the master pool profile in the context of the subscription and resource group. - */ - name?: string; - /** - * Number of masters (VMs) to host docker containers. The default value is 3. - */ - count: number; - /** - * Size of agent VMs. Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3', - * 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', - * 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', - * 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', - * 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3', - * 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', - * 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', - * 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s' - */ - vmSize: OpenShiftContainerServiceVMSize; - /** - * Subnet CIDR for the peering. - */ - subnetCidr?: string; - /** - * OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux. - * Possible values include: 'Linux', 'Windows'. Default value: 'Linux'. - */ - osType?: OSType; -} - -/** - * Defines the configuration of the OpenShift cluster VMs. - */ -export interface OpenShiftManagedClusterAgentPoolProfile { - /** - * Unique name of the pool profile in the context of the subscription and resource group. - */ - name: string; - /** - * Number of agents (VMs) to host docker containers. - */ - count: number; - /** - * Size of agent VMs. Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3', - * 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', - * 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', - * 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', - * 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3', - * 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', - * 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', - * 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s' - */ - vmSize: OpenShiftContainerServiceVMSize; - /** - * Subnet CIDR for the peering. Default value: '10.0.0.0/24'. - */ - subnetCidr?: string; - /** - * OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux. - * Possible values include: 'Linux', 'Windows'. Default value: 'Linux'. - */ - osType?: OSType; - /** - * Define the role of the AgentPoolProfile. Possible values include: 'compute', 'infra' - */ - role?: OpenShiftAgentPoolProfileRole; -} - -/** - * Contains the possible cases for OpenShiftManagedClusterBaseIdentityProvider. - */ -export type OpenShiftManagedClusterBaseIdentityProviderUnion = OpenShiftManagedClusterBaseIdentityProvider | OpenShiftManagedClusterAADIdentityProvider; - -/** - * Structure for any Identity provider. - */ -export interface OpenShiftManagedClusterBaseIdentityProvider { - /** - * Polymorphic Discriminator - */ - kind: "OpenShiftManagedClusterBaseIdentityProvider"; -} - -/** - * Defines the configuration of the identity providers to be used in the OpenShift cluster. - */ -export interface OpenShiftManagedClusterIdentityProvider { - /** - * Name of the provider. - */ - name?: string; - /** - * Configuration of the provider. - */ - provider?: OpenShiftManagedClusterBaseIdentityProviderUnion; -} - -/** - * Defines all possible authentication profiles for the OpenShift cluster. - */ -export interface OpenShiftManagedClusterAuthProfile { + readonly description?: string; /** - * Type of authentication profile to use. + * The resource provider for the operation. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - identityProviders?: OpenShiftManagedClusterIdentityProvider[]; + readonly provider?: string; } /** - * OpenShift Managed cluster. + * The Resource model definition. */ -export interface OpenShiftManagedCluster extends Resource { - /** - * Define the resource plan as required by ARM for billing purposes - */ - plan?: PurchasePlan; - /** - * The current deployment or provisioning state, which only appears in the response. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly provisioningState?: string; - /** - * Version of OpenShift specified when creating the cluster. - */ - openShiftVersion: string; +export interface Resource extends BaseResource { /** - * Version of OpenShift specified when creating the cluster. + * Resource Id * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly clusterVersion?: string; + readonly id?: string; /** - * Service generated FQDN for OpenShift API server. + * Resource name * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly publicHostname?: string; + readonly name?: string; /** - * Service generated FQDN for OpenShift API server loadbalancer internal hostname. + * Resource type * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly fqdn?: string; - /** - * Configuration for OpenShift networking. - */ - networkProfile?: NetworkProfile; - /** - * Configuration for OpenShift router(s). - */ - routerProfiles?: OpenShiftRouterProfile[]; - /** - * Configuration for OpenShift master VMs. - */ - masterPoolProfile?: OpenShiftManagedClusterMasterPoolProfile; + readonly type?: string; /** - * Configuration of OpenShift cluster VMs. + * Resource location */ - agentPoolProfiles?: OpenShiftManagedClusterAgentPoolProfile[]; + location: string; /** - * Configures OpenShift authentication. + * Resource tags */ - authProfile?: OpenShiftManagedClusterAuthProfile; + tags?: { [propertyName: string]: string }; } /** - * Defines the Identity provider for MS AAD. + * Reference to another subresource. */ -export interface OpenShiftManagedClusterAADIdentityProvider { - /** - * Polymorphic Discriminator - */ - kind: "AADIdentityProvider"; - /** - * The clientId password associated with the provider. - */ - clientId?: string; +export interface SubResource extends BaseResource { /** - * The secret password associated with the provider. + * Resource ID. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - secret?: string; + readonly id?: string; /** - * The tenantId associated with the provider. + * The name of the resource that is unique within a resource group. This name can be used to + * access the resource. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - tenantId?: string; + readonly name?: string; /** - * The groupId to be granted cluster admin role. + * Resource type + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - customerAdminGroupId?: string; + readonly type?: string; } /** @@ -302,39 +108,11 @@ export interface TagsObject { tags?: { [propertyName: string]: string }; } -/** - * Properties to configure a custom container service cluster. - */ -export interface ContainerServiceCustomProfile { - /** - * The name of the custom orchestrator to use. - */ - orchestrator: string; -} - -/** - * Reference to a secret stored in Azure Key Vault. - */ -export interface KeyVaultSecretRef { - /** - * Key vault identifier. - */ - vaultID: string; - /** - * The secret name. - */ - secretName: string; - /** - * The secret version. - */ - version?: string; -} - /** * Information about a service principal identity for the cluster to use for manipulating Azure - * APIs. Either secret or keyVaultSecretRef must be specified. + * APIs. */ -export interface ContainerServiceServicePrincipalProfile { +export interface ManagedClusterServicePrincipalProfile { /** * The ID for the service principal. */ @@ -343,27 +121,6 @@ export interface ContainerServiceServicePrincipalProfile { * The secret password associated with the service principal in plain text. */ secret?: string; - /** - * Reference to a secret stored in Azure Key Vault. - */ - keyVaultSecretRef?: KeyVaultSecretRef; -} - -/** - * Profile for the container service orchestrator. - */ -export interface ContainerServiceOrchestratorProfile { - /** - * The orchestrator to use to manage container service cluster resources. Valid values are - * Kubernetes, Swarm, DCOS, DockerCE and Custom. Possible values include: 'Kubernetes', 'Swarm', - * 'DCOS', 'DockerCE', 'Custom' - */ - orchestratorType: ContainerServiceOrchestratorTypes; - /** - * The version of the orchestrator to use. You can specify the major.minor.patch part of the - * actual version.For example, you can specify version as "1.6.11". - */ - orchestratorVersion?: string; } /** @@ -449,16 +206,33 @@ export interface ContainerServiceMasterProfile { } /** - * Profile for the container service agent pool. + * Settings for upgrading an agentpool */ -export interface ContainerServiceAgentPoolProfile { +export interface AgentPoolUpgradeSettings { /** - * Unique name of the agent pool profile in the context of the subscription and resource group. + * Count or percentage of additional nodes to be added during upgrade. If empty uses AKS default */ - name: string; + maxSurge?: string; +} + +/** + * Describes the Power State of the cluster + */ +export interface PowerState { + /** + * Tells whether the cluster is Running or Stopped. Possible values include: 'Running', 'Stopped' + */ + code?: Code; +} + +/** + * Properties for the container service agent pool profile. + */ +export interface ManagedClusterAgentPoolProfileProperties { /** - * 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. + * Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to + * 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The + * default value is 1. */ count?: number; /** @@ -501,7 +275,7 @@ export interface ContainerServiceAgentPoolProfile { * 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', * 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' */ - vmSize: ContainerServiceVMSizeTypes; + vmSize?: ContainerServiceVMSizeTypes; /** * 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 @@ -509,311 +283,130 @@ export interface ContainerServiceAgentPoolProfile { */ osDiskSizeGB?: number; /** - * DNS prefix to be used to create the FQDN for the agent pool. - */ - dnsPrefix?: string; - /** - * FQDN for the agent pool. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and + * 'Managed'. Defaults to 'Managed'. May not be changed after creation. Possible values include: + * 'Managed', 'Ephemeral' */ - readonly fqdn?: string; + osDiskType?: OSDiskType; /** - * Ports number array used to expose on this agent pool. The default opened ports are different - * based on your choice of orchestrator. + * VNet SubnetID specifies the VNet's subnet identifier for nodes and maybe pods */ - ports?: number[]; + vnetSubnetID?: string; /** - * Storage profile specifies what kind of storage used. Choose from StorageAccount and - * ManagedDisks. Leave it empty, we will choose for you based on the orchestrator choice. - * Possible values include: 'StorageAccount', 'ManagedDisks' + * Pod SubnetID specifies the VNet's subnet identifier for pods. */ - storageProfile?: ContainerServiceStorageProfileTypes; + podSubnetID?: string; /** - * VNet SubnetID specifies the VNet's subnet identifier. + * Maximum number of pods that can run on a node. */ - vnetSubnetID?: string; + maxPods?: number; /** * OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux. * Possible values include: 'Linux', 'Windows'. Default value: 'Linux'. */ osType?: OSType; -} - -/** - * Profile for Windows VMs in the container service cluster. - */ -export interface ContainerServiceWindowsProfile { /** - * The administrator username to use for Windows VMs. + * Maximum number of nodes for auto-scaling */ - adminUsername: string; + maxCount?: number; /** - * The administrator password to use for Windows VMs. + * Minimum number of nodes for auto-scaling */ - adminPassword: string; -} - -/** - * Contains information about SSH certificate public key data. - */ -export interface ContainerServiceSshPublicKey { + minCount?: number; /** - * Certificate public key used to authenticate with VMs through SSH. The certificate must be in - * PEM format with or without headers. + * Whether to enable auto-scaler */ - keyData: string; -} - -/** - * SSH configuration for Linux-based VMs running on Azure. - */ -export interface ContainerServiceSshConfiguration { - /** - * The list of SSH public keys used to authenticate with Linux-based VMs. Only expect one key - * specified. - */ - publicKeys: ContainerServiceSshPublicKey[]; -} - -/** - * Profile for Linux VMs in the container service cluster. - */ -export interface ContainerServiceLinuxProfile { + enableAutoScaling?: boolean; /** - * The administrator username to use for Linux VMs. + * AgentPoolType represents types of an agent pool. Possible values include: + * 'VirtualMachineScaleSets', 'AvailabilitySet' */ - adminUsername: string; + type?: AgentPoolType; /** - * SSH configuration for Linux-based VMs running on Azure. + * AgentPoolMode represents mode of an agent pool. Possible values include: 'System', 'User' */ - ssh: ContainerServiceSshConfiguration; -} - -/** - * Profile for diagnostics on the container service VMs. - */ -export interface ContainerServiceVMDiagnostics { + mode?: AgentPoolMode; /** - * Whether the VM diagnostic agent is provisioned on the VM. + * Version of orchestrator specified when creating the managed cluster. */ - enabled: boolean; + orchestratorVersion?: string; /** - * The URI of the storage account where diagnostics are stored. + * Version of node image * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly storageUri?: string; -} - -/** - * Profile for diagnostics on the container service cluster. - */ -export interface ContainerServiceDiagnosticsProfile { + readonly nodeImageVersion?: string; /** - * Profile for diagnostics on the container service VMs. + * Settings for upgrading the agentpool */ - vmDiagnostics: ContainerServiceVMDiagnostics; -} - -/** - * Container service. - */ -export interface ContainerService extends Resource { + upgradeSettings?: AgentPoolUpgradeSettings; /** * The current deployment or provisioning state, which only appears in the response. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly provisioningState?: string; /** - * Profile for the container service orchestrator. - */ - orchestratorProfile: ContainerServiceOrchestratorProfile; - /** - * Properties to configure a custom container service cluster. - */ - customProfile?: ContainerServiceCustomProfile; - /** - * Information about a service principal identity for the cluster to use for manipulating Azure - * APIs. Exact one of secret or keyVaultSecretRef need to be specified. - */ - servicePrincipalProfile?: ContainerServiceServicePrincipalProfile; - /** - * Profile for the container service master. - */ - masterProfile: ContainerServiceMasterProfile; - /** - * Properties of the agent pool. - */ - agentPoolProfiles?: ContainerServiceAgentPoolProfile[]; - /** - * Profile for Windows VMs in the container service cluster. - */ - windowsProfile?: ContainerServiceWindowsProfile; - /** - * Profile for Linux VMs in the container service cluster. - */ - linuxProfile: ContainerServiceLinuxProfile; - /** - * Profile for diagnostics in the container service cluster. - */ - diagnosticsProfile?: ContainerServiceDiagnosticsProfile; -} - -/** - * Contains information about orchestrator. - */ -export interface OrchestratorProfile { - /** - * Orchestrator type. - */ - orchestratorType?: string; - /** - * Orchestrator version (major, minor, patch). - */ - orchestratorVersion: string; - /** - * Whether Kubernetes version is currently in preview. - */ - isPreview?: boolean; -} - -/** - * The profile of an orchestrator and its available versions. - */ -export interface OrchestratorVersionProfile { - /** - * Orchestrator type. - */ - orchestratorType: string; - /** - * Orchestrator version (major, minor, patch). - */ - orchestratorVersion: string; - /** - * Installed by default if version is not specified. - */ - default?: boolean; - /** - * Whether Kubernetes version is currently in preview. - */ - isPreview?: boolean; - /** - * The list of available upgrade versions. - */ - upgrades?: OrchestratorProfile[]; -} - -/** - * The list of versions for supported orchestrators. - */ -export interface OrchestratorVersionProfileListResult { - /** - * Id of the orchestrator version profile list result. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly id?: string; - /** - * Name of the orchestrator version profile list result. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly name?: string; - /** - * Type of the orchestrator version profile list result. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly type?: string; - /** - * List of orchestrator version profiles. - */ - orchestrators: OrchestratorVersionProfile[]; -} - -/** - * Describes the properties of a Compute Operation value. - */ -export interface OperationValue { - /** - * The origin of the compute operation. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly origin?: string; - /** - * The name of the compute operation. + * Describes whether the Agent Pool is Running or Stopped * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly name?: string; + readonly powerState?: PowerState; /** - * The display name of the compute operation. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType. */ - readonly operation?: string; + availabilityZones?: string[]; /** - * The display name of the resource the operation applies to. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Enable public IP for nodes */ - readonly resource?: string; + enableNodePublicIP?: boolean; /** - * The description of the operation. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. + * Possible values include: 'Spot', 'Regular'. Default value: 'Regular'. */ - readonly description?: string; + scaleSetPriority?: ScaleSetPriority; /** - * The resource provider for the operation. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * ScaleSetEvictionPolicy to be used to specify eviction policy for Spot virtual machine scale + * set. Default to Delete. Possible values include: 'Delete', 'Deallocate'. Default value: + * 'Delete'. */ - readonly provider?: string; -} - -/** - * Reference to another subresource. - */ -export interface SubResource extends BaseResource { + scaleSetEvictionPolicy?: ScaleSetEvictionPolicy; /** - * Resource ID. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * SpotMaxPrice to be used to specify the maximum price you are willing to pay in US Dollars. + * Possible values are any decimal value greater than zero or -1 which indicates default price to + * be up-to on-demand. */ - readonly id?: string; + spotMaxPrice?: number; /** - * The name of the resource that is unique within a resource group. This name can be used to - * access the resource. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Agent pool tags to be persisted on the agent pool virtual machine scale set. */ - readonly name?: string; + tags?: { [propertyName: string]: string }; /** - * Resource type - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Agent pool node labels to be persisted across all nodes in agent pool. */ - readonly type?: string; -} - -/** - * Information about a service principal identity for the cluster to use for manipulating Azure - * APIs. - */ -export interface ManagedClusterServicePrincipalProfile { + nodeLabels?: { [propertyName: string]: string }; /** - * The ID for the service principal. + * Taints added to new nodes during node pool create and scale. For example, + * key=value:NoSchedule. */ - clientId: string; + nodeTaints?: string[]; /** - * The secret password associated with the service principal in plain text. + * The ID for Proximity Placement Group. */ - secret?: string; + proximityPlacementGroupID?: string; } /** - * Settings for upgrading an agentpool + * Profile for the container service agent pool. */ -export interface AgentPoolUpgradeSettings { +export interface ManagedClusterAgentPoolProfile extends ManagedClusterAgentPoolProfileProperties { /** - * Count or percentage of additional nodes to be added during upgrade. If empty uses AKS default + * Unique name of the agent pool profile in the context of the subscription and resource group. */ - maxSurge?: string; + name: string; } /** - * Properties for the container service agent pool profile. + * Agent Pool. */ -export interface ManagedClusterAgentPoolProfileProperties { +export interface AgentPool extends SubResource { /** * Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to * 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The @@ -868,9 +461,19 @@ export interface ManagedClusterAgentPoolProfileProperties { */ osDiskSizeGB?: number; /** - * VNet SubnetID specifies the VNet's subnet identifier. + * OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and + * 'Managed'. Defaults to 'Managed'. May not be changed after creation. Possible values include: + * 'Managed', 'Ephemeral' + */ + osDiskType?: OSDiskType; + /** + * VNet SubnetID specifies the VNet's subnet identifier for nodes and maybe pods */ vnetSubnetID?: string; + /** + * Pod SubnetID specifies the VNet's subnet identifier for pods. + */ + podSubnetID?: string; /** * Maximum number of pods that can run on a node. */ @@ -896,7 +499,7 @@ export interface ManagedClusterAgentPoolProfileProperties { * AgentPoolType represents types of an agent pool. Possible values include: * 'VirtualMachineScaleSets', 'AvailabilitySet' */ - type?: AgentPoolType; + agentPoolType?: AgentPoolType; /** * AgentPoolMode represents mode of an agent pool. Possible values include: 'System', 'User' */ @@ -919,6 +522,11 @@ export interface ManagedClusterAgentPoolProfileProperties { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly provisioningState?: string; + /** + * Describes whether the Agent Pool is Running or Stopped + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly powerState?: PowerState; /** * Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType. */ @@ -964,185 +572,68 @@ export interface ManagedClusterAgentPoolProfileProperties { } /** - * Profile for the container service agent pool. + * Profile for Windows VMs in the container service cluster. */ -export interface ManagedClusterAgentPoolProfile extends ManagedClusterAgentPoolProfileProperties { +export interface ManagedClusterWindowsProfile { /** - * Unique name of the agent pool profile in the context of the subscription and resource group. + * Specifies the name of the administrator account.

**restriction:** Cannot end in "." + *

**Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", + * "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", + * "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", + * "support_388945a0", "sys", "test2", "test3", "user4", "user5".

**Minimum-length:** 1 + * character

**Max-length:** 20 characters */ - name: string; + adminUsername: string; + /** + * Specifies the password of the administrator account.

**Minimum-length:** 8 characters + *

**Max-length:** 123 characters

**Complexity requirements:** 3 out of 4 + * conditions below need to be fulfilled
Has lower characters
Has upper characters
+ * Has a digit
Has a special character (Regex match [\W_])

**Disallowed values:** + * "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", + * "Password1", "Password22", "iloveyou!" + */ + adminPassword?: string; + /** + * The licenseType to use for Windows VMs. Windows_Server is used to enable Azure Hybrid User + * Benefits for Windows VMs. Possible values include: 'None', 'Windows_Server' + */ + licenseType?: LicenseType; } /** - * Agent Pool. + * Contains information about SSH certificate public key data. */ -export interface AgentPool extends SubResource { +export interface ContainerServiceSshPublicKey { /** - * Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to - * 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The - * default value is 1. + * Certificate public key used to authenticate with VMs through SSH. The certificate must be in + * PEM format with or without headers. */ - count?: number; + keyData: string; +} + +/** + * SSH configuration for Linux-based VMs running on Azure. + */ +export interface ContainerServiceSshConfiguration { /** - * Size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', - * 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', - * 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', - * 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', - * 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', - * 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', - * 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', - * 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', - * 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', - * 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', - * 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', - * 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', - * 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', - * 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', - * 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', - * 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', - * 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', - * 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', - * 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', - * 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', - * 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', - * 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', - * 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', - * 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', - * 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', - * 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', - * 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', - * 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', - * 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', - * 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', - * 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', - * 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', - * 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', - * 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', - * 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', - * 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', - * 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', - * 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' - */ - vmSize?: ContainerServiceVMSizeTypes; - /** - * 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 + * The list of SSH public keys used to authenticate with Linux-based VMs. Only expect one key * specified. */ - osDiskSizeGB?: number; - /** - * VNet SubnetID specifies the VNet's subnet identifier. - */ - vnetSubnetID?: string; - /** - * Maximum number of pods that can run on a node. - */ - maxPods?: number; - /** - * OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux. - * Possible values include: 'Linux', 'Windows'. Default value: 'Linux'. - */ - osType?: OSType; - /** - * Maximum number of nodes for auto-scaling - */ - maxCount?: number; - /** - * Minimum number of nodes for auto-scaling - */ - minCount?: number; - /** - * Whether to enable auto-scaler - */ - enableAutoScaling?: boolean; - /** - * AgentPoolType represents types of an agent pool. Possible values include: - * 'VirtualMachineScaleSets', 'AvailabilitySet' - */ - agentPoolType?: AgentPoolType; - /** - * AgentPoolMode represents mode of an agent pool. Possible values include: 'System', 'User' - */ - mode?: AgentPoolMode; - /** - * Version of orchestrator specified when creating the managed cluster. - */ - orchestratorVersion?: string; - /** - * Version of node image - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly nodeImageVersion?: string; - /** - * Settings for upgrading the agentpool - */ - upgradeSettings?: AgentPoolUpgradeSettings; - /** - * The current deployment or provisioning state, which only appears in the response. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly provisioningState?: string; - /** - * Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType. - */ - availabilityZones?: string[]; - /** - * Enable public IP for nodes - */ - enableNodePublicIP?: boolean; - /** - * ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. - * Possible values include: 'Spot', 'Regular'. Default value: 'Regular'. - */ - scaleSetPriority?: ScaleSetPriority; - /** - * ScaleSetEvictionPolicy to be used to specify eviction policy for Spot virtual machine scale - * set. Default to Delete. Possible values include: 'Delete', 'Deallocate'. Default value: - * 'Delete'. - */ - scaleSetEvictionPolicy?: ScaleSetEvictionPolicy; - /** - * SpotMaxPrice to be used to specify the maximum price you are willing to pay in US Dollars. - * Possible values are any decimal value greater than zero or -1 which indicates default price to - * be up-to on-demand. - */ - spotMaxPrice?: number; - /** - * Agent pool tags to be persisted on the agent pool virtual machine scale set. - */ - tags?: { [propertyName: string]: string }; - /** - * Agent pool node labels to be persisted across all nodes in agent pool. - */ - nodeLabels?: { [propertyName: string]: string }; - /** - * Taints added to new nodes during node pool create and scale. For example, - * key=value:NoSchedule. - */ - nodeTaints?: string[]; - /** - * The ID for Proximity Placement Group. - */ - proximityPlacementGroupID?: string; + publicKeys: ContainerServiceSshPublicKey[]; } /** - * Profile for Windows VMs in the container service cluster. + * Profile for Linux VMs in the container service cluster. */ -export interface ManagedClusterWindowsProfile { +export interface ContainerServiceLinuxProfile { /** - * The administrator username to use for Windows VMs. + * The administrator username to use for Linux VMs. */ adminUsername: string; /** - * The administrator password to use for Windows VMs. - */ - adminPassword?: string; - /** - * The licenseType to use for Windows VMs. Windows_Server is used to enable Azure Hybrid User - * Benefits for Windows VMs. Possible values include: 'None', 'Windows_Server' + * SSH configuration for Linux-based VMs running on Azure. */ - licenseType?: LicenseType; + ssh: ContainerServiceSshConfiguration; } /** @@ -1273,6 +764,31 @@ export interface ContainerServiceNetworkProfile { loadBalancerProfile?: ManagedClusterLoadBalancerProfile; } +/** + * Profile for diagnostics on the container service VMs. + */ +export interface ContainerServiceVMDiagnostics { + /** + * Whether the VM diagnostic agent is provisioned on the VM. + */ + enabled: boolean; + /** + * The URI of the storage account where diagnostics are stored. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly storageUri?: string; +} + +/** + * Profile for diagnostics on the container service cluster. + */ +export interface ContainerServiceDiagnosticsProfile { + /** + * Profile for diagnostics on the container service VMs. + */ + vmDiagnostics: ContainerServiceVMDiagnostics; +} + /** * An interface representing UserAssignedIdentity. */ @@ -1316,6 +832,80 @@ export interface ManagedClusterAddonProfile { readonly identity?: ManagedClusterAddonProfileIdentity; } +/** + * An interface representing ManagedClusterPodIdentityProvisioningInfo. + */ +export interface ManagedClusterPodIdentityProvisioningInfo { + /** + * Pod identity assignment error (if any). + */ + error?: CloudError; +} + +/** + * An interface representing ManagedClusterPodIdentity. + */ +export interface ManagedClusterPodIdentity { + /** + * Name of the pod identity. + */ + name: string; + /** + * Namespace of the pod identity. + */ + namespace: string; + /** + * Information of the user assigned identity. + */ + identity: UserAssignedIdentity; + /** + * The current provisioning state of the pod identity. Possible values include: 'Assigned', + * 'Updating', 'Deleting', 'Failed' + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningState?: ManagedClusterPodIdentityProvisioningState; + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningInfo?: ManagedClusterPodIdentityProvisioningInfo; +} + +/** + * An interface representing ManagedClusterPodIdentityException. + */ +export interface ManagedClusterPodIdentityException { + /** + * Name of the pod identity exception. + */ + name: string; + /** + * Namespace of the pod identity exception. + */ + namespace: string; + /** + * Pod labels to match. + */ + podLabels: { [propertyName: string]: string }; +} + +/** + * An interface representing ManagedClusterPodIdentityProfile. + */ +export interface ManagedClusterPodIdentityProfile { + /** + * Whether the pod identity addon is enabled. + */ + enabled?: boolean; + /** + * User assigned pod identity settings. + */ + userAssignedIdentities?: ManagedClusterPodIdentity[]; + /** + * User assigned pod identity exception settings. + */ + userAssignedIdentityExceptions?: ManagedClusterPodIdentityException[]; +} + /** * AADProfile specifies attributes for Azure Active Directory integration. */ @@ -1351,11 +941,30 @@ export interface ManagedClusterAADProfile { tenantID?: string; } +/** + * Auto upgrade profile for a managed cluster. + */ +export interface ManagedClusterAutoUpgradeProfile { + /** + * upgrade channel for auto upgrade. Possible values include: 'rapid', 'stable', 'patch', 'none' + */ + upgradeChannel?: UpgradeChannel; +} + /** * Parameters to be applied to the cluster-autoscaler when enabled */ export interface ManagedClusterPropertiesAutoScalerProfile { balanceSimilarNodeGroups?: string; + /** + * Possible values include: 'least-waste', 'most-pods', 'random' + */ + expander?: Expander; + maxEmptyBulkDelete?: string; + maxGracefulTerminationSec?: string; + maxTotalUnreadyPercentage?: string; + newPodScaleUpDelay?: string; + okTotalUnreadyCount?: string; scanInterval?: string; scaleDownDelayAfterAdd?: string; scaleDownDelayAfterDelete?: string; @@ -1363,7 +972,8 @@ export interface ManagedClusterPropertiesAutoScalerProfile { scaleDownUnneededTime?: string; scaleDownUnreadyTime?: string; scaleDownUtilizationThreshold?: string; - maxGracefulTerminationSec?: string; + skipNodesWithLocalStorage?: string; + skipNodesWithSystemPods?: string; } /** @@ -1378,6 +988,10 @@ export interface ManagedClusterAPIServerAccessProfile { * Whether to create the cluster as a private cluster or not. */ enablePrivateCluster?: boolean; + /** + * Private dns zone mode for private cluster. + */ + privateDNSZone?: string; } /** @@ -1456,6 +1070,11 @@ export interface ManagedCluster extends Resource { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly provisioningState?: string; + /** + * Represents the Power State of the cluster + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly powerState?: PowerState; /** * The max number of agent pools for the managed cluster. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -1500,6 +1119,10 @@ export interface ManagedCluster extends Resource { * Profile of managed cluster add-on. */ addonProfiles?: { [propertyName: string]: ManagedClusterAddonProfile }; + /** + * Profile of managed cluster pod identity. + */ + podIdentityProfile?: ManagedClusterPodIdentityProfile; /** * Name of the resource group containing agent pool nodes. */ @@ -1521,6 +1144,10 @@ export interface ManagedCluster extends Resource { * Profile of Azure Active Directory configuration. */ aadProfile?: ManagedClusterAADProfile; + /** + * Profile of auto upgrade configuration. + */ + autoUpgradeProfile?: ManagedClusterAutoUpgradeProfile; /** * Parameters to be applied to the cluster-autoscaler when enabled */ @@ -1817,13 +1444,44 @@ export interface PrivateEndpointConnectionListResult { } /** - * Optional Parameters. + * A private link resource + */ +export interface PrivateLinkResource { + /** + * The ID of the private link resource. + */ + id?: string; + /** + * The name of the private link resource. + */ + name?: string; + /** + * The resource type. + */ + type?: string; + /** + * The group ID of the resource. + */ + groupId?: string; + /** + * RequiredMembers of the resource + */ + requiredMembers?: string[]; + /** + * The private link service ID of the resource, this field is exposed only to NRP internally. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly privateLinkServiceID?: string; +} + +/** + * A list of private link resources */ -export interface ContainerServicesListOrchestratorsOptionalParams extends msRest.RequestOptionsBase { +export interface PrivateLinkResourcesListResult { /** - * resource type for which the list of orchestrators needs to be returned + * The collection value. */ - resourceType?: string; + value?: PrivateLinkResource[]; } /** @@ -1833,32 +1491,6 @@ export interface ContainerServiceClientOptions extends AzureServiceClientOptions baseUri?: string; } -/** - * @interface - * The response from the List OpenShift Managed Clusters operation. - * @extends Array - */ -export interface OpenShiftManagedClusterListResult extends Array { - /** - * The URL to get the next set of OpenShift managed cluster results. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly nextLink?: string; -} - -/** - * @interface - * The response from the List Container Services operation. - * @extends Array - */ -export interface ContainerServiceListResult extends Array { - /** - * The URL to get the next set of container service results. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly nextLink?: string; -} - /** * @interface * The List Compute Operation operation response. @@ -1893,37 +1525,6 @@ export interface AgentPoolListResult extends Array { readonly nextLink?: string; } -/** - * Defines values for OSType. - * Possible values include: 'Linux', 'Windows' - * @readonly - * @enum {string} - */ -export type OSType = 'Linux' | 'Windows'; - -/** - * Defines values for OpenShiftContainerServiceVMSize. - * Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3', - * 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2', - * 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2', - * 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3', - * 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3', 'Standard_E32s_v3', - * 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', - * 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s', - * 'Standard_L8s', 'Standard_L16s', 'Standard_L32s' - * @readonly - * @enum {string} - */ -export type OpenShiftContainerServiceVMSize = 'Standard_D2s_v3' | 'Standard_D4s_v3' | 'Standard_D8s_v3' | 'Standard_D16s_v3' | 'Standard_D32s_v3' | 'Standard_D64s_v3' | 'Standard_DS4_v2' | 'Standard_DS5_v2' | 'Standard_F8s_v2' | 'Standard_F16s_v2' | 'Standard_F32s_v2' | 'Standard_F64s_v2' | 'Standard_F72s_v2' | 'Standard_F8s' | 'Standard_F16s' | 'Standard_E4s_v3' | 'Standard_E8s_v3' | 'Standard_E16s_v3' | 'Standard_E20s_v3' | 'Standard_E32s_v3' | 'Standard_E64s_v3' | 'Standard_GS2' | 'Standard_GS3' | 'Standard_GS4' | 'Standard_GS5' | 'Standard_DS12_v2' | 'Standard_DS13_v2' | 'Standard_DS14_v2' | 'Standard_DS15_v2' | 'Standard_L4s' | 'Standard_L8s' | 'Standard_L16s' | 'Standard_L32s'; - -/** - * Defines values for OpenShiftAgentPoolProfileRole. - * Possible values include: 'compute', 'infra' - * @readonly - * @enum {string} - */ -export type OpenShiftAgentPoolProfileRole = 'compute' | 'infra'; - /** * Defines values for ContainerServiceStorageProfileTypes. * Possible values include: 'StorageAccount', 'ManagedDisks' @@ -1978,12 +1579,20 @@ export type ContainerServiceStorageProfileTypes = 'StorageAccount' | 'ManagedDis export type ContainerServiceVMSizeTypes = 'Standard_A1' | 'Standard_A10' | 'Standard_A11' | 'Standard_A1_v2' | 'Standard_A2' | 'Standard_A2_v2' | 'Standard_A2m_v2' | 'Standard_A3' | 'Standard_A4' | 'Standard_A4_v2' | 'Standard_A4m_v2' | 'Standard_A5' | 'Standard_A6' | 'Standard_A7' | 'Standard_A8' | 'Standard_A8_v2' | 'Standard_A8m_v2' | 'Standard_A9' | 'Standard_B2ms' | 'Standard_B2s' | 'Standard_B4ms' | 'Standard_B8ms' | 'Standard_D1' | 'Standard_D11' | 'Standard_D11_v2' | 'Standard_D11_v2_Promo' | 'Standard_D12' | 'Standard_D12_v2' | 'Standard_D12_v2_Promo' | 'Standard_D13' | 'Standard_D13_v2' | 'Standard_D13_v2_Promo' | 'Standard_D14' | 'Standard_D14_v2' | 'Standard_D14_v2_Promo' | 'Standard_D15_v2' | 'Standard_D16_v3' | 'Standard_D16s_v3' | 'Standard_D1_v2' | 'Standard_D2' | 'Standard_D2_v2' | 'Standard_D2_v2_Promo' | 'Standard_D2_v3' | 'Standard_D2s_v3' | 'Standard_D3' | 'Standard_D32_v3' | 'Standard_D32s_v3' | 'Standard_D3_v2' | 'Standard_D3_v2_Promo' | 'Standard_D4' | 'Standard_D4_v2' | 'Standard_D4_v2_Promo' | 'Standard_D4_v3' | 'Standard_D4s_v3' | 'Standard_D5_v2' | 'Standard_D5_v2_Promo' | 'Standard_D64_v3' | 'Standard_D64s_v3' | 'Standard_D8_v3' | 'Standard_D8s_v3' | 'Standard_DS1' | 'Standard_DS11' | 'Standard_DS11_v2' | 'Standard_DS11_v2_Promo' | 'Standard_DS12' | 'Standard_DS12_v2' | 'Standard_DS12_v2_Promo' | 'Standard_DS13' | 'Standard_DS13-2_v2' | 'Standard_DS13-4_v2' | 'Standard_DS13_v2' | 'Standard_DS13_v2_Promo' | 'Standard_DS14' | 'Standard_DS14-4_v2' | 'Standard_DS14-8_v2' | 'Standard_DS14_v2' | 'Standard_DS14_v2_Promo' | 'Standard_DS15_v2' | 'Standard_DS1_v2' | 'Standard_DS2' | 'Standard_DS2_v2' | 'Standard_DS2_v2_Promo' | 'Standard_DS3' | 'Standard_DS3_v2' | 'Standard_DS3_v2_Promo' | 'Standard_DS4' | 'Standard_DS4_v2' | 'Standard_DS4_v2_Promo' | 'Standard_DS5_v2' | 'Standard_DS5_v2_Promo' | 'Standard_E16_v3' | 'Standard_E16s_v3' | 'Standard_E2_v3' | 'Standard_E2s_v3' | 'Standard_E32-16s_v3' | 'Standard_E32-8s_v3' | 'Standard_E32_v3' | 'Standard_E32s_v3' | 'Standard_E4_v3' | 'Standard_E4s_v3' | 'Standard_E64-16s_v3' | 'Standard_E64-32s_v3' | 'Standard_E64_v3' | 'Standard_E64s_v3' | 'Standard_E8_v3' | 'Standard_E8s_v3' | 'Standard_F1' | 'Standard_F16' | 'Standard_F16s' | 'Standard_F16s_v2' | 'Standard_F1s' | 'Standard_F2' | 'Standard_F2s' | 'Standard_F2s_v2' | 'Standard_F32s_v2' | 'Standard_F4' | 'Standard_F4s' | 'Standard_F4s_v2' | 'Standard_F64s_v2' | 'Standard_F72s_v2' | 'Standard_F8' | 'Standard_F8s' | 'Standard_F8s_v2' | 'Standard_G1' | 'Standard_G2' | 'Standard_G3' | 'Standard_G4' | 'Standard_G5' | 'Standard_GS1' | 'Standard_GS2' | 'Standard_GS3' | 'Standard_GS4' | 'Standard_GS4-4' | 'Standard_GS4-8' | 'Standard_GS5' | 'Standard_GS5-16' | 'Standard_GS5-8' | 'Standard_H16' | 'Standard_H16m' | 'Standard_H16mr' | 'Standard_H16r' | 'Standard_H8' | 'Standard_H8m' | 'Standard_L16s' | 'Standard_L32s' | 'Standard_L4s' | 'Standard_L8s' | 'Standard_M128-32ms' | 'Standard_M128-64ms' | 'Standard_M128ms' | 'Standard_M128s' | 'Standard_M64-16ms' | 'Standard_M64-32ms' | 'Standard_M64ms' | 'Standard_M64s' | 'Standard_NC12' | 'Standard_NC12s_v2' | 'Standard_NC12s_v3' | 'Standard_NC24' | 'Standard_NC24r' | 'Standard_NC24rs_v2' | 'Standard_NC24rs_v3' | 'Standard_NC24s_v2' | 'Standard_NC24s_v3' | 'Standard_NC6' | 'Standard_NC6s_v2' | 'Standard_NC6s_v3' | 'Standard_ND12s' | 'Standard_ND24rs' | 'Standard_ND24s' | 'Standard_ND6s' | 'Standard_NV12' | 'Standard_NV24' | 'Standard_NV6'; /** - * Defines values for ContainerServiceOrchestratorTypes. - * Possible values include: 'Kubernetes', 'Swarm', 'DCOS', 'DockerCE', 'Custom' + * Defines values for OSDiskType. + * Possible values include: 'Managed', 'Ephemeral' + * @readonly + * @enum {string} + */ +export type OSDiskType = 'Managed' | 'Ephemeral'; + +/** + * Defines values for OSType. + * Possible values include: 'Linux', 'Windows' * @readonly * @enum {string} */ -export type ContainerServiceOrchestratorTypes = 'Kubernetes' | 'Swarm' | 'DCOS' | 'DockerCE' | 'Custom'; +export type OSType = 'Linux' | 'Windows'; /** * Defines values for AgentPoolType. @@ -2001,6 +1610,14 @@ export type AgentPoolType = 'VirtualMachineScaleSets' | 'AvailabilitySet'; */ export type AgentPoolMode = 'System' | 'User'; +/** + * Defines values for Code. + * Possible values include: 'Running', 'Stopped' + * @readonly + * @enum {string} + */ +export type Code = 'Running' | 'Stopped'; + /** * Defines values for ScaleSetPriority. * Possible values include: 'Spot', 'Regular' @@ -2037,413 +1654,97 @@ export type NetworkPlugin = 'azure' | 'kubenet'; * Defines values for NetworkPolicy. * Possible values include: 'calico', 'azure' * @readonly - * @enum {string} - */ -export type NetworkPolicy = 'calico' | 'azure'; - -/** - * Defines values for NetworkMode. - * Possible values include: 'transparent', 'bridge' - * @readonly - * @enum {string} - */ -export type NetworkMode = 'transparent' | 'bridge'; - -/** - * Defines values for OutboundType. - * Possible values include: 'loadBalancer', 'userDefinedRouting' - * @readonly - * @enum {string} - */ -export type OutboundType = 'loadBalancer' | 'userDefinedRouting'; - -/** - * Defines values for LoadBalancerSku. - * Possible values include: 'standard', 'basic' - * @readonly - * @enum {string} - */ -export type LoadBalancerSku = 'standard' | 'basic'; - -/** - * Defines values for ResourceIdentityType. - * Possible values include: 'SystemAssigned', 'UserAssigned', 'None' - * @readonly - * @enum {string} - */ -export type ResourceIdentityType = 'SystemAssigned' | 'UserAssigned' | 'None'; - -/** - * Defines values for ManagedClusterSKUName. - * Possible values include: 'Basic' - * @readonly - * @enum {string} - */ -export type ManagedClusterSKUName = 'Basic'; - -/** - * Defines values for ManagedClusterSKUTier. - * Possible values include: 'Paid', 'Free' - * @readonly - * @enum {string} - */ -export type ManagedClusterSKUTier = 'Paid' | 'Free'; - -/** - * Defines values for PrivateEndpointConnectionProvisioningState. - * Possible values include: 'Succeeded', 'Creating', 'Deleting', 'Failed' - * @readonly - * @enum {string} - */ -export type PrivateEndpointConnectionProvisioningState = 'Succeeded' | 'Creating' | 'Deleting' | 'Failed'; - -/** - * Defines values for ConnectionStatus. - * Possible values include: 'Pending', 'Approved', 'Rejected', 'Disconnected' - * @readonly - * @enum {string} - */ -export type ConnectionStatus = 'Pending' | 'Approved' | 'Rejected' | 'Disconnected'; - -/** - * Contains response data for the list operation. - */ -export type OpenShiftManagedClustersListResponse = OpenShiftManagedClusterListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: OpenShiftManagedClusterListResult; - }; -}; - -/** - * Contains response data for the listByResourceGroup operation. - */ -export type OpenShiftManagedClustersListByResourceGroupResponse = OpenShiftManagedClusterListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: OpenShiftManagedClusterListResult; - }; -}; - -/** - * Contains response data for the get operation. - */ -export type OpenShiftManagedClustersGetResponse = OpenShiftManagedCluster & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: OpenShiftManagedCluster; - }; -}; - -/** - * Contains response data for the createOrUpdate operation. - */ -export type OpenShiftManagedClustersCreateOrUpdateResponse = OpenShiftManagedCluster & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: OpenShiftManagedCluster; - }; -}; - -/** - * Contains response data for the updateTags operation. - */ -export type OpenShiftManagedClustersUpdateTagsResponse = OpenShiftManagedCluster & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: OpenShiftManagedCluster; - }; -}; - -/** - * Contains response data for the beginCreateOrUpdate operation. - */ -export type OpenShiftManagedClustersBeginCreateOrUpdateResponse = OpenShiftManagedCluster & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: OpenShiftManagedCluster; - }; -}; - -/** - * Contains response data for the beginUpdateTags operation. - */ -export type OpenShiftManagedClustersBeginUpdateTagsResponse = OpenShiftManagedCluster & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: OpenShiftManagedCluster; - }; -}; - -/** - * Contains response data for the listNext operation. - */ -export type OpenShiftManagedClustersListNextResponse = OpenShiftManagedClusterListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: OpenShiftManagedClusterListResult; - }; -}; - -/** - * Contains response data for the listByResourceGroupNext operation. - */ -export type OpenShiftManagedClustersListByResourceGroupNextResponse = OpenShiftManagedClusterListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: OpenShiftManagedClusterListResult; - }; -}; - -/** - * Contains response data for the list operation. - */ -export type ContainerServicesListResponse = ContainerServiceListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: ContainerServiceListResult; - }; -}; + * @enum {string} + */ +export type NetworkPolicy = 'calico' | 'azure'; /** - * Contains response data for the createOrUpdate operation. + * Defines values for NetworkMode. + * Possible values include: 'transparent', 'bridge' + * @readonly + * @enum {string} */ -export type ContainerServicesCreateOrUpdateResponse = ContainerService & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: ContainerService; - }; -}; +export type NetworkMode = 'transparent' | 'bridge'; /** - * Contains response data for the get operation. + * Defines values for OutboundType. + * Possible values include: 'loadBalancer', 'userDefinedRouting' + * @readonly + * @enum {string} */ -export type ContainerServicesGetResponse = ContainerService & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: ContainerService; - }; -}; +export type OutboundType = 'loadBalancer' | 'userDefinedRouting'; /** - * Contains response data for the listByResourceGroup operation. + * Defines values for LoadBalancerSku. + * Possible values include: 'standard', 'basic' + * @readonly + * @enum {string} */ -export type ContainerServicesListByResourceGroupResponse = ContainerServiceListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: ContainerServiceListResult; - }; -}; +export type LoadBalancerSku = 'standard' | 'basic'; /** - * Contains response data for the listOrchestrators operation. + * Defines values for ManagedClusterPodIdentityProvisioningState. + * Possible values include: 'Assigned', 'Updating', 'Deleting', 'Failed' + * @readonly + * @enum {string} */ -export type ContainerServicesListOrchestratorsResponse = OrchestratorVersionProfileListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; +export type ManagedClusterPodIdentityProvisioningState = 'Assigned' | 'Updating' | 'Deleting' | 'Failed'; - /** - * The response body as parsed JSON or XML - */ - parsedBody: OrchestratorVersionProfileListResult; - }; -}; +/** + * Defines values for UpgradeChannel. + * Possible values include: 'rapid', 'stable', 'patch', 'none' + * @readonly + * @enum {string} + */ +export type UpgradeChannel = 'rapid' | 'stable' | 'patch' | 'none'; /** - * Contains response data for the beginCreateOrUpdate operation. + * Defines values for Expander. + * Possible values include: 'least-waste', 'most-pods', 'random' + * @readonly + * @enum {string} */ -export type ContainerServicesBeginCreateOrUpdateResponse = ContainerService & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; +export type Expander = 'least-waste' | 'most-pods' | 'random'; - /** - * The response body as parsed JSON or XML - */ - parsedBody: ContainerService; - }; -}; +/** + * Defines values for ResourceIdentityType. + * Possible values include: 'SystemAssigned', 'UserAssigned', 'None' + * @readonly + * @enum {string} + */ +export type ResourceIdentityType = 'SystemAssigned' | 'UserAssigned' | 'None'; /** - * Contains response data for the listNext operation. + * Defines values for ManagedClusterSKUName. + * Possible values include: 'Basic' + * @readonly + * @enum {string} */ -export type ContainerServicesListNextResponse = ContainerServiceListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; +export type ManagedClusterSKUName = 'Basic'; - /** - * The response body as parsed JSON or XML - */ - parsedBody: ContainerServiceListResult; - }; -}; +/** + * Defines values for ManagedClusterSKUTier. + * Possible values include: 'Paid', 'Free' + * @readonly + * @enum {string} + */ +export type ManagedClusterSKUTier = 'Paid' | 'Free'; /** - * Contains response data for the listByResourceGroupNext operation. + * Defines values for PrivateEndpointConnectionProvisioningState. + * Possible values include: 'Succeeded', 'Creating', 'Deleting', 'Failed' + * @readonly + * @enum {string} */ -export type ContainerServicesListByResourceGroupNextResponse = ContainerServiceListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; +export type PrivateEndpointConnectionProvisioningState = 'Succeeded' | 'Creating' | 'Deleting' | 'Failed'; - /** - * The response body as parsed JSON or XML - */ - parsedBody: ContainerServiceListResult; - }; -}; +/** + * Defines values for ConnectionStatus. + * Possible values include: 'Pending', 'Approved', 'Rejected', 'Disconnected' + * @readonly + * @enum {string} + */ +export type ConnectionStatus = 'Pending' | 'Approved' | 'Rejected' | 'Disconnected'; /** * Contains response data for the list operation. @@ -2666,9 +1967,9 @@ export type ManagedClustersUpdateTagsResponse = ManagedCluster & { }; /** - * Contains response data for the upgradeNodeImageVersion operation. + * Contains response data for the beginCreateOrUpdate operation. */ -export type ManagedClustersUpgradeNodeImageVersionResponse = AgentPool & { +export type ManagedClustersBeginCreateOrUpdateResponse = ManagedCluster & { /** * The underlying HTTP response. */ @@ -2681,14 +1982,14 @@ export type ManagedClustersUpgradeNodeImageVersionResponse = AgentPool & { /** * The response body as parsed JSON or XML */ - parsedBody: AgentPool; + parsedBody: ManagedCluster; }; }; /** - * Contains response data for the beginCreateOrUpdate operation. + * Contains response data for the beginUpdateTags operation. */ -export type ManagedClustersBeginCreateOrUpdateResponse = ManagedCluster & { +export type ManagedClustersBeginUpdateTagsResponse = ManagedCluster & { /** * The underlying HTTP response. */ @@ -2706,9 +2007,9 @@ export type ManagedClustersBeginCreateOrUpdateResponse = ManagedCluster & { }; /** - * Contains response data for the beginUpdateTags operation. + * Contains response data for the listNext operation. */ -export type ManagedClustersBeginUpdateTagsResponse = ManagedCluster & { +export type ManagedClustersListNextResponse = ManagedClusterListResult & { /** * The underlying HTTP response. */ @@ -2721,14 +2022,14 @@ export type ManagedClustersBeginUpdateTagsResponse = ManagedCluster & { /** * The response body as parsed JSON or XML */ - parsedBody: ManagedCluster; + parsedBody: ManagedClusterListResult; }; }; /** - * Contains response data for the beginUpgradeNodeImageVersion operation. + * Contains response data for the listByResourceGroupNext operation. */ -export type ManagedClustersBeginUpgradeNodeImageVersionResponse = AgentPool & { +export type ManagedClustersListByResourceGroupNextResponse = ManagedClusterListResult & { /** * The underlying HTTP response. */ @@ -2741,14 +2042,14 @@ export type ManagedClustersBeginUpgradeNodeImageVersionResponse = AgentPool & { /** * The response body as parsed JSON or XML */ - parsedBody: AgentPool; + parsedBody: ManagedClusterListResult; }; }; /** - * Contains response data for the listNext operation. + * Contains response data for the list operation. */ -export type ManagedClustersListNextResponse = ManagedClusterListResult & { +export type AgentPoolsListResponse = AgentPoolListResult & { /** * The underlying HTTP response. */ @@ -2761,14 +2062,14 @@ export type ManagedClustersListNextResponse = ManagedClusterListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: ManagedClusterListResult; + parsedBody: AgentPoolListResult; }; }; /** - * Contains response data for the listByResourceGroupNext operation. + * Contains response data for the get operation. */ -export type ManagedClustersListByResourceGroupNextResponse = ManagedClusterListResult & { +export type AgentPoolsGetResponse = AgentPool & { /** * The underlying HTTP response. */ @@ -2781,14 +2082,14 @@ export type ManagedClustersListByResourceGroupNextResponse = ManagedClusterListR /** * The response body as parsed JSON or XML */ - parsedBody: ManagedClusterListResult; + parsedBody: AgentPool; }; }; /** - * Contains response data for the list operation. + * Contains response data for the createOrUpdate operation. */ -export type AgentPoolsListResponse = AgentPoolListResult & { +export type AgentPoolsCreateOrUpdateResponse = AgentPool & { /** * The underlying HTTP response. */ @@ -2801,14 +2102,14 @@ export type AgentPoolsListResponse = AgentPoolListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: AgentPoolListResult; + parsedBody: AgentPool; }; }; /** - * Contains response data for the get operation. + * Contains response data for the getUpgradeProfile operation. */ -export type AgentPoolsGetResponse = AgentPool & { +export type AgentPoolsGetUpgradeProfileResponse = AgentPoolUpgradeProfile & { /** * The underlying HTTP response. */ @@ -2821,14 +2122,14 @@ export type AgentPoolsGetResponse = AgentPool & { /** * The response body as parsed JSON or XML */ - parsedBody: AgentPool; + parsedBody: AgentPoolUpgradeProfile; }; }; /** - * Contains response data for the createOrUpdate operation. + * Contains response data for the getAvailableAgentPoolVersions operation. */ -export type AgentPoolsCreateOrUpdateResponse = AgentPool & { +export type AgentPoolsGetAvailableAgentPoolVersionsResponse = AgentPoolAvailableVersions & { /** * The underlying HTTP response. */ @@ -2841,14 +2142,14 @@ export type AgentPoolsCreateOrUpdateResponse = AgentPool & { /** * The response body as parsed JSON or XML */ - parsedBody: AgentPool; + parsedBody: AgentPoolAvailableVersions; }; }; /** - * Contains response data for the getUpgradeProfile operation. + * Contains response data for the upgradeNodeImageVersion operation. */ -export type AgentPoolsGetUpgradeProfileResponse = AgentPoolUpgradeProfile & { +export type AgentPoolsUpgradeNodeImageVersionResponse = AgentPool & { /** * The underlying HTTP response. */ @@ -2861,14 +2162,14 @@ export type AgentPoolsGetUpgradeProfileResponse = AgentPoolUpgradeProfile & { /** * The response body as parsed JSON or XML */ - parsedBody: AgentPoolUpgradeProfile; + parsedBody: AgentPool; }; }; /** - * Contains response data for the getAvailableAgentPoolVersions operation. + * Contains response data for the beginCreateOrUpdate operation. */ -export type AgentPoolsGetAvailableAgentPoolVersionsResponse = AgentPoolAvailableVersions & { +export type AgentPoolsBeginCreateOrUpdateResponse = AgentPool & { /** * The underlying HTTP response. */ @@ -2881,14 +2182,14 @@ export type AgentPoolsGetAvailableAgentPoolVersionsResponse = AgentPoolAvailable /** * The response body as parsed JSON or XML */ - parsedBody: AgentPoolAvailableVersions; + parsedBody: AgentPool; }; }; /** - * Contains response data for the beginCreateOrUpdate operation. + * Contains response data for the beginUpgradeNodeImageVersion operation. */ -export type AgentPoolsBeginCreateOrUpdateResponse = AgentPool & { +export type AgentPoolsBeginUpgradeNodeImageVersionResponse = AgentPool & { /** * The underlying HTTP response. */ @@ -2984,3 +2285,43 @@ export type PrivateEndpointConnectionsUpdateResponse = PrivateEndpointConnection parsedBody: PrivateEndpointConnection; }; }; + +/** + * Contains response data for the list operation. + */ +export type PrivateLinkResourcesListResponse = PrivateLinkResourcesListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: PrivateLinkResourcesListResult; + }; +}; + +/** + * Contains response data for the pOST operation. + */ +export type ResolvePrivateLinkServiceIdPOSTResponse = PrivateLinkResource & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: PrivateLinkResource; + }; +}; diff --git a/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts b/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts index b16ddcf75f19..7bcf2f508e54 100644 --- a/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts @@ -1,33 +1,22 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { - discriminators, AgentPool, AgentPoolUpgradeSettings, BaseResource, CloudError, - ContainerService, - ContainerServiceAgentPoolProfile, - ContainerServiceCustomProfile, - ContainerServiceDiagnosticsProfile, ContainerServiceLinuxProfile, - ContainerServiceMasterProfile, ContainerServiceNetworkProfile, - ContainerServiceOrchestratorProfile, - ContainerServiceServicePrincipalProfile, ContainerServiceSshConfiguration, ContainerServiceSshPublicKey, - ContainerServiceVMDiagnostics, - ContainerServiceWindowsProfile, CredentialResult, CredentialResults, - KeyVaultSecretRef, ManagedCluster, ManagedClusterAADProfile, ManagedClusterAccessProfile, @@ -36,6 +25,7 @@ export { ManagedClusterAgentPoolProfile, ManagedClusterAgentPoolProfileProperties, ManagedClusterAPIServerAccessProfile, + ManagedClusterAutoUpgradeProfile, ManagedClusterIdentity, ManagedClusterIdentityUserAssignedIdentitiesValue, ManagedClusterListResult, @@ -43,6 +33,10 @@ export { ManagedClusterLoadBalancerProfileManagedOutboundIPs, ManagedClusterLoadBalancerProfileOutboundIPPrefixes, ManagedClusterLoadBalancerProfileOutboundIPs, + ManagedClusterPodIdentity, + ManagedClusterPodIdentityException, + ManagedClusterPodIdentityProfile, + ManagedClusterPodIdentityProvisioningInfo, ManagedClusterPoolUpgradeProfile, ManagedClusterPoolUpgradeProfileUpgradesItem, ManagedClusterPropertiesAutoScalerProfile, @@ -51,19 +45,10 @@ export { ManagedClusterSKU, ManagedClusterUpgradeProfile, ManagedClusterWindowsProfile, - NetworkProfile, - OpenShiftManagedCluster, - OpenShiftManagedClusterAADIdentityProvider, - OpenShiftManagedClusterAgentPoolProfile, - OpenShiftManagedClusterAuthProfile, - OpenShiftManagedClusterBaseIdentityProvider, - OpenShiftManagedClusterIdentityProvider, - OpenShiftManagedClusterMasterPoolProfile, - OpenShiftRouterProfile, + PowerState, PrivateEndpoint, PrivateEndpointConnection, PrivateLinkServiceConnectionState, - PurchasePlan, Resource, ResourceReference, SubResource, diff --git a/sdk/containerservice/arm-containerservice/src/models/mappers.ts b/sdk/containerservice/arm-containerservice/src/models/mappers.ts index 23fafe415798..7aefe69f9edb 100644 --- a/sdk/containerservice/arm-containerservice/src/models/mappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/mappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -12,1064 +12,67 @@ import * as msRest from "@azure/ms-rest-js"; export const CloudError = CloudErrorMapper; export const BaseResource = BaseResourceMapper; -export const Resource: msRest.CompositeMapper = { - serializedName: "Resource", +export const OperationValue: msRest.CompositeMapper = { + serializedName: "OperationValue", type: { name: "Composite", - className: "Resource", + className: "OperationValue", modelProperties: { - id: { - readOnly: true, - serializedName: "id", - type: { - name: "String" - } - }, - name: { - readOnly: true, - serializedName: "name", - type: { - name: "String" - } - }, - type: { + origin: { readOnly: true, - serializedName: "type", - type: { - name: "String" - } - }, - location: { - required: true, - serializedName: "location", - type: { - name: "String" - } - }, - tags: { - serializedName: "tags", - type: { - name: "Dictionary", - value: { - type: { - name: "String" - } - } - } - } - } - } -}; - -export const PurchasePlan: msRest.CompositeMapper = { - serializedName: "PurchasePlan", - type: { - name: "Composite", - className: "PurchasePlan", - modelProperties: { - name: { - serializedName: "name", - type: { - name: "String" - } - }, - product: { - serializedName: "product", - type: { - name: "String" - } - }, - promotionCode: { - serializedName: "promotionCode", + serializedName: "origin", type: { name: "String" } }, - publisher: { - serializedName: "publisher", - type: { - name: "String" - } - } - } - } -}; - -export const OpenShiftRouterProfile: msRest.CompositeMapper = { - serializedName: "OpenShiftRouterProfile", - type: { - name: "Composite", - className: "OpenShiftRouterProfile", - modelProperties: { name: { - serializedName: "name", - type: { - name: "String" - } - }, - publicSubdomain: { - readOnly: true, - serializedName: "publicSubdomain", - type: { - name: "String" - } - }, - fqdn: { readOnly: true, - serializedName: "fqdn", - type: { - name: "String" - } - } - } - } -}; - -export const NetworkProfile: msRest.CompositeMapper = { - serializedName: "NetworkProfile", - type: { - name: "Composite", - className: "NetworkProfile", - modelProperties: { - vnetCidr: { - serializedName: "vnetCidr", - defaultValue: '10.0.0.0/8', - type: { - name: "String" - } - }, - peerVnetId: { - serializedName: "peerVnetId", - type: { - name: "String" - } - }, - vnetId: { - serializedName: "vnetId", - type: { - name: "String" - } - } - } - } -}; - -export const OpenShiftManagedClusterMasterPoolProfile: msRest.CompositeMapper = { - serializedName: "OpenShiftManagedClusterMasterPoolProfile", - type: { - name: "Composite", - className: "OpenShiftManagedClusterMasterPoolProfile", - modelProperties: { - name: { - serializedName: "name", - type: { - name: "String" - } - }, - count: { - required: true, - serializedName: "count", - type: { - name: "Number" - } - }, - vmSize: { - required: true, - serializedName: "vmSize", - type: { - name: "String" - } - }, - subnetCidr: { - serializedName: "subnetCidr", - type: { - name: "String" - } - }, - osType: { - serializedName: "osType", - defaultValue: 'Linux', - type: { - name: "String" - } - } - } - } -}; - -export const OpenShiftManagedClusterAgentPoolProfile: msRest.CompositeMapper = { - serializedName: "OpenShiftManagedClusterAgentPoolProfile", - type: { - name: "Composite", - className: "OpenShiftManagedClusterAgentPoolProfile", - modelProperties: { - name: { - required: true, - serializedName: "name", - type: { - name: "String" - } - }, - count: { - required: true, - serializedName: "count", - type: { - name: "Number" - } - }, - vmSize: { - required: true, - serializedName: "vmSize", - type: { - name: "String" - } - }, - subnetCidr: { - serializedName: "subnetCidr", - defaultValue: '10.0.0.0/24', - type: { - name: "String" - } - }, - osType: { - serializedName: "osType", - defaultValue: 'Linux', - type: { - name: "String" - } - }, - role: { - serializedName: "role", - type: { - name: "String" - } - } - } - } -}; - -export const OpenShiftManagedClusterBaseIdentityProvider: msRest.CompositeMapper = { - serializedName: "OpenShiftManagedClusterBaseIdentityProvider", - type: { - name: "Composite", - polymorphicDiscriminator: { - serializedName: "kind", - clientName: "kind" - }, - uberParent: "OpenShiftManagedClusterBaseIdentityProvider", - className: "OpenShiftManagedClusterBaseIdentityProvider", - modelProperties: { - kind: { - required: true, - serializedName: "kind", - type: { - name: "String" - } - } - } - } -}; - -export const OpenShiftManagedClusterIdentityProvider: msRest.CompositeMapper = { - serializedName: "OpenShiftManagedClusterIdentityProvider", - type: { - name: "Composite", - className: "OpenShiftManagedClusterIdentityProvider", - modelProperties: { - name: { serializedName: "name", type: { - name: "String" - } - }, - provider: { - serializedName: "provider", - type: { - name: "Composite", - className: "OpenShiftManagedClusterBaseIdentityProvider" - } - } - } - } -}; - -export const OpenShiftManagedClusterAuthProfile: msRest.CompositeMapper = { - serializedName: "OpenShiftManagedClusterAuthProfile", - type: { - name: "Composite", - className: "OpenShiftManagedClusterAuthProfile", - modelProperties: { - identityProviders: { - serializedName: "identityProviders", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "OpenShiftManagedClusterIdentityProvider" - } - } - } - } - } - } -}; - -export const OpenShiftManagedCluster: msRest.CompositeMapper = { - serializedName: "OpenShiftManagedCluster", - type: { - name: "Composite", - className: "OpenShiftManagedCluster", - modelProperties: { - ...Resource.type.modelProperties, - plan: { - serializedName: "plan", - type: { - name: "Composite", - className: "PurchasePlan" - } - }, - provisioningState: { - readOnly: true, - serializedName: "properties.provisioningState", - type: { - name: "String" - } - }, - openShiftVersion: { - required: true, - serializedName: "properties.openShiftVersion", - type: { - name: "String" - } - }, - clusterVersion: { - readOnly: true, - serializedName: "properties.clusterVersion", - type: { - name: "String" - } - }, - publicHostname: { - readOnly: true, - serializedName: "properties.publicHostname", - type: { - name: "String" - } - }, - fqdn: { - readOnly: true, - serializedName: "properties.fqdn", - type: { - name: "String" - } - }, - networkProfile: { - serializedName: "properties.networkProfile", - type: { - name: "Composite", - className: "NetworkProfile" - } - }, - routerProfiles: { - serializedName: "properties.routerProfiles", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "OpenShiftRouterProfile" - } - } - } - }, - masterPoolProfile: { - serializedName: "properties.masterPoolProfile", - type: { - name: "Composite", - className: "OpenShiftManagedClusterMasterPoolProfile" - } - }, - agentPoolProfiles: { - serializedName: "properties.agentPoolProfiles", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "OpenShiftManagedClusterAgentPoolProfile" - } - } - } - }, - authProfile: { - serializedName: "properties.authProfile", - type: { - name: "Composite", - className: "OpenShiftManagedClusterAuthProfile" - } - } - } - } -}; - -export const OpenShiftManagedClusterAADIdentityProvider: msRest.CompositeMapper = { - serializedName: "AADIdentityProvider", - type: { - name: "Composite", - polymorphicDiscriminator: OpenShiftManagedClusterBaseIdentityProvider.type.polymorphicDiscriminator, - uberParent: "OpenShiftManagedClusterBaseIdentityProvider", - className: "OpenShiftManagedClusterAADIdentityProvider", - modelProperties: { - ...OpenShiftManagedClusterBaseIdentityProvider.type.modelProperties, - clientId: { - serializedName: "clientId", - type: { - name: "String" - } - }, - secret: { - serializedName: "secret", - type: { - name: "String" - } - }, - tenantId: { - serializedName: "tenantId", - type: { - name: "String" - } - }, - customerAdminGroupId: { - serializedName: "customerAdminGroupId", - type: { - name: "String" - } - } - } - } -}; - -export const TagsObject: msRest.CompositeMapper = { - serializedName: "TagsObject", - type: { - name: "Composite", - className: "TagsObject", - modelProperties: { - tags: { - serializedName: "tags", - type: { - name: "Dictionary", - value: { - type: { - name: "String" - } - } - } - } - } - } -}; - -export const ContainerServiceCustomProfile: msRest.CompositeMapper = { - serializedName: "ContainerServiceCustomProfile", - type: { - name: "Composite", - className: "ContainerServiceCustomProfile", - modelProperties: { - orchestrator: { - required: true, - serializedName: "orchestrator", - type: { - name: "String" - } - } - } - } -}; - -export const KeyVaultSecretRef: msRest.CompositeMapper = { - serializedName: "KeyVaultSecretRef", - type: { - name: "Composite", - className: "KeyVaultSecretRef", - modelProperties: { - vaultID: { - required: true, - serializedName: "vaultID", - type: { - name: "String" - } - }, - secretName: { - required: true, - serializedName: "secretName", - type: { - name: "String" - } - }, - version: { - serializedName: "version", - type: { - name: "String" - } - } - } - } -}; - -export const ContainerServiceServicePrincipalProfile: msRest.CompositeMapper = { - serializedName: "ContainerServiceServicePrincipalProfile", - type: { - name: "Composite", - className: "ContainerServiceServicePrincipalProfile", - modelProperties: { - clientId: { - required: true, - serializedName: "clientId", - type: { - name: "String" - } - }, - secret: { - serializedName: "secret", - type: { - name: "String" - } - }, - keyVaultSecretRef: { - serializedName: "keyVaultSecretRef", - type: { - name: "Composite", - className: "KeyVaultSecretRef" - } - } - } - } -}; - -export const ContainerServiceOrchestratorProfile: msRest.CompositeMapper = { - serializedName: "ContainerServiceOrchestratorProfile", - type: { - name: "Composite", - className: "ContainerServiceOrchestratorProfile", - modelProperties: { - orchestratorType: { - required: true, - serializedName: "orchestratorType", - type: { - name: "String" - } - }, - orchestratorVersion: { - serializedName: "orchestratorVersion", - type: { - name: "String" - } - } - } - } -}; - -export const ContainerServiceMasterProfile: msRest.CompositeMapper = { - serializedName: "ContainerServiceMasterProfile", - type: { - name: "Composite", - className: "ContainerServiceMasterProfile", - modelProperties: { - count: { - serializedName: "count", - defaultValue: 1, - type: { - name: "Number" - } - }, - dnsPrefix: { - required: true, - serializedName: "dnsPrefix", - type: { - name: "String" - } - }, - vmSize: { - required: true, - serializedName: "vmSize", - type: { - name: "String" - } - }, - osDiskSizeGB: { - serializedName: "osDiskSizeGB", - type: { - name: "Number" - } - }, - vnetSubnetID: { - serializedName: "vnetSubnetID", - type: { - name: "String" - } - }, - firstConsecutiveStaticIP: { - serializedName: "firstConsecutiveStaticIP", - defaultValue: '10.240.255.5', - type: { - name: "String" - } - }, - storageProfile: { - serializedName: "storageProfile", - type: { - name: "String" - } - }, - fqdn: { - readOnly: true, - serializedName: "fqdn", - type: { - name: "String" - } - } - } - } -}; - -export const ContainerServiceAgentPoolProfile: msRest.CompositeMapper = { - serializedName: "ContainerServiceAgentPoolProfile", - type: { - name: "Composite", - className: "ContainerServiceAgentPoolProfile", - modelProperties: { - name: { - required: true, - serializedName: "name", - type: { - name: "String" - } - }, - count: { - serializedName: "count", - defaultValue: 1, - constraints: { - InclusiveMaximum: 100, - InclusiveMinimum: 1 - }, - type: { - name: "Number" - } - }, - vmSize: { - required: true, - serializedName: "vmSize", - type: { - name: "String" - } - }, - osDiskSizeGB: { - serializedName: "osDiskSizeGB", - type: { - name: "Number" - } - }, - dnsPrefix: { - serializedName: "dnsPrefix", - type: { - name: "String" - } - }, - fqdn: { - readOnly: true, - serializedName: "fqdn", - type: { - name: "String" - } - }, - ports: { - serializedName: "ports", - type: { - name: "Sequence", - element: { - type: { - name: "Number" - } - } - } - }, - storageProfile: { - serializedName: "storageProfile", - type: { - name: "String" - } - }, - vnetSubnetID: { - serializedName: "vnetSubnetID", - type: { - name: "String" - } - }, - osType: { - serializedName: "osType", - defaultValue: 'Linux', - type: { - name: "String" - } - } - } - } -}; - -export const ContainerServiceWindowsProfile: msRest.CompositeMapper = { - serializedName: "ContainerServiceWindowsProfile", - type: { - name: "Composite", - className: "ContainerServiceWindowsProfile", - modelProperties: { - adminUsername: { - required: true, - serializedName: "adminUsername", - constraints: { - Pattern: /^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$/ - }, - type: { - name: "String" - } - }, - adminPassword: { - required: true, - serializedName: "adminPassword", - constraints: { - Pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\^&\*\(\)])[a-zA-Z\d!@#$%\^&\*\(\)]{12,123}$/ - }, - type: { - name: "String" - } - } - } - } -}; - -export const ContainerServiceSshPublicKey: msRest.CompositeMapper = { - serializedName: "ContainerServiceSshPublicKey", - type: { - name: "Composite", - className: "ContainerServiceSshPublicKey", - modelProperties: { - keyData: { - required: true, - serializedName: "keyData", - type: { - name: "String" - } - } - } - } -}; - -export const ContainerServiceSshConfiguration: msRest.CompositeMapper = { - serializedName: "ContainerServiceSshConfiguration", - type: { - name: "Composite", - className: "ContainerServiceSshConfiguration", - modelProperties: { - publicKeys: { - required: true, - serializedName: "publicKeys", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "ContainerServiceSshPublicKey" - } - } - } - } - } - } -}; - -export const ContainerServiceLinuxProfile: msRest.CompositeMapper = { - serializedName: "ContainerServiceLinuxProfile", - type: { - name: "Composite", - className: "ContainerServiceLinuxProfile", - modelProperties: { - adminUsername: { - required: true, - serializedName: "adminUsername", - constraints: { - Pattern: /^[A-Za-z][-A-Za-z0-9_]*$/ - }, - type: { - name: "String" - } - }, - ssh: { - required: true, - serializedName: "ssh", - type: { - name: "Composite", - className: "ContainerServiceSshConfiguration" - } - } - } - } -}; - -export const ContainerServiceVMDiagnostics: msRest.CompositeMapper = { - serializedName: "ContainerServiceVMDiagnostics", - type: { - name: "Composite", - className: "ContainerServiceVMDiagnostics", - modelProperties: { - enabled: { - required: true, - serializedName: "enabled", - type: { - name: "Boolean" - } - }, - storageUri: { - readOnly: true, - serializedName: "storageUri", - type: { - name: "String" - } - } - } - } -}; - -export const ContainerServiceDiagnosticsProfile: msRest.CompositeMapper = { - serializedName: "ContainerServiceDiagnosticsProfile", - type: { - name: "Composite", - className: "ContainerServiceDiagnosticsProfile", - modelProperties: { - vmDiagnostics: { - required: true, - serializedName: "vmDiagnostics", - type: { - name: "Composite", - className: "ContainerServiceVMDiagnostics" - } - } - } - } -}; - -export const ContainerService: msRest.CompositeMapper = { - serializedName: "ContainerService", - type: { - name: "Composite", - className: "ContainerService", - modelProperties: { - ...Resource.type.modelProperties, - provisioningState: { - readOnly: true, - serializedName: "properties.provisioningState", - type: { - name: "String" - } - }, - orchestratorProfile: { - required: true, - serializedName: "properties.orchestratorProfile", - type: { - name: "Composite", - className: "ContainerServiceOrchestratorProfile" - } - }, - customProfile: { - serializedName: "properties.customProfile", - type: { - name: "Composite", - className: "ContainerServiceCustomProfile" - } - }, - servicePrincipalProfile: { - serializedName: "properties.servicePrincipalProfile", - type: { - name: "Composite", - className: "ContainerServiceServicePrincipalProfile" - } - }, - masterProfile: { - required: true, - serializedName: "properties.masterProfile", - type: { - name: "Composite", - className: "ContainerServiceMasterProfile" - } - }, - agentPoolProfiles: { - serializedName: "properties.agentPoolProfiles", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "ContainerServiceAgentPoolProfile" - } - } - } - }, - windowsProfile: { - serializedName: "properties.windowsProfile", - type: { - name: "Composite", - className: "ContainerServiceWindowsProfile" - } - }, - linuxProfile: { - required: true, - serializedName: "properties.linuxProfile", - type: { - name: "Composite", - className: "ContainerServiceLinuxProfile" - } - }, - diagnosticsProfile: { - serializedName: "properties.diagnosticsProfile", - type: { - name: "Composite", - className: "ContainerServiceDiagnosticsProfile" - } - } - } - } -}; - -export const OrchestratorProfile: msRest.CompositeMapper = { - serializedName: "OrchestratorProfile", - type: { - name: "Composite", - className: "OrchestratorProfile", - modelProperties: { - orchestratorType: { - serializedName: "orchestratorType", - type: { - name: "String" - } - }, - orchestratorVersion: { - required: true, - serializedName: "orchestratorVersion", - type: { - name: "String" - } - }, - isPreview: { - serializedName: "isPreview", - type: { - name: "Boolean" - } - } - } - } -}; - -export const OrchestratorVersionProfile: msRest.CompositeMapper = { - serializedName: "OrchestratorVersionProfile", - type: { - name: "Composite", - className: "OrchestratorVersionProfile", - modelProperties: { - orchestratorType: { - required: true, - serializedName: "orchestratorType", - type: { - name: "String" - } - }, - orchestratorVersion: { - required: true, - serializedName: "orchestratorVersion", - type: { - name: "String" - } - }, - default: { - serializedName: "default", - type: { - name: "Boolean" - } - }, - isPreview: { - serializedName: "isPreview", - type: { - name: "Boolean" - } - }, - upgrades: { - serializedName: "upgrades", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "OrchestratorProfile" - } - } - } - } - } - } -}; - -export const OrchestratorVersionProfileListResult: msRest.CompositeMapper = { - serializedName: "OrchestratorVersionProfileListResult", - type: { - name: "Composite", - className: "OrchestratorVersionProfileListResult", - modelProperties: { - id: { + name: "String" + } + }, + operation: { readOnly: true, - serializedName: "id", + serializedName: "display.operation", type: { name: "String" } }, - name: { + resource: { readOnly: true, - serializedName: "name", + serializedName: "display.resource", type: { name: "String" } }, - type: { + description: { readOnly: true, - serializedName: "type", + serializedName: "display.description", type: { name: "String" } }, - orchestrators: { - required: true, - serializedName: "properties.orchestrators", + provider: { + readOnly: true, + serializedName: "display.provider", type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "OrchestratorVersionProfile" - } - } + name: "String" } } } } }; -export const OperationValue: msRest.CompositeMapper = { - serializedName: "OperationValue", +export const Resource: msRest.CompositeMapper = { + serializedName: "Resource", type: { name: "Composite", - className: "OperationValue", + className: "Resource", modelProperties: { - origin: { + id: { readOnly: true, - serializedName: "origin", + serializedName: "id", type: { name: "String" } @@ -1081,32 +84,29 @@ export const OperationValue: msRest.CompositeMapper = { name: "String" } }, - operation: { - readOnly: true, - serializedName: "display.operation", - type: { - name: "String" - } - }, - resource: { + type: { readOnly: true, - serializedName: "display.resource", + serializedName: "type", type: { name: "String" } }, - description: { - readOnly: true, - serializedName: "display.description", + location: { + required: true, + serializedName: "location", type: { name: "String" } }, - provider: { - readOnly: true, - serializedName: "display.provider", + tags: { + serializedName: "tags", type: { - name: "String" + name: "Dictionary", + value: { + type: { + name: "String" + } + } } } } @@ -1144,6 +144,27 @@ export const SubResource: msRest.CompositeMapper = { } }; +export const TagsObject: msRest.CompositeMapper = { + serializedName: "TagsObject", + type: { + name: "Composite", + className: "TagsObject", + modelProperties: { + tags: { + serializedName: "tags", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } + } + } + } +}; + export const ManagedClusterServicePrincipalProfile: msRest.CompositeMapper = { serializedName: "ManagedClusterServicePrincipalProfile", type: { @@ -1167,6 +188,69 @@ export const ManagedClusterServicePrincipalProfile: msRest.CompositeMapper = { } }; +export const ContainerServiceMasterProfile: msRest.CompositeMapper = { + serializedName: "ContainerServiceMasterProfile", + type: { + name: "Composite", + className: "ContainerServiceMasterProfile", + modelProperties: { + count: { + serializedName: "count", + defaultValue: 1, + type: { + name: "Number" + } + }, + dnsPrefix: { + required: true, + serializedName: "dnsPrefix", + type: { + name: "String" + } + }, + vmSize: { + required: true, + serializedName: "vmSize", + type: { + name: "String" + } + }, + osDiskSizeGB: { + serializedName: "osDiskSizeGB", + type: { + name: "Number" + } + }, + vnetSubnetID: { + serializedName: "vnetSubnetID", + type: { + name: "String" + } + }, + firstConsecutiveStaticIP: { + serializedName: "firstConsecutiveStaticIP", + defaultValue: '10.240.255.5', + type: { + name: "String" + } + }, + storageProfile: { + serializedName: "storageProfile", + type: { + name: "String" + } + }, + fqdn: { + readOnly: true, + serializedName: "fqdn", + type: { + name: "String" + } + } + } + } +}; + export const AgentPoolUpgradeSettings: msRest.CompositeMapper = { serializedName: "AgentPoolUpgradeSettings", type: { @@ -1183,6 +267,22 @@ export const AgentPoolUpgradeSettings: msRest.CompositeMapper = { } }; +export const PowerState: msRest.CompositeMapper = { + serializedName: "PowerState", + type: { + name: "Composite", + className: "PowerState", + modelProperties: { + code: { + serializedName: "code", + type: { + name: "String" + } + } + } + } +}; + export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = { serializedName: "ManagedClusterAgentPoolProfileProperties", type: { @@ -1207,12 +307,24 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = name: "Number" } }, + osDiskType: { + serializedName: "osDiskType", + type: { + name: "String" + } + }, vnetSubnetID: { serializedName: "vnetSubnetID", type: { name: "String" } }, + podSubnetID: { + serializedName: "podSubnetID", + type: { + name: "String" + } + }, maxPods: { serializedName: "maxPods", type: { @@ -1283,6 +395,14 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = name: "String" } }, + powerState: { + readOnly: true, + serializedName: "powerState", + type: { + name: "Composite", + className: "PowerState" + } + }, availabilityZones: { serializedName: "availabilityZones", type: { @@ -1409,12 +529,24 @@ export const AgentPool: msRest.CompositeMapper = { name: "Number" } }, + osDiskType: { + serializedName: "properties.osDiskType", + type: { + name: "String" + } + }, vnetSubnetID: { serializedName: "properties.vnetSubnetID", type: { name: "String" } }, + podSubnetID: { + serializedName: "properties.podSubnetID", + type: { + name: "String" + } + }, maxPods: { serializedName: "properties.maxPods", type: { @@ -1485,6 +617,14 @@ export const AgentPool: msRest.CompositeMapper = { name: "String" } }, + powerState: { + readOnly: true, + serializedName: "properties.powerState", + type: { + name: "Composite", + className: "PowerState" + } + }, availabilityZones: { serializedName: "properties.availabilityZones", type: { @@ -1574,18 +714,12 @@ export const ManagedClusterWindowsProfile: msRest.CompositeMapper = { adminUsername: { required: true, serializedName: "adminUsername", - constraints: { - Pattern: /^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$/ - }, type: { name: "String" } }, adminPassword: { serializedName: "adminPassword", - constraints: { - Pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\^&\*\(\)])[a-zA-Z\d!@#$%\^&\*\(\)]{12,123}$/ - }, type: { name: "String" } @@ -1593,7 +727,75 @@ export const ManagedClusterWindowsProfile: msRest.CompositeMapper = { licenseType: { serializedName: "licenseType", type: { - name: "String" + name: "String" + } + } + } + } +}; + +export const ContainerServiceSshPublicKey: msRest.CompositeMapper = { + serializedName: "ContainerServiceSshPublicKey", + type: { + name: "Composite", + className: "ContainerServiceSshPublicKey", + modelProperties: { + keyData: { + required: true, + serializedName: "keyData", + type: { + name: "String" + } + } + } + } +}; + +export const ContainerServiceSshConfiguration: msRest.CompositeMapper = { + serializedName: "ContainerServiceSshConfiguration", + type: { + name: "Composite", + className: "ContainerServiceSshConfiguration", + modelProperties: { + publicKeys: { + required: true, + serializedName: "publicKeys", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ContainerServiceSshPublicKey" + } + } + } + } + } + } +}; + +export const ContainerServiceLinuxProfile: msRest.CompositeMapper = { + serializedName: "ContainerServiceLinuxProfile", + type: { + name: "Composite", + className: "ContainerServiceLinuxProfile", + modelProperties: { + adminUsername: { + required: true, + serializedName: "adminUsername", + constraints: { + Pattern: /^[A-Za-z][-A-Za-z0-9_]*$/ + }, + type: { + name: "String" + } + }, + ssh: { + required: true, + serializedName: "ssh", + type: { + name: "Composite", + className: "ContainerServiceSshConfiguration" } } } @@ -1835,6 +1037,48 @@ export const ContainerServiceNetworkProfile: msRest.CompositeMapper = { } }; +export const ContainerServiceVMDiagnostics: msRest.CompositeMapper = { + serializedName: "ContainerServiceVMDiagnostics", + type: { + name: "Composite", + className: "ContainerServiceVMDiagnostics", + modelProperties: { + enabled: { + required: true, + serializedName: "enabled", + type: { + name: "Boolean" + } + }, + storageUri: { + readOnly: true, + serializedName: "storageUri", + type: { + name: "String" + } + } + } + } +}; + +export const ContainerServiceDiagnosticsProfile: msRest.CompositeMapper = { + serializedName: "ContainerServiceDiagnosticsProfile", + type: { + name: "Composite", + className: "ContainerServiceDiagnosticsProfile", + modelProperties: { + vmDiagnostics: { + required: true, + serializedName: "vmDiagnostics", + type: { + name: "Composite", + className: "ContainerServiceVMDiagnostics" + } + } + } + } +}; + export const UserAssignedIdentity: msRest.CompositeMapper = { serializedName: "UserAssignedIdentity", type: { @@ -1910,6 +1154,146 @@ export const ManagedClusterAddonProfile: msRest.CompositeMapper = { } }; +export const ManagedClusterPodIdentityProvisioningInfo: msRest.CompositeMapper = { + serializedName: "ManagedClusterPodIdentity_provisioningInfo", + type: { + name: "Composite", + className: "ManagedClusterPodIdentityProvisioningInfo", + modelProperties: { + error: { + serializedName: "error", + type: { + name: "Composite", + className: "CloudError" + } + } + } + } +}; + +export const ManagedClusterPodIdentity: msRest.CompositeMapper = { + serializedName: "ManagedClusterPodIdentity", + type: { + name: "Composite", + className: "ManagedClusterPodIdentity", + modelProperties: { + name: { + required: true, + serializedName: "name", + type: { + name: "String" + } + }, + namespace: { + required: true, + serializedName: "namespace", + type: { + name: "String" + } + }, + identity: { + required: true, + serializedName: "identity", + type: { + name: "Composite", + className: "UserAssignedIdentity" + } + }, + provisioningState: { + readOnly: true, + serializedName: "provisioningState", + type: { + name: "String" + } + }, + provisioningInfo: { + readOnly: true, + serializedName: "provisioningInfo", + type: { + name: "Composite", + className: "ManagedClusterPodIdentityProvisioningInfo" + } + } + } + } +}; + +export const ManagedClusterPodIdentityException: msRest.CompositeMapper = { + serializedName: "ManagedClusterPodIdentityException", + type: { + name: "Composite", + className: "ManagedClusterPodIdentityException", + modelProperties: { + name: { + required: true, + serializedName: "name", + type: { + name: "String" + } + }, + namespace: { + required: true, + serializedName: "namespace", + type: { + name: "String" + } + }, + podLabels: { + required: true, + serializedName: "podLabels", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } + } + } + } +}; + +export const ManagedClusterPodIdentityProfile: msRest.CompositeMapper = { + serializedName: "ManagedClusterPodIdentityProfile", + type: { + name: "Composite", + className: "ManagedClusterPodIdentityProfile", + modelProperties: { + enabled: { + serializedName: "enabled", + type: { + name: "Boolean" + } + }, + userAssignedIdentities: { + serializedName: "userAssignedIdentities", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ManagedClusterPodIdentity" + } + } + } + }, + userAssignedIdentityExceptions: { + serializedName: "userAssignedIdentityExceptions", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ManagedClusterPodIdentityException" + } + } + } + } + } + } +}; + export const ManagedClusterAADProfile: msRest.CompositeMapper = { serializedName: "ManagedClusterAADProfile", type: { @@ -1967,6 +1351,22 @@ export const ManagedClusterAADProfile: msRest.CompositeMapper = { } }; +export const ManagedClusterAutoUpgradeProfile: msRest.CompositeMapper = { + serializedName: "ManagedClusterAutoUpgradeProfile", + type: { + name: "Composite", + className: "ManagedClusterAutoUpgradeProfile", + modelProperties: { + upgradeChannel: { + serializedName: "upgradeChannel", + type: { + name: "String" + } + } + } + } +}; + export const ManagedClusterPropertiesAutoScalerProfile: msRest.CompositeMapper = { serializedName: "ManagedClusterProperties_autoScalerProfile", type: { @@ -1979,6 +1379,42 @@ export const ManagedClusterPropertiesAutoScalerProfile: msRest.CompositeMapper = name: "String" } }, + expander: { + serializedName: "expander", + type: { + name: "String" + } + }, + maxEmptyBulkDelete: { + serializedName: "max-empty-bulk-delete", + type: { + name: "String" + } + }, + maxGracefulTerminationSec: { + serializedName: "max-graceful-termination-sec", + type: { + name: "String" + } + }, + maxTotalUnreadyPercentage: { + serializedName: "max-total-unready-percentage", + type: { + name: "String" + } + }, + newPodScaleUpDelay: { + serializedName: "new-pod-scale-up-delay", + type: { + name: "String" + } + }, + okTotalUnreadyCount: { + serializedName: "ok-total-unready-count", + type: { + name: "String" + } + }, scanInterval: { serializedName: "scan-interval", type: { @@ -2021,8 +1457,14 @@ export const ManagedClusterPropertiesAutoScalerProfile: msRest.CompositeMapper = name: "String" } }, - maxGracefulTerminationSec: { - serializedName: "max-graceful-termination-sec", + skipNodesWithLocalStorage: { + serializedName: "skip-nodes-with-local-storage", + type: { + name: "String" + } + }, + skipNodesWithSystemPods: { + serializedName: "skip-nodes-with-system-pods", type: { name: "String" } @@ -2053,6 +1495,12 @@ export const ManagedClusterAPIServerAccessProfile: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + privateDNSZone: { + serializedName: "privateDNSZone", + type: { + name: "String" + } } } } @@ -2176,6 +1624,14 @@ export const ManagedCluster: msRest.CompositeMapper = { name: "String" } }, + powerState: { + readOnly: true, + serializedName: "properties.powerState", + type: { + name: "Composite", + className: "PowerState" + } + }, maxAgentPools: { readOnly: true, serializedName: "properties.maxAgentPools", @@ -2254,6 +1710,13 @@ export const ManagedCluster: msRest.CompositeMapper = { } } }, + podIdentityProfile: { + serializedName: "properties.podIdentityProfile", + type: { + name: "Composite", + className: "ManagedClusterPodIdentityProfile" + } + }, nodeResourceGroup: { serializedName: "properties.nodeResourceGroup", type: { @@ -2286,6 +1749,13 @@ export const ManagedCluster: msRest.CompositeMapper = { className: "ManagedClusterAADProfile" } }, + autoUpgradeProfile: { + serializedName: "properties.autoUpgradeProfile", + type: { + name: "Composite", + className: "ManagedClusterAutoUpgradeProfile" + } + }, autoScalerProfile: { serializedName: "properties.autoScalerProfile", type: { @@ -2787,27 +2257,50 @@ export const PrivateEndpointConnectionListResult: msRest.CompositeMapper = { } }; -export const OpenShiftManagedClusterListResult: msRest.CompositeMapper = { - serializedName: "OpenShiftManagedClusterListResult", +export const PrivateLinkResource: msRest.CompositeMapper = { + serializedName: "PrivateLinkResource", type: { name: "Composite", - className: "OpenShiftManagedClusterListResult", + className: "PrivateLinkResource", modelProperties: { - value: { - serializedName: "", + id: { + serializedName: "id", + type: { + name: "String" + } + }, + name: { + serializedName: "name", + type: { + name: "String" + } + }, + type: { + serializedName: "type", + type: { + name: "String" + } + }, + groupId: { + serializedName: "groupId", + type: { + name: "String" + } + }, + requiredMembers: { + serializedName: "requiredMembers", type: { name: "Sequence", element: { type: { - name: "Composite", - className: "OpenShiftManagedCluster" + name: "String" } } } }, - nextLink: { + privateLinkServiceID: { readOnly: true, - serializedName: "nextLink", + serializedName: "privateLinkServiceID", type: { name: "String" } @@ -2816,30 +2309,23 @@ export const OpenShiftManagedClusterListResult: msRest.CompositeMapper = { } }; -export const ContainerServiceListResult: msRest.CompositeMapper = { - serializedName: "ContainerServiceListResult", +export const PrivateLinkResourcesListResult: msRest.CompositeMapper = { + serializedName: "PrivateLinkResourcesListResult", type: { name: "Composite", - className: "ContainerServiceListResult", + className: "PrivateLinkResourcesListResult", modelProperties: { value: { - serializedName: "", + serializedName: "value", type: { name: "Sequence", element: { type: { name: "Composite", - className: "ContainerService" + className: "PrivateLinkResource" } } } - }, - nextLink: { - readOnly: true, - serializedName: "nextLink", - type: { - name: "String" - } } } } @@ -2925,9 +2411,3 @@ export const AgentPoolListResult: msRest.CompositeMapper = { } } }; - -export const discriminators = { - 'OpenShiftManagedClusterBaseIdentityProvider' : OpenShiftManagedClusterBaseIdentityProvider, - 'OpenShiftManagedClusterBaseIdentityProvider.AADIdentityProvider' : OpenShiftManagedClusterAADIdentityProvider - -}; diff --git a/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts b/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts deleted file mode 100644 index 280e986c8c9c..000000000000 --- a/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - * - * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is regenerated. - */ - -export { - discriminators, - AgentPool, - AgentPoolUpgradeSettings, - BaseResource, - CloudError, - ContainerService, - ContainerServiceAgentPoolProfile, - ContainerServiceCustomProfile, - ContainerServiceDiagnosticsProfile, - ContainerServiceLinuxProfile, - ContainerServiceMasterProfile, - ContainerServiceNetworkProfile, - ContainerServiceOrchestratorProfile, - ContainerServiceServicePrincipalProfile, - ContainerServiceSshConfiguration, - ContainerServiceSshPublicKey, - ContainerServiceVMDiagnostics, - ContainerServiceWindowsProfile, - KeyVaultSecretRef, - ManagedCluster, - ManagedClusterAADProfile, - ManagedClusterAccessProfile, - ManagedClusterAddonProfile, - ManagedClusterAddonProfileIdentity, - ManagedClusterAgentPoolProfile, - ManagedClusterAgentPoolProfileProperties, - ManagedClusterAPIServerAccessProfile, - ManagedClusterIdentity, - ManagedClusterIdentityUserAssignedIdentitiesValue, - ManagedClusterLoadBalancerProfile, - ManagedClusterLoadBalancerProfileManagedOutboundIPs, - ManagedClusterLoadBalancerProfileOutboundIPPrefixes, - ManagedClusterLoadBalancerProfileOutboundIPs, - ManagedClusterPropertiesAutoScalerProfile, - ManagedClusterPropertiesIdentityProfileValue, - ManagedClusterServicePrincipalProfile, - ManagedClusterSKU, - ManagedClusterWindowsProfile, - NetworkProfile, - OpenShiftManagedCluster, - OpenShiftManagedClusterAADIdentityProvider, - OpenShiftManagedClusterAgentPoolProfile, - OpenShiftManagedClusterAuthProfile, - OpenShiftManagedClusterBaseIdentityProvider, - OpenShiftManagedClusterIdentityProvider, - OpenShiftManagedClusterListResult, - OpenShiftManagedClusterMasterPoolProfile, - OpenShiftRouterProfile, - PrivateEndpoint, - PrivateEndpointConnection, - PrivateLinkServiceConnectionState, - PurchasePlan, - Resource, - ResourceReference, - SubResource, - TagsObject, - UserAssignedIdentity -} from "../models/mappers"; diff --git a/sdk/containerservice/arm-containerservice/src/models/operationsMappers.ts b/sdk/containerservice/arm-containerservice/src/models/operationsMappers.ts index 5a2162d493ce..c31dc01a6669 100644 --- a/sdk/containerservice/arm-containerservice/src/models/operationsMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/operationsMappers.ts @@ -1,13 +1,12 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { - discriminators, CloudError, OperationListResult, OperationValue diff --git a/sdk/containerservice/arm-containerservice/src/models/parameters.ts b/sdk/containerservice/arm-containerservice/src/models/parameters.ts index cf7863ca08f0..267c873c843b 100644 --- a/sdk/containerservice/arm-containerservice/src/models/parameters.ts +++ b/sdk/containerservice/arm-containerservice/src/models/parameters.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -30,69 +29,11 @@ export const agentPoolName: msRest.OperationURLParameter = { } } }; -export const apiVersion0: msRest.OperationQueryParameter = { +export const apiVersion: msRest.OperationQueryParameter = { parameterPath: "apiVersion", mapper: { required: true, - isConstant: true, serializedName: "api-version", - defaultValue: '2019-04-30', - type: { - name: "String" - } - } -}; -export const apiVersion1: msRest.OperationQueryParameter = { - parameterPath: "apiVersion", - mapper: { - required: true, - isConstant: true, - serializedName: "api-version", - defaultValue: '2017-07-01', - type: { - name: "String" - } - } -}; -export const apiVersion2: msRest.OperationQueryParameter = { - parameterPath: "apiVersion", - mapper: { - required: true, - isConstant: true, - serializedName: "api-version", - defaultValue: '2019-08-01', - type: { - name: "String" - } - } -}; -export const apiVersion3: msRest.OperationQueryParameter = { - parameterPath: "apiVersion", - mapper: { - required: true, - isConstant: true, - serializedName: "api-version", - defaultValue: '2020-07-01', - type: { - name: "String" - } - } -}; -export const containerServiceName: msRest.OperationURLParameter = { - parameterPath: "containerServiceName", - mapper: { - required: true, - serializedName: "containerServiceName", - type: { - name: "String" - } - } -}; -export const location: msRest.OperationURLParameter = { - parameterPath: "location", - mapper: { - required: true, - serializedName: "location", type: { name: "String" } @@ -119,7 +60,7 @@ export const privateEndpointConnectionName: msRest.OperationURLParameter = { } } }; -export const resourceGroupName0: msRest.OperationURLParameter = { +export const resourceGroupName: msRest.OperationURLParameter = { parameterPath: "resourceGroupName", mapper: { required: true, @@ -132,27 +73,7 @@ export const resourceGroupName0: msRest.OperationURLParameter = { } } }; -export const resourceGroupName1: msRest.OperationURLParameter = { - parameterPath: "resourceGroupName", - mapper: { - required: true, - serializedName: "resourceGroupName", - type: { - name: "String" - } - } -}; -export const resourceName0: msRest.OperationURLParameter = { - parameterPath: "resourceName", - mapper: { - required: true, - serializedName: "resourceName", - type: { - name: "String" - } - } -}; -export const resourceName1: msRest.OperationURLParameter = { +export const resourceName: msRest.OperationURLParameter = { parameterPath: "resourceName", mapper: { required: true, @@ -167,18 +88,6 @@ export const resourceName1: msRest.OperationURLParameter = { } } }; -export const resourceType: msRest.OperationQueryParameter = { - parameterPath: [ - "options", - "resourceType" - ], - mapper: { - serializedName: "resource-type", - type: { - name: "String" - } - } -}; export const roleName: msRest.OperationURLParameter = { parameterPath: "roleName", mapper: { diff --git a/sdk/containerservice/arm-containerservice/src/models/privateEndpointConnectionsMappers.ts b/sdk/containerservice/arm-containerservice/src/models/privateEndpointConnectionsMappers.ts index a68d5ae6a5ed..df78b2e278b6 100644 --- a/sdk/containerservice/arm-containerservice/src/models/privateEndpointConnectionsMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/privateEndpointConnectionsMappers.ts @@ -1,31 +1,20 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { - discriminators, AgentPool, AgentPoolUpgradeSettings, BaseResource, CloudError, - ContainerService, - ContainerServiceAgentPoolProfile, - ContainerServiceCustomProfile, - ContainerServiceDiagnosticsProfile, ContainerServiceLinuxProfile, - ContainerServiceMasterProfile, ContainerServiceNetworkProfile, - ContainerServiceOrchestratorProfile, - ContainerServiceServicePrincipalProfile, ContainerServiceSshConfiguration, ContainerServiceSshPublicKey, - ContainerServiceVMDiagnostics, - ContainerServiceWindowsProfile, - KeyVaultSecretRef, ManagedCluster, ManagedClusterAADProfile, ManagedClusterAccessProfile, @@ -34,31 +23,27 @@ export { ManagedClusterAgentPoolProfile, ManagedClusterAgentPoolProfileProperties, ManagedClusterAPIServerAccessProfile, + ManagedClusterAutoUpgradeProfile, ManagedClusterIdentity, ManagedClusterIdentityUserAssignedIdentitiesValue, ManagedClusterLoadBalancerProfile, ManagedClusterLoadBalancerProfileManagedOutboundIPs, ManagedClusterLoadBalancerProfileOutboundIPPrefixes, ManagedClusterLoadBalancerProfileOutboundIPs, + ManagedClusterPodIdentity, + ManagedClusterPodIdentityException, + ManagedClusterPodIdentityProfile, + ManagedClusterPodIdentityProvisioningInfo, ManagedClusterPropertiesAutoScalerProfile, ManagedClusterPropertiesIdentityProfileValue, ManagedClusterServicePrincipalProfile, ManagedClusterSKU, ManagedClusterWindowsProfile, - NetworkProfile, - OpenShiftManagedCluster, - OpenShiftManagedClusterAADIdentityProvider, - OpenShiftManagedClusterAgentPoolProfile, - OpenShiftManagedClusterAuthProfile, - OpenShiftManagedClusterBaseIdentityProvider, - OpenShiftManagedClusterIdentityProvider, - OpenShiftManagedClusterMasterPoolProfile, - OpenShiftRouterProfile, + PowerState, PrivateEndpoint, PrivateEndpointConnection, PrivateEndpointConnectionListResult, PrivateLinkServiceConnectionState, - PurchasePlan, Resource, ResourceReference, SubResource, diff --git a/sdk/containerservice/arm-containerservice/src/models/privateLinkResourcesMappers.ts b/sdk/containerservice/arm-containerservice/src/models/privateLinkResourcesMappers.ts new file mode 100644 index 000000000000..2319aa683ccb --- /dev/null +++ b/sdk/containerservice/arm-containerservice/src/models/privateLinkResourcesMappers.ts @@ -0,0 +1,13 @@ +/* + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. + */ + +export { + CloudError, + PrivateLinkResource, + PrivateLinkResourcesListResult +} from "../models/mappers"; diff --git a/sdk/containerservice/arm-containerservice/src/models/resolvePrivateLinkServiceIdMappers.ts b/sdk/containerservice/arm-containerservice/src/models/resolvePrivateLinkServiceIdMappers.ts new file mode 100644 index 000000000000..568b20b5d070 --- /dev/null +++ b/sdk/containerservice/arm-containerservice/src/models/resolvePrivateLinkServiceIdMappers.ts @@ -0,0 +1,12 @@ +/* + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. + */ + +export { + CloudError, + PrivateLinkResource +} from "../models/mappers"; diff --git a/sdk/containerservice/arm-containerservice/src/operations/agentPools.ts b/sdk/containerservice/arm-containerservice/src/operations/agentPools.ts index e883d6d9a83b..4b67fcdc8b5f 100644 --- a/sdk/containerservice/arm-containerservice/src/operations/agentPools.ts +++ b/sdk/containerservice/arm-containerservice/src/operations/agentPools.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -198,6 +197,20 @@ export class AgentPools { callback) as Promise; } + /** + * Upgrade node image version of an agent pool to the latest. + * @summary Upgrade node image version of an agent pool to the latest. + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param agentPoolName The name of the agent pool. + * @param [options] The optional parameters + * @returns Promise + */ + upgradeNodeImageVersion(resourceGroupName: string, resourceName: string, agentPoolName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginUpgradeNodeImageVersion(resourceGroupName,resourceName,agentPoolName,options) + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + } + /** * Creates or updates an agent pool in the specified managed cluster. * @summary Creates or updates an agent pool. @@ -242,6 +255,27 @@ export class AgentPools { options); } + /** + * Upgrade node image version of an agent pool to the latest. + * @summary Upgrade node image version of an agent pool to the latest. + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param agentPoolName The name of the agent pool. + * @param [options] The optional parameters + * @returns Promise + */ + beginUpgradeNodeImageVersion(resourceGroupName: string, resourceName: string, agentPoolName: string, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( + { + resourceGroupName, + resourceName, + agentPoolName, + options + }, + beginUpgradeNodeImageVersionOperationSpec, + options); + } + /** * Gets a list of agent pools in the specified managed cluster. The operation returns properties of * each agent pool. @@ -280,11 +314,11 @@ const listOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -305,12 +339,12 @@ const getOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1, + Parameters.resourceGroupName, + Parameters.resourceName, Parameters.agentPoolName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -331,12 +365,12 @@ const getUpgradeProfileOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/upgradeProfiles/default", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1, + Parameters.resourceGroupName, + Parameters.resourceName, Parameters.agentPoolName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -357,11 +391,11 @@ const getAvailableAgentPoolVersionsOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/availableAgentPoolVersions", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -382,12 +416,12 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1, + Parameters.resourceGroupName, + Parameters.resourceName, Parameters.agentPoolName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -418,12 +452,12 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1, + Parameters.resourceGroupName, + Parameters.resourceName, Parameters.agentPoolName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -438,6 +472,33 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = { serializer }; +const beginUpgradeNodeImageVersionOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/upgradeNodeImageVersion", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.resourceName, + Parameters.agentPoolName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: {}, + 202: { + bodyMapper: Mappers.AgentPool + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + const listNextOperationSpec: msRest.OperationSpec = { httpMethod: "GET", baseUrl: "https://management.azure.com", @@ -445,6 +506,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/containerservice/arm-containerservice/src/operations/containerServices.ts b/sdk/containerservice/arm-containerservice/src/operations/containerServices.ts deleted file mode 100644 index b77a035b47c6..000000000000 --- a/sdk/containerservice/arm-containerservice/src/operations/containerServices.ts +++ /dev/null @@ -1,515 +0,0 @@ -/* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - * - * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is - * regenerated. - */ - -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as Models from "../models"; -import * as Mappers from "../models/containerServicesMappers"; -import * as Parameters from "../models/parameters"; -import { ContainerServiceClientContext } from "../containerServiceClientContext"; - -/** Class representing a ContainerServices. */ -export class ContainerServices { - private readonly client: ContainerServiceClientContext; - - /** - * Create a ContainerServices. - * @param {ContainerServiceClientContext} client Reference to the service client. - */ - constructor(client: ContainerServiceClientContext) { - this.client = client; - } - - /** - * Gets a list of container services in the specified subscription. The operation returns - * properties of each container service including state, orchestrator, number of masters and - * agents, and FQDNs of masters and agents. - * @summary Gets a list of container services in the specified subscription. - * @param [options] The optional parameters - * @deprecated This operation is deprecated. Please do not use it any longer. - * @returns Promise - */ - list(options?: msRest.RequestOptionsBase): Promise; - /** - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - list(callback: msRest.ServiceCallback): void; - /** - * @param options The optional parameters - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - options - }, - listOperationSpec, - callback) as Promise; - } - - /** - * Creates or updates a container service with the specified configuration of orchestrator, - * masters, and agents. - * @summary Creates or updates a container service. - * @param resourceGroupName The name of the resource group. - * @param containerServiceName The name of the container service in the specified subscription and - * resource group. - * @param parameters Parameters supplied to the Create or Update a Container Service operation. - * @param [options] The optional parameters - * @returns Promise - */ - createOrUpdate(resourceGroupName: string, containerServiceName: string, parameters: Models.ContainerService, options?: msRest.RequestOptionsBase): Promise { - return this.beginCreateOrUpdate(resourceGroupName,containerServiceName,parameters,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; - } - - /** - * Gets the properties of the specified container service in the specified subscription and - * resource group. The operation returns the properties including state, orchestrator, number of - * masters and agents, and FQDNs of masters and agents. - * @summary Gets the properties of the specified container service. - * @param resourceGroupName The name of the resource group. - * @param containerServiceName The name of the container service in the specified subscription and - * resource group. - * @param [options] The optional parameters - * @deprecated This operation is deprecated. Please do not use it any longer. - * @returns Promise - */ - get(resourceGroupName: string, containerServiceName: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param resourceGroupName The name of the resource group. - * @param containerServiceName The name of the container service in the specified subscription and - * resource group. - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - get(resourceGroupName: string, containerServiceName: string, callback: msRest.ServiceCallback): void; - /** - * @param resourceGroupName The name of the resource group. - * @param containerServiceName The name of the container service in the specified subscription and - * resource group. - * @param options The optional parameters - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - get(resourceGroupName: string, containerServiceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, containerServiceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - containerServiceName, - options - }, - getOperationSpec, - callback) as Promise; - } - - /** - * Deletes the specified container service in the specified subscription and resource group. The - * operation does not delete other resources created as part of creating a container service, - * including storage accounts, VMs, and availability sets. All the other resources created with the - * container service are part of the same resource group and can be deleted individually. - * @summary Deletes the specified container service. - * @param resourceGroupName The name of the resource group. - * @param containerServiceName The name of the container service in the specified subscription and - * resource group. - * @param [options] The optional parameters - * @returns Promise - */ - deleteMethod(resourceGroupName: string, containerServiceName: string, options?: msRest.RequestOptionsBase): Promise { - return this.beginDeleteMethod(resourceGroupName,containerServiceName,options) - .then(lroPoller => lroPoller.pollUntilFinished()); - } - - /** - * Gets a list of container services in the specified subscription and resource group. The - * operation returns properties of each container service including state, orchestrator, number of - * masters and agents, and FQDNs of masters and agents. - * @summary Gets a list of container services in the specified resource group. - * @param resourceGroupName The name of the resource group. - * @param [options] The optional parameters - * @deprecated This operation is deprecated. Please do not use it any longer. - * @returns Promise - */ - listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param resourceGroupName The name of the resource group. - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - listByResourceGroup(resourceGroupName: string, callback: msRest.ServiceCallback): void; - /** - * @param resourceGroupName The name of the resource group. - * @param options The optional parameters - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - listByResourceGroup(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - options - }, - listByResourceGroupOperationSpec, - callback) as Promise; - } - - /** - * Gets a list of supported orchestrators in the specified subscription. The operation returns - * properties of each orchestrator including version, available upgrades and whether that version - * or upgrades are in preview. - * @summary Gets a list of supported orchestrators in the specified subscription. - * @param location The name of a supported Azure region. - * @param [options] The optional parameters - * @returns Promise - */ - listOrchestrators(location: string, options?: Models.ContainerServicesListOrchestratorsOptionalParams): Promise; - /** - * @param location The name of a supported Azure region. - * @param callback The callback - */ - listOrchestrators(location: string, callback: msRest.ServiceCallback): void; - /** - * @param location The name of a supported Azure region. - * @param options The optional parameters - * @param callback The callback - */ - listOrchestrators(location: string, options: Models.ContainerServicesListOrchestratorsOptionalParams, callback: msRest.ServiceCallback): void; - listOrchestrators(location: string, options?: Models.ContainerServicesListOrchestratorsOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - location, - options - }, - listOrchestratorsOperationSpec, - callback) as Promise; - } - - /** - * Creates or updates a container service with the specified configuration of orchestrator, - * masters, and agents. - * @summary Creates or updates a container service. - * @param resourceGroupName The name of the resource group. - * @param containerServiceName The name of the container service in the specified subscription and - * resource group. - * @param parameters Parameters supplied to the Create or Update a Container Service operation. - * @param [options] The optional parameters - * @returns Promise - */ - beginCreateOrUpdate(resourceGroupName: string, containerServiceName: string, parameters: Models.ContainerService, options?: msRest.RequestOptionsBase): Promise { - return this.client.sendLRORequest( - { - resourceGroupName, - containerServiceName, - parameters, - options - }, - beginCreateOrUpdateOperationSpec, - options); - } - - /** - * Deletes the specified container service in the specified subscription and resource group. The - * operation does not delete other resources created as part of creating a container service, - * including storage accounts, VMs, and availability sets. All the other resources created with the - * container service are part of the same resource group and can be deleted individually. - * @summary Deletes the specified container service. - * @param resourceGroupName The name of the resource group. - * @param containerServiceName The name of the container service in the specified subscription and - * resource group. - * @param [options] The optional parameters - * @returns Promise - */ - beginDeleteMethod(resourceGroupName: string, containerServiceName: string, options?: msRest.RequestOptionsBase): Promise { - return this.client.sendLRORequest( - { - resourceGroupName, - containerServiceName, - options - }, - beginDeleteMethodOperationSpec, - options); - } - - /** - * Gets a list of container services in the specified subscription. The operation returns - * properties of each container service including state, orchestrator, number of masters and - * agents, and FQDNs of masters and agents. - * @summary Gets a list of container services in the specified subscription. - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param [options] The optional parameters - * @deprecated This operation is deprecated. Please do not use it any longer. - * @returns Promise - */ - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - listNext(nextPageLink: string, callback: msRest.ServiceCallback): void; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param options The optional parameters - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - nextPageLink, - options - }, - listNextOperationSpec, - callback) as Promise; - } - - /** - * Gets a list of container services in the specified subscription and resource group. The - * operation returns properties of each container service including state, orchestrator, number of - * masters and agents, and FQDNs of masters and agents. - * @summary Gets a list of container services in the specified resource group. - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param [options] The optional parameters - * @deprecated This operation is deprecated. Please do not use it any longer. - * @returns Promise - */ - listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - listByResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback): void; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param options The optional parameters - * @param callback The callback - * @deprecated This operation is deprecated. Please do not use it any longer. - */ - listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - nextPageLink, - options - }, - listByResourceGroupNextOperationSpec, - callback) as Promise; - } -} - -// Operation Specifications -const serializer = new msRest.Serializer(Mappers); -const listOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/containerServices", - urlParameters: [ - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion1 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.ContainerServiceListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const getOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}", - urlParameters: [ - Parameters.resourceGroupName1, - Parameters.containerServiceName, - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion1 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.ContainerService - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const listByResourceGroupOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices", - urlParameters: [ - Parameters.resourceGroupName1, - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion1 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.ContainerServiceListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const listOrchestratorsOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/orchestrators", - urlParameters: [ - Parameters.subscriptionId, - Parameters.location - ], - queryParameters: [ - Parameters.apiVersion2, - Parameters.resourceType - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.OrchestratorVersionProfileListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { - httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}", - urlParameters: [ - Parameters.resourceGroupName1, - Parameters.containerServiceName, - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion1 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - requestBody: { - parameterPath: "parameters", - mapper: { - ...Mappers.ContainerService, - required: true - } - }, - responses: { - 200: { - bodyMapper: Mappers.ContainerService - }, - 201: { - bodyMapper: Mappers.ContainerService - }, - 202: { - bodyMapper: Mappers.ContainerService - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const beginDeleteMethodOperationSpec: msRest.OperationSpec = { - httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}", - urlParameters: [ - Parameters.resourceGroupName1, - Parameters.containerServiceName, - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion1 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 202: {}, - 204: {}, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const listNextOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - baseUrl: "https://management.azure.com", - path: "{nextLink}", - urlParameters: [ - Parameters.nextPageLink - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.ContainerServiceListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - baseUrl: "https://management.azure.com", - path: "{nextLink}", - urlParameters: [ - Parameters.nextPageLink - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.ContainerServiceListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; diff --git a/sdk/containerservice/arm-containerservice/src/operations/index.ts b/sdk/containerservice/arm-containerservice/src/operations/index.ts index 0d10279e7a1f..2c8ce272439f 100644 --- a/sdk/containerservice/arm-containerservice/src/operations/index.ts +++ b/sdk/containerservice/arm-containerservice/src/operations/index.ts @@ -1,16 +1,15 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is * regenerated. */ -export * from "./openShiftManagedClusters"; -export * from "./containerServices"; export * from "./operations"; export * from "./managedClusters"; export * from "./agentPools"; export * from "./privateEndpointConnections"; +export * from "./privateLinkResources"; +export * from "./resolvePrivateLinkServiceId"; diff --git a/sdk/containerservice/arm-containerservice/src/operations/managedClusters.ts b/sdk/containerservice/arm-containerservice/src/operations/managedClusters.ts index e666f57fc681..a3a0ee7f1249 100644 --- a/sdk/containerservice/arm-containerservice/src/operations/managedClusters.ts +++ b/sdk/containerservice/arm-containerservice/src/operations/managedClusters.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -380,17 +379,29 @@ export class ManagedClusters { } /** - * Upgrade node image version of an agent pool to the latest. - * @summary Upgrade node image version of an agent pool to the latest. + * Stops a Running Managed Cluster + * @summary Stop Managed Cluster * @param resourceGroupName The name of the resource group. * @param resourceName The name of the managed cluster resource. - * @param agentPoolName The name of the agent pool. * @param [options] The optional parameters - * @returns Promise + * @returns Promise + */ + stop(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginStop(resourceGroupName,resourceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()); + } + + /** + * Starts a Stopped Managed Cluster + * @summary Start Managed Cluster + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param [options] The optional parameters + * @returns Promise */ - upgradeNodeImageVersion(resourceGroupName: string, resourceName: string, agentPoolName: string, options?: msRest.RequestOptionsBase): Promise { - return this.beginUpgradeNodeImageVersion(resourceGroupName,resourceName,agentPoolName,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + start(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginStart(resourceGroupName,resourceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()); } /** @@ -518,23 +529,40 @@ export class ManagedClusters { } /** - * Upgrade node image version of an agent pool to the latest. - * @summary Upgrade node image version of an agent pool to the latest. + * Stops a Running Managed Cluster + * @summary Stop Managed Cluster * @param resourceGroupName The name of the resource group. * @param resourceName The name of the managed cluster resource. - * @param agentPoolName The name of the agent pool. * @param [options] The optional parameters * @returns Promise */ - beginUpgradeNodeImageVersion(resourceGroupName: string, resourceName: string, agentPoolName: string, options?: msRest.RequestOptionsBase): Promise { + beginStop(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { return this.client.sendLRORequest( { resourceGroupName, resourceName, - agentPoolName, options }, - beginUpgradeNodeImageVersionOperationSpec, + beginStopOperationSpec, + options); + } + + /** + * Starts a Stopped Managed Cluster + * @summary Start Managed Cluster + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param [options] The optional parameters + * @returns Promise + */ + beginStart(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( + { + resourceGroupName, + resourceName, + options + }, + beginStartOperationSpec, options); } @@ -608,7 +636,7 @@ const listOperationSpec: msRest.OperationSpec = { Parameters.subscriptionId ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -629,10 +657,10 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0 + Parameters.resourceGroupName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -653,11 +681,11 @@ const getUpgradeProfileOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/upgradeProfiles/default", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -678,12 +706,12 @@ const getAccessProfileOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}/listCredential", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1, + Parameters.resourceGroupName, + Parameters.resourceName, Parameters.roleName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -704,11 +732,11 @@ const listClusterAdminCredentialsOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/listClusterAdminCredential", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -729,11 +757,11 @@ const listClusterUserCredentialsOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/listClusterUserCredential", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -754,11 +782,11 @@ const listClusterMonitoringUserCredentialsOperationSpec: msRest.OperationSpec = path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/listClusterMonitoringUserCredential", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -779,11 +807,11 @@ const getOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -804,11 +832,11 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -839,11 +867,11 @@ const beginUpdateTagsOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -871,11 +899,11 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -895,11 +923,11 @@ const beginResetServicePrincipalProfileOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resetServicePrincipalProfile", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -926,11 +954,11 @@ const beginResetAADProfileOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resetAADProfile", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -957,11 +985,11 @@ const beginRotateClusterCertificatesOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/rotateClusterCertificates", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -976,26 +1004,47 @@ const beginRotateClusterCertificatesOperationSpec: msRest.OperationSpec = { serializer }; -const beginUpgradeNodeImageVersionOperationSpec: msRest.OperationSpec = { +const beginStopOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/upgradeNodeImageVersion", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/stop", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1, - Parameters.agentPoolName + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage ], responses: { - 200: {}, - 202: { - bodyMapper: Mappers.AgentPool - }, + 202: {}, + 204: {}, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const beginStartOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/start", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.resourceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 202: {}, + 204: {}, default: { bodyMapper: Mappers.CloudError } @@ -1010,6 +1059,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -1031,6 +1083,9 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/containerservice/arm-containerservice/src/operations/openShiftManagedClusters.ts b/sdk/containerservice/arm-containerservice/src/operations/openShiftManagedClusters.ts deleted file mode 100644 index 7571389a4111..000000000000 --- a/sdk/containerservice/arm-containerservice/src/operations/openShiftManagedClusters.ts +++ /dev/null @@ -1,491 +0,0 @@ -/* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - * - * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is - * regenerated. - */ - -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as Models from "../models"; -import * as Mappers from "../models/openShiftManagedClustersMappers"; -import * as Parameters from "../models/parameters"; -import { ContainerServiceClientContext } from "../containerServiceClientContext"; - -/** Class representing a OpenShiftManagedClusters. */ -export class OpenShiftManagedClusters { - private readonly client: ContainerServiceClientContext; - - /** - * Create a OpenShiftManagedClusters. - * @param {ContainerServiceClientContext} client Reference to the service client. - */ - constructor(client: ContainerServiceClientContext) { - this.client = client; - } - - /** - * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns - * properties of each OpenShift managed cluster. - * @summary Gets a list of OpenShift managed clusters in the specified subscription. - * @param [options] The optional parameters - * @returns Promise - */ - list(options?: msRest.RequestOptionsBase): Promise; - /** - * @param callback The callback - */ - list(callback: msRest.ServiceCallback): void; - /** - * @param options The optional parameters - * @param callback The callback - */ - list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - options - }, - listOperationSpec, - callback) as Promise; - } - - /** - * Lists OpenShift managed clusters in the specified subscription and resource group. The operation - * returns properties of each OpenShift managed cluster. - * @summary Lists OpenShift managed clusters in the specified subscription and resource group. - * @param resourceGroupName The name of the resource group. - * @param [options] The optional parameters - * @returns Promise - */ - listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param resourceGroupName The name of the resource group. - * @param callback The callback - */ - listByResourceGroup(resourceGroupName: string, callback: msRest.ServiceCallback): void; - /** - * @param resourceGroupName The name of the resource group. - * @param options The optional parameters - * @param callback The callback - */ - listByResourceGroup(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - options - }, - listByResourceGroupOperationSpec, - callback) as Promise; - } - - /** - * Gets the details of the managed OpenShift cluster with a specified resource group and name. - * @summary Gets a OpenShift managed cluster. - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the OpenShift managed cluster resource. - * @param [options] The optional parameters - * @returns Promise - */ - get(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the OpenShift managed cluster resource. - * @param callback The callback - */ - get(resourceGroupName: string, resourceName: string, callback: msRest.ServiceCallback): void; - /** - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the OpenShift managed cluster resource. - * @param options The optional parameters - * @param callback The callback - */ - get(resourceGroupName: string, resourceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - resourceName, - options - }, - getOperationSpec, - callback) as Promise; - } - - /** - * Creates or updates a OpenShift managed cluster with the specified configuration for agents and - * OpenShift version. - * @summary Creates or updates an OpenShift managed cluster. - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the OpenShift managed cluster resource. - * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster - * operation. - * @param [options] The optional parameters - * @returns Promise - */ - createOrUpdate(resourceGroupName: string, resourceName: string, parameters: Models.OpenShiftManagedCluster, options?: msRest.RequestOptionsBase): Promise { - return this.beginCreateOrUpdate(resourceGroupName,resourceName,parameters,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; - } - - /** - * Updates an OpenShift managed cluster with the specified tags. - * @summary Updates tags on an OpenShift managed cluster. - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the OpenShift managed cluster resource. - * @param parameters Parameters supplied to the Update OpenShift Managed Cluster Tags operation. - * @param [options] The optional parameters - * @returns Promise - */ - updateTags(resourceGroupName: string, resourceName: string, parameters: Models.TagsObject, options?: msRest.RequestOptionsBase): Promise { - return this.beginUpdateTags(resourceGroupName,resourceName,parameters,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; - } - - /** - * Deletes the OpenShift managed cluster with a specified resource group and name. - * @summary Deletes an OpenShift managed cluster. - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the OpenShift managed cluster resource. - * @param [options] The optional parameters - * @returns Promise - */ - deleteMethod(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { - return this.beginDeleteMethod(resourceGroupName,resourceName,options) - .then(lroPoller => lroPoller.pollUntilFinished()); - } - - /** - * Creates or updates a OpenShift managed cluster with the specified configuration for agents and - * OpenShift version. - * @summary Creates or updates an OpenShift managed cluster. - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the OpenShift managed cluster resource. - * @param parameters Parameters supplied to the Create or Update an OpenShift Managed Cluster - * operation. - * @param [options] The optional parameters - * @returns Promise - */ - beginCreateOrUpdate(resourceGroupName: string, resourceName: string, parameters: Models.OpenShiftManagedCluster, options?: msRest.RequestOptionsBase): Promise { - return this.client.sendLRORequest( - { - resourceGroupName, - resourceName, - parameters, - options - }, - beginCreateOrUpdateOperationSpec, - options); - } - - /** - * Updates an OpenShift managed cluster with the specified tags. - * @summary Updates tags on an OpenShift managed cluster. - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the OpenShift managed cluster resource. - * @param parameters Parameters supplied to the Update OpenShift Managed Cluster Tags operation. - * @param [options] The optional parameters - * @returns Promise - */ - beginUpdateTags(resourceGroupName: string, resourceName: string, parameters: Models.TagsObject, options?: msRest.RequestOptionsBase): Promise { - return this.client.sendLRORequest( - { - resourceGroupName, - resourceName, - parameters, - options - }, - beginUpdateTagsOperationSpec, - options); - } - - /** - * Deletes the OpenShift managed cluster with a specified resource group and name. - * @summary Deletes an OpenShift managed cluster. - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the OpenShift managed cluster resource. - * @param [options] The optional parameters - * @returns Promise - */ - beginDeleteMethod(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise { - return this.client.sendLRORequest( - { - resourceGroupName, - resourceName, - options - }, - beginDeleteMethodOperationSpec, - options); - } - - /** - * Gets a list of OpenShift managed clusters in the specified subscription. The operation returns - * properties of each OpenShift managed cluster. - * @summary Gets a list of OpenShift managed clusters in the specified subscription. - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param [options] The optional parameters - * @returns Promise - */ - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param callback The callback - */ - listNext(nextPageLink: string, callback: msRest.ServiceCallback): void; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param options The optional parameters - * @param callback The callback - */ - listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - nextPageLink, - options - }, - listNextOperationSpec, - callback) as Promise; - } - - /** - * Lists OpenShift managed clusters in the specified subscription and resource group. The operation - * returns properties of each OpenShift managed cluster. - * @summary Lists OpenShift managed clusters in the specified subscription and resource group. - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param [options] The optional parameters - * @returns Promise - */ - listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param callback The callback - */ - listByResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback): void; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param options The optional parameters - * @param callback The callback - */ - listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - nextPageLink, - options - }, - listByResourceGroupNextOperationSpec, - callback) as Promise; - } -} - -// Operation Specifications -const serializer = new msRest.Serializer(Mappers); -const listOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/openShiftManagedClusters", - urlParameters: [ - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion0 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.OpenShiftManagedClusterListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const listByResourceGroupOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters", - urlParameters: [ - Parameters.subscriptionId, - Parameters.resourceGroupName0 - ], - queryParameters: [ - Parameters.apiVersion0 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.OpenShiftManagedClusterListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const getOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}", - urlParameters: [ - Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName0 - ], - queryParameters: [ - Parameters.apiVersion0 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.OpenShiftManagedCluster - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { - httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}", - urlParameters: [ - Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName0 - ], - queryParameters: [ - Parameters.apiVersion0 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - requestBody: { - parameterPath: "parameters", - mapper: { - ...Mappers.OpenShiftManagedCluster, - required: true - } - }, - responses: { - 200: { - bodyMapper: Mappers.OpenShiftManagedCluster - }, - 201: { - bodyMapper: Mappers.OpenShiftManagedCluster - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const beginUpdateTagsOperationSpec: msRest.OperationSpec = { - httpMethod: "PATCH", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}", - urlParameters: [ - Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName0 - ], - queryParameters: [ - Parameters.apiVersion0 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - requestBody: { - parameterPath: "parameters", - mapper: { - ...Mappers.TagsObject, - required: true - } - }, - responses: { - 200: { - bodyMapper: Mappers.OpenShiftManagedCluster - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const beginDeleteMethodOperationSpec: msRest.OperationSpec = { - httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}", - urlParameters: [ - Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName0 - ], - queryParameters: [ - Parameters.apiVersion0 - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 202: {}, - 204: {}, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const listNextOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - baseUrl: "https://management.azure.com", - path: "{nextLink}", - urlParameters: [ - Parameters.nextPageLink - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.OpenShiftManagedClusterListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; - -const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - baseUrl: "https://management.azure.com", - path: "{nextLink}", - urlParameters: [ - Parameters.nextPageLink - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.OpenShiftManagedClusterListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; diff --git a/sdk/containerservice/arm-containerservice/src/operations/operations.ts b/sdk/containerservice/arm-containerservice/src/operations/operations.ts index 3d409d17f22c..2d8bd37661b9 100644 --- a/sdk/containerservice/arm-containerservice/src/operations/operations.ts +++ b/sdk/containerservice/arm-containerservice/src/operations/operations.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -57,7 +56,7 @@ const listOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "providers/Microsoft.ContainerService/operations", queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage diff --git a/sdk/containerservice/arm-containerservice/src/operations/privateEndpointConnections.ts b/sdk/containerservice/arm-containerservice/src/operations/privateEndpointConnections.ts index 5c4e4237a306..4da23b229813 100644 --- a/sdk/containerservice/arm-containerservice/src/operations/privateEndpointConnections.ts +++ b/sdk/containerservice/arm-containerservice/src/operations/privateEndpointConnections.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -182,11 +181,11 @@ const listOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/privateEndpointConnections", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1 + Parameters.resourceGroupName, + Parameters.resourceName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -207,12 +206,12 @@ const getOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/privateEndpointConnections/{privateEndpointConnectionName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1, + Parameters.resourceGroupName, + Parameters.resourceName, Parameters.privateEndpointConnectionName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -233,12 +232,12 @@ const updateOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/privateEndpointConnections/{privateEndpointConnectionName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1, + Parameters.resourceGroupName, + Parameters.resourceName, Parameters.privateEndpointConnectionName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage @@ -266,12 +265,12 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = { path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/privateEndpointConnections/{privateEndpointConnectionName}", urlParameters: [ Parameters.subscriptionId, - Parameters.resourceGroupName0, - Parameters.resourceName1, + Parameters.resourceGroupName, + Parameters.resourceName, Parameters.privateEndpointConnectionName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage diff --git a/sdk/containerservice/arm-containerservice/src/operations/privateLinkResources.ts b/sdk/containerservice/arm-containerservice/src/operations/privateLinkResources.ts new file mode 100644 index 000000000000..652594840b00 --- /dev/null +++ b/sdk/containerservice/arm-containerservice/src/operations/privateLinkResources.ts @@ -0,0 +1,88 @@ +/* + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +import * as msRest from "@azure/ms-rest-js"; +import * as Models from "../models"; +import * as Mappers from "../models/privateLinkResourcesMappers"; +import * as Parameters from "../models/parameters"; +import { ContainerServiceClientContext } from "../containerServiceClientContext"; + +/** Class representing a PrivateLinkResources. */ +export class PrivateLinkResources { + private readonly client: ContainerServiceClientContext; + + /** + * Create a PrivateLinkResources. + * @param {ContainerServiceClientContext} client Reference to the service client. + */ + constructor(client: ContainerServiceClientContext) { + this.client = client; + } + + /** + * Gets a list of private link resources in the specified managed cluster. The operation returns + * properties of each private link resource. + * @summary Gets a list of private link resources in the specified managed cluster. + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param [options] The optional parameters + * @returns Promise + */ + list(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param callback The callback + */ + list(resourceGroupName: string, resourceName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param options The optional parameters + * @param callback The callback + */ + list(resourceGroupName: string, resourceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, resourceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + resourceName, + options + }, + listOperationSpec, + callback) as Promise; + } +} + +// Operation Specifications +const serializer = new msRest.Serializer(Mappers); +const listOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/privateLinkResources", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.resourceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.PrivateLinkResourcesListResult + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; diff --git a/sdk/containerservice/arm-containerservice/src/operations/resolvePrivateLinkServiceId.ts b/sdk/containerservice/arm-containerservice/src/operations/resolvePrivateLinkServiceId.ts new file mode 100644 index 000000000000..c23d10a99b32 --- /dev/null +++ b/sdk/containerservice/arm-containerservice/src/operations/resolvePrivateLinkServiceId.ts @@ -0,0 +1,101 @@ +/* + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +import * as msRest from "@azure/ms-rest-js"; +import * as Models from "../models"; +import * as Mappers from "../models/resolvePrivateLinkServiceIdMappers"; +import * as Parameters from "../models/parameters"; +import { ContainerServiceClientContext } from "../containerServiceClientContext"; + +/** Class representing a ResolvePrivateLinkServiceId. */ +export class ResolvePrivateLinkServiceId { + private readonly client: ContainerServiceClientContext; + + /** + * Create a ResolvePrivateLinkServiceId. + * @param {ContainerServiceClientContext} client Reference to the service client. + */ + constructor(client: ContainerServiceClientContext) { + this.client = client; + } + + /** + * Gets the private link service ID the specified managed cluster. + * @summary Gets the private link service ID for the specified managed cluster. + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param parameters Parameters (name, groupId) supplied in order to resolve a private link service + * ID. + * @param [options] The optional parameters + * @returns Promise + */ + pOST(resourceGroupName: string, resourceName: string, parameters: Models.PrivateLinkResource, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param parameters Parameters (name, groupId) supplied in order to resolve a private link service + * ID. + * @param callback The callback + */ + pOST(resourceGroupName: string, resourceName: string, parameters: Models.PrivateLinkResource, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. + * @param resourceName The name of the managed cluster resource. + * @param parameters Parameters (name, groupId) supplied in order to resolve a private link service + * ID. + * @param options The optional parameters + * @param callback The callback + */ + pOST(resourceGroupName: string, resourceName: string, parameters: Models.PrivateLinkResource, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + pOST(resourceGroupName: string, resourceName: string, parameters: Models.PrivateLinkResource, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + resourceName, + parameters, + options + }, + pOSTOperationSpec, + callback) as Promise; + } +} + +// Operation Specifications +const serializer = new msRest.Serializer(Mappers); +const pOSTOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resolvePrivateLinkServiceId", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.resourceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + requestBody: { + parameterPath: "parameters", + mapper: { + ...Mappers.PrivateLinkResource, + required: true + } + }, + responses: { + 200: { + bodyMapper: Mappers.PrivateLinkResource + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +};