Skip to content

Commit

Permalink
CodeGen from PR 31527 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge 130ddfbe944cb19345fedd8a0b96a94483d1ccba into 07c0f76f53ae661897e5eb3b47ec151dc2990c6b
  • Loading branch information
SDKAuto committed Nov 13, 2024
1 parent 1174bfb commit d14ef82
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 66 deletions.
9 changes: 6 additions & 3 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions sdk/billing/arm-billing/_meta.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"commit": "f958cceb74699d24953a6ea04536ed65767fbeb6",
"commit": "78495adc7bb7118cee68e56f81586811d9d2a25a",
"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.16",
"use": "@autorest/typescript@^6.0.12"
}
65 changes: 30 additions & 35 deletions sdk/billing/arm-billing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"node": ">=18.0.0"
},
"dependencies": {
"@azure/abort-controller": "^2.1.2",
"@azure/core-auth": "^1.6.0",
"@azure/core-client": "^1.7.0",
"@azure/core-lro": "^2.5.4",
"@azure/abort-controller": "^2.1.2",
"@azure/core-paging": "^1.2.0",
"@azure/core-client": "^1.7.0",
"@azure/core-auth": "^1.6.0",
"@azure/core-rest-pipeline": "^1.14.0",
"tslib": "^2.2.0"
},
Expand All @@ -28,19 +28,22 @@
"module": "./dist-esm/src/index.js",
"types": "./types/arm-billing.d.ts",
"devDependencies": {
"@azure-tools/test-credential": "^1.1.0",
"@azure-tools/test-recorder": "^3.0.0",
"@microsoft/api-extractor": "^7.31.1",
"typescript": "~5.6.2",
"uglify-js": "^3.4.9",
"dotenv": "^16.0.0",
"@azure/dev-tool": "^1.0.0",
"@azure/identity": "^4.2.1",
"@types/chai": "^4.2.8",
"@types/mocha": "^10.0.0",
"@types/node": "^18.0.0",
"chai": "^4.2.0",
"dotenv": "^16.0.0",
"@azure-tools/test-recorder": "^3.0.0",
"@azure-tools/test-credential": "^1.1.0",
"mocha": "^10.0.0",
"ts-node": "^10.0.0",
"@types/mocha": "^10.0.0",
"tsx": "^4.7.1",
"typescript": "~5.6.2"
"@types/chai": "^4.2.8",
"chai": "^4.2.0",
"cross-env": "^7.0.2",
"@types/node": "^18.0.0",
"ts-node": "^10.0.0"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -68,28 +71,28 @@
],
"scripts": {
"build": "npm run clean && tsc && dev-tool run bundle && npm run minify && dev-tool run vendored mkdirp ./review && npm run extract-api",
"build:browser": "echo skipped",
"minify": "uglifyjs -c -m --comments --source-map \"content='./dist/index.js.map'\" -o ./dist/index.min.js ./dist/index.js",
"prepack": "npm run build",
"pack": "npm pack 2>&1",
"extract-api": "dev-tool run extract-api",
"lint": "echo skipped",
"clean": "dev-tool run vendored rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log",
"build:node": "echo skipped",
"build:samples": "echo skipped.",
"build:browser": "echo skipped",
"build:test": "echo skipped",
"build:samples": "echo skipped.",
"check-format": "echo skipped",
"clean": "dev-tool run vendored rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log",
"execute:samples": "echo skipped",
"extract-api": "dev-tool run extract-api",
"format": "echo skipped",
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
"integration-test:browser": "echo skipped",
"integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'",
"lint": "echo skipped",
"minify": "dev-tool run vendored uglifyjs -c -m --comments --source-map \"content='./dist/index.js.map'\" -o ./dist/index.min.js ./dist/index.js",
"pack": "npm pack 2>&1",
"prepack": "npm run build",
"test": "npm run integration-test",
"test:browser": "echo skipped",
"test:node": "echo skipped",
"test:browser": "echo skipped",
"unit-test": "npm run unit-test:node && npm run unit-test:browser",
"unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
"unit-test:browser": "echo skipped",
"unit-test:node": "dev-tool run vendored cross-env TEST_MODE=playback npm run integration-test:node",
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
"integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'",
"integration-test:browser": "echo skipped",
"update-snippets": "echo skipped"
},
"sideEffects": false,
Expand All @@ -102,13 +105,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"
}
5 changes: 1 addition & 4 deletions sdk/billing/arm-billing/sample.env
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
# App registration secret for AAD authentication
AZURE_CLIENT_SECRET=
AZURE_CLIENT_ID=
AZURE_TENANT_ID=
# Feel free to add your own environment variables.
2 changes: 1 addition & 1 deletion sdk/billing/arm-billing/src/lroImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions sdk/billing/arm-billing/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 2 additions & 6 deletions sdk/billing/arm-billing/test/sampleTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {
Recorder,
RecorderStartOptions,
env
env,
} from "@azure-tools/test-recorder";
import { assert } from "chai";
import { Context } from "mocha";
Expand All @@ -18,15 +18,11 @@ const replaceableVariables: Record<string, string> = {
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", () => {
Expand Down
12 changes: 3 additions & 9 deletions sdk/billing/arm-billing/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"src/**/*.ts",
"test/**/*.ts"
],
"exclude": [
"node_modules"
Expand Down

0 comments on commit d14ef82

Please sign in to comment.