From a770af0409780113f93b061e8a78dae57d68cf28 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 25 Sep 2024 04:12:33 +0000 Subject: [PATCH] CodeGen from PR 30721 in Azure/azure-rest-api-specs Merge 941d81824e78c274e03cb4cd71c3d2a551b81b25 into d79d73bea550b643c312dde6a7e817840c1ac914 --- common/config/rush/pnpm-lock.yaml | 39 ++++++++++++++++++--- sdk/billing/arm-billing/_meta.json | 8 ++--- sdk/billing/arm-billing/package.json | 16 +++------ sdk/billing/arm-billing/src/lroImpl.ts | 2 +- sdk/billing/arm-billing/src/models/index.ts | 8 ++--- sdk/billing/arm-billing/test/sampleTest.ts | 8 ++--- sdk/billing/arm-billing/tsconfig.json | 10 ++---- 7 files changed, 52 insertions(+), 39 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 07a389eaa442..89a7f79af94b 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -10488,6 +10488,37 @@ packages: yn: 3.1.1 dev: false + /ts-node@10.9.2(@types/node@18.19.50)(typescript@5.5.4): + resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.50' + '@swc/wasm': '>=1.2.50' + '@types/node': '*' + typescript: '>=2.7' + peerDependenciesMeta: + '@swc/core': + optional: true + '@swc/wasm': + optional: true + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.11 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 18.19.50 + acorn: 8.12.1 + acorn-walk: 8.3.4 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 5.5.4 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + dev: false + /ts-node@10.9.2(@types/node@18.19.50)(typescript@5.6.2): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true @@ -13065,7 +13096,7 @@ packages: dev: false file:projects/arm-billing.tgz: - resolution: {integrity: sha512-hBrwE8YTVASJTUfX1hJSV7lq1o1jZ70DD4DVmq2t5zdugjxFftxsytzyQzdCBYfvAHa5Vxm7a+8gWDOJPsWC9w==, tarball: file:projects/arm-billing.tgz} + resolution: {integrity: sha512-FXyG1I9p+Y3rCU9yl503SMPYgEWGc+oPBAPeLF5d5kK4FBin4fJqk0D7LK4ZIYusE4OTricpA3cmmO/fNWdbQQ==, tarball: file:projects/arm-billing.tgz} name: '@rush-temp/arm-billing' version: 0.0.0 dependencies: @@ -13083,10 +13114,10 @@ packages: mkdirp: 3.0.1 mocha: 10.7.3 rimraf: 5.0.10 - ts-node: 10.9.2(@types/node@18.19.50)(typescript@5.6.2) + ts-node: 10.9.2(@types/node@18.19.50)(typescript@5.5.4) tslib: 2.7.0 tsx: 4.19.1 - typescript: 5.6.2 + typescript: 5.5.4 uglify-js: 3.19.3 transitivePeerDependencies: - '@swc/core' @@ -13742,7 +13773,7 @@ packages: dev: false file:projects/arm-containerservice-1.tgz: - resolution: {integrity: sha512-Wl42MhvqkSN9qt7aI2dq9MoSjUPhKs9Vd7ph4z1NDv/4+Tr5TThGfXEcF6li2/uyM/oej6wCchIOXcN+x5t8Ug==, tarball: file:projects/arm-containerservice-1.tgz} + resolution: {integrity: sha512-giEQbgQSPKX5IztgAepOuRLfULJTB4rv9RXCMFBYOh9cAjTSCfDW5HXmQ9KyPDtFJ1XAEtWRzIcIqEb+93rJ1A==, tarball: file:projects/arm-containerservice-1.tgz} name: '@rush-temp/arm-containerservice-1' version: 0.0.0 dependencies: diff --git a/sdk/billing/arm-billing/_meta.json b/sdk/billing/arm-billing/_meta.json index 82f340e50083..9811510931f3 100644 --- a/sdk/billing/arm-billing/_meta.json +++ b/sdk/billing/arm-billing/_meta.json @@ -1,8 +1,8 @@ { - "commit": "f958cceb74699d24953a6ea04536ed65767fbeb6", + "commit": "0eb27c9c15cf7b2ee632fb4437155b3207ce34b7", "readme": "specification/billing/resource-manager/readme.md", - "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=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\billing\\resource-manager\\readme.md --use=@autorest/typescript@6.0.26 --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/billing/resource-manager/readme.md --use=@autorest/typescript@^6.0.12", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "js-sdk-release-tools@2.7.21-beta", - "use": "@autorest/typescript@6.0.26" + "release_tool": "@azure-tools/js-sdk-release-tools@2.7.14", + "use": "@autorest/typescript@^6.0.12" } \ No newline at end of file diff --git a/sdk/billing/arm-billing/package.json b/sdk/billing/arm-billing/package.json index b195ae56ac88..853382d210dd 100644 --- a/sdk/billing/arm-billing/package.json +++ b/sdk/billing/arm-billing/package.json @@ -30,9 +30,9 @@ "devDependencies": { "@microsoft/api-extractor": "^7.31.1", "mkdirp": "^3.0.1", - "typescript": "~5.6.2", + "typescript": "~5.5.3", "uglify-js": "^3.4.9", - "rimraf": "^5.0.5", + "rimraf": "^5.0.0", "dotenv": "^16.0.0", "@azure/dev-tool": "^1.0.0", "@azure/identity": "^4.2.1", @@ -106,13 +106,5 @@ ] }, "autoPublish": true, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/billing/arm-billing", - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-billing?view=azure-node-preview" - } -} + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/billing/arm-billing" +} \ No newline at end of file diff --git a/sdk/billing/arm-billing/src/lroImpl.ts b/sdk/billing/arm-billing/src/lroImpl.ts index b27f5ac7209b..5f88efab981b 100644 --- a/sdk/billing/arm-billing/src/lroImpl.ts +++ b/sdk/billing/arm-billing/src/lroImpl.ts @@ -7,7 +7,7 @@ */ // Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. +// Licensed under the MIT License. import { AbortSignalLike } from "@azure/abort-controller"; import { LongRunningOperation, LroResponse } from "@azure/core-lro"; diff --git a/sdk/billing/arm-billing/src/models/index.ts b/sdk/billing/arm-billing/src/models/index.ts index 1548bdf90bcf..8e4b21d7e3a3 100644 --- a/sdk/billing/arm-billing/src/models/index.ts +++ b/sdk/billing/arm-billing/src/models/index.ts @@ -1719,7 +1719,7 @@ export interface BillingSubscriptionProperties { */ readonly nextBillingCycleDetails?: NextBillingCycleDetails; /** - * The offer ID for the subscription. This field is only available for the Microsoft Online Services Program billing accounts. + * The offer ID for the subscription. This field is only available for the Microsoft Online Services Program billing accounts or billing accounts with agreement type Enterprise Agreement. * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly offerId?: string; @@ -4104,7 +4104,7 @@ export interface BillingSubscription extends ProxyResourceWithTags { */ readonly nextBillingCycleDetails?: NextBillingCycleDetails; /** - * The offer ID for the subscription. This field is only available for the Microsoft Online Services Program billing accounts. + * The offer ID for the subscription. This field is only available for the Microsoft Online Services Program billing accounts or billing accounts with agreement type Enterprise Agreement. * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly offerId?: string; @@ -4288,7 +4288,7 @@ export interface BillingSubscriptionAlias extends ProxyResourceWithTags { */ readonly nextBillingCycleDetails?: NextBillingCycleDetails; /** - * The offer ID for the subscription. This field is only available for the Microsoft Online Services Program billing accounts. + * The offer ID for the subscription. This field is only available for the Microsoft Online Services Program billing accounts or billing accounts with agreement type Enterprise Agreement. * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly offerId?: string; @@ -4477,7 +4477,7 @@ export interface BillingSubscriptionPatch extends ProxyResourceWithTags { */ readonly nextBillingCycleDetails?: NextBillingCycleDetails; /** - * The offer ID for the subscription. This field is only available for the Microsoft Online Services Program billing accounts. + * The offer ID for the subscription. This field is only available for the Microsoft Online Services Program billing accounts or billing accounts with agreement type Enterprise Agreement. * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly offerId?: string; diff --git a/sdk/billing/arm-billing/test/sampleTest.ts b/sdk/billing/arm-billing/test/sampleTest.ts index 8ff7deb0acbe..d64be981b694 100644 --- a/sdk/billing/arm-billing/test/sampleTest.ts +++ b/sdk/billing/arm-billing/test/sampleTest.ts @@ -9,7 +9,7 @@ import { Recorder, RecorderStartOptions, - env + env, } from "@azure-tools/test-recorder"; import { assert } from "chai"; import { Context } from "mocha"; @@ -18,15 +18,11 @@ 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" + SUBSCRIPTION_ID: "azure_subscription_id", }; const recorderOptions: RecorderStartOptions = { envSetupForPlayback: replaceableVariables, - removeCentralSanitizers: [ - "AZSDK3493", // .name in the body is not a secret and is listed below in the beforeEach section - "AZSDK3430", // .id in the body is not a secret and is listed below in the beforeEach section - ], }; describe("My test", () => { diff --git a/sdk/billing/arm-billing/tsconfig.json b/sdk/billing/arm-billing/tsconfig.json index 9ae8a5150d1d..3e6ae96443f3 100644 --- a/sdk/billing/arm-billing/tsconfig.json +++ b/sdk/billing/arm-billing/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-billing": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"