From e4e02a674befa0ebaaa3d85940192fb4a212083b Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 9 Jul 2021 02:41:01 +0000 Subject: [PATCH] CodeGen from PR 15131 in Azure/azure-rest-api-specs Azure resource 2021 7 (#15131) * sql t2 readme config * readme config * Update readme.python.md * conflient resolve * readme.python config Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com> --- sdk/locks/arm-locks/LICENSE.txt | 2 +- sdk/locks/arm-locks/README.md | 9 ++-- sdk/locks/arm-locks/package.json | 14 +++--- sdk/locks/arm-locks/rollup.config.js | 6 +-- .../arm-locks/src/managementLockClient.ts | 5 +-- .../src/managementLockClientContext.ts | 13 +++--- .../models/authorizationOperationsMappers.ts | 4 +- sdk/locks/arm-locks/src/models/index.ts | 44 +++++++++++++++++- .../src/models/managementLocksMappers.ts | 4 +- sdk/locks/arm-locks/src/models/mappers.ts | 4 +- sdk/locks/arm-locks/src/models/parameters.ts | 5 +-- .../src/operations/authorizationOperations.ts | 8 ++-- sdk/locks/arm-locks/src/operations/index.ts | 5 +-- .../src/operations/managementLocks.ts | 45 ++++++++++++------- sdk/locks/arm-locks/tsconfig.json | 2 +- 15 files changed, 110 insertions(+), 60 deletions(-) diff --git a/sdk/locks/arm-locks/LICENSE.txt b/sdk/locks/arm-locks/LICENSE.txt index b73b4a1293c3..2d3163745319 100644 --- a/sdk/locks/arm-locks/LICENSE.txt +++ b/sdk/locks/arm-locks/LICENSE.txt @@ -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 diff --git a/sdk/locks/arm-locks/README.md b/sdk/locks/arm-locks/README.md index cb93d1272533..41c37e538a08 100644 --- a/sdk/locks/arm-locks/README.md +++ b/sdk/locks/arm-locks/README.md @@ -1,11 +1,11 @@ ## Azure ManagementLockClient SDK for JavaScript -This package contains an isomorphic SDK (runs both in Node.js and in browsers) for ManagementLockClient. +This package contains an isomorphic SDK (runs both in node.js and in browsers) for ManagementLockClient. ### 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 @@ -21,7 +21,6 @@ Install both packages using the below command: ```bash npm install --save @azure/arm-locks @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. @@ -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 authorizationOperations as an example written in JavaScript. ##### Sample code @@ -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 ManagementLockClient(creds, subscriptionId); - client.authorizationOperations.list().then((result) => { console.log("The result is:"); console.log(result); @@ -86,7 +83,7 @@ In browser applications, we recommend using the `InteractiveBrowserCredential` t const credential = new InteractiveBrowserCredential( { clientId: "", - tenantId: "" + tenant: "" }); const client = new Azure.ArmLocks.ManagementLockClient(creds, subscriptionId); client.authorizationOperations.list().then((result) => { diff --git a/sdk/locks/arm-locks/package.json b/sdk/locks/arm-locks/package.json index 04b2b5689fe1..5a03e6842e33 100644 --- a/sdk/locks/arm-locks/package.json +++ b/sdk/locks/arm-locks/package.json @@ -4,10 +4,10 @@ "description": "ManagementLockClient Library with typescript type definitions for node.js and browser.", "version": "1.2.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", @@ -22,12 +22,12 @@ "types": "./esm/managementLockClient.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/main/sdk/locks/arm-locks", + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/locks/arm-locks", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" diff --git a/sdk/locks/arm-locks/rollup.config.js b/sdk/locks/arm-locks/rollup.config.js index ad258f7a3de7..634feec9bd0f 100644 --- a/sdk/locks/arm-locks/rollup.config.js +++ b/sdk/locks/arm-locks/rollup.config.js @@ -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() ] }; diff --git a/sdk/locks/arm-locks/src/managementLockClient.ts b/sdk/locks/arm-locks/src/managementLockClient.ts index e732ae6e8de1..2430543d465e 100644 --- a/sdk/locks/arm-locks/src/managementLockClient.ts +++ b/sdk/locks/arm-locks/src/managementLockClient.ts @@ -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 diff --git a/sdk/locks/arm-locks/src/managementLockClientContext.ts b/sdk/locks/arm-locks/src/managementLockClientContext.ts index 49465f512f87..24e9d7fcb1d4 100644 --- a/sdk/locks/arm-locks/src/managementLockClientContext.ts +++ b/sdk/locks/arm-locks/src/managementLockClientContext.ts @@ -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 @@ -10,8 +9,8 @@ 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-locks"; const packageVersion = "1.2.0"; @@ -43,7 +42,7 @@ export class ManagementLockClientContext extends msRestAzure.AzureServiceClient if (!options) { options = {}; } - if(!options.userAgent) { + if (!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } @@ -58,10 +57,10 @@ export class ManagementLockClientContext extends msRestAzure.AzureServiceClient 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; } } diff --git a/sdk/locks/arm-locks/src/models/authorizationOperationsMappers.ts b/sdk/locks/arm-locks/src/models/authorizationOperationsMappers.ts index 689688180be7..938d3e665a23 100644 --- a/sdk/locks/arm-locks/src/models/authorizationOperationsMappers.ts +++ b/sdk/locks/arm-locks/src/models/authorizationOperationsMappers.ts @@ -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. diff --git a/sdk/locks/arm-locks/src/models/index.ts b/sdk/locks/arm-locks/src/models/index.ts index cb1a27b7a18b..416c69793916 100644 --- a/sdk/locks/arm-locks/src/models/index.ts +++ b/sdk/locks/arm-locks/src/models/index.ts @@ -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. @@ -129,6 +129,46 @@ export interface ManagementLocksListByScopeOptionalParams extends msRest.Request filter?: string; } +/** + * Optional Parameters. + */ +export interface ManagementLocksListAtResourceGroupLevelNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The filter to apply on the operation. + */ + filter?: string; +} + +/** + * Optional Parameters. + */ +export interface ManagementLocksListAtResourceLevelNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The filter to apply on the operation. + */ + filter?: string; +} + +/** + * Optional Parameters. + */ +export interface ManagementLocksListAtSubscriptionLevelNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The filter to apply on the operation. + */ + filter?: string; +} + +/** + * Optional Parameters. + */ +export interface ManagementLocksListByScopeNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The filter to apply on the operation. + */ + filter?: string; +} + /** * An interface representing ManagementLockClientOptions. */ diff --git a/sdk/locks/arm-locks/src/models/managementLocksMappers.ts b/sdk/locks/arm-locks/src/models/managementLocksMappers.ts index 829964b3158a..ca0b95dc96f3 100644 --- a/sdk/locks/arm-locks/src/models/managementLocksMappers.ts +++ b/sdk/locks/arm-locks/src/models/managementLocksMappers.ts @@ -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. diff --git a/sdk/locks/arm-locks/src/models/mappers.ts b/sdk/locks/arm-locks/src/models/mappers.ts index 6a0539a576e5..b4a81ecd3b4e 100644 --- a/sdk/locks/arm-locks/src/models/mappers.ts +++ b/sdk/locks/arm-locks/src/models/mappers.ts @@ -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. diff --git a/sdk/locks/arm-locks/src/models/parameters.ts b/sdk/locks/arm-locks/src/models/parameters.ts index fe8e8e08a3b1..df9eaad06d05 100644 --- a/sdk/locks/arm-locks/src/models/parameters.ts +++ b/sdk/locks/arm-locks/src/models/parameters.ts @@ -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 diff --git a/sdk/locks/arm-locks/src/operations/authorizationOperations.ts b/sdk/locks/arm-locks/src/operations/authorizationOperations.ts index 29d0a0621e3b..fa837ad33dba 100644 --- a/sdk/locks/arm-locks/src/operations/authorizationOperations.ts +++ b/sdk/locks/arm-locks/src/operations/authorizationOperations.ts @@ -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 @@ -108,6 +107,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/locks/arm-locks/src/operations/index.ts b/sdk/locks/arm-locks/src/operations/index.ts index 83933898775f..7c3e495d3386 100644 --- a/sdk/locks/arm-locks/src/operations/index.ts +++ b/sdk/locks/arm-locks/src/operations/index.ts @@ -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 diff --git a/sdk/locks/arm-locks/src/operations/managementLocks.ts b/sdk/locks/arm-locks/src/operations/managementLocks.ts index d6f3a7b68d01..894eda1a1ff1 100644 --- a/sdk/locks/arm-locks/src/operations/managementLocks.ts +++ b/sdk/locks/arm-locks/src/operations/managementLocks.ts @@ -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 @@ -656,7 +655,7 @@ export class ManagementLocks { * @param [options] The optional parameters * @returns Promise */ - listAtResourceGroupLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listAtResourceGroupLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtResourceGroupLevelNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -667,8 +666,8 @@ export class ManagementLocks { * @param options The optional parameters * @param callback The callback */ - listAtResourceGroupLevelNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listAtResourceGroupLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listAtResourceGroupLevelNext(nextPageLink: string, options: Models.ManagementLocksListAtResourceGroupLevelNextOptionalParams, callback: msRest.ServiceCallback): void; + listAtResourceGroupLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtResourceGroupLevelNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -684,7 +683,7 @@ export class ManagementLocks { * @param [options] The optional parameters * @returns Promise */ - listAtResourceLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listAtResourceLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtResourceLevelNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -695,8 +694,8 @@ export class ManagementLocks { * @param options The optional parameters * @param callback The callback */ - listAtResourceLevelNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listAtResourceLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listAtResourceLevelNext(nextPageLink: string, options: Models.ManagementLocksListAtResourceLevelNextOptionalParams, callback: msRest.ServiceCallback): void; + listAtResourceLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtResourceLevelNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -712,7 +711,7 @@ export class ManagementLocks { * @param [options] The optional parameters * @returns Promise */ - listAtSubscriptionLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listAtSubscriptionLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtSubscriptionLevelNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -723,8 +722,8 @@ export class ManagementLocks { * @param options The optional parameters * @param callback The callback */ - listAtSubscriptionLevelNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listAtSubscriptionLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listAtSubscriptionLevelNext(nextPageLink: string, options: Models.ManagementLocksListAtSubscriptionLevelNextOptionalParams, callback: msRest.ServiceCallback): void; + listAtSubscriptionLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtSubscriptionLevelNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -740,7 +739,7 @@ export class ManagementLocks { * @param [options] The optional parameters * @returns Promise */ - listByScopeNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listByScopeNext(nextPageLink: string, options?: Models.ManagementLocksListByScopeNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -751,8 +750,8 @@ export class ManagementLocks { * @param options The optional parameters * @param callback The callback */ - listByScopeNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByScopeNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listByScopeNext(nextPageLink: string, options: Models.ManagementLocksListByScopeNextOptionalParams, callback: msRest.ServiceCallback): void; + listByScopeNext(nextPageLink: string, options?: Models.ManagementLocksListByScopeNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -1216,6 +1215,10 @@ const listAtResourceGroupLevelNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -1237,6 +1240,10 @@ const listAtResourceLevelNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -1258,6 +1265,10 @@ const listAtSubscriptionLevelNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -1279,6 +1290,10 @@ const listByScopeNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/locks/arm-locks/tsconfig.json b/sdk/locks/arm-locks/tsconfig.json index 87bbf5b5fa49..422b584abd5e 100644 --- a/sdk/locks/arm-locks/tsconfig.json +++ b/sdk/locks/arm-locks/tsconfig.json @@ -9,7 +9,7 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, - "lib": ["es6"], + "lib": ["es6", "dom"], "declaration": true, "outDir": "./esm", "importHelpers": true