diff --git a/sdk/redis/arm-rediscache/LICENSE.txt b/sdk/redis/arm-rediscache/LICENSE.txt index ea8fb1516028..2d3163745319 100644 --- a/sdk/redis/arm-rediscache/LICENSE.txt +++ b/sdk/redis/arm-rediscache/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2020 Microsoft +Copyright (c) 2021 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/README.md b/sdk/redis/arm-rediscache/README.md index 9fd3b180eb27..86801a2da4f5 100644 --- a/sdk/redis/arm-rediscache/README.md +++ b/sdk/redis/arm-rediscache/README.md @@ -1,90 +1,97 @@ ## Azure RedisManagementClient SDK for JavaScript -This package contains an isomorphic SDK for RedisManagementClient. +This package contains an isomorphic SDK (runs both in node.js and in browsers) for RedisManagementClient. ### Currently supported environments -- Node.js version 6.x.x or higher -- Browser JavaScript +- [LTS versions of Node.js](https://nodejs.org/about/releases/) +- Latest versions of Safari, Chrome, Edge and Firefox. -### How to Install +### Prerequisites +You must have an [Azure subscription](https://azure.microsoft.com/free/). + +### How to install + +To use this SDK in your project, you will need to install two packages. +- `@azure/arm-rediscache` that contains the client. +- `@azure/identity` that provides different mechanisms for the client to authenticate your requests using Azure Active Directory. + +Install both packages using the below command: ```bash -npm install @azure/arm-rediscache +npm install --save @azure/arm-rediscache @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. ### How to use -#### nodejs - Authentication, client creation and list operations as an example written in TypeScript. +- If you are writing a client side browser application, + - Follow the instructions in the section on Authenticating client side browser applications in [Azure Identity examples](https://aka.ms/azsdk/js/identity/examples) to register your application in the Microsoft identity platform and set the right permissions. + - Copy the client ID and tenant ID from the Overview section of your app registration in Azure portal and use it in the browser sample below. +- If you are writing a server side application, + - [Select a credential from `@azure/identity` based on the authentication method of your choice](https://aka.ms/azsdk/js/identity/examples) + - Complete the set up steps required by the credential if any. + - Use the credential you picked in the place of `DefaultAzureCredential` in the Node.js sample below. -##### Install @azure/ms-rest-nodeauth - -- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`. -```bash -npm install @azure/ms-rest-nodeauth@"^3.0.0" -``` +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 -```typescript -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; -import { RedisManagementClient, RedisManagementModels, RedisManagementMappers } from "@azure/arm-rediscache"; +```javascript +const { DefaultAzureCredential } = require("@azure/identity"); +const { RedisManagementClient } = require("@azure/arm-rediscache"); const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new RedisManagementClient(creds, subscriptionId); - client.operations.list().then((result) => { - console.log("The result is:"); - console.log(result); - }); +// Use `DefaultAzureCredential` or any other credential of your choice based on https://aka.ms/azsdk/js/identity/examples +// Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead. +const creds = new DefaultAzureCredential(); +const client = new RedisManagementClient(creds, subscriptionId); +client.operations.list().then((result) => { + console.log("The result is:"); + console.log(result); }).catch((err) => { + console.log("An error occurred:"); console.error(err); }); ``` -#### browser - Authentication, client creation and list operations as an example written in JavaScript. +#### browser - Authentication, client creation, and list operations as an example written in JavaScript. -##### Install @azure/ms-rest-browserauth - -```bash -npm install @azure/ms-rest-browserauth -``` +In browser applications, we recommend using the `InteractiveBrowserCredential` that interactively authenticates using the default system browser. + - See [Single-page application: App registration guide](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-app-registration) to configure your app registration for the browser. + - Note down the client Id from the previous step and use it in the browser sample below. ##### Sample code -See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. - - index.html + ```html @azure/arm-rediscache sample - - + diff --git a/sdk/redis/arm-rediscache/package.json b/sdk/redis/arm-rediscache/package.json index 1938144a46ee..8b9dee2a5ff6 100644 --- a/sdk/redis/arm-rediscache/package.json +++ b/sdk/redis/arm-rediscache/package.json @@ -4,8 +4,9 @@ "description": "RedisManagementClient Library with typescript type definitions for node.js and browser.", "version": "4.0.0", "dependencies": { - "@azure/ms-rest-azure-js": "^2.0.1", - "@azure/ms-rest-js": "^2.0.4", + "@azure/ms-rest-azure-js": "^2.1.0", + "@azure/ms-rest-js": "^2.2.0", + "@azure/core-auth": "^1.1.4", "tslib": "^1.10.0" }, "keywords": [ @@ -20,13 +21,13 @@ "module": "./esm/redisManagementClient.js", "types": "./esm/redisManagementClient.d.ts", "devDependencies": { - "typescript": "^3.5.3", + "typescript": "^3.6.0", "rollup": "^1.18.0", "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-sourcemaps": "^0.4.2", "uglify-js": "^3.6.0" }, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redis/arm-rediscache", + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/redis/arm-rediscache", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" diff --git a/sdk/redis/arm-rediscache/rollup.config.js b/sdk/redis/arm-rediscache/rollup.config.js index 8d2642be4eba..8f18fe5e7d00 100644 --- a/sdk/redis/arm-rediscache/rollup.config.js +++ b/sdk/redis/arm-rediscache/rollup.config.js @@ -21,8 +21,8 @@ const config = { "@azure/ms-rest-azure-js": "msRestAzure" }, banner: `/* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * 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. diff --git a/sdk/redis/arm-rediscache/src/models/firewallRulesMappers.ts b/sdk/redis/arm-rediscache/src/models/firewallRulesMappers.ts index cf356274183a..6fde71c644a2 100644 --- a/sdk/redis/arm-rediscache/src/models/firewallRulesMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/firewallRulesMappers.ts @@ -1,14 +1,21 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * 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. */ export { + AzureEntityResource, BaseResource, - CloudError, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + PrivateEndpoint, + PrivateEndpointConnection, + PrivateLinkResource, + PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, RedisFirewallRule, diff --git a/sdk/redis/arm-rediscache/src/models/index.ts b/sdk/redis/arm-rediscache/src/models/index.ts index b61bfc6cd69f..1a0545e90445 100644 --- a/sdk/redis/arm-rediscache/src/models/index.ts +++ b/sdk/redis/arm-rediscache/src/models/index.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * 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. @@ -85,52 +85,90 @@ export interface RedisInstanceDetails { */ readonly shardId?: number; /** - * Specifies whether the instance is a master node. + * Specifies whether the instance is a primary node. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly isMaster?: boolean; + /** + * Specifies whether the instance is a primary node. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly isPrimary?: boolean; +} + +/** + * The Private Endpoint resource. + */ +export interface PrivateEndpoint { + /** + * The ARM identifier for Private Endpoint + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly id?: string; +} + +/** + * A collection of information about the state of the connection between service consumer and + * provider. + */ +export interface PrivateLinkServiceConnectionState { + /** + * Indicates whether the connection has been Approved/Rejected/Removed by the owner of the + * service. Possible values include: 'Pending', 'Approved', 'Rejected' + */ + status?: PrivateEndpointServiceConnectionStatus; + /** + * The reason for approval/rejection of the connection. + */ + description?: string; + /** + * A message indicating if changes on the service provider require any updates on the consumer. + */ + actionsRequired?: string; } /** - * The Resource definition. + * Common fields that are returned in the response for all Azure Resource Manager resources + * @summary Resource */ export interface Resource extends BaseResource { /** - * Resource ID. + * Fully qualified resource ID for the resource. Ex - + * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly id?: string; /** - * Resource name. + * The name of the resource * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly name?: string; /** - * Resource type. + * The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or + * "Microsoft.Storage/storageAccounts" * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly type?: string; } /** - * The resource model definition for a ARM proxy resource. It will have everything other than - * required location and tags - */ -export interface ProxyResource extends Resource { -} - -/** - * The resource model definition for a ARM tracked top level resource + * The Private Endpoint Connection resource. */ -export interface TrackedResource extends Resource { +export interface PrivateEndpointConnection extends Resource { /** - * Resource tags. + * The resource of private end point. */ - tags?: { [propertyName: string]: string }; + privateEndpoint?: PrivateEndpoint; /** - * The geo-location where the resource lives + * A collection of information about the state of the connection between service consumer and + * provider. */ - location: string; + privateLinkServiceConnectionState: PrivateLinkServiceConnectionState; + /** + * The provisioning state of the private endpoint connection resource. Possible values include: + * 'Succeeded', 'Creating', 'Deleting', 'Failed' + */ + provisioningState?: PrivateEndpointConnectionProvisioningState; } /** @@ -143,14 +181,23 @@ export interface RedisCreateParameters { * etc. */ redisConfiguration?: { [propertyName: string]: string }; + /** + * Redis version. Only major version will be used in PUT/PATCH request with current valid values: + * (4, 6) + */ + redisVersion?: string; /** * Specifies whether the non-ssl Redis server port (6379) is enabled. */ enableNonSslPort?: boolean; /** - * The number of replicas to be created per master. + * The number of replicas to be created per primary. */ replicasPerMaster?: number; + /** + * The number of replicas to be created per primary. + */ + replicasPerPrimary?: number; /** * A dictionary of tenant settings */ @@ -164,6 +211,12 @@ export interface RedisCreateParameters { * '1.1', '1.2'). Possible values include: '1.0', '1.1', '1.2' */ minimumTlsVersion?: TlsVersion; + /** + * Whether or not public endpoint access is allowed for this cache. Value is optional but if + * passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive + * access method. Default value is 'Enabled'. Possible values include: 'Enabled', 'Disabled' + */ + publicNetworkAccess?: PublicNetworkAccess; /** * The SKU of the Redis cache to deploy. */ @@ -203,14 +256,23 @@ export interface RedisUpdateParameters { * etc. */ redisConfiguration?: { [propertyName: string]: string }; + /** + * Redis version. Only major version will be used in PUT/PATCH request with current valid values: + * (4, 6) + */ + redisVersion?: string; /** * Specifies whether the non-ssl Redis server port (6379) is enabled. */ enableNonSslPort?: boolean; /** - * The number of replicas to be created per master. + * The number of replicas to be created per primary. */ replicasPerMaster?: number; + /** + * The number of replicas to be created per primary. + */ + replicasPerPrimary?: number; /** * A dictionary of tenant settings */ @@ -224,6 +286,12 @@ export interface RedisUpdateParameters { * '1.1', '1.2'). Possible values include: '1.0', '1.1', '1.2' */ minimumTlsVersion?: TlsVersion; + /** + * Whether or not public endpoint access is allowed for this cache. Value is optional but if + * passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive + * access method. Default value is 'Enabled'. Possible values include: 'Enabled', 'Disabled' + */ + publicNetworkAccess?: PublicNetworkAccess; /** * The SKU of the Redis cache to deploy. */ @@ -248,6 +316,14 @@ export interface RedisFirewallRuleProperties { endIP: string; } +/** + * The resource model definition for a Azure Resource Manager proxy resource. It will not have tags + * and a location + * @summary Proxy Resource + */ +export interface ProxyResource extends Resource { +} + /** * A firewall rule on a redis cache has a name, and describes a contiguous range of IP addresses * permitted to connect @@ -264,17 +340,26 @@ export interface RedisFirewallRule extends ProxyResource { } /** - * Parameters required for creating a firewall rule on redis cache. + * Parameters required for creating a firewall rule on redis cache. (Note, you can just use the + * FirewallRule type instead now.) + */ +export interface RedisFirewallRuleCreateParameters extends RedisFirewallRule { +} + +/** + * The resource model definition for an Azure Resource Manager tracked top level resource which has + * 'tags' and a 'location' + * @summary Tracked Resource */ -export interface RedisFirewallRuleCreateParameters { +export interface TrackedResource extends Resource { /** - * lowest IP address included in the range + * Resource tags. */ - startIP: string; + tags?: { [propertyName: string]: string }; /** - * highest IP address included in the range + * The geo-location where the resource lives */ - endIP: string; + location: string; } /** @@ -287,14 +372,23 @@ export interface RedisResource extends TrackedResource { * etc. */ redisConfiguration?: { [propertyName: string]: string }; + /** + * Redis version. Only major version will be used in PUT/PATCH request with current valid values: + * (4, 6) + */ + redisVersion?: string; /** * Specifies whether the non-ssl Redis server port (6379) is enabled. */ enableNonSslPort?: boolean; /** - * The number of replicas to be created per master. + * The number of replicas to be created per primary. */ replicasPerMaster?: number; + /** + * The number of replicas to be created per primary. + */ + replicasPerPrimary?: number; /** * A dictionary of tenant settings */ @@ -308,6 +402,12 @@ export interface RedisResource extends TrackedResource { * '1.1', '1.2'). Possible values include: '1.0', '1.1', '1.2' */ minimumTlsVersion?: TlsVersion; + /** + * Whether or not public endpoint access is allowed for this cache. Value is optional but if + * passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive + * access method. Default value is 'Enabled'. Possible values include: 'Enabled', 'Disabled' + */ + publicNetworkAccess?: PublicNetworkAccess; /** * The SKU of the Redis cache to deploy. */ @@ -323,11 +423,6 @@ export interface RedisResource extends TrackedResource { * Network. */ staticIP?: string; - /** - * Redis version. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly redisVersion?: string; /** * Redis instance provisioning status. Possible values include: 'Creating', 'Deleting', * 'Disabled', 'Failed', 'Linking', 'Provisioning', 'RecoveringScaleFailure', 'Scaling', @@ -366,6 +461,11 @@ export interface RedisResource extends TrackedResource { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly instances?: RedisInstanceDetails[]; + /** + * List of private endpoint connection associated with the specified redis cache + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly privateEndpointConnections?: PrivateEndpointConnection[]; /** * A list of availability zones denoting where the resource needs to come from. */ @@ -626,18 +726,114 @@ export interface UpgradeNotification { } /** - * The response of listUpgradeNotifications. + * The resource model definition for an Azure Resource Manager resource with an etag. + * @summary Entity Resource + */ +export interface AzureEntityResource extends Resource { + /** + * Resource Etag. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly etag?: string; +} + +/** + * The resource management error additional info. */ -export interface NotificationListResponse { +export interface ErrorAdditionalInfo { /** - * List of all notifications. + * The additional info type. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - value?: UpgradeNotification[]; + readonly type?: string; /** - * Link for next set of notifications. + * The additional info. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly nextLink?: string; + readonly info?: any; +} + +/** + * The error detail. + */ +export interface ErrorDetail { + /** + * The error code. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly code?: string; + /** + * The error message. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly message?: string; + /** + * The error target. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly target?: string; + /** + * The error details. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly details?: ErrorDetail[]; + /** + * The error additional info. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly additionalInfo?: ErrorAdditionalInfo[]; +} + +/** + * Common error response for all Azure Resource Manager APIs to return error details for failed + * operations. (This also follows the OData error response format.). + * @summary Error response + */ +export interface ErrorResponse { + /** + * The error object. + */ + error?: ErrorDetail; +} + +/** + * Properties of a private link resource. + */ +export interface PrivateLinkResourceProperties { + /** + * The private link resource group id. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly groupId?: string; + /** + * The private link resource required member names. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly requiredMembers?: string[]; + /** + * The private link resource Private link DNS zone name. + */ + requiredZoneNames?: string[]; +} + +/** + * A private link resource + */ +export interface PrivateLinkResource extends Resource { + /** + * The private link resource group id. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly groupId?: string; + /** + * The private link resource required member names. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly requiredMembers?: string[]; + /** + * The private link resource Private link DNS zone name. + */ + requiredZoneNames?: string[]; } /** @@ -661,6 +857,19 @@ export interface OperationListResult extends Array { readonly nextLink?: string; } +/** + * @interface + * The response of listUpgradeNotifications. + * @extends Array + */ +export interface NotificationListResponse extends Array { + /** + * Link for next set of notifications. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly nextLink?: string; +} + /** * @interface * The response of list Redis operation. @@ -713,6 +922,22 @@ export interface RedisLinkedServerWithPropertiesList extends Array + */ +export interface PrivateEndpointConnectionListResult extends Array { +} + +/** + * @interface + * A list of private link resources + * @extends Array + */ +export interface PrivateLinkResourceListResult extends Array { +} + /** * Defines values for SkuName. * Possible values include: 'Basic', 'Standard', 'Premium' @@ -737,6 +962,14 @@ export type SkuFamily = 'C' | 'P'; */ export type TlsVersion = '1.0' | '1.1' | '1.2'; +/** + * Defines values for PublicNetworkAccess. + * Possible values include: 'Enabled', 'Disabled' + * @readonly + * @enum {string} + */ +export type PublicNetworkAccess = 'Enabled' | 'Disabled'; + /** * Defines values for ProvisioningState. * Possible values include: 'Creating', 'Deleting', 'Disabled', 'Failed', 'Linking', @@ -747,6 +980,22 @@ export type TlsVersion = '1.0' | '1.1' | '1.2'; */ export type ProvisioningState = 'Creating' | 'Deleting' | 'Disabled' | 'Failed' | 'Linking' | 'Provisioning' | 'RecoveringScaleFailure' | 'Scaling' | 'Succeeded' | 'Unlinking' | 'Unprovisioning' | 'Updating'; +/** + * Defines values for PrivateEndpointServiceConnectionStatus. + * Possible values include: 'Pending', 'Approved', 'Rejected' + * @readonly + * @enum {string} + */ +export type PrivateEndpointServiceConnectionStatus = 'Pending' | 'Approved' | 'Rejected'; + +/** + * Defines values for PrivateEndpointConnectionProvisioningState. + * Possible values include: 'Succeeded', 'Creating', 'Deleting', 'Failed' + * @readonly + * @enum {string} + */ +export type PrivateEndpointConnectionProvisioningState = 'Succeeded' | 'Creating' | 'Deleting' | 'Failed'; + /** * Defines values for RedisKeyType. * Possible values include: 'Primary', 'Secondary' @@ -921,9 +1170,9 @@ export type RedisListByResourceGroupResponse = RedisListResult & { }; /** - * Contains response data for the list operation. + * Contains response data for the listBySubscription operation. */ -export type RedisListResponse = RedisListResult & { +export type RedisListBySubscriptionResponse = RedisListResult & { /** * The underlying HTTP response. */ @@ -1020,6 +1269,26 @@ export type RedisBeginCreateResponse = RedisResource & { }; }; +/** + * Contains response data for the listUpgradeNotificationsNext operation. + */ +export type RedisListUpgradeNotificationsNextResponse = NotificationListResponse & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: NotificationListResponse; + }; +}; + /** * Contains response data for the listByResourceGroupNext operation. */ @@ -1041,9 +1310,9 @@ export type RedisListByResourceGroupNextResponse = RedisListResult & { }; /** - * Contains response data for the listNext operation. + * Contains response data for the listBySubscriptionNext operation. */ -export type RedisListNextResponse = RedisListResult & { +export type RedisListBySubscriptionNextResponse = RedisListResult & { /** * The underlying HTTP response. */ @@ -1061,9 +1330,9 @@ export type RedisListNextResponse = RedisListResult & { }; /** - * Contains response data for the listByRedisResource operation. + * Contains response data for the list operation. */ -export type FirewallRulesListByRedisResourceResponse = RedisFirewallRuleListResult & { +export type FirewallRulesListResponse = RedisFirewallRuleListResult & { /** * The underlying HTTP response. */ @@ -1121,9 +1390,9 @@ export type FirewallRulesGetResponse = RedisFirewallRule & { }; /** - * Contains response data for the listByRedisResourceNext operation. + * Contains response data for the listNext operation. */ -export type FirewallRulesListByRedisResourceNextResponse = RedisFirewallRuleListResult & { +export type FirewallRulesListNextResponse = RedisFirewallRuleListResult & { /** * The underlying HTTP response. */ @@ -1319,3 +1588,103 @@ export type LinkedServerListNextResponse = RedisLinkedServerWithPropertiesList & parsedBody: RedisLinkedServerWithPropertiesList; }; }; + +/** + * Contains response data for the list operation. + */ +export type PrivateEndpointConnectionsListResponse = PrivateEndpointConnectionListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: PrivateEndpointConnectionListResult; + }; +}; + +/** + * Contains response data for the get operation. + */ +export type PrivateEndpointConnectionsGetResponse = PrivateEndpointConnection & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: PrivateEndpointConnection; + }; +}; + +/** + * Contains response data for the put operation. + */ +export type PrivateEndpointConnectionsPutResponse = PrivateEndpointConnection & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: PrivateEndpointConnection; + }; +}; + +/** + * Contains response data for the beginPut operation. + */ +export type PrivateEndpointConnectionsBeginPutResponse = PrivateEndpointConnection & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: PrivateEndpointConnection; + }; +}; + +/** + * Contains response data for the listByRedisCache operation. + */ +export type PrivateLinkResourcesListByRedisCacheResponse = PrivateLinkResourceListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: PrivateLinkResourceListResult; + }; +}; diff --git a/sdk/redis/arm-rediscache/src/models/linkedServerMappers.ts b/sdk/redis/arm-rediscache/src/models/linkedServerMappers.ts index 8c4b9cc9739d..0d8ced2660e9 100644 --- a/sdk/redis/arm-rediscache/src/models/linkedServerMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/linkedServerMappers.ts @@ -1,17 +1,25 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * 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. */ export { + AzureEntityResource, BaseResource, - CloudError, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + PrivateEndpoint, + PrivateEndpointConnection, + PrivateLinkResource, + PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, RedisFirewallRule, + RedisFirewallRuleCreateParameters, RedisInstanceDetails, RedisLinkedServer, RedisLinkedServerCreateParameters, diff --git a/sdk/redis/arm-rediscache/src/models/mappers.ts b/sdk/redis/arm-rediscache/src/models/mappers.ts index 07812bd8021c..dd5589ab16ac 100644 --- a/sdk/redis/arm-rediscache/src/models/mappers.ts +++ b/sdk/redis/arm-rediscache/src/models/mappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * 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. @@ -124,6 +124,58 @@ export const RedisInstanceDetails: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + isPrimary: { + readOnly: true, + serializedName: "isPrimary", + type: { + name: "Boolean" + } + } + } + } +}; + +export const PrivateEndpoint: msRest.CompositeMapper = { + serializedName: "PrivateEndpoint", + type: { + name: "Composite", + className: "PrivateEndpoint", + modelProperties: { + id: { + readOnly: true, + serializedName: "id", + type: { + name: "String" + } + } + } + } +}; + +export const PrivateLinkServiceConnectionState: msRest.CompositeMapper = { + serializedName: "PrivateLinkServiceConnectionState", + type: { + name: "Composite", + className: "PrivateLinkServiceConnectionState", + modelProperties: { + status: { + serializedName: "status", + type: { + name: "String" + } + }, + description: { + serializedName: "description", + type: { + name: "String" + } + }, + actionsRequired: { + serializedName: "actionsRequired", + type: { + name: "String" + } } } } @@ -160,38 +212,30 @@ export const Resource: msRest.CompositeMapper = { } }; -export const ProxyResource: msRest.CompositeMapper = { - serializedName: "ProxyResource", - type: { - name: "Composite", - className: "ProxyResource", - modelProperties: { - ...Resource.type.modelProperties - } - } -}; - -export const TrackedResource: msRest.CompositeMapper = { - serializedName: "TrackedResource", +export const PrivateEndpointConnection: msRest.CompositeMapper = { + serializedName: "PrivateEndpointConnection", type: { name: "Composite", - className: "TrackedResource", + className: "PrivateEndpointConnection", modelProperties: { ...Resource.type.modelProperties, - tags: { - serializedName: "tags", + privateEndpoint: { + serializedName: "properties.privateEndpoint", type: { - name: "Dictionary", - value: { - type: { - name: "String" - } - } + name: "Composite", + className: "PrivateEndpoint" } }, - location: { + privateLinkServiceConnectionState: { required: true, - serializedName: "location", + serializedName: "properties.privateLinkServiceConnectionState", + type: { + name: "Composite", + className: "PrivateLinkServiceConnectionState" + } + }, + provisioningState: { + serializedName: "properties.provisioningState", type: { name: "String" } @@ -217,6 +261,12 @@ export const RedisCreateParameters: msRest.CompositeMapper = { } } }, + redisVersion: { + serializedName: "properties.redisVersion", + type: { + name: "String" + } + }, enableNonSslPort: { serializedName: "properties.enableNonSslPort", type: { @@ -229,6 +279,12 @@ export const RedisCreateParameters: msRest.CompositeMapper = { name: "Number" } }, + replicasPerPrimary: { + serializedName: "properties.replicasPerPrimary", + type: { + name: "Number" + } + }, tenantSettings: { serializedName: "properties.tenantSettings", type: { @@ -252,6 +308,12 @@ export const RedisCreateParameters: msRest.CompositeMapper = { name: "String" } }, + publicNetworkAccess: { + serializedName: "properties.publicNetworkAccess", + type: { + name: "String" + } + }, sku: { required: true, serializedName: "properties.sku", @@ -328,6 +390,12 @@ export const RedisUpdateParameters: msRest.CompositeMapper = { } } }, + redisVersion: { + serializedName: "properties.redisVersion", + type: { + name: "String" + } + }, enableNonSslPort: { serializedName: "properties.enableNonSslPort", type: { @@ -340,6 +408,12 @@ export const RedisUpdateParameters: msRest.CompositeMapper = { name: "Number" } }, + replicasPerPrimary: { + serializedName: "properties.replicasPerPrimary", + type: { + name: "Number" + } + }, tenantSettings: { serializedName: "properties.tenantSettings", type: { @@ -363,6 +437,12 @@ export const RedisUpdateParameters: msRest.CompositeMapper = { name: "String" } }, + publicNetworkAccess: { + serializedName: "properties.publicNetworkAccess", + type: { + name: "String" + } + }, sku: { serializedName: "properties.sku", type: { @@ -409,6 +489,17 @@ export const RedisFirewallRuleProperties: msRest.CompositeMapper = { } }; +export const ProxyResource: msRest.CompositeMapper = { + serializedName: "ProxyResource", + type: { + name: "Composite", + className: "ProxyResource", + modelProperties: { + ...Resource.type.modelProperties + } + } +}; + export const RedisFirewallRule: msRest.CompositeMapper = { serializedName: "RedisFirewallRule", type: { @@ -440,16 +531,32 @@ export const RedisFirewallRuleCreateParameters: msRest.CompositeMapper = { name: "Composite", className: "RedisFirewallRuleCreateParameters", modelProperties: { - startIP: { - required: true, - serializedName: "properties.startIP", + ...RedisFirewallRule.type.modelProperties + } + } +}; + +export const TrackedResource: msRest.CompositeMapper = { + serializedName: "TrackedResource", + type: { + name: "Composite", + className: "TrackedResource", + modelProperties: { + ...Resource.type.modelProperties, + tags: { + serializedName: "tags", type: { - name: "String" + name: "Dictionary", + value: { + type: { + name: "String" + } + } } }, - endIP: { + location: { required: true, - serializedName: "properties.endIP", + serializedName: "location", type: { name: "String" } @@ -476,6 +583,12 @@ export const RedisResource: msRest.CompositeMapper = { } } }, + redisVersion: { + serializedName: "properties.redisVersion", + type: { + name: "String" + } + }, enableNonSslPort: { serializedName: "properties.enableNonSslPort", type: { @@ -488,6 +601,12 @@ export const RedisResource: msRest.CompositeMapper = { name: "Number" } }, + replicasPerPrimary: { + serializedName: "properties.replicasPerPrimary", + type: { + name: "Number" + } + }, tenantSettings: { serializedName: "properties.tenantSettings", type: { @@ -511,6 +630,12 @@ export const RedisResource: msRest.CompositeMapper = { name: "String" } }, + publicNetworkAccess: { + serializedName: "properties.publicNetworkAccess", + type: { + name: "String" + } + }, sku: { required: true, serializedName: "properties.sku", @@ -537,13 +662,6 @@ export const RedisResource: msRest.CompositeMapper = { name: "String" } }, - redisVersion: { - readOnly: true, - serializedName: "properties.redisVersion", - type: { - name: "String" - } - }, provisioningState: { readOnly: true, serializedName: "properties.provisioningState", @@ -606,6 +724,19 @@ export const RedisResource: msRest.CompositeMapper = { } } }, + privateEndpointConnections: { + readOnly: true, + serializedName: "properties.privateEndpointConnections", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "PrivateEndpointConnection" + } + } + } + }, zones: { serializedName: "zones", type: { @@ -1086,30 +1217,198 @@ export const UpgradeNotification: msRest.CompositeMapper = { } }; -export const NotificationListResponse: msRest.CompositeMapper = { - serializedName: "NotificationListResponse", +export const AzureEntityResource: msRest.CompositeMapper = { + serializedName: "AzureEntityResource", type: { name: "Composite", - className: "NotificationListResponse", + className: "AzureEntityResource", modelProperties: { - value: { - serializedName: "value", + ...Resource.type.modelProperties, + etag: { + readOnly: true, + serializedName: "etag", + type: { + name: "String" + } + } + } + } +}; + +export const ErrorAdditionalInfo: msRest.CompositeMapper = { + serializedName: "ErrorAdditionalInfo", + type: { + name: "Composite", + className: "ErrorAdditionalInfo", + modelProperties: { + type: { + readOnly: true, + serializedName: "type", + type: { + name: "String" + } + }, + info: { + readOnly: true, + serializedName: "info", + type: { + name: "Object" + } + } + } + } +}; + +export const ErrorDetail: msRest.CompositeMapper = { + serializedName: "ErrorDetail", + type: { + name: "Composite", + className: "ErrorDetail", + modelProperties: { + code: { + readOnly: true, + serializedName: "code", + type: { + name: "String" + } + }, + message: { + readOnly: true, + serializedName: "message", + type: { + name: "String" + } + }, + target: { + readOnly: true, + serializedName: "target", + type: { + name: "String" + } + }, + details: { + readOnly: true, + serializedName: "details", type: { name: "Sequence", element: { type: { name: "Composite", - className: "UpgradeNotification" + className: "ErrorDetail" } } } }, - nextLink: { + additionalInfo: { readOnly: true, - serializedName: "nextLink", + serializedName: "additionalInfo", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ErrorAdditionalInfo" + } + } + } + } + } + } +}; + +export const ErrorResponse: msRest.CompositeMapper = { + serializedName: "ErrorResponse", + type: { + name: "Composite", + className: "ErrorResponse", + modelProperties: { + error: { + serializedName: "error", + type: { + name: "Composite", + className: "ErrorDetail" + } + } + } + } +}; + +export const PrivateLinkResourceProperties: msRest.CompositeMapper = { + serializedName: "PrivateLinkResourceProperties", + type: { + name: "Composite", + className: "PrivateLinkResourceProperties", + modelProperties: { + groupId: { + readOnly: true, + serializedName: "groupId", + type: { + name: "String" + } + }, + requiredMembers: { + readOnly: true, + serializedName: "requiredMembers", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + requiredZoneNames: { + serializedName: "requiredZoneNames", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + } + } + } +}; + +export const PrivateLinkResource: msRest.CompositeMapper = { + serializedName: "PrivateLinkResource", + type: { + name: "Composite", + className: "PrivateLinkResource", + modelProperties: { + ...Resource.type.modelProperties, + groupId: { + readOnly: true, + serializedName: "properties.groupId", type: { name: "String" } + }, + requiredMembers: { + readOnly: true, + serializedName: "properties.requiredMembers", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + requiredZoneNames: { + serializedName: "properties.requiredZoneNames", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } } } } @@ -1144,6 +1443,35 @@ export const OperationListResult: msRest.CompositeMapper = { } }; +export const NotificationListResponse: msRest.CompositeMapper = { + serializedName: "NotificationListResponse", + type: { + name: "Composite", + className: "NotificationListResponse", + modelProperties: { + value: { + serializedName: "", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "UpgradeNotification" + } + } + } + }, + nextLink: { + readOnly: true, + serializedName: "nextLink", + type: { + name: "String" + } + } + } + } +}; + export const RedisListResult: msRest.CompositeMapper = { serializedName: "RedisListResult", type: { @@ -1259,3 +1587,47 @@ export const RedisLinkedServerWithPropertiesList: msRest.CompositeMapper = { } } }; + +export const PrivateEndpointConnectionListResult: msRest.CompositeMapper = { + serializedName: "PrivateEndpointConnectionListResult", + type: { + name: "Composite", + className: "PrivateEndpointConnectionListResult", + modelProperties: { + value: { + serializedName: "", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "PrivateEndpointConnection" + } + } + } + } + } + } +}; + +export const PrivateLinkResourceListResult: msRest.CompositeMapper = { + serializedName: "PrivateLinkResourceListResult", + type: { + name: "Composite", + className: "PrivateLinkResourceListResult", + modelProperties: { + value: { + serializedName: "", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "PrivateLinkResource" + } + } + } + } + } + } +}; diff --git a/sdk/redis/arm-rediscache/src/models/operationsMappers.ts b/sdk/redis/arm-rediscache/src/models/operationsMappers.ts index 689688180be7..fddc3077d64b 100644 --- a/sdk/redis/arm-rediscache/src/models/operationsMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/operationsMappers.ts @@ -1,13 +1,15 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * 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. */ export { - CloudError, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, Operation, OperationDisplay, OperationListResult diff --git a/sdk/redis/arm-rediscache/src/models/parameters.ts b/sdk/redis/arm-rediscache/src/models/parameters.ts index e80292daf04e..e21f3c648ea7 100644 --- a/sdk/redis/arm-rediscache/src/models/parameters.ts +++ b/sdk/redis/arm-rediscache/src/models/parameters.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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 @@ -93,6 +92,16 @@ export const nextPageLink: msRest.OperationURLParameter = { }, skipEncoding: true }; +export const privateEndpointConnectionName: msRest.OperationURLParameter = { + parameterPath: "privateEndpointConnectionName", + mapper: { + required: true, + serializedName: "privateEndpointConnectionName", + type: { + name: "String" + } + } +}; export const resourceGroupName: msRest.OperationURLParameter = { parameterPath: "resourceGroupName", mapper: { diff --git a/sdk/redis/arm-rediscache/src/models/patchSchedulesMappers.ts b/sdk/redis/arm-rediscache/src/models/patchSchedulesMappers.ts index 3f414b53ae84..9ca3016e1fd8 100644 --- a/sdk/redis/arm-rediscache/src/models/patchSchedulesMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/patchSchedulesMappers.ts @@ -1,17 +1,25 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * 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. */ export { + AzureEntityResource, BaseResource, - CloudError, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + PrivateEndpoint, + PrivateEndpointConnection, + PrivateLinkResource, + PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, RedisFirewallRule, + RedisFirewallRuleCreateParameters, RedisInstanceDetails, RedisLinkedServer, RedisLinkedServerWithProperties, diff --git a/sdk/redis/arm-rediscache/src/models/privateEndpointConnectionsMappers.ts b/sdk/redis/arm-rediscache/src/models/privateEndpointConnectionsMappers.ts new file mode 100644 index 000000000000..8914bae01de3 --- /dev/null +++ b/sdk/redis/arm-rediscache/src/models/privateEndpointConnectionsMappers.ts @@ -0,0 +1,33 @@ +/* + * 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. + */ + +export { + AzureEntityResource, + BaseResource, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + PrivateEndpoint, + PrivateEndpointConnection, + PrivateEndpointConnectionListResult, + PrivateLinkResource, + PrivateLinkServiceConnectionState, + ProxyResource, + RedisAccessKeys, + RedisFirewallRule, + RedisFirewallRuleCreateParameters, + RedisInstanceDetails, + RedisLinkedServer, + RedisLinkedServerWithProperties, + RedisPatchSchedule, + RedisResource, + Resource, + ScheduleEntry, + Sku, + TrackedResource +} from "../models/mappers"; diff --git a/sdk/redis/arm-rediscache/src/models/privateLinkResourcesMappers.ts b/sdk/redis/arm-rediscache/src/models/privateLinkResourcesMappers.ts new file mode 100644 index 000000000000..d98791591822 --- /dev/null +++ b/sdk/redis/arm-rediscache/src/models/privateLinkResourcesMappers.ts @@ -0,0 +1,33 @@ +/* + * 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. + */ + +export { + AzureEntityResource, + BaseResource, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + PrivateEndpoint, + PrivateEndpointConnection, + PrivateLinkResource, + PrivateLinkResourceListResult, + PrivateLinkServiceConnectionState, + ProxyResource, + RedisAccessKeys, + RedisFirewallRule, + RedisFirewallRuleCreateParameters, + RedisInstanceDetails, + RedisLinkedServer, + RedisLinkedServerWithProperties, + RedisPatchSchedule, + RedisResource, + Resource, + ScheduleEntry, + Sku, + TrackedResource +} from "../models/mappers"; diff --git a/sdk/redis/arm-rediscache/src/models/redisMappers.ts b/sdk/redis/arm-rediscache/src/models/redisMappers.ts index 597dbcc9fdc7..96102deb4554 100644 --- a/sdk/redis/arm-rediscache/src/models/redisMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/redisMappers.ts @@ -1,22 +1,30 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * 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. */ export { + AzureEntityResource, BaseResource, CheckNameAvailabilityParameters, - CloudError, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, ExportRDBParameters, ImportRDBParameters, NotificationListResponse, + PrivateEndpoint, + PrivateEndpointConnection, + PrivateLinkResource, + PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, RedisCreateParameters, RedisFirewallRule, + RedisFirewallRuleCreateParameters, RedisForceRebootResponse, RedisInstanceDetails, RedisLinkedServer, diff --git a/sdk/redis/arm-rediscache/src/operations/firewallRules.ts b/sdk/redis/arm-rediscache/src/operations/firewallRules.ts index 1f26b29976d4..4db495c2bc4e 100644 --- a/sdk/redis/arm-rediscache/src/operations/firewallRules.ts +++ b/sdk/redis/arm-rediscache/src/operations/firewallRules.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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 @@ -31,31 +30,31 @@ export class FirewallRules { * @param resourceGroupName The name of the resource group. * @param cacheName The name of the Redis cache. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listByRedisResource(resourceGroupName: string, cacheName: string, options?: msRest.RequestOptionsBase): Promise; + list(resourceGroupName: string, cacheName: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group. * @param cacheName The name of the Redis cache. * @param callback The callback */ - listByRedisResource(resourceGroupName: string, cacheName: string, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, cacheName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group. * @param cacheName The name of the Redis cache. * @param options The optional parameters * @param callback The callback */ - listByRedisResource(resourceGroupName: string, cacheName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByRedisResource(resourceGroupName: string, cacheName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + list(resourceGroupName: string, cacheName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, cacheName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, cacheName, options }, - listByRedisResourceOperationSpec, - callback) as Promise; + listOperationSpec, + callback) as Promise; } /** @@ -67,7 +66,7 @@ export class FirewallRules { * @param [options] The optional parameters * @returns Promise */ - createOrUpdate(resourceGroupName: string, cacheName: string, ruleName: string, parameters: Models.RedisFirewallRuleCreateParameters, options?: msRest.RequestOptionsBase): Promise; + createOrUpdate(resourceGroupName: string, cacheName: string, ruleName: string, parameters: Models.RedisFirewallRule, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group. * @param cacheName The name of the Redis cache. @@ -75,7 +74,7 @@ export class FirewallRules { * @param parameters Parameters supplied to the create or update redis firewall rule operation. * @param callback The callback */ - createOrUpdate(resourceGroupName: string, cacheName: string, ruleName: string, parameters: Models.RedisFirewallRuleCreateParameters, callback: msRest.ServiceCallback): void; + createOrUpdate(resourceGroupName: string, cacheName: string, ruleName: string, parameters: Models.RedisFirewallRule, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group. * @param cacheName The name of the Redis cache. @@ -84,8 +83,8 @@ export class FirewallRules { * @param options The optional parameters * @param callback The callback */ - createOrUpdate(resourceGroupName: string, cacheName: string, ruleName: string, parameters: Models.RedisFirewallRuleCreateParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - createOrUpdate(resourceGroupName: string, cacheName: string, ruleName: string, parameters: Models.RedisFirewallRuleCreateParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + createOrUpdate(resourceGroupName: string, cacheName: string, ruleName: string, parameters: Models.RedisFirewallRule, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + createOrUpdate(resourceGroupName: string, cacheName: string, ruleName: string, parameters: Models.RedisFirewallRule, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -174,36 +173,36 @@ export class FirewallRules { * Gets all firewall rules in the specified redis cache. * @param nextPageLink The NextLink from the previous successful call to List operation. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listByRedisResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback */ - listByRedisResourceNext(nextPageLink: string, callback: msRest.ServiceCallback): void; + listNext(nextPageLink: string, callback: msRest.ServiceCallback): void; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param options The optional parameters * @param callback The callback */ - listByRedisResourceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByRedisResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, options }, - listByRedisResourceNextOperationSpec, - callback) as Promise; + listNextOperationSpec, + callback) as Promise; } } // Operation Specifications const serializer = new msRest.Serializer(Mappers); -const listByRedisResourceOperationSpec: msRest.OperationSpec = { +const listOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{cacheName}/firewallRules", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/firewallRules", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -220,7 +219,7 @@ const listByRedisResourceOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisFirewallRuleListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -228,7 +227,7 @@ const listByRedisResourceOperationSpec: msRest.OperationSpec = { const createOrUpdateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{cacheName}/firewallRules/{ruleName}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/firewallRules/{ruleName}", urlParameters: [ Parameters.resourceGroupName, Parameters.cacheName, @@ -244,7 +243,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = { requestBody: { parameterPath: "parameters", mapper: { - ...Mappers.RedisFirewallRuleCreateParameters, + ...Mappers.RedisFirewallRule, required: true } }, @@ -256,7 +255,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisFirewallRule }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -264,7 +263,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = { const getOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{cacheName}/firewallRules/{ruleName}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/firewallRules/{ruleName}", urlParameters: [ Parameters.resourceGroupName, Parameters.cacheName, @@ -282,7 +281,7 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisFirewallRule }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -290,7 +289,7 @@ const getOperationSpec: msRest.OperationSpec = { const deleteMethodOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{cacheName}/firewallRules/{ruleName}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/firewallRules/{ruleName}", urlParameters: [ Parameters.resourceGroupName, Parameters.cacheName, @@ -307,19 +306,22 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { 200: {}, 204: {}, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const listByRedisResourceNextOperationSpec: msRest.OperationSpec = { +const listNextOperationSpec: msRest.OperationSpec = { httpMethod: "GET", baseUrl: "https://management.azure.com", path: "{nextLink}", urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -328,7 +330,7 @@ const listByRedisResourceNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisFirewallRuleListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/redis/arm-rediscache/src/operations/index.ts b/sdk/redis/arm-rediscache/src/operations/index.ts index a2f30803474f..802ed8f58a66 100644 --- a/sdk/redis/arm-rediscache/src/operations/index.ts +++ b/sdk/redis/arm-rediscache/src/operations/index.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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 @@ -13,3 +12,5 @@ export * from "./redis"; export * from "./firewallRules"; export * from "./patchSchedules"; export * from "./linkedServer"; +export * from "./privateEndpointConnections"; +export * from "./privateLinkResources"; diff --git a/sdk/redis/arm-rediscache/src/operations/linkedServer.ts b/sdk/redis/arm-rediscache/src/operations/linkedServer.ts index a070b31122df..8d02394d1be4 100644 --- a/sdk/redis/arm-rediscache/src/operations/linkedServer.ts +++ b/sdk/redis/arm-rediscache/src/operations/linkedServer.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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 @@ -200,7 +199,7 @@ export class LinkedServer { const serializer = new msRest.Serializer(Mappers); const deleteMethodOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/linkedServers/{linkedServerName}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/linkedServers/{linkedServerName}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -215,8 +214,9 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { ], responses: { 200: {}, + 204: {}, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -224,7 +224,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { const getOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/linkedServers/{linkedServerName}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/linkedServers/{linkedServerName}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -242,7 +242,7 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisLinkedServerWithProperties }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -250,7 +250,7 @@ const getOperationSpec: msRest.OperationSpec = { const listOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/linkedServers", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/linkedServers", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -267,7 +267,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisLinkedServerWithPropertiesList }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -275,7 +275,7 @@ const listOperationSpec: msRest.OperationSpec = { const beginCreateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/linkedServers/{linkedServerName}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/linkedServers/{linkedServerName}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -303,7 +303,7 @@ const beginCreateOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisLinkedServerWithProperties }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -316,6 +316,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -324,7 +327,7 @@ const listNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisLinkedServerWithPropertiesList }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/redis/arm-rediscache/src/operations/operations.ts b/sdk/redis/arm-rediscache/src/operations/operations.ts index 00b63249fdd4..17a6f0ff88f8 100644 --- a/sdk/redis/arm-rediscache/src/operations/operations.ts +++ b/sdk/redis/arm-rediscache/src/operations/operations.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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 @@ -95,7 +94,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.OperationListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -108,6 +107,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -116,7 +118,7 @@ const listNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.OperationListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/redis/arm-rediscache/src/operations/patchSchedules.ts b/sdk/redis/arm-rediscache/src/operations/patchSchedules.ts index 4e8a39613a00..b51289a2ea9b 100644 --- a/sdk/redis/arm-rediscache/src/operations/patchSchedules.ts +++ b/sdk/redis/arm-rediscache/src/operations/patchSchedules.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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 @@ -59,7 +58,7 @@ export class PatchSchedules { } /** - * Create or replace the patching schedule for Redis cache (requires Premium SKU). + * Create or replace the patching schedule for Redis cache. * @param resourceGroupName The name of the resource group. * @param name The name of the Redis cache. * @param scheduleEntries List of patch schedules for a Redis cache. @@ -95,7 +94,7 @@ export class PatchSchedules { } /** - * Deletes the patching schedule of a redis cache (requires Premium SKU). + * Deletes the patching schedule of a redis cache. * @param resourceGroupName The name of the resource group. * @param name The name of the redis cache. * @param [options] The optional parameters @@ -127,7 +126,7 @@ export class PatchSchedules { } /** - * Gets the patching schedule of a redis cache (requires Premium SKU). + * Gets the patching schedule of a redis cache. * @param resourceGroupName The name of the resource group. * @param name The name of the redis cache. * @param [options] The optional parameters @@ -191,7 +190,7 @@ export class PatchSchedules { const serializer = new msRest.Serializer(Mappers); const listByRedisResourceOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{cacheName}/patchSchedules", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/patchSchedules", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -208,7 +207,7 @@ const listByRedisResourceOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisPatchScheduleListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -216,7 +215,7 @@ const listByRedisResourceOperationSpec: msRest.OperationSpec = { const createOrUpdateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/patchSchedules/{default}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/patchSchedules/{default}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -246,7 +245,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisPatchSchedule }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -254,7 +253,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = { const deleteMethodOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/patchSchedules/{default}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/patchSchedules/{default}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -271,7 +270,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { 200: {}, 204: {}, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -279,7 +278,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { const getOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/patchSchedules/{default}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/patchSchedules/{default}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -297,7 +296,7 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisPatchSchedule }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -310,6 +309,9 @@ const listByRedisResourceNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -318,7 +320,7 @@ const listByRedisResourceNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisPatchScheduleListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/redis/arm-rediscache/src/operations/privateEndpointConnections.ts b/sdk/redis/arm-rediscache/src/operations/privateEndpointConnections.ts new file mode 100644 index 000000000000..80d069b66ce3 --- /dev/null +++ b/sdk/redis/arm-rediscache/src/operations/privateEndpointConnections.ts @@ -0,0 +1,287 @@ +/* + * 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 * as msRest from "@azure/ms-rest-js"; +import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as Models from "../models"; +import * as Mappers from "../models/privateEndpointConnectionsMappers"; +import * as Parameters from "../models/parameters"; +import { RedisManagementClientContext } from "../redisManagementClientContext"; + +/** Class representing a PrivateEndpointConnections. */ +export class PrivateEndpointConnections { + private readonly client: RedisManagementClientContext; + + /** + * Create a PrivateEndpointConnections. + * @param {RedisManagementClientContext} client Reference to the service client. + */ + constructor(client: RedisManagementClientContext) { + this.client = client; + } + + /** + * List all the private endpoint connections associated with the redis cache. + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param [options] The optional parameters + * @returns Promise + */ + list(resourceGroupName: string, cacheName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param callback The callback + */ + list(resourceGroupName: string, cacheName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param options The optional parameters + * @param callback The callback + */ + list(resourceGroupName: string, cacheName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, cacheName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + cacheName, + options + }, + listOperationSpec, + callback) as Promise; + } + + /** + * Gets the specified private endpoint connection associated with the redis cache. + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with + * the Azure resource + * @param [options] The optional parameters + * @returns Promise + */ + get(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with + * the Azure resource + * @param callback The callback + */ + get(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with + * the Azure resource + * @param options The optional parameters + * @param callback The callback + */ + get(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + cacheName, + privateEndpointConnectionName, + options + }, + getOperationSpec, + callback) as Promise; + } + + /** + * Update the state of specified private endpoint connection associated with the redis cache. + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with + * the Azure resource + * @param properties The private endpoint connection properties. + * @param [options] The optional parameters + * @returns Promise + */ + put(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, options?: msRest.RequestOptionsBase): Promise { + return this.beginPut(resourceGroupName,cacheName,privateEndpointConnectionName,properties,options) + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + } + + /** + * Deletes the specified private endpoint connection associated with the redis cache. + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with + * the Azure resource + * @param [options] The optional parameters + * @returns Promise + */ + deleteMethod(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with + * the Azure resource + * @param callback The callback + */ + deleteMethod(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with + * the Azure resource + * @param options The optional parameters + * @param callback The callback + */ + deleteMethod(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + deleteMethod(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + cacheName, + privateEndpointConnectionName, + options + }, + deleteMethodOperationSpec, + callback); + } + + /** + * Update the state of specified private endpoint connection associated with the redis cache. + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with + * the Azure resource + * @param properties The private endpoint connection properties. + * @param [options] The optional parameters + * @returns Promise + */ + beginPut(resourceGroupName: string, cacheName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( + { + resourceGroupName, + cacheName, + privateEndpointConnectionName, + properties, + options + }, + beginPutOperationSpec, + options); + } +} + +// Operation Specifications +const serializer = new msRest.Serializer(Mappers); +const listOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/privateEndpointConnections", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.cacheName, + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.PrivateEndpointConnectionListResult + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const getOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/privateEndpointConnections/{privateEndpointConnectionName}", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.cacheName, + Parameters.privateEndpointConnectionName, + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.PrivateEndpointConnection + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const deleteMethodOperationSpec: msRest.OperationSpec = { + httpMethod: "DELETE", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/privateEndpointConnections/{privateEndpointConnectionName}", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.cacheName, + Parameters.subscriptionId, + Parameters.privateEndpointConnectionName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: {}, + 204: {}, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const beginPutOperationSpec: msRest.OperationSpec = { + httpMethod: "PUT", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/privateEndpointConnections/{privateEndpointConnectionName}", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.cacheName, + Parameters.subscriptionId, + Parameters.privateEndpointConnectionName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + requestBody: { + parameterPath: "properties", + mapper: { + ...Mappers.PrivateEndpointConnection, + required: true + } + }, + responses: { + 201: { + bodyMapper: Mappers.PrivateEndpointConnection + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; diff --git a/sdk/redis/arm-rediscache/src/operations/privateLinkResources.ts b/sdk/redis/arm-rediscache/src/operations/privateLinkResources.ts new file mode 100644 index 000000000000..cb02a4c57065 --- /dev/null +++ b/sdk/redis/arm-rediscache/src/operations/privateLinkResources.ts @@ -0,0 +1,86 @@ +/* + * 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 * as msRest from "@azure/ms-rest-js"; +import * as Models from "../models"; +import * as Mappers from "../models/privateLinkResourcesMappers"; +import * as Parameters from "../models/parameters"; +import { RedisManagementClientContext } from "../redisManagementClientContext"; + +/** Class representing a PrivateLinkResources. */ +export class PrivateLinkResources { + private readonly client: RedisManagementClientContext; + + /** + * Create a PrivateLinkResources. + * @param {RedisManagementClientContext} client Reference to the service client. + */ + constructor(client: RedisManagementClientContext) { + this.client = client; + } + + /** + * Gets the private link resources that need to be created for a redis cache. + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param [options] The optional parameters + * @returns Promise + */ + listByRedisCache(resourceGroupName: string, cacheName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param callback The callback + */ + listByRedisCache(resourceGroupName: string, cacheName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. + * @param cacheName The name of the Redis cache. + * @param options The optional parameters + * @param callback The callback + */ + listByRedisCache(resourceGroupName: string, cacheName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByRedisCache(resourceGroupName: string, cacheName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + cacheName, + options + }, + listByRedisCacheOperationSpec, + callback) as Promise; + } +} + +// Operation Specifications +const serializer = new msRest.Serializer(Mappers); +const listByRedisCacheOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{cacheName}/privateLinkResources", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.cacheName, + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.PrivateLinkResourceListResult + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; diff --git a/sdk/redis/arm-rediscache/src/operations/redis.ts b/sdk/redis/arm-rediscache/src/operations/redis.ts index 03ee10850310..ca160b0e8388 100644 --- a/sdk/redis/arm-rediscache/src/operations/redis.ts +++ b/sdk/redis/arm-rediscache/src/operations/redis.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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 @@ -218,25 +217,25 @@ export class Redis { /** * Gets all Redis caches in the specified subscription. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - list(options?: msRest.RequestOptionsBase): Promise; + listBySubscription(options?: msRest.RequestOptionsBase): Promise; /** * @param callback The callback */ - list(callback: msRest.ServiceCallback): void; + listBySubscription(callback: msRest.ServiceCallback): void; /** * @param options The optional parameters * @param callback The callback */ - list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listBySubscription(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listBySubscription(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options }, - listOperationSpec, - callback) as Promise; + listBySubscriptionOperationSpec, + callback) as Promise; } /** @@ -453,6 +452,38 @@ export class Redis { options); } + /** + * Gets any upgrade notifications for a Redis cache. + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param history how many minutes in past to look for upgrade notifications + * @param [options] The optional parameters + * @returns Promise + */ + listUpgradeNotificationsNext(nextPageLink: string, history: number, options?: msRest.RequestOptionsBase): Promise; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param history how many minutes in past to look for upgrade notifications + * @param callback The callback + */ + listUpgradeNotificationsNext(nextPageLink: string, history: number, callback: msRest.ServiceCallback): void; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param history how many minutes in past to look for upgrade notifications + * @param options The optional parameters + * @param callback The callback + */ + listUpgradeNotificationsNext(nextPageLink: string, history: number, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listUpgradeNotificationsNext(nextPageLink: string, history: number, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + nextPageLink, + history, + options + }, + listUpgradeNotificationsNextOperationSpec, + callback) as Promise; + } + /** * Lists all Redis caches in a resource group. * @param nextPageLink The NextLink from the previous successful call to List operation. @@ -485,28 +516,28 @@ export class Redis { * Gets all Redis caches in the specified subscription. * @param nextPageLink The NextLink from the previous successful call to List operation. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback */ - listNext(nextPageLink: string, callback: msRest.ServiceCallback): void; + listBySubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback): void; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param options The optional parameters * @param callback The callback */ - listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listBySubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, options }, - listNextOperationSpec, - callback) as Promise; + listBySubscriptionNextOperationSpec, + callback) as Promise; } } @@ -534,7 +565,7 @@ const checkNameAvailabilityOperationSpec: msRest.OperationSpec = { responses: { 200: {}, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -542,7 +573,7 @@ const checkNameAvailabilityOperationSpec: msRest.OperationSpec = { const listUpgradeNotificationsOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/listUpgradeNotifications", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/listUpgradeNotifications", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -560,7 +591,7 @@ const listUpgradeNotificationsOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.NotificationListResponse }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -568,7 +599,7 @@ const listUpgradeNotificationsOperationSpec: msRest.OperationSpec = { const updateOperationSpec: msRest.OperationSpec = { httpMethod: "PATCH", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -592,7 +623,7 @@ const updateOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisResource }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -600,7 +631,7 @@ const updateOperationSpec: msRest.OperationSpec = { const getOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -617,7 +648,7 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisResource }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -625,7 +656,7 @@ const getOperationSpec: msRest.OperationSpec = { const listByResourceGroupOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis", urlParameters: [ Parameters.resourceGroupName, Parameters.subscriptionId @@ -641,15 +672,15 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const listOperationSpec: msRest.OperationSpec = { +const listBySubscriptionOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/providers/Microsoft.Cache/Redis", + path: "subscriptions/{subscriptionId}/providers/Microsoft.Cache/redis", urlParameters: [ Parameters.subscriptionId ], @@ -664,7 +695,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -672,7 +703,7 @@ const listOperationSpec: msRest.OperationSpec = { const listKeysOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/listKeys", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/listKeys", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -689,7 +720,7 @@ const listKeysOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisAccessKeys }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -697,7 +728,7 @@ const listKeysOperationSpec: msRest.OperationSpec = { const regenerateKeyOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/regenerateKey", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/regenerateKey", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -723,7 +754,7 @@ const regenerateKeyOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisAccessKeys }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -731,7 +762,7 @@ const regenerateKeyOperationSpec: msRest.OperationSpec = { const forceRebootOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/forceReboot", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/forceReboot", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -755,7 +786,7 @@ const forceRebootOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisForceRebootResponse }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -763,7 +794,7 @@ const forceRebootOperationSpec: msRest.OperationSpec = { const beginCreateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -790,7 +821,7 @@ const beginCreateOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisResource }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -798,7 +829,7 @@ const beginCreateOperationSpec: msRest.OperationSpec = { const beginDeleteMethodOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -815,7 +846,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = { 202: {}, 204: {}, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -823,7 +854,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = { const beginImportDataOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/import", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/import", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -847,7 +878,7 @@ const beginImportDataOperationSpec: msRest.OperationSpec = { 202: {}, 204: {}, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -855,7 +886,7 @@ const beginImportDataOperationSpec: msRest.OperationSpec = { const beginExportDataOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/Redis/{name}/export", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redis/{name}/export", urlParameters: [ Parameters.resourceGroupName, Parameters.name, @@ -879,7 +910,32 @@ const beginExportDataOperationSpec: msRest.OperationSpec = { 202: {}, 204: {}, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const listUpgradeNotificationsNextOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + baseUrl: "https://management.azure.com", + path: "{nextLink}", + urlParameters: [ + Parameters.nextPageLink + ], + queryParameters: [ + Parameters.apiVersion, + Parameters.history + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.NotificationListResponse + }, + default: { + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -892,6 +948,9 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -900,19 +959,22 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const listNextOperationSpec: msRest.OperationSpec = { +const listBySubscriptionNextOperationSpec: msRest.OperationSpec = { httpMethod: "GET", baseUrl: "https://management.azure.com", path: "{nextLink}", urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -921,7 +983,7 @@ const listNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.RedisListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/redis/arm-rediscache/src/redisManagementClient.ts b/sdk/redis/arm-rediscache/src/redisManagementClient.ts index cd3b8b9dfe2e..292a8709b7ad 100644 --- a/sdk/redis/arm-rediscache/src/redisManagementClient.ts +++ b/sdk/redis/arm-rediscache/src/redisManagementClient.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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 @@ -9,6 +8,7 @@ */ import * as msRest from "@azure/ms-rest-js"; +import { TokenCredential } from "@azure/core-auth"; import * as Models from "./models"; import * as Mappers from "./models/mappers"; import * as operations from "./operations"; @@ -22,21 +22,30 @@ class RedisManagementClient extends RedisManagementClientContext { firewallRules: operations.FirewallRules; patchSchedules: operations.PatchSchedules; linkedServer: operations.LinkedServer; + privateEndpointConnections: operations.PrivateEndpointConnections; + privateLinkResources: operations.PrivateLinkResources; /** * Initializes a new instance of the RedisManagementClient class. - * @param credentials Credentials needed for the client to connect to Azure. + * @param credentials Credentials needed for the client to connect to Azure. Credentials + * implementing the TokenCredential interface from the @azure/identity package are recommended. For + * more information about these credentials, see + * {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the + * ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and + * @azure/ms-rest-browserauth are also supported. * @param subscriptionId Gets subscription credentials which uniquely identify the Microsoft Azure * subscription. The subscription ID forms part of the URI for every service call. * @param [options] The parameter options */ - constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.RedisManagementClientOptions) { + constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.RedisManagementClientOptions) { super(credentials, subscriptionId, options); this.operations = new operations.Operations(this); this.redis = new operations.Redis(this); this.firewallRules = new operations.FirewallRules(this); this.patchSchedules = new operations.PatchSchedules(this); this.linkedServer = new operations.LinkedServer(this); + this.privateEndpointConnections = new operations.PrivateEndpointConnections(this); + this.privateLinkResources = new operations.PrivateLinkResources(this); } } diff --git a/sdk/redis/arm-rediscache/src/redisManagementClientContext.ts b/sdk/redis/arm-rediscache/src/redisManagementClientContext.ts index 286d06abeb1f..10f98f858eb6 100644 --- a/sdk/redis/arm-rediscache/src/redisManagementClientContext.ts +++ b/sdk/redis/arm-rediscache/src/redisManagementClientContext.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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 @@ -11,23 +10,29 @@ import * as Models from "./models"; import * as msRest from "@azure/ms-rest-js"; import * as msRestAzure from "@azure/ms-rest-azure-js"; +import { TokenCredential } from "@azure/core-auth"; const packageName = "@azure/arm-rediscache"; const packageVersion = "4.0.0"; export class RedisManagementClientContext extends msRestAzure.AzureServiceClient { - credentials: msRest.ServiceClientCredentials; + credentials: msRest.ServiceClientCredentials | TokenCredential; subscriptionId: string; apiVersion?: string; /** * Initializes a new instance of the RedisManagementClient class. - * @param credentials Credentials needed for the client to connect to Azure. + * @param credentials Credentials needed for the client to connect to Azure. Credentials + * implementing the TokenCredential interface from the @azure/identity package are recommended. For + * more information about these credentials, see + * {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the + * ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and + * @azure/ms-rest-browserauth are also supported. * @param subscriptionId Gets subscription credentials which uniquely identify the Microsoft Azure * subscription. The subscription ID forms part of the URI for every service call. * @param [options] The parameter options */ - constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.RedisManagementClientOptions) { + constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.RedisManagementClientOptions) { if (credentials == undefined) { throw new Error('\'credentials\' cannot be null.'); } @@ -38,14 +43,14 @@ export class RedisManagementClientContext extends msRestAzure.AzureServiceClient if (!options) { options = {}; } - if(!options.userAgent) { + if (!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } super(credentials, options); - this.apiVersion = '2019-07-01'; + this.apiVersion = '2020-12-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; @@ -53,10 +58,10 @@ export class RedisManagementClientContext extends msRestAzure.AzureServiceClient 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; } }