Skip to content

Commit

Permalink
CodeGen from PR 16113 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge 709c19c1a51b807fc96d5b09ced99aa6af8b2daf into c64c64aea8aeb5daef14ee51db0cd5df884df583
  • Loading branch information
SDKAuto committed Sep 22, 2021
1 parent 3c7a547 commit c2148da
Show file tree
Hide file tree
Showing 17 changed files with 1,353 additions and 1,955 deletions.
9 changes: 3 additions & 6 deletions sdk/iothub/arm-iothub/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Azure IotHubClient SDK for JavaScript

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

### 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-iothub @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 operations 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 IotHubClient(creds, subscriptionId);

client.operations.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.ArmIothub.IotHubClient(creds, subscriptionId);
client.operations.list().then((result) => {
Expand Down
2 changes: 1 addition & 1 deletion sdk/iothub/arm-iothub/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/iothub/arm-iothub",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/iothub/arm-iothub",
"repository": {
"type": "git",
"url": "https://github.com/Azure/azure-sdk-for-js.git"
Expand Down
10 changes: 8 additions & 2 deletions sdk/iothub/arm-iothub/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import sourcemaps from "rollup-plugin-sourcemaps";
*/
const config = {
input: "./esm/iotHubClient.js",
external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
],
output: {
file: "./dist/arm-iothub.js",
format: "umd",
Expand All @@ -25,7 +28,10 @@ const config = {
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/`
},
plugins: [nodeResolve({ mainFields: ["module", "main"] }), sourcemaps()]
plugins: [
nodeResolve({ mainFields: ['module', 'main'] }),
sourcemaps()
]
};

export default config;
14 changes: 8 additions & 6 deletions sdk/iothub/arm-iothub/src/iotHubClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import * as Mappers from "./models/mappers";
import * as operations from "./operations";
import { IotHubClientContext } from "./iotHubClientContext";


class IotHubClient extends IotHubClientContext {
// Operation groups
operations: operations.Operations;
Expand All @@ -35,11 +36,7 @@ class IotHubClient extends IotHubClientContext {
* @param subscriptionId The subscription identifier.
* @param [options] The parameter options
*/
constructor(
credentials: msRest.ServiceClientCredentials | TokenCredential,
subscriptionId: string,
options?: Models.IotHubClientOptions
) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.IotHubClientOptions) {
super(credentials, subscriptionId, options);
this.operations = new operations.Operations(this);
this.iotHubResource = new operations.IotHubResource(this);
Expand All @@ -53,5 +50,10 @@ class IotHubClient extends IotHubClientContext {

// Operation Specifications

export { IotHubClient, IotHubClientContext, Models as IotHubModels, Mappers as IotHubMappers };
export {
IotHubClient,
IotHubClientContext,
Models as IotHubModels,
Mappers as IotHubMappers
};
export * from "./operations";
21 changes: 7 additions & 14 deletions sdk/iothub/arm-iothub/src/iotHubClientContext.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-iothub";
const packageVersion = "5.1.1";
Expand All @@ -31,16 +31,12 @@ export class IotHubClientContext extends msRestAzure.AzureServiceClient {
* @param subscriptionId The subscription identifier.
* @param [options] The parameter options
*/
constructor(
credentials: msRest.ServiceClientCredentials | TokenCredential,
subscriptionId: string,
options?: Models.IotHubClientOptions
) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.IotHubClientOptions) {
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 IotHubClientContext extends msRestAzure.AzureServiceClient {

super(credentials, options);

this.apiVersion = "2021-03-31";
this.acceptLanguage = "en-US";
this.apiVersion = '2021-07-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 IotHubClientContext extends msRestAzure.AzureServiceClient {
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 c2148da

Please sign in to comment.