diff --git a/sdk/containerinstance/arm-containerinstance/CHANGELOG.md b/sdk/containerinstance/arm-containerinstance/CHANGELOG.md index b3e617fd5981..30a2b7807321 100644 --- a/sdk/containerinstance/arm-containerinstance/CHANGELOG.md +++ b/sdk/containerinstance/arm-containerinstance/CHANGELOG.md @@ -1,15 +1,20 @@ # Release History + +## 9.1.0-beta.1 (2022-11-24) + +**Features** -## 9.0.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + - Added Interface ConfidentialComputeProperties + - Added Interface DeploymentExtensionSpec + - Added Type Alias ContainerGroupPriority + - 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 + - Added Enum KnownContainerGroupPriority + - Enum KnownContainerGroupSku has a new value Confidential + + ## 9.0.0 (2022-08-30) **Features** diff --git a/sdk/containerinstance/arm-containerinstance/README.md b/sdk/containerinstance/arm-containerinstance/README.md index e28b289cba0d..8b91c74654a4 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) | +[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-containerinstance?view=azure-node-preview) | [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 4e17e2812337..dc94702e1490 100644 --- a/sdk/containerinstance/arm-containerinstance/_meta.json +++ b/sdk/containerinstance/arm-containerinstance/_meta.json @@ -1,8 +1,8 @@ { - "commit": "ee364f685feedb2ad905c682b57117f9006f541f", + "commit": "5b05c080b24b2efe1e3687559f1b4e47daaf2b5a", "readme": "specification/containerinstance/resource-manager/readme.md", - "autorest_command": "autorest --version=3.8.4 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\containerinstance\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.1.20220727.1 --generate-sample=true", + "autorest_command": "autorest --version=3.8.4 --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.2", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.4.2", - "use": "@autorest/typescript@6.0.0-rc.1.20220727.1" + "release_tool": "@azure-tools/js-sdk-release-tools@2.5.1", + "use": "@autorest/typescript@6.0.0-rc.2" } \ No newline at end of file diff --git a/sdk/containerinstance/arm-containerinstance/package.json b/sdk/containerinstance/arm-containerinstance/package.json index 017586bd57ed..59156ce0174b 100644 --- a/sdk/containerinstance/arm-containerinstance/package.json +++ b/sdk/containerinstance/arm-containerinstance/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for ContainerInstanceManagementClient.", - "version": "9.0.1", + "version": "9.1.0-beta.1", "engines": { "node": ">=14.0.0" }, @@ -109,13 +109,5 @@ } ] }, - "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-containerinstance?view=azure-node-preview" - } -} + "autoPublish": true +} \ 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 87acdbe6d5c6..7004cdefffb3 100644 --- a/sdk/containerinstance/arm-containerinstance/review/arm-containerinstance.api.md +++ b/sdk/containerinstance/arm-containerinstance/review/arm-containerinstance.api.md @@ -66,6 +66,11 @@ export interface CloudErrorBody { target?: string; } +// @public +export interface ConfidentialComputeProperties { + ccePolicy?: string; +} + // @public export interface Container { command?: string[]; @@ -140,18 +145,24 @@ 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; encryptionProperties?: EncryptionProperties; + extensions?: DeploymentExtensionSpec[]; identity?: ContainerGroupIdentity; imageRegistryCredentials?: ImageRegistryCredential[]; initContainers?: InitContainerDefinition[]; readonly instanceView?: ContainerGroupPropertiesInstanceView; ipAddress?: IpAddress; osType: OperatingSystemTypes; + priority?: ContainerGroupPriority; readonly provisioningState?: string; restartPolicy?: ContainerGroupRestartPolicy; sku?: ContainerGroupSku; @@ -386,6 +397,15 @@ export interface ContainerState { readonly state?: string; } +// @public +export interface DeploymentExtensionSpec { + extensionType?: string; + name: string; + protectedSettings?: Record; + settings?: Record; + version?: string; +} + // @public export interface DnsConfiguration { nameServers: string[]; @@ -398,6 +418,7 @@ export type DnsNameLabelReusePolicy = string; // @public export interface EncryptionProperties { + identity?: string; keyName: string; keyVersion: string; vaultBaseUrl: string; @@ -492,6 +513,12 @@ export enum KnownContainerGroupNetworkProtocol { UDP = "UDP" } +// @public +export enum KnownContainerGroupPriority { + Regular = "Regular", + Spot = "Spot" +} + // @public export enum KnownContainerGroupRestartPolicy { Always = "Always", @@ -501,6 +528,7 @@ export enum KnownContainerGroupRestartPolicy { // @public export enum KnownContainerGroupSku { + Confidential = "Confidential", Dedicated = "Dedicated", Standard = "Standard" } diff --git a/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts b/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts index 4efc11a36adf..56c94e6273dc 100644 --- a/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts +++ b/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts @@ -63,7 +63,7 @@ export class ContainerInstanceManagementClient extends coreClient.ServiceClient credential: credentials }; - const packageDetails = `azsdk-js-arm-containerinstance/9.0.1`; + const packageDetails = `azsdk-js-arm-containerinstance/9.1.0-beta.1`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -117,7 +117,7 @@ export class ContainerInstanceManagementClient extends coreClient.ServiceClient // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2021-10-01"; + this.apiVersion = options.apiVersion || "2022-10-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/models/index.ts b/sdk/containerinstance/arm-containerinstance/src/models/index.ts index 2b6705aede45..8d4ac561a707 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/index.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/index.ts @@ -85,6 +85,12 @@ export interface ContainerGroupProperties { encryptionProperties?: EncryptionProperties; /** The init containers for a container group. */ 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. */ @@ -478,6 +484,8 @@ export interface EncryptionProperties { keyName: string; /** The encryption key version. */ keyVersion: string; + /** The keyvault managed identity. */ + identity?: string; } /** The init container definition. */ @@ -523,6 +531,26 @@ export interface InitContainerPropertiesDefinitionInstanceView { readonly events?: Event[]; } +/** Extension sidecars to be added to the deployment. */ +export interface DeploymentExtensionSpec { + /** Name of the extension. */ + name: string; + /** Type of extension to be added. */ + extensionType?: string; + /** Version of the extension being used. */ + version?: string; + /** Settings for the extension. */ + settings?: Record; + /** Protected settings for the extension. */ + 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. */ @@ -925,7 +953,9 @@ export enum KnownContainerGroupSku { /** Standard */ Standard = "Standard", /** Dedicated */ - Dedicated = "Dedicated" + Dedicated = "Dedicated", + /** Confidential */ + Confidential = "Confidential" } /** @@ -934,10 +964,29 @@ export enum KnownContainerGroupSku { * this enum contains the known values that the service supports. * ### Known values supported by the service * **Standard** \ - * **Dedicated** + * **Dedicated** \ + * **Confidential** */ 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 62844be8c1d5..66e61761c931 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts @@ -222,6 +222,31 @@ export const ContainerGroupProperties: coreClient.CompositeMapper = { } } } + }, + extensions: { + serializedName: "properties.extensions", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DeploymentExtensionSpec" + } + } + } + }, + confidentialComputeProperties: { + serializedName: "properties.confidentialComputeProperties", + type: { + name: "Composite", + className: "ConfidentialComputeProperties" + } + }, + priority: { + serializedName: "properties.priority", + type: { + name: "String" + } } } } @@ -1238,6 +1263,12 @@ export const EncryptionProperties: coreClient.CompositeMapper = { type: { name: "String" } + }, + identity: { + serializedName: "identity", + type: { + name: "String" + } } } } @@ -1350,6 +1381,63 @@ export const InitContainerPropertiesDefinitionInstanceView: coreClient.Composite } }; +export const DeploymentExtensionSpec: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "DeploymentExtensionSpec", + modelProperties: { + name: { + serializedName: "name", + required: true, + type: { + name: "String" + } + }, + extensionType: { + serializedName: "properties.extensionType", + type: { + name: "String" + } + }, + version: { + serializedName: "properties.version", + type: { + name: "String" + } + }, + settings: { + serializedName: "properties.settings", + type: { + name: "Dictionary", + value: { type: { name: "any" } } + } + }, + protectedSettings: { + serializedName: "properties.protectedSettings", + type: { + name: "Dictionary", + value: { type: { name: "any" } } + } + } + } + } +}; + +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 4a5b773620ad..018bdf637ede 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: "2021-10-01", + defaultValue: "2022-10-01-preview", isConstant: true, serializedName: "api-version", type: { 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"