Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR track2_@azure/arm-billing] [Microsoft.Billing] S360 | Adding missing properties for GA swagger #7458

Closed
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
21 changes: 10 additions & 11 deletions sdk/billing/arm-billing/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# Release History

## 4.0.1 (Unreleased)

### Features Added

### Breaking Changes

### Bugs Fixed

### Other Changes


## 4.1.0-beta.1 (2022-02-09)

**Features**

- Added Interface BillingProfileInfo
- Interface BillingProfileListResult has a new optional parameter totalCount
- Type Alias Agreement has a new parameter billingProfileInfo


## 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.
Expand Down
2 changes: 1 addition & 1 deletion sdk/billing/arm-billing/LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions sdk/billing/arm-billing/_meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commit": "0fe46ea84880c3232c7a86db0c73f30975b11b0b",
"commit": "96ed8535a27b7216ac5d6ddee8d7f5c8c0d3c46d",
"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"
}
25 changes: 19 additions & 6 deletions sdk/billing/arm-billing/api-extractor.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
}
4 changes: 2 additions & 2 deletions sdk/billing/arm-billing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -99,4 +99,4 @@
},
"sideEffects": false,
"autoPublish": true
}
}
9 changes: 9 additions & 0 deletions sdk/billing/arm-billing/review/arm-billing.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export type Agreement = Resource & {
readonly agreementLink?: string;
readonly category?: Category;
readonly acceptanceMode?: AcceptanceMode;
readonly billingProfileInfo?: BillingProfileInfo;
readonly effectiveDate?: Date;
readonly expirationDate?: Date;
participants?: Participants[];
Expand Down Expand Up @@ -440,9 +441,17 @@ export interface BillingProfileCreationRequest {
poNumber?: string;
}

// @public
export interface BillingProfileInfo {
billingProfileDisplayName?: string;
billingProfileId?: string;
indirectRelationshipOrganizationName?: string;
}

// @public
export interface BillingProfileListResult {
readonly nextLink?: string;
readonly totalCount?: number;
readonly value?: BillingProfile[];
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/billing/arm-billing/src/billingManagementClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
Expand Down
20 changes: 20 additions & 0 deletions sdk/billing/arm-billing/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,11 @@ export interface BillingProfileListResult {
* NOTE: This property will not be serialized. It can only be populated by the server.
*/
readonly value?: BillingProfile[];
/**
* Total number of records.
* NOTE: This property will not be serialized. It can only be populated by the server.
*/
readonly totalCount?: number;
/**
* The link (url) to the next page of results.
* NOTE: This property will not be serialized. It can only be populated by the server.
Expand Down Expand Up @@ -767,6 +772,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 {
/**
Expand Down Expand Up @@ -1916,6 +1931,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 billingProfileInfo?: BillingProfileInfo;
/**
* The date from which the agreement is effective.
* NOTE: This property will not be serialized. It can only be populated by the server.
Expand Down
41 changes: 41 additions & 0 deletions sdk/billing/arm-billing/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,13 @@ export const BillingProfileListResult: coreClient.CompositeMapper = {
}
}
},
totalCount: {
serializedName: "totalCount",
readOnly: true,
type: {
name: "Number"
}
},
nextLink: {
serializedName: "nextLink",
readOnly: true,
Expand Down Expand Up @@ -1524,6 +1531,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",
Expand Down Expand Up @@ -3580,6 +3614,13 @@ export const Agreement: coreClient.CompositeMapper = {
name: "String"
}
},
billingProfileInfo: {
serializedName: "properties.billingProfileInfo",
type: {
name: "Composite",
className: "BillingProfileInfo"
}
},
effectiveDate: {
serializedName: "properties.effectiveDate",
readOnly: true,
Expand Down
16 changes: 12 additions & 4 deletions sdk/billing/arm-billing/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}