diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 14cd0cf2ff92..08b4b33d92f5 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 @@ -11126,7 +11127,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: @@ -11141,7 +11142,7 @@ packages: chai: 4.3.7 cross-env: 7.0.3 dotenv: 16.0.3 - mkdirp: 1.0.4 + mkdirp: 2.1.6 mocha: 7.2.0 rimraf: 3.0.2 rollup: 2.79.1 @@ -17171,7 +17172,7 @@ packages: dev: false file:projects/eventgrid.tgz: - resolution: {integrity: sha512-55L6D3Zr5nZu7iJ/bEuLzhKZ2AG4xeZ3aqkU2H9n3h1/bCp8g9Z4IhCZ3zBj5tSyZolhXot3cbINTIHlvDZZtA==, tarball: file:projects/eventgrid.tgz} + resolution: {integrity: sha512-/v2/2q6QmBLAy9IctuvCXDMjEedZw7eU0nNBrsQYr1zZqFHDyQRVJXLYYZVsIjWpuYTb6c/o7fkUhfe8YIuFAg==, tarball: file:projects/eventgrid.tgz} name: '@rush-temp/eventgrid' version: 0.0.0 dependencies: @@ -18744,7 +18745,7 @@ packages: dev: false file:projects/perf-service-bus.tgz: - resolution: {integrity: sha512-X1NvwwnX9KW680X8qYAvWSab7HtqQCZXw/alWYUXwIV5glv3ivLmPYQ5Piid4yK4GyhBRMmd1zmgHk+MHPXiOQ==, tarball: file:projects/perf-service-bus.tgz} + resolution: {integrity: sha512-wioVHbwMitD5Oi7RoiJr6nKap7VrDmz+QfijZnl1FWfCgRdtrCyIpYp2oC+VDnmCiPQavSFrLpW+6qmzGR1jrg==, tarball: file:projects/perf-service-bus.tgz} name: '@rush-temp/perf-service-bus' version: 0.0.0 dependencies: diff --git a/sdk/containerinstance/arm-containerinstance/CHANGELOG.md b/sdk/containerinstance/arm-containerinstance/CHANGELOG.md index 786c62ca5182..a514e7349b22 100644 --- a/sdk/containerinstance/arm-containerinstance/CHANGELOG.md +++ b/sdk/containerinstance/arm-containerinstance/CHANGELOG.md @@ -1,26 +1,20 @@ # 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 (2023-04-06) **Features** - Added Interface ConfidentialComputeProperties - Added Interface DeploymentExtensionSpec + - Added Interface SecurityContextCapabilitiesDefinition + - Added Interface SecurityContextDefinition - Added Type Alias ContainerGroupPriority + - Interface Container has a new optional parameter securityContext - Interface ContainerGroupProperties has a new optional parameter confidentialComputeProperties - Interface ContainerGroupProperties has a new optional parameter extensions - Interface ContainerGroupProperties has a new optional parameter priority - Interface EncryptionProperties has a new optional parameter identity + - Interface InitContainerDefinition has a new optional parameter securityContext - Added Enum KnownContainerGroupPriority - Enum KnownContainerGroupSku has a new value Confidential - Added function getContinuationToken diff --git a/sdk/containerinstance/arm-containerinstance/README.md b/sdk/containerinstance/arm-containerinstance/README.md index 8b91c74654a4..e28b289cba0d 100644 --- a/sdk/containerinstance/arm-containerinstance/README.md +++ b/sdk/containerinstance/arm-containerinstance/README.md @@ -6,7 +6,7 @@ This package contains an isomorphic SDK (runs both in Node.js and in browsers) f [Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/containerinstance/arm-containerinstance) | [Package (NPM)](https://www.npmjs.com/package/@azure/arm-containerinstance) | -[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-containerinstance?view=azure-node-preview) | +[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-containerinstance) | [Samples](https://github.com/Azure-Samples/azure-samples-js-management) ## Getting started diff --git a/sdk/containerinstance/arm-containerinstance/_meta.json b/sdk/containerinstance/arm-containerinstance/_meta.json index 5b188d8427ca..07544bf28ca7 100644 --- a/sdk/containerinstance/arm-containerinstance/_meta.json +++ b/sdk/containerinstance/arm-containerinstance/_meta.json @@ -1,8 +1,8 @@ { - "commit": "3f36931e7edfce60595fd5558a722e0230a44eb1", + "commit": "b8d43a3be9573626533a4e7a162458c83e46feb2", "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..a307f92cf13f 100644 --- a/sdk/containerinstance/arm-containerinstance/package.json +++ b/sdk/containerinstance/arm-containerinstance/package.json @@ -3,15 +3,15 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for ContainerInstanceManagementClient.", - "version": "9.1.0-beta.2", + "version": "9.1.0", "engines": { "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..c0a22659618c 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 { @@ -82,6 +82,7 @@ export interface Container { ports?: ContainerPort[]; readinessProbe?: ContainerProbe; resources: ResourceRequirements; + securityContext?: SecurityContextDefinition; volumeMounts?: VolumeMount[]; } @@ -181,13 +182,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; @@ -483,6 +484,7 @@ export interface InitContainerDefinition { image?: string; readonly instanceView?: InitContainerPropertiesDefinitionInstanceView; name: string; + securityContext?: SecurityContextDefinition; volumeMounts?: VolumeMount[]; } @@ -732,9 +734,25 @@ export interface ResourceRequirements { // @public export type Scheme = string; +// @public +export interface SecurityContextCapabilitiesDefinition { + add?: string[]; + drop?: string[]; +} + +// @public +export interface SecurityContextDefinition { + allowPrivilegeEscalation?: boolean; + capabilities?: SecurityContextCapabilitiesDefinition; + privileged?: boolean; + runAsGroup?: number; + runAsUser?: number; + seccompProfile?: 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..63802803c32d 100644 --- a/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts +++ b/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts @@ -63,12 +63,15 @@ export class ContainerInstanceManagementClient extends coreClient.ServiceClient credential: credentials }; - const packageDetails = `azsdk-js-arm-containerinstance/9.1.0-beta.2`; + const packageDetails = `azsdk-js-arm-containerinstance/9.1.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` : `${packageDetails}`; + if (!options.credentialScopes) { + options.credentialScopes = ["https://management.azure.com/.default"]; + } const optionsWithDefaults = { ...defaults, ...options, @@ -76,7 +79,9 @@ export class ContainerInstanceManagementClient extends coreClient.ServiceClient userAgentPrefix }, endpoint: - options.endpoint ?? options.baseUri ?? "https://management.azure.com" + options.endpoint ?? + options.baseUri ?? + "https://eastus2euap.management.azure.com" }; super(optionsWithDefaults); @@ -115,8 +120,8 @@ export class ContainerInstanceManagementClient extends coreClient.ServiceClient this.subscriptionId = subscriptionId; // Assigning values to Constant parameters - this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2022-10-01-preview"; + this.$host = options.$host || "https://eastus2euap.management.azure.com"; + this.apiVersion = options.apiVersion || "2023-05-01"; 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..a82edd98b8b1 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/index.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/index.ts @@ -150,6 +150,8 @@ export interface Container { livenessProbe?: ContainerProbe; /** The readiness probe. */ readinessProbe?: ContainerProbe; + /** The container security properties. */ + securityContext?: SecurityContextDefinition; } /** The port exposed on the container instance. */ @@ -347,6 +349,30 @@ export interface HttpHeader { value?: string; } +/** The security context for the container. */ +export interface SecurityContextDefinition { + /** The flag to determine if the container permissions is elevated to Privileged. */ + privileged?: boolean; + /** A boolean value indicating whether the init process can elevate its privileges */ + allowPrivilegeEscalation?: boolean; + /** The capabilities to add or drop from a container. */ + capabilities?: SecurityContextCapabilitiesDefinition; + /** Sets the User GID for the container. */ + runAsGroup?: number; + /** Sets the User UID for the container. */ + runAsUser?: number; + /** a base64 encoded string containing the contents of the JSON in the seccomp profile */ + seccompProfile?: string; +} + +/** The capabilities to add or drop from a container. */ +export interface SecurityContextCapabilitiesDefinition { + /** The capabilities to add to the container. */ + add?: string[]; + /** The capabilities to drop from the container. */ + drop?: string[]; +} + /** Image registry credential. */ export interface ImageRegistryCredential { /** The Docker image registry server without a protocol such as "http" and "https". */ @@ -505,6 +531,8 @@ export interface InitContainerDefinition { readonly instanceView?: InitContainerPropertiesDefinitionInstanceView; /** The volume mounts available to the init container. */ volumeMounts?: VolumeMount[]; + /** The container security properties. */ + securityContext?: SecurityContextDefinition; } /** The instance view of the init container. Only valid in response. */ diff --git a/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts b/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts index 66e61761c931..b4b482c66ac1 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts @@ -412,6 +412,13 @@ export const Container: coreClient.CompositeMapper = { name: "Composite", className: "ContainerProbe" } + }, + securityContext: { + serializedName: "properties.securityContext", + type: { + name: "Composite", + className: "SecurityContextDefinition" + } } } } @@ -872,6 +879,83 @@ export const HttpHeader: coreClient.CompositeMapper = { } }; +export const SecurityContextDefinition: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "SecurityContextDefinition", + modelProperties: { + privileged: { + serializedName: "privileged", + type: { + name: "Boolean" + } + }, + allowPrivilegeEscalation: { + serializedName: "allowPrivilegeEscalation", + type: { + name: "Boolean" + } + }, + capabilities: { + serializedName: "capabilities", + type: { + name: "Composite", + className: "SecurityContextCapabilitiesDefinition" + } + }, + runAsGroup: { + serializedName: "runAsGroup", + type: { + name: "Number" + } + }, + runAsUser: { + serializedName: "runAsUser", + type: { + name: "Number" + } + }, + seccompProfile: { + serializedName: "seccompProfile", + type: { + name: "String" + } + } + } + } +}; + +export const SecurityContextCapabilitiesDefinition: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "SecurityContextCapabilitiesDefinition", + modelProperties: { + add: { + serializedName: "add", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + drop: { + serializedName: "drop", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + } + } + } +}; + export const ImageRegistryCredential: coreClient.CompositeMapper = { type: { name: "Composite", @@ -1333,6 +1417,13 @@ export const InitContainerDefinition: coreClient.CompositeMapper = { } } } + }, + securityContext: { + serializedName: "properties.securityContext", + type: { + name: "Composite", + className: "SecurityContextDefinition" + } } } } diff --git a/sdk/containerinstance/arm-containerinstance/src/models/parameters.ts b/sdk/containerinstance/arm-containerinstance/src/models/parameters.ts index 018bdf637ede..e0cf5d2709cf 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-05-01", 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"