From 08e11de7406f0091bea050cb6a58011052a89e44 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 20 Nov 2023 09:41:53 +0000 Subject: [PATCH] CodeGen from PR 26712 in Azure/azure-rest-api-specs Merge 6970c8db497399ba952f52a2a9e6d8431bb5137e into bf204aab860f2eb58a9d346b00d44760f2a9b0a2 --- common/config/rush/pnpm-lock.yaml | 41 +++++++++++++----- sdk/storage/arm-storage/_meta.json | 8 ++-- sdk/storage/arm-storage/package.json | 24 ++++------- .../src/operations/storageAccounts.ts | 4 +- .../operationsInterfaces/storageAccounts.ts | 4 +- sdk/storage/arm-storage/test/sampleTest.ts | 43 +++++++++++++++++++ sdk/storage/arm-storage/tsconfig.json | 10 +---- 7 files changed, 93 insertions(+), 41 deletions(-) create mode 100644 sdk/storage/arm-storage/test/sampleTest.ts diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index d7a22bc94638..5faf52e461f2 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1157,6 +1157,21 @@ packages: - supports-color dev: false + /@azure/arm-storage@18.2.0: + resolution: {integrity: sha512-jLUsAVFq5YBOYQfhE6L+KaUs+lntctKVafPz50FFScfzPMHYT/SptQGZ7BKzAJBBE/evdt8afmt2NSdl8Szomg==} + engines: {node: '>=14.0.0'} + dependencies: + '@azure/abort-controller': 1.1.0 + '@azure/core-auth': 1.5.0 + '@azure/core-client': 1.7.3 + '@azure/core-lro': 2.5.4 + '@azure/core-paging': 1.5.0 + '@azure/core-rest-pipeline': 1.12.2 + tslib: 2.6.2 + transitivePeerDependencies: + - supports-color + dev: false + /@azure/communication-signaling@1.0.0-beta.20: resolution: {integrity: sha512-Vjsiv6lWiVFqTG51cKNOAwnhuUhKbb6oOsQ833NEaWl9MwlqEQtxSOMJPYsoSCjb+pnIYvbioC+hIHkKfkAxbQ==} engines: {node: '>=8.0.0'} @@ -4447,7 +4462,7 @@ packages: dependencies: semver: 7.5.4 shelljs: 0.8.5 - typescript: 5.4.0-dev.20231119 + typescript: 5.4.0-dev.20231120 dev: false /downlevel-dts@0.11.0: @@ -4456,7 +4471,7 @@ packages: dependencies: semver: 7.5.4 shelljs: 0.8.5 - typescript: 5.4.0-dev.20231119 + typescript: 5.4.0-dev.20231120 dev: false /eastasianwidth@0.2.0: @@ -9158,8 +9173,8 @@ packages: hasBin: true dev: false - /typescript@5.4.0-dev.20231119: - resolution: {integrity: sha512-a8JGI0ifhQ0VM9dJhSWWZnSKQu6Bgm16G32BHDOIhEuLcn0uWcfA2ZHeazTiqYEAzja+zsN+Y4f8yliGW0K3+A==} + /typescript@5.4.0-dev.20231120: + resolution: {integrity: sha512-MG4Zg5HXb8bnvGdZrMeLBekqbCjHjaMPewXh3wVrNgTF+toQ4BrdhXnYiqMU0pLLxcsxRSMPB5MzB7YHgr67Cg==} engines: {node: '>=14.17'} hasBin: true dev: false @@ -11035,10 +11050,11 @@ packages: dev: false file:projects/arm-batch.tgz: - resolution: {integrity: sha512-JdX8p69h996oRDKT3p6h3987ccXckSsKn9kxdLn8VmewD/s4T6yL0Q0GPtdYGelrpOD/xkqbtkIw62ZF8ivFxw==, tarball: file:projects/arm-batch.tgz} + resolution: {integrity: sha512-QmsfeKfIuh+9l/j7WejE1Te37UPQ8K9bcTmfBxZ+Cm/PX2u/QRQK+auv8iaPWsyGA1RjOmRN0pUUVe68s0cTmQ==, tarball: file:projects/arm-batch.tgz} name: '@rush-temp/arm-batch' version: 0.0.0 dependencies: + '@azure/arm-storage': 18.2.0 '@azure/identity': 3.4.1 '@microsoft/api-extractor': 7.38.3(@types/node@18.18.9) '@types/chai': 4.3.10 @@ -12562,10 +12578,11 @@ packages: dev: false file:projects/arm-eventhub.tgz: - resolution: {integrity: sha512-MfPrGJfNBWzwigKTkYZc19i+yeMfEcS2Qqv4b12H6wCup7inRqS3dpnGKQ503XzVVwaaYNzqHdCTrYZo27lo6Q==, tarball: file:projects/arm-eventhub.tgz} + resolution: {integrity: sha512-m4KPoR00khkuJHNKaQvrcuTBm2l73jyyaYbhQyr5vGHGzpgLI4eJ9y/eK4AP22unXhVXeXckNomPewhIJ9jumA==, tarball: file:projects/arm-eventhub.tgz} name: '@rush-temp/arm-eventhub' version: 0.0.0 dependencies: + '@azure/arm-storage': 18.2.0 '@azure/identity': 3.4.1 '@microsoft/api-extractor': 7.38.3(@types/node@18.18.9) '@types/chai': 4.3.10 @@ -13597,10 +13614,11 @@ packages: dev: false file:projects/arm-mediaservices.tgz: - resolution: {integrity: sha512-OPwyai3MfADcAaTvIibG5XdIeHEFyin90TGvNhN5ARCzfXgwFM+Lt0LYdnQNKrRXsml08mfLD9Ll1NtMMRmi3A==, tarball: file:projects/arm-mediaservices.tgz} + resolution: {integrity: sha512-x7/XhY67nAKxCwCgvvy4Lt136M1oQbYyPuzH/JjmQxCfuHu2SSlnYKjXiHFahyOJjPcQZtlfDyf04VXgOdsGiA==, tarball: file:projects/arm-mediaservices.tgz} name: '@rush-temp/arm-mediaservices' version: 0.0.0 dependencies: + '@azure/arm-storage': 18.2.0 '@azure/identity': 3.4.1 '@microsoft/api-extractor': 7.38.3(@types/node@18.18.9) '@types/chai': 4.3.10 @@ -13721,10 +13739,11 @@ packages: dev: false file:projects/arm-monitor.tgz: - resolution: {integrity: sha512-Y1VZukOZZynij3LPMM+/n7hJb+m/c7bh24g3s07ALYMcqAVEY8lKmb2tXl936TH+vZ0c3205V8wDBqJDK0etiA==, tarball: file:projects/arm-monitor.tgz} + resolution: {integrity: sha512-tA7a6ywC9AXn6skxr40X2ZLtX2yvIsLJDnw8kkVJRXU8DsfGqX1b28WgsHPolt19B3408boEB86BFDptQ0BtQA==, tarball: file:projects/arm-monitor.tgz} name: '@rush-temp/arm-monitor' version: 0.0.0 dependencies: + '@azure/arm-storage': 18.2.0 '@azure/identity': 3.4.1 '@microsoft/api-extractor': 7.38.3(@types/node@18.18.9) '@types/chai': 4.3.10 @@ -15448,20 +15467,22 @@ packages: dev: false file:projects/arm-storage.tgz: - resolution: {integrity: sha512-UuuK+iuMPz/9v9nntW9IKaos0DJR2H30+RdKKHmtmuZdjeABTJvAGSR5M8LFQxf782daemUgBYSWxjY7KiotTA==, tarball: file:projects/arm-storage.tgz} + resolution: {integrity: sha512-CEgtZ2kFnVwkQ3l/s1o7wrgIWYFc1rYy6tIDtgs4iULJ2WOLS6tNlkDS0Vr51GGnsNSD1aOFDqLyfzCvHyWxbw==, tarball: file:projects/arm-storage.tgz} name: '@rush-temp/arm-storage' version: 0.0.0 dependencies: '@azure/identity': 3.4.1 '@microsoft/api-extractor': 7.38.3(@types/node@18.18.9) '@types/chai': 4.3.10 + '@types/mocha': 10.0.4 '@types/node': 18.18.9 chai: 4.3.10 cross-env: 7.0.3 dotenv: 16.3.1 + esm: 3.2.25 mkdirp: 2.1.6 mocha: 10.2.0 - rimraf: 3.0.2 + rimraf: 5.0.5 ts-node: 10.9.1(@types/node@18.18.9)(typescript@5.2.2) tslib: 2.6.2 typescript: 5.2.2 diff --git a/sdk/storage/arm-storage/_meta.json b/sdk/storage/arm-storage/_meta.json index 807d83db83f9..e6fbcee5845f 100644 --- a/sdk/storage/arm-storage/_meta.json +++ b/sdk/storage/arm-storage/_meta.json @@ -1,8 +1,8 @@ { - "commit": "2888f49ff0b4ce0587780b83530a7974dae71015", + "commit": "5e2ec79b203a555050fe8827e73ae28e86b478c7", "readme": "specification/storage/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\\storage\\resource-manager\\readme.md --use=@autorest/typescript@6.0.5 --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/storage/resource-manager/readme.md --use=@autorest/typescript@^6.0.12", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.7.0", - "use": "@autorest/typescript@6.0.5" + "release_tool": "@azure-tools/js-sdk-release-tools@2.7.4", + "use": "@autorest/typescript@^6.0.12" } \ No newline at end of file diff --git a/sdk/storage/arm-storage/package.json b/sdk/storage/arm-storage/package.json index a8e2be4a3ab5..a0b6d00c35ef 100644 --- a/sdk/storage/arm-storage/package.json +++ b/sdk/storage/arm-storage/package.json @@ -8,12 +8,12 @@ "node": ">=18.0.0" }, "dependencies": { - "@azure/core-lro": "^2.5.3", + "@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": [ @@ -32,17 +32,19 @@ "mkdirp": "^2.1.2", "typescript": "~5.2.0", "uglify-js": "^3.4.9", - "rimraf": "^3.0.0", + "rimraf": "^5.0.0", "dotenv": "^16.0.0", + "@azure/dev-tool": "^1.0.0", "@azure/identity": "^3.3.0", "@azure-tools/test-recorder": "^3.0.0", "@azure-tools/test-credential": "^1.0.0", "mocha": "^10.0.0", + "@types/mocha": "^10.0.0", + "esm": "^3.2.18", "@types/chai": "^4.2.8", "chai": "^4.2.0", "cross-env": "^7.0.2", "@types/node": "^18.0.0", - "@azure/dev-tool": "^1.0.0", "ts-node": "^10.0.0" }, "repository": { @@ -77,7 +79,7 @@ "extract-api": "api-extractor run --local", "lint": "echo skipped", "audit": "echo skipped", - "clean": "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log", + "clean": "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log", "build:node": "echo skipped", "build:browser": "echo skipped", "build:test": "echo skipped", @@ -105,13 +107,5 @@ ] }, "autoPublish": true, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/storage/arm-storage", - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-storage?view=azure-node-preview" - } -} + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/storage/arm-storage" +} \ No newline at end of file diff --git a/sdk/storage/arm-storage/src/operations/storageAccounts.ts b/sdk/storage/arm-storage/src/operations/storageAccounts.ts index f207639bfbfa..339b1e33c980 100644 --- a/sdk/storage/arm-storage/src/operations/storageAccounts.ts +++ b/sdk/storage/arm-storage/src/operations/storageAccounts.ts @@ -524,7 +524,7 @@ export class StorageAccountsImpl implements StorageAccounts { * primary and secondary endpoints are available. The primary use case of a Planned Failover is * disaster recovery testing drills. This type of failover is invoked by setting FailoverType parameter * to 'Planned'. Learn more about the failover options here- - * https://learn.microsoft.com/azure/storage/common/storage-disaster-recovery-guidance + * https://learn.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance * @param resourceGroupName The name of the resource group within the user's subscription. The name is * case insensitive. * @param accountName The name of the storage account within the specified resource group. Storage @@ -600,7 +600,7 @@ export class StorageAccountsImpl implements StorageAccounts { * primary and secondary endpoints are available. The primary use case of a Planned Failover is * disaster recovery testing drills. This type of failover is invoked by setting FailoverType parameter * to 'Planned'. Learn more about the failover options here- - * https://learn.microsoft.com/azure/storage/common/storage-disaster-recovery-guidance + * https://learn.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance * @param resourceGroupName The name of the resource group within the user's subscription. The name is * case insensitive. * @param accountName The name of the storage account within the specified resource group. Storage diff --git a/sdk/storage/arm-storage/src/operationsInterfaces/storageAccounts.ts b/sdk/storage/arm-storage/src/operationsInterfaces/storageAccounts.ts index e8ef18c226a0..249561e313a1 100644 --- a/sdk/storage/arm-storage/src/operationsInterfaces/storageAccounts.ts +++ b/sdk/storage/arm-storage/src/operationsInterfaces/storageAccounts.ts @@ -250,7 +250,7 @@ export interface StorageAccounts { * primary and secondary endpoints are available. The primary use case of a Planned Failover is * disaster recovery testing drills. This type of failover is invoked by setting FailoverType parameter * to 'Planned'. Learn more about the failover options here- - * https://learn.microsoft.com/azure/storage/common/storage-disaster-recovery-guidance + * https://learn.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance * @param resourceGroupName The name of the resource group within the user's subscription. The name is * case insensitive. * @param accountName The name of the storage account within the specified resource group. Storage @@ -273,7 +273,7 @@ export interface StorageAccounts { * primary and secondary endpoints are available. The primary use case of a Planned Failover is * disaster recovery testing drills. This type of failover is invoked by setting FailoverType parameter * to 'Planned'. Learn more about the failover options here- - * https://learn.microsoft.com/azure/storage/common/storage-disaster-recovery-guidance + * https://learn.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance * @param resourceGroupName The name of the resource group within the user's subscription. The name is * case insensitive. * @param accountName The name of the storage account within the specified resource group. Storage diff --git a/sdk/storage/arm-storage/test/sampleTest.ts b/sdk/storage/arm-storage/test/sampleTest.ts new file mode 100644 index 000000000000..25aeb3ebcc36 --- /dev/null +++ b/sdk/storage/arm-storage/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/storage/arm-storage/tsconfig.json b/sdk/storage/arm-storage/tsconfig.json index 2792c048bc1f..3e6ae96443f3 100644 --- a/sdk/storage/arm-storage/tsconfig.json +++ b/sdk/storage/arm-storage/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-storage": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"