Skip to content

Commit 7fbf2ac

Browse files
author
SDKAuto
committed
CodeGen from PR 23745 in Azure/azure-rest-api-specs
Merge d70671fe5dceb9c46dbd527e9e4fe09d7fab0ccd into 1c4b161f7e259669789340da018051084209e3fe
1 parent aa84908 commit 7fbf2ac

File tree

18 files changed

+259
-174
lines changed

18 files changed

+259
-174
lines changed

‎common/config/rush/pnpm-lock.yaml‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/redis/arm-rediscache/CHANGELOG.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
# Release History
2+
3+
## 7.2.0 (2023-05-05)
4+
5+
**Features**
26

3-
## 7.1.2 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
12-
7+
- Interface ExportRDBParameters has a new optional parameter storageSubscriptionId
8+
- Interface ImportRDBParameters has a new optional parameter storageSubscriptionId
9+
- Interface RedisCommonPropertiesRedisConfiguration has a new optional parameter storageSubscriptionId
10+
1311
## 7.1.1 (2023-01-31)
1412

1513
**Features**

‎sdk/redis/arm-rediscache/_meta.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "794b03f1b40b6f7646528fbe06bcfce7b58223a9",
2+
"commit": "1d1d84c307c53db67ddf4a312d2b57f2cf48ce5f",
33
"readme": "specification/redis/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=F:\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\redis\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.7 --generate-sample=true",
4+
"autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --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/typescript@6.0.0-rc.10",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"release_tool": "@azure-tools/js-sdk-release-tools@2.6.0",
7-
"use": "@autorest/typescript@6.0.0-rc.7"
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.7.0",
7+
"use": "@autorest/typescript@6.0.0-rc.10"
88
}

‎sdk/redis/arm-rediscache/package.json‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for RedisManagementClient.",
6-
"version": "7.1.2",
6+
"version": "7.2.0",
77
"engines": {
88
"node": ">=14.0.0"
99
},
1010
"dependencies": {
11-
"@azure/core-lro": "^2.2.0",
11+
"@azure/core-lro": "^2.5.0",
1212
"@azure/abort-controller": "^1.0.0",
1313
"@azure/core-paging": "^1.2.0",
14-
"@azure/core-client": "^1.6.1",
14+
"@azure/core-client": "^1.7.0",
1515
"@azure/core-auth": "^1.3.0",
1616
"@azure/core-rest-pipeline": "^1.8.0",
1717
"tslib": "^2.2.0"
@@ -33,13 +33,13 @@
3333
"@rollup/plugin-json": "^6.0.0",
3434
"@rollup/plugin-multi-entry": "^6.0.0",
3535
"@rollup/plugin-node-resolve": "^13.1.3",
36-
"mkdirp": "^1.0.4",
36+
"mkdirp": "^2.1.2",
3737
"rollup": "^2.66.1",
3838
"rollup-plugin-sourcemaps": "^0.6.3",
39-
"typescript": "~5.0.0",
39+
"typescript": "~4.8.0",
4040
"uglify-js": "^3.4.9",
4141
"rimraf": "^3.0.0",
42-
"dotenv": "^8.2.0",
42+
"dotenv": "^16.0.0",
4343
"@azure/identity": "^2.0.1",
4444
"@azure-tools/test-recorder": "^3.0.0",
4545
"@azure-tools/test-credential": "^1.0.0",
@@ -48,8 +48,7 @@
4848
"chai": "^4.2.0",
4949
"cross-env": "^7.0.2",
5050
"@types/node": "^14.0.0",
51-
"@azure/dev-tool": "^1.0.0",
52-
"@azure/arm-network": "^26.0.0"
51+
"@azure/dev-tool": "^1.0.0"
5352
},
5453
"repository": {
5554
"type": "git",
@@ -112,13 +111,5 @@
112111
]
113112
},
114113
"autoPublish": true,
115-
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redis/arm-rediscache",
116-
"//sampleConfiguration": {
117-
"productName": "",
118-
"productSlugs": [
119-
"azure"
120-
],
121-
"disableDocsMs": true,
122-
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-rediscache?view=azure-node-preview"
123-
}
124-
}
114+
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redis/arm-rediscache"
115+
}

‎sdk/redis/arm-rediscache/review/arm-rediscache.api.md‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
import * as coreAuth from '@azure/core-auth';
88
import * as coreClient from '@azure/core-client';
9+
import { OperationState } from '@azure/core-lro';
910
import { PagedAsyncIterableIterator } from '@azure/core-paging';
10-
import { PollerLike } from '@azure/core-lro';
11-
import { PollOperationState } from '@azure/core-lro';
11+
import { SimplePollerLike } from '@azure/core-lro';
1212

1313
// @public
1414
export interface AsyncOperationStatus {
@@ -69,6 +69,7 @@ export interface ExportRDBParameters {
6969
format?: string;
7070
preferredDataArchiveAuthMethod?: string;
7171
prefix: string;
72+
storageSubscriptionId?: string;
7273
}
7374

7475
// @public
@@ -119,6 +120,7 @@ export interface ImportRDBParameters {
119120
files: string[];
120121
format?: string;
121122
preferredDataArchiveAuthMethod?: string;
123+
storageSubscriptionId?: string;
122124
}
123125

124126
// @public
@@ -202,9 +204,9 @@ export enum KnownTlsVersion {
202204

203205
// @public
204206
export interface LinkedServer {
205-
beginCreate(resourceGroupName: string, name: string, linkedServerName: string, parameters: RedisLinkedServerCreateParameters, options?: LinkedServerCreateOptionalParams): Promise<PollerLike<PollOperationState<LinkedServerCreateResponse>, LinkedServerCreateResponse>>;
207+
beginCreate(resourceGroupName: string, name: string, linkedServerName: string, parameters: RedisLinkedServerCreateParameters, options?: LinkedServerCreateOptionalParams): Promise<SimplePollerLike<OperationState<LinkedServerCreateResponse>, LinkedServerCreateResponse>>;
206208
beginCreateAndWait(resourceGroupName: string, name: string, linkedServerName: string, parameters: RedisLinkedServerCreateParameters, options?: LinkedServerCreateOptionalParams): Promise<LinkedServerCreateResponse>;
207-
beginDelete(resourceGroupName: string, name: string, linkedServerName: string, options?: LinkedServerDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
209+
beginDelete(resourceGroupName: string, name: string, linkedServerName: string, options?: LinkedServerDeleteOptionalParams): Promise<SimplePollerLike<OperationState<void>, void>>;
208210
beginDeleteAndWait(resourceGroupName: string, name: string, linkedServerName: string, options?: LinkedServerDeleteOptionalParams): Promise<void>;
209211
get(resourceGroupName: string, name: string, linkedServerName: string, options?: LinkedServerGetOptionalParams): Promise<LinkedServerGetResponse>;
210212
list(resourceGroupName: string, name: string, options?: LinkedServerListOptionalParams): PagedAsyncIterableIterator<RedisLinkedServerWithProperties>;
@@ -385,7 +387,7 @@ export type PrivateEndpointConnectionProvisioningState = string;
385387

386388
// @public
387389
export interface PrivateEndpointConnections {
388-
beginPut(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, properties: PrivateEndpointConnection, options?: PrivateEndpointConnectionsPutOptionalParams): Promise<PollerLike<PollOperationState<PrivateEndpointConnectionsPutResponse>, PrivateEndpointConnectionsPutResponse>>;
390+
beginPut(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, properties: PrivateEndpointConnection, options?: PrivateEndpointConnectionsPutOptionalParams): Promise<SimplePollerLike<OperationState<PrivateEndpointConnectionsPutResponse>, PrivateEndpointConnectionsPutResponse>>;
389391
beginPutAndWait(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, properties: PrivateEndpointConnection, options?: PrivateEndpointConnectionsPutOptionalParams): Promise<PrivateEndpointConnectionsPutResponse>;
390392
delete(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, options?: PrivateEndpointConnectionsDeleteOptionalParams): Promise<void>;
391393
get(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, options?: PrivateEndpointConnectionsGetOptionalParams): Promise<PrivateEndpointConnectionsGetResponse>;
@@ -468,15 +470,15 @@ export type RebootType = string;
468470

469471
// @public
470472
export interface Redis {
471-
beginCreate(resourceGroupName: string, name: string, parameters: RedisCreateParameters, options?: RedisCreateOptionalParams): Promise<PollerLike<PollOperationState<RedisCreateResponse>, RedisCreateResponse>>;
473+
beginCreate(resourceGroupName: string, name: string, parameters: RedisCreateParameters, options?: RedisCreateOptionalParams): Promise<SimplePollerLike<OperationState<RedisCreateResponse>, RedisCreateResponse>>;
472474
beginCreateAndWait(resourceGroupName: string, name: string, parameters: RedisCreateParameters, options?: RedisCreateOptionalParams): Promise<RedisCreateResponse>;
473-
beginDelete(resourceGroupName: string, name: string, options?: RedisDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
475+
beginDelete(resourceGroupName: string, name: string, options?: RedisDeleteOptionalParams): Promise<SimplePollerLike<OperationState<void>, void>>;
474476
beginDeleteAndWait(resourceGroupName: string, name: string, options?: RedisDeleteOptionalParams): Promise<void>;
475-
beginExportData(resourceGroupName: string, name: string, parameters: ExportRDBParameters, options?: RedisExportDataOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
477+
beginExportData(resourceGroupName: string, name: string, parameters: ExportRDBParameters, options?: RedisExportDataOptionalParams): Promise<SimplePollerLike<OperationState<void>, void>>;
476478
beginExportDataAndWait(resourceGroupName: string, name: string, parameters: ExportRDBParameters, options?: RedisExportDataOptionalParams): Promise<void>;
477-
beginImportData(resourceGroupName: string, name: string, parameters: ImportRDBParameters, options?: RedisImportDataOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
479+
beginImportData(resourceGroupName: string, name: string, parameters: ImportRDBParameters, options?: RedisImportDataOptionalParams): Promise<SimplePollerLike<OperationState<void>, void>>;
478480
beginImportDataAndWait(resourceGroupName: string, name: string, parameters: ImportRDBParameters, options?: RedisImportDataOptionalParams): Promise<void>;
479-
beginUpdate(resourceGroupName: string, name: string, parameters: RedisUpdateParameters, options?: RedisUpdateOptionalParams): Promise<PollerLike<PollOperationState<RedisUpdateResponse>, RedisUpdateResponse>>;
481+
beginUpdate(resourceGroupName: string, name: string, parameters: RedisUpdateParameters, options?: RedisUpdateOptionalParams): Promise<SimplePollerLike<OperationState<RedisUpdateResponse>, RedisUpdateResponse>>;
480482
beginUpdateAndWait(resourceGroupName: string, name: string, parameters: RedisUpdateParameters, options?: RedisUpdateOptionalParams): Promise<RedisUpdateResponse>;
481483
checkNameAvailability(parameters: CheckNameAvailabilityParameters, options?: RedisCheckNameAvailabilityOptionalParams): Promise<void>;
482484
forceReboot(resourceGroupName: string, name: string, parameters: RedisRebootParameters, options?: RedisForceRebootOptionalParams): Promise<RedisForceRebootOperationResponse>;
@@ -531,6 +533,7 @@ export interface RedisCommonPropertiesRedisConfiguration {
531533
rdbBackupFrequency?: string;
532534
rdbBackupMaxSnapshotCount?: string;
533535
rdbStorageConnectionString?: string;
536+
storageSubscriptionId?: string;
534537
readonly zonalConfiguration?: string;
535538
}
536539

‎sdk/redis/arm-rediscache/src/lroImpl.ts‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,37 @@
66
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
*/
88

9+
// Copyright (c) Microsoft Corporation.
10+
// Licensed under the MIT license.
11+
12+
import { AbortSignalLike } from "@azure/abort-controller";
913
import { LongRunningOperation, LroResponse } from "@azure/core-lro";
1014

11-
export class LroImpl<T> implements LongRunningOperation<T> {
12-
constructor(
13-
private sendOperationFn: (args: any, spec: any) => Promise<LroResponse<T>>,
14-
private args: Record<string, unknown>,
15-
private spec: {
16-
readonly requestBody?: unknown;
17-
readonly path?: string;
18-
readonly httpMethod: string;
19-
} & Record<string, any>,
20-
public requestPath: string = spec.path!,
21-
public requestMethod: string = spec.httpMethod
22-
) {}
23-
public async sendInitialRequest(): Promise<LroResponse<T>> {
24-
return this.sendOperationFn(this.args, this.spec);
25-
}
26-
public async sendPollRequest(path: string): Promise<LroResponse<T>> {
27-
const { requestBody, ...restSpec } = this.spec;
28-
return this.sendOperationFn(this.args, {
29-
...restSpec,
30-
path,
31-
httpMethod: "GET"
32-
});
33-
}
15+
export function createLroSpec<T>(inputs: {
16+
sendOperationFn: (args: any, spec: any) => Promise<LroResponse<T>>;
17+
args: Record<string, unknown>;
18+
spec: {
19+
readonly requestBody?: unknown;
20+
readonly path?: string;
21+
readonly httpMethod: string;
22+
} & Record<string, any>;
23+
}): LongRunningOperation<T> {
24+
const { args, spec, sendOperationFn } = inputs;
25+
return {
26+
requestMethod: spec.httpMethod,
27+
requestPath: spec.path!,
28+
sendInitialRequest: () => sendOperationFn(args, spec),
29+
sendPollRequest: (
30+
path: string,
31+
options?: { abortSignal?: AbortSignalLike }
32+
) => {
33+
const { requestBody, ...restSpec } = spec;
34+
return sendOperationFn(args, {
35+
...restSpec,
36+
httpMethod: "GET",
37+
path,
38+
abortSignal: options?.abortSignal
39+
});
40+
}
41+
};
3442
}

‎sdk/redis/arm-rediscache/src/models/index.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ export interface RedisCommonPropertiesRedisConfiguration {
239239
readonly zonalConfiguration?: string;
240240
/** Specifies whether the authentication is disabled. Setting this property is highly discouraged from security point of view. */
241241
authnotrequired?: string;
242+
/** SubscriptionId of the storage account for persistence (aof/rdb) using ManagedIdentity. */
243+
storageSubscriptionId?: string;
242244
}
243245

244246
/** Managed service identity (system assigned and/or user assigned identities) */
@@ -440,6 +442,8 @@ export interface ImportRDBParameters {
440442
files: string[];
441443
/** Preferred auth method to communicate to storage account used for data archive, specify SAS or ManagedIdentity, default value is SAS */
442444
preferredDataArchiveAuthMethod?: string;
445+
/** Subscription id of the storage container containing files to import using Managed Identity. */
446+
storageSubscriptionId?: string;
443447
}
444448

445449
/** Parameters for Redis export operation. */
@@ -452,6 +456,8 @@ export interface ExportRDBParameters {
452456
container: string;
453457
/** Preferred auth method to communicate to storage account used for data archive, specify SAS or ManagedIdentity, default value is SAS */
454458
preferredDataArchiveAuthMethod?: string;
459+
/** Subscription id of the storage container for data to be exported using ManagedIdentity. */
460+
storageSubscriptionId?: string;
455461
}
456462

457463
/** The response of list firewall rules Redis operation. */

‎sdk/redis/arm-rediscache/src/models/mappers.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,12 @@ export const RedisCommonPropertiesRedisConfiguration: coreClient.CompositeMapper
596596
type: {
597597
name: "String"
598598
}
599+
},
600+
storageSubscriptionId: {
601+
serializedName: "storage-subscription-id",
602+
type: {
603+
name: "String"
604+
}
599605
}
600606
}
601607
}
@@ -1035,6 +1041,12 @@ export const ImportRDBParameters: coreClient.CompositeMapper = {
10351041
type: {
10361042
name: "String"
10371043
}
1044+
},
1045+
storageSubscriptionId: {
1046+
serializedName: "storage-subscription-id",
1047+
type: {
1048+
name: "String"
1049+
}
10381050
}
10391051
}
10401052
}
@@ -1070,6 +1082,12 @@ export const ExportRDBParameters: coreClient.CompositeMapper = {
10701082
type: {
10711083
name: "String"
10721084
}
1085+
},
1086+
storageSubscriptionId: {
1087+
serializedName: "storage-subscription-id",
1088+
type: {
1089+
name: "String"
1090+
}
10731091
}
10741092
}
10751093
}

‎sdk/redis/arm-rediscache/src/models/parameters.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const $host: OperationURLParameter = {
5252
export const apiVersion: OperationQueryParameter = {
5353
parameterPath: "apiVersion",
5454
mapper: {
55-
defaultValue: "2022-06-01",
55+
defaultValue: "2023-04-01",
5656
isConstant: true,
5757
serializedName: "api-version",
5858
type: {

0 commit comments

Comments
 (0)