diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IKeyVaultManagementClient.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IKeyVaultManagementClient.cs index f3de174aee621..621287c8eae85 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IKeyVaultManagementClient.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IKeyVaultManagementClient.cs @@ -48,6 +48,11 @@ public partial interface IKeyVaultManagementClient : System.IDisposable /// string SubscriptionId { get; set; } + /// + /// Client Api Version. + /// + string ApiVersion { get; } + /// /// The preferred language for the response. /// @@ -88,9 +93,9 @@ public partial interface IKeyVaultManagementClient : System.IDisposable IOperations Operations { get; } /// - /// Gets the IManagedHsmsOperations. + /// Gets the IKeysOperations. /// - IManagedHsmsOperations ManagedHsms { get; } + IKeysOperations Keys { get; } } } diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IKeysOperations.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IKeysOperations.cs new file mode 100644 index 0000000000000..473cf582c9d12 --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IKeysOperations.cs @@ -0,0 +1,226 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Collections; + using System.Collections.Generic; + using System.Threading; + using System.Threading.Tasks; + + /// + /// KeysOperations operations. + /// + public partial interface IKeysOperations + { + /// + /// Creates the first version of a new key if it does not exist. If it + /// already exists, then the existing key is returned without any write + /// operations being performed. This API does not create subsequent + /// versions, and does not update existing keys. + /// + /// + /// The name of the resource group which contains the specified key + /// vault. + /// + /// + /// The name of the key vault which contains the key to be created. + /// + /// + /// The name of the key to be created. + /// + /// + /// The parameters used to create the specified key. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task> CreateIfNotExistWithHttpMessagesAsync(string resourceGroupName, string vaultName, string keyName, KeyCreateParameters parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Gets the current version of the specified key from the specified + /// key vault. + /// + /// + /// The name of the resource group which contains the specified key + /// vault. + /// + /// + /// The name of the vault which contains the key to be retrieved. + /// + /// + /// The name of the key to be retrieved. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task> GetWithHttpMessagesAsync(string resourceGroupName, string vaultName, string keyName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Lists the keys in the specified key vault. + /// + /// + /// The name of the resource group which contains the specified key + /// vault. + /// + /// + /// The name of the vault which contains the keys to be retrieved. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListWithHttpMessagesAsync(string resourceGroupName, string vaultName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Gets the specified version of the specified key in the specified + /// key vault. + /// + /// + /// The name of the resource group which contains the specified key + /// vault. + /// + /// + /// The name of the vault which contains the key version to be + /// retrieved. + /// + /// + /// The name of the key version to be retrieved. + /// + /// + /// The version of the key to be retrieved. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task> GetVersionWithHttpMessagesAsync(string resourceGroupName, string vaultName, string keyName, string keyVersion, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Lists the versions of the specified key in the specified key vault. + /// + /// + /// The name of the resource group which contains the specified key + /// vault. + /// + /// + /// The name of the vault which contains the key versions to be + /// retrieved. + /// + /// + /// The name of the key versions to be retrieved. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListVersionsWithHttpMessagesAsync(string resourceGroupName, string vaultName, string keyName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Lists the keys in the specified key vault. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Lists the versions of the specified key in the specified key vault. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListVersionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IManagedHsmsOperations.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IManagedHsmsOperations.cs deleted file mode 100644 index 0d326629baf74..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/IManagedHsmsOperations.cs +++ /dev/null @@ -1,305 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault -{ - using Microsoft.Rest; - using Microsoft.Rest.Azure; - using Models; - using System.Collections; - using System.Collections.Generic; - using System.Threading; - using System.Threading.Tasks; - - /// - /// ManagedHsmsOperations operations. - /// - public partial interface IManagedHsmsOperations - { - /// - /// Create or update a managed HSM Pool in the specified subscription. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to create or update the managed HSM Pool - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when unable to deserialize the response - /// - /// - /// Thrown when a required parameter is null - /// - Task> CreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string name, ManagedHsm parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Update a managed HSM Pool in the specified subscription. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to patch the managed HSM Pool - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when unable to deserialize the response - /// - /// - /// Thrown when a required parameter is null - /// - Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string name, ManagedHsm parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Deletes the specified managed HSM Pool. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool to delete - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when a required parameter is null - /// - Task DeleteWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Gets the specified managed HSM Pool. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when unable to deserialize the response - /// - /// - /// Thrown when a required parameter is null - /// - Task> GetWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// The List operation gets information about the managed HSM Pools - /// associated with the subscription and within the specified resource - /// group. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Maximum number of results to return. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when unable to deserialize the response - /// - /// - /// Thrown when a required parameter is null - /// - Task>> ListByResourceGroupWithHttpMessagesAsync(string resourceGroupName, int? top = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// The List operation gets information about the managed HSM Pools - /// associated with the subscription. - /// - /// - /// Maximum number of results to return. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when unable to deserialize the response - /// - /// - /// Thrown when a required parameter is null - /// - Task>> ListBySubscriptionWithHttpMessagesAsync(int? top = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Create or update a managed HSM Pool in the specified subscription. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to create or update the managed HSM Pool - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when unable to deserialize the response - /// - /// - /// Thrown when a required parameter is null - /// - Task> BeginCreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string name, ManagedHsm parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Update a managed HSM Pool in the specified subscription. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to patch the managed HSM Pool - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when unable to deserialize the response - /// - /// - /// Thrown when a required parameter is null - /// - Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string name, ManagedHsm parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Deletes the specified managed HSM Pool. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool to delete - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when a required parameter is null - /// - Task BeginDeleteWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// The List operation gets information about the managed HSM Pools - /// associated with the subscription and within the specified resource - /// group. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when unable to deserialize the response - /// - /// - /// Thrown when a required parameter is null - /// - Task>> ListByResourceGroupNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// The List operation gets information about the managed HSM Pools - /// associated with the subscription. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when unable to deserialize the response - /// - /// - /// Thrown when a required parameter is null - /// - Task>> ListBySubscriptionNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeyVaultManagementClient.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeyVaultManagementClient.cs index 5445b99956e7e..6a0d1566a2024 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeyVaultManagementClient.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeyVaultManagementClient.cs @@ -54,6 +54,11 @@ public partial class KeyVaultManagementClient : ServiceClient public string SubscriptionId { get; set; } + /// + /// Client Api Version. + /// + public string ApiVersion { get; private set; } + /// /// The preferred language for the response. /// @@ -93,9 +98,9 @@ public partial class KeyVaultManagementClient : ServiceClient - /// Gets the IManagedHsmsOperations. + /// Gets the IKeysOperations. /// - public virtual IManagedHsmsOperations ManagedHsms { get; private set; } + public virtual IKeysOperations Keys { get; private set; } /// /// Initializes a new instance of the KeyVaultManagementClient class. @@ -342,8 +347,9 @@ private void Initialize() PrivateEndpointConnections = new PrivateEndpointConnectionsOperations(this); PrivateLinkResources = new PrivateLinkResourcesOperations(this); Operations = new Operations(this); - ManagedHsms = new ManagedHsmsOperations(this); + Keys = new KeysOperations(this); BaseUri = new System.Uri("https://management.azure.com"); + ApiVersion = "2019-09-01"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/ManagedHsmsOperations.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeysOperations.cs similarity index 70% rename from sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/ManagedHsmsOperations.cs rename to sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeysOperations.cs index eb4f7bb6f55fb..3662b5382893e 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/ManagedHsmsOperations.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeysOperations.cs @@ -23,12 +23,12 @@ namespace Microsoft.Azure.Management.KeyVault using System.Threading.Tasks; /// - /// ManagedHsmsOperations operations. + /// KeysOperations operations. /// - internal partial class ManagedHsmsOperations : IServiceOperations, IManagedHsmsOperations + internal partial class KeysOperations : IServiceOperations, IKeysOperations { /// - /// Initializes a new instance of the ManagedHsmsOperations class. + /// Initializes a new instance of the KeysOperations class. /// /// /// Reference to the service client. @@ -36,7 +36,7 @@ internal partial class ManagedHsmsOperations : IServiceOperations /// Thrown when a required parameter is null /// - internal ManagedHsmsOperations(KeyVaultManagementClient client) + internal KeysOperations(KeyVaultManagementClient client) { if (client == null) { @@ -51,85 +51,22 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) public KeyVaultManagementClient Client { get; private set; } /// - /// Create or update a managed HSM Pool in the specified subscription. + /// Creates the first version of a new key if it does not exist. If it already + /// exists, then the existing key is returned without any write operations + /// being performed. This API does not create subsequent versions, and does not + /// update existing keys. /// /// - /// Name of the resource group that contains the managed HSM pool. + /// The name of the resource group which contains the specified key vault. /// - /// - /// Name of the managed HSM Pool + /// + /// The name of the key vault which contains the key to be created. /// - /// - /// Parameters to create or update the managed HSM Pool - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - public async Task> CreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string name, ManagedHsm parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - // Send Request - AzureOperationResponse _response = await BeginCreateOrUpdateWithHttpMessagesAsync(resourceGroupName, name, parameters, customHeaders, cancellationToken).ConfigureAwait(false); - return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); - } - - /// - /// Update a managed HSM Pool in the specified subscription. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool + /// + /// The name of the key to be created. /// /// - /// Parameters to patch the managed HSM Pool - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - public async Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string name, ManagedHsm parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - // Send Request - AzureOperationResponse _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, name, parameters, customHeaders, cancellationToken).ConfigureAwait(false); - return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); - } - - /// - /// Deletes the specified managed HSM Pool. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool to delete - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - public async Task DeleteWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - // Send request - AzureOperationResponse _response = await BeginDeleteWithHttpMessagesAsync(resourceGroupName, name, customHeaders, cancellationToken).ConfigureAwait(false); - return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); - } - - /// - /// Gets the specified managed HSM Pool. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool. + /// The parameters used to create the specified key. /// /// /// Headers that will be added to request. @@ -137,7 +74,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -152,21 +89,50 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> CreateIfNotExistWithHttpMessagesAsync(string resourceGroupName, string vaultName, string keyName, KeyCreateParameters parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } if (resourceGroupName == null) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); } - if (name == null) + if (vaultName == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "name"); + throw new ValidationException(ValidationRules.CannotBeNull, "vaultName"); } - if (Client.SubscriptionId == null) + if (vaultName != null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + if (!System.Text.RegularExpressions.Regex.IsMatch(vaultName, "^[a-zA-Z0-9-]{3,24}$")) + { + throw new ValidationException(ValidationRules.Pattern, "vaultName", "^[a-zA-Z0-9-]{3,24}$"); + } + } + if (keyName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "keyName"); + } + if (keyName != null) + { + if (!System.Text.RegularExpressions.Regex.IsMatch(keyName, "^[a-zA-Z0-9-]{1,127}$")) + { + throw new ValidationException(ValidationRules.Pattern, "keyName", "^[a-zA-Z0-9-]{1,127}$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + if (parameters == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); + } + if (parameters != null) + { + parameters.Validate(); } - string apiVersion = "2020-04-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -175,21 +141,23 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("name", name); - tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("vaultName", vaultName); + tracingParameters.Add("keyName", keyName); + tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "CreateIfNotExist", tracingParameters); } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/managedHSMs/{name}").ToString(); - _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); - _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}/keys/{keyName}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); + _url = _url.Replace("{keyName}", System.Uri.EscapeDataString(keyName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -198,7 +166,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("GET"); + _httpRequest.Method = new HttpMethod("PUT"); _httpRequest.RequestUri = new System.Uri(_url); // Set Headers if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) @@ -229,6 +197,12 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) // Serialize Request string _requestContent = null; + if(parameters != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, Client.SerializationSettings); + _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); + } // Set Credentials if (Client.Credentials != null) { @@ -251,13 +225,14 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) string _responseContent = null; if ((int)_statusCode != 200) { - var ex = new ManagedHsmErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - ManagedHsmError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { + ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -267,6 +242,10 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); @@ -279,7 +258,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -292,7 +271,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -312,14 +291,16 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription and within the specified resource group. + /// Gets the current version of the specified key from the specified key vault. /// /// - /// Name of the resource group that contains the managed HSM pool. + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the key to be retrieved. /// - /// - /// Maximum number of results to return. + /// + /// The name of the key to be retrieved. /// /// /// Headers that will be added to request. @@ -327,7 +308,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -342,17 +323,42 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListByResourceGroupWithHttpMessagesAsync(string resourceGroupName, int? top = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string vaultName, string keyName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } if (resourceGroupName == null) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); } - if (Client.SubscriptionId == null) + if (vaultName == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + throw new ValidationException(ValidationRules.CannotBeNull, "vaultName"); + } + if (vaultName != null) + { + if (!System.Text.RegularExpressions.Regex.IsMatch(vaultName, "^[a-zA-Z0-9-]{3,24}$")) + { + throw new ValidationException(ValidationRules.Pattern, "vaultName", "^[a-zA-Z0-9-]{3,24}$"); + } + } + if (keyName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "keyName"); + } + if (keyName != null) + { + if (!System.Text.RegularExpressions.Regex.IsMatch(keyName, "^[a-zA-Z0-9-]{1,127}$")) + { + throw new ValidationException(ValidationRules.Pattern, "keyName", "^[a-zA-Z0-9-]{1,127}$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - string apiVersion = "2020-04-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -361,24 +367,22 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("top", top); - tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("vaultName", vaultName); + tracingParameters.Add("keyName", keyName); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/managedHSMs").ToString(); - _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}/keys/{keyName}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); + _url = _url.Replace("{keyName}", System.Uri.EscapeDataString(keyName)); List _queryParameters = new List(); - if (top != null) - { - _queryParameters.Add(string.Format("$top={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(top, Client.SerializationSettings).Trim('"')))); - } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -440,13 +444,14 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) string _responseContent = null; if ((int)_statusCode != 200) { - var ex = new ManagedHsmErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - ManagedHsmError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { + ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -456,6 +461,10 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); @@ -468,7 +477,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -481,7 +490,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -501,11 +510,13 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription. + /// Lists the keys in the specified key vault. /// - /// - /// Maximum number of results to return. + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the keys to be retrieved. /// /// /// Headers that will be added to request. @@ -513,7 +524,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -528,13 +539,31 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListBySubscriptionWithHttpMessagesAsync(int? top = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string vaultName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2020-04-01-preview"; + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (vaultName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "vaultName"); + } + if (vaultName != null) + { + if (!System.Text.RegularExpressions.Regex.IsMatch(vaultName, "^[a-zA-Z0-9-]{3,24}$")) + { + throw new ValidationException(ValidationRules.Pattern, "vaultName", "^[a-zA-Z0-9-]{3,24}$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -542,23 +571,21 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) { _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("top", top); - tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("vaultName", vaultName); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "ListBySubscription", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.KeyVault/managedHSMs").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}/keys").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); List _queryParameters = new List(); - if (top != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("$top={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(top, Client.SerializationSettings).Trim('"')))); - } - if (apiVersion != null) - { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -620,13 +647,14 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) string _responseContent = null; if ((int)_statusCode != 200) { - var ex = new ManagedHsmErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - ManagedHsmError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { + ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -636,6 +664,10 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); @@ -648,7 +680,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse>(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -661,7 +693,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -681,16 +713,19 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } /// - /// Create or update a managed HSM Pool in the specified subscription. + /// Gets the specified version of the specified key in the specified key vault. /// /// - /// Name of the resource group that contains the managed HSM pool. + /// The name of the resource group which contains the specified key vault. /// - /// - /// Name of the managed HSM Pool + /// + /// The name of the vault which contains the key version to be retrieved. /// - /// - /// Parameters to create or update the managed HSM Pool + /// + /// The name of the key version to be retrieved. + /// + /// + /// The version of the key to be retrieved. /// /// /// Headers that will be added to request. @@ -698,7 +733,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -713,29 +748,53 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> BeginCreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string name, ManagedHsm parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetVersionWithHttpMessagesAsync(string resourceGroupName, string vaultName, string keyName, string keyVersion, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } if (resourceGroupName == null) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); } - if (name == null) + if (vaultName == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "name"); + throw new ValidationException(ValidationRules.CannotBeNull, "vaultName"); } - if (parameters == null) + if (vaultName != null) { - throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); + if (!System.Text.RegularExpressions.Regex.IsMatch(vaultName, "^[a-zA-Z0-9-]{3,24}$")) + { + throw new ValidationException(ValidationRules.Pattern, "vaultName", "^[a-zA-Z0-9-]{3,24}$"); + } } - if (parameters != null) + if (keyName == null) { - parameters.Validate(); + throw new ValidationException(ValidationRules.CannotBeNull, "keyName"); } - if (Client.SubscriptionId == null) + if (keyName != null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + if (!System.Text.RegularExpressions.Regex.IsMatch(keyName, "^[a-zA-Z0-9-]{1,127}$")) + { + throw new ValidationException(ValidationRules.Pattern, "keyName", "^[a-zA-Z0-9-]{1,127}$"); + } + } + if (keyVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "keyVersion"); + } + if (keyVersion != null) + { + if (!System.Text.RegularExpressions.Regex.IsMatch(keyVersion, "^[a-fA-F0-9]{32}$")) + { + throw new ValidationException(ValidationRules.Pattern, "keyVersion", "^[a-fA-F0-9]{32}$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - string apiVersion = "2020-04-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -744,22 +803,24 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("name", name); - tracingParameters.Add("apiVersion", apiVersion); - tracingParameters.Add("parameters", parameters); + tracingParameters.Add("vaultName", vaultName); + tracingParameters.Add("keyName", keyName); + tracingParameters.Add("keyVersion", keyVersion); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "GetVersion", tracingParameters); } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/managedHSMs/{name}").ToString(); - _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); - _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}/keys/{keyName}/versions/{keyVersion}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); + _url = _url.Replace("{keyName}", System.Uri.EscapeDataString(keyName)); + _url = _url.Replace("{keyVersion}", System.Uri.EscapeDataString(keyVersion)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -768,7 +829,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("PUT"); + _httpRequest.Method = new HttpMethod("GET"); _httpRequest.RequestUri = new System.Uri(_url); // Set Headers if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) @@ -799,12 +860,6 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) // Serialize Request string _requestContent = null; - if(parameters != null) - { - _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, Client.SerializationSettings); - _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); - _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); - } // Set Credentials if (Client.Credentials != null) { @@ -825,15 +880,16 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) HttpStatusCode _statusCode = _httpResponse.StatusCode; cancellationToken.ThrowIfCancellationRequested(); string _responseContent = null; - if ((int)_statusCode != 200 && (int)_statusCode != 202) + if ((int)_statusCode != 200) { - var ex = new ManagedHsmErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - ManagedHsmError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { + ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -843,6 +899,10 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); @@ -855,7 +915,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -868,25 +928,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); - } - catch (JsonException ex) - { - _httpRequest.Dispose(); - if (_httpResponse != null) - { - _httpResponse.Dispose(); - } - throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); - } - } - // Deserialize Response - if ((int)_statusCode == 202) - { - _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - try - { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -906,16 +948,16 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } /// - /// Update a managed HSM Pool in the specified subscription. + /// Lists the versions of the specified key in the specified key vault. /// /// - /// Name of the resource group that contains the managed HSM pool. + /// The name of the resource group which contains the specified key vault. /// - /// - /// Name of the managed HSM Pool + /// + /// The name of the vault which contains the key versions to be retrieved. /// - /// - /// Parameters to patch the managed HSM Pool + /// + /// The name of the key versions to be retrieved. /// /// /// Headers that will be added to request. @@ -923,7 +965,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -938,25 +980,42 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string name, ManagedHsm parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListVersionsWithHttpMessagesAsync(string resourceGroupName, string vaultName, string keyName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } if (resourceGroupName == null) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); } - if (name == null) + if (vaultName == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "name"); + throw new ValidationException(ValidationRules.CannotBeNull, "vaultName"); } - if (parameters == null) + if (vaultName != null) { - throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); + if (!System.Text.RegularExpressions.Regex.IsMatch(vaultName, "^[a-zA-Z0-9-]{3,24}$")) + { + throw new ValidationException(ValidationRules.Pattern, "vaultName", "^[a-zA-Z0-9-]{3,24}$"); + } } - if (Client.SubscriptionId == null) + if (keyName == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + throw new ValidationException(ValidationRules.CannotBeNull, "keyName"); + } + if (keyName != null) + { + if (!System.Text.RegularExpressions.Regex.IsMatch(keyName, "^[a-zA-Z0-9-]{1,127}$")) + { + throw new ValidationException(ValidationRules.Pattern, "keyName", "^[a-zA-Z0-9-]{1,127}$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - string apiVersion = "2020-04-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -965,22 +1024,22 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("name", name); - tracingParameters.Add("apiVersion", apiVersion); - tracingParameters.Add("parameters", parameters); + tracingParameters.Add("vaultName", vaultName); + tracingParameters.Add("keyName", keyName); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "BeginUpdate", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "ListVersions", tracingParameters); } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/managedHSMs/{name}").ToString(); - _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); - _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}/keys/{keyName}/versions").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); + _url = _url.Replace("{keyName}", System.Uri.EscapeDataString(keyName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -989,7 +1048,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("PATCH"); + _httpRequest.Method = new HttpMethod("GET"); _httpRequest.RequestUri = new System.Uri(_url); // Set Headers if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) @@ -1020,12 +1079,6 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) // Serialize Request string _requestContent = null; - if(parameters != null) - { - _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, Client.SerializationSettings); - _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); - _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); - } // Set Credentials if (Client.Credentials != null) { @@ -1046,15 +1099,16 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) HttpStatusCode _statusCode = _httpResponse.StatusCode; cancellationToken.ThrowIfCancellationRequested(); string _responseContent = null; - if ((int)_statusCode != 200 && (int)_statusCode != 202) + if ((int)_statusCode != 200) { - var ex = new ManagedHsmErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - ManagedHsmError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { + ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -1064,6 +1118,10 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); @@ -1076,7 +1134,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse(); + var _result = new AzureOperationResponse>(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -1089,7 +1147,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -1101,192 +1159,6 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); } } - // Deserialize Response - if ((int)_statusCode == 202) - { - _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - try - { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); - } - catch (JsonException ex) - { - _httpRequest.Dispose(); - if (_httpResponse != null) - { - _httpResponse.Dispose(); - } - throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); - } - } - if (_shouldTrace) - { - ServiceClientTracing.Exit(_invocationId, _result); - } - return _result; - } - - /// - /// Deletes the specified managed HSM Pool. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool to delete - /// - /// - /// Headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when a required parameter is null - /// - /// - /// Thrown when a required parameter is null - /// - /// - /// A response object containing the response body and response headers. - /// - public async Task BeginDeleteWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - if (resourceGroupName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); - } - if (name == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "name"); - } - if (Client.SubscriptionId == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); - } - string apiVersion = "2020-04-01-preview"; - // Tracing - bool _shouldTrace = ServiceClientTracing.IsEnabled; - string _invocationId = null; - if (_shouldTrace) - { - _invocationId = ServiceClientTracing.NextInvocationId.ToString(); - Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("name", name); - tracingParameters.Add("apiVersion", apiVersion); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters); - } - // Construct URL - var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/managedHSMs/{name}").ToString(); - _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); - _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); - _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); - List _queryParameters = new List(); - if (apiVersion != null) - { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); - } - if (_queryParameters.Count > 0) - { - _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); - } - // Create HTTP transport objects - var _httpRequest = new HttpRequestMessage(); - HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("DELETE"); - _httpRequest.RequestUri = new System.Uri(_url); - // Set Headers - if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) - { - _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); - } - if (Client.AcceptLanguage != null) - { - if (_httpRequest.Headers.Contains("accept-language")) - { - _httpRequest.Headers.Remove("accept-language"); - } - _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); - } - - - if (customHeaders != null) - { - foreach(var _header in customHeaders) - { - if (_httpRequest.Headers.Contains(_header.Key)) - { - _httpRequest.Headers.Remove(_header.Key); - } - _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); - } - } - - // Serialize Request - string _requestContent = null; - // Set Credentials - if (Client.Credentials != null) - { - cancellationToken.ThrowIfCancellationRequested(); - await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - } - // Send Request - if (_shouldTrace) - { - ServiceClientTracing.SendRequest(_invocationId, _httpRequest); - } - cancellationToken.ThrowIfCancellationRequested(); - _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - if (_shouldTrace) - { - ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); - } - HttpStatusCode _statusCode = _httpResponse.StatusCode; - cancellationToken.ThrowIfCancellationRequested(); - string _responseContent = null; - if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 204) - { - var ex = new ManagedHsmErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); - try - { - _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - ManagedHsmError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); - if (_errorBody != null) - { - ex.Body = _errorBody; - } - } - catch (JsonException) - { - // Ignore the exception - } - ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); - ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); - if (_shouldTrace) - { - ServiceClientTracing.Error(_invocationId, ex); - } - _httpRequest.Dispose(); - if (_httpResponse != null) - { - _httpResponse.Dispose(); - } - throw ex; - } - // Create Result - var _result = new AzureOperationResponse(); - _result.Request = _httpRequest; - _result.Response = _httpResponse; - if (_httpResponse.Headers.Contains("x-ms-request-id")) - { - _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); - } if (_shouldTrace) { ServiceClientTracing.Exit(_invocationId, _result); @@ -1295,8 +1167,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription and within the specified resource group. + /// Lists the keys in the specified key vault. /// /// /// The NextLink from the previous successful call to List operation. @@ -1307,7 +1178,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -1322,7 +1193,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListByResourceGroupNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (nextPageLink == null) { @@ -1337,7 +1208,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("nextPageLink", nextPageLink); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroupNext", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters); } // Construct URL string _url = "{nextLink}"; @@ -1403,13 +1274,14 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) string _responseContent = null; if ((int)_statusCode != 200) { - var ex = new ManagedHsmErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - ManagedHsmError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { + ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -1419,6 +1291,10 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); @@ -1431,7 +1307,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse>(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -1444,7 +1320,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -1464,8 +1340,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription. + /// Lists the versions of the specified key in the specified key vault. /// /// /// The NextLink from the previous successful call to List operation. @@ -1476,7 +1351,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -1491,7 +1366,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListBySubscriptionNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListVersionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (nextPageLink == null) { @@ -1506,7 +1381,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("nextPageLink", nextPageLink); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "ListBySubscriptionNext", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "ListVersionsNext", tracingParameters); } // Construct URL string _url = "{nextLink}"; @@ -1572,13 +1447,14 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) string _responseContent = null; if ((int)_statusCode != 200) { - var ex = new ManagedHsmErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - ManagedHsmError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { + ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -1588,6 +1464,10 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); @@ -1600,7 +1480,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse>(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -1613,7 +1493,7 @@ internal ManagedHsmsOperations(KeyVaultManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeysOperationsExtensions.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeysOperationsExtensions.cs new file mode 100644 index 0000000000000..4aca734b7a741 --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/KeysOperationsExtensions.cs @@ -0,0 +1,335 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Threading; + using System.Threading.Tasks; + + /// + /// Extension methods for KeysOperations. + /// + public static partial class KeysOperationsExtensions + { + /// + /// Creates the first version of a new key if it does not exist. If it already + /// exists, then the existing key is returned without any write operations + /// being performed. This API does not create subsequent versions, and does not + /// update existing keys. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the key vault which contains the key to be created. + /// + /// + /// The name of the key to be created. + /// + /// + /// The parameters used to create the specified key. + /// + public static Key CreateIfNotExist(this IKeysOperations operations, string resourceGroupName, string vaultName, string keyName, KeyCreateParameters parameters) + { + return operations.CreateIfNotExistAsync(resourceGroupName, vaultName, keyName, parameters).GetAwaiter().GetResult(); + } + + /// + /// Creates the first version of a new key if it does not exist. If it already + /// exists, then the existing key is returned without any write operations + /// being performed. This API does not create subsequent versions, and does not + /// update existing keys. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the key vault which contains the key to be created. + /// + /// + /// The name of the key to be created. + /// + /// + /// The parameters used to create the specified key. + /// + /// + /// The cancellation token. + /// + public static async Task CreateIfNotExistAsync(this IKeysOperations operations, string resourceGroupName, string vaultName, string keyName, KeyCreateParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.CreateIfNotExistWithHttpMessagesAsync(resourceGroupName, vaultName, keyName, parameters, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Gets the current version of the specified key from the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the key to be retrieved. + /// + /// + /// The name of the key to be retrieved. + /// + public static Key Get(this IKeysOperations operations, string resourceGroupName, string vaultName, string keyName) + { + return operations.GetAsync(resourceGroupName, vaultName, keyName).GetAwaiter().GetResult(); + } + + /// + /// Gets the current version of the specified key from the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the key to be retrieved. + /// + /// + /// The name of the key to be retrieved. + /// + /// + /// The cancellation token. + /// + public static async Task GetAsync(this IKeysOperations operations, string resourceGroupName, string vaultName, string keyName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, vaultName, keyName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Lists the keys in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the keys to be retrieved. + /// + public static IPage List(this IKeysOperations operations, string resourceGroupName, string vaultName) + { + return operations.ListAsync(resourceGroupName, vaultName).GetAwaiter().GetResult(); + } + + /// + /// Lists the keys in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the keys to be retrieved. + /// + /// + /// The cancellation token. + /// + public static async Task> ListAsync(this IKeysOperations operations, string resourceGroupName, string vaultName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, vaultName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Gets the specified version of the specified key in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the key version to be retrieved. + /// + /// + /// The name of the key version to be retrieved. + /// + /// + /// The version of the key to be retrieved. + /// + public static Key GetVersion(this IKeysOperations operations, string resourceGroupName, string vaultName, string keyName, string keyVersion) + { + return operations.GetVersionAsync(resourceGroupName, vaultName, keyName, keyVersion).GetAwaiter().GetResult(); + } + + /// + /// Gets the specified version of the specified key in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the key version to be retrieved. + /// + /// + /// The name of the key version to be retrieved. + /// + /// + /// The version of the key to be retrieved. + /// + /// + /// The cancellation token. + /// + public static async Task GetVersionAsync(this IKeysOperations operations, string resourceGroupName, string vaultName, string keyName, string keyVersion, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetVersionWithHttpMessagesAsync(resourceGroupName, vaultName, keyName, keyVersion, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Lists the versions of the specified key in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the key versions to be retrieved. + /// + /// + /// The name of the key versions to be retrieved. + /// + public static IPage ListVersions(this IKeysOperations operations, string resourceGroupName, string vaultName, string keyName) + { + return operations.ListVersionsAsync(resourceGroupName, vaultName, keyName).GetAwaiter().GetResult(); + } + + /// + /// Lists the versions of the specified key in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group which contains the specified key vault. + /// + /// + /// The name of the vault which contains the key versions to be retrieved. + /// + /// + /// The name of the key versions to be retrieved. + /// + /// + /// The cancellation token. + /// + public static async Task> ListVersionsAsync(this IKeysOperations operations, string resourceGroupName, string vaultName, string keyName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListVersionsWithHttpMessagesAsync(resourceGroupName, vaultName, keyName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Lists the keys in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + public static IPage ListNext(this IKeysOperations operations, string nextPageLink) + { + return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult(); + } + + /// + /// Lists the keys in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The cancellation token. + /// + public static async Task> ListNextAsync(this IKeysOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Lists the versions of the specified key in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + public static IPage ListVersionsNext(this IKeysOperations operations, string nextPageLink) + { + return operations.ListVersionsNextAsync(nextPageLink).GetAwaiter().GetResult(); + } + + /// + /// Lists the versions of the specified key in the specified key vault. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The cancellation token. + /// + public static async Task> ListVersionsNextAsync(this IKeysOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListVersionsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/ManagedHsmsOperationsExtensions.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/ManagedHsmsOperationsExtensions.cs deleted file mode 100644 index b58e3160edf31..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/ManagedHsmsOperationsExtensions.cs +++ /dev/null @@ -1,473 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault -{ - using Microsoft.Rest; - using Microsoft.Rest.Azure; - using Models; - using System.Threading; - using System.Threading.Tasks; - - /// - /// Extension methods for ManagedHsmsOperations. - /// - public static partial class ManagedHsmsOperationsExtensions - { - /// - /// Create or update a managed HSM Pool in the specified subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to create or update the managed HSM Pool - /// - public static ManagedHsm CreateOrUpdate(this IManagedHsmsOperations operations, string resourceGroupName, string name, ManagedHsm parameters) - { - return operations.CreateOrUpdateAsync(resourceGroupName, name, parameters).GetAwaiter().GetResult(); - } - - /// - /// Create or update a managed HSM Pool in the specified subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to create or update the managed HSM Pool - /// - /// - /// The cancellation token. - /// - public static async Task CreateOrUpdateAsync(this IManagedHsmsOperations operations, string resourceGroupName, string name, ManagedHsm parameters, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.CreateOrUpdateWithHttpMessagesAsync(resourceGroupName, name, parameters, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// Update a managed HSM Pool in the specified subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to patch the managed HSM Pool - /// - public static ManagedHsm Update(this IManagedHsmsOperations operations, string resourceGroupName, string name, ManagedHsm parameters) - { - return operations.UpdateAsync(resourceGroupName, name, parameters).GetAwaiter().GetResult(); - } - - /// - /// Update a managed HSM Pool in the specified subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to patch the managed HSM Pool - /// - /// - /// The cancellation token. - /// - public static async Task UpdateAsync(this IManagedHsmsOperations operations, string resourceGroupName, string name, ManagedHsm parameters, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.UpdateWithHttpMessagesAsync(resourceGroupName, name, parameters, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// Deletes the specified managed HSM Pool. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool to delete - /// - public static void Delete(this IManagedHsmsOperations operations, string resourceGroupName, string name) - { - operations.DeleteAsync(resourceGroupName, name).GetAwaiter().GetResult(); - } - - /// - /// Deletes the specified managed HSM Pool. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool to delete - /// - /// - /// The cancellation token. - /// - public static async Task DeleteAsync(this IManagedHsmsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) - { - (await operations.DeleteWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)).Dispose(); - } - - /// - /// Gets the specified managed HSM Pool. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool. - /// - public static ManagedHsm Get(this IManagedHsmsOperations operations, string resourceGroupName, string name) - { - return operations.GetAsync(resourceGroupName, name).GetAwaiter().GetResult(); - } - - /// - /// Gets the specified managed HSM Pool. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool. - /// - /// - /// The cancellation token. - /// - public static async Task GetAsync(this IManagedHsmsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription and within the specified resource group. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Maximum number of results to return. - /// - public static IPage ListByResourceGroup(this IManagedHsmsOperations operations, string resourceGroupName, int? top = default(int?)) - { - return operations.ListByResourceGroupAsync(resourceGroupName, top).GetAwaiter().GetResult(); - } - - /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription and within the specified resource group. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Maximum number of results to return. - /// - /// - /// The cancellation token. - /// - public static async Task> ListByResourceGroupAsync(this IManagedHsmsOperations operations, string resourceGroupName, int? top = default(int?), CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.ListByResourceGroupWithHttpMessagesAsync(resourceGroupName, top, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Maximum number of results to return. - /// - public static IPage ListBySubscription(this IManagedHsmsOperations operations, int? top = default(int?)) - { - return operations.ListBySubscriptionAsync(top).GetAwaiter().GetResult(); - } - - /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Maximum number of results to return. - /// - /// - /// The cancellation token. - /// - public static async Task> ListBySubscriptionAsync(this IManagedHsmsOperations operations, int? top = default(int?), CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.ListBySubscriptionWithHttpMessagesAsync(top, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// Create or update a managed HSM Pool in the specified subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to create or update the managed HSM Pool - /// - public static ManagedHsm BeginCreateOrUpdate(this IManagedHsmsOperations operations, string resourceGroupName, string name, ManagedHsm parameters) - { - return operations.BeginCreateOrUpdateAsync(resourceGroupName, name, parameters).GetAwaiter().GetResult(); - } - - /// - /// Create or update a managed HSM Pool in the specified subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to create or update the managed HSM Pool - /// - /// - /// The cancellation token. - /// - public static async Task BeginCreateOrUpdateAsync(this IManagedHsmsOperations operations, string resourceGroupName, string name, ManagedHsm parameters, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.BeginCreateOrUpdateWithHttpMessagesAsync(resourceGroupName, name, parameters, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// Update a managed HSM Pool in the specified subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to patch the managed HSM Pool - /// - public static ManagedHsm BeginUpdate(this IManagedHsmsOperations operations, string resourceGroupName, string name, ManagedHsm parameters) - { - return operations.BeginUpdateAsync(resourceGroupName, name, parameters).GetAwaiter().GetResult(); - } - - /// - /// Update a managed HSM Pool in the specified subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// Name of the managed HSM Pool - /// - /// - /// Parameters to patch the managed HSM Pool - /// - /// - /// The cancellation token. - /// - public static async Task BeginUpdateAsync(this IManagedHsmsOperations operations, string resourceGroupName, string name, ManagedHsm parameters, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(resourceGroupName, name, parameters, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// Deletes the specified managed HSM Pool. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool to delete - /// - public static void BeginDelete(this IManagedHsmsOperations operations, string resourceGroupName, string name) - { - operations.BeginDeleteAsync(resourceGroupName, name).GetAwaiter().GetResult(); - } - - /// - /// Deletes the specified managed HSM Pool. - /// - /// - /// The operations group for this extension method. - /// - /// - /// Name of the resource group that contains the managed HSM pool. - /// - /// - /// The name of the managed HSM Pool to delete - /// - /// - /// The cancellation token. - /// - public static async Task BeginDeleteAsync(this IManagedHsmsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) - { - (await operations.BeginDeleteWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)).Dispose(); - } - - /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription and within the specified resource group. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - public static IPage ListByResourceGroupNext(this IManagedHsmsOperations operations, string nextPageLink) - { - return operations.ListByResourceGroupNextAsync(nextPageLink).GetAwaiter().GetResult(); - } - - /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription and within the specified resource group. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - /// - /// The cancellation token. - /// - public static async Task> ListByResourceGroupNextAsync(this IManagedHsmsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.ListByResourceGroupNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - public static IPage ListBySubscriptionNext(this IManagedHsmsOperations operations, string nextPageLink) - { - return operations.ListBySubscriptionNextAsync(nextPageLink).GetAwaiter().GetResult(); - } - - /// - /// The List operation gets information about the managed HSM Pools associated - /// with the subscription. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - /// - /// The cancellation token. - /// - public static async Task> ListBySubscriptionNextAsync(this IManagedHsmsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.ListBySubscriptionNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/Attributes.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/Attributes.cs new file mode 100644 index 0000000000000..7c6c6c3edc749 --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/Attributes.cs @@ -0,0 +1,107 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The object attributes managed by the Azure Key Vault service. + /// + public partial class Attributes + { + /// + /// Initializes a new instance of the Attributes class. + /// + public Attributes() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the Attributes class. + /// + /// Determines whether or not the object is + /// enabled. + /// Not before date in seconds since + /// 1970-01-01T00:00:00Z. + /// Expiry date in seconds since + /// 1970-01-01T00:00:00Z. + /// Creation time in seconds since + /// 1970-01-01T00:00:00Z. + /// Last updated time in seconds since + /// 1970-01-01T00:00:00Z. + /// The deletion recovery level currently + /// in effect for the object. If it contains 'Purgeable', then the + /// object can be permanently deleted by a privileged user; otherwise, + /// only the system can purge the object at the end of the retention + /// interval. Possible values include: 'Purgeable', + /// 'Recoverable+Purgeable', 'Recoverable', + /// 'Recoverable+ProtectedSubscription' + public Attributes(bool? enabled = default(bool?), long? notBefore = default(long?), long? expires = default(long?), long? created = default(long?), long? updated = default(long?), string recoveryLevel = default(string)) + { + Enabled = enabled; + NotBefore = notBefore; + Expires = expires; + Created = created; + Updated = updated; + RecoveryLevel = recoveryLevel; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets determines whether or not the object is enabled. + /// + [JsonProperty(PropertyName = "enabled")] + public bool? Enabled { get; set; } + + /// + /// Gets or sets not before date in seconds since 1970-01-01T00:00:00Z. + /// + [JsonProperty(PropertyName = "nbf")] + public long? NotBefore { get; set; } + + /// + /// Gets or sets expiry date in seconds since 1970-01-01T00:00:00Z. + /// + [JsonProperty(PropertyName = "exp")] + public long? Expires { get; set; } + + /// + /// Gets creation time in seconds since 1970-01-01T00:00:00Z. + /// + [JsonProperty(PropertyName = "created")] + public long? Created { get; private set; } + + /// + /// Gets last updated time in seconds since 1970-01-01T00:00:00Z. + /// + [JsonProperty(PropertyName = "updated")] + public long? Updated { get; private set; } + + /// + /// Gets the deletion recovery level currently in effect for the + /// object. If it contains 'Purgeable', then the object can be + /// permanently deleted by a privileged user; otherwise, only the + /// system can purge the object at the end of the retention interval. + /// Possible values include: 'Purgeable', 'Recoverable+Purgeable', + /// 'Recoverable', 'Recoverable+ProtectedSubscription' + /// + [JsonProperty(PropertyName = "recoveryLevel")] + public string RecoveryLevel { get; private set; } + + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/CertificatePermissions.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/CertificatePermissions.cs index e67ca8c27a2b9..da3ebb7b9ff8b 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/CertificatePermissions.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/CertificatePermissions.cs @@ -16,6 +16,7 @@ namespace Microsoft.Azure.Management.KeyVault.Models /// public static class CertificatePermissions { + public const string All = "all"; public const string Get = "get"; public const string List = "list"; public const string Delete = "delete"; diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/DeletionRecoveryLevel.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/DeletionRecoveryLevel.cs new file mode 100644 index 0000000000000..08f8a1c76fdc4 --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/DeletionRecoveryLevel.cs @@ -0,0 +1,24 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault.Models +{ + + /// + /// Defines values for DeletionRecoveryLevel. + /// + public static class DeletionRecoveryLevel + { + public const string Purgeable = "Purgeable"; + public const string RecoverablePurgeable = "Recoverable+Purgeable"; + public const string Recoverable = "Recoverable"; + public const string RecoverableProtectedSubscription = "Recoverable+ProtectedSubscription"; + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/Error.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/Error.cs deleted file mode 100644 index 77ae9e8bbe92b..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/Error.cs +++ /dev/null @@ -1,68 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault.Models -{ - using Newtonsoft.Json; - using System.Linq; - - /// - /// The server error. - /// - public partial class Error - { - /// - /// Initializes a new instance of the Error class. - /// - public Error() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the Error class. - /// - /// The error code. - /// The error message. - /// The inner error, contains a more specific - /// error code. - public Error(string code = default(string), string message = default(string), Error innerError = default(Error)) - { - Code = code; - Message = message; - InnerError = innerError; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets the error code. - /// - [JsonProperty(PropertyName = "code")] - public string Code { get; private set; } - - /// - /// Gets the error message. - /// - [JsonProperty(PropertyName = "message")] - public string Message { get; private set; } - - /// - /// Gets the inner error, contains a more specific error code. - /// - [JsonProperty(PropertyName = "innererror")] - public Error InnerError { get; private set; } - - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/JsonWebKeyCurveName.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/JsonWebKeyCurveName.cs new file mode 100644 index 0000000000000..9a09f4e2ac66c --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/JsonWebKeyCurveName.cs @@ -0,0 +1,24 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault.Models +{ + + /// + /// Defines values for JsonWebKeyCurveName. + /// + public static class JsonWebKeyCurveName + { + public const string P256 = "P-256"; + public const string P384 = "P-384"; + public const string P521 = "P-521"; + public const string P256K = "P-256K"; + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/JsonWebKeyOperation.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/JsonWebKeyOperation.cs new file mode 100644 index 0000000000000..507bbc3ba36f5 --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/JsonWebKeyOperation.cs @@ -0,0 +1,27 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault.Models +{ + + /// + /// Defines values for JsonWebKeyOperation. + /// + public static class JsonWebKeyOperation + { + public const string Encrypt = "encrypt"; + public const string Decrypt = "decrypt"; + public const string Sign = "sign"; + public const string Verify = "verify"; + public const string WrapKey = "wrapKey"; + public const string UnwrapKey = "unwrapKey"; + public const string Import = "import"; + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/JsonWebKeyType.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/JsonWebKeyType.cs new file mode 100644 index 0000000000000..ecb780e8117da --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/JsonWebKeyType.cs @@ -0,0 +1,24 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault.Models +{ + + /// + /// Defines values for JsonWebKeyType. + /// + public static class JsonWebKeyType + { + public const string EC = "EC"; + public const string ECHSM = "EC-HSM"; + public const string RSA = "RSA"; + public const string RSAHSM = "RSA-HSM"; + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/Key.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/Key.cs new file mode 100644 index 0000000000000..9953908e35e31 --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/Key.cs @@ -0,0 +1,138 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The key resource. + /// + [Rest.Serialization.JsonTransformation] + public partial class Key : Resource + { + /// + /// Initializes a new instance of the Key class. + /// + public Key() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the Key class. + /// + /// Fully qualified identifier of the key vault + /// resource. + /// Name of the key vault resource. + /// Resource type of the key vault resource. + /// Azure location of the key vault + /// resource. + /// Tags assigned to the key vault resource. + /// The attributes of the key. + /// The type of the key. For valid values, see + /// JsonWebKeyType. Possible values include: 'EC', 'EC-HSM', 'RSA', + /// 'RSA-HSM' + /// The key size in bits. For example: 2048, + /// 3072, or 4096 for RSA. + /// The elliptic curve name. For valid values, + /// see JsonWebKeyCurveName. Possible values include: 'P-256', 'P-384', + /// 'P-521', 'P-256K' + /// The URI to retrieve the current version of the + /// key. + /// The URI to retrieve the specific + /// version of the key. + public Key(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), KeyAttributes attributes = default(KeyAttributes), string kty = default(string), IList keyOps = default(IList), int? keySize = default(int?), string curveName = default(string), string keyUri = default(string), string keyUriWithVersion = default(string)) + : base(id, name, type, location, tags) + { + Attributes = attributes; + Kty = kty; + KeyOps = keyOps; + KeySize = keySize; + CurveName = curveName; + KeyUri = keyUri; + KeyUriWithVersion = keyUriWithVersion; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the attributes of the key. + /// + [JsonProperty(PropertyName = "properties.attributes")] + public KeyAttributes Attributes { get; set; } + + /// + /// Gets or sets the type of the key. For valid values, see + /// JsonWebKeyType. Possible values include: 'EC', 'EC-HSM', 'RSA', + /// 'RSA-HSM' + /// + [JsonProperty(PropertyName = "properties.kty")] + public string Kty { get; set; } + + /// + /// + [JsonProperty(PropertyName = "properties.keyOps")] + public IList KeyOps { get; set; } + + /// + /// Gets or sets the key size in bits. For example: 2048, 3072, or 4096 + /// for RSA. + /// + [JsonProperty(PropertyName = "properties.keySize")] + public int? KeySize { get; set; } + + /// + /// Gets or sets the elliptic curve name. For valid values, see + /// JsonWebKeyCurveName. Possible values include: 'P-256', 'P-384', + /// 'P-521', 'P-256K' + /// + [JsonProperty(PropertyName = "properties.curveName")] + public string CurveName { get; set; } + + /// + /// Gets the URI to retrieve the current version of the key. + /// + [JsonProperty(PropertyName = "properties.keyUri")] + public string KeyUri { get; private set; } + + /// + /// Gets the URI to retrieve the specific version of the key. + /// + [JsonProperty(PropertyName = "properties.keyUriWithVersion")] + public string KeyUriWithVersion { get; private set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Kty != null) + { + if (Kty.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "Kty", 1); + } + } + } + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyAttributes.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyAttributes.cs new file mode 100644 index 0000000000000..ef10dfaa85fff --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyAttributes.cs @@ -0,0 +1,60 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault.Models +{ + using System.Linq; + + /// + /// The attributes of the key. + /// + public partial class KeyAttributes : Attributes + { + /// + /// Initializes a new instance of the KeyAttributes class. + /// + public KeyAttributes() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the KeyAttributes class. + /// + /// Determines whether or not the object is + /// enabled. + /// Not before date in seconds since + /// 1970-01-01T00:00:00Z. + /// Expiry date in seconds since + /// 1970-01-01T00:00:00Z. + /// Creation time in seconds since + /// 1970-01-01T00:00:00Z. + /// Last updated time in seconds since + /// 1970-01-01T00:00:00Z. + /// The deletion recovery level currently + /// in effect for the object. If it contains 'Purgeable', then the + /// object can be permanently deleted by a privileged user; otherwise, + /// only the system can purge the object at the end of the retention + /// interval. Possible values include: 'Purgeable', + /// 'Recoverable+Purgeable', 'Recoverable', + /// 'Recoverable+ProtectedSubscription' + public KeyAttributes(bool? enabled = default(bool?), long? notBefore = default(long?), long? expires = default(long?), long? created = default(long?), long? updated = default(long?), string recoveryLevel = default(string)) + : base(enabled, notBefore, expires, created, updated, recoveryLevel) + { + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyCreateParameters.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyCreateParameters.cs new file mode 100644 index 0000000000000..22c51c5ffff92 --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyCreateParameters.cs @@ -0,0 +1,82 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The parameters used to create a key. + /// + public partial class KeyCreateParameters : IResource + { + /// + /// Initializes a new instance of the KeyCreateParameters class. + /// + public KeyCreateParameters() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the KeyCreateParameters class. + /// + /// The properties of the key to be + /// created. + /// The tags that will be assigned to the + /// key. + public KeyCreateParameters(KeyProperties properties, IDictionary tags = default(IDictionary)) + { + Tags = tags; + Properties = properties; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the tags that will be assigned to the key. + /// + [JsonProperty(PropertyName = "tags")] + public IDictionary Tags { get; set; } + + /// + /// Gets or sets the properties of the key to be created. + /// + [JsonProperty(PropertyName = "properties")] + public KeyProperties Properties { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Properties == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Properties"); + } + if (Properties != null) + { + Properties.Validate(); + } + } + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyPermissions.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyPermissions.cs index f069fc994269b..52b1c230ef81a 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyPermissions.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyPermissions.cs @@ -16,6 +16,7 @@ namespace Microsoft.Azure.Management.KeyVault.Models /// public static class KeyPermissions { + public const string All = "all"; public const string Encrypt = "encrypt"; public const string Decrypt = "decrypt"; public const string WrapKey = "wrapKey"; diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyProperties.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyProperties.cs new file mode 100644 index 0000000000000..e0fac1a3a464e --- /dev/null +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/KeyProperties.cs @@ -0,0 +1,128 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.KeyVault.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The properties of the key. + /// + public partial class KeyProperties + { + /// + /// Initializes a new instance of the KeyProperties class. + /// + public KeyProperties() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the KeyProperties class. + /// + /// The attributes of the key. + /// The type of the key. For valid values, see + /// JsonWebKeyType. Possible values include: 'EC', 'EC-HSM', 'RSA', + /// 'RSA-HSM' + /// The key size in bits. For example: 2048, + /// 3072, or 4096 for RSA. + /// The elliptic curve name. For valid values, + /// see JsonWebKeyCurveName. Possible values include: 'P-256', 'P-384', + /// 'P-521', 'P-256K' + /// The URI to retrieve the current version of the + /// key. + /// The URI to retrieve the specific + /// version of the key. + public KeyProperties(KeyAttributes attributes = default(KeyAttributes), string kty = default(string), IList keyOps = default(IList), int? keySize = default(int?), string curveName = default(string), string keyUri = default(string), string keyUriWithVersion = default(string)) + { + Attributes = attributes; + Kty = kty; + KeyOps = keyOps; + KeySize = keySize; + CurveName = curveName; + KeyUri = keyUri; + KeyUriWithVersion = keyUriWithVersion; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the attributes of the key. + /// + [JsonProperty(PropertyName = "attributes")] + public KeyAttributes Attributes { get; set; } + + /// + /// Gets or sets the type of the key. For valid values, see + /// JsonWebKeyType. Possible values include: 'EC', 'EC-HSM', 'RSA', + /// 'RSA-HSM' + /// + [JsonProperty(PropertyName = "kty")] + public string Kty { get; set; } + + /// + /// + [JsonProperty(PropertyName = "keyOps")] + public IList KeyOps { get; set; } + + /// + /// Gets or sets the key size in bits. For example: 2048, 3072, or 4096 + /// for RSA. + /// + [JsonProperty(PropertyName = "keySize")] + public int? KeySize { get; set; } + + /// + /// Gets or sets the elliptic curve name. For valid values, see + /// JsonWebKeyCurveName. Possible values include: 'P-256', 'P-384', + /// 'P-521', 'P-256K' + /// + [JsonProperty(PropertyName = "curveName")] + public string CurveName { get; set; } + + /// + /// Gets the URI to retrieve the current version of the key. + /// + [JsonProperty(PropertyName = "keyUri")] + public string KeyUri { get; private set; } + + /// + /// Gets the URI to retrieve the specific version of the key. + /// + [JsonProperty(PropertyName = "keyUriWithVersion")] + public string KeyUriWithVersion { get; private set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Kty != null) + { + if (Kty.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "Kty", 1); + } + } + } + } +} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsm.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsm.cs deleted file mode 100644 index 2c8d405f635e8..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsm.cs +++ /dev/null @@ -1,73 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault.Models -{ - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - - /// - /// Resource information with extended details. - /// - public partial class ManagedHsm : ManagedHsmResource - { - /// - /// Initializes a new instance of the ManagedHsm class. - /// - public ManagedHsm() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the ManagedHsm class. - /// - /// The Azure Resource Manager resource ID for the - /// managed HSM Pool. - /// The name of the managed HSM Pool. - /// The resource type of the managed HSM - /// Pool. - /// The supported Azure location where the - /// managed HSM Pool should be created. - /// SKU details - /// Resource tags - /// Properties of the managed HSM - public ManagedHsm(string id = default(string), string name = default(string), string type = default(string), string location = default(string), ManagedHsmSku sku = default(ManagedHsmSku), IDictionary tags = default(IDictionary), ManagedHsmProperties properties = default(ManagedHsmProperties)) - : base(id, name, type, location, sku, tags) - { - Properties = properties; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets properties of the managed HSM - /// - [JsonProperty(PropertyName = "properties")] - public ManagedHsmProperties Properties { get; set; } - - /// - /// Validate the object. - /// - /// - /// Thrown if validation fails - /// - public override void Validate() - { - base.Validate(); - } - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmError.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmError.cs deleted file mode 100644 index bcaf15f1b9cb2..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmError.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault.Models -{ - using Newtonsoft.Json; - using System.Linq; - - /// - /// The error exception. - /// - public partial class ManagedHsmError - { - /// - /// Initializes a new instance of the ManagedHsmError class. - /// - public ManagedHsmError() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the ManagedHsmError class. - /// - /// The server error. - public ManagedHsmError(Error error = default(Error)) - { - Error = error; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets the server error. - /// - [JsonProperty(PropertyName = "error")] - public Error Error { get; private set; } - - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmErrorException.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmErrorException.cs deleted file mode 100644 index 69094783a2cbe..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmErrorException.cs +++ /dev/null @@ -1,62 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault.Models -{ - using Microsoft.Rest; - - /// - /// Exception thrown for an invalid response with ManagedHsmError - /// information. - /// - public partial class ManagedHsmErrorException : RestException - { - /// - /// Gets information about the associated HTTP request. - /// - public HttpRequestMessageWrapper Request { get; set; } - - /// - /// Gets information about the associated HTTP response. - /// - public HttpResponseMessageWrapper Response { get; set; } - - /// - /// Gets or sets the body object. - /// - public ManagedHsmError Body { get; set; } - - /// - /// Initializes a new instance of the ManagedHsmErrorException class. - /// - public ManagedHsmErrorException() - { - } - - /// - /// Initializes a new instance of the ManagedHsmErrorException class. - /// - /// The exception message. - public ManagedHsmErrorException(string message) - : this(message, null) - { - } - - /// - /// Initializes a new instance of the ManagedHsmErrorException class. - /// - /// The exception message. - /// Inner exception. - public ManagedHsmErrorException(string message, System.Exception innerException) - : base(message, innerException) - { - } - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmProperties.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmProperties.cs deleted file mode 100644 index 7597b3595ef14..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmProperties.cs +++ /dev/null @@ -1,155 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault.Models -{ - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - - /// - /// Properties of the managed HSM Pool - /// - public partial class ManagedHsmProperties - { - /// - /// Initializes a new instance of the ManagedHsmProperties class. - /// - public ManagedHsmProperties() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the ManagedHsmProperties class. - /// - /// The Azure Active Directory tenant ID that - /// should be used for authenticating requests to the managed HSM - /// pool. - /// Array of initial administrators - /// object ids for this managed hsm pool. - /// The URI of the managed hsm pool for performing - /// operations on keys. - /// Property to specify whether the - /// 'soft delete' functionality is enabled for this managed HSM pool. - /// If it's not set to any value(true or false) when creating new - /// managed HSM pool, it will be set to true by default. Once set to - /// true, it cannot be reverted to false. - /// softDelete data retention - /// days. It accepts >=7 and <=90. - /// Property specifying whether - /// protection against purge is enabled for this managed HSM pool. - /// Setting this property to true activates protection against purge - /// for this managed HSM pool and its content - only the Managed HSM - /// service may initiate a hard, irrecoverable deletion. The setting is - /// effective only if soft delete is also enabled. Enabling this - /// functionality is irreversible. - /// The create mode to indicate whether the - /// resource is being created or is being recovered from a deleted - /// resource. Possible values include: 'recover', 'default' - /// Resource Status Message. - /// Provisioning state. Possible values - /// include: 'Succeeded', 'Provisioning', 'Failed', 'Updating', - /// 'Deleting', 'Activated', 'SecurityDomainRestore', - /// 'Restoring' - public ManagedHsmProperties(System.Guid? tenantId = default(System.Guid?), IList initialAdminObjectIds = default(IList), string hsmUri = default(string), bool? enableSoftDelete = default(bool?), int? softDeleteRetentionInDays = default(int?), bool? enablePurgeProtection = default(bool?), CreateMode? createMode = default(CreateMode?), string statusMessage = default(string), string provisioningState = default(string)) - { - TenantId = tenantId; - InitialAdminObjectIds = initialAdminObjectIds; - HsmUri = hsmUri; - EnableSoftDelete = enableSoftDelete; - SoftDeleteRetentionInDays = softDeleteRetentionInDays; - EnablePurgeProtection = enablePurgeProtection; - CreateMode = createMode; - StatusMessage = statusMessage; - ProvisioningState = provisioningState; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets the Azure Active Directory tenant ID that should be - /// used for authenticating requests to the managed HSM pool. - /// - [JsonProperty(PropertyName = "tenantId")] - public System.Guid? TenantId { get; set; } - - /// - /// Gets or sets array of initial administrators object ids for this - /// managed hsm pool. - /// - [JsonProperty(PropertyName = "initialAdminObjectIds")] - public IList InitialAdminObjectIds { get; set; } - - /// - /// Gets or sets the URI of the managed hsm pool for performing - /// operations on keys. - /// - [JsonProperty(PropertyName = "hsmUri")] - public string HsmUri { get; set; } - - /// - /// Gets or sets property to specify whether the 'soft delete' - /// functionality is enabled for this managed HSM pool. If it's not set - /// to any value(true or false) when creating new managed HSM pool, it - /// will be set to true by default. Once set to true, it cannot be - /// reverted to false. - /// - [JsonProperty(PropertyName = "enableSoftDelete")] - public bool? EnableSoftDelete { get; set; } - - /// - /// Gets or sets softDelete data retention days. It accepts &gt;=7 - /// and &lt;=90. - /// - [JsonProperty(PropertyName = "softDeleteRetentionInDays")] - public int? SoftDeleteRetentionInDays { get; set; } - - /// - /// Gets or sets property specifying whether protection against purge - /// is enabled for this managed HSM pool. Setting this property to true - /// activates protection against purge for this managed HSM pool and - /// its content - only the Managed HSM service may initiate a hard, - /// irrecoverable deletion. The setting is effective only if soft - /// delete is also enabled. Enabling this functionality is - /// irreversible. - /// - [JsonProperty(PropertyName = "enablePurgeProtection")] - public bool? EnablePurgeProtection { get; set; } - - /// - /// Gets or sets the create mode to indicate whether the resource is - /// being created or is being recovered from a deleted resource. - /// Possible values include: 'recover', 'default' - /// - [JsonProperty(PropertyName = "createMode")] - public CreateMode? CreateMode { get; set; } - - /// - /// Gets resource Status Message. - /// - [JsonProperty(PropertyName = "statusMessage")] - public string StatusMessage { get; private set; } - - /// - /// Gets provisioning state. Possible values include: 'Succeeded', - /// 'Provisioning', 'Failed', 'Updating', 'Deleting', 'Activated', - /// 'SecurityDomainRestore', 'Restoring' - /// - [JsonProperty(PropertyName = "provisioningState")] - public string ProvisioningState { get; private set; } - - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmResource.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmResource.cs deleted file mode 100644 index 5d65eecafb53b..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmResource.cs +++ /dev/null @@ -1,113 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault.Models -{ - using Microsoft.Rest; - using Microsoft.Rest.Azure; - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - - /// - /// Managed HSM resource - /// - public partial class ManagedHsmResource : IResource - { - /// - /// Initializes a new instance of the ManagedHsmResource class. - /// - public ManagedHsmResource() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the ManagedHsmResource class. - /// - /// The Azure Resource Manager resource ID for the - /// managed HSM Pool. - /// The name of the managed HSM Pool. - /// The resource type of the managed HSM - /// Pool. - /// The supported Azure location where the - /// managed HSM Pool should be created. - /// SKU details - /// Resource tags - public ManagedHsmResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), ManagedHsmSku sku = default(ManagedHsmSku), IDictionary tags = default(IDictionary)) - { - Id = id; - Name = name; - Type = type; - Location = location; - Sku = sku; - Tags = tags; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets the Azure Resource Manager resource ID for the managed HSM - /// Pool. - /// - [JsonProperty(PropertyName = "id")] - public string Id { get; private set; } - - /// - /// Gets the name of the managed HSM Pool. - /// - [JsonProperty(PropertyName = "name")] - public string Name { get; private set; } - - /// - /// Gets the resource type of the managed HSM Pool. - /// - [JsonProperty(PropertyName = "type")] - public string Type { get; private set; } - - /// - /// Gets or sets the supported Azure location where the managed HSM - /// Pool should be created. - /// - [JsonProperty(PropertyName = "location")] - public string Location { get; set; } - - /// - /// Gets or sets SKU details - /// - [JsonProperty(PropertyName = "sku")] - public ManagedHsmSku Sku { get; set; } - - /// - /// Gets or sets resource tags - /// - [JsonProperty(PropertyName = "tags")] - public IDictionary Tags { get; set; } - - /// - /// Validate the object. - /// - /// - /// Thrown if validation fails - /// - public virtual void Validate() - { - if (Sku != null) - { - Sku.Validate(); - } - } - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmSku.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmSku.cs deleted file mode 100644 index ee026d520adbb..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmSku.cs +++ /dev/null @@ -1,75 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault.Models -{ - using Newtonsoft.Json; - using System.Linq; - - /// - /// SKU details - /// - public partial class ManagedHsmSku - { - /// - /// Initializes a new instance of the ManagedHsmSku class. - /// - public ManagedHsmSku() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the ManagedHsmSku class. - /// - /// SKU of the managed HSM Pool. Possible values - /// include: 'Standard_B1', 'Custom_B32' - public ManagedHsmSku(ManagedHsmSkuName name) - { - Name = name; - CustomInit(); - } - /// - /// Static constructor for ManagedHsmSku class. - /// - static ManagedHsmSku() - { - Family = "B"; - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets SKU of the managed HSM Pool. Possible values include: - /// 'Standard_B1', 'Custom_B32' - /// - [JsonProperty(PropertyName = "name")] - public ManagedHsmSkuName Name { get; set; } - - /// - /// SKU Family of the managed HSM Pool - /// - [JsonProperty(PropertyName = "family")] - public static string Family { get; private set; } - - /// - /// Validate the object. - /// - /// - /// Thrown if validation fails - /// - public virtual void Validate() - { - } - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmSkuName.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmSkuName.cs deleted file mode 100644 index a7443c2cebf84..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ManagedHsmSkuName.cs +++ /dev/null @@ -1,60 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault.Models -{ - using Newtonsoft.Json; - using Newtonsoft.Json.Converters; - using System.Runtime; - using System.Runtime.Serialization; - - /// - /// Defines values for ManagedHsmSkuName. - /// - [JsonConverter(typeof(StringEnumConverter))] - public enum ManagedHsmSkuName - { - [EnumMember(Value = "Standard_B1")] - StandardB1, - [EnumMember(Value = "Custom_B32")] - CustomB32 - } - internal static class ManagedHsmSkuNameEnumExtension - { - internal static string ToSerializedValue(this ManagedHsmSkuName? value) - { - return value == null ? null : ((ManagedHsmSkuName)value).ToSerializedValue(); - } - - internal static string ToSerializedValue(this ManagedHsmSkuName value) - { - switch( value ) - { - case ManagedHsmSkuName.StandardB1: - return "Standard_B1"; - case ManagedHsmSkuName.CustomB32: - return "Custom_B32"; - } - return null; - } - - internal static ManagedHsmSkuName? ParseManagedHsmSkuName(this string value) - { - switch( value ) - { - case "Standard_B1": - return ManagedHsmSkuName.StandardB1; - case "Custom_B32": - return ManagedHsmSkuName.CustomB32; - } - return null; - } - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ProvisioningState.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ProvisioningState.cs deleted file mode 100644 index 9bbe9c85523d1..0000000000000 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/ProvisioningState.cs +++ /dev/null @@ -1,53 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.KeyVault.Models -{ - - /// - /// Defines values for ProvisioningState. - /// - public static class ProvisioningState - { - /// - /// The managed HSM Pool has been full provisioned. - /// - public const string Succeeded = "Succeeded"; - /// - /// The managed HSM Pool is currently being provisioned. - /// - public const string Provisioning = "Provisioning"; - /// - /// Provisioning of the managed HSM Pool has failed. - /// - public const string Failed = "Failed"; - /// - /// The managed HSM Pool is currently being updated. - /// - public const string Updating = "Updating"; - /// - /// The managed HSM Pool is currently being deleted. - /// - public const string Deleting = "Deleting"; - /// - /// The managed HSM pool is ready for normal use. - /// - public const string Activated = "Activated"; - /// - /// The managed HSM pool is waiting for a security domain restore - /// action. - /// - public const string SecurityDomainRestore = "SecurityDomainRestore"; - /// - /// The managed HSM pool is being restored from full HSM backup. - /// - public const string Restoring = "Restoring"; - } -} diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/SecretPermissions.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/SecretPermissions.cs index efe8c1730fecb..ed8a95736ee83 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/SecretPermissions.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/SecretPermissions.cs @@ -16,6 +16,7 @@ namespace Microsoft.Azure.Management.KeyVault.Models /// public static class SecretPermissions { + public const string All = "all"; public const string Get = "get"; public const string List = "list"; public const string Set = "set"; diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/StoragePermissions.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/StoragePermissions.cs index dfa64ca47cf79..2604b8dfb8460 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/StoragePermissions.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Models/StoragePermissions.cs @@ -16,6 +16,7 @@ namespace Microsoft.Azure.Management.KeyVault.Models /// public static class StoragePermissions { + public const string All = "all"; public const string Get = "get"; public const string List = "list"; public const string Delete = "delete"; diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Operations.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Operations.cs index e6a9bb02727cf..c7f6e2a12097f 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Operations.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/Operations.cs @@ -65,12 +65,21 @@ internal Operations(KeyVaultManagementClient client) /// /// Thrown when unable to deserialize the response /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// /// /// A response object containing the response body and response headers. /// public async Task>> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - string apiVersion = "2019-09-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -78,7 +87,6 @@ internal Operations(KeyVaultManagementClient client) { _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -86,9 +94,9 @@ internal Operations(KeyVaultManagementClient client) var _baseUrl = Client.BaseUri.AbsoluteUri; var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.KeyVault/operations").ToString(); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/PrivateEndpointConnectionsOperations.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/PrivateEndpointConnectionsOperations.cs index 970a8e9528b01..e064090a5b662 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/PrivateEndpointConnectionsOperations.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/PrivateEndpointConnectionsOperations.cs @@ -109,7 +109,10 @@ internal PrivateEndpointConnectionsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "privateEndpointConnectionName"); } - string apiVersion = "2019-09-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -120,7 +123,6 @@ internal PrivateEndpointConnectionsOperations(KeyVaultManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vaultName", vaultName); tracingParameters.Add("privateEndpointConnectionName", privateEndpointConnectionName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -132,9 +134,9 @@ internal PrivateEndpointConnectionsOperations(KeyVaultManagementClient client) _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); _url = _url.Replace("{privateEndpointConnectionName}", System.Uri.EscapeDataString(privateEndpointConnectionName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -323,11 +325,14 @@ internal PrivateEndpointConnectionsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "privateEndpointConnectionName"); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (properties == null) { throw new ValidationException(ValidationRules.CannotBeNull, "properties"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -338,7 +343,6 @@ internal PrivateEndpointConnectionsOperations(KeyVaultManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vaultName", vaultName); tracingParameters.Add("privateEndpointConnectionName", privateEndpointConnectionName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("properties", properties); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Put", tracingParameters); @@ -351,9 +355,9 @@ internal PrivateEndpointConnectionsOperations(KeyVaultManagementClient client) _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); _url = _url.Replace("{privateEndpointConnectionName}", System.Uri.EscapeDataString(privateEndpointConnectionName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -584,7 +588,10 @@ internal PrivateEndpointConnectionsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "privateEndpointConnectionName"); } - string apiVersion = "2019-09-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -595,7 +602,6 @@ internal PrivateEndpointConnectionsOperations(KeyVaultManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vaultName", vaultName); tracingParameters.Add("privateEndpointConnectionName", privateEndpointConnectionName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters); } @@ -607,9 +613,9 @@ internal PrivateEndpointConnectionsOperations(KeyVaultManagementClient client) _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); _url = _url.Replace("{privateEndpointConnectionName}", System.Uri.EscapeDataString(privateEndpointConnectionName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/PrivateLinkResourcesOperations.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/PrivateLinkResourcesOperations.cs index fea7442aebbf9..b1bde0a13752d 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/PrivateLinkResourcesOperations.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/PrivateLinkResourcesOperations.cs @@ -101,7 +101,10 @@ internal PrivateLinkResourcesOperations(KeyVaultManagementClient client) throw new ValidationException(ValidationRules.Pattern, "vaultName", "^[a-zA-Z0-9-]{3,24}$"); } } - string apiVersion = "2019-09-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -111,7 +114,6 @@ internal PrivateLinkResourcesOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vaultName", vaultName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "ListByVault", tracingParameters); } @@ -122,9 +124,9 @@ internal PrivateLinkResourcesOperations(KeyVaultManagementClient client) _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/SdkInfo_KeyVaultManagementClient.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/SdkInfo_KeyVaultManagementClient.cs index a7a5f8d6aef5e..bfac409694b96 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/SdkInfo_KeyVaultManagementClient.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/SdkInfo_KeyVaultManagementClient.cs @@ -19,7 +19,7 @@ public static IEnumerable> ApiInfo_KeyVaultManagem { return new Tuple[] { - new Tuple("KeyVault", "ManagedHsms", "2020-04-01-preview"), + new Tuple("KeyVault", "Keys", "2019-09-01"), new Tuple("KeyVault", "Operations", "2019-09-01"), new Tuple("KeyVault", "PrivateEndpointConnections", "2019-09-01"), new Tuple("KeyVault", "PrivateLinkResources", "2019-09-01"), @@ -28,16 +28,5 @@ public static IEnumerable> ApiInfo_KeyVaultManagem }.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/keyvault/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-preview-2020-04 --csharp.output-folder=C:\\Users\\yeliu\\code\\azure-sdk-for-net\\sdk\\keyvault\\Microsoft.Azure.Management.KeyVault\\src\\Generated"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "2a2233b0baf0246cd881711511802584efb92bd4"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/VaultsOperations.cs b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/VaultsOperations.cs index bdbf8d3071695..175587fccdb5e 100644 --- a/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/VaultsOperations.cs +++ b/sdk/keyvault/Microsoft.Azure.Management.KeyVault/src/Generated/VaultsOperations.cs @@ -125,6 +125,10 @@ internal VaultsOperations(KeyVaultManagementClient client) throw new ValidationException(ValidationRules.Pattern, "vaultName", "^[a-zA-Z0-9-]{3,24}$"); } } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (parameters == null) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); @@ -133,7 +137,6 @@ internal VaultsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -143,7 +146,6 @@ internal VaultsOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vaultName", vaultName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters); @@ -155,9 +157,9 @@ internal VaultsOperations(KeyVaultManagementClient client) _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -345,11 +347,14 @@ internal VaultsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "vaultName"); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -359,7 +364,6 @@ internal VaultsOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vaultName", vaultName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Delete", tracingParameters); } @@ -370,9 +374,9 @@ internal VaultsOperations(KeyVaultManagementClient client) _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -521,11 +525,14 @@ internal VaultsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "vaultName"); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -535,7 +542,6 @@ internal VaultsOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vaultName", vaultName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -546,9 +552,9 @@ internal VaultsOperations(KeyVaultManagementClient client) _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -728,6 +734,10 @@ internal VaultsOperations(KeyVaultManagementClient client) throw new ValidationException(ValidationRules.Pattern, "vaultName", "^[a-zA-Z0-9-]{3,24}$"); } } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (parameters == null) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); @@ -740,7 +750,6 @@ internal VaultsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -751,7 +760,6 @@ internal VaultsOperations(KeyVaultManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vaultName", vaultName); tracingParameters.Add("operationKind", operationKind); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "UpdateAccessPolicy", tracingParameters); @@ -764,9 +772,9 @@ internal VaultsOperations(KeyVaultManagementClient client) _url = _url.Replace("{operationKind}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(operationKind, Client.SerializationSettings).Trim('"'))); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -954,11 +962,14 @@ internal VaultsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -968,7 +979,6 @@ internal VaultsOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("top", top); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters); } @@ -982,9 +992,9 @@ internal VaultsOperations(KeyVaultManagementClient client) { _queryParameters.Add(string.Format("$top={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(top, Client.SerializationSettings).Trim('"')))); } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1141,11 +1151,14 @@ internal VaultsOperations(KeyVaultManagementClient client) /// public async Task>> ListBySubscriptionWithHttpMessagesAsync(int? top = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1154,7 +1167,6 @@ internal VaultsOperations(KeyVaultManagementClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("top", top); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "ListBySubscription", tracingParameters); } @@ -1167,9 +1179,9 @@ internal VaultsOperations(KeyVaultManagementClient client) { _queryParameters.Add(string.Format("$top={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(top, Client.SerializationSettings).Trim('"')))); } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1322,11 +1334,14 @@ internal VaultsOperations(KeyVaultManagementClient client) /// public async Task>> ListDeletedWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1334,7 +1349,6 @@ internal VaultsOperations(KeyVaultManagementClient client) { _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "ListDeleted", tracingParameters); } @@ -1343,9 +1357,9 @@ internal VaultsOperations(KeyVaultManagementClient client) var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.KeyVault/deletedVaults").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1512,11 +1526,14 @@ internal VaultsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1526,7 +1543,6 @@ internal VaultsOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("vaultName", vaultName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "GetDeleted", tracingParameters); } @@ -1537,9 +1553,9 @@ internal VaultsOperations(KeyVaultManagementClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1917,11 +1933,14 @@ internal VaultsOperations(KeyVaultManagementClient client) { vaultName.Validate(); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1930,7 +1949,6 @@ internal VaultsOperations(KeyVaultManagementClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("vaultName", vaultName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "CheckNameAvailability", tracingParameters); } @@ -1939,9 +1957,9 @@ internal VaultsOperations(KeyVaultManagementClient client) var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.KeyVault/checkNameAvailability").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -2124,6 +2142,10 @@ internal VaultsOperations(KeyVaultManagementClient client) throw new ValidationException(ValidationRules.Pattern, "vaultName", "^[a-zA-Z0-9-]{3,24}$"); } } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (parameters == null) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); @@ -2136,7 +2158,6 @@ internal VaultsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -2146,7 +2167,6 @@ internal VaultsOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("vaultName", vaultName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters); @@ -2158,9 +2178,9 @@ internal VaultsOperations(KeyVaultManagementClient client) _url = _url.Replace("{vaultName}", System.Uri.EscapeDataString(vaultName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -2349,11 +2369,14 @@ internal VaultsOperations(KeyVaultManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2019-09-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -2363,7 +2386,6 @@ internal VaultsOperations(KeyVaultManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("vaultName", vaultName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginPurgeDeleted", tracingParameters); } @@ -2374,9 +2396,9 @@ internal VaultsOperations(KeyVaultManagementClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) {