From af0330bea57b9c724641b2a333d019e1c2be9210 Mon Sep 17 00:00:00 2001 From: colawwj <70128817+colawwj@users.noreply.github.com> Date: Wed, 29 Sep 2021 09:43:35 +0800 Subject: [PATCH] containerinstance-track1 (#17866) --- .../arm-containerinstance/package.json | 2 +- ...ontainerInstanceManagementClientContext.ts | 4 +- .../src/models/containerGroupsMappers.ts | 4 +- .../arm-containerinstance/src/models/index.ts | 50 +++++++++++--- .../src/models/mappers.ts | 59 +++++++++++----- .../src/operations/containerGroups.ts | 69 +++++++++++++++++++ .../src/operations/containers.ts | 2 +- 7 files changed, 157 insertions(+), 33 deletions(-) diff --git a/sdk/containerinstance/arm-containerinstance/package.json b/sdk/containerinstance/arm-containerinstance/package.json index 7af23df6c9d6..9cc5ae22d2fa 100644 --- a/sdk/containerinstance/arm-containerinstance/package.json +++ b/sdk/containerinstance/arm-containerinstance/package.json @@ -2,7 +2,7 @@ "name": "@azure/arm-containerinstance", "author": "Microsoft Corporation", "description": "ContainerInstanceManagementClient Library with typescript type definitions for node.js and browser.", - "version": "6.3.0", + "version": "7.0.0", "dependencies": { "@azure/ms-rest-azure-js": "^2.1.0", "@azure/ms-rest-js": "^2.2.0", diff --git a/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClientContext.ts b/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClientContext.ts index f0c300eae755..f5d97f870b5b 100644 --- a/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClientContext.ts +++ b/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClientContext.ts @@ -13,7 +13,7 @@ import * as msRestAzure from "@azure/ms-rest-azure-js"; import { TokenCredential } from "@azure/core-auth"; const packageName = "@azure/arm-containerinstance"; -const packageVersion = "6.3.0"; +const packageVersion = "7.0.0"; export class ContainerInstanceManagementClientContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials | TokenCredential; @@ -50,7 +50,7 @@ export class ContainerInstanceManagementClientContext extends msRestAzure.AzureS super(credentials, options); - this.apiVersion = '2021-03-01'; + this.apiVersion = '2021-07-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; diff --git a/sdk/containerinstance/arm-containerinstance/src/models/containerGroupsMappers.ts b/sdk/containerinstance/arm-containerinstance/src/models/containerGroupsMappers.ts index 53d30b744762..a83a1f216fba 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/containerGroupsMappers.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/containerGroupsMappers.ts @@ -17,8 +17,8 @@ export { ContainerGroupIdentity, ContainerGroupIdentityUserAssignedIdentitiesValue, ContainerGroupListResult, - ContainerGroupNetworkProfile, ContainerGroupPropertiesInstanceView, + ContainerGroupSubnetId, ContainerHttpGet, ContainerPort, ContainerProbe, @@ -30,7 +30,7 @@ export { Event, GitRepoVolume, GpuResource, - HttpHeaders, + HttpHeader, ImageRegistryCredential, InitContainerDefinition, InitContainerPropertiesDefinitionInstanceView, diff --git a/sdk/containerinstance/arm-containerinstance/src/models/index.ts b/sdk/containerinstance/arm-containerinstance/src/models/index.ts index 7ce98ccfbdc8..8884ea47ddbb 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/index.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/index.ts @@ -229,9 +229,9 @@ export interface ContainerExec { } /** - * The HTTP headers. + * The HTTP header. */ -export interface HttpHeaders { +export interface HttpHeader { /** * The header name. */ @@ -261,7 +261,7 @@ export interface ContainerHttpGet { /** * The HTTP headers. */ - httpHeaders?: HttpHeaders; + httpHeaders?: HttpHeader[]; } /** @@ -476,6 +476,14 @@ export interface ImageRegistryCredential { * The password for the private registry. */ password?: string; + /** + * The identity for the private registry. + */ + identity?: string; + /** + * The identity URL for the private registry. + */ + identityUrl?: string; } /** @@ -559,7 +567,7 @@ export interface LogAnalytics { /** * The workspace resource id for log analytics */ - workspaceResourceId?: { [propertyName: string]: string }; + workspaceResourceId?: string; } /** @@ -573,13 +581,17 @@ export interface ContainerGroupDiagnostics { } /** - * Container group network profile information. + * Container group subnet information. */ -export interface ContainerGroupNetworkProfile { +export interface ContainerGroupSubnetId { /** - * The identifier for a network profile. + * Resource ID of virtual network and subnet. */ id: string; + /** + * Friendly name for the subnet. + */ + name?: string; } /** @@ -756,9 +768,9 @@ export interface ContainerGroup extends Resource { */ diagnostics?: ContainerGroupDiagnostics; /** - * The network profile information for a container group. + * The subnet resource IDs for a container group. */ - networkProfile?: ContainerGroupNetworkProfile; + subnetIds?: ContainerGroupSubnetId[]; /** * The DNS config information for a container group. */ @@ -1289,6 +1301,26 @@ export type ContainerGroupsDeleteMethodResponse = ContainerGroup & { }; }; +/** + * Contains response data for the getOutboundNetworkDependenciesEndpoints operation. + */ +export type ContainerGroupsGetOutboundNetworkDependenciesEndpointsResponse = Array & { + /** + * 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: string[]; + }; +}; + /** * Contains response data for the beginCreateOrUpdate operation. */ diff --git a/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts b/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts index 31a466e5b32d..4f8be21e173f 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts @@ -367,11 +367,11 @@ export const ContainerExec: msRest.CompositeMapper = { } }; -export const HttpHeaders: msRest.CompositeMapper = { - serializedName: "HttpHeaders", +export const HttpHeader: msRest.CompositeMapper = { + serializedName: "HttpHeader", type: { name: "Composite", - className: "HttpHeaders", + className: "HttpHeader", modelProperties: { name: { serializedName: "name", @@ -417,8 +417,13 @@ export const ContainerHttpGet: msRest.CompositeMapper = { httpHeaders: { serializedName: "httpHeaders", type: { - name: "Composite", - className: "HttpHeaders" + name: "Sequence", + element: { + type: { + name: "Composite", + className: "HttpHeader" + } + } } } } @@ -790,6 +795,18 @@ export const ImageRegistryCredential: msRest.CompositeMapper = { type: { name: "String" } + }, + identity: { + serializedName: "identity", + type: { + name: "String" + } + }, + identityUrl: { + serializedName: "identityUrl", + type: { + name: "String" + } } } } @@ -937,12 +954,7 @@ export const LogAnalytics: msRest.CompositeMapper = { workspaceResourceId: { serializedName: "workspaceResourceId", type: { - name: "Dictionary", - value: { - type: { - name: "String" - } - } + name: "String" } } } @@ -966,11 +978,11 @@ export const ContainerGroupDiagnostics: msRest.CompositeMapper = { } }; -export const ContainerGroupNetworkProfile: msRest.CompositeMapper = { - serializedName: "ContainerGroupNetworkProfile", +export const ContainerGroupSubnetId: msRest.CompositeMapper = { + serializedName: "ContainerGroupSubnetId", type: { name: "Composite", - className: "ContainerGroupNetworkProfile", + className: "ContainerGroupSubnetId", modelProperties: { id: { required: true, @@ -978,6 +990,12 @@ export const ContainerGroupNetworkProfile: msRest.CompositeMapper = { type: { name: "String" } + }, + name: { + serializedName: "name", + type: { + name: "String" + } } } } @@ -1301,11 +1319,16 @@ export const ContainerGroup: msRest.CompositeMapper = { className: "ContainerGroupDiagnostics" } }, - networkProfile: { - serializedName: "properties.networkProfile", + subnetIds: { + serializedName: "properties.subnetIds", type: { - name: "Composite", - className: "ContainerGroupNetworkProfile" + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ContainerGroupSubnetId" + } + } } }, dnsConfig: { diff --git a/sdk/containerinstance/arm-containerinstance/src/operations/containerGroups.ts b/sdk/containerinstance/arm-containerinstance/src/operations/containerGroups.ts index ea5c1289b758..3b70a6501060 100644 --- a/sdk/containerinstance/arm-containerinstance/src/operations/containerGroups.ts +++ b/sdk/containerinstance/arm-containerinstance/src/operations/containerGroups.ts @@ -246,6 +246,40 @@ export class ContainerGroups { .then(lroPoller => lroPoller.pollUntilFinished()); } + /** + * Gets all the network dependencies for this container group to allow complete control of network + * setting and configuration. For container groups, this will always be an empty list. + * @summary Get all network dependencies for container group. + * @param resourceGroupName The name of the resource group. + * @param containerGroupName The name of the container group. + * @param [options] The optional parameters + * @returns Promise + */ + getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. + * @param containerGroupName The name of the container group. + * @param callback The callback + */ + getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. + * @param containerGroupName The name of the container group. + * @param options The optional parameters + * @param callback The callback + */ + getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + containerGroupName, + options + }, + getOutboundNetworkDependenciesEndpointsOperationSpec, + callback) as Promise; + } + /** * Create or update container groups with specified configurations. * @summary Create or update container groups. @@ -519,6 +553,41 @@ const stopOperationSpec: msRest.OperationSpec = { serializer }; +const getOutboundNetworkDependenciesEndpointsOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/outboundNetworkDependenciesEndpoints", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.containerGroupName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: { + serializedName: "parsedResponse", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + } + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}", diff --git a/sdk/containerinstance/arm-containerinstance/src/operations/containers.ts b/sdk/containerinstance/arm-containerinstance/src/operations/containers.ts index 7688c71254e1..57973cbfbe58 100644 --- a/sdk/containerinstance/arm-containerinstance/src/operations/containers.ts +++ b/sdk/containerinstance/arm-containerinstance/src/operations/containers.ts @@ -209,7 +209,7 @@ const executeCommandOperationSpec: msRest.OperationSpec = { const attachOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/containers/{containerName}/attach", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups/{containerGroupName}/containers/{containerName}/attach", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName,