From ca493ff106a0cecfbe569952da9cd7c7ddd62c92 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 28 Jul 2021 23:59:38 +0000 Subject: [PATCH] CodeGen from PR 15417 in Azure/azure-rest-api-specs Merge 3e1538958f5f39a34fa41540cc5931fff5652a27 into 7cc0a47e7808f3247c71cda25b7c1da8503272ba --- .../src/Generated/DatabasesOperations.cs | 26 ++++++------ .../DatabasesOperationsExtensions.cs | 42 ++++++++++--------- .../src/Generated/IDatabasesOperations.cs | 16 +++---- .../Models/ImportClusterParameters.cs | 16 +++---- .../RedisEnterpriseManagementClient.cs | 2 +- ...SdkInfo_RedisEnterpriseManagementClient.cs | 23 +++------- 6 files changed, 59 insertions(+), 66 deletions(-) diff --git a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/DatabasesOperations.cs b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/DatabasesOperations.cs index e0e036e936d84..c373433c2f42a 100644 --- a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/DatabasesOperations.cs +++ b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/DatabasesOperations.cs @@ -752,7 +752,7 @@ internal DatabasesOperations(RedisEnterpriseManagementClient client) } /// - /// Imports a database file to target database. + /// Imports database files to target database. /// /// /// The name of the resource group. The name is case insensitive. @@ -763,8 +763,8 @@ internal DatabasesOperations(RedisEnterpriseManagementClient client) /// /// The name of the database. /// - /// - /// SAS URI for the target blob to import from + /// + /// SAS URIs for the target blobs to import from /// /// /// The headers that will be added to request. @@ -772,10 +772,10 @@ internal DatabasesOperations(RedisEnterpriseManagementClient client) /// /// The cancellation token. /// - public async Task ImportWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, string sasUri, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task ImportWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, IList sasUris, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { // Send request - AzureOperationResponse _response = await BeginImportWithHttpMessagesAsync(resourceGroupName, clusterName, databaseName, sasUri, customHeaders, cancellationToken).ConfigureAwait(false); + AzureOperationResponse _response = await BeginImportWithHttpMessagesAsync(resourceGroupName, clusterName, databaseName, sasUris, customHeaders, cancellationToken).ConfigureAwait(false); return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); } @@ -1646,7 +1646,7 @@ internal DatabasesOperations(RedisEnterpriseManagementClient client) } /// - /// Imports a database file to target database. + /// Imports database files to target database. /// /// /// The name of the resource group. The name is case insensitive. @@ -1657,8 +1657,8 @@ internal DatabasesOperations(RedisEnterpriseManagementClient client) /// /// The name of the database. /// - /// - /// SAS URI for the target blob to import from + /// + /// SAS URIs for the target blobs to import from /// /// /// Headers that will be added to request. @@ -1678,7 +1678,7 @@ internal DatabasesOperations(RedisEnterpriseManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task BeginImportWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, string sasUri, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task BeginImportWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, IList sasUris, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -1700,14 +1700,14 @@ internal DatabasesOperations(RedisEnterpriseManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - if (sasUri == null) + if (sasUris == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "sasUri"); + throw new ValidationException(ValidationRules.CannotBeNull, "sasUris"); } ImportClusterParameters parameters = new ImportClusterParameters(); - if (sasUri != null) + if (sasUris != null) { - parameters.SasUri = sasUri; + parameters.SasUris = sasUris; } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; diff --git a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/DatabasesOperationsExtensions.cs b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/DatabasesOperationsExtensions.cs index 1cdc136bdfe19..fb92cf2a90c99 100644 --- a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/DatabasesOperationsExtensions.cs +++ b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/DatabasesOperationsExtensions.cs @@ -13,6 +13,8 @@ namespace Microsoft.Azure.Management.RedisEnterprise using Microsoft.Rest; using Microsoft.Rest.Azure; using Models; + using System.Collections; + using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -355,7 +357,7 @@ public static AccessKeys RegenerateKey(this IDatabasesOperations operations, str } /// - /// Imports a database file to target database. + /// Imports database files to target database. /// /// /// The operations group for this extension method. @@ -369,16 +371,16 @@ public static AccessKeys RegenerateKey(this IDatabasesOperations operations, str /// /// The name of the database. /// - /// - /// SAS URI for the target blob to import from + /// + /// SAS URIs for the target blobs to import from /// - public static void Import(this IDatabasesOperations operations, string resourceGroupName, string clusterName, string databaseName, string sasUri) + public static void Import(this IDatabasesOperations operations, string resourceGroupName, string clusterName, string databaseName, IList sasUris) { - operations.ImportAsync(resourceGroupName, clusterName, databaseName, sasUri).GetAwaiter().GetResult(); + operations.ImportAsync(resourceGroupName, clusterName, databaseName, sasUris).GetAwaiter().GetResult(); } /// - /// Imports a database file to target database. + /// Imports database files to target database. /// /// /// The operations group for this extension method. @@ -392,15 +394,15 @@ public static void Import(this IDatabasesOperations operations, string resourceG /// /// The name of the database. /// - /// - /// SAS URI for the target blob to import from + /// + /// SAS URIs for the target blobs to import from /// /// /// The cancellation token. /// - public static async Task ImportAsync(this IDatabasesOperations operations, string resourceGroupName, string clusterName, string databaseName, string sasUri, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task ImportAsync(this IDatabasesOperations operations, string resourceGroupName, string clusterName, string databaseName, IList sasUris, CancellationToken cancellationToken = default(CancellationToken)) { - (await operations.ImportWithHttpMessagesAsync(resourceGroupName, clusterName, databaseName, sasUri, null, cancellationToken).ConfigureAwait(false)).Dispose(); + (await operations.ImportWithHttpMessagesAsync(resourceGroupName, clusterName, databaseName, sasUris, null, cancellationToken).ConfigureAwait(false)).Dispose(); } /// @@ -654,7 +656,7 @@ public static AccessKeys BeginRegenerateKey(this IDatabasesOperations operations } /// - /// Imports a database file to target database. + /// Imports database files to target database. /// /// /// The operations group for this extension method. @@ -668,16 +670,16 @@ public static AccessKeys BeginRegenerateKey(this IDatabasesOperations operations /// /// The name of the database. /// - /// - /// SAS URI for the target blob to import from + /// + /// SAS URIs for the target blobs to import from /// - public static void BeginImport(this IDatabasesOperations operations, string resourceGroupName, string clusterName, string databaseName, string sasUri) + public static void BeginImport(this IDatabasesOperations operations, string resourceGroupName, string clusterName, string databaseName, IList sasUris) { - operations.BeginImportAsync(resourceGroupName, clusterName, databaseName, sasUri).GetAwaiter().GetResult(); + operations.BeginImportAsync(resourceGroupName, clusterName, databaseName, sasUris).GetAwaiter().GetResult(); } /// - /// Imports a database file to target database. + /// Imports database files to target database. /// /// /// The operations group for this extension method. @@ -691,15 +693,15 @@ public static void BeginImport(this IDatabasesOperations operations, string reso /// /// The name of the database. /// - /// - /// SAS URI for the target blob to import from + /// + /// SAS URIs for the target blobs to import from /// /// /// The cancellation token. /// - public static async Task BeginImportAsync(this IDatabasesOperations operations, string resourceGroupName, string clusterName, string databaseName, string sasUri, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task BeginImportAsync(this IDatabasesOperations operations, string resourceGroupName, string clusterName, string databaseName, IList sasUris, CancellationToken cancellationToken = default(CancellationToken)) { - (await operations.BeginImportWithHttpMessagesAsync(resourceGroupName, clusterName, databaseName, sasUri, null, cancellationToken).ConfigureAwait(false)).Dispose(); + (await operations.BeginImportWithHttpMessagesAsync(resourceGroupName, clusterName, databaseName, sasUris, null, cancellationToken).ConfigureAwait(false)).Dispose(); } /// diff --git a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/IDatabasesOperations.cs b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/IDatabasesOperations.cs index f210a716c3d3e..790f9a73e5442 100644 --- a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/IDatabasesOperations.cs +++ b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/IDatabasesOperations.cs @@ -224,7 +224,7 @@ public partial interface IDatabasesOperations /// Task> RegenerateKeyWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, AccessKeyType keyType, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Imports a database file to target database. + /// Imports database files to target database. /// /// /// The name of the resource group. The name is case insensitive. @@ -235,8 +235,8 @@ public partial interface IDatabasesOperations /// /// The name of the database. /// - /// - /// SAS URI for the target blob to import from + /// + /// SAS URIs for the target blobs to import from /// /// /// The headers that will be added to request. @@ -250,7 +250,7 @@ public partial interface IDatabasesOperations /// /// Thrown when a required parameter is null /// - Task ImportWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, string sasUri, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task ImportWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, IList sasUris, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Exports a database file from target database. /// @@ -399,7 +399,7 @@ public partial interface IDatabasesOperations /// Task> BeginRegenerateKeyWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, AccessKeyType keyType, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Imports a database file to target database. + /// Imports database files to target database. /// /// /// The name of the resource group. The name is case insensitive. @@ -410,8 +410,8 @@ public partial interface IDatabasesOperations /// /// The name of the database. /// - /// - /// SAS URI for the target blob to import from + /// + /// SAS URIs for the target blobs to import from /// /// /// The headers that will be added to request. @@ -425,7 +425,7 @@ public partial interface IDatabasesOperations /// /// Thrown when a required parameter is null /// - Task BeginImportWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, string sasUri, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task BeginImportWithHttpMessagesAsync(string resourceGroupName, string clusterName, string databaseName, IList sasUris, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Exports a database file from target database. /// diff --git a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/Models/ImportClusterParameters.cs b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/Models/ImportClusterParameters.cs index a5adbae21aecb..7d94449cb55cc 100644 --- a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/Models/ImportClusterParameters.cs +++ b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/Models/ImportClusterParameters.cs @@ -11,10 +11,12 @@ namespace Microsoft.Azure.Management.RedisEnterprise.Models { using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; using System.Linq; /// - /// Import an RDB file into a target database + /// Import RDB files into a target database /// /// /// Parameters for a Redis Enterprise import operation. @@ -32,11 +34,11 @@ public ImportClusterParameters() /// /// Initializes a new instance of the ImportClusterParameters class. /// - /// SAS URI for the target blob to import + /// SAS URIs for the target blobs to import /// from - public ImportClusterParameters(string sasUri) + public ImportClusterParameters(IList sasUris) { - SasUri = sasUri; + SasUris = sasUris; CustomInit(); } @@ -46,10 +48,10 @@ public ImportClusterParameters(string sasUri) partial void CustomInit(); /// - /// Gets or sets SAS URI for the target blob to import from + /// Gets or sets SAS URIs for the target blobs to import from /// - [JsonProperty(PropertyName = "sasUri")] - public string SasUri { get; set; } + [JsonProperty(PropertyName = "sasUris")] + public IList SasUris { get; set; } } } diff --git a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/RedisEnterpriseManagementClient.cs b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/RedisEnterpriseManagementClient.cs index 6cdf73b64ae6d..07937867cc7b1 100644 --- a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/RedisEnterpriseManagementClient.cs +++ b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/RedisEnterpriseManagementClient.cs @@ -352,7 +352,7 @@ private void Initialize() PrivateEndpointConnections = new PrivateEndpointConnectionsOperations(this); PrivateLinkResources = new PrivateLinkResourcesOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2021-03-01"; + ApiVersion = "2021-08-01"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/SdkInfo_RedisEnterpriseManagementClient.cs b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/SdkInfo_RedisEnterpriseManagementClient.cs index 72a4529ff61fc..7b8088a99860d 100644 --- a/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/SdkInfo_RedisEnterpriseManagementClient.cs +++ b/sdk/redisenterprise/Microsoft.Azure.Management.RedisEnterpriseCache/src/Generated/SdkInfo_RedisEnterpriseManagementClient.cs @@ -19,25 +19,14 @@ public static IEnumerable> ApiInfo_RedisEnterprise { return new Tuple[] { - new Tuple("Cache", "Databases", "2021-03-01"), - new Tuple("Cache", "Operations", "2021-03-01"), - new Tuple("Cache", "OperationsStatus", "2021-03-01"), - new Tuple("Cache", "PrivateEndpointConnections", "2021-03-01"), - new Tuple("Cache", "PrivateLinkResources", "2021-03-01"), - new Tuple("Cache", "RedisEnterprise", "2021-03-01"), + new Tuple("Cache", "Databases", "2021-08-01"), + new Tuple("Cache", "Operations", "2021-08-01"), + new Tuple("Cache", "OperationsStatus", "2021-08-01"), + new Tuple("Cache", "PrivateEndpointConnections", "2021-08-01"), + new Tuple("Cache", "PrivateLinkResources", "2021-08-01"), + new Tuple("Cache", "RedisEnterprise", "2021-08-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/redisenterprise/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\\repos\\feb21\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "379ee7309b62268464be1e14b0f9022a9283c2a4"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -