diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 3df1bbf10e37..8d32298c9097 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -4131,7 +4131,7 @@ packages: dependencies: semver: 7.5.4 shelljs: 0.8.5 - typescript: 5.3.0-dev.20230822 + typescript: 5.3.0-dev.20230823 dev: false /ecdsa-sig-formatter/1.0.11: @@ -8715,8 +8715,8 @@ packages: hasBin: true dev: false - /typescript/5.3.0-dev.20230822: - resolution: {integrity: sha512-zVlawDu8ult5+AoXXQck+R+qJn1Gzv5aE1lH9UcStRRE461MjXK7P8DDJuee840m66huRJKMzh+ttgrTUEfWmQ==} + /typescript/5.3.0-dev.20230823: + resolution: {integrity: sha512-IEFfTl67UgTTJzf+Ma4+0txDKzxzxtjNjyFjTm7c+yP5sff+atKe44mAjhCxX8wGjwRrFuhAUeHz1udmzBZ4ow==} engines: {node: '>=14.17'} hasBin: true dev: false @@ -12744,7 +12744,7 @@ packages: dev: false file:projects/arm-keyvault.tgz: - resolution: {integrity: sha512-2TREBAkAGf26rF/3HLaw2v+BtfaR0hgYJ1hYkb5JQTcWUKN7lAdsrLaeFyH1qu+e0VMMQWR922cfNo6Wa8wo2A==, tarball: file:projects/arm-keyvault.tgz} + resolution: {integrity: sha512-FSGTN/bVV1AzMiJefk/d0DRxfFSACIpo2x4iqxckGSN7a8BMAoRoD5LawOKKM2hr6r6c6DrZRdqPyGb6V7YpnA==, tarball: file:projects/arm-keyvault.tgz} name: '@rush-temp/arm-keyvault' version: 0.0.0 dependencies: @@ -12764,10 +12764,13 @@ packages: rimraf: 3.0.2 rollup: 2.79.1 rollup-plugin-sourcemaps: 0.6.3_dmbj5memikchm63lpeyt6ukdau + ts-node: 10.9.1_n7tz6hmpirns3flqdptizaxofa tslib: 2.6.2 typescript: 5.0.4 uglify-js: 3.17.4 transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' - supports-color dev: false @@ -14510,7 +14513,7 @@ packages: dev: false file:projects/arm-resourceconnector.tgz: - resolution: {integrity: sha512-A5KPLmzwoQ024tNq6AKb/Er0C6bwhs8U1HtzQRmYFRuFLXhHSh+Dk86nwQRc2vgV/J+Cvr4QQ+uYDQ0x0K4gHw==, tarball: file:projects/arm-resourceconnector.tgz} + resolution: {integrity: sha512-19vyuiPH5cJogzuaO5ZWxm9aCXhh6xgkOl4NA3n8f1HlR1cjy4dfz23a5qEGkcxQVudXpN53gCOeoTc1sDYD7w==, tarball: file:projects/arm-resourceconnector.tgz} name: '@rush-temp/arm-resourceconnector' version: 0.0.0 dependencies: diff --git a/sdk/keyvault/arm-keyvault/_meta.json b/sdk/keyvault/arm-keyvault/_meta.json index e59ec18c6cbe..d71bc2649fba 100644 --- a/sdk/keyvault/arm-keyvault/_meta.json +++ b/sdk/keyvault/arm-keyvault/_meta.json @@ -1,8 +1,8 @@ { - "commit": "6b992c049ed7d6a95465d5c0a2234fc54c87b9bf", + "commit": "34e5544ad7d71ad8814714371c5dc58694b04238", "readme": "specification/keyvault/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\\keyvault\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.10 --generate-sample=true", + "autorest_command": "autorest --version=3.9.7 --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/keyvault/resource-manager/readme.md --use=@autorest/typescript@^6.0.4", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.6.2", - "use": "@autorest/typescript@6.0.0-rc.10" + "release_tool": "@azure-tools/js-sdk-release-tools@2.7.2", + "use": "@autorest/typescript@^6.0.4" } \ No newline at end of file diff --git a/sdk/keyvault/arm-keyvault/package.json b/sdk/keyvault/arm-keyvault/package.json index f734beb93fb6..5d0cdf57a34c 100644 --- a/sdk/keyvault/arm-keyvault/package.json +++ b/sdk/keyvault/arm-keyvault/package.json @@ -8,12 +8,12 @@ "node": ">=14.0.0" }, "dependencies": { - "@azure/core-lro": "^2.5.0", + "@azure/core-lro": "^2.5.4", "@azure/abort-controller": "^1.0.0", "@azure/core-paging": "^1.2.0", "@azure/core-client": "^1.7.0", "@azure/core-auth": "^1.3.0", - "@azure/core-rest-pipeline": "^1.8.0", + "@azure/core-rest-pipeline": "^1.12.0", "tslib": "^2.2.0" }, "keywords": [ @@ -48,6 +48,7 @@ "chai": "^4.2.0", "cross-env": "^7.0.2", "@types/node": "^14.0.0", + "ts-node": "^10.0.0", "@azure/dev-tool": "^1.0.0" }, "repository": { @@ -111,13 +112,5 @@ ] }, "autoPublish": true, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/keyvault/arm-keyvault", - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-keyvault?view=azure-node-preview" - } -} + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/keyvault/arm-keyvault" +} \ No newline at end of file diff --git a/sdk/keyvault/arm-keyvault/review/arm-keyvault.api.md b/sdk/keyvault/arm-keyvault/review/arm-keyvault.api.md index 733eed42bd11..250914aed2ed 100644 --- a/sdk/keyvault/arm-keyvault/review/arm-keyvault.api.md +++ b/sdk/keyvault/arm-keyvault/review/arm-keyvault.api.md @@ -232,7 +232,7 @@ export interface KeyReleasePolicy { } // @public -export type KeyRotationPolicyActionType = "rotate" | "notify"; +export type KeyRotationPolicyActionType = "Rotate" | "rotate" | "Notify"; // @public (undocumented) export interface KeyRotationPolicyAttributes { @@ -832,7 +832,7 @@ export interface ManagedHsmSku { export type ManagedHsmSkuFamily = string; // @public -export type ManagedHsmSkuName = "Standard_B1" | "Custom_B32"; +export type ManagedHsmSkuName = "Standard_B1" | "Custom_B32" | "Custom_B6"; // @public export interface ManagedHsmsListByResourceGroupNextOptionalParams extends coreClient.OperationOptions { diff --git a/sdk/keyvault/arm-keyvault/src/models/index.ts b/sdk/keyvault/arm-keyvault/src/models/index.ts index d68099bfe8ce..0bc89c3095ec 100644 --- a/sdk/keyvault/arm-keyvault/src/models/index.ts +++ b/sdk/keyvault/arm-keyvault/src/models/index.ts @@ -107,7 +107,7 @@ export interface Trigger { } export interface Action { - /** The type of action. */ + /** The type of the action. */ type?: KeyRotationPolicyActionType; } @@ -268,7 +268,7 @@ export interface ManagedHsmTrigger { } export interface ManagedHsmAction { - /** The type of action. */ + /** The type of the action. */ type?: KeyRotationPolicyActionType; } @@ -700,11 +700,11 @@ export interface ManagedHsmProperties { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly hsmUri?: string; - /** Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false. */ + /** Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable. */ enableSoftDelete?: boolean; - /** softDelete data retention days. It accepts >=7 and <=90. */ + /** Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90. */ softDeleteRetentionInDays?: number; - /** Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible. */ + /** Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible. */ enablePurgeProtection?: boolean; /** The create mode to indicate whether the resource is being created or is being recovered from a deleted resource. */ createMode?: CreateMode; @@ -727,7 +727,7 @@ export interface ManagedHsmProperties { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly privateEndpointConnections?: MhsmPrivateEndpointConnectionItem[]; - /** Control permission for data plane traffic coming from public networks while private endpoint is enabled. */ + /** Control permission to the managed HSM from public networks. */ publicNetworkAccess?: PublicNetworkAccess; /** * The scheduled purge date in UTC. @@ -1976,7 +1976,7 @@ export enum KnownManagedHsmSkuFamily { */ export type ManagedHsmSkuFamily = string; /** Defines values for KeyRotationPolicyActionType. */ -export type KeyRotationPolicyActionType = "rotate" | "notify"; +export type KeyRotationPolicyActionType = "Rotate" | "rotate" | "Notify"; /** Defines values for SkuName. */ export type SkuName = "standard" | "premium"; /** Defines values for CreateMode. */ @@ -1986,7 +1986,7 @@ export type AccessPolicyUpdateKind = "add" | "replace" | "remove"; /** Defines values for Reason. */ export type Reason = "AccountNameInvalid" | "AlreadyExists"; /** Defines values for ManagedHsmSkuName. */ -export type ManagedHsmSkuName = "Standard_B1" | "Custom_B32"; +export type ManagedHsmSkuName = "Standard_B1" | "Custom_B32" | "Custom_B6"; /** Optional parameters. */ export interface KeysCreateIfNotExistOptionalParams diff --git a/sdk/keyvault/arm-keyvault/src/models/mappers.ts b/sdk/keyvault/arm-keyvault/src/models/mappers.ts index aeba2010bca0..21bc5436af0b 100644 --- a/sdk/keyvault/arm-keyvault/src/models/mappers.ts +++ b/sdk/keyvault/arm-keyvault/src/models/mappers.ts @@ -269,7 +269,7 @@ export const Action: coreClient.CompositeMapper = { serializedName: "type", type: { name: "Enum", - allowedValues: ["rotate", "notify"] + allowedValues: ["Rotate", "rotate", "Notify"] } } } @@ -667,7 +667,7 @@ export const ManagedHsmAction: coreClient.CompositeMapper = { serializedName: "type", type: { name: "Enum", - allowedValues: ["rotate", "notify"] + allowedValues: ["Rotate", "rotate", "Notify"] } } } @@ -1867,6 +1867,7 @@ export const ManagedHsmProperties: coreClient.CompositeMapper = { } }, publicNetworkAccess: { + defaultValue: "Enabled", serializedName: "publicNetworkAccess", type: { name: "String" @@ -2176,7 +2177,7 @@ export const ManagedHsmSku: coreClient.CompositeMapper = { required: true, type: { name: "Enum", - allowedValues: ["Standard_B1", "Custom_B32"] + allowedValues: ["Standard_B1", "Custom_B32", "Custom_B6"] } } } diff --git a/sdk/keyvault/arm-keyvault/test/sampleTest.ts b/sdk/keyvault/arm-keyvault/test/sampleTest.ts new file mode 100644 index 000000000000..25aeb3ebcc36 --- /dev/null +++ b/sdk/keyvault/arm-keyvault/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/keyvault/arm-keyvault/tsconfig.json b/sdk/keyvault/arm-keyvault/tsconfig.json index d2c1e922fd67..3e6ae96443f3 100644 --- a/sdk/keyvault/arm-keyvault/tsconfig.json +++ b/sdk/keyvault/arm-keyvault/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-keyvault": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"