diff --git a/sdk/commerce/arm-commerce/CHANGELOG.md b/sdk/commerce/arm-commerce/CHANGELOG.md index 68d9b1028a8e..5bfdb7f4edb4 100644 --- a/sdk/commerce/arm-commerce/CHANGELOG.md +++ b/sdk/commerce/arm-commerce/CHANGELOG.md @@ -1,18 +1,8 @@ # Release History + +## 4.0.0-beta.4 (2023-02-10) -## 4.0.0-beta.4 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - -## 4.0.0-beta.3 (2022-11-17) - -The package of @azure/arm-commerce is using our next generation design principles since version 4.0.0-beta.3, which contains breaking changes. +The package of @azure/arm-commerce is using our next generation design principles since version 4.0.0-beta.4, which contains breaking changes. To understand the detail of the change, please refer to [Changelog](https://aka.ms/js-track2-changelog). diff --git a/sdk/commerce/arm-commerce/LICENSE b/sdk/commerce/arm-commerce/LICENSE index 5d1d36e0af80..3a1d9b6f24f7 100644 --- a/sdk/commerce/arm-commerce/LICENSE +++ b/sdk/commerce/arm-commerce/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2022 Microsoft +Copyright (c) 2023 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/commerce/arm-commerce/_meta.json b/sdk/commerce/arm-commerce/_meta.json index 78950a2694aa..ef6b506c17fc 100644 --- a/sdk/commerce/arm-commerce/_meta.json +++ b/sdk/commerce/arm-commerce/_meta.json @@ -1,8 +1,8 @@ { - "commit": "d29e6eb4894005c52e67cb4b5ac3faf031113e7d", - "readme": "specification\\commerce\\resource-manager\\readme.md", - "autorest_command": "autorest --version=3.8.4 --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\\commerce\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.3.20221108.1 --generate-sample=true", + "commit": "289ed254a0f9e94397afe3245ec048e368332eeb", + "readme": "specification/commerce/resource-manager/readme.md", + "autorest_command": "autorest --version=3.9.3 --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/commerce/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.5", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.4.2", - "use": "@autorest/typescript@6.0.0-rc.3.20221108.1" + "release_tool": "@azure-tools/js-sdk-release-tools@2.6.2", + "use": "@autorest/typescript@6.0.0-rc.5" } \ No newline at end of file diff --git a/sdk/commerce/arm-commerce/package.json b/sdk/commerce/arm-commerce/package.json index f776916f921b..ae5d99ddc059 100644 --- a/sdk/commerce/arm-commerce/package.json +++ b/sdk/commerce/arm-commerce/package.json @@ -108,13 +108,5 @@ } ] }, - "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-commerce?view=azure-node-preview" - } -} + "autoPublish": true +} \ No newline at end of file diff --git a/sdk/commerce/arm-commerce/review/arm-commerce.api.md b/sdk/commerce/arm-commerce/review/arm-commerce.api.md index 8216bd495224..3b9d390a8191 100644 --- a/sdk/commerce/arm-commerce/review/arm-commerce.api.md +++ b/sdk/commerce/arm-commerce/review/arm-commerce.api.md @@ -111,9 +111,6 @@ export interface UsageAggregates { // @public export interface UsageAggregatesListNextOptionalParams extends coreClient.OperationOptions { - aggregationGranularity?: AggregationGranularity; - continuationToken?: string; - showDetails?: boolean; } // @public diff --git a/sdk/commerce/arm-commerce/src/models/index.ts b/sdk/commerce/arm-commerce/src/models/index.ts index 3317546d2ede..d3b3f65974f3 100644 --- a/sdk/commerce/arm-commerce/src/models/index.ts +++ b/sdk/commerce/arm-commerce/src/models/index.ts @@ -180,14 +180,7 @@ export type UsageAggregatesListResponse = UsageAggregationListResult; /** Optional parameters. */ export interface UsageAggregatesListNextOptionalParams - extends coreClient.OperationOptions { - /** `True` returns usage data in instance-level detail, `false` causes server-side aggregation with fewer details. For example, if you have 3 website instances, by default you will get 3 line items for website consumption. If you specify showDetails = false, the data will be aggregated as a single line item for website consumption within the time period (for the given subscriptionId, meterId, usageStartTime and usageEndTime). */ - showDetails?: boolean; - /** `Daily` (default) returns the data in daily granularity, `Hourly` returns the data in hourly granularity. */ - aggregationGranularity?: AggregationGranularity; - /** Used when a continuation token string is provided in the response body of the previous call, enabling paging through a large result set. If not present, the data is retrieved from the beginning of the day/hour (based on the granularity) passed in. */ - continuationToken?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type UsageAggregatesListNextResponse = UsageAggregationListResult; diff --git a/sdk/commerce/arm-commerce/src/operations/usageAggregates.ts b/sdk/commerce/arm-commerce/src/operations/usageAggregates.ts index 4e1751e53c7e..60cf6b67620d 100644 --- a/sdk/commerce/arm-commerce/src/operations/usageAggregates.ts +++ b/sdk/commerce/arm-commerce/src/operations/usageAggregates.ts @@ -87,12 +87,7 @@ export class UsageAggregatesImpl implements UsageAggregates { yield page; } while (continuationToken) { - result = await this._listNext( - reportedStartTime, - reportedEndTime, - continuationToken, - options - ); + result = await this._listNext(continuationToken, options); continuationToken = result.nextLink; let page = result.value || []; setContinuationToken(page, continuationToken); @@ -133,19 +128,15 @@ export class UsageAggregatesImpl implements UsageAggregates { /** * ListNext - * @param reportedStartTime The start of the time range to retrieve data for. - * @param reportedEndTime The end of the time range to retrieve data for. * @param nextLink The nextLink from the previous successful call to the List method. * @param options The options parameters. */ private _listNext( - reportedStartTime: Date, - reportedEndTime: Date, nextLink: string, options?: UsageAggregatesListNextOptionalParams ): Promise { return this.client.sendOperationRequest( - { reportedStartTime, reportedEndTime, nextLink, options }, + { nextLink, options }, listNextOperationSpec ); } @@ -188,14 +179,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.reportedStartTime, - Parameters.reportedEndTime, - Parameters.showDetails, - Parameters.aggregationGranularity, - Parameters.continuationToken, - Parameters.apiVersion - ], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/commerce/arm-commerce/src/pagingHelper.ts b/sdk/commerce/arm-commerce/src/pagingHelper.ts index d85fc13bce1e..269a2b9814b5 100644 --- a/sdk/commerce/arm-commerce/src/pagingHelper.ts +++ b/sdk/commerce/arm-commerce/src/pagingHelper.ts @@ -13,11 +13,11 @@ export interface PageInfo { const pageMap = new WeakMap(); /** - * Given a result page from a pageable operation, returns a - * continuation token that can be used to begin paging from + * Given the last `.value` produced by the `byPage` iterator, + * returns a continuation token that can be used to begin paging from * that point later. - * @param page A result object from calling .byPage() on a paged operation. - * @returns The continuation token that can be passed into byPage(). + * @param page An object from accessing `value` on the IteratorResult from a `byPage` iterator. + * @returns The continuation token that can be passed into byPage() during future calls. */ export function getContinuationToken(page: unknown): string | undefined { if (typeof page !== "object" || page === null) { diff --git a/sdk/commerce/arm-commerce/test/sampleTest.ts b/sdk/commerce/arm-commerce/test/sampleTest.ts new file mode 100644 index 000000000000..25aeb3ebcc36 --- /dev/null +++ b/sdk/commerce/arm-commerce/test/sampleTest.ts @@ -0,0 +1,43 @@ +/* + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. + */ + +import { + Recorder, + RecorderStartOptions, + env +} from "@azure-tools/test-recorder"; +import { assert } from "chai"; +import { Context } from "mocha"; + +const replaceableVariables: Record = { + 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" +}; + +const recorderOptions: RecorderStartOptions = { + envSetupForPlayback: replaceableVariables +}; + +describe("My test", () => { + let recorder: Recorder; + + beforeEach(async function(this: Context) { + recorder = new Recorder(this.currentTest); + await recorder.start(recorderOptions); + }); + + afterEach(async function() { + await recorder.stop(); + }); + + it("sample test", async function() { + console.log("Hi, I'm a test!"); + }); +}); diff --git a/sdk/commerce/arm-commerce/tsconfig.json b/sdk/commerce/arm-commerce/tsconfig.json index 7e7b314b0f0d..3e6ae96443f3 100644 --- a/sdk/commerce/arm-commerce/tsconfig.json +++ b/sdk/commerce/arm-commerce/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-commerce": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"