Skip to content

Commit c1b4460

Browse files
authored
Arm netapp release (Azure#15661)
1 parent 5d53854 commit c1b4460

File tree

13 files changed

+1202
-1108
lines changed

13 files changed

+1202
-1108
lines changed

sdk/netapp/arm-netapp/README.md

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,97 @@
11
## Azure AzureNetAppFilesManagementClient SDK for JavaScript
22

3-
This package contains an isomorphic SDK for AzureNetAppFilesManagementClient.
3+
This package contains an isomorphic SDK (runs both in Node.js and in browsers) for AzureNetAppFilesManagementClient.
44

55
### Currently supported environments
66

7-
- Node.js version 6.x.x or higher
8-
- Browser JavaScript
7+
- [LTS versions of Node.js](https://nodejs.org/about/releases/)
8+
- Latest versions of Safari, Chrome, Edge, and Firefox.
99

10-
### How to Install
10+
### Prerequisites
1111

12+
You must have an [Azure subscription](https://azure.microsoft.com/free/).
13+
14+
### How to install
15+
16+
To use this SDK in your project, you will need to install two packages.
17+
- `@azure/arm-netapp` that contains the client.
18+
- `@azure/identity` that provides different mechanisms for the client to authenticate your requests using Azure Active Directory.
19+
20+
Install both packages using the below command:
1221
```bash
13-
npm install @azure/arm-netapp
22+
npm install --save @azure/arm-netapp @azure/identity
1423
```
24+
> **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.
25+
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.
1526

1627
### How to use
1728

18-
#### nodejs - client creation and list operations as an example written in TypeScript.
29+
- If you are writing a client side browser application,
30+
- 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.
31+
- 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.
32+
- If you are writing a server side application,
33+
- [Select a credential from `@azure/identity` based on the authentication method of your choice](https://aka.ms/azsdk/js/identity/examples)
34+
- Complete the set up steps required by the credential if any.
35+
- Use the credential you picked in the place of `DefaultAzureCredential` in the Node.js sample below.
1936

20-
##### Install @azure/ms-rest-nodeauth
21-
22-
- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`.
23-
```bash
24-
npm install @azure/ms-rest-nodeauth@"^3.0.0"
25-
```
37+
In the below samples, we pass the credential and the Azure subscription id to instantiate the client.
38+
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.
39+
#### nodejs - Authentication, client creation, and list operations as an example written in JavaScript.
2640

2741
##### Sample code
2842

29-
While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
30-
```typescript
31-
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
43+
```javascript
44+
const { DefaultAzureCredential } = require("@azure/identity");
3245
const { AzureNetAppFilesManagementClient } = require("@azure/arm-netapp");
3346
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
3447

35-
msRestNodeAuth.interactiveLogin().then((creds) => {
36-
const client = new AzureNetAppFilesManagementClient(creds, subscriptionId);
37-
client.operations.list().then((result) => {
38-
console.log("The result is:");
39-
console.log(result);
40-
});
48+
// Use `DefaultAzureCredential` or any other credential of your choice based on https://aka.ms/azsdk/js/identity/examples
49+
// Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead.
50+
const creds = new DefaultAzureCredential();
51+
const client = new AzureNetAppFilesManagementClient(creds, subscriptionId);
52+
client.operations.list().then((result) => {
53+
console.log("The result is:");
54+
console.log(result);
4155
}).catch((err) => {
56+
console.log("An error occurred:");
4257
console.error(err);
4358
});
4459
```
4560

46-
#### browser - Authentication, client creation and list operations as an example written in JavaScript.
61+
#### browser - Authentication, client creation, and list operations as an example written in JavaScript.
4762

48-
##### Install @azure/ms-rest-browserauth
49-
50-
```bash
51-
npm install @azure/ms-rest-browserauth
52-
```
63+
In browser applications, we recommend using the `InteractiveBrowserCredential` that interactively authenticates using the default system browser.
64+
- 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.
65+
- Note down the client Id from the previous step and use it in the browser sample below.
5366

5467
##### Sample code
5568

56-
See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.
57-
5869
- index.html
70+
5971
```html
6072
<!DOCTYPE html>
6173
<html lang="en">
6274
<head>
6375
<title>@azure/arm-netapp sample</title>
64-
<script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
6576
<script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
66-
<script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
77+
<script src="node_modules/@azure/identity/dist/index.js"></script>
6778
<script src="node_modules/@azure/arm-netapp/dist/arm-netapp.js"></script>
6879
<script type="text/javascript">
6980
const subscriptionId = "<Subscription_Id>";
70-
const authManager = new msAuth.AuthManager({
81+
// Create credentials using the `@azure/identity` package.
82+
// Please note that you can also use credentials from the `@azure/ms-rest-browserauth` package instead.
83+
const credential = new InteractiveBrowserCredential(
84+
{
7185
clientId: "<client id for your Azure AD app>",
7286
tenant: "<optional tenant for your organization>"
7387
});
74-
authManager.finalizeLogin().then((res) => {
75-
if (!res.isLoggedIn) {
76-
// may cause redirects
77-
authManager.login();
78-
}
79-
const client = new Azure.ArmNetapp.AzureNetAppFilesManagementClient(res.creds, subscriptionId);
80-
client.operations.list().then((result) => {
81-
console.log("The result is:");
82-
console.log(result);
83-
}).catch((err) => {
84-
console.log("An error occurred:");
85-
console.error(err);
86-
});
88+
const client = new Azure.ArmNetapp.AzureNetAppFilesManagementClient(creds, subscriptionId);
89+
client.operations.list().then((result) => {
90+
console.log("The result is:");
91+
console.log(result);
92+
}).catch((err) => {
93+
console.log("An error occurred:");
94+
console.error(err);
8795
});
8896
</script>
8997
</head>

sdk/netapp/arm-netapp/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"name": "@azure/arm-netapp",
33
"author": "Microsoft Corporation",
44
"description": "AzureNetAppFilesManagementClient Library with typescript type definitions for node.js and browser.",
5-
"version": "14.0.0",
5+
"version": "14.1.0",
66
"dependencies": {
7-
"@azure/ms-rest-azure-js": "^2.0.1",
8-
"@azure/ms-rest-js": "^2.0.4",
7+
"@azure/ms-rest-azure-js": "^2.1.0",
8+
"@azure/ms-rest-js": "^2.2.0",
9+
"@azure/core-auth": "^1.1.4",
910
"tslib": "^1.10.0"
1011
},
1112
"keywords": [
@@ -20,7 +21,7 @@
2021
"module": "./esm/azureNetAppFilesManagementClient.js",
2122
"types": "./esm/azureNetAppFilesManagementClient.d.ts",
2223
"devDependencies": {
23-
"typescript": "^3.5.3",
24+
"typescript": "^3.6.0",
2425
"rollup": "^1.18.0",
2526
"rollup-plugin-node-resolve": "^5.2.0",
2627
"rollup-plugin-sourcemaps": "^0.4.2",

sdk/netapp/arm-netapp/src/azureNetAppFilesManagementClient.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
*/
99

1010
import * as msRest from "@azure/ms-rest-js";
11+
import { TokenCredential } from "@azure/core-auth";
1112
import * as Models from "./models";
1213
import * as Mappers from "./models/mappers";
1314
import * as operations from "./operations";
1415
import { AzureNetAppFilesManagementClientContext } from "./azureNetAppFilesManagementClientContext";
1516

17+
1618
class AzureNetAppFilesManagementClient extends AzureNetAppFilesManagementClientContext {
1719
// Operation groups
1820
operations: operations.Operations;
@@ -29,16 +31,17 @@ class AzureNetAppFilesManagementClient extends AzureNetAppFilesManagementClientC
2931

3032
/**
3133
* Initializes a new instance of the AzureNetAppFilesManagementClient class.
32-
* @param credentials Credentials needed for the client to connect to Azure.
34+
* @param credentials Credentials needed for the client to connect to Azure. Credentials
35+
* implementing the TokenCredential interface from the @azure/identity package are recommended. For
36+
* more information about these credentials, see
37+
* {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
38+
* ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
39+
* @azure/ms-rest-browserauth are also supported.
3340
* @param subscriptionId Subscription credentials which uniquely identify Microsoft Azure
3441
* subscription. The subscription ID forms part of the URI for every service call.
3542
* @param [options] The parameter options
3643
*/
37-
constructor(
38-
credentials: msRest.ServiceClientCredentials,
39-
subscriptionId: string,
40-
options?: Models.AzureNetAppFilesManagementClientOptions
41-
) {
44+
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.AzureNetAppFilesManagementClientOptions) {
4245
super(credentials, subscriptionId, options);
4346
this.operations = new operations.Operations(this);
4447
this.netAppResource = new operations.NetAppResource(this);

sdk/netapp/arm-netapp/src/azureNetAppFilesManagementClientContext.ts

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,34 @@
1010
import * as Models from "./models";
1111
import * as msRest from "@azure/ms-rest-js";
1212
import * as msRestAzure from "@azure/ms-rest-azure-js";
13+
import { TokenCredential } from "@azure/core-auth";
1314

1415
const packageName = "@azure/arm-netapp";
15-
const packageVersion = "14.0.0";
16+
const packageVersion = "14.1.0";
1617

1718
export class AzureNetAppFilesManagementClientContext extends msRestAzure.AzureServiceClient {
18-
credentials: msRest.ServiceClientCredentials;
19+
credentials: msRest.ServiceClientCredentials | TokenCredential;
1920
subscriptionId: string;
2021
apiVersion?: string;
2122

2223
/**
2324
* Initializes a new instance of the AzureNetAppFilesManagementClient class.
24-
* @param credentials Credentials needed for the client to connect to Azure.
25+
* @param credentials Credentials needed for the client to connect to Azure. Credentials
26+
* implementing the TokenCredential interface from the @azure/identity package are recommended. For
27+
* more information about these credentials, see
28+
* {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
29+
* ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
30+
* @azure/ms-rest-browserauth are also supported.
2531
* @param subscriptionId Subscription credentials which uniquely identify Microsoft Azure
2632
* subscription. The subscription ID forms part of the URI for every service call.
2733
* @param [options] The parameter options
2834
*/
29-
constructor(
30-
credentials: msRest.ServiceClientCredentials,
31-
subscriptionId: string,
32-
options?: Models.AzureNetAppFilesManagementClientOptions
33-
) {
35+
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.AzureNetAppFilesManagementClientOptions) {
3436
if (credentials == undefined) {
35-
throw new Error("'credentials' cannot be null.");
37+
throw new Error('\'credentials\' cannot be null.');
3638
}
3739
if (subscriptionId == undefined) {
38-
throw new Error("'subscriptionId' cannot be null.");
40+
throw new Error('\'subscriptionId\' cannot be null.');
3941
}
4042

4143
if (!options) {
@@ -48,8 +50,8 @@ export class AzureNetAppFilesManagementClientContext extends msRestAzure.AzureSe
4850

4951
super(credentials, options);
5052

51-
this.apiVersion = "2021-02-01";
52-
this.acceptLanguage = "en-US";
53+
this.apiVersion = '2021-04-01';
54+
this.acceptLanguage = 'en-US';
5355
this.longRunningOperationRetryTimeout = 30;
5456
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
5557
this.requestContentType = "application/json; charset=utf-8";
@@ -59,10 +61,7 @@ export class AzureNetAppFilesManagementClientContext extends msRestAzure.AzureSe
5961
if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
6062
this.acceptLanguage = options.acceptLanguage;
6163
}
62-
if (
63-
options.longRunningOperationRetryTimeout !== null &&
64-
options.longRunningOperationRetryTimeout !== undefined
65-
) {
64+
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
6665
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
6766
}
6867
}

sdk/netapp/arm-netapp/src/models/backupsMappers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export {
2828
NetAppAccount,
2929
NetAppAccountPatch,
3030
ReplicationObject,
31+
RestoreStatus,
3132
Snapshot,
3233
SnapshotPolicy,
3334
SystemData,

0 commit comments

Comments
 (0)