Skip to content

Commit

Permalink
CodeGen from PR 15449 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge f8c5381af0a6910d6c93d3ccc5aca75477398349 into 1d28da6ddb09d18ef055e36f57c781e0f76eb3ed
  • Loading branch information
SDKAuto committed Jul 30, 2021
1 parent 33602ff commit 6955faf
Show file tree
Hide file tree
Showing 7 changed files with 667 additions and 867 deletions.
9 changes: 3 additions & 6 deletions sdk/datadog/arm-datadog/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Azure MicrosoftDatadogClient SDK for JavaScript

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

### 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-datadog @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,7 +36,6 @@ 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 list marketplaceAgreements as an example written in JavaScript.

##### Sample code
Expand All @@ -51,7 +49,6 @@ const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
// Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead.
const creds = new DefaultAzureCredential();
const client = new MicrosoftDatadogClient(creds, subscriptionId);

client.marketplaceAgreements.list().then((result) => {
console.log("The result is:");
console.log(result);
Expand Down Expand Up @@ -86,7 +83,7 @@ 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.ArmDatadog.MicrosoftDatadogClient(creds, subscriptionId);
client.marketplaceAgreements.list().then((result) => {
Expand Down
2 changes: 1 addition & 1 deletion sdk/datadog/arm-datadog/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/main/sdk/datadog/arm-datadog",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/datadog/arm-datadog",
"repository": {
"type": "git",
"url": "https://github.com/Azure/azure-sdk-for-js.git"
Expand Down
21 changes: 7 additions & 14 deletions sdk/datadog/arm-datadog/src/microsoftDatadogClientContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

import * as Models from "./models";
import * as msRest from "@azure/ms-rest-js";
import { TokenCredential } from "@azure/core-auth";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import { TokenCredential } from "@azure/core-auth";

const packageName = "@azure/arm-datadog";
const packageVersion = "2.1.0";
Expand All @@ -31,16 +31,12 @@ export class MicrosoftDatadogClientContext extends msRestAzure.AzureServiceClien
* @param subscriptionId The ID of the target subscription.
* @param [options] The parameter options
*/
constructor(
credentials: msRest.ServiceClientCredentials | TokenCredential,
subscriptionId: string,
options?: Models.MicrosoftDatadogClientOptions
) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.MicrosoftDatadogClientOptions) {
if (credentials == undefined) {
throw new Error("'credentials' cannot be null.");
throw new Error('\'credentials\' cannot be null.');
}
if (subscriptionId == undefined) {
throw new Error("'subscriptionId' cannot be null.");
throw new Error('\'subscriptionId\' cannot be null.');
}

if (!options) {
Expand All @@ -53,8 +49,8 @@ export class MicrosoftDatadogClientContext extends msRestAzure.AzureServiceClien

super(credentials, options);

this.apiVersion = "2021-03-01";
this.acceptLanguage = "en-US";
this.apiVersion = '2021-03-01';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
this.requestContentType = "application/json; charset=utf-8";
Expand All @@ -64,10 +60,7 @@ export class MicrosoftDatadogClientContext extends msRestAzure.AzureServiceClien
if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
this.acceptLanguage = options.acceptLanguage;
}
if (
options.longRunningOperationRetryTimeout !== null &&
options.longRunningOperationRetryTimeout !== undefined
) {
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
}
}
Expand Down
Loading

0 comments on commit 6955faf

Please sign in to comment.