From 9d225eb9c37b733a083a947a7c245e18b4dda8d6 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 21 Jan 2022 12:47:36 +0000 Subject: [PATCH] CodeGen from PR 17448 in Azure/azure-rest-api-specs Merge ead34485f0be910bbe091ae0494ea10db0beae64 into e88a7008354fa35cdb3c551d6c7f9eb6b1e21db0 --- sdk/redis/arm-rediscache/CHANGELOG.md | 28 +++-- sdk/redis/arm-rediscache/LICENSE | 2 +- sdk/redis/arm-rediscache/_meta.json | 6 +- sdk/redis/arm-rediscache/api-extractor.json | 25 ++++- sdk/redis/arm-rediscache/package.json | 7 +- .../review/arm-rediscache.api.md | 37 +++++++ sdk/redis/arm-rediscache/src/models/index.ts | 73 ++++++++++++ .../arm-rediscache/src/models/mappers.ts | 104 ++++++++++++++++++ .../arm-rediscache/src/models/parameters.ts | 2 +- .../src/redisManagementClient.ts | 4 +- sdk/redis/arm-rediscache/test/sampleTest.ts | 48 ++++++++ sdk/redis/arm-rediscache/tsconfig.json | 16 ++- 12 files changed, 320 insertions(+), 32 deletions(-) create mode 100644 sdk/redis/arm-rediscache/test/sampleTest.ts diff --git a/sdk/redis/arm-rediscache/CHANGELOG.md b/sdk/redis/arm-rediscache/CHANGELOG.md index 06ae59951f0c..1cf7a59bad83 100644 --- a/sdk/redis/arm-rediscache/CHANGELOG.md +++ b/sdk/redis/arm-rediscache/CHANGELOG.md @@ -1,15 +1,21 @@ # Release History - -## 6.0.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + +## 6.1.0 (2022-01-21) + +**Features** + + - Added Interface ManagedServiceIdentity + - Added Interface UserAssignedIdentity + - Added Type Alias ManagedServiceIdentityType + - Interface RedisCommonPropertiesRedisConfiguration has a new optional parameter preferredDataArchiveAuthMethod + - Interface RedisCommonPropertiesRedisConfiguration has a new optional parameter preferredDataPersistenceAuthMethod + - Interface RedisCommonPropertiesRedisConfiguration has a new optional parameter zonalConfiguration + - Interface RedisCreateParameters has a new optional parameter identity + - Interface RedisUpdateParameters has a new optional parameter identity + - Type Alias RedisResource has a new parameter identity + - Added Enum KnownManagedServiceIdentityType + + ## 6.0.0 (2021-12-10) The package of @azure/arm-rediscache is using our next generation design principles since version 6.0.0, which contains breaking changes. diff --git a/sdk/redis/arm-rediscache/LICENSE b/sdk/redis/arm-rediscache/LICENSE index ccb63b166732..5d1d36e0af80 100644 --- a/sdk/redis/arm-rediscache/LICENSE +++ b/sdk/redis/arm-rediscache/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2021 Microsoft +Copyright (c) 2022 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/redis/arm-rediscache/_meta.json b/sdk/redis/arm-rediscache/_meta.json index 0f1344845723..873cbbfc7f33 100644 --- a/sdk/redis/arm-rediscache/_meta.json +++ b/sdk/redis/arm-rediscache/_meta.json @@ -1,7 +1,7 @@ { - "commit": "76f8e0c50629ef12aa338d55782278ceca46212a", + "commit": "01308c0b70b89c0929985e75e06e214c09af0ddf", "readme": "specification/redis/resource-manager/readme.md", - "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/typescript@6.0.0-alpha.16.20211130.1", + "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/typescript@6.0.0-alpha.16.20220105.1", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "use": "@autorest/typescript@6.0.0-alpha.16.20211130.1" + "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1" } \ No newline at end of file diff --git a/sdk/redis/arm-rediscache/api-extractor.json b/sdk/redis/arm-rediscache/api-extractor.json index 9776e9904ed0..6619c8f199b1 100644 --- a/sdk/redis/arm-rediscache/api-extractor.json +++ b/sdk/redis/arm-rediscache/api-extractor.json @@ -1,18 +1,31 @@ { "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", "mainEntryPointFilePath": "./dist-esm/src/index.d.ts", - "docModel": { "enabled": true }, - "apiReport": { "enabled": true, "reportFolder": "./review" }, + "docModel": { + "enabled": true + }, + "apiReport": { + "enabled": true, + "reportFolder": "./review" + }, "dtsRollup": { "enabled": true, "untrimmedFilePath": "", "publicTrimmedFilePath": "./types/arm-rediscache.d.ts" }, "messages": { - "tsdocMessageReporting": { "default": { "logLevel": "none" } }, + "tsdocMessageReporting": { + "default": { + "logLevel": "none" + } + }, "extractorMessageReporting": { - "ae-missing-release-tag": { "logLevel": "none" }, - "ae-unresolved-link": { "logLevel": "none" } + "ae-missing-release-tag": { + "logLevel": "none" + }, + "ae-unresolved-link": { + "logLevel": "none" + } } } -} +} \ No newline at end of file diff --git a/sdk/redis/arm-rediscache/package.json b/sdk/redis/arm-rediscache/package.json index 7d3bf13130a4..a23f2d08ae8e 100644 --- a/sdk/redis/arm-rediscache/package.json +++ b/sdk/redis/arm-rediscache/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for RedisManagementClient.", - "version": "6.0.1", + "version": "6.1.0", "engines": { "node": ">=12.0.0" }, @@ -42,8 +42,7 @@ "@azure/identity": "^2.0.1", "@azure-tools/test-recorder": "^1.0.0", "mocha": "^7.1.1", - "cross-env": "^7.0.2", - "@azure/arm-network": "^26.0.0" + "cross-env": "^7.0.2" }, "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redis/arm-rediscache", "repository": { @@ -100,4 +99,4 @@ }, "sideEffects": false, "autoPublish": true -} +} \ No newline at end of file diff --git a/sdk/redis/arm-rediscache/review/arm-rediscache.api.md b/sdk/redis/arm-rediscache/review/arm-rediscache.api.md index cb4bef245f4c..ea8142984282 100644 --- a/sdk/redis/arm-rediscache/review/arm-rediscache.api.md +++ b/sdk/redis/arm-rediscache/review/arm-rediscache.api.md @@ -101,6 +101,18 @@ export enum KnownDefaultName { Default = "default" } +// @public +export enum KnownManagedServiceIdentityType { + // (undocumented) + None = "None", + // (undocumented) + SystemAssigned = "SystemAssigned", + // (undocumented) + SystemAssignedUserAssigned = "SystemAssigned, UserAssigned", + // (undocumented) + UserAssigned = "UserAssigned" +} + // @public export enum KnownPrivateEndpointConnectionProvisioningState { // (undocumented) @@ -240,6 +252,19 @@ export interface LinkedServerListOptionalParams extends coreClient.OperationOpti // @public export type LinkedServerListResponse = RedisLinkedServerWithPropertiesList; +// @public +export interface ManagedServiceIdentity { + readonly principalId?: string; + readonly tenantId?: string; + type: ManagedServiceIdentityType; + userAssignedIdentities?: { + [propertyName: string]: UserAssignedIdentity; + }; +} + +// @public +export type ManagedServiceIdentityType = string; + // @public export interface NotificationListResponse { readonly nextLink?: string; @@ -483,10 +508,13 @@ export interface RedisCommonPropertiesRedisConfiguration { maxmemoryDelta?: string; maxmemoryPolicy?: string; maxmemoryReserved?: string; + readonly preferredDataArchiveAuthMethod?: string; + readonly preferredDataPersistenceAuthMethod?: string; rdbBackupEnabled?: string; rdbBackupFrequency?: string; rdbBackupMaxSnapshotCount?: string; rdbStorageConnectionString?: string; + readonly zonalConfiguration?: string; } // @public @@ -498,6 +526,7 @@ export interface RedisCreateOptionalParams extends coreClient.OperationOptions { // @public export interface RedisCreateParameters { enableNonSslPort?: boolean; + identity?: ManagedServiceIdentity; location: string; minimumTlsVersion?: TlsVersion; publicNetworkAccess?: PublicNetworkAccess; @@ -763,6 +792,7 @@ export type RedisRegenerateKeyResponse = RedisAccessKeys; // @public export type RedisResource = TrackedResource & { zones?: string[]; + identity?: ManagedServiceIdentity; redisConfiguration?: RedisCommonPropertiesRedisConfiguration; redisVersion?: string; enableNonSslPort?: boolean; @@ -794,6 +824,7 @@ export interface RedisUpdateOptionalParams extends coreClient.OperationOptions { // @public export interface RedisUpdateParameters { enableNonSslPort?: boolean; + identity?: ManagedServiceIdentity; minimumTlsVersion?: TlsVersion; publicNetworkAccess?: PublicNetworkAccess; redisConfiguration?: RedisCommonPropertiesRedisConfiguration; @@ -868,6 +899,12 @@ export interface UpgradeNotification { }; } +// @public +export interface UserAssignedIdentity { + readonly clientId?: string; + readonly principalId?: string; +} + // (No @packageDocumentation comment for this package) ``` diff --git a/sdk/redis/arm-rediscache/src/models/index.ts b/sdk/redis/arm-rediscache/src/models/index.ts index 0b4a94fddacf..52f9b4e8c116 100644 --- a/sdk/redis/arm-rediscache/src/models/index.ts +++ b/sdk/redis/arm-rediscache/src/models/index.ts @@ -134,6 +134,8 @@ export interface RedisCreateParameters { location: string; /** Resource tags. */ tags?: { [propertyName: string]: string }; + /** The identity of the resource. */ + identity?: ManagedServiceIdentity; /** 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. */ redisConfiguration?: RedisCommonPropertiesRedisConfiguration; /** 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 { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly maxclients?: string; + /** + * Preferred auth method to communicate to storage account used for data archive, specify SAS or ManagedIdentity, default value is SAS + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly preferredDataArchiveAuthMethod?: string; + /** + * Preferred auth method to communicate to storage account used for data persistence, specify SAS or ManagedIdentity, default value is SAS + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly preferredDataPersistenceAuthMethod?: string; + /** + * Zonal Configuration + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly zonalConfiguration?: string; +} + +/** Managed service identity (system assigned and/or user assigned identities) */ +export interface ManagedServiceIdentity { + /** + * The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly principalId?: string; + /** + * The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly tenantId?: string; + /** Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed). */ + type: ManagedServiceIdentityType; + /** 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. */ + userAssignedIdentities?: { [propertyName: string]: UserAssignedIdentity }; +} + +/** User assigned identity properties */ +export interface UserAssignedIdentity { + /** + * The principal ID of the assigned identity. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly principalId?: string; + /** + * The client ID of the assigned identity. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly clientId?: string; } /** Redis cache access keys. */ @@ -322,6 +371,8 @@ export interface Resource { export interface RedisUpdateParameters { /** Resource tags. */ tags?: { [propertyName: string]: string }; + /** The identity of the resource. */ + identity?: ManagedServiceIdentity; /** 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. */ redisConfiguration?: RedisCommonPropertiesRedisConfiguration; /** 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 & { export type RedisResource = TrackedResource & { /** A list of availability zones denoting where the resource needs to come from. */ zones?: string[]; + /** The identity of the resource. */ + identity?: ManagedServiceIdentity; /** 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. */ redisConfiguration?: RedisCommonPropertiesRedisConfiguration; /** Redis version. Only major version will be used in PUT/PATCH request with current valid values: (4, 6) */ @@ -752,6 +805,26 @@ export enum KnownPublicNetworkAccess { */ export type PublicNetworkAccess = string; +/** Known values of {@link ManagedServiceIdentityType} that the service accepts. */ +export enum KnownManagedServiceIdentityType { + None = "None", + SystemAssigned = "SystemAssigned", + UserAssigned = "UserAssigned", + SystemAssignedUserAssigned = "SystemAssigned, UserAssigned" +} + +/** + * Defines values for ManagedServiceIdentityType. \ + * {@link KnownManagedServiceIdentityType} can be used interchangeably with ManagedServiceIdentityType, + * this enum contains the known values that the service supports. + * ### Known values supported by the service + * **None** \ + * **SystemAssigned** \ + * **UserAssigned** \ + * **SystemAssigned, UserAssigned** + */ +export type ManagedServiceIdentityType = string; + /** Known values of {@link ProvisioningState} that the service accepts. */ export enum KnownProvisioningState { Creating = "Creating", diff --git a/sdk/redis/arm-rediscache/src/models/mappers.ts b/sdk/redis/arm-rediscache/src/models/mappers.ts index 7353731df194..e6f6526e4490 100644 --- a/sdk/redis/arm-rediscache/src/models/mappers.ts +++ b/sdk/redis/arm-rediscache/src/models/mappers.ts @@ -299,6 +299,13 @@ export const RedisCreateParameters: coreClient.CompositeMapper = { value: { type: { name: "String" } } } }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "ManagedServiceIdentity" + } + }, redisConfiguration: { serializedName: "properties.redisConfiguration", type: { @@ -557,6 +564,89 @@ export const RedisCommonPropertiesRedisConfiguration: coreClient.CompositeMapper type: { name: "String" } + }, + preferredDataArchiveAuthMethod: { + serializedName: "preferred-data-archive-auth-method", + readOnly: true, + type: { + name: "String" + } + }, + preferredDataPersistenceAuthMethod: { + serializedName: "preferred-data-persistence-auth-method", + readOnly: true, + type: { + name: "String" + } + }, + zonalConfiguration: { + serializedName: "zonal-configuration", + readOnly: true, + type: { + name: "String" + } + } + } + } +}; + +export const ManagedServiceIdentity: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "ManagedServiceIdentity", + modelProperties: { + principalId: { + serializedName: "principalId", + readOnly: true, + type: { + name: "Uuid" + } + }, + tenantId: { + serializedName: "tenantId", + readOnly: true, + type: { + name: "Uuid" + } + }, + type: { + serializedName: "type", + required: true, + type: { + name: "String" + } + }, + userAssignedIdentities: { + serializedName: "userAssignedIdentities", + type: { + name: "Dictionary", + value: { + type: { name: "Composite", className: "UserAssignedIdentity" } + } + } + } + } + } +}; + +export const UserAssignedIdentity: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "UserAssignedIdentity", + modelProperties: { + principalId: { + serializedName: "principalId", + readOnly: true, + type: { + name: "Uuid" + } + }, + clientId: { + serializedName: "clientId", + readOnly: true, + type: { + name: "Uuid" + } } } } @@ -737,6 +827,13 @@ export const RedisUpdateParameters: coreClient.CompositeMapper = { value: { type: { name: "String" } } } }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "ManagedServiceIdentity" + } + }, redisConfiguration: { serializedName: "properties.redisConfiguration", type: { @@ -1460,6 +1557,13 @@ export const RedisResource: coreClient.CompositeMapper = { } } }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "ManagedServiceIdentity" + } + }, redisConfiguration: { serializedName: "properties.redisConfiguration", type: { diff --git a/sdk/redis/arm-rediscache/src/models/parameters.ts b/sdk/redis/arm-rediscache/src/models/parameters.ts index 09440d09462f..1adffc48fe68 100644 --- a/sdk/redis/arm-rediscache/src/models/parameters.ts +++ b/sdk/redis/arm-rediscache/src/models/parameters.ts @@ -52,7 +52,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2020-12-01", + defaultValue: "2021-06-01", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/redis/arm-rediscache/src/redisManagementClient.ts b/sdk/redis/arm-rediscache/src/redisManagementClient.ts index b49a9af10179..16f0bb27ac68 100644 --- a/sdk/redis/arm-rediscache/src/redisManagementClient.ts +++ b/sdk/redis/arm-rediscache/src/redisManagementClient.ts @@ -61,7 +61,7 @@ export class RedisManagementClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-rediscache/6.0.0`; + const packageDetails = `azsdk-js-arm-rediscache/6.1.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -84,7 +84,7 @@ export class RedisManagementClient extends coreClient.ServiceClient { // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2020-12-01"; + this.apiVersion = options.apiVersion || "2021-06-01"; this.operations = new OperationsImpl(this); this.redis = new RedisImpl(this); this.firewallRules = new FirewallRulesImpl(this); diff --git a/sdk/redis/arm-rediscache/test/sampleTest.ts b/sdk/redis/arm-rediscache/test/sampleTest.ts new file mode 100644 index 000000000000..7ed89b043e1b --- /dev/null +++ b/sdk/redis/arm-rediscache/test/sampleTest.ts @@ -0,0 +1,48 @@ +/* + * 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 { + env, + record, + RecorderEnvironmentSetup, + Recorder +} from "@azure-tools/test-recorder"; +import * as assert from "assert"; + +const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + 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" + }, + customizationsOnRecordings: [ + (recording: any): any => + recording.replace( + /"access_token":"[^"]*"/g, + `"access_token":"access_token"` + ) + ], + queryParametersToSkip: [] +}; + +describe("My test", () => { + let recorder: Recorder; + + beforeEach(async function() { + recorder = record(this, recorderEnvSetup); + }); + + afterEach(async function() { + await recorder.stop(); + }); + + it("sample test", async function() { + console.log("Hi, I'm a test!"); + }); +}); diff --git a/sdk/redis/arm-rediscache/tsconfig.json b/sdk/redis/arm-rediscache/tsconfig.json index 6e3251194117..3e6ae96443f3 100644 --- a/sdk/redis/arm-rediscache/tsconfig.json +++ b/sdk/redis/arm-rediscache/tsconfig.json @@ -9,11 +9,19 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, - "lib": ["es6", "dom"], + "lib": [ + "es6", + "dom" + ], "declaration": true, "outDir": "./dist-esm", "importHelpers": true }, - "include": ["./src/**/*.ts", "./test/**/*.ts"], - "exclude": ["node_modules"] -} + "include": [ + "./src/**/*.ts", + "./test/**/*.ts" + ], + "exclude": [ + "node_modules" + ] +} \ No newline at end of file