Skip to content

Commit

Permalink
labservices-track1 (Azure#18156)
Browse files Browse the repository at this point in the history
  • Loading branch information
colawwj authored Dec 6, 2021
1 parent b969325 commit 8fdfd62
Show file tree
Hide file tree
Showing 39 changed files with 5,231 additions and 6,388 deletions.
2 changes: 1 addition & 1 deletion sdk/labservices/arm-labservices/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2019 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
25 changes: 11 additions & 14 deletions sdk/labservices/arm-labservices/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Azure ManagedLabsClient SDK for JavaScript
## Azure LabServicesClient SDK for JavaScript

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

### 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-labservices @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,22 +36,20 @@ 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 providerOperations as an example written in JavaScript.
#### nodejs - Authentication, client creation, and list operations as an example written in JavaScript.

##### Sample code

```javascript
const { DefaultAzureCredential } = require("@azure/identity");
const { ManagedLabsClient } = require("@azure/arm-labservices");
const { LabServicesClient } = require("@azure/arm-labservices");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

// Use `DefaultAzureCredential` or any other credential of your choice based on https://aka.ms/azsdk/js/identity/examples
// Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead.
const creds = new DefaultAzureCredential();
const client = new ManagedLabsClient(creds, subscriptionId);

client.providerOperations.list().then((result) => {
const client = new LabServicesClient(creds, subscriptionId);
client.operations.list().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand All @@ -61,7 +58,7 @@ client.providerOperations.list().then((result) => {
});
```

#### browser - Authentication, client creation, and list providerOperations as an example written in JavaScript.
#### browser - Authentication, client creation, and list operations as an example written in JavaScript.

In browser applications, we recommend using the `InteractiveBrowserCredential` that interactively authenticates using the default system browser.
- 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.
Expand All @@ -86,10 +83,10 @@ 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.ArmLabservices.ManagedLabsClient(creds, subscriptionId);
client.providerOperations.list().then((result) => {
const client = new Azure.ArmLabservices.LabServicesClient(creds, subscriptionId);
client.operations.list().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand Down
26 changes: 13 additions & 13 deletions sdk/labservices/arm-labservices/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@azure/arm-labservices",
"author": "Microsoft Corporation",
"description": "ManagedLabsClient Library with typescript type definitions for node.js and browser.",
"version": "1.1.1",
"description": "LabServicesClient Library with typescript type definitions for node.js and browser.",
"version": "2.0.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^1.4.0",
"@azure/ms-rest-js": "^1.11.0",
"@azure/ms-rest-azure-js": "^2.1.0",
"@azure/ms-rest-js": "^2.2.0",
"@azure/core-auth": "^1.1.4",
"tslib": "^1.9.3"
"tslib": "^1.10.0"
},
"keywords": [
"node",
Expand All @@ -18,22 +18,22 @@
],
"license": "MIT",
"main": "./dist/arm-labservices.js",
"module": "./esm/managedLabsClient.js",
"types": "./esm/managedLabsClient.d.ts",
"module": "./esm/labServicesClient.js",
"types": "./esm/labServicesClient.d.ts",
"devDependencies": {
"typescript": "^3.6.0",
"rollup": "^0.66.2",
"rollup-plugin-node-resolve": "^3.4.0",
"rollup": "^1.18.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.4.9"
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/azure/azure-sdk-for-js/tree/feature/v4/sdk/labservices/arm-labservices",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/feature/v4/sdk/labservices/arm-labservices",
"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 Down
8 changes: 4 additions & 4 deletions sdk/labservices/arm-labservices/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import sourcemaps from "rollup-plugin-sourcemaps";
* @type {rollup.RollupFileOptions}
*/
const config = {
input: "./esm/managedLabsClient.js",
input: "./esm/labServicesClient.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
Expand All @@ -21,15 +21,15 @@ 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.
*/`
},
plugins: [
nodeResolve({ module: true }),
nodeResolve({ mainFields: ['module', 'main'] }),
sourcemaps()
]
};
Expand Down
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,52 +12,50 @@ import { TokenCredential } from "@azure/core-auth";
import * as Models from "./models";
import * as Mappers from "./models/mappers";
import * as operations from "./operations";
import { ManagedLabsClientContext } from "./managedLabsClientContext";
import { LabServicesClientContext } from "./labServicesClientContext";


class ManagedLabsClient extends ManagedLabsClientContext {
class LabServicesClient extends LabServicesClientContext {
// Operation groups
providerOperations: operations.ProviderOperations;
globalUsers: operations.GlobalUsers;
labAccounts: operations.LabAccounts;
operations: operations.Operations;
galleryImages: operations.GalleryImages;
operationResults: operations.OperationResults;
labPlans: operations.LabPlans;
images: operations.Images;
labs: operations.Labs;
environmentSettings: operations.EnvironmentSettings;
environments: operations.Environments;
users: operations.Users;
virtualMachines: operations.VirtualMachines;
schedules: operations.Schedules;

/**
* Initializes a new instance of the ManagedLabsClient class.
* Initializes a new instance of the LabServicesClient class.
* @param credentials Credentials needed for the client to connect to Azure. Credentials
* implementing the TokenCredential interface from the @azure/identity package are recommended. For
* more information about these credentials, see
* {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
* ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
* @azure/ms-rest-browserauth are also supported.
* @param subscriptionId The subscription ID.
* @param subscriptionId The ID of the target subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.ManagedLabsClientOptions) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.LabServicesClientOptions) {
super(credentials, subscriptionId, options);
this.providerOperations = new operations.ProviderOperations(this);
this.globalUsers = new operations.GlobalUsers(this);
this.labAccounts = new operations.LabAccounts(this);
this.operations = new operations.Operations(this);
this.galleryImages = new operations.GalleryImages(this);
this.operationResults = new operations.OperationResults(this);
this.labPlans = new operations.LabPlans(this);
this.images = new operations.Images(this);
this.labs = new operations.Labs(this);
this.environmentSettings = new operations.EnvironmentSettings(this);
this.environments = new operations.Environments(this);
this.users = new operations.Users(this);
this.virtualMachines = new operations.VirtualMachines(this);
this.schedules = new operations.Schedules(this);
}
}

// Operation Specifications

export {
ManagedLabsClient,
ManagedLabsClientContext,
Models as ManagedLabsModels,
Mappers as ManagedLabsMappers
LabServicesClient,
LabServicesClientContext,
Models as LabServicesModels,
Mappers as LabServicesMappers
};
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 @@ -10,29 +9,29 @@

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-labservices";
const packageVersion = "1.1.1";
const packageVersion = "2.0.0";

export class ManagedLabsClientContext extends msRestAzure.AzureServiceClient {
export class LabServicesClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials | TokenCredential;
apiVersion?: string;
subscriptionId: string;

/**
* Initializes a new instance of the ManagedLabsClient class.
* Initializes a new instance of the LabServicesClient class.
* @param credentials Credentials needed for the client to connect to Azure. Credentials
* implementing the TokenCredential interface from the @azure/identity package are recommended. For
* more information about these credentials, see
* {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
* ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
* @azure/ms-rest-browserauth are also supported.
* @param subscriptionId The subscription ID.
* @param subscriptionId The ID of the target subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.ManagedLabsClientOptions) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.LabServicesClientOptions) {
if (credentials == undefined) {
throw new Error('\'credentials\' cannot be null.');
}
Expand All @@ -50,7 +49,7 @@ export class ManagedLabsClientContext extends msRestAzure.AzureServiceClient {

super(credentials, options);

this.apiVersion = '2018-10-15';
this.apiVersion = '2021-10-01-preview';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down

This file was deleted.

40 changes: 0 additions & 40 deletions sdk/labservices/arm-labservices/src/models/environmentsMappers.ts

This file was deleted.

Loading

0 comments on commit 8fdfd62

Please sign in to comment.