From cad8e43f273f5f478619b65cdbd16786a1fb4b09 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 2 Aug 2021 01:56:23 +0000 Subject: [PATCH] CodeGen from PR 15417 in Azure/azure-rest-api-specs [Hub Generated] Review request for Microsoft.Cache to add version stable/2021-08-01 (#15417) * Adds base for updating Microsoft.Cache from version stable/2021-03-01 to version 2021-08-01 * Updates readme * Updates API version in new specs and examples * Breaking Change: Replaced 'sasUri' import parameter with 'sasUris' to enable importing from multiple files * Fix ModelValidation errors and some existing Linter errors --- .../arm-redisenterprisecache/README.md | 9 +++------ .../arm-redisenterprisecache/package.json | 2 +- .../src/models/index.ts | 6 +++--- .../src/models/mappers.ts | 11 ++++++++--- .../src/models/parameters.ts | 3 +-- .../src/operations/databases.ts | 18 +++++++++--------- .../redisEnterpriseManagementClientContext.ts | 10 +++++----- 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/sdk/redisenterprise/arm-redisenterprisecache/README.md b/sdk/redisenterprise/arm-redisenterprisecache/README.md index f29210e8558f..35eaf44c67be 100644 --- a/sdk/redisenterprise/arm-redisenterprisecache/README.md +++ b/sdk/redisenterprise/arm-redisenterprisecache/README.md @@ -1,11 +1,11 @@ ## Azure RedisEnterpriseManagementClient SDK for JavaScript -This package contains an isomorphic SDK (runs both in Node.js and in browsers) for RedisEnterpriseManagementClient. +This package contains an isomorphic SDK (runs both in node.js and in browsers) for RedisEnterpriseManagementClient. ### 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-redisenterprisecache @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 operations 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 RedisEnterpriseManagementClient(creds, subscriptionId); - client.operations.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.ArmRedisenterprisecache.RedisEnterpriseManagementClient(creds, subscriptionId); client.operations.list().then((result) => { diff --git a/sdk/redisenterprise/arm-redisenterprisecache/package.json b/sdk/redisenterprise/arm-redisenterprisecache/package.json index 1c0617fecd66..00d58e2d985c 100644 --- a/sdk/redisenterprise/arm-redisenterprisecache/package.json +++ b/sdk/redisenterprise/arm-redisenterprisecache/package.json @@ -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/redisenterprise/arm-redisenterprisecache", + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/redisenterprise/arm-redisenterprisecache", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/models/index.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/models/index.ts index 1f701a1789fc..3332087dadda 100644 --- a/sdk/redisenterprise/arm-redisenterprisecache/src/models/index.ts +++ b/sdk/redisenterprise/arm-redisenterprisecache/src/models/index.ts @@ -392,13 +392,13 @@ export interface RegenerateKeyParameters { /** * Parameters for a Redis Enterprise import operation. - * @summary Import an RDB file into a target database + * @summary Import RDB files into a target database */ export interface ImportClusterParameters { /** - * SAS URI for the target blob to import from + * SAS URIs for the target blobs to import from */ - sasUri: string; + sasUris: string[]; } /** diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/models/mappers.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/models/mappers.ts index da7943f2f74b..21fd151ee52e 100644 --- a/sdk/redisenterprise/arm-redisenterprisecache/src/models/mappers.ts +++ b/sdk/redisenterprise/arm-redisenterprisecache/src/models/mappers.ts @@ -585,11 +585,16 @@ export const ImportClusterParameters: msRest.CompositeMapper = { name: "Composite", className: "ImportClusterParameters", modelProperties: { - sasUri: { + sasUris: { required: true, - serializedName: "sasUri", + serializedName: "sasUris", type: { - name: "String" + name: "Sequence", + element: { + type: { + name: "String" + } + } } } } diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/models/parameters.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/models/parameters.ts index 98f4bd82664b..027c1774e1e4 100644 --- a/sdk/redisenterprise/arm-redisenterprisecache/src/models/parameters.ts +++ b/sdk/redisenterprise/arm-redisenterprisecache/src/models/parameters.ts @@ -100,8 +100,7 @@ export const resourceGroupName: msRest.OperationURLParameter = { serializedName: "resourceGroupName", constraints: { MaxLength: 90, - MinLength: 1, - Pattern: /^[-\w\._\(\)]+$/ + MinLength: 1 }, type: { name: "String" diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/databases.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/databases.ts index 5317e2a3bf78..862ad5315155 100644 --- a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/databases.ts +++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/databases.ts @@ -186,16 +186,16 @@ export class Databases { } /** - * Imports a database file to target database. + * Imports database files to target database. * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param clusterName The name of the RedisEnterprise cluster. * @param databaseName The name of the database. - * @param sasUri SAS URI for the target blob to import from + * @param sasUris SAS URIs for the target blobs to import from * @param [options] The optional parameters * @returns Promise */ - importMethod(resourceGroupName: string, clusterName: string, databaseName: string, sasUri: string, options?: msRest.RequestOptionsBase): Promise { - return this.beginImportMethod(resourceGroupName,clusterName,databaseName,sasUri,options) + importMethod(resourceGroupName: string, clusterName: string, databaseName: string, sasUris: string[], options?: msRest.RequestOptionsBase): Promise { + return this.beginImportMethod(resourceGroupName,clusterName,databaseName,sasUris,options) .then(lroPoller => lroPoller.pollUntilFinished()); } @@ -300,21 +300,21 @@ export class Databases { } /** - * Imports a database file to target database. + * Imports database files to target database. * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param clusterName The name of the RedisEnterprise cluster. * @param databaseName The name of the database. - * @param sasUri SAS URI for the target blob to import from + * @param sasUris SAS URIs for the target blobs to import from * @param [options] The optional parameters * @returns Promise */ - beginImportMethod(resourceGroupName: string, clusterName: string, databaseName: string, sasUri: string, options?: msRest.RequestOptionsBase): Promise { + beginImportMethod(resourceGroupName: string, clusterName: string, databaseName: string, sasUris: string[], options?: msRest.RequestOptionsBase): Promise { return this.client.sendLRORequest( { resourceGroupName, clusterName, databaseName, - sasUri, + sasUris, options }, beginImportMethodOperationSpec, @@ -600,7 +600,7 @@ const beginImportMethodOperationSpec: msRest.OperationSpec = { ], requestBody: { parameterPath: { - sasUri: "sasUri" + sasUris: "sasUris" }, mapper: { ...Mappers.ImportClusterParameters, diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/redisEnterpriseManagementClientContext.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/redisEnterpriseManagementClientContext.ts index cbf5215c0cb7..f8117e9fb02f 100644 --- a/sdk/redisenterprise/arm-redisenterprisecache/src/redisEnterpriseManagementClientContext.ts +++ b/sdk/redisenterprise/arm-redisenterprisecache/src/redisEnterpriseManagementClientContext.ts @@ -9,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-redisenterprisecache"; const packageVersion = "1.1.0"; @@ -42,14 +42,14 @@ export class RedisEnterpriseManagementClientContext extends msRestAzure.AzureSer if (!options) { options = {}; } - if(!options.userAgent) { + if (!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } super(credentials, options); - this.apiVersion = '2021-03-01'; + this.apiVersion = '2021-08-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; @@ -57,10 +57,10 @@ export class RedisEnterpriseManagementClientContext extends msRestAzure.AzureSer 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; } }