@azure/arm-commerce 4.0.0-beta.2 → 4.0.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +2 -2
- package/README.md +1 -1
- package/dist/index.js +106 -14
- package/dist/index.js.map +1 -1
- package/dist/index.min.js +1 -1
- package/dist/index.min.js.map +1 -1
- package/dist-esm/src/index.d.ts +1 -0
- package/dist-esm/src/index.d.ts.map +1 -1
- package/dist-esm/src/index.js +1 -0
- package/dist-esm/src/index.js.map +1 -1
- package/dist-esm/src/models/index.d.ts +6 -6
- package/dist-esm/src/models/index.d.ts.map +1 -1
- package/dist-esm/src/operations/usageAggregates.d.ts.map +1 -1
- package/dist-esm/src/operations/usageAggregates.js +19 -7
- package/dist-esm/src/operations/usageAggregates.js.map +1 -1
- package/dist-esm/src/pagingHelper.d.ts +13 -0
- package/dist-esm/src/pagingHelper.d.ts.map +1 -0
- package/dist-esm/src/pagingHelper.js +32 -0
- package/dist-esm/src/pagingHelper.js.map +1 -0
- package/dist-esm/src/usageManagementClient.d.ts +2 -0
- package/dist-esm/src/usageManagementClient.d.ts.map +1 -1
- package/dist-esm/src/usageManagementClient.js +54 -6
- package/dist-esm/src/usageManagementClient.js.map +1 -1
- package/dist-esm/test/commerce_examples.d.ts.map +1 -1
- package/dist-esm/test/commerce_examples.js +16 -18
- package/dist-esm/test/commerce_examples.js.map +1 -1
- package/package.json +15 -11
- package/review/arm-commerce.api.md +11 -8
- package/src/index.ts +1 -0
- package/src/models/index.ts +7 -6
- package/src/operations/usageAggregates.ts +26 -8
- package/src/pagingHelper.ts +39 -0
- package/src/usageManagementClient.ts +69 -5
- package/types/arm-commerce.d.ts +17 -6
- package/types/tsdoc-metadata.json +1 -1
|
@@ -109,16 +109,16 @@ export interface RateCardQueryParameters {
|
|
|
109
109
|
regionInfo: string;
|
|
110
110
|
}
|
|
111
111
|
/** Indicates that this is a monetary credit offer. */
|
|
112
|
-
export
|
|
112
|
+
export interface MonetaryCredit extends OfferTermInfoAutoGenerated {
|
|
113
113
|
/** Polymorphic discriminator, which specifies the different types this object can be */
|
|
114
114
|
name: "Monetary Credit";
|
|
115
115
|
/** The amount of credit provided under the terms of the given offer level. */
|
|
116
116
|
credit?: number;
|
|
117
117
|
/** An array of meter ids that are excluded from the given offer terms. */
|
|
118
118
|
excludedMeterIds?: string[];
|
|
119
|
-
}
|
|
119
|
+
}
|
|
120
120
|
/** Indicates that a monetary commitment is required for this offer */
|
|
121
|
-
export
|
|
121
|
+
export interface MonetaryCommitment extends OfferTermInfoAutoGenerated {
|
|
122
122
|
/** Polymorphic discriminator, which specifies the different types this object can be */
|
|
123
123
|
name: "Monetary Commitment";
|
|
124
124
|
/** The list of key/value pairs for the tiered meter rates, in the format 'key':'value' where key = price, and value = the corresponding discount percentage. This field is used only by offer terms of type 'Monetary Commitment'. */
|
|
@@ -127,14 +127,14 @@ export declare type MonetaryCommitment = OfferTermInfoAutoGenerated & {
|
|
|
127
127
|
};
|
|
128
128
|
/** An array of meter ids that are excluded from the given offer terms. */
|
|
129
129
|
excludedMeterIds?: string[];
|
|
130
|
-
}
|
|
130
|
+
}
|
|
131
131
|
/** Indicates a recurring charge is present for this offer. */
|
|
132
|
-
export
|
|
132
|
+
export interface RecurringCharge extends OfferTermInfoAutoGenerated {
|
|
133
133
|
/** Polymorphic discriminator, which specifies the different types this object can be */
|
|
134
134
|
name: "Recurring Charge";
|
|
135
135
|
/** The amount of recurring charge as per the offer term. */
|
|
136
136
|
recurringCharge?: number;
|
|
137
|
-
}
|
|
137
|
+
}
|
|
138
138
|
/** Defines values for AggregationGranularity. */
|
|
139
139
|
export declare type AggregationGranularity = "Daily" | "Hourly";
|
|
140
140
|
/** Defines values for OfferTermInfo. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usageAggregates.d.ts","sourceRoot":"","sources":["../../../src/operations/usageAggregates.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,0BAA0B,
|
|
1
|
+
{"version":3,"file":"usageAggregates.d.ts","sourceRoot":"","sources":["../../../src/operations/usageAggregates.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,0BAA0B,EAAgB,MAAM,oBAAoB,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EACL,gBAAgB,EAEhB,iCAAiC,EAGlC,MAAM,WAAW,CAAC;AAGnB,mDAAmD;AACnD,qBAAa,mBAAoB,YAAW,eAAe;IACzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAE/C;;;OAGG;gBACS,MAAM,EAAE,qBAAqB;IAIzC;;;;;OAKG;IACI,IAAI,CACT,iBAAiB,EAAE,IAAI,EACvB,eAAe,EAAE,IAAI,EACrB,OAAO,CAAC,EAAE,iCAAiC,GAC1C,0BAA0B,CAAC,gBAAgB,CAAC;YA2BhC,cAAc;YA6Bd,aAAa;IAc5B;;;;;OAKG;IACH,OAAO,CAAC,KAAK;IAWb;;;;;;OAMG;IACH,OAAO,CAAC,SAAS;CAWlB"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
|
|
7
7
|
*/
|
|
8
8
|
import { __asyncDelegator, __asyncGenerator, __asyncValues, __await } from "tslib";
|
|
9
|
+
import { setContinuationToken } from "../pagingHelper";
|
|
9
10
|
import * as coreClient from "@azure/core-client";
|
|
10
11
|
import * as Mappers from "../models/mappers";
|
|
11
12
|
import * as Parameters from "../models/parameters";
|
|
@@ -34,20 +35,31 @@ export class UsageAggregatesImpl {
|
|
|
34
35
|
[Symbol.asyncIterator]() {
|
|
35
36
|
return this;
|
|
36
37
|
},
|
|
37
|
-
byPage: () => {
|
|
38
|
-
|
|
38
|
+
byPage: (settings) => {
|
|
39
|
+
if (settings === null || settings === void 0 ? void 0 : settings.maxPageSize) {
|
|
40
|
+
throw new Error("maxPageSize is not supported by this operation.");
|
|
41
|
+
}
|
|
42
|
+
return this.listPagingPage(reportedStartTime, reportedEndTime, options, settings);
|
|
39
43
|
}
|
|
40
44
|
};
|
|
41
45
|
}
|
|
42
|
-
listPagingPage(reportedStartTime, reportedEndTime, options) {
|
|
46
|
+
listPagingPage(reportedStartTime, reportedEndTime, options, settings) {
|
|
43
47
|
return __asyncGenerator(this, arguments, function* listPagingPage_1() {
|
|
44
|
-
let result
|
|
45
|
-
|
|
46
|
-
|
|
48
|
+
let result;
|
|
49
|
+
let continuationToken = settings === null || settings === void 0 ? void 0 : settings.continuationToken;
|
|
50
|
+
if (!continuationToken) {
|
|
51
|
+
result = yield __await(this._list(reportedStartTime, reportedEndTime, options));
|
|
52
|
+
let page = result.value || [];
|
|
53
|
+
continuationToken = result.nextLink;
|
|
54
|
+
setContinuationToken(page, continuationToken);
|
|
55
|
+
yield yield __await(page);
|
|
56
|
+
}
|
|
47
57
|
while (continuationToken) {
|
|
48
58
|
result = yield __await(this._listNext(reportedStartTime, reportedEndTime, continuationToken, options));
|
|
49
59
|
continuationToken = result.nextLink;
|
|
50
|
-
|
|
60
|
+
let page = result.value || [];
|
|
61
|
+
setContinuationToken(page, continuationToken);
|
|
62
|
+
yield yield __await(page);
|
|
51
63
|
}
|
|
52
64
|
});
|
|
53
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usageAggregates.js","sourceRoot":"","sources":["../../../src/operations/usageAggregates.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"usageAggregates.js","sourceRoot":"","sources":["../../../src/operations/usageAggregates.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface PageInfo {
|
|
2
|
+
continuationToken?: string;
|
|
3
|
+
}
|
|
4
|
+
/**
|
|
5
|
+
* Given a result page from a pageable operation, returns a
|
|
6
|
+
* continuation token that can be used to begin paging from
|
|
7
|
+
* that point later.
|
|
8
|
+
* @param page A result object from calling .byPage() on a paged operation.
|
|
9
|
+
* @returns The continuation token that can be passed into byPage().
|
|
10
|
+
*/
|
|
11
|
+
export declare function getContinuationToken(page: unknown): string | undefined;
|
|
12
|
+
export declare function setContinuationToken(page: unknown, continuationToken: string | undefined): void;
|
|
13
|
+
//# sourceMappingURL=pagingHelper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pagingHelper.d.ts","sourceRoot":"","sources":["../../src/pagingHelper.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,QAAQ;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAID;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAKtE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,MAAM,GAAG,SAAS,GACpC,IAAI,CAON"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Microsoft Corporation.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*
|
|
5
|
+
* Code generated by Microsoft (R) AutoRest Code Generator.
|
|
6
|
+
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
|
|
7
|
+
*/
|
|
8
|
+
const pageMap = new WeakMap();
|
|
9
|
+
/**
|
|
10
|
+
* Given a result page from a pageable operation, returns a
|
|
11
|
+
* continuation token that can be used to begin paging from
|
|
12
|
+
* that point later.
|
|
13
|
+
* @param page A result object from calling .byPage() on a paged operation.
|
|
14
|
+
* @returns The continuation token that can be passed into byPage().
|
|
15
|
+
*/
|
|
16
|
+
export function getContinuationToken(page) {
|
|
17
|
+
var _a;
|
|
18
|
+
if (typeof page !== "object" || page === null) {
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
return (_a = pageMap.get(page)) === null || _a === void 0 ? void 0 : _a.continuationToken;
|
|
22
|
+
}
|
|
23
|
+
export function setContinuationToken(page, continuationToken) {
|
|
24
|
+
var _a;
|
|
25
|
+
if (typeof page !== "object" || page === null || !continuationToken) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const pageInfo = (_a = pageMap.get(page)) !== null && _a !== void 0 ? _a : {};
|
|
29
|
+
pageInfo.continuationToken = continuationToken;
|
|
30
|
+
pageMap.set(page, pageInfo);
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=pagingHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pagingHelper.js","sourceRoot":"","sources":["../../src/pagingHelper.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,MAAM,OAAO,GAAG,IAAI,OAAO,EAAoB,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAa;;IAChD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;QAC7C,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,0CAAE,iBAAiB,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAAa,EACb,iBAAqC;;IAErC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,iBAAiB,EAAE;QACnE,OAAO;KACR;IACD,MAAM,QAAQ,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC;IACzC,QAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -14,6 +14,8 @@ export declare class UsageManagementClient extends coreClient.ServiceClient {
|
|
|
14
14
|
* @param options The parameter options
|
|
15
15
|
*/
|
|
16
16
|
constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: UsageManagementClientOptionalParams);
|
|
17
|
+
/** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
|
|
18
|
+
private addCustomApiVersionPolicy;
|
|
17
19
|
usageAggregates: UsageAggregates;
|
|
18
20
|
rateCard: RateCard;
|
|
19
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usageManagementClient.d.ts","sourceRoot":"","sources":["../../src/usageManagementClient.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"usageManagementClient.d.ts","sourceRoot":"","sources":["../../src/usageManagementClient.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAOjD,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,mCAAmC,EAAE,MAAM,UAAU,CAAC;AAE/D,qBAAa,qBAAsB,SAAQ,UAAU,CAAC,aAAa;IACjE,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;gBAED,WAAW,EAAE,QAAQ,CAAC,eAAe,EACrC,cAAc,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,mCAAmC;IA6E/C,8GAA8G;IAC9G,OAAO,CAAC,yBAAyB;IA2BjC,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,QAAQ,CAAC;CACpB"}
|
|
@@ -5,7 +5,9 @@
|
|
|
5
5
|
* Code generated by Microsoft (R) AutoRest Code Generator.
|
|
6
6
|
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
|
|
7
7
|
*/
|
|
8
|
+
import { __awaiter } from "tslib";
|
|
8
9
|
import * as coreClient from "@azure/core-client";
|
|
10
|
+
import * as coreRestPipeline from "@azure/core-rest-pipeline";
|
|
9
11
|
import { UsageAggregatesImpl, RateCardImpl } from "./operations";
|
|
10
12
|
export class UsageManagementClient extends coreClient.ServiceClient {
|
|
11
13
|
/**
|
|
@@ -16,7 +18,7 @@ export class UsageManagementClient extends coreClient.ServiceClient {
|
|
|
16
18
|
* @param options The parameter options
|
|
17
19
|
*/
|
|
18
20
|
constructor(credentials, subscriptionId, options) {
|
|
19
|
-
var _a, _b;
|
|
21
|
+
var _a, _b, _c;
|
|
20
22
|
if (credentials === undefined) {
|
|
21
23
|
throw new Error("'credentials' cannot be null");
|
|
22
24
|
}
|
|
@@ -31,17 +33,35 @@ export class UsageManagementClient extends coreClient.ServiceClient {
|
|
|
31
33
|
requestContentType: "application/json; charset=utf-8",
|
|
32
34
|
credential: credentials
|
|
33
35
|
};
|
|
34
|
-
const packageDetails = `azsdk-js-arm-commerce/4.0.0-beta.
|
|
36
|
+
const packageDetails = `azsdk-js-arm-commerce/4.0.0-beta.3`;
|
|
35
37
|
const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix
|
|
36
38
|
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
|
|
37
39
|
: `${packageDetails}`;
|
|
38
|
-
if (!options.credentialScopes) {
|
|
39
|
-
options.credentialScopes = ["https://management.azure.com/.default"];
|
|
40
|
-
}
|
|
41
40
|
const optionsWithDefaults = Object.assign(Object.assign(Object.assign({}, defaults), options), { userAgentOptions: {
|
|
42
41
|
userAgentPrefix
|
|
43
|
-
},
|
|
42
|
+
}, endpoint: (_b = (_a = options.endpoint) !== null && _a !== void 0 ? _a : options.baseUri) !== null && _b !== void 0 ? _b : "https://management.azure.com" });
|
|
44
43
|
super(optionsWithDefaults);
|
|
44
|
+
let bearerTokenAuthenticationPolicyFound = false;
|
|
45
|
+
if ((options === null || options === void 0 ? void 0 : options.pipeline) && options.pipeline.getOrderedPolicies().length > 0) {
|
|
46
|
+
const pipelinePolicies = options.pipeline.getOrderedPolicies();
|
|
47
|
+
bearerTokenAuthenticationPolicyFound = pipelinePolicies.some((pipelinePolicy) => pipelinePolicy.name ===
|
|
48
|
+
coreRestPipeline.bearerTokenAuthenticationPolicyName);
|
|
49
|
+
}
|
|
50
|
+
if (!options ||
|
|
51
|
+
!options.pipeline ||
|
|
52
|
+
options.pipeline.getOrderedPolicies().length == 0 ||
|
|
53
|
+
!bearerTokenAuthenticationPolicyFound) {
|
|
54
|
+
this.pipeline.removePolicy({
|
|
55
|
+
name: coreRestPipeline.bearerTokenAuthenticationPolicyName
|
|
56
|
+
});
|
|
57
|
+
this.pipeline.addPolicy(coreRestPipeline.bearerTokenAuthenticationPolicy({
|
|
58
|
+
credential: credentials,
|
|
59
|
+
scopes: (_c = optionsWithDefaults.credentialScopes) !== null && _c !== void 0 ? _c : `${optionsWithDefaults.endpoint}/.default`,
|
|
60
|
+
challengeCallbacks: {
|
|
61
|
+
authorizeRequestOnChallenge: coreClient.authorizeRequestOnClaimChallenge
|
|
62
|
+
}
|
|
63
|
+
}));
|
|
64
|
+
}
|
|
45
65
|
// Parameter assignments
|
|
46
66
|
this.subscriptionId = subscriptionId;
|
|
47
67
|
// Assigning values to Constant parameters
|
|
@@ -49,6 +69,34 @@ export class UsageManagementClient extends coreClient.ServiceClient {
|
|
|
49
69
|
this.apiVersion = options.apiVersion || "2015-06-01-preview";
|
|
50
70
|
this.usageAggregates = new UsageAggregatesImpl(this);
|
|
51
71
|
this.rateCard = new RateCardImpl(this);
|
|
72
|
+
this.addCustomApiVersionPolicy(options.apiVersion);
|
|
73
|
+
}
|
|
74
|
+
/** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
|
|
75
|
+
addCustomApiVersionPolicy(apiVersion) {
|
|
76
|
+
if (!apiVersion) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
const apiVersionPolicy = {
|
|
80
|
+
name: "CustomApiVersionPolicy",
|
|
81
|
+
sendRequest(request, next) {
|
|
82
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
+
const param = request.url.split("?");
|
|
84
|
+
if (param.length > 1) {
|
|
85
|
+
const newParams = param[1].split("&").map((item) => {
|
|
86
|
+
if (item.indexOf("api-version") > -1) {
|
|
87
|
+
return "api-version=" + apiVersion;
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
return item;
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
request.url = param[0] + "?" + newParams.join("&");
|
|
94
|
+
}
|
|
95
|
+
return next(request);
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
};
|
|
99
|
+
this.pipeline.addPolicy(apiVersionPolicy);
|
|
52
100
|
}
|
|
53
101
|
}
|
|
54
102
|
//# sourceMappingURL=usageManagementClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usageManagementClient.js","sourceRoot":"","sources":["../../src/usageManagementClient.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG
|
|
1
|
+
{"version":3,"file":"usageManagementClient.js","sourceRoot":"","sources":["../../src/usageManagementClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commerce_examples.d.ts","sourceRoot":"","sources":["../../test/commerce_examples.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commerce_examples.d.ts","sourceRoot":"","sources":["../../test/commerce_examples.ts"],"names":[],"mappings":"AAgCA,eAAO,MAAM,kBAAkB;;CAE9B,CAAC"}
|
|
@@ -6,21 +6,18 @@
|
|
|
6
6
|
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
|
|
7
7
|
*/
|
|
8
8
|
import { __awaiter } from "tslib";
|
|
9
|
-
import { env,
|
|
10
|
-
import
|
|
11
|
-
import {
|
|
9
|
+
import { env, Recorder, isPlaybackMode, } from "@azure-tools/test-recorder";
|
|
10
|
+
import { createTestCredential } from "@azure-tools/test-credential";
|
|
11
|
+
import { assert } from "chai";
|
|
12
12
|
import { UsageManagementClient } from "../src/usageManagementClient";
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
(recording) => recording.replace(/"access_token":"[^"]*"/g, `"access_token":"access_token"`)
|
|
22
|
-
],
|
|
23
|
-
queryParametersToSkip: []
|
|
13
|
+
const replaceableVariables = {
|
|
14
|
+
AZURE_CLIENT_ID: "azure_client_id",
|
|
15
|
+
AZURE_CLIENT_SECRET: "azure_client_secret",
|
|
16
|
+
AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
|
|
17
|
+
SUBSCRIPTION_ID: "azure_subscription_id"
|
|
18
|
+
};
|
|
19
|
+
const recorderOptions = {
|
|
20
|
+
envSetupForPlayback: replaceableVariables
|
|
24
21
|
};
|
|
25
22
|
export const testPollingOptions = {
|
|
26
23
|
updateIntervalInMs: isPlaybackMode() ? 0 : undefined,
|
|
@@ -33,11 +30,12 @@ describe("Commerce test", () => {
|
|
|
33
30
|
let resourceGroup;
|
|
34
31
|
beforeEach(function () {
|
|
35
32
|
return __awaiter(this, void 0, void 0, function* () {
|
|
36
|
-
recorder =
|
|
37
|
-
|
|
33
|
+
recorder = new Recorder(this.currentTest);
|
|
34
|
+
yield recorder.start(recorderOptions);
|
|
35
|
+
subscriptionId = env.SUBSCRIPTION_ID || '';
|
|
38
36
|
// This is an example of how the environment variables are used
|
|
39
|
-
const credential =
|
|
40
|
-
client = new UsageManagementClient(credential, subscriptionId);
|
|
37
|
+
const credential = createTestCredential();
|
|
38
|
+
client = new UsageManagementClient(credential, subscriptionId, recorder.configureClientOptions({}));
|
|
41
39
|
location = "eastus";
|
|
42
40
|
resourceGroup = "myjstest";
|
|
43
41
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commerce_examples.js","sourceRoot":"","sources":["../../test/commerce_examples.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;AAEH,OAAO,EACL,GAAG,EACH,
|
|
1
|
+
{"version":3,"file":"commerce_examples.js","sourceRoot":"","sources":["../../test/commerce_examples.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;AAEH,OAAO,EACL,GAAG,EACH,QAAQ,EAGR,cAAc,GACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAGrE,MAAM,oBAAoB,GAA2B;IACnD,eAAe,EAAE,iBAAiB;IAClC,mBAAmB,EAAE,qBAAqB;IAC1C,eAAe,EAAE,sCAAsC;IACvD,eAAe,EAAE,uBAAuB;CACzC,CAAC;AAEF,MAAM,eAAe,GAAyB;IAC5C,mBAAmB,EAAE,oBAAoB;CAC1C,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,kBAAkB,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;CACrD,CAAC;AAEF,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,QAAkB,CAAC;IACvB,IAAI,cAAsB,CAAC;IAC3B,IAAI,MAA6B,CAAC;IAClC,IAAI,QAAgB,CAAC;IACrB,IAAI,aAAqB,CAAC;IAE1B,UAAU,CAAC;;YACT,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC1C,MAAM,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACtC,cAAc,GAAG,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC;YAC3C,+DAA+D;YAC/D,MAAM,UAAU,GAAG,oBAAoB,EAAE,CAAC;YAC1C,MAAM,GAAG,IAAI,qBAAqB,CAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC;YACpG,QAAQ,GAAG,QAAQ,CAAC;YACpB,aAAa,GAAG,UAAU,CAAC;QAC7B,CAAC;KAAA,CAAC,CAAC;IAEH,SAAS,CAAC;;YACR,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxB,CAAC;KAAA,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE;;;YACtB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,qGAAqG,CAAC,CAAC;YAC7I,MAAM,CAAC,QAAQ,CAAC,MAAA,GAAG,CAAC,MAAM,0CAAE,MAAM,EAAE,CAAC,CAAC,CAAC;;KACxC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -3,15 +3,15 @@
|
|
|
3
3
|
"sdk-type": "mgmt",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "A generated SDK for UsageManagementClient.",
|
|
6
|
-
"version": "4.0.0-beta.
|
|
6
|
+
"version": "4.0.0-beta.3",
|
|
7
7
|
"engines": {
|
|
8
|
-
"node": ">=
|
|
8
|
+
"node": ">=14.0.0"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
11
|
"@azure/core-paging": "^1.2.0",
|
|
12
|
-
"@azure/core-client": "^1.
|
|
12
|
+
"@azure/core-client": "^1.6.1",
|
|
13
13
|
"@azure/core-auth": "^1.3.0",
|
|
14
|
-
"@azure/core-rest-pipeline": "^1.
|
|
14
|
+
"@azure/core-rest-pipeline": "^1.8.0",
|
|
15
15
|
"tslib": "^2.2.0"
|
|
16
16
|
},
|
|
17
17
|
"keywords": [
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"module": "./dist-esm/src/index.js",
|
|
27
27
|
"types": "./types/arm-commerce.d.ts",
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@microsoft/api-extractor": "^7.
|
|
29
|
+
"@microsoft/api-extractor": "^7.31.1",
|
|
30
30
|
"@rollup/plugin-commonjs": "^21.0.1",
|
|
31
31
|
"@rollup/plugin-json": "^4.1.0",
|
|
32
32
|
"@rollup/plugin-multi-entry": "^4.1.0",
|
|
@@ -34,13 +34,18 @@
|
|
|
34
34
|
"mkdirp": "^1.0.4",
|
|
35
35
|
"rollup": "^2.66.1",
|
|
36
36
|
"rollup-plugin-sourcemaps": "^0.6.3",
|
|
37
|
-
"typescript": "~4.
|
|
37
|
+
"typescript": "~4.8.0",
|
|
38
38
|
"uglify-js": "^3.4.9",
|
|
39
39
|
"rimraf": "^3.0.0",
|
|
40
40
|
"@azure/identity": "^2.0.1",
|
|
41
|
-
"@azure-tools/test-recorder": "^
|
|
41
|
+
"@azure-tools/test-recorder": "^2.0.0",
|
|
42
|
+
"@azure-tools/test-credential": "^1.0.0",
|
|
42
43
|
"mocha": "^7.1.1",
|
|
43
|
-
"
|
|
44
|
+
"@types/chai": "^4.2.8",
|
|
45
|
+
"chai": "^4.2.0",
|
|
46
|
+
"cross-env": "^7.0.2",
|
|
47
|
+
"@types/node": "^14.0.0",
|
|
48
|
+
"@azure/dev-tool": "^1.0.0"
|
|
44
49
|
},
|
|
45
50
|
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/commerce/arm-commerce",
|
|
46
51
|
"repository": {
|
|
@@ -91,9 +96,8 @@
|
|
|
91
96
|
"unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
|
|
92
97
|
"unit-test:browser": "echo skipped",
|
|
93
98
|
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
|
|
94
|
-
"integration-test:node": "
|
|
95
|
-
"integration-test:browser": "echo skipped"
|
|
96
|
-
"docs": "echo skipped"
|
|
99
|
+
"integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'",
|
|
100
|
+
"integration-test:browser": "echo skipped"
|
|
97
101
|
},
|
|
98
102
|
"sideEffects": false,
|
|
99
103
|
"//metadata": {
|
|
@@ -17,6 +17,9 @@ export interface ErrorResponse {
|
|
|
17
17
|
message?: string;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
+
// @public
|
|
21
|
+
export function getContinuationToken(page: unknown): string | undefined;
|
|
22
|
+
|
|
20
23
|
// @public
|
|
21
24
|
export interface InfoField {
|
|
22
25
|
project?: string;
|
|
@@ -39,20 +42,20 @@ export interface MeterInfo {
|
|
|
39
42
|
}
|
|
40
43
|
|
|
41
44
|
// @public
|
|
42
|
-
export
|
|
45
|
+
export interface MonetaryCommitment extends OfferTermInfoAutoGenerated {
|
|
46
|
+
excludedMeterIds?: string[];
|
|
43
47
|
name: "Monetary Commitment";
|
|
44
48
|
tieredDiscount?: {
|
|
45
49
|
[propertyName: string]: number;
|
|
46
50
|
};
|
|
47
|
-
|
|
48
|
-
};
|
|
51
|
+
}
|
|
49
52
|
|
|
50
53
|
// @public
|
|
51
|
-
export
|
|
52
|
-
name: "Monetary Credit";
|
|
54
|
+
export interface MonetaryCredit extends OfferTermInfoAutoGenerated {
|
|
53
55
|
credit?: number;
|
|
54
56
|
excludedMeterIds?: string[];
|
|
55
|
-
|
|
57
|
+
name: "Monetary Credit";
|
|
58
|
+
}
|
|
56
59
|
|
|
57
60
|
// @public
|
|
58
61
|
export type OfferTermInfo = "Recurring Charge" | "Monetary Commitment" | "Monetary Credit";
|
|
@@ -87,10 +90,10 @@ export interface RateCardQueryParameters {
|
|
|
87
90
|
}
|
|
88
91
|
|
|
89
92
|
// @public
|
|
90
|
-
export
|
|
93
|
+
export interface RecurringCharge extends OfferTermInfoAutoGenerated {
|
|
91
94
|
name: "Recurring Charge";
|
|
92
95
|
recurringCharge?: number;
|
|
93
|
-
}
|
|
96
|
+
}
|
|
94
97
|
|
|
95
98
|
// @public
|
|
96
99
|
export interface ResourceRateCardInfo {
|
package/src/index.ts
CHANGED
package/src/models/index.ts
CHANGED
|
@@ -129,32 +129,33 @@ export interface RateCardQueryParameters {
|
|
|
129
129
|
}
|
|
130
130
|
|
|
131
131
|
/** Indicates that this is a monetary credit offer. */
|
|
132
|
-
export
|
|
132
|
+
export interface MonetaryCredit extends OfferTermInfoAutoGenerated {
|
|
133
133
|
/** Polymorphic discriminator, which specifies the different types this object can be */
|
|
134
134
|
name: "Monetary Credit";
|
|
135
135
|
/** The amount of credit provided under the terms of the given offer level. */
|
|
136
136
|
credit?: number;
|
|
137
137
|
/** An array of meter ids that are excluded from the given offer terms. */
|
|
138
138
|
excludedMeterIds?: string[];
|
|
139
|
-
}
|
|
139
|
+
}
|
|
140
140
|
|
|
141
141
|
/** Indicates that a monetary commitment is required for this offer */
|
|
142
|
-
export
|
|
142
|
+
export interface MonetaryCommitment extends OfferTermInfoAutoGenerated {
|
|
143
143
|
/** Polymorphic discriminator, which specifies the different types this object can be */
|
|
144
144
|
name: "Monetary Commitment";
|
|
145
145
|
/** The list of key/value pairs for the tiered meter rates, in the format 'key':'value' where key = price, and value = the corresponding discount percentage. This field is used only by offer terms of type 'Monetary Commitment'. */
|
|
146
146
|
tieredDiscount?: { [propertyName: string]: number };
|
|
147
147
|
/** An array of meter ids that are excluded from the given offer terms. */
|
|
148
148
|
excludedMeterIds?: string[];
|
|
149
|
-
}
|
|
149
|
+
}
|
|
150
150
|
|
|
151
151
|
/** Indicates a recurring charge is present for this offer. */
|
|
152
|
-
export
|
|
152
|
+
export interface RecurringCharge extends OfferTermInfoAutoGenerated {
|
|
153
153
|
/** Polymorphic discriminator, which specifies the different types this object can be */
|
|
154
154
|
name: "Recurring Charge";
|
|
155
155
|
/** The amount of recurring charge as per the offer term. */
|
|
156
156
|
recurringCharge?: number;
|
|
157
|
-
}
|
|
157
|
+
}
|
|
158
|
+
|
|
158
159
|
/** Defines values for AggregationGranularity. */
|
|
159
160
|
export type AggregationGranularity = "Daily" | "Hourly";
|
|
160
161
|
/** Defines values for OfferTermInfo. */
|
|
@@ -6,7 +6,8 @@
|
|
|
6
6
|
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
|
-
import { PagedAsyncIterableIterator } from "@azure/core-paging";
|
|
9
|
+
import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
|
|
10
|
+
import { setContinuationToken } from "../pagingHelper";
|
|
10
11
|
import { UsageAggregates } from "../operationsInterfaces";
|
|
11
12
|
import * as coreClient from "@azure/core-client";
|
|
12
13
|
import * as Mappers from "../models/mappers";
|
|
@@ -56,8 +57,16 @@ export class UsageAggregatesImpl implements UsageAggregates {
|
|
|
56
57
|
[Symbol.asyncIterator]() {
|
|
57
58
|
return this;
|
|
58
59
|
},
|
|
59
|
-
byPage: () => {
|
|
60
|
-
|
|
60
|
+
byPage: (settings?: PageSettings) => {
|
|
61
|
+
if (settings?.maxPageSize) {
|
|
62
|
+
throw new Error("maxPageSize is not supported by this operation.");
|
|
63
|
+
}
|
|
64
|
+
return this.listPagingPage(
|
|
65
|
+
reportedStartTime,
|
|
66
|
+
reportedEndTime,
|
|
67
|
+
options,
|
|
68
|
+
settings
|
|
69
|
+
);
|
|
61
70
|
}
|
|
62
71
|
};
|
|
63
72
|
}
|
|
@@ -65,11 +74,18 @@ export class UsageAggregatesImpl implements UsageAggregates {
|
|
|
65
74
|
private async *listPagingPage(
|
|
66
75
|
reportedStartTime: Date,
|
|
67
76
|
reportedEndTime: Date,
|
|
68
|
-
options?: UsageAggregatesListOptionalParams
|
|
77
|
+
options?: UsageAggregatesListOptionalParams,
|
|
78
|
+
settings?: PageSettings
|
|
69
79
|
): AsyncIterableIterator<UsageAggregation[]> {
|
|
70
|
-
let result
|
|
71
|
-
|
|
72
|
-
|
|
80
|
+
let result: UsageAggregatesListResponse;
|
|
81
|
+
let continuationToken = settings?.continuationToken;
|
|
82
|
+
if (!continuationToken) {
|
|
83
|
+
result = await this._list(reportedStartTime, reportedEndTime, options);
|
|
84
|
+
let page = result.value || [];
|
|
85
|
+
continuationToken = result.nextLink;
|
|
86
|
+
setContinuationToken(page, continuationToken);
|
|
87
|
+
yield page;
|
|
88
|
+
}
|
|
73
89
|
while (continuationToken) {
|
|
74
90
|
result = await this._listNext(
|
|
75
91
|
reportedStartTime,
|
|
@@ -78,7 +94,9 @@ export class UsageAggregatesImpl implements UsageAggregates {
|
|
|
78
94
|
options
|
|
79
95
|
);
|
|
80
96
|
continuationToken = result.nextLink;
|
|
81
|
-
|
|
97
|
+
let page = result.value || [];
|
|
98
|
+
setContinuationToken(page, continuationToken);
|
|
99
|
+
yield page;
|
|
82
100
|
}
|
|
83
101
|
}
|
|
84
102
|
|