Skip to content

Commit

Permalink
CodeGen from PR 15417 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
[Hub Generated] Review request for Microsoft.Cache to add version stable/2021-08-01 (Azure#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
  • Loading branch information
SDKAuto committed Aug 2, 2021
1 parent 33602ff commit cad8e43
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 29 deletions.
9 changes: 3 additions & 6 deletions sdk/redisenterprise/arm-redisenterprisecache/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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.

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 RedisEnterpriseManagementClient(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.ArmRedisenterprisecache.RedisEnterpriseManagementClient(creds, subscriptionId);
client.operations.list().then((result) => {
Expand Down
2 changes: 1 addition & 1 deletion sdk/redisenterprise/arm-redisenterprisecache/package.json
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/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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ export const resourceGroupName: msRest.OperationURLParameter = {
serializedName: "resourceGroupName",
constraints: {
MaxLength: 90,
MinLength: 1,
Pattern: /^[-\w\._\(\)]+$/
MinLength: 1
},
type: {
name: "String"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<msRest.RestResponse>
*/
importMethod(resourceGroupName: string, clusterName: string, databaseName: string, sasUri: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse> {
return this.beginImportMethod(resourceGroupName,clusterName,databaseName,sasUri,options)
importMethod(resourceGroupName: string, clusterName: string, databaseName: string, sasUris: string[], options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse> {
return this.beginImportMethod(resourceGroupName,clusterName,databaseName,sasUris,options)
.then(lroPoller => lroPoller.pollUntilFinished());
}

Expand Down Expand Up @@ -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<msRestAzure.LROPoller>
*/
beginImportMethod(resourceGroupName: string, clusterName: string, databaseName: string, sasUri: string, options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
beginImportMethod(resourceGroupName: string, clusterName: string, databaseName: string, sasUris: string[], options?: msRest.RequestOptionsBase): Promise<msRestAzure.LROPoller> {
return this.client.sendLRORequest(
{
resourceGroupName,
clusterName,
databaseName,
sasUri,
sasUris,
options
},
beginImportMethodOperationSpec,
Expand Down Expand Up @@ -600,7 +600,7 @@ const beginImportMethodOperationSpec: msRest.OperationSpec = {
],
requestBody: {
parameterPath: {
sasUri: "sasUri"
sasUris: "sasUris"
},
mapper: {
...Mappers.ImportClusterParameters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -42,25 +42,25 @@ 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";
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

0 comments on commit cad8e43

Please sign in to comment.