From e72717e9fea3dbbedf1d83b60947b4dc79bda6e2 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 10 May 2021 09:47:49 +0000 Subject: [PATCH] CodeGen from PR 14340 in Azure/azure-rest-api-specs Merge cd43235b4447e1b44ae4b6710ebd325e96714bac into a80c025adbc7c41a7a99d47e35965ef5684b879d --- .../src/Generated/ConfluentManagementClient.cs | 2 +- .../IMarketplaceAgreementsOperations.cs | 4 ++-- .../MarketplaceAgreementsOperations.cs | 12 ++++++++++-- ...MarketplaceAgreementsOperationsExtensions.cs | 8 ++++---- .../Models/ConfluentAgreementResource.cs | 14 +++++++------- .../Generated/Models/OrganizationResource.cs | 8 ++++---- .../Models/OrganizationResourceProperties.cs | 8 ++++---- .../src/Generated/Models/UserDetail.cs | 4 ++-- .../SdkInfo_ConfluentManagementClient.cs | 17 +++-------------- 9 files changed, 37 insertions(+), 40 deletions(-) diff --git a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/ConfluentManagementClient.cs b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/ConfluentManagementClient.cs index 165411152f338..226c6c129e830 100644 --- a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/ConfluentManagementClient.cs +++ b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/ConfluentManagementClient.cs @@ -331,7 +331,7 @@ private void Initialize() OrganizationOperations = new OrganizationOperations(this); Organization = new OrganizationOperationsOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2020-03-01"; + ApiVersion = "2020-03-01-preview"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/IMarketplaceAgreementsOperations.cs b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/IMarketplaceAgreementsOperations.cs index 353ce32da5af0..de6cae30e745b 100644 --- a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/IMarketplaceAgreementsOperations.cs +++ b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/IMarketplaceAgreementsOperations.cs @@ -43,10 +43,10 @@ public partial interface IMarketplaceAgreementsOperations /// Task>> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Accept marketplace terms. + /// Create Confluent Marketplace agreement in the subscription. /// /// - /// Confluent Agreement resource + /// Confluent Marketplace Agreement resource /// /// /// The headers that will be added to request. diff --git a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/MarketplaceAgreementsOperations.cs b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/MarketplaceAgreementsOperations.cs index 85a13ea00ce65..387dcb246be03 100644 --- a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/MarketplaceAgreementsOperations.cs +++ b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/MarketplaceAgreementsOperations.cs @@ -95,6 +95,10 @@ internal MarketplaceAgreementsOperations(ConfluentManagementClient client) var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } if (_queryParameters.Count > 0) { _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); @@ -216,10 +220,10 @@ internal MarketplaceAgreementsOperations(ConfluentManagementClient client) } /// - /// Accept marketplace terms. + /// Create Confluent Marketplace agreement in the subscription. /// /// - /// Confluent Agreement resource + /// Confluent Marketplace Agreement resource /// /// /// Headers that will be added to request. @@ -264,6 +268,10 @@ internal MarketplaceAgreementsOperations(ConfluentManagementClient client) var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Confluent/agreements/default").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } if (_queryParameters.Count > 0) { _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); diff --git a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/MarketplaceAgreementsOperationsExtensions.cs b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/MarketplaceAgreementsOperationsExtensions.cs index deb43ce518323..0337ae21f40ec 100644 --- a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/MarketplaceAgreementsOperationsExtensions.cs +++ b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/MarketplaceAgreementsOperationsExtensions.cs @@ -50,13 +50,13 @@ public static IPage List(this IMarketplaceAgreements } /// - /// Accept marketplace terms. + /// Create Confluent Marketplace agreement in the subscription. /// /// /// The operations group for this extension method. /// /// - /// Confluent Agreement resource + /// Confluent Marketplace Agreement resource /// public static ConfluentAgreementResource Create(this IMarketplaceAgreementsOperations operations, ConfluentAgreementResource body = default(ConfluentAgreementResource)) { @@ -64,13 +64,13 @@ public static IPage List(this IMarketplaceAgreements } /// - /// Accept marketplace terms. + /// Create Confluent Marketplace agreement in the subscription. /// /// /// The operations group for this extension method. /// /// - /// Confluent Agreement resource + /// Confluent Marketplace Agreement resource /// /// /// The cancellation token. diff --git a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/ConfluentAgreementResource.cs b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/ConfluentAgreementResource.cs index 8bb02564592ee..1bd73eb6b6394 100644 --- a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/ConfluentAgreementResource.cs +++ b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/ConfluentAgreementResource.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.Management.Confluent.Models using System.Linq; /// - /// Confluent Agreements Resource. + /// Agreement Terms definition /// [Rest.Serialization.JsonTransformation] public partial class ConfluentAgreementResource : IResource @@ -33,9 +33,9 @@ public ConfluentAgreementResource() /// /// Initializes a new instance of the ConfluentAgreementResource class. /// - /// ARM id of the resource. - /// Name of the agreement. - /// The type of the resource. + /// The ARM id of the resource. + /// The name of the agreement. + /// The type of the agreement. /// Publisher identifier string. /// Product identifier string. /// Plan identifier string. @@ -70,19 +70,19 @@ public ConfluentAgreementResource() partial void CustomInit(); /// - /// Gets ARM id of the resource. + /// Gets the ARM id of the resource. /// [JsonProperty(PropertyName = "id")] public string Id { get; private set; } /// - /// Gets name of the agreement. + /// Gets the name of the agreement. /// [JsonProperty(PropertyName = "name")] public string Name { get; private set; } /// - /// Gets the type of the resource. + /// Gets the type of the agreement. /// [JsonProperty(PropertyName = "type")] public string Type { get; private set; } diff --git a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/OrganizationResource.cs b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/OrganizationResource.cs index 88b34bce0955f..23e375a0f9497 100644 --- a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/OrganizationResource.cs +++ b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/OrganizationResource.cs @@ -98,12 +98,12 @@ public OrganizationResource() public System.DateTime? CreatedTime { get; private set; } /// - /// Gets or sets provision states for confluent RP. Possible values - /// include: 'Accepted', 'Creating', 'Updating', 'Deleting', - /// 'Succeeded', 'Failed', 'Canceled', 'Deleted', 'NotSpecified' + /// Gets provision states for confluent RP. Possible values include: + /// 'Accepted', 'Creating', 'Updating', 'Deleting', 'Succeeded', + /// 'Failed', 'Canceled', 'Deleted', 'NotSpecified' /// [JsonProperty(PropertyName = "properties.provisioningState")] - public string ProvisioningState { get; set; } + public string ProvisioningState { get; private set; } /// /// Gets id of the Confluent organization. diff --git a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/OrganizationResourceProperties.cs b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/OrganizationResourceProperties.cs index d3075d98127fa..29808cb5b3f5c 100644 --- a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/OrganizationResourceProperties.cs +++ b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/OrganizationResourceProperties.cs @@ -66,12 +66,12 @@ public OrganizationResourceProperties() public System.DateTime? CreatedTime { get; private set; } /// - /// Gets or sets provision states for confluent RP. Possible values - /// include: 'Accepted', 'Creating', 'Updating', 'Deleting', - /// 'Succeeded', 'Failed', 'Canceled', 'Deleted', 'NotSpecified' + /// Gets provision states for confluent RP. Possible values include: + /// 'Accepted', 'Creating', 'Updating', 'Deleting', 'Succeeded', + /// 'Failed', 'Canceled', 'Deleted', 'NotSpecified' /// [JsonProperty(PropertyName = "provisioningState")] - public string ProvisioningState { get; set; } + public string ProvisioningState { get; private set; } /// /// Gets id of the Confluent organization. diff --git a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/UserDetail.cs b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/UserDetail.cs index d435c68c65fab..b59db0713b8f6 100644 --- a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/UserDetail.cs +++ b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/Models/UserDetail.cs @@ -88,9 +88,9 @@ public virtual void Validate() } if (EmailAddress != null) { - if (!System.Text.RegularExpressions.Regex.IsMatch(EmailAddress, "\\S+@\\S+\\.\\S+")) + if (!System.Text.RegularExpressions.Regex.IsMatch(EmailAddress, "^\\S+@\\S+\\.\\S+$")) { - throw new ValidationException(ValidationRules.Pattern, "EmailAddress", "\\S+@\\S+\\.\\S+"); + throw new ValidationException(ValidationRules.Pattern, "EmailAddress", "^\\S+@\\S+\\.\\S+$"); } } } diff --git a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/SdkInfo_ConfluentManagementClient.cs b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/SdkInfo_ConfluentManagementClient.cs index ad5da04ed629c..fd9f5a44497a0 100644 --- a/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/SdkInfo_ConfluentManagementClient.cs +++ b/sdk/confluent/Microsoft.Azure.Management.Confluent/src/Generated/SdkInfo_ConfluentManagementClient.cs @@ -19,22 +19,11 @@ public static IEnumerable> ApiInfo_ConfluentManage { return new Tuple[] { - new Tuple("Confluent", "MarketplaceAgreements", "2020-03-01"), - new Tuple("Confluent", "Organization", "2020-03-01"), - new Tuple("Confluent", "OrganizationOperations", "2020-03-01"), + new Tuple("Confluent", "MarketplaceAgreements", "2020-03-01-preview"), + new Tuple("Confluent", "Organization", "2020-03-01-preview"), + new Tuple("Confluent", "OrganizationOperations", "2020-03-01-preview"), }.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/confluent/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\\Users\\sralluri\\source\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "14313ea8bb4807f71b970334262b4e199797a4a1"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -