diff --git a/sdk/containerinstance/arm-containerinstance/CHANGELOG.md b/sdk/containerinstance/arm-containerinstance/CHANGELOG.md index c5cfe581a85f..e3ddf9b23f6c 100644 --- a/sdk/containerinstance/arm-containerinstance/CHANGELOG.md +++ b/sdk/containerinstance/arm-containerinstance/CHANGELOG.md @@ -1,16 +1,22 @@ # Release History -## 9.1.0-beta.2 (2023-04-10) +## 9.1.0 (2023-04-12) **Features** + - Added Interface ConfidentialComputeProperties - Added Interface DeploymentExtensionSpec - - Added Type Alias IsCustomProvisioningTimeout + - 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 isCustomProvisioningTimeout - - Interface ContainerGroupProperties has a new optional parameter provisioningTimeoutInSeconds + - Interface ContainerGroupProperties has a new optional parameter priority - Interface EncryptionProperties has a new optional parameter identity - - Added Enum KnownIsCustomProvisioningTimeout + - 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 362ee1fa19b2..ef05946853f0 100644 --- a/sdk/containerinstance/arm-containerinstance/_meta.json +++ b/sdk/containerinstance/arm-containerinstance/_meta.json @@ -1,8 +1,8 @@ { - "commit": "6b992c049ed7d6a95465d5c0a2234fc54c87b9bf", + "commit": "6f0a57a285d1e190180dbcf361b86dfec9492b08", "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=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\containerinstance\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.10 --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.6.2", + "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 7164da91f73d..a307f92cf13f 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.1.0-beta.2", + "version": "9.1.0", "engines": { "node": ">=14.0.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 d5b700ee3a6d..c0a22659618c 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[]; @@ -77,6 +82,7 @@ export interface Container { ports?: ContainerPort[]; readinessProbe?: ContainerProbe; resources: ResourceRequirements; + securityContext?: SecurityContextDefinition; volumeMounts?: VolumeMount[]; } @@ -140,8 +146,12 @@ 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; @@ -152,10 +162,9 @@ 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[]; @@ -475,6 +484,7 @@ export interface InitContainerDefinition { image?: string; readonly instanceView?: InitContainerPropertiesDefinitionInstanceView; name: string; + securityContext?: SecurityContextDefinition; volumeMounts?: VolumeMount[]; } @@ -496,9 +506,6 @@ export interface IpAddress { type: ContainerGroupIpAddressType; } -// @public -export type IsCustomProvisioningTimeout = string; - // @public export enum KnownContainerGroupIpAddressType { Private = "Private", @@ -511,6 +518,12 @@ export enum KnownContainerGroupNetworkProtocol { UDP = "UDP" } +// @public +export enum KnownContainerGroupPriority { + Regular = "Regular", + Spot = "Spot" +} + // @public export enum KnownContainerGroupRestartPolicy { Always = "Always", @@ -520,6 +533,7 @@ export enum KnownContainerGroupRestartPolicy { // @public export enum KnownContainerGroupSku { + Confidential = "Confidential", Dedicated = "Dedicated", Standard = "Standard" } @@ -552,12 +566,6 @@ export enum KnownGpuSku { V100 = "V100" } -// @public -export enum KnownIsCustomProvisioningTimeout { - False = "False", - True = "True" -} - // @public export enum KnownLogAnalyticsLogType { ContainerInsights = "ContainerInsights", @@ -726,6 +734,22 @@ 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>>; diff --git a/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts b/sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts index a1399daca703..666a151074e1 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.1.0-beta.2`; + const packageDetails = `azsdk-js-arm-containerinstance/9.1.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -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 || "2023-02-01-preview"; + 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/models/index.ts b/sdk/containerinstance/arm-containerinstance/src/models/index.ts index b82850886548..a82edd98b8b1 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/index.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/index.ts @@ -54,13 +54,6 @@ 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 @@ -94,6 +87,10 @@ 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. */ @@ -153,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. */ @@ -350,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". */ @@ -508,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. */ @@ -548,6 +573,12 @@ 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. */ @@ -825,24 +856,6 @@ 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 */ @@ -968,7 +981,9 @@ export enum KnownContainerGroupSku { /** Standard */ Standard = "Standard", /** Dedicated */ - Dedicated = "Dedicated" + Dedicated = "Dedicated", + /** Confidential */ + Confidential = "Confidential" } /** @@ -977,10 +992,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 3da788c6af9c..b4b482c66ac1 100644 --- a/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts +++ b/sdk/containerinstance/arm-containerinstance/src/models/mappers.ts @@ -133,19 +133,6 @@ 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: { @@ -247,6 +234,19 @@ export const ContainerGroupProperties: coreClient.CompositeMapper = { } } } + }, + confidentialComputeProperties: { + serializedName: "properties.confidentialComputeProperties", + type: { + name: "Composite", + className: "ConfidentialComputeProperties" + } + }, + priority: { + serializedName: "properties.priority", + type: { + name: "String" + } } } } @@ -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" + } } } } @@ -1423,6 +1514,21 @@ 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 b92b8fda95a9..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: "2023-02-01-preview", + defaultValue: "2023-05-01", 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"