Skip to content

Commit

Permalink
Update from master
Browse files Browse the repository at this point in the history
  • Loading branch information
SDK Automation committed Jul 21, 2020
1 parent 357c6ce commit 7dbfbe4
Show file tree
Hide file tree
Showing 18 changed files with 550 additions and 958 deletions.
2 changes: 1 addition & 1 deletion sdk/migrate/arm-migrate/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
14 changes: 7 additions & 7 deletions sdk/migrate/arm-migrate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This package contains an isomorphic SDK for AzureMigrate.

### How to Install

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

Expand All @@ -19,13 +19,14 @@ npm install @azure/arm-migrate

##### 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 @@ -48,7 +49,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => {

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

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

Expand Down Expand Up @@ -97,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%2Fmigrate%2Farm-migrate%2FREADME.png)
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/migrate/arm-migrate/README.png)
22 changes: 12 additions & 10 deletions sdk/migrate/arm-migrate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "AzureMigrate Library with typescript type definitions for node.js and browser.",
"version": "1.1.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/azureMigrate.js",
"types": "./esm/azureMigrate.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/migrate/arm-migrate",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/migrate/arm-migrate",
"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 Down
22 changes: 14 additions & 8 deletions sdk/migrate/arm-migrate/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/azureMigrate.js',
external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
input: "./esm/azureMigrate.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
],
output: {
file: "./dist/arm-migrate.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: 1 addition & 1 deletion sdk/migrate/arm-migrate/src/azureMigrateContext.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-migrate";
const packageVersion = "0.1.0";
const packageVersion = "1.1.0";

export class AzureMigrateContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials;
Expand Down
23 changes: 10 additions & 13 deletions sdk/migrate/arm-migrate/src/models/assessedMachinesMappers.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
/*
* 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 {
AssessedMachineResultList,
AssessedMachine,
BaseResource,
AssessedDisk,
AssessedNetworkAdapter,
AssessedMachine,
AssessedMachineResultList,
AssessedMachinesGetHeaders,
AssessedMachinesListByAssessmentHeaders,
AssessedNetworkAdapter,
Assessment,
BaseResource,
CloudError,
AssessedMachinesGetHeaders,
Project,
Disk,
Group,
Assessment,
Machine,
Disk,
NetworkAdapter,
Project,
ProjectKey
} from "../models/mappers";

11 changes: 4 additions & 7 deletions sdk/migrate/arm-migrate/src/models/assessmentOptionsMappers.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
/*
* 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 {
AssessmentOptionsResultList,
VmFamily,
CloudError
CloudError,
VmFamily
} from "../models/mappers";

31 changes: 14 additions & 17 deletions sdk/migrate/arm-migrate/src/models/assessmentsMappers.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
/*
* 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 {
AssessmentResultList,
AssessedDisk,
AssessedMachine,
AssessedNetworkAdapter,
Assessment,
BaseResource,
AssessmentsListByGroupHeaders,
CloudError,
AssessmentsListByProjectHeaders,
AssessmentsGetHeaders,
AssessmentResultList,
AssessmentsCreateHeaders,
AssessmentsDeleteHeaders,
DownloadUrl,
AssessmentsGetHeaders,
AssessmentsGetReportDownloadUrlHeaders,
Project,
AssessmentsListByGroupHeaders,
AssessmentsListByProjectHeaders,
BaseResource,
CloudError,
Disk,
DownloadUrl,
Group,
Machine,
Disk,
NetworkAdapter,
AssessedMachine,
AssessedDisk,
AssessedNetworkAdapter,
Project,
ProjectKey
} from "../models/mappers";

27 changes: 12 additions & 15 deletions sdk/migrate/arm-migrate/src/models/groupsMappers.ts
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
/*
* 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 {
GroupResultList,
Group,
AssessedDisk,
AssessedMachine,
AssessedNetworkAdapter,
Assessment,
BaseResource,
GroupsListByProjectHeaders,
CloudError,
GroupsGetHeaders,
Disk,
Group,
GroupResultList,
GroupsCreateHeaders,
GroupsDeleteHeaders,
Project,
Assessment,
GroupsGetHeaders,
GroupsListByProjectHeaders,
Machine,
Disk,
NetworkAdapter,
AssessedMachine,
AssessedDisk,
AssessedNetworkAdapter,
Project,
ProjectKey
} from "../models/mappers";

Loading

0 comments on commit 7dbfbe4

Please sign in to comment.