-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
arm-consumption-track2 #18678
Closed
Closed
arm-consumption-track2 #18678
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
d2349fe
update
colawwj 8d9d4e6
Sync eng/common directory with azure-sdk-tools for PR 2265 (#18683)
azure-sdk 26ca5a7
Build and test predefined set of packages only in identity pipelines …
praveenkuttappan eeee083
update
colawwj 1335879
update
colawwj 069012a
update
colawwj 0cfea44
update
colawwj 8423f9e
update ci.yml
colawwj 3938c20
update
colawwj 2f2e80a
update
colawwj 42f84b2
update
colawwj c5427e8
update
colawwj 920e91b
update
colawwj b9ddb94
update
colawwj f22784d
back 3938
colawwj 82d9359
Merge branch 'arm-consumption-track2' of https://github.com/colawwj/a…
colawwj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| ## 9.0.0-beta.1 (2021-11-16) | ||
|
|
||
| This is the first preview for the new version of the `@azure/arm-consumption` package that follows the new [guidelines for TypeScript SDKs](https://azure.github.io/azure-sdk/typescript_introduction.html) for Azure services. | ||
|
|
||
| While this package remains auto generated, the SDK generator itself has undergone changes to comply with the above guidelines in order to generate packages that are idiomatic to the JavaScript/TypeScript ecosystem and consistent with other packages for Azure services. For more on this, please see [State of the Azure SDK 2021](https://devblogs.microsoft.com/azure-sdk/state-of-the-azure-sdk-2021/). | ||
|
|
||
| Please note that this version has breaking changes, all of which were made after careful consideration during the authoring of the guidelines and user studies. | ||
|
|
||
| **Noteworthy changes and features** | ||
| - Authentication: The packages `@azure/ms-rest-nodeauth` or `@azure/ms-rest-browserauth` are no longer supported. Use package [@azure/identity](https://www.npmjs.com/package/@azure/identity) instead. Select a credential from Azure Identity examples based on the authentication method of your choice. | ||
| - Callbacks: Method overloads that used callbacks have been removed and the use of promises is encouraged instead. | ||
| - List operations now return an iterable result that follows the `PagedAsyncIterableIterator` interface as opposed to the previous model where you had to make a new request using the link to the next page. | ||
| - Long running operations i.e. the Lro related object returned by methods whose names started with `begin`, now uses `pollUntilDone` to check whether the request is finished, instead of `pollUntilFinished`. To get the final result, use the corresponding method that will have the suffix `AndWait`. | ||
| - The SDK only supports ECMAScript 2015 (ES6) and beyond, all projects that referenced this SDK should be upgraded to use ES6. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,94 @@ | ||
| ## Azure ConsumptionManagementClient SDK for JavaScript | ||
| # Azure ConsumptionManagement client library for JavaScript | ||
|
|
||
| This package contains an isomorphic SDK (runs both in Node.js and in browsers) for ConsumptionManagementClient. | ||
| This package contains an isomorphic SDK (runs both in Node.js and in browsers) for Azure ConsumptionManagement client. | ||
|
|
||
| Consumption management client provides access to consumption resources for Azure Enterprise Subscriptions. | ||
|
|
||
| [Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/consumption/arm-consumption) | | ||
| [Package (NPM)](https://www.npmjs.com/package/@azure/arm-consumption) | | ||
| [API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-consumption) | | ||
| [Samples](https://github.com/Azure-Samples/azure-samples-js-management) | ||
|
|
||
| ## Getting started | ||
|
|
||
| ### Currently supported environments | ||
|
|
||
| - [LTS versions of Node.js](https://nodejs.org/about/releases/) | ||
| - Latest versions of Safari, Chrome, Edge, and Firefox. | ||
| - Latest versions of Safari, Chrome, Edge and Firefox. | ||
|
|
||
| ### Prerequisites | ||
|
|
||
| You must have an [Azure subscription](https://azure.microsoft.com/free/). | ||
| - An [Azure subscription][azure_sub]. | ||
|
|
||
| ### How to install | ||
| ### Install the `@azure/arm-consumption` package | ||
|
|
||
| To use this SDK in your project, you will need to install two packages. | ||
| - `@azure/arm-consumption` that contains the client. | ||
| - `@azure/identity` that provides different mechanisms for the client to authenticate your requests using Azure Active Directory. | ||
| Install the Azure ConsumptionManagement client library for JavaScript with `npm`: | ||
|
|
||
| Install both packages using the below command: | ||
| ```bash | ||
| npm install --save @azure/arm-consumption @azure/identity | ||
| npm install @azure/arm-consumption | ||
| ``` | ||
|
|
||
| > **Note**: You may have used either `@azure/ms-rest-nodeauth` or `@azure/ms-rest-browserauth` in the past. These packages are in maintenance mode receiving critical bug fixes, but no new features. | ||
| If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/), or are writing a client side browser application, we strongly encourage you to upgrade to `@azure/identity` which uses the latest versions of Azure Active Directory and MSAL APIs and provides more authentication options. | ||
| ### Create and authenticate a `ConsumptionManagementClient` | ||
|
|
||
| ### How to use | ||
| To create a client object to access the Azure ConsumptionManagement API, you will need the `endpoint` of your Azure ConsumptionManagement resource and a `credential`. The Azure ConsumptionManagement client can use Azure Active Directory credentials to authenticate. | ||
| You can find the endpoint for your Azure ConsumptionManagement resource in the [Azure Portal][azure_portal]. | ||
|
|
||
| - If you are writing a client side browser application, | ||
| - Follow the instructions in the section on Authenticating client side browser applications in [Azure Identity examples](https://aka.ms/azsdk/js/identity/examples) to register your application in the Microsoft identity platform and set the right permissions. | ||
| - Copy the client ID and tenant ID from the Overview section of your app registration in Azure portal and use it in the browser sample below. | ||
| - If you are writing a server side application, | ||
| - [Select a credential from `@azure/identity` based on the authentication method of your choice](https://aka.ms/azsdk/js/identity/examples) | ||
| - Complete the set up steps required by the credential if any. | ||
| - Use the credential you picked in the place of `DefaultAzureCredential` in the Node.js sample below. | ||
| You can authenticate with Azure Active Directory using a credential from the [@azure/identity][azure_identity] library or [an existing AAD Token](https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token). | ||
|
|
||
| In the below samples, we pass the credential and the Azure subscription id to instantiate the client. | ||
| Once the client is created, explore the operations on it either in your favorite editor or in our [API reference documentation](https://docs.microsoft.com/javascript/api) to get started. | ||
| To use the [DefaultAzureCredential][defaultazurecredential] provider shown below, or other credential providers provided with the Azure SDK, please install the `@azure/identity` package: | ||
|
|
||
| ```bash | ||
| npm install @azure/identity | ||
| ``` | ||
|
|
||
| #### nodejs - Authentication, client creation, and list usageDetails as an example written in JavaScript. | ||
| You will also need to **register a new AAD application and grant access to Azure ConsumptionManagement** by assigning the suitable role to your service principal (note: roles such as `"Owner"` will not grant the necessary permissions). | ||
| Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables: `AZURE_CLIENT_ID`, `AZURE_TENANT_ID`, `AZURE_CLIENT_SECRET`. | ||
|
|
||
| ##### Sample code | ||
| For more information about how to create an Azure AD Application check out [this guide](https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal). | ||
|
|
||
| ```javascript | ||
| const { DefaultAzureCredential } = require("@azure/identity"); | ||
| const { ConsumptionManagementClient } = require("@azure/arm-consumption"); | ||
| const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; | ||
|
|
||
| // Use `DefaultAzureCredential` or any other credential of your choice based on https://aka.ms/azsdk/js/identity/examples | ||
| // Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead. | ||
| const creds = new DefaultAzureCredential(); | ||
| const client = new ConsumptionManagementClient(creds, subscriptionId); | ||
| const expand = "testexpand"; | ||
| const filter = "testfilter"; | ||
| const skiptoken = "testskiptoken"; | ||
| const top = 1; | ||
| const apply = "testapply"; | ||
| client.usageDetails.list(expand, filter, skiptoken, top, apply).then((result) => { | ||
| console.log("The result is:"); | ||
| console.log(result); | ||
| }).catch((err) => { | ||
| console.log("An error occurred:"); | ||
| console.error(err); | ||
| }); | ||
| const { DefaultAzureCredential } = require("@azure/identity"); | ||
| const subscriptionId = "00000000-0000-0000-0000-000000000000"; | ||
| const client = new ConsumptionManagementClient(new DefaultAzureCredential(), subscriptionId); | ||
| ``` | ||
|
|
||
| #### browser - Authentication, client creation, and list usageDetails as an example written in JavaScript. | ||
|
|
||
| In browser applications, we recommend using the `InteractiveBrowserCredential` that interactively authenticates using the default system browser. | ||
| - See [Single-page application: App registration guide](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-app-registration) to configure your app registration for the browser. | ||
| - Note down the client Id from the previous step and use it in the browser sample below. | ||
|
|
||
| ##### Sample code | ||
|
|
||
| - index.html | ||
|
|
||
| ```html | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title>@azure/arm-consumption sample</title> | ||
| <script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script> | ||
| <script src="node_modules/@azure/identity/dist/index.js"></script> | ||
| <script src="node_modules/@azure/arm-consumption/dist/arm-consumption.js"></script> | ||
| <script type="text/javascript"> | ||
| const subscriptionId = "<Subscription_Id>"; | ||
| // Create credentials using the `@azure/identity` package. | ||
| // Please note that you can also use credentials from the `@azure/ms-rest-browserauth` package instead. | ||
| const credential = new InteractiveBrowserCredential( | ||
| { | ||
| clientId: "<client id for your Azure AD app>", | ||
| tenantId: "<optional tenant for your organization>" | ||
| }); | ||
| const client = new Azure.ArmConsumption.ConsumptionManagementClient(creds, subscriptionId); | ||
| const expand = "testexpand"; | ||
| const filter = "testfilter"; | ||
| const skiptoken = "testskiptoken"; | ||
| const top = 1; | ||
| const apply = "testapply"; | ||
| client.usageDetails.list(expand, filter, skiptoken, top, apply).then((result) => { | ||
| console.log("The result is:"); | ||
| console.log(result); | ||
| }).catch((err) => { | ||
| console.log("An error occurred:"); | ||
| console.error(err); | ||
| }); | ||
| </script> | ||
| </head> | ||
| <body></body> | ||
| </html> | ||
| ## Key concepts | ||
|
|
||
| ### ConsumptionManagementClient | ||
|
|
||
| `ConsumptionManagementClient` is the primary interface for developers using the Azure ConsumptionManagement client library. Explore the methods on this client object to understand the different features of the Azure ConsumptionManagement service that you can access. | ||
|
|
||
| ## Troubleshooting | ||
|
|
||
| ### Logging | ||
|
|
||
| Enabling logging may help uncover useful information about failures. In order to see a log of HTTP requests and responses, set the `AZURE_LOG_LEVEL` environment variable to `info`. Alternatively, logging can be enabled at runtime by calling `setLogLevel` in the `@azure/logger`: | ||
|
|
||
| ```javascript | ||
| const { setLogLevel } = require("@azure/logger"); | ||
| setLogLevel("info"); | ||
| ``` | ||
|
|
||
| For more detailed instructions on how to enable logs, you can look at the [@azure/logger package docs](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/core/logger). | ||
|
|
||
| ## Next steps | ||
|
|
||
| Please take a look at the [samples](https://github.com/Azure-Samples/azure-samples-js-management) directory for detailed examples on how to use this library. | ||
|
|
||
| ## Contributing | ||
|
|
||
| If you'd like to contribute to this library, please read the [contributing guide](https://github.com/Azure/azure-sdk-for-js/blob/main/CONTRIBUTING.md) to learn more about how to build and test the code. | ||
|
|
||
| ## Related projects | ||
|
|
||
| - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) | ||
| - [Microsoft Azure SDK for JavaScript](https://github.com/Azure/azure-sdk-for-js) | ||
|
|
||
|  | ||
|
|
||
|  | ||
| [azure_cli]: https://docs.microsoft.com/cli/azure | ||
| [azure_sub]: https://azure.microsoft.com/free/ | ||
| [azure_sub]: https://azure.microsoft.com/free/ | ||
| [azure_portal]: https://portal.azure.com | ||
| [azure_identity]: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity | ||
| [defaultazurecredential]: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#defaultazurecredential |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "commit": "1e65d778939ea2f0859a81bde55740169a9b8dbb", | ||
| "readme": "specification/consumption/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/consumption/resource-manager/readme.md --use=@autorest/[email protected]", | ||
| "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", | ||
| "use": "@autorest/[email protected]" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "$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" }, | ||
| "dtsRollup": { | ||
| "enabled": true, | ||
| "untrimmedFilePath": "", | ||
| "publicTrimmedFilePath": "./types/arm-consumption.d.ts" | ||
| }, | ||
| "messages": { | ||
| "tsdocMessageReporting": { "default": { "logLevel": "none" } }, | ||
| "extractorMessageReporting": { | ||
| "ae-missing-release-tag": { "logLevel": "none" }, | ||
| "ae-unresolved-link": { "logLevel": "none" } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why make the changes here ?