Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReleasePR @azure/arm-migrate] Updated SAS swagger with latest changes. #14777

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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) 2021 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
39 changes: 18 additions & 21 deletions sdk/migrate/arm-migrate/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Azure AzureMigrate SDK for JavaScript
## Azure AzureMigrateV2 SDK for JavaScript

This package contains an isomorphic SDK for AzureMigrate.
This package contains an isomorphic SDK for AzureMigrateV2.

### Currently supported environments

Expand All @@ -9,33 +9,32 @@ This package contains an isomorphic SDK for AzureMigrate.

### How to Install

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

### How to use

#### nodejs - Authentication, client creation and get assessmentOptions as an example written in TypeScript.
#### nodejs - client creation and listBySubscription projects 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
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";
import { AzureMigrate, AzureMigrateModels, AzureMigrateMappers } from "@azure/arm-migrate";
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
```typescript
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
const { AzureMigrateV2 } = require("@azure/arm-migrate");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
const client = new AzureMigrate(creds, subscriptionId);
const locationName = "testlocationName";
client.assessmentOptions.get(locationName).then((result) => {
const client = new AzureMigrateV2(creds, subscriptionId);
client.projects.listBySubscription().then((result) => {
console.log("The result is:");
console.log(result);
});
Expand All @@ -44,11 +43,11 @@ msRestNodeAuth.interactiveLogin().then((creds) => {
});
```

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

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

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

Expand Down Expand Up @@ -77,9 +76,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
// may cause redirects
authManager.login();
}
const client = new Azure.ArmMigrate.AzureMigrate(res.creds, subscriptionId);
const locationName = "testlocationName";
client.assessmentOptions.get(locationName).then((result) => {
const client = new Azure.ArmMigrate.AzureMigrateV2(res.creds, subscriptionId);
client.projects.listBySubscription().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand All @@ -97,5 +95,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)
28 changes: 15 additions & 13 deletions sdk/migrate/arm-migrate/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@azure/arm-migrate",
"author": "Microsoft Corporation",
"description": "AzureMigrate Library with typescript type definitions for node.js and browser.",
"description": "AzureMigrateV2 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 @@ -17,21 +17,22 @@
],
"license": "MIT",
"main": "./dist/arm-migrate.js",
"module": "./esm/azureMigrate.js",
"types": "./esm/azureMigrate.d.ts",
"module": "./esm/azureMigrateV2.js",
"types": "./esm/azureMigrateV2.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
24 changes: 15 additions & 9 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/azureMigrateV2.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
],
output: {
file: "./dist/arm-migrate.js",
format: "umd",
Expand All @@ -15,17 +21,17 @@ const config = {
"@azure/ms-rest-azure-js": "msRestAzure"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* 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;
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand All @@ -12,45 +11,53 @@ import * as msRest from "@azure/ms-rest-js";
import * as Models from "./models";
import * as Mappers from "./models/mappers";
import * as operations from "./operations";
import { AzureMigrateContext } from "./azureMigrateContext";
import { AzureMigrateV2Context } from "./azureMigrateV2Context";


class AzureMigrate extends AzureMigrateContext {
class AzureMigrateV2 extends AzureMigrateV2Context {
// Operation groups
location: operations.Location;
assessmentOptions: operations.AssessmentOptions;
projects: operations.Projects;
machines: operations.Machines;
groups: operations.Groups;
assessments: operations.Assessments;
assessedMachines: operations.AssessedMachines;
hyperVCollectors: operations.HyperVCollectors;
serverCollectors: operations.ServerCollectors;
vMwareCollectors: operations.VMwareCollectors;
importCollectors: operations.ImportCollectors;
privateEndpointConnection: operations.PrivateEndpointConnectionOperations;
privateLinkResource: operations.PrivateLinkResourceOperations;
operations: operations.Operations;

/**
* Initializes a new instance of the AzureMigrate class.
* Initializes a new instance of the AzureMigrateV2 class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param subscriptionId Azure Subscription Id in which project was created.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AzureMigrateOptions) {
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AzureMigrateV2Options) {
super(credentials, subscriptionId, options);
this.location = new operations.Location(this);
this.assessmentOptions = new operations.AssessmentOptions(this);
this.projects = new operations.Projects(this);
this.machines = new operations.Machines(this);
this.groups = new operations.Groups(this);
this.assessments = new operations.Assessments(this);
this.assessedMachines = new operations.AssessedMachines(this);
this.hyperVCollectors = new operations.HyperVCollectors(this);
this.serverCollectors = new operations.ServerCollectors(this);
this.vMwareCollectors = new operations.VMwareCollectors(this);
this.importCollectors = new operations.ImportCollectors(this);
this.privateEndpointConnection = new operations.PrivateEndpointConnectionOperations(this);
this.privateLinkResource = new operations.PrivateLinkResourceOperations(this);
this.operations = new operations.Operations(this);
}
}

// Operation Specifications

export {
AzureMigrate,
AzureMigrateContext,
Models as AzureMigrateModels,
Mappers as AzureMigrateMappers
AzureMigrateV2,
AzureMigrateV2Context,
Models as AzureMigrateV2Models,
Mappers as AzureMigrateV2Mappers
};
export * from "./operations";
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand All @@ -13,20 +12,20 @@ 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 {
export class AzureMigrateV2Context extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials;
subscriptionId: string;
apiVersion?: string;

/**
* Initializes a new instance of the AzureMigrate class.
* Initializes a new instance of the AzureMigrateV2 class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param subscriptionId Azure Subscription Id in which project was created.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AzureMigrateOptions) {
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AzureMigrateV2Options) {
if (credentials == undefined) {
throw new Error('\'credentials\' cannot be null.');
}
Expand All @@ -44,7 +43,8 @@ export class AzureMigrateContext extends msRestAzure.AzureServiceClient {

super(credentials, options);

this.apiVersion = '2018-02-02';
this.apiVersion = '2019-10-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 Down
49 changes: 34 additions & 15 deletions sdk/migrate/arm-migrate/src/models/assessedMachinesMappers.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,47 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* 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,
AssessedMachineProperties,
AssessedMachineResultList,
AssessedMachinesGetHeaders,
AssessedMachinesListByAssessmentHeaders,
AssessedNetworkAdapter,
Assessment,
AssessmentOptions,
AssessmentOptionsProperties,
AssessmentProperties,
BaseResource,
CloudError,
AssessedMachinesGetHeaders,
Project,
CollectorAgentProperties,
CollectorBodyAgentSpnProperties,
CollectorProperties,
Disk,
Group,
Assessment,
GroupProperties,
HyperVCollector,
ImportCollector,
ImportCollectorProperties,
Machine,
Disk,
MachineProperties,
NetworkAdapter,
ProjectKey
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateLinkResource,
PrivateLinkResourceProperties,
PrivateLinkServiceConnectionState,
Project,
ProjectProperties,
ResourceId,
ServerCollector,
VmFamily,
VmUptime,
VMwareCollector
} from "../models/mappers";

16 changes: 0 additions & 16 deletions sdk/migrate/arm-migrate/src/models/assessmentOptionsMappers.ts

This file was deleted.

Loading