From 93fba30f1671b4ee10fd1549a64b9ee5e52e6e01 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 27 Mar 2023 15:02:16 +0000 Subject: [PATCH] CodeGen from PR 23221 in Azure/azure-rest-api-specs Merge 2f2f786c11fa976e5d10ddf2729fdd560b818de9 into efd2b52bcf2b06e174f7008b2728f70ee7f972bd --- common/config/rush/pnpm-lock.yaml | 5 +- .../arm-containerinstance/CHANGELOG.md | 24 ++--- .../arm-containerinstance/_meta.json | 8 +- .../arm-containerinstance/package.json | 18 ++-- .../review/arm-containerinstance.api.md | 42 ++++----- .../src/containerInstanceManagementClient.ts | 2 +- .../arm-containerinstance/src/lroImpl.ts | 54 ++++++----- .../arm-containerinstance/src/models/index.ts | 60 ++++++------- .../src/models/mappers.ts | 41 +++------ .../src/models/parameters.ts | 2 +- .../src/operations/containerGroups.ts | 90 ++++++++++--------- .../subnetServiceAssociationLink.ts | 26 +++--- .../operationsInterfaces/containerGroups.ts | 14 +-- .../subnetServiceAssociationLink.ts | 4 +- .../arm-containerinstance/test/sampleTest.ts | 43 +++++++++ .../arm-containerinstance/tsconfig.json | 10 +-- 16 files changed, 228 insertions(+), 215 deletions(-) create mode 100644 sdk/containerinstance/arm-containerinstance/test/sampleTest.ts diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 5603c042c148..b6c76274f7ea 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -734,6 +734,7 @@ packages: /@azure/ai-form-recognizer/3.1.0-beta.3: resolution: {integrity: sha512-+4QtFKNyxAmdqpcYjuAtmWKm/MuOe9kZsbpS9jA9h0YHzngNj5gc67AA4egV9BXOq9x+1phjYTNC/rxiOUr1uQ==} engines: {node: '>=8.0.0'} + deprecated: Please migrate to a supported (non-beta) version of this package dependencies: '@azure/core-auth': 1.4.0 '@azure/core-http': 1.2.6 @@ -11065,7 +11066,7 @@ packages: dev: false file:projects/arm-containerinstance.tgz: - resolution: {integrity: sha512-DK5ZdqF5eYbp2Zr/AiG+GuTavFBCeGB0ovWcehz4BaZXHWpbavDhVMXW2AgIIHlx6i9AUlVaGRrGbB3NPObhZQ==, tarball: file:projects/arm-containerinstance.tgz} + resolution: {integrity: sha512-J0w6H3a4pTQt8JfPPVVuidUoZADRzjP7CweTua3ZltyvQcWhkYguiLJqHKtLMPhFKJ7n3U6pRCU+xGT1i/fOlg==, tarball: file:projects/arm-containerinstance.tgz} name: '@rush-temp/arm-containerinstance' version: 0.0.0 dependencies: @@ -11080,7 +11081,7 @@ packages: chai: 4.3.7 cross-env: 7.0.3 dotenv: 16.0.3 - mkdirp: 1.0.4 + mkdirp: 2.1.5 mocha: 7.2.0 rimraf: 3.0.2 rollup: 2.79.1 diff --git a/sdk/containerinstance/arm-containerinstance/CHANGELOG.md b/sdk/containerinstance/arm-containerinstance/CHANGELOG.md index 786c62ca5182..6af8cfa102f2 100644 --- a/sdk/containerinstance/arm-containerinstance/CHANGELOG.md +++ b/sdk/containerinstance/arm-containerinstance/CHANGELOG.md @@ -1,28 +1,16 @@ # Release History - -## 9.1.0-beta.2 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - -## 9.1.0-beta.1 (2023-01-13) + +## 9.1.0-beta.2 (2023-03-27) **Features** - - Added Interface ConfidentialComputeProperties - Added Interface DeploymentExtensionSpec - - Added Type Alias ContainerGroupPriority - - Interface ContainerGroupProperties has a new optional parameter confidentialComputeProperties + - Added Type Alias IsCustomProvisioningTimeout - Interface ContainerGroupProperties has a new optional parameter extensions - - Interface ContainerGroupProperties has a new optional parameter priority + - Interface ContainerGroupProperties has a new optional parameter isCustomProvisioningTimeout + - Interface ContainerGroupProperties has a new optional parameter provisioningTimeoutInSeconds - Interface EncryptionProperties has a new optional parameter identity - - Added Enum KnownContainerGroupPriority - - Enum KnownContainerGroupSku has a new value Confidential + - Added Enum KnownIsCustomProvisioningTimeout - Added function getContinuationToken diff --git a/sdk/containerinstance/arm-containerinstance/_meta.json b/sdk/containerinstance/arm-containerinstance/_meta.json index 5b188d8427ca..85ed064ed42b 100644 --- a/sdk/containerinstance/arm-containerinstance/_meta.json +++ b/sdk/containerinstance/arm-containerinstance/_meta.json @@ -1,8 +1,8 @@ { - "commit": "3f36931e7edfce60595fd5558a722e0230a44eb1", + "commit": "7efe20700592916a0ce1f8a80ff941e70712a8b2", "readme": "specification/containerinstance/resource-manager/readme.md", - "autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=F:\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\containerinstance\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.7 --generate-sample=true", + "autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/containerinstance/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.10", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.5.4", - "use": "@autorest/typescript@6.0.0-rc.7" + "release_tool": "@azure-tools/js-sdk-release-tools@2.7.0", + "use": "@autorest/typescript@6.0.0-rc.10" } \ No newline at end of file diff --git a/sdk/containerinstance/arm-containerinstance/package.json b/sdk/containerinstance/arm-containerinstance/package.json index d51cb02b68c8..1b5bf452fbc1 100644 --- a/sdk/containerinstance/arm-containerinstance/package.json +++ b/sdk/containerinstance/arm-containerinstance/package.json @@ -8,10 +8,10 @@ "node": ">=14.0.0" }, "dependencies": { - "@azure/core-lro": "^2.2.0", + "@azure/core-lro": "^2.5.0", "@azure/abort-controller": "^1.0.0", "@azure/core-paging": "^1.2.0", - "@azure/core-client": "^1.6.1", + "@azure/core-client": "^1.7.0", "@azure/core-auth": "^1.3.0", "@azure/core-rest-pipeline": "^1.8.0", "tslib": "^2.2.0" @@ -33,7 +33,7 @@ "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-multi-entry": "^6.0.0", "@rollup/plugin-node-resolve": "^13.1.3", - "mkdirp": "^1.0.4", + "mkdirp": "^2.1.2", "rollup": "^2.66.1", "rollup-plugin-sourcemaps": "^0.6.3", "typescript": "~4.8.0", @@ -111,13 +111,5 @@ ] }, "autoPublish": true, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/containerinstance/arm-containerinstance", - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-containerinstance?view=azure-node-preview" - } -} + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/containerinstance/arm-containerinstance" +} \ No newline at end of file diff --git a/sdk/containerinstance/arm-containerinstance/review/arm-containerinstance.api.md b/sdk/containerinstance/arm-containerinstance/review/arm-containerinstance.api.md index 6724f44ec769..d5b700ee3a6d 100644 --- a/sdk/containerinstance/arm-containerinstance/review/arm-containerinstance.api.md +++ b/sdk/containerinstance/arm-containerinstance/review/arm-containerinstance.api.md @@ -6,9 +6,9 @@ import * as coreAuth from '@azure/core-auth'; import * as coreClient from '@azure/core-client'; +import { OperationState } from '@azure/core-lro'; import { PagedAsyncIterableIterator } from '@azure/core-paging'; -import { PollerLike } from '@azure/core-lro'; -import { PollOperationState } from '@azure/core-lro'; +import { SimplePollerLike } from '@azure/core-lro'; // @public export interface AzureFileVolume { @@ -66,11 +66,6 @@ export interface CloudErrorBody { target?: string; } -// @public -export interface ConfidentialComputeProperties { - ccePolicy?: string; -} - // @public export interface Container { command?: string[]; @@ -145,12 +140,8 @@ export interface ContainerGroupListResult { // @public export type ContainerGroupNetworkProtocol = string; -// @public -export type ContainerGroupPriority = string; - // @public export interface ContainerGroupProperties { - confidentialComputeProperties?: ConfidentialComputeProperties; containers: Container[]; diagnostics?: ContainerGroupDiagnostics; dnsConfig?: DnsConfiguration; @@ -161,9 +152,10 @@ export interface ContainerGroupProperties { initContainers?: InitContainerDefinition[]; readonly instanceView?: ContainerGroupPropertiesInstanceView; ipAddress?: IpAddress; + readonly isCustomProvisioningTimeout?: IsCustomProvisioningTimeout; osType: OperatingSystemTypes; - priority?: ContainerGroupPriority; readonly provisioningState?: string; + provisioningTimeoutInSeconds?: number; restartPolicy?: ContainerGroupRestartPolicy; sku?: ContainerGroupSku; subnetIds?: ContainerGroupSubnetId[]; @@ -181,13 +173,13 @@ export type ContainerGroupRestartPolicy = string; // @public export interface ContainerGroups { - beginCreateOrUpdate(resourceGroupName: string, containerGroupName: string, containerGroup: ContainerGroup, options?: ContainerGroupsCreateOrUpdateOptionalParams): Promise, ContainerGroupsCreateOrUpdateResponse>>; + beginCreateOrUpdate(resourceGroupName: string, containerGroupName: string, containerGroup: ContainerGroup, options?: ContainerGroupsCreateOrUpdateOptionalParams): Promise, ContainerGroupsCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(resourceGroupName: string, containerGroupName: string, containerGroup: ContainerGroup, options?: ContainerGroupsCreateOrUpdateOptionalParams): Promise; - beginDelete(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsDeleteOptionalParams): Promise, ContainerGroupsDeleteResponse>>; + beginDelete(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsDeleteOptionalParams): Promise, ContainerGroupsDeleteResponse>>; beginDeleteAndWait(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsDeleteOptionalParams): Promise; - beginRestart(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsRestartOptionalParams): Promise, void>>; + beginRestart(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsRestartOptionalParams): Promise, void>>; beginRestartAndWait(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsRestartOptionalParams): Promise; - beginStart(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsStartOptionalParams): Promise, void>>; + beginStart(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsStartOptionalParams): Promise, void>>; beginStartAndWait(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsStartOptionalParams): Promise; get(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsGetOptionalParams): Promise; getOutboundNetworkDependenciesEndpoints(resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsGetOutboundNetworkDependenciesEndpointsOptionalParams): Promise; @@ -504,6 +496,9 @@ export interface IpAddress { type: ContainerGroupIpAddressType; } +// @public +export type IsCustomProvisioningTimeout = string; + // @public export enum KnownContainerGroupIpAddressType { Private = "Private", @@ -516,12 +511,6 @@ export enum KnownContainerGroupNetworkProtocol { UDP = "UDP" } -// @public -export enum KnownContainerGroupPriority { - Regular = "Regular", - Spot = "Spot" -} - // @public export enum KnownContainerGroupRestartPolicy { Always = "Always", @@ -531,7 +520,6 @@ export enum KnownContainerGroupRestartPolicy { // @public export enum KnownContainerGroupSku { - Confidential = "Confidential", Dedicated = "Dedicated", Standard = "Standard" } @@ -564,6 +552,12 @@ export enum KnownGpuSku { V100 = "V100" } +// @public +export enum KnownIsCustomProvisioningTimeout { + False = "False", + True = "True" +} + // @public export enum KnownLogAnalyticsLogType { ContainerInsights = "ContainerInsights", @@ -734,7 +728,7 @@ export type Scheme = string; // @public export interface SubnetServiceAssociationLink { - beginDelete(resourceGroupName: string, virtualNetworkName: string, subnetName: string, options?: SubnetServiceAssociationLinkDeleteOptionalParams): Promise, void>>; + beginDelete(resourceGroupName: string, virtualNetworkName: string, subnetName: string, options?: SubnetServiceAssociationLinkDeleteOptionalParams): Promise, void>>; beginDeleteAndWait(resourceGroupName: string, virtualNetworkName: string, subnetName: string, options?: SubnetServiceAssociationLinkDeleteOptionalParams): Promise; } diff --git a/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts b/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts index 808b6dca9141..a1399daca703 100644 --- a/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts +++ b/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts @@ -116,7 +116,7 @@ export class ContainerInstanceManagementClient extends coreClient.ServiceClient // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2022-10-01-preview"; + this.apiVersion = options.apiVersion || "2023-02-01-preview"; this.containerGroups = new ContainerGroupsImpl(this); this.operations = new OperationsImpl(this); this.location = new LocationImpl(this); diff --git a/sdk/containerinstance/arm-containerinstance/src/lroImpl.ts b/sdk/containerinstance/arm-containerinstance/src/lroImpl.ts index 518d5f053b4e..dd803cd5e28c 100644 --- a/sdk/containerinstance/arm-containerinstance/src/lroImpl.ts +++ b/sdk/containerinstance/arm-containerinstance/src/lroImpl.ts @@ -6,29 +6,37 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +import { AbortSignalLike } from "@azure/abort-controller"; import { LongRunningOperation, LroResponse } from "@azure/core-lro"; -export class LroImpl implements LongRunningOperation { - constructor( - private sendOperationFn: (args: any, spec: any) => Promise>, - private args: Record, - private spec: { - readonly requestBody?: unknown; - readonly path?: string; - readonly httpMethod: string; - } & Record, - public requestPath: string = spec.path!, - public requestMethod: string = spec.httpMethod - ) {} - public async sendInitialRequest(): Promise> { - return this.sendOperationFn(this.args, this.spec); - } - public async sendPollRequest(path: string): Promise> { - const { requestBody, ...restSpec } = this.spec; - return this.sendOperationFn(this.args, { - ...restSpec, - path, - httpMethod: "GET" - }); - } +export function createLroSpec(inputs: { + sendOperationFn: (args: any, spec: any) => Promise>; + args: Record; + spec: { + readonly requestBody?: unknown; + readonly path?: string; + readonly httpMethod: string; + } & Record; +}): LongRunningOperation { + const { args, spec, sendOperationFn } = inputs; + return { + requestMethod: spec.httpMethod, + requestPath: spec.path!, + sendInitialRequest: () => sendOperationFn(args, spec), + sendPollRequest: ( + path: string, + options?: { abortSignal?: AbortSignalLike } + ) => { + const { requestBody, ...restSpec } = spec; + return sendOperationFn(args, { + ...restSpec, + httpMethod: "GET", + path, + abortSignal: options?.abortSignal + }); + } + }; } diff --git a/sdk/containerinstance/arm-containerinstance/src/models/index.ts b/sdk/containerinstance/arm-containerinstance/src/models/index.ts index 8d4ac561a707..b82850886548 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/index.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/index.ts @@ -54,6 +54,13 @@ export interface ContainerGroupProperties { containers: Container[]; /** The image registry credentials by which the container group is created from. */ imageRegistryCredentials?: ImageRegistryCredential[]; + /** Time in seconds in which a container group deployment would timeout and fail. The allowed maximum value is 1800 seconds. If value is not provided, property is given maximum value by default. */ + provisioningTimeoutInSeconds?: number; + /** + * Flag indicating whether a custom value was provided for the provisioningTimeoutInSeconds property + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly isCustomProvisioningTimeout?: IsCustomProvisioningTimeout; /** * Restart policy for all containers within the container group. * - `Always` Always restart @@ -87,10 +94,6 @@ export interface ContainerGroupProperties { initContainers?: InitContainerDefinition[]; /** extensions used by virtual kubelet */ extensions?: DeploymentExtensionSpec[]; - /** The properties for confidential container group */ - confidentialComputeProperties?: ConfidentialComputeProperties; - /** The priority of the container group. */ - priority?: ContainerGroupPriority; } /** Identity for the container group. */ @@ -545,12 +548,6 @@ export interface DeploymentExtensionSpec { protectedSettings?: Record; } -/** The properties for confidential container group */ -export interface ConfidentialComputeProperties { - /** The base64 encoded confidential compute enforcement policy */ - ccePolicy?: string; -} - /** An error response from the Container Instance service. */ export interface CloudError { /** An error response from the Container Instance service. */ @@ -828,6 +825,24 @@ export enum KnownScheme { */ export type Scheme = string; +/** Known values of {@link IsCustomProvisioningTimeout} that the service accepts. */ +export enum KnownIsCustomProvisioningTimeout { + /** True */ + True = "True", + /** False */ + False = "False" +} + +/** + * Defines values for IsCustomProvisioningTimeout. \ + * {@link KnownIsCustomProvisioningTimeout} can be used interchangeably with IsCustomProvisioningTimeout, + * this enum contains the known values that the service supports. + * ### Known values supported by the service + * **True** \ + * **False** + */ +export type IsCustomProvisioningTimeout = string; + /** Known values of {@link ContainerGroupRestartPolicy} that the service accepts. */ export enum KnownContainerGroupRestartPolicy { /** Always */ @@ -953,9 +968,7 @@ export enum KnownContainerGroupSku { /** Standard */ Standard = "Standard", /** Dedicated */ - Dedicated = "Dedicated", - /** Confidential */ - Confidential = "Confidential" + Dedicated = "Dedicated" } /** @@ -964,29 +977,10 @@ export enum KnownContainerGroupSku { * this enum contains the known values that the service supports. * ### Known values supported by the service * **Standard** \ - * **Dedicated** \ - * **Confidential** + * **Dedicated** */ export type ContainerGroupSku = string; -/** Known values of {@link ContainerGroupPriority} that the service accepts. */ -export enum KnownContainerGroupPriority { - /** Regular */ - Regular = "Regular", - /** Spot */ - Spot = "Spot" -} - -/** - * Defines values for ContainerGroupPriority. \ - * {@link KnownContainerGroupPriority} can be used interchangeably with ContainerGroupPriority, - * this enum contains the known values that the service supports. - * ### Known values supported by the service - * **Regular** \ - * **Spot** - */ -export type ContainerGroupPriority = string; - /** Known values of {@link ContainerInstanceOperationsOrigin} that the service accepts. */ export enum KnownContainerInstanceOperationsOrigin { /** User */ diff --git a/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts b/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts index 66e61761c931..3da788c6af9c 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts @@ -133,6 +133,19 @@ export const ContainerGroupProperties: coreClient.CompositeMapper = { } } }, + provisioningTimeoutInSeconds: { + serializedName: "properties.provisioningTimeoutInSeconds", + type: { + name: "Number" + } + }, + isCustomProvisioningTimeout: { + serializedName: "properties.isCustomProvisioningTimeout", + readOnly: true, + type: { + name: "String" + } + }, restartPolicy: { serializedName: "properties.restartPolicy", type: { @@ -234,19 +247,6 @@ export const ContainerGroupProperties: coreClient.CompositeMapper = { } } } - }, - confidentialComputeProperties: { - serializedName: "properties.confidentialComputeProperties", - type: { - name: "Composite", - className: "ConfidentialComputeProperties" - } - }, - priority: { - serializedName: "properties.priority", - type: { - name: "String" - } } } } @@ -1423,21 +1423,6 @@ export const DeploymentExtensionSpec: coreClient.CompositeMapper = { } }; -export const ConfidentialComputeProperties: coreClient.CompositeMapper = { - type: { - name: "Composite", - className: "ConfidentialComputeProperties", - modelProperties: { - ccePolicy: { - serializedName: "ccePolicy", - type: { - name: "String" - } - } - } - } -}; - export const CloudError: coreClient.CompositeMapper = { type: { name: "Composite", diff --git a/sdk/containerinstance/arm-containerinstance/src/models/parameters.ts b/sdk/containerinstance/arm-containerinstance/src/models/parameters.ts index 018bdf637ede..b92b8fda95a9 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/parameters.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/parameters.ts @@ -55,7 +55,7 @@ export const subscriptionId: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2022-10-01-preview", + defaultValue: "2023-02-01-preview", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/containerinstance/arm-containerinstance/src/operations/containerGroups.ts b/sdk/containerinstance/arm-containerinstance/src/operations/containerGroups.ts index 6c530ba79a07..94cb7ea403cf 100644 --- a/sdk/containerinstance/arm-containerinstance/src/operations/containerGroups.ts +++ b/sdk/containerinstance/arm-containerinstance/src/operations/containerGroups.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { ContainerInstanceManagementClient } from "../containerInstanceManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { ContainerGroup, ContainerGroupsListNextOptionalParams, @@ -242,8 +246,8 @@ export class ContainerGroupsImpl implements ContainerGroups { containerGroup: ContainerGroup, options?: ContainerGroupsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, ContainerGroupsCreateOrUpdateResponse > > { @@ -253,7 +257,7 @@ export class ContainerGroupsImpl implements ContainerGroups { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -286,13 +290,16 @@ export class ContainerGroupsImpl implements ContainerGroups { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, containerGroupName, containerGroup, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, containerGroupName, containerGroup, options }, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + ContainerGroupsCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -352,8 +359,8 @@ export class ContainerGroupsImpl implements ContainerGroups { containerGroupName: string, options?: ContainerGroupsDeleteOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, ContainerGroupsDeleteResponse > > { @@ -363,7 +370,7 @@ export class ContainerGroupsImpl implements ContainerGroups { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -396,13 +403,16 @@ export class ContainerGroupsImpl implements ContainerGroups { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, containerGroupName, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, containerGroupName, options }, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller< + ContainerGroupsDeleteResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -440,14 +450,14 @@ export class ContainerGroupsImpl implements ContainerGroups { resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsRestartOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -480,13 +490,13 @@ export class ContainerGroupsImpl implements ContainerGroups { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, containerGroupName, options }, - restartOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, containerGroupName, options }, + spec: restartOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -542,14 +552,14 @@ export class ContainerGroupsImpl implements ContainerGroups { resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsStartOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -582,13 +592,13 @@ export class ContainerGroupsImpl implements ContainerGroups { }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, containerGroupName, options }, - startOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, containerGroupName, options }, + spec: startOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); diff --git a/sdk/containerinstance/arm-containerinstance/src/operations/subnetServiceAssociationLink.ts b/sdk/containerinstance/arm-containerinstance/src/operations/subnetServiceAssociationLink.ts index 5f192cf7c259..542674000148 100644 --- a/sdk/containerinstance/arm-containerinstance/src/operations/subnetServiceAssociationLink.ts +++ b/sdk/containerinstance/arm-containerinstance/src/operations/subnetServiceAssociationLink.ts @@ -11,8 +11,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { ContainerInstanceManagementClient } from "../containerInstanceManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { SubnetServiceAssociationLinkDeleteOptionalParams } from "../models"; /** Class containing SubnetServiceAssociationLink operations. */ @@ -41,14 +45,14 @@ export class SubnetServiceAssociationLinkImpl virtualNetworkName: string, subnetName: string, options?: SubnetServiceAssociationLinkDeleteOptionalParams - ): Promise, void>> { + ): Promise, void>> { const directSendOperation = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -81,13 +85,13 @@ export class SubnetServiceAssociationLinkImpl }; }; - const lro = new LroImpl( - sendOperation, - { resourceGroupName, virtualNetworkName, subnetName, options }, - deleteOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { resourceGroupName, virtualNetworkName, subnetName, options }, + spec: deleteOperationSpec + }); + const poller = await createHttpPoller>(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); diff --git a/sdk/containerinstance/arm-containerinstance/src/operationsInterfaces/containerGroups.ts b/sdk/containerinstance/arm-containerinstance/src/operationsInterfaces/containerGroups.ts index 464e807cab0e..177bc1c29b77 100644 --- a/sdk/containerinstance/arm-containerinstance/src/operationsInterfaces/containerGroups.ts +++ b/sdk/containerinstance/arm-containerinstance/src/operationsInterfaces/containerGroups.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { ContainerGroup, ContainerGroupsListOptionalParams, @@ -77,8 +77,8 @@ export interface ContainerGroups { containerGroup: ContainerGroup, options?: ContainerGroupsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, ContainerGroupsCreateOrUpdateResponse > >; @@ -120,8 +120,8 @@ export interface ContainerGroups { containerGroupName: string, options?: ContainerGroupsDeleteOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, ContainerGroupsDeleteResponse > >; @@ -148,7 +148,7 @@ export interface ContainerGroups { resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsRestartOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Restarts all containers in a container group in place. If container image has updates, new image * will be downloaded. @@ -184,7 +184,7 @@ export interface ContainerGroups { resourceGroupName: string, containerGroupName: string, options?: ContainerGroupsStartOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Starts all containers in a container group. Compute resources will be allocated and billing will * start. diff --git a/sdk/containerinstance/arm-containerinstance/src/operationsInterfaces/subnetServiceAssociationLink.ts b/sdk/containerinstance/arm-containerinstance/src/operationsInterfaces/subnetServiceAssociationLink.ts index ba1f1c5598dc..a7dbeffaf1ac 100644 --- a/sdk/containerinstance/arm-containerinstance/src/operationsInterfaces/subnetServiceAssociationLink.ts +++ b/sdk/containerinstance/arm-containerinstance/src/operationsInterfaces/subnetServiceAssociationLink.ts @@ -6,7 +6,7 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { SubnetServiceAssociationLinkDeleteOptionalParams } from "../models"; /** Interface representing a SubnetServiceAssociationLink. */ @@ -24,7 +24,7 @@ export interface SubnetServiceAssociationLink { virtualNetworkName: string, subnetName: string, options?: SubnetServiceAssociationLinkDeleteOptionalParams - ): Promise, void>>; + ): Promise, void>>; /** * Delete container group virtual network association links. The operation does not delete other * resources provided by the user. diff --git a/sdk/containerinstance/arm-containerinstance/test/sampleTest.ts b/sdk/containerinstance/arm-containerinstance/test/sampleTest.ts new file mode 100644 index 000000000000..25aeb3ebcc36 --- /dev/null +++ b/sdk/containerinstance/arm-containerinstance/test/sampleTest.ts @@ -0,0 +1,43 @@ +/* + * 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 { + Recorder, + RecorderStartOptions, + env +} from "@azure-tools/test-recorder"; +import { assert } from "chai"; +import { Context } from "mocha"; + +const replaceableVariables: Record = { + AZURE_CLIENT_ID: "azure_client_id", + AZURE_CLIENT_SECRET: "azure_client_secret", + AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888", + SUBSCRIPTION_ID: "azure_subscription_id" +}; + +const recorderOptions: RecorderStartOptions = { + envSetupForPlayback: replaceableVariables +}; + +describe("My test", () => { + let recorder: Recorder; + + beforeEach(async function(this: Context) { + recorder = new Recorder(this.currentTest); + await recorder.start(recorderOptions); + }); + + afterEach(async function() { + await recorder.stop(); + }); + + it("sample test", async function() { + console.log("Hi, I'm a test!"); + }); +}); diff --git a/sdk/containerinstance/arm-containerinstance/tsconfig.json b/sdk/containerinstance/arm-containerinstance/tsconfig.json index c28d6295827d..3e6ae96443f3 100644 --- a/sdk/containerinstance/arm-containerinstance/tsconfig.json +++ b/sdk/containerinstance/arm-containerinstance/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-containerinstance": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"