Skip to content

Commit

Permalink
Generated from 497f37d011e45d90e7a5f190b1326ec89e2719c8
Browse files Browse the repository at this point in the history
Merge pull request #6 from Khushboo-Baheti/master

merge
  • Loading branch information
SDK Automation committed Feb 24, 2020
1 parent 0453ec6 commit 5661a44
Show file tree
Hide file tree
Showing 18 changed files with 769 additions and 305 deletions.
2 changes: 1 addition & 1 deletion sdk/advisor/arm-advisor/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Microsoft
Copyright (c) 2020 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
24 changes: 13 additions & 11 deletions sdk/advisor/arm-advisor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,24 @@ This package contains an isomorphic SDK for AdvisorManagementClient.

### How to Install

```
```bash
npm install @azure/arm-advisor
```

### How to use

#### nodejs - Authentication, client creation and listBySubscription configurations as an example written in TypeScript.
#### nodejs - Authentication, client creation and get recommendationMetadata as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

```
npm install @azure/ms-rest-nodeauth
- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`.
```bash
npm install @azure/ms-rest-nodeauth@"^3.0.0"
```

##### Sample code

```ts
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
Expand All @@ -34,7 +35,8 @@ const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
const client = new AdvisorManagementClient(creds, subscriptionId);
client.configurations.listBySubscription().then((result) => {
const name = "testname";
client.recommendationMetadata.get(name).then((result) => {
console.log("The result is:");
console.log(result);
});
Expand All @@ -43,11 +45,11 @@ msRestNodeAuth.interactiveLogin().then((creds) => {
});
```

#### browser - Authentication, client creation and listBySubscription configurations as an example written in JavaScript.
#### browser - Authentication, client creation and get recommendationMetadata as an example written in JavaScript.

##### Install @azure/ms-rest-browserauth

```
```bash
npm install @azure/ms-rest-browserauth
```

Expand Down Expand Up @@ -77,7 +79,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
authManager.login();
}
const client = new Azure.ArmAdvisor.AdvisorManagementClient(res.creds, subscriptionId);
client.configurations.listBySubscription().then((result) => {
const name = "testname";
client.recommendationMetadata.get(name).then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand All @@ -95,5 +98,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to

- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)


![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fadvisor%2Farm-advisor%2FREADME.png)
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/advisor/arm-advisor/README.png)
24 changes: 13 additions & 11 deletions sdk/advisor/arm-advisor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "AdvisorManagementClient Library with typescript type definitions for node.js and browser.",
"version": "1.2.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^1.1.0",
"@azure/ms-rest-js": "^1.1.0",
"tslib": "^1.9.3"
"@azure/ms-rest-azure-js": "^2.0.1",
"@azure/ms-rest-js": "^2.0.4",
"tslib": "^1.10.0"
},
"keywords": [
"node",
Expand All @@ -20,18 +20,19 @@
"module": "./esm/advisorManagementClient.js",
"types": "./esm/advisorManagementClient.d.ts",
"devDependencies": {
"typescript": "^3.1.1",
"rollup": "^0.66.2",
"rollup-plugin-node-resolve": "^3.4.0",
"uglify-js": "^3.4.9"
"typescript": "^3.5.3",
"rollup": "^1.18.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/sdk/advisor/arm-advisor",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/advisor/arm-advisor",
"repository": {
"type": "git",
"url": "https://github.com/azure/azure-sdk-for-js.git"
"url": "https://github.com/Azure/azure-sdk-for-js.git"
},
"bugs": {
"url": "https://github.com/azure/azure-sdk-for-js/issues"
"url": "https://github.com/Azure/azure-sdk-for-js/issues"
},
"files": [
"dist/**/*.js",
Expand All @@ -43,6 +44,7 @@
"esm/**/*.d.ts",
"esm/**/*.d.ts.map",
"src/**/*.ts",
"README.md",
"rollup.config.js",
"tsconfig.json"
],
Expand All @@ -52,5 +54,5 @@
"prepack": "npm install && npm run build"
},
"sideEffects": false,
"authPublish": true
"autoPublish": true
}
22 changes: 14 additions & 8 deletions sdk/advisor/arm-advisor/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import rollup from "rollup";
import nodeResolve from "rollup-plugin-node-resolve";
import sourcemaps from "rollup-plugin-sourcemaps";

/**
* @type {import('rollup').RollupFileOptions}
* @type {rollup.RollupFileOptions}
*/
const config = {
input: './esm/advisorManagementClient.js',
external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
input: "./esm/advisorManagementClient.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
],
output: {
file: "./dist/arm-advisor.js",
format: "umd",
Expand All @@ -16,16 +22,16 @@ const config = {
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/`
},
plugins: [
nodeResolve({ module: true })
nodeResolve({ mainFields: ['module', 'main'] }),
sourcemaps()
]
};

export default config;
2 changes: 2 additions & 0 deletions sdk/advisor/arm-advisor/src/advisorManagementClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { AdvisorManagementClientContext } from "./advisorManagementClientContext

class AdvisorManagementClient extends AdvisorManagementClientContext {
// Operation groups
recommendationMetadata: operations.RecommendationMetadata;
configurations: operations.Configurations;
recommendations: operations.Recommendations;
operations: operations.Operations;
Expand All @@ -30,6 +31,7 @@ class AdvisorManagementClient extends AdvisorManagementClientContext {
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AdvisorManagementClientOptions) {
super(credentials, subscriptionId, options);
this.recommendationMetadata = new operations.RecommendationMetadata(this);
this.configurations = new operations.Configurations(this);
this.recommendations = new operations.Recommendations(this);
this.operations = new operations.Operations(this);
Expand Down
4 changes: 2 additions & 2 deletions sdk/advisor/arm-advisor/src/advisorManagementClientContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";

const packageName = "@azure/arm-advisor";
const packageVersion = "0.1.0";
const packageVersion = "1.2.0";

export class AdvisorManagementClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials;
Expand Down Expand Up @@ -44,7 +44,7 @@ export class AdvisorManagementClientContext extends msRestAzure.AzureServiceClie

super(credentials, options);

this.apiVersion = '2017-04-19';
this.apiVersion = '2020-01-01';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
20 changes: 11 additions & 9 deletions sdk/advisor/arm-advisor/src/models/configurationsMappers.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/

export {
ConfigurationListResult,
ArmErrorResponse,
ARMErrorResponseBody,
BaseResource,
ConfigData,
ConfigDataProperties,
CloudError,
ARMErrorResponseBody
ConfigurationListResult,
DigestConfig,
Resource,
ResourceRecommendationBase,
ShortDescription,
SuppressionContract
} from "../models/mappers";

Loading

0 comments on commit 5661a44

Please sign in to comment.