Skip to content

Commit dd4b451

Browse files
author
SDKAuto
committed
CodeGen from PR 17750 in Azure/azure-rest-api-specs
Merge 6d0a85453dbe016d0a59e5ba25c97a9d16adf5a8 into c731fa175f77b7b53ef0579eb877c61b5d0467d6
1 parent c2713dc commit dd4b451

File tree

13 files changed

+343
-41
lines changed

13 files changed

+343
-41
lines changed

common/config/rush/pnpm-lock.yaml

Lines changed: 7 additions & 7 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: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
# Release History
2-
3-
## 6.0.1 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
12-
2+
3+
## 6.1.0 (2022-02-18)
4+
5+
**Features**
6+
7+
- Added Interface ManagedServiceIdentity
8+
- Added Interface UserAssignedIdentity
9+
- Added Type Alias ManagedServiceIdentityType
10+
- Interface RedisCommonPropertiesRedisConfiguration has a new optional parameter preferredDataArchiveAuthMethod
11+
- Interface RedisCommonPropertiesRedisConfiguration has a new optional parameter preferredDataPersistenceAuthMethod
12+
- Interface RedisCommonPropertiesRedisConfiguration has a new optional parameter zonalConfiguration
13+
- Interface RedisCreateParameters has a new optional parameter identity
14+
- Interface RedisUpdateParameters has a new optional parameter identity
15+
- Type Alias RedisPatchSchedule has a new parameter location
16+
- Type Alias RedisResource has a new parameter identity
17+
- Added Enum KnownManagedServiceIdentityType
18+
19+
1320
## 6.0.0 (2021-12-10)
1421

1522
The package of @azure/arm-rediscache is using our next generation design principles since version 6.0.0, which contains breaking changes.

sdk/redis/arm-rediscache/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2021 Microsoft
3+
Copyright (c) 2022 Microsoft
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"commit": "76f8e0c50629ef12aa338d55782278ceca46212a",
2+
"commit": "4d741e220aa2fa6d963b281f691554cc6922983c",
33
"readme": "specification/redis/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.1.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].20211130.1",
4+
"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=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/redis/resource-manager/readme.md --use=@autorest/[email protected].20220105.1",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"use": "@autorest/[email protected].20211130.1"
6+
"use": "@autorest/[email protected].20220105.1"
77
}
Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
33
"mainEntryPointFilePath": "./dist-esm/src/index.d.ts",
4-
"docModel": { "enabled": true },
5-
"apiReport": { "enabled": true, "reportFolder": "./review" },
4+
"docModel": {
5+
"enabled": true
6+
},
7+
"apiReport": {
8+
"enabled": true,
9+
"reportFolder": "./review"
10+
},
611
"dtsRollup": {
712
"enabled": true,
813
"untrimmedFilePath": "",
914
"publicTrimmedFilePath": "./types/arm-rediscache.d.ts"
1015
},
1116
"messages": {
12-
"tsdocMessageReporting": { "default": { "logLevel": "none" } },
17+
"tsdocMessageReporting": {
18+
"default": {
19+
"logLevel": "none"
20+
}
21+
},
1322
"extractorMessageReporting": {
14-
"ae-missing-release-tag": { "logLevel": "none" },
15-
"ae-unresolved-link": { "logLevel": "none" }
23+
"ae-missing-release-tag": {
24+
"logLevel": "none"
25+
},
26+
"ae-unresolved-link": {
27+
"logLevel": "none"
28+
}
1629
}
1730
}
18-
}
31+
}

sdk/redis/arm-rediscache/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for RedisManagementClient.",
6-
"version": "6.0.1",
6+
"version": "1.0.0-beta.1",
77
"engines": {
88
"node": ">=12.0.0"
99
},
@@ -29,21 +29,20 @@
2929
"types": "./types/arm-rediscache.d.ts",
3030
"devDependencies": {
3131
"@microsoft/api-extractor": "^7.18.11",
32-
"@rollup/plugin-commonjs": "^21.0.1",
32+
"@rollup/plugin-commonjs": "11.0.2",
3333
"@rollup/plugin-json": "^4.0.0",
3434
"@rollup/plugin-multi-entry": "^3.0.0",
3535
"@rollup/plugin-node-resolve": "^8.0.0",
3636
"mkdirp": "^1.0.4",
37-
"rollup": "^2.0.0",
37+
"rollup": "^1.16.3",
3838
"rollup-plugin-sourcemaps": "^0.4.2",
3939
"typescript": "~4.2.0",
4040
"uglify-js": "^3.4.9",
4141
"rimraf": "^3.0.0",
4242
"@azure/identity": "^2.0.1",
4343
"@azure-tools/test-recorder": "^1.0.0",
4444
"mocha": "^7.1.1",
45-
"cross-env": "^7.0.2",
46-
"@azure/arm-network": "^26.0.0"
45+
"cross-env": "^7.0.2"
4746
},
4847
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redis/arm-rediscache",
4948
"repository": {
@@ -100,4 +99,4 @@
10099
},
101100
"sideEffects": false,
102101
"autoPublish": true
103-
}
102+
}

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,18 @@ export enum KnownDefaultName {
101101
Default = "default"
102102
}
103103

104+
// @public
105+
export enum KnownManagedServiceIdentityType {
106+
// (undocumented)
107+
None = "None",
108+
// (undocumented)
109+
SystemAssigned = "SystemAssigned",
110+
// (undocumented)
111+
SystemAssignedUserAssigned = "SystemAssigned, UserAssigned",
112+
// (undocumented)
113+
UserAssigned = "UserAssigned"
114+
}
115+
104116
// @public
105117
export enum KnownPrivateEndpointConnectionProvisioningState {
106118
// (undocumented)
@@ -240,6 +252,19 @@ export interface LinkedServerListOptionalParams extends coreClient.OperationOpti
240252
// @public
241253
export type LinkedServerListResponse = RedisLinkedServerWithPropertiesList;
242254

255+
// @public
256+
export interface ManagedServiceIdentity {
257+
readonly principalId?: string;
258+
readonly tenantId?: string;
259+
type: ManagedServiceIdentityType;
260+
userAssignedIdentities?: {
261+
[propertyName: string]: UserAssignedIdentity;
262+
};
263+
}
264+
265+
// @public
266+
export type ManagedServiceIdentityType = string;
267+
243268
// @public
244269
export interface NotificationListResponse {
245270
readonly nextLink?: string;
@@ -483,10 +508,13 @@ export interface RedisCommonPropertiesRedisConfiguration {
483508
maxmemoryDelta?: string;
484509
maxmemoryPolicy?: string;
485510
maxmemoryReserved?: string;
511+
readonly preferredDataArchiveAuthMethod?: string;
512+
readonly preferredDataPersistenceAuthMethod?: string;
486513
rdbBackupEnabled?: string;
487514
rdbBackupFrequency?: string;
488515
rdbBackupMaxSnapshotCount?: string;
489516
rdbStorageConnectionString?: string;
517+
readonly zonalConfiguration?: string;
490518
}
491519

492520
// @public
@@ -498,6 +526,7 @@ export interface RedisCreateOptionalParams extends coreClient.OperationOptions {
498526
// @public
499527
export interface RedisCreateParameters {
500528
enableNonSslPort?: boolean;
529+
identity?: ManagedServiceIdentity;
501530
location: string;
502531
minimumTlsVersion?: TlsVersion;
503532
publicNetworkAccess?: PublicNetworkAccess;
@@ -720,6 +749,7 @@ export interface RedisManagementClientOptionalParams extends coreClient.ServiceC
720749

721750
// @public
722751
export type RedisPatchSchedule = ProxyResource & {
752+
readonly location?: string;
723753
scheduleEntries: ScheduleEntry[];
724754
};
725755

@@ -763,6 +793,7 @@ export type RedisRegenerateKeyResponse = RedisAccessKeys;
763793
// @public
764794
export type RedisResource = TrackedResource & {
765795
zones?: string[];
796+
identity?: ManagedServiceIdentity;
766797
redisConfiguration?: RedisCommonPropertiesRedisConfiguration;
767798
redisVersion?: string;
768799
enableNonSslPort?: boolean;
@@ -794,6 +825,7 @@ export interface RedisUpdateOptionalParams extends coreClient.OperationOptions {
794825
// @public
795826
export interface RedisUpdateParameters {
796827
enableNonSslPort?: boolean;
828+
identity?: ManagedServiceIdentity;
797829
minimumTlsVersion?: TlsVersion;
798830
publicNetworkAccess?: PublicNetworkAccess;
799831
redisConfiguration?: RedisCommonPropertiesRedisConfiguration;
@@ -868,6 +900,12 @@ export interface UpgradeNotification {
868900
};
869901
}
870902

903+
// @public
904+
export interface UserAssignedIdentity {
905+
readonly clientId?: string;
906+
readonly principalId?: string;
907+
}
908+
871909
// (No @packageDocumentation comment for this package)
872910

873911
```

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ export interface RedisCreateParameters {
134134
location: string;
135135
/** Resource tags. */
136136
tags?: { [propertyName: string]: string };
137+
/** The identity of the resource. */
138+
identity?: ManagedServiceIdentity;
137139
/** All Redis Settings. Few possible keys: rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value etc. */
138140
redisConfiguration?: RedisCommonPropertiesRedisConfiguration;
139141
/** Redis version. Only major version will be used in PUT/PATCH request with current valid values: (4, 6) */
@@ -221,6 +223,53 @@ export interface RedisCommonPropertiesRedisConfiguration {
221223
* NOTE: This property will not be serialized. It can only be populated by the server.
222224
*/
223225
readonly maxclients?: string;
226+
/**
227+
* Preferred auth method to communicate to storage account used for data archive, specify SAS or ManagedIdentity, default value is SAS
228+
* NOTE: This property will not be serialized. It can only be populated by the server.
229+
*/
230+
readonly preferredDataArchiveAuthMethod?: string;
231+
/**
232+
* Preferred auth method to communicate to storage account used for data persistence, specify SAS or ManagedIdentity, default value is SAS
233+
* NOTE: This property will not be serialized. It can only be populated by the server.
234+
*/
235+
readonly preferredDataPersistenceAuthMethod?: string;
236+
/**
237+
* Zonal Configuration
238+
* NOTE: This property will not be serialized. It can only be populated by the server.
239+
*/
240+
readonly zonalConfiguration?: string;
241+
}
242+
243+
/** Managed service identity (system assigned and/or user assigned identities) */
244+
export interface ManagedServiceIdentity {
245+
/**
246+
* The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity.
247+
* NOTE: This property will not be serialized. It can only be populated by the server.
248+
*/
249+
readonly principalId?: string;
250+
/**
251+
* The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity.
252+
* NOTE: This property will not be serialized. It can only be populated by the server.
253+
*/
254+
readonly tenantId?: string;
255+
/** Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed). */
256+
type: ManagedServiceIdentityType;
257+
/** The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests. */
258+
userAssignedIdentities?: { [propertyName: string]: UserAssignedIdentity };
259+
}
260+
261+
/** User assigned identity properties */
262+
export interface UserAssignedIdentity {
263+
/**
264+
* The principal ID of the assigned identity.
265+
* NOTE: This property will not be serialized. It can only be populated by the server.
266+
*/
267+
readonly principalId?: string;
268+
/**
269+
* The client ID of the assigned identity.
270+
* NOTE: This property will not be serialized. It can only be populated by the server.
271+
*/
272+
readonly clientId?: string;
224273
}
225274

226275
/** Redis cache access keys. */
@@ -322,6 +371,8 @@ export interface Resource {
322371
export interface RedisUpdateParameters {
323372
/** Resource tags. */
324373
tags?: { [propertyName: string]: string };
374+
/** The identity of the resource. */
375+
identity?: ManagedServiceIdentity;
325376
/** All Redis Settings. Few possible keys: rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value etc. */
326377
redisConfiguration?: RedisCommonPropertiesRedisConfiguration;
327378
/** Redis version. Only major version will be used in PUT/PATCH request with current valid values: (4, 6) */
@@ -586,6 +637,8 @@ export type RedisProperties = RedisCreateProperties & {
586637
export type RedisResource = TrackedResource & {
587638
/** A list of availability zones denoting where the resource needs to come from. */
588639
zones?: string[];
640+
/** The identity of the resource. */
641+
identity?: ManagedServiceIdentity;
589642
/** All Redis Settings. Few possible keys: rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value etc. */
590643
redisConfiguration?: RedisCommonPropertiesRedisConfiguration;
591644
/** Redis version. Only major version will be used in PUT/PATCH request with current valid values: (4, 6) */
@@ -662,6 +715,11 @@ export type RedisFirewallRule = ProxyResource & {
662715

663716
/** Response to put/get patch schedules for Redis cache. */
664717
export type RedisPatchSchedule = ProxyResource & {
718+
/**
719+
* The geo-location where the resource lives
720+
* NOTE: This property will not be serialized. It can only be populated by the server.
721+
*/
722+
readonly location?: string;
665723
/** List of patch schedules for a Redis cache. */
666724
scheduleEntries: ScheduleEntry[];
667725
};
@@ -752,6 +810,26 @@ export enum KnownPublicNetworkAccess {
752810
*/
753811
export type PublicNetworkAccess = string;
754812

813+
/** Known values of {@link ManagedServiceIdentityType} that the service accepts. */
814+
export enum KnownManagedServiceIdentityType {
815+
None = "None",
816+
SystemAssigned = "SystemAssigned",
817+
UserAssigned = "UserAssigned",
818+
SystemAssignedUserAssigned = "SystemAssigned, UserAssigned"
819+
}
820+
821+
/**
822+
* Defines values for ManagedServiceIdentityType. \
823+
* {@link KnownManagedServiceIdentityType} can be used interchangeably with ManagedServiceIdentityType,
824+
* this enum contains the known values that the service supports.
825+
* ### Known values supported by the service
826+
* **None** \
827+
* **SystemAssigned** \
828+
* **UserAssigned** \
829+
* **SystemAssigned, UserAssigned**
830+
*/
831+
export type ManagedServiceIdentityType = string;
832+
755833
/** Known values of {@link ProvisioningState} that the service accepts. */
756834
export enum KnownProvisioningState {
757835
Creating = "Creating",

0 commit comments

Comments
 (0)