Skip to content

Commit

Permalink
CodeGen from PR 15432 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge 475a9d3cb7190247ee3121b369f08bb2be314a04 into 1267076f6a49f9eea0860e70e79f523d1085ed14
  • Loading branch information
SDKAuto committed Jul 29, 2021
1 parent 33602ff commit bfdbfe6
Show file tree
Hide file tree
Showing 29 changed files with 4,879 additions and 1,744 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020 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
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Azure AzureMachineLearningWorkspaces SDK for JavaScript

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

### 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-machinelearningservices @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,7 +36,6 @@ 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 operations as an example written in JavaScript.

##### Sample code
Expand All @@ -51,7 +49,6 @@ const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
// Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead.
const creds = new DefaultAzureCredential();
const client = new AzureMachineLearningWorkspaces(creds, subscriptionId);

client.operations.list().then((result) => {
console.log("The result is:");
console.log(result);
Expand Down Expand Up @@ -86,7 +83,7 @@ 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.ArmMachinelearningservices.AzureMachineLearningWorkspaces(creds, subscriptionId);
client.operations.list().then((result) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/machinelearningservices/arm-machinelearningservices",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/machinelearningservices/arm-machinelearningservices",
"repository": {
"type": "git",
"url": "https://github.com/Azure/azure-sdk-for-js.git"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import * as msRest from "@azure/ms-rest-js";
import { TokenCredential } from "@azure/core-auth";
import * as Models from "./models";
import * as Mappers from "./models/mappers";
import * as Parameters from "./models/parameters";
import * as operations from "./operations";
import { AzureMachineLearningWorkspacesContext } from "./azureMachineLearningWorkspacesContext";

Expand All @@ -20,15 +19,15 @@ class AzureMachineLearningWorkspaces extends AzureMachineLearningWorkspacesConte
// Operation groups
operations: operations.Operations;
workspaces: operations.Workspaces;
workspaceFeatures: operations.WorkspaceFeatures;
notebooks: operations.Notebooks;
usages: operations.Usages;
virtualMachineSizes: operations.VirtualMachineSizes;
quotas: operations.Quotas;
workspaceConnections: operations.WorkspaceConnections;
machineLearningCompute: operations.MachineLearningCompute;
compute: operations.ComputeOperations;
privateEndpointConnections: operations.PrivateEndpointConnections;
privateLinkResources: operations.PrivateLinkResources;
workspaceConnections: operations.WorkspaceConnections;
workspaceFeatures: operations.WorkspaceFeatures;
workspaceSkus: operations.WorkspaceSkus;

/**
* Initializes a new instance of the AzureMachineLearningWorkspaces class.
Expand All @@ -38,125 +37,26 @@ class AzureMachineLearningWorkspaces extends AzureMachineLearningWorkspacesConte
* {@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 Azure subscription identifier.
* @param subscriptionId The ID of the target subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.AzureMachineLearningWorkspacesOptions) {
super(credentials, subscriptionId, options);
this.operations = new operations.Operations(this);
this.workspaces = new operations.Workspaces(this);
this.workspaceFeatures = new operations.WorkspaceFeatures(this);
this.notebooks = new operations.Notebooks(this);
this.usages = new operations.Usages(this);
this.virtualMachineSizes = new operations.VirtualMachineSizes(this);
this.quotas = new operations.Quotas(this);
this.workspaceConnections = new operations.WorkspaceConnections(this);
this.machineLearningCompute = new operations.MachineLearningCompute(this);
this.compute = new operations.ComputeOperations(this);
this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
this.privateLinkResources = new operations.PrivateLinkResources(this);
}

/**
* Lists all skus with associated features
* @param [options] The optional parameters
* @returns Promise<Models.ListSkusResponse>
*/
listSkus(options?: msRest.RequestOptionsBase): Promise<Models.ListSkusResponse>;
/**
* @param callback The callback
*/
listSkus(callback: msRest.ServiceCallback<Models.SkuListResult>): void;
/**
* @param options The optional parameters
* @param callback The callback
*/
listSkus(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SkuListResult>): void;
listSkus(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SkuListResult>, callback?: msRest.ServiceCallback<Models.SkuListResult>): Promise<Models.ListSkusResponse> {
return this.sendOperationRequest(
{
options
},
listSkusOperationSpec,
callback) as Promise<Models.ListSkusResponse>;
}

/**
* Lists all skus with associated features
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param [options] The optional parameters
* @returns Promise<Models.ListSkusNextResponse>
*/
listSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ListSkusNextResponse>;
/**
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param callback The callback
*/
listSkusNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SkuListResult>): void;
/**
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param options The optional parameters
* @param callback The callback
*/
listSkusNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SkuListResult>): void;
listSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SkuListResult>, callback?: msRest.ServiceCallback<Models.SkuListResult>): Promise<Models.ListSkusNextResponse> {
return this.sendOperationRequest(
{
nextPageLink,
options
},
listSkusNextOperationSpec,
callback) as Promise<Models.ListSkusNextResponse>;
this.workspaceConnections = new operations.WorkspaceConnections(this);
this.workspaceFeatures = new operations.WorkspaceFeatures(this);
this.workspaceSkus = new operations.WorkspaceSkus(this);
}
}

// Operation Specifications
const serializer = new msRest.Serializer(Mappers);
const listSkusOperationSpec: msRest.OperationSpec = {
httpMethod: "GET",
path: "subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/workspaces/skus",
urlParameters: [
Parameters.subscriptionId
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
responses: {
200: {
bodyMapper: Mappers.SkuListResult
},
default: {
bodyMapper: Mappers.MachineLearningServiceError
}
},
serializer
};

const listSkusNextOperationSpec: msRest.OperationSpec = {
httpMethod: "GET",
baseUrl: "https://management.azure.com",
path: "{nextLink}",
urlParameters: [
Parameters.nextPageLink
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
responses: {
200: {
bodyMapper: Mappers.SkuListResult
},
default: {
bodyMapper: Mappers.MachineLearningServiceError
}
},
serializer
};

export {
AzureMachineLearningWorkspaces,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@

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-machinelearningservices";
const packageVersion = "4.1.0";

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

/**
* Initializes a new instance of the AzureMachineLearningWorkspaces class.
Expand All @@ -28,7 +28,7 @@ export class AzureMachineLearningWorkspacesContext extends msRestAzure.AzureServ
* {@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 Azure subscription identifier.
* @param subscriptionId The ID of the target subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.AzureMachineLearningWorkspacesOptions) {
Expand All @@ -42,25 +42,25 @@ export class AzureMachineLearningWorkspacesContext extends msRestAzure.AzureServ
if (!options) {
options = {};
}
if(!options.userAgent) {
if (!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}

super(credentials, options);

this.apiVersion = '2020-08-01';
this.apiVersion = '2021-07-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";
this.credentials = credentials;
this.subscriptionId = subscriptionId;

if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
this.acceptLanguage = options.acceptLanguage;
}
if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,60 +9,75 @@
export {
discriminators,
AKS,
AksComputeSecrets,
AksNetworkingConfiguration,
AKSProperties,
AmlCompute,
AmlComputeNodeInformation,
AmlComputeNodesInformation,
AmlComputeProperties,
AssignedUser,
AutoPauseProperties,
AutoScaleProperties,
AzureEntityResource,
BaseResource,
ClusterUpdateParameters,
Compute,
ComputeCreateOrUpdateHeaders,
ComputeDeleteHeaders,
ComputeInstance,
ComputeInstanceApplication,
ComputeInstanceConnectivityEndpoints,
ComputeInstanceCreatedBy,
ComputeInstanceLastOperation,
ComputeInstanceProperties,
ComputeInstanceSshSettings,
ComputeNodesInformation,
ComputeResource,
ComputeSecrets,
CosmosDbSettings,
Databricks,
DatabricksComputeSecrets,
DatabricksProperties,
DataFactory,
DataLakeAnalytics,
DataLakeAnalyticsProperties,
EncryptionProperty,
ErrorAdditionalInfo,
ErrorDetail,
ErrorResponse,
HDInsight,
HDInsightProperties,
Identity,
IdentityUserAssignedIdentitiesValue,
IdentityForCmk,
KeyVaultProperties,
MachineLearningComputeCreateOrUpdateHeaders,
MachineLearningComputeDeleteHeaders,
MachineLearningServiceError,
NodeStateCounts,
NotebookPreparationError,
NotebookResourceInfo,
PaginatedComputeResourcesList,
PersonalComputeInstanceSettings,
PrivateEndpoint,
PrivateEndpointConnection,
PrivateLinkResource,
PrivateLinkServiceConnectionState,
ProxyResource,
Resource,
ResourceId,
ScaleSettings,
ScaleSettingsInformation,
ScriptReference,
ScriptsToExecute,
ServiceManagedResourcesSettings,
SetupScripts,
SharedPrivateLinkResource,
Sku,
SslConfiguration,
SynapseSpark,
SynapseSparkProperties,
SystemData,
SystemService,
TrackedResource,
UserAccountCredentials,
UserAssignedIdentity,
VirtualMachine,
VirtualMachineImage,
VirtualMachineProperties,
VirtualMachineSecrets,
VirtualMachineSshCredentials,
Expand Down
Loading

0 comments on commit bfdbfe6

Please sign in to comment.