From 07a6b503b8c8dd465bf60764cfe87d6b8436a790 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Sat, 22 Jan 2022 01:53:48 +0000 Subject: [PATCH] CodeGen from PR 17458 in Azure/azure-rest-api-specs Merge cc012e96cc9bb035f7e595ed954f175bf6186c92 into a4def981588f1c39ee8d795fdcf6e8594e9a01dc --- sdk/billing/arm-billing/CHANGELOG.md | 20 +++++----- sdk/billing/arm-billing/LICENSE | 2 +- sdk/billing/arm-billing/_meta.json | 6 +-- sdk/billing/arm-billing/api-extractor.json | 25 +++++++++--- sdk/billing/arm-billing/package.json | 4 +- .../arm-billing/review/arm-billing.api.md | 8 ++++ .../src/billingManagementClient.ts | 2 +- sdk/billing/arm-billing/src/models/index.ts | 15 +++++++ sdk/billing/arm-billing/src/models/mappers.ts | 40 +++++++++++++++++++ sdk/billing/arm-billing/tsconfig.json | 16 ++++++-- 10 files changed, 110 insertions(+), 28 deletions(-) diff --git a/sdk/billing/arm-billing/CHANGELOG.md b/sdk/billing/arm-billing/CHANGELOG.md index 9db38f873d8e..91ade850f143 100644 --- a/sdk/billing/arm-billing/CHANGELOG.md +++ b/sdk/billing/arm-billing/CHANGELOG.md @@ -1,15 +1,13 @@ # Release History - -## 4.0.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + +## 4.1.0-beta.1 (2022-01-22) + +**Features** + + - Added Interface BillingProfileInfo + - Type Alias Agreement has a new parameter billingProfilesInfo + + ## 4.0.0 (2021-12-31) The package of @azure/arm-billing is using our next generation design principles since version 4.0.0, which contains breaking changes. diff --git a/sdk/billing/arm-billing/LICENSE b/sdk/billing/arm-billing/LICENSE index ccb63b166732..5d1d36e0af80 100644 --- a/sdk/billing/arm-billing/LICENSE +++ b/sdk/billing/arm-billing/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2021 Microsoft +Copyright (c) 2022 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/billing/arm-billing/_meta.json b/sdk/billing/arm-billing/_meta.json index 4864e3d0f808..881ad81de9a2 100644 --- a/sdk/billing/arm-billing/_meta.json +++ b/sdk/billing/arm-billing/_meta.json @@ -1,7 +1,7 @@ { - "commit": "0fe46ea84880c3232c7a86db0c73f30975b11b0b", + "commit": "a64ff1c7b9466f6efc1bd4868782569d7efcce89", "readme": "specification/billing/resource-manager/readme.md", - "autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/billing/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20211217.1", + "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/billing/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20220105.1", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "use": "@autorest/typescript@6.0.0-alpha.16.20211217.1" + "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1" } \ No newline at end of file diff --git a/sdk/billing/arm-billing/api-extractor.json b/sdk/billing/arm-billing/api-extractor.json index a3ea4f0e6b90..eb563b1c2f58 100644 --- a/sdk/billing/arm-billing/api-extractor.json +++ b/sdk/billing/arm-billing/api-extractor.json @@ -1,18 +1,31 @@ { "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", "mainEntryPointFilePath": "./dist-esm/src/index.d.ts", - "docModel": { "enabled": true }, - "apiReport": { "enabled": true, "reportFolder": "./review" }, + "docModel": { + "enabled": true + }, + "apiReport": { + "enabled": true, + "reportFolder": "./review" + }, "dtsRollup": { "enabled": true, "untrimmedFilePath": "", "publicTrimmedFilePath": "./types/arm-billing.d.ts" }, "messages": { - "tsdocMessageReporting": { "default": { "logLevel": "none" } }, + "tsdocMessageReporting": { + "default": { + "logLevel": "none" + } + }, "extractorMessageReporting": { - "ae-missing-release-tag": { "logLevel": "none" }, - "ae-unresolved-link": { "logLevel": "none" } + "ae-missing-release-tag": { + "logLevel": "none" + }, + "ae-unresolved-link": { + "logLevel": "none" + } } } -} +} \ No newline at end of file diff --git a/sdk/billing/arm-billing/package.json b/sdk/billing/arm-billing/package.json index eaa3fca62847..0bc29b44ce5b 100644 --- a/sdk/billing/arm-billing/package.json +++ b/sdk/billing/arm-billing/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for BillingManagementClient.", - "version": "4.0.1", + "version": "4.1.0-beta.1", "engines": { "node": ">=12.0.0" }, @@ -99,4 +99,4 @@ }, "sideEffects": false, "autoPublish": true -} +} \ No newline at end of file diff --git a/sdk/billing/arm-billing/review/arm-billing.api.md b/sdk/billing/arm-billing/review/arm-billing.api.md index 17009cbc42d6..95190467c7ce 100644 --- a/sdk/billing/arm-billing/review/arm-billing.api.md +++ b/sdk/billing/arm-billing/review/arm-billing.api.md @@ -57,6 +57,7 @@ export type Agreement = Resource & { readonly agreementLink?: string; readonly category?: Category; readonly acceptanceMode?: AcceptanceMode; + readonly billingProfilesInfo?: BillingProfileInfo[]; readonly effectiveDate?: Date; readonly expirationDate?: Date; participants?: Participants[]; @@ -440,6 +441,13 @@ export interface BillingProfileCreationRequest { poNumber?: string; } +// @public +export interface BillingProfileInfo { + billingProfileDisplayName?: string; + billingProfileId?: string; + indirectRelationshipOrganizationName?: string; +} + // @public export interface BillingProfileListResult { readonly nextLink?: string; diff --git a/sdk/billing/arm-billing/src/billingManagementClient.ts b/sdk/billing/arm-billing/src/billingManagementClient.ts index d46500057b1f..99b8424b23cc 100644 --- a/sdk/billing/arm-billing/src/billingManagementClient.ts +++ b/sdk/billing/arm-billing/src/billingManagementClient.ts @@ -87,7 +87,7 @@ export class BillingManagementClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-billing/4.0.0`; + const packageDetails = `azsdk-js-arm-billing/4.1.0-beta.1`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` diff --git a/sdk/billing/arm-billing/src/models/index.ts b/sdk/billing/arm-billing/src/models/index.ts index 81635b09b200..81bb2199cd88 100644 --- a/sdk/billing/arm-billing/src/models/index.ts +++ b/sdk/billing/arm-billing/src/models/index.ts @@ -767,6 +767,16 @@ export interface AgreementListResult { readonly nextLink?: string; } +/** Details about billing profile associated with agreement and available only for specific agreements. */ +export interface BillingProfileInfo { + /** The unique identifier for the billing profile. */ + billingProfileId?: string; + /** The name of the billing profile */ + billingProfileDisplayName?: string; + /** Billing account name. This property is available for a specific type of agreement. */ + indirectRelationshipOrganizationName?: string; +} + /** The details about a participant. */ export interface Participants { /** @@ -1916,6 +1926,11 @@ export type Agreement = Resource & { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly acceptanceMode?: AcceptanceMode; + /** + * The list of billing profiles associated with agreement and present only for specific agreements. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly billingProfilesInfo?: BillingProfileInfo[]; /** * The date from which the agreement is effective. * NOTE: This property will not be serialized. It can only be populated by the server. diff --git a/sdk/billing/arm-billing/src/models/mappers.ts b/sdk/billing/arm-billing/src/models/mappers.ts index cab4b62c81e0..5e1118b84f9f 100644 --- a/sdk/billing/arm-billing/src/models/mappers.ts +++ b/sdk/billing/arm-billing/src/models/mappers.ts @@ -1524,6 +1524,33 @@ export const AgreementListResult: coreClient.CompositeMapper = { } }; +export const BillingProfileInfo: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "BillingProfileInfo", + modelProperties: { + billingProfileId: { + serializedName: "billingProfileId", + type: { + name: "String" + } + }, + billingProfileDisplayName: { + serializedName: "billingProfileDisplayName", + type: { + name: "String" + } + }, + indirectRelationshipOrganizationName: { + serializedName: "indirectRelationshipOrganizationName", + type: { + name: "String" + } + } + } + } +}; + export const Participants: coreClient.CompositeMapper = { type: { name: "Composite", @@ -3580,6 +3607,19 @@ export const Agreement: coreClient.CompositeMapper = { name: "String" } }, + billingProfilesInfo: { + serializedName: "properties.billingProfilesInfo", + readOnly: true, + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "BillingProfileInfo" + } + } + } + }, effectiveDate: { serializedName: "properties.effectiveDate", readOnly: true, diff --git a/sdk/billing/arm-billing/tsconfig.json b/sdk/billing/arm-billing/tsconfig.json index 6e3251194117..3e6ae96443f3 100644 --- a/sdk/billing/arm-billing/tsconfig.json +++ b/sdk/billing/arm-billing/tsconfig.json @@ -9,11 +9,19 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, - "lib": ["es6", "dom"], + "lib": [ + "es6", + "dom" + ], "declaration": true, "outDir": "./dist-esm", "importHelpers": true }, - "include": ["./src/**/*.ts", "./test/**/*.ts"], - "exclude": ["node_modules"] -} + "include": [ + "./src/**/*.ts", + "./test/**/*.ts" + ], + "exclude": [ + "node_modules" + ] +} \ No newline at end of file