Skip to content

Commit

Permalink
CodeGen from PR 15367 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Fixed order (Azure#15367)

C# needs required fields to be before any optional fields. Because username and password are no longer required, autorest is ordering these parameters alphabetically.
  • Loading branch information
SDKAuto committed Jul 28, 2021
1 parent 33602ff commit 7215f04
Show file tree
Hide file tree
Showing 30 changed files with 1,886 additions and 929 deletions.
2 changes: 1 addition & 1 deletion sdk/batch/arm-batch/LICENSE.txt
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
16 changes: 7 additions & 9 deletions sdk/batch/arm-batch/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Azure BatchManagementClient SDK for JavaScript
## Azure BatchManagement SDK for JavaScript

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

### 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-batch @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,20 +36,19 @@ 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 get batchAccount as an example written in JavaScript.

##### Sample code

```javascript
const { DefaultAzureCredential } = require("@azure/identity");
const { BatchManagementClient } = require("@azure/arm-batch");
const { BatchManagement } = require("@azure/arm-batch");
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 BatchManagementClient(creds, subscriptionId);
const client = new BatchManagement(creds, subscriptionId);
const resourceGroupName = "testresourceGroupName";
const accountName = "testaccountName";
client.batchAccount.get(resourceGroupName, accountName).then((result) => {
Expand Down Expand Up @@ -87,9 +85,9 @@ 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.ArmBatch.BatchManagementClient(creds, subscriptionId);
const client = new Azure.ArmBatch.BatchManagement(creds, subscriptionId);
const resourceGroupName = "testresourceGroupName";
const accountName = "testaccountName";
client.batchAccount.get(resourceGroupName, accountName).then((result) => {
Expand Down
27 changes: 9 additions & 18 deletions sdk/batch/arm-batch/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@azure/arm-batch",
"author": "Microsoft Corporation",
"description": "BatchManagementClient Library with typescript type definitions for node.js and browser.",
"description": "BatchManagement Library with typescript type definitions for node.js and browser.",
"version": "5.1.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^2.1.0",
"@azure/ms-rest-js": "^2.2.0",
"@azure/core-auth": "^1.1.4",
"tslib": "^2.0.0"
"tslib": "^1.10.0"
},
"keywords": [
"node",
Expand All @@ -18,24 +18,16 @@
],
"license": "MIT",
"main": "./dist/arm-batch.js",
"module": "./esm/batchManagementClient.js",
"types": "./esm/batchManagementClient.d.ts",
"module": "./esm/batchManagement.js",
"types": "./esm/batchManagement.d.ts",
"devDependencies": {
"@types/chai": "^4.1.6",
"@types/jssha": "^2.0.0",
"@types/mocha": "^7.0.2",
"chai": "^4.2.0",
"dotenv": "^8.2.0",
"mocha": "^7.1.1",
"rollup": "^1.16.3",
"typescript": "^3.6.0",
"rollup": "^1.18.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"esm": "^3.2.25",
"ts-node": "^8.3.0",
"typescript": "^3.6.0",
"uglify-js": "^3.4.9"
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/Azure/azure-sdk-for-js",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/batch/arm-batch",
"repository": {
"type": "git",
"url": "https://github.com/Azure/azure-sdk-for-js.git"
Expand All @@ -60,8 +52,7 @@
"scripts": {
"build": "tsc && rollup -c rollup.config.js && npm run minify",
"minify": "uglifyjs -c -m --comments --source-map \"content='./dist/arm-batch.js.map'\" -o ./dist/arm-batch.min.js ./dist/arm-batch.js",
"prepack": "npm install && npm run build",
"test": "mocha -r esm --require ts-node/register test/*.spec.ts --timeout 1200000 --full-trace"
"prepack": "npm install && npm run build"
},
"sideEffects": false,
"autoPublish": true
Expand Down
6 changes: 3 additions & 3 deletions sdk/batch/arm-batch/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/batchManagementClient.js",
input: "./esm/batchManagement.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
Expand All @@ -21,8 +21,8 @@ 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.
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,10 +12,10 @@ import { TokenCredential } from "@azure/core-auth";
import * as Models from "./models";
import * as Mappers from "./models/mappers";
import * as operations from "./operations";
import { BatchManagementClientContext } from "./batchManagementClientContext";
import { BatchManagementContext } from "./batchManagementContext";


class BatchManagementClient extends BatchManagementClientContext {
class BatchManagement extends BatchManagementContext {
// Operation groups
batchAccount: operations.BatchAccountOperations;
applicationPackage: operations.ApplicationPackageOperations;
Expand All @@ -29,7 +28,7 @@ class BatchManagementClient extends BatchManagementClientContext {
pool: operations.PoolOperations;

/**
* Initializes a new instance of the BatchManagementClient class.
* Initializes a new instance of the BatchManagement 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
Expand All @@ -40,7 +39,7 @@ class BatchManagementClient extends BatchManagementClientContext {
* 00000000-0000-0000-0000-000000000000)
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.BatchManagementClientOptions) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.BatchManagementOptions) {
super(credentials, subscriptionId, options);
this.batchAccount = new operations.BatchAccountOperations(this);
this.applicationPackage = new operations.ApplicationPackageOperations(this);
Expand All @@ -57,8 +56,8 @@ class BatchManagementClient extends BatchManagementClientContext {
// Operation Specifications

export {
BatchManagementClient,
BatchManagementClientContext,
BatchManagement,
BatchManagementContext,
Models as BatchManagementModels,
Mappers as BatchManagementMappers
};
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 @@ -10,19 +9,19 @@

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-batch";
const packageVersion = "5.1.0";

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

/**
* Initializes a new instance of the BatchManagementClient class.
* Initializes a new instance of the BatchManagement 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
Expand All @@ -33,7 +32,7 @@ export class BatchManagementClientContext extends msRestAzure.AzureServiceClient
* 00000000-0000-0000-0000-000000000000)
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.BatchManagementClientOptions) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.BatchManagementOptions) {
if (credentials == undefined) {
throw new Error('\'credentials\' cannot be null.');
}
Expand All @@ -44,25 +43,25 @@ export class BatchManagementClientContext extends msRestAzure.AzureServiceClient
if (!options) {
options = {};
}
if(!options.userAgent) {
if (!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}

super(credentials, options);

this.apiVersion = '2020-09-01';
this.apiVersion = '2021-06-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
11 changes: 9 additions & 2 deletions sdk/batch/arm-batch/src/models/applicationOperationsMappers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +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 regenerated.
Expand All @@ -21,17 +21,20 @@ export {
BaseResource,
BatchAccount,
BatchAccountIdentity,
BatchPoolIdentity,
Certificate,
CertificateCreateOrUpdateParameters,
CertificateReference,
CIFSMountConfiguration,
CloudError,
CloudServiceConfiguration,
ComputeNodeIdentityReference,
ContainerConfiguration,
ContainerRegistry,
DataDisk,
DeleteCertificateError,
DeploymentConfiguration,
DiffDiskSettings,
DiskEncryptionConfiguration,
EncryptionProperties,
EnvironmentSetting,
Expand All @@ -47,6 +50,8 @@ export {
NetworkConfiguration,
NetworkSecurityGroupRule,
NFSMountConfiguration,
NodePlacementConfiguration,
OSDisk,
Pool,
PoolEndpointConfiguration,
PrivateEndpoint,
Expand All @@ -64,9 +69,11 @@ export {
TaskContainerSettings,
TaskSchedulingPolicy,
UserAccount,
UserAssignedIdentities,
UserIdentity,
VirtualMachineConfiguration,
VirtualMachineFamilyCoreQuota,
VMExtension,
WindowsConfiguration,
WindowsUserConfiguration
} from "../models/mappers";
Original file line number Diff line number Diff line change
@@ -1,6 +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 regenerated.
Expand All @@ -22,17 +22,20 @@ export {
BaseResource,
BatchAccount,
BatchAccountIdentity,
BatchPoolIdentity,
Certificate,
CertificateCreateOrUpdateParameters,
CertificateReference,
CIFSMountConfiguration,
CloudError,
CloudServiceConfiguration,
ComputeNodeIdentityReference,
ContainerConfiguration,
ContainerRegistry,
DataDisk,
DeleteCertificateError,
DeploymentConfiguration,
DiffDiskSettings,
DiskEncryptionConfiguration,
EncryptionProperties,
EnvironmentSetting,
Expand All @@ -48,6 +51,8 @@ export {
NetworkConfiguration,
NetworkSecurityGroupRule,
NFSMountConfiguration,
NodePlacementConfiguration,
OSDisk,
Pool,
PoolEndpointConfiguration,
PrivateEndpoint,
Expand All @@ -65,9 +70,11 @@ export {
TaskContainerSettings,
TaskSchedulingPolicy,
UserAccount,
UserAssignedIdentities,
UserIdentity,
VirtualMachineConfiguration,
VirtualMachineFamilyCoreQuota,
VMExtension,
WindowsConfiguration,
WindowsUserConfiguration
} from "../models/mappers";
Loading

0 comments on commit 7215f04

Please sign in to comment.