Skip to content

Commit

Permalink
CodeGen from PR 19566 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge 1d17afedb288334f12a7c3b53ca232715bba1a62 into bf82b74acfa933165e8e30d3403195043d1149d5
  • Loading branch information
SDKAuto committed Jun 23, 2022
1 parent c862585 commit 1faf741
Show file tree
Hide file tree
Showing 12 changed files with 163 additions and 45 deletions.
18 changes: 8 additions & 10 deletions sdk/redis/arm-rediscache/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# Release History

## 6.2.0 (2022-06-23)

**Features**

## 6.1.1 (Unreleased)

### Features Added

### Breaking Changes

### Bugs Fixed

### Other Changes

- Interface RedisCommonPropertiesRedisConfiguration has a new optional parameter aofBackupEnabled
- Interface RedisCommonPropertiesRedisConfiguration has a new optional parameter authnotrequired


## 6.1.0 (2022-03-07)

**Features**
Expand Down
7 changes: 4 additions & 3 deletions sdk/redis/arm-rediscache/_meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"commit": "20d333fa60a4a81acfd01a7bd56dd9c552301afe",
"commit": "04121c295af6cdb213e836d81ffe907206c280ce",
"readme": "specification/redis/resource-manager/readme.md",
"autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\redis\\resource-manager\\readme.md --use=@autorest/[email protected]beta.16 --generate-sample=true",
"autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/redis/resource-manager/readme.md --use=@autorest/[email protected]alpha.19.20220425.1",
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
"use": "@autorest/[email protected]"
"release_tool": "@azure-tools/[email protected]",
"use": "@autorest/[email protected]"
}
25 changes: 9 additions & 16 deletions sdk/redis/arm-rediscache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"sdk-type": "mgmt",
"author": "Microsoft Corporation",
"description": "A generated SDK for RedisManagementClient.",
"version": "6.1.1",
"version": "6.2.0",
"engines": {
"node": ">=12.0.0"
},
"dependencies": {
"@azure/core-lro": "^2.2.0",
"@azure/abort-controller": "^1.0.0",
"@azure/core-paging": "^1.2.0",
"@azure/core-client": "^1.0.0",
"@azure/core-client": "^1.5.0",
"@azure/core-auth": "^1.3.0",
"@azure/core-rest-pipeline": "^1.1.0",
"@azure/core-rest-pipeline": "^1.8.0",
"tslib": "^2.2.0"
},
"keywords": [
Expand All @@ -40,10 +40,11 @@
"uglify-js": "^3.4.9",
"rimraf": "^3.0.0",
"@azure/identity": "^2.0.1",
"@azure-tools/test-recorder": "^1.0.0",
"@azure-tools/test-recorder": "^2.0.0",
"@azure-tools/test-credential": "^1.0.0",
"mocha": "^7.1.1",
"cross-env": "^7.0.2",
"@azure/arm-network": "^26.0.0"
"@azure/dev-tool": "^1.0.0"
},
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redis/arm-rediscache",
"repository": {
Expand Down Expand Up @@ -94,7 +95,7 @@
"unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
"unit-test:browser": "echo skipped",
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
"integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js",
"integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'",
"integration-test:browser": "echo skipped",
"docs": "echo skipped"
},
Expand All @@ -107,13 +108,5 @@
}
]
},
"autoPublish": true,
"//sampleConfiguration": {
"productName": "",
"productSlugs": [
"azure"
],
"disableDocsMs": true,
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-rediscache?view=azure-node-preview"
}
}
"autoPublish": true
}
2 changes: 2 additions & 0 deletions sdk/redis/arm-rediscache/review/arm-rediscache.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,10 @@ export interface RedisCommonProperties {
// @public
export interface RedisCommonPropertiesRedisConfiguration {
[property: string]: any;
aofBackupEnabled?: string;
aofStorageConnectionString0?: string;
aofStorageConnectionString1?: string;
authnotrequired?: string;
readonly maxclients?: string;
maxfragmentationmemoryReserved?: string;
maxmemoryDelta?: string;
Expand Down
4 changes: 4 additions & 0 deletions sdk/redis/arm-rediscache/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ export interface RedisCommonPropertiesRedisConfiguration {
rdbBackupMaxSnapshotCount?: string;
/** The storage account connection string for storing rdb file */
rdbStorageConnectionString?: string;
/** Specifies whether the aof backup is enabled */
aofBackupEnabled?: string;
/** First storage account connection string */
aofStorageConnectionString0?: string;
/** Second storage account connection string */
Expand Down Expand Up @@ -238,6 +240,8 @@ export interface RedisCommonPropertiesRedisConfiguration {
* NOTE: This property will not be serialized. It can only be populated by the server.
*/
readonly zonalConfiguration?: string;
/** Specifies whether the authentication is disabled. */
authnotrequired?: string;
}

/** Managed service identity (system assigned and/or user assigned identities) */
Expand Down
12 changes: 12 additions & 0 deletions sdk/redis/arm-rediscache/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,12 @@ export const RedisCommonPropertiesRedisConfiguration: coreClient.CompositeMapper
name: "String"
}
},
aofBackupEnabled: {
serializedName: "aof-backup-enabled",
type: {
name: "String"
}
},
aofStorageConnectionString0: {
serializedName: "aof-storage-connection-string-0",
type: {
Expand Down Expand Up @@ -585,6 +591,12 @@ export const RedisCommonPropertiesRedisConfiguration: coreClient.CompositeMapper
type: {
name: "String"
}
},
authnotrequired: {
serializedName: "authnotrequired",
type: {
name: "String"
}
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion sdk/redis/arm-rediscache/src/operations/linkedServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,12 @@ export class LinkedServerImpl implements LinkedServer {
{ resourceGroupName, name, linkedServerName, parameters, options },
createOperationSpec
);
return new LroEngine(lro, {
const poller = new LroEngine(lro, {
resumeFrom: options?.resumeFrom,
intervalInMs: options?.updateIntervalInMs
});
await poller.poll();
return poller;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,12 @@ export class PrivateEndpointConnectionsImpl
},
putOperationSpec
);
return new LroEngine(lro, {
const poller = new LroEngine(lro, {
resumeFrom: options?.resumeFrom,
intervalInMs: options?.updateIntervalInMs
});
await poller.poll();
return poller;
}

/**
Expand Down
16 changes: 12 additions & 4 deletions sdk/redis/arm-rediscache/src/operations/redis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -336,10 +336,12 @@ export class RedisImpl implements Redis {
{ resourceGroupName, name, parameters, options },
createOperationSpec
);
return new LroEngine(lro, {
const poller = new LroEngine(lro, {
resumeFrom: options?.resumeFrom,
intervalInMs: options?.updateIntervalInMs
});
await poller.poll();
return poller;
}

/**
Expand Down Expand Up @@ -438,10 +440,12 @@ export class RedisImpl implements Redis {
{ resourceGroupName, name, options },
deleteOperationSpec
);
return new LroEngine(lro, {
const poller = new LroEngine(lro, {
resumeFrom: options?.resumeFrom,
intervalInMs: options?.updateIntervalInMs
});
await poller.poll();
return poller;
}

/**
Expand Down Expand Up @@ -619,10 +623,12 @@ export class RedisImpl implements Redis {
{ resourceGroupName, name, parameters, options },
importDataOperationSpec
);
return new LroEngine(lro, {
const poller = new LroEngine(lro, {
resumeFrom: options?.resumeFrom,
intervalInMs: options?.updateIntervalInMs
});
await poller.poll();
return poller;
}

/**
Expand Down Expand Up @@ -704,10 +710,12 @@ export class RedisImpl implements Redis {
{ resourceGroupName, name, parameters, options },
exportDataOperationSpec
);
return new LroEngine(lro, {
const poller = new LroEngine(lro, {
resumeFrom: options?.resumeFrom,
intervalInMs: options?.updateIntervalInMs
});
await poller.poll();
return poller;
}

/**
Expand Down
63 changes: 61 additions & 2 deletions sdk/redis/arm-rediscache/src/redisManagementClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
*/

import * as coreClient from "@azure/core-client";
import * as coreRestPipeline from "@azure/core-rest-pipeline";
import {
PipelineRequest,
PipelineResponse,
SendRequest
} from "@azure/core-rest-pipeline";
import * as coreAuth from "@azure/core-auth";
import {
OperationsImpl,
Expand Down Expand Up @@ -63,7 +69,7 @@ export class RedisManagementClient extends coreClient.ServiceClient {
credential: credentials
};

const packageDetails = `azsdk-js-arm-rediscache/6.1.1`;
const packageDetails = `azsdk-js-arm-rediscache/6.2.0`;
const userAgentPrefix =
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
Expand All @@ -78,9 +84,33 @@ export class RedisManagementClient extends coreClient.ServiceClient {
userAgentOptions: {
userAgentPrefix
},
baseUri: options.endpoint || "https://management.azure.com"
baseUri:
options.endpoint ?? options.baseUri ?? "https://management.azure.com"
};
super(optionsWithDefaults);

if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
(pipelinePolicy) =>
pipelinePolicy.name ===
coreRestPipeline.bearerTokenAuthenticationPolicyName
);
if (!bearerTokenAuthenticationPolicyFound) {
this.pipeline.removePolicy({
name: coreRestPipeline.bearerTokenAuthenticationPolicyName
});
this.pipeline.addPolicy(
coreRestPipeline.bearerTokenAuthenticationPolicy({
scopes: `${optionsWithDefaults.baseUri}/.default`,
challengeCallbacks: {
authorizeRequestOnChallenge:
coreClient.authorizeRequestOnClaimChallenge
}
})
);
}
}
// Parameter assignments
this.subscriptionId = subscriptionId;

Expand All @@ -95,6 +125,35 @@ export class RedisManagementClient extends coreClient.ServiceClient {
this.privateEndpointConnections = new PrivateEndpointConnectionsImpl(this);
this.privateLinkResources = new PrivateLinkResourcesImpl(this);
this.asyncOperationStatus = new AsyncOperationStatusImpl(this);
this.addCustomApiVersionPolicy(options.apiVersion);
}

/** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
private addCustomApiVersionPolicy(apiVersion?: string) {
if (!apiVersion) {
return;
}
const apiVersionPolicy = {
name: "CustomApiVersionPolicy",
async sendRequest(
request: PipelineRequest,
next: SendRequest
): Promise<PipelineResponse> {
const param = request.url.split("?");
if (param.length > 1) {
const newParams = param[1].split("&").map((item) => {
if (item.indexOf("api-version") > -1) {
return item.replace(/(?<==).*$/, apiVersion);
} else {
return item;
}
});
request.url = param[0] + "?" + newParams.join("&");
}
return next(request);
}
};
this.pipeline.addPolicy(apiVersionPolicy);
}

operations: Operations;
Expand Down
43 changes: 43 additions & 0 deletions sdk/redis/arm-rediscache/test/sampleTest.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* 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.
*/

import {
Recorder,
RecorderStartOptions,
env
} from "@azure-tools/test-recorder";
import { assert } from "chai";
import { Context } from "mocha";

const replaceableVariables: Record<string, string> = {
AZURE_CLIENT_ID: "azure_client_id",
AZURE_CLIENT_SECRET: "azure_client_secret",
AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
SUBSCRIPTION_ID: "azure_subscription_id"
};

const recorderOptions: RecorderStartOptions = {
envSetupForPlayback: replaceableVariables
};

describe("My test", () => {
let recorder: Recorder;

beforeEach(async function(this: Context) {
recorder = new Recorder(this.currentTest);
await recorder.start(recorderOptions);
});

afterEach(async function() {
await recorder.stop();
});

it("sample test", async function() {
console.log("Hi, I'm a test!");
});
});
10 changes: 2 additions & 8 deletions sdk/redis/arm-rediscache/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,11 @@
],
"declaration": true,
"outDir": "./dist-esm",
"importHelpers": true,
"paths": {
"@azure/arm-rediscache": [
"./src/index"
]
}
"importHelpers": true
},
"include": [
"./src/**/*.ts",
"./test/**/*.ts",
"samples-dev/**/*.ts"
"./test/**/*.ts"
],
"exclude": [
"node_modules"
Expand Down

0 comments on commit 1faf741

Please sign in to comment.