Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
CodeGen from PR 30721 in Azure/azure-rest-api-specs
Merge be066bcba4f8e06bf2755d015d77fa642412b1c8 into e6fde2ac19d0202f0e72217a3e0f9edb63dba273
  • Loading branch information
SDKAuto committed Sep 27, 2024
commit 8a589e93c2f12d478e7b1de1ca3e71d7929ca894
8 changes: 4 additions & 4 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": "97434fb970b73a35476e10ae5f3e7b631d8ad9aa",
"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"
}
69 changes: 30 additions & 39 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,24 +28,24 @@
"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",
"mkdirp": "^3.0.1",
"typescript": "~5.5.3",
"uglify-js": "^3.4.9",
"rimraf": "^5.0.0",
"dotenv": "^16.0.0",
"@azure/dev-tool": "^1.0.0",
"@azure/identity": "^4.2.1",
"@microsoft/api-extractor": "^7.31.1",
"@types/chai": "^4.2.8",
"@azure-tools/test-recorder": "^3.0.0",
"@azure-tools/test-credential": "^1.1.0",
"mocha": "^10.0.0",
"@types/mocha": "^10.0.0",
"@types/node": "^18.0.0",
"tsx": "^4.7.1",
"@types/chai": "^4.2.8",
"chai": "^4.2.0",
"cross-env": "^7.0.2",
"dotenv": "^16.0.0",
"mkdirp": "^3.0.1",
"mocha": "^10.0.0",
"rimraf": "^5.0.5",
"ts-node": "^10.0.0",
"tsx": "^4.7.1",
"typescript": "~5.6.2",
"uglify-js": "^3.4.9"
"@types/node": "^18.0.0",
"ts-node": "^10.0.0"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -73,29 +73,28 @@
],
"scripts": {
"build": "npm run clean && tsc && dev-tool run bundle && npm run minify && 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": "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": "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": "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:browser": "echo skipped",
"unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
"update-snippets": "echo skipped"
"unit-test:browser": "echo skipped",
"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"
},
"sideEffects": false,
"//metadata": {
Expand All @@ -107,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"
}
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
10 changes: 2 additions & 8 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"
"./test/**/*.ts"
],
"exclude": [
"node_modules"
Expand Down