Skip to content

Commit

Permalink
CodeGen from PR 16687 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge 2c1d6754d57fa8ce2a1d07b8ceb2c463884e9102 into f2e08ab373eb0e96b54920e89f9fc96d683355ca
  • Loading branch information
SDKAuto committed Nov 9, 2021
1 parent b049934 commit be9c45f
Show file tree
Hide file tree
Showing 24 changed files with 1,563 additions and 893 deletions.
2 changes: 1 addition & 1 deletion sdk/subscription/arm-subscriptions/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020 Microsoft
Copyright (c) 2021 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
22 changes: 11 additions & 11 deletions sdk/subscription/arm-subscriptions/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Azure SubscriptionClient SDK for JavaScript

This package contains an isomorphic SDK (runs both in Node.js and in browsers) for SubscriptionClient.
This package contains an isomorphic SDK (runs both in node.js and in browsers) for SubscriptionClient.

### 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

Expand All @@ -21,7 +21,6 @@ Install both packages using the below command:
```bash
npm install --save @azure/arm-subscriptions @azure/identity
```

> **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.

Expand All @@ -37,8 +36,7 @@ If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/

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.

#### nodejs - Authentication, client creation, and listLocations subscriptions as an example written in JavaScript.
#### nodejs - Authentication, client creation, and acceptOwnershipStatus subscription as an example written in JavaScript.

##### Sample code

Expand All @@ -50,8 +48,9 @@ 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 SubscriptionClient(creds);
client.subscriptions.listLocations(subscriptionId).then((result) => {
const client = new SubscriptionClient(creds, subscriptionId);
const subscriptionId = "testsubscriptionId";
client.subscription.acceptOwnershipStatus(subscriptionId).then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand All @@ -60,7 +59,7 @@ client.subscriptions.listLocations(subscriptionId).then((result) => {
});
```

#### browser - Authentication, client creation, and listLocations subscriptions as an example written in JavaScript.
#### browser - Authentication, client creation, and acceptOwnershipStatus subscription 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.
Expand All @@ -85,10 +84,11 @@ In browser applications, we recommend using the `InteractiveBrowserCredential` t
const credential = new InteractiveBrowserCredential(
{
clientId: "<client id for your Azure AD app>",
tenantId: "<optional tenant for your organization>"
tenant: "<optional tenant for your organization>"
});
const client = new Azure.ArmSubscriptions.SubscriptionClient(creds);
client.subscriptions.listLocations(subscriptionId).then((result) => {
const client = new Azure.ArmSubscriptions.SubscriptionClient(creds, subscriptionId);
const subscriptionId = "testsubscriptionId";
client.subscription.acceptOwnershipStatus(subscriptionId).then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand Down
2 changes: 1 addition & 1 deletion sdk/subscription/arm-subscriptions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/feature/v4/sdk/subscription/arm-subscriptions",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/subscription/arm-subscriptions",
"repository": {
"type": "git",
"url": "https://github.com/Azure/azure-sdk-for-js.git"
Expand Down
4 changes: 2 additions & 2 deletions sdk/subscription/arm-subscriptions/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const config = {
"@azure/ms-rest-azure-js": "msRestAzure"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* 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.
Expand Down
17 changes: 12 additions & 5 deletions sdk/subscription/arm-subscriptions/src/models/aliasMappers.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* 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.
*/

export {
BaseResource,
BillingAccountPoliciesResponse,
BillingAccountPoliciesResponseProperties,
ErrorResponse,
ErrorResponseBody,
PutAliasListResult,
GetTenantPolicyResponse,
PutAliasRequest,
PutAliasRequestAdditionalProperties,
PutAliasRequestProperties,
PutAliasResponse,
PutAliasResponseProperties
ServiceTenantResponse,
SubscriptionAliasListResult,
SubscriptionAliasResponse,
SubscriptionAliasResponseProperties,
SystemData,
TenantPolicy
} from "../models/mappers";
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* 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.
*/

export {
BaseResource,
BillingAccountPoliciesResponse,
BillingAccountPoliciesResponseProperties,
ErrorResponse,
ErrorResponseBody,
GetTenantPolicyResponse,
ServiceTenantResponse,
SubscriptionAliasResponse,
SubscriptionAliasResponseProperties,
SystemData,
TenantPolicy
} from "../models/mappers";
Loading

0 comments on commit be9c45f

Please sign in to comment.