From d1d86b0cb8294cc1d19f5d7a3e8a42d03c24eb70 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 22 Oct 2021 21:09:36 +0000 Subject: [PATCH] CodeGen from PR 16516 in Azure/azure-rest-api-specs Merge bbaefd6c05c36ca7329e7b1579b6eb7fc5aedfa8 into 508638435b0c564f2150985b28a345892c7d233e --- .../AppServiceCertificateOrdersOperations.cs | 59 +-- ...ceCertificateOrdersOperationsExtensions.cs | 38 +- .../Generated/AppServicePlansOperations.cs | 12 +- .../AppServicePlansOperationsExtensions.cs | 8 +- .../src/Generated/CertificatesOperations.cs | 374 ++++++++++++++++++ .../CertificatesOperationsExtensions.cs | 74 ++++ .../src/Generated/DiagnosticsOperations.cs | 36 +- .../DiagnosticsOperationsExtensions.cs | 24 +- .../IAppServiceCertificateOrdersOperations.cs | 21 +- .../Generated/IAppServicePlansOperations.cs | 4 +- .../src/Generated/ICertificatesOperations.cs | 47 +++ .../src/Generated/IDiagnosticsOperations.cs | 12 +- .../src/Generated/IWebAppsOperations.cs | 48 ++- .../Models/AllowedAudiencesValidation.cs | 22 +- .../src/Generated/Models/AllowedPrincipals.cs | 63 +++ .../src/Generated/Models/AppRegistration.cs | 16 +- .../Generated/Models/AppServiceEnvironment.cs | 16 +- .../AppServiceEnvironmentPatchResource.cs | 16 +- .../Models/AppServiceEnvironmentResource.cs | 16 +- .../src/Generated/Models/AppServicePlan.cs | 16 +- .../Models/AppServicePlanPatchResource.cs | 16 +- .../src/Generated/Models/Apple.cs | 18 +- .../src/Generated/Models/AppleRegistration.cs | 16 +- .../Models/AseV3NetworkingConfiguration.cs | 14 +- .../src/Generated/Models/AuthPlatform.cs | 18 +- .../Generated/Models/AzureActiveDirectory.cs | 22 +- .../Models/AzureActiveDirectoryLogin.cs | 32 +- .../AzureActiveDirectoryRegistration.cs | 53 ++- .../Models/AzureActiveDirectoryValidation.cs | 26 +- .../Generated/Models/AzureStaticWebApps.cs | 16 +- .../Models/AzureStaticWebAppsRegistration.cs | 14 +- .../Generated/Models/BlobStorageTokenStore.cs | 14 +- .../Generated/Models/ClientRegistration.cs | 16 +- .../src/Generated/Models/CookieExpiration.cs | 16 +- .../Models/CustomOpenIdConnectProvider.cs | 18 +- .../Models/DefaultAuthorizationPolicy.cs | 66 ++++ .../Generated/Models/DetectorDefinition.cs | 20 +- .../Models/DetectorDefinitionResource.cs | 84 ++++ .../Models/EnterpriseGradeCdnStatus.cs | 24 ++ .../src/Generated/Models/ErrorEntity.cs | 18 +- .../src/Generated/Models/Facebook.cs | 20 +- .../Generated/Models/FileSystemTokenStore.cs | 14 +- .../src/Generated/Models/ForwardProxy.cs | 18 +- .../src/Generated/Models/GitHub.cs | 18 +- .../src/Generated/Models/GlobalValidation.cs | 20 +- .../src/Generated/Models/Google.cs | 20 +- .../src/Generated/Models/HttpSettings.cs | 18 +- .../Generated/Models/HttpSettingsRoutes.cs | 14 +- .../src/Generated/Models/IdentityProviders.cs | 70 ++-- .../src/Generated/Models/JwtClaimChecks.cs | 16 +- .../Models/LegacyMicrosoftAccount.cs | 20 +- .../src/Generated/Models/Login.cs | 24 +- .../src/Generated/Models/LoginRoutes.cs | 14 +- .../src/Generated/Models/LoginScopes.cs | 14 +- .../src/Generated/Models/Nonce.cs | 16 +- .../Models/OpenIdConnectClientCredential.cs | 16 +- .../Generated/Models/OpenIdConnectConfig.cs | 22 +- .../Generated/Models/OpenIdConnectLogin.cs | 16 +- .../Models/OpenIdConnectRegistration.cs | 18 +- .../Generated/Models/StaticSiteARMResource.cs | 21 +- .../Models/StaticSitePatchResource.cs | 21 +- .../src/Generated/Models/TokenStore.cs | 20 +- .../src/Generated/Models/TriggeredJobRun.cs | 34 +- .../src/Generated/Models/Twitter.cs | 16 +- .../Generated/Models/TwitterRegistration.cs | 16 +- .../src/Generated/Models/VnetInfo.cs | 26 +- .../src/Generated/Models/VnetInfoResource.cs | 124 ++++++ .../SdkInfo_WebSiteManagementClient.cs | 81 ++-- .../src/Generated/WebAppsOperations.cs | 263 ++++++++++-- .../Generated/WebAppsOperationsExtensions.cs | 90 ++++- .../src/Generated/WebSiteManagementClient.cs | 2 +- 71 files changed, 1770 insertions(+), 775 deletions(-) create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AllowedPrincipals.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DefaultAuthorizationPolicy.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DetectorDefinitionResource.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/EnterpriseGradeCdnStatus.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VnetInfoResource.cs diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperations.cs index aafa69a988d3..ac950e2ea00a 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperations.cs @@ -1185,7 +1185,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client) HttpStatusCode _statusCode = _httpResponse.StatusCode; cancellationToken.ThrowIfCancellationRequested(); string _responseContent = null; - if ((int)_statusCode != 200 && (int)_statusCode != 201) + if ((int)_statusCode != 200) { var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try @@ -1240,24 +1240,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client) throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); } } - // Deserialize Response - if ((int)_statusCode == 201) - { - _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); @@ -2092,7 +2074,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client) HttpStatusCode _statusCode = _httpResponse.StatusCode; cancellationToken.ThrowIfCancellationRequested(); string _responseContent = null; - if ((int)_statusCode != 200 && (int)_statusCode != 201) + if ((int)_statusCode != 200) { var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try @@ -2147,24 +2129,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client) throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); } } - // Deserialize Response - if ((int)_statusCode == 201) - { - _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); @@ -2765,10 +2729,11 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client) } /// - /// Verify domain ownership for this certificate order. + /// Resend domain verification email to customer for this certificate order /// /// - /// Description for Verify domain ownership for this certificate order. + /// Resend domain verification ownership email containing steps on how to + /// verify a domain for a given certificate order /// /// /// Name of the resource group to which the resource belongs. @@ -2967,10 +2932,20 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client) } /// - /// Verify domain ownership for this certificate order. + /// This method is used to obtain the site seal information for an issued + /// certificate. /// /// - /// Description for Verify domain ownership for this certificate order. + /// This method is used to obtain the site seal information for an issued + /// certificate. A site seal is a graphic that the certificate purchaser can + /// embed on their web site to show their visitors information about their SSL + /// certificate. If a web site visitor clicks on the site seal image, a pop-up + /// page is displayed that contains detailed information about the SSL + /// certificate. The site seal token is used to link the site seal graphic + /// image to the appropriate certificate details pop-up page display when a + /// user clicks on the site seal. The site seal images are expected to be + /// static images and hosted by the reseller, to minimize delays for customer + /// page load times. /// /// /// Name of the resource group to which the resource belongs. diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperationsExtensions.cs index 66512a36d4f3..4c412abf611f 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperationsExtensions.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperationsExtensions.cs @@ -736,10 +736,11 @@ public static void ResendEmail(this IAppServiceCertificateOrdersOperations opera } /// - /// Verify domain ownership for this certificate order. + /// Resend domain verification email to customer for this certificate order /// /// - /// Description for Verify domain ownership for this certificate order. + /// Resend domain verification ownership email containing steps on how to + /// verify a domain for a given certificate order /// /// /// The operations group for this extension method. @@ -759,10 +760,11 @@ public static void ResendRequestEmails(this IAppServiceCertificateOrdersOperatio } /// - /// Verify domain ownership for this certificate order. + /// Resend domain verification email to customer for this certificate order /// /// - /// Description for Verify domain ownership for this certificate order. + /// Resend domain verification ownership email containing steps on how to + /// verify a domain for a given certificate order /// /// /// The operations group for this extension method. @@ -785,10 +787,20 @@ public static void ResendRequestEmails(this IAppServiceCertificateOrdersOperatio } /// - /// Verify domain ownership for this certificate order. + /// This method is used to obtain the site seal information for an issued + /// certificate. /// /// - /// Description for Verify domain ownership for this certificate order. + /// This method is used to obtain the site seal information for an issued + /// certificate. A site seal is a graphic that the certificate purchaser can + /// embed on their web site to show their visitors information about their SSL + /// certificate. If a web site visitor clicks on the site seal image, a pop-up + /// page is displayed that contains detailed information about the SSL + /// certificate. The site seal token is used to link the site seal graphic + /// image to the appropriate certificate details pop-up page display when a + /// user clicks on the site seal. The site seal images are expected to be + /// static images and hosted by the reseller, to minimize delays for customer + /// page load times. /// /// /// The operations group for this extension method. @@ -808,10 +820,20 @@ public static SiteSeal RetrieveSiteSeal(this IAppServiceCertificateOrdersOperati } /// - /// Verify domain ownership for this certificate order. + /// This method is used to obtain the site seal information for an issued + /// certificate. /// /// - /// Description for Verify domain ownership for this certificate order. + /// This method is used to obtain the site seal information for an issued + /// certificate. A site seal is a graphic that the certificate purchaser can + /// embed on their web site to show their visitors information about their SSL + /// certificate. If a web site visitor clicks on the site seal image, a pop-up + /// page is displayed that contains detailed information about the SSL + /// certificate. The site seal token is used to link the site seal graphic + /// image to the appropriate certificate details pop-up page display when a + /// user clicks on the site seal. The site seal images are expected to be + /// static images and hosted by the reseller, to minimize delays for customer + /// page load times. /// /// /// The operations group for this extension method. diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperations.cs index 4c48686441f0..e4b195f768c6 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperations.cs @@ -3519,7 +3519,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListVnetsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListVnetsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -3663,7 +3663,7 @@ internal AppServicePlansOperations(WebSiteManagementClient 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")) @@ -3676,7 +3676,7 @@ internal AppServicePlansOperations(WebSiteManagementClient 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) { @@ -3731,7 +3731,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetVnetFromServerFarmWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetVnetFromServerFarmWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -3881,7 +3881,7 @@ internal AppServicePlansOperations(WebSiteManagementClient 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")) @@ -3894,7 +3894,7 @@ internal AppServicePlansOperations(WebSiteManagementClient 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/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperationsExtensions.cs index 023addb2962b..df4059ded179 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperationsExtensions.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperationsExtensions.cs @@ -922,7 +922,7 @@ public static object GetServerFarmSkus(this IAppServicePlansOperations operation /// /// Name of the App Service plan. /// - public static IList ListVnets(this IAppServicePlansOperations operations, string resourceGroupName, string name) + public static IList ListVnets(this IAppServicePlansOperations operations, string resourceGroupName, string name) { return operations.ListVnetsAsync(resourceGroupName, name).GetAwaiter().GetResult(); } @@ -946,7 +946,7 @@ public static IList ListVnets(this IAppServicePlansOperations operatio /// /// The cancellation token. /// - public static async Task> ListVnetsAsync(this IAppServicePlansOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListVnetsAsync(this IAppServicePlansOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListVnetsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) { @@ -972,7 +972,7 @@ public static IList ListVnets(this IAppServicePlansOperations operatio /// /// Name of the Virtual Network. /// - public static VnetInfo GetVnetFromServerFarm(this IAppServicePlansOperations operations, string resourceGroupName, string name, string vnetName) + public static VnetInfoResource GetVnetFromServerFarm(this IAppServicePlansOperations operations, string resourceGroupName, string name, string vnetName) { return operations.GetVnetFromServerFarmAsync(resourceGroupName, name, vnetName).GetAwaiter().GetResult(); } @@ -998,7 +998,7 @@ public static VnetInfo GetVnetFromServerFarm(this IAppServicePlansOperations ope /// /// The cancellation token. /// - public static async Task GetVnetFromServerFarmAsync(this IAppServicePlansOperations operations, string resourceGroupName, string name, string vnetName, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetVnetFromServerFarmAsync(this IAppServicePlansOperations operations, string resourceGroupName, string name, string vnetName, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.GetVnetFromServerFarmWithHttpMessagesAsync(resourceGroupName, name, vnetName, null, cancellationToken).ConfigureAwait(false)) { diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperations.cs index fea3e9de0871..d6602bfca072 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperations.cs @@ -1282,6 +1282,212 @@ internal CertificatesOperations(WebSiteManagementClient client) return _result; } + /// + /// Gets all hostname bindings a certificate is used in. + /// + /// + /// Name of the resource group to which the resource belongs. + /// + /// + /// Name of the certificate. + /// + /// + /// 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 + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task>> ListHostnameBindingsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$"); + } + } + if (name == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "name"); + } + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // 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("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ListHostnameBindings", 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.Web/certificates/{name}/hostNameBindings").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 (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); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("GET"); + _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) + { + var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + DefaultErrorResponse _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(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _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; + } + /// /// Get all certificates for a subscription. /// @@ -1624,5 +1830,173 @@ internal CertificatesOperations(WebSiteManagementClient client) return _result; } + /// + /// Gets all hostname bindings a certificate is used in. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// 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 + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task>> ListHostnameBindingsNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (nextPageLink == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("nextPageLink", nextPageLink); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ListHostnameBindingsNext", tracingParameters); + } + // Construct URL + string _url = "{nextLink}"; + _url = _url.Replace("{nextLink}", nextPageLink); + List _queryParameters = new List(); + 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("GET"); + _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) + { + var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + DefaultErrorResponse _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(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _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; + } + } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperationsExtensions.cs index 0b12b9a8b490..27ad45438729 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperationsExtensions.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperationsExtensions.cs @@ -296,6 +296,46 @@ public static Certificate Update(this ICertificatesOperations operations, string } } + /// + /// Gets all hostname bindings a certificate is used in. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group to which the resource belongs. + /// + /// + /// Name of the certificate. + /// + public static IPage ListHostnameBindings(this ICertificatesOperations operations, string resourceGroupName, string name) + { + return operations.ListHostnameBindingsAsync(resourceGroupName, name).GetAwaiter().GetResult(); + } + + /// + /// Gets all hostname bindings a certificate is used in. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group to which the resource belongs. + /// + /// + /// Name of the certificate. + /// + /// + /// The cancellation token. + /// + public static async Task> ListHostnameBindingsAsync(this ICertificatesOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListHostnameBindingsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Get all certificates for a subscription. /// @@ -376,5 +416,39 @@ public static IPage ListByResourceGroupNext(this ICertificatesOpera } } + /// + /// Gets all hostname bindings a certificate is used in. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + public static IPage ListHostnameBindingsNext(this ICertificatesOperations operations, string nextPageLink) + { + return operations.ListHostnameBindingsNextAsync(nextPageLink).GetAwaiter().GetResult(); + } + + /// + /// Gets all hostname bindings a certificate is used in. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The cancellation token. + /// + public static async Task> ListHostnameBindingsNextAsync(this ICertificatesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListHostnameBindingsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperations.cs index bdcc7b0ef1c5..4d5a18906798 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperations.cs @@ -2132,7 +2132,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListSiteDetectorsWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListSiteDetectorsWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -2282,7 +2282,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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")) @@ -2295,7 +2295,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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) { @@ -2353,7 +2353,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetSiteDetectorWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetSiteDetectorWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -2509,7 +2509,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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")) @@ -2522,7 +2522,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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) { @@ -4489,7 +4489,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListSiteDetectorsSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListSiteDetectorsSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -4645,7 +4645,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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")) @@ -4658,7 +4658,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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) { @@ -4719,7 +4719,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetSiteDetectorSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetSiteDetectorSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -4881,7 +4881,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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")) @@ -4894,7 +4894,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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) { @@ -5894,7 +5894,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListSiteDetectorsNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListSiteDetectorsNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (nextPageLink == null) { @@ -6003,7 +6003,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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")) @@ -6016,7 +6016,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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) { @@ -6578,7 +6578,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListSiteDetectorsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListSiteDetectorsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (nextPageLink == null) { @@ -6687,7 +6687,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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")) @@ -6700,7 +6700,7 @@ internal DiagnosticsOperations(WebSiteManagementClient 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/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperationsExtensions.cs index 7cfac6fdb1b8..730a96ac2198 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperationsExtensions.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperationsExtensions.cs @@ -555,7 +555,7 @@ public static AnalysisDefinition GetSiteAnalysis(this IDiagnosticsOperations ope /// /// Diagnostic Category /// - public static IPage ListSiteDetectors(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory) + public static IPage ListSiteDetectors(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory) { return operations.ListSiteDetectorsAsync(resourceGroupName, siteName, diagnosticCategory).GetAwaiter().GetResult(); } @@ -581,7 +581,7 @@ public static IPage ListSiteDetectors(this IDiagnosticsOpera /// /// The cancellation token. /// - public static async Task> ListSiteDetectorsAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListSiteDetectorsAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListSiteDetectorsWithHttpMessagesAsync(resourceGroupName, siteName, diagnosticCategory, null, cancellationToken).ConfigureAwait(false)) { @@ -610,7 +610,7 @@ public static IPage ListSiteDetectors(this IDiagnosticsOpera /// /// Detector Name /// - public static DetectorDefinition GetSiteDetector(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName) + public static DetectorDefinitionResource GetSiteDetector(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName) { return operations.GetSiteDetectorAsync(resourceGroupName, siteName, diagnosticCategory, detectorName).GetAwaiter().GetResult(); } @@ -639,7 +639,7 @@ public static DetectorDefinition GetSiteDetector(this IDiagnosticsOperations ope /// /// The cancellation token. /// - public static async Task GetSiteDetectorAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetSiteDetectorAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.GetSiteDetectorWithHttpMessagesAsync(resourceGroupName, siteName, diagnosticCategory, detectorName, null, cancellationToken).ConfigureAwait(false)) { @@ -1186,7 +1186,7 @@ public static AnalysisDefinition GetSiteAnalysisSlot(this IDiagnosticsOperations /// /// Slot Name /// - public static IPage ListSiteDetectorsSlot(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string slot) + public static IPage ListSiteDetectorsSlot(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string slot) { return operations.ListSiteDetectorsSlotAsync(resourceGroupName, siteName, diagnosticCategory, slot).GetAwaiter().GetResult(); } @@ -1215,7 +1215,7 @@ public static IPage ListSiteDetectorsSlot(this IDiagnosticsO /// /// The cancellation token. /// - public static async Task> ListSiteDetectorsSlotAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string slot, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListSiteDetectorsSlotAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string slot, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListSiteDetectorsSlotWithHttpMessagesAsync(resourceGroupName, siteName, diagnosticCategory, slot, null, cancellationToken).ConfigureAwait(false)) { @@ -1247,7 +1247,7 @@ public static IPage ListSiteDetectorsSlot(this IDiagnosticsO /// /// Slot Name /// - public static DetectorDefinition GetSiteDetectorSlot(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot) + public static DetectorDefinitionResource GetSiteDetectorSlot(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot) { return operations.GetSiteDetectorSlotAsync(resourceGroupName, siteName, diagnosticCategory, detectorName, slot).GetAwaiter().GetResult(); } @@ -1279,7 +1279,7 @@ public static DetectorDefinition GetSiteDetectorSlot(this IDiagnosticsOperations /// /// The cancellation token. /// - public static async Task GetSiteDetectorSlotAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetSiteDetectorSlotAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.GetSiteDetectorSlotWithHttpMessagesAsync(resourceGroupName, siteName, diagnosticCategory, detectorName, slot, null, cancellationToken).ConfigureAwait(false)) { @@ -1541,7 +1541,7 @@ public static IPage ListSiteAnalysesNext(this IDiagnosticsOp /// /// The NextLink from the previous successful call to List operation. /// - public static IPage ListSiteDetectorsNext(this IDiagnosticsOperations operations, string nextPageLink) + public static IPage ListSiteDetectorsNext(this IDiagnosticsOperations operations, string nextPageLink) { return operations.ListSiteDetectorsNextAsync(nextPageLink).GetAwaiter().GetResult(); } @@ -1561,7 +1561,7 @@ public static IPage ListSiteDetectorsNext(this IDiagnosticsO /// /// The cancellation token. /// - public static async Task> ListSiteDetectorsNextAsync(this IDiagnosticsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListSiteDetectorsNextAsync(this IDiagnosticsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListSiteDetectorsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) { @@ -1701,7 +1701,7 @@ public static IPage ListSiteAnalysesSlotNext(this IDiagnosti /// /// The NextLink from the previous successful call to List operation. /// - public static IPage ListSiteDetectorsSlotNext(this IDiagnosticsOperations operations, string nextPageLink) + public static IPage ListSiteDetectorsSlotNext(this IDiagnosticsOperations operations, string nextPageLink) { return operations.ListSiteDetectorsSlotNextAsync(nextPageLink).GetAwaiter().GetResult(); } @@ -1721,7 +1721,7 @@ public static IPage ListSiteDetectorsSlotNext(this IDiagnost /// /// The cancellation token. /// - public static async Task> ListSiteDetectorsSlotNextAsync(this IDiagnosticsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListSiteDetectorsSlotNextAsync(this IDiagnosticsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListSiteDetectorsSlotNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) { diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceCertificateOrdersOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceCertificateOrdersOperations.cs index ea68b4c9a69c..7073513eefc5 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceCertificateOrdersOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceCertificateOrdersOperations.cs @@ -451,10 +451,12 @@ public partial interface IAppServiceCertificateOrdersOperations /// Task ResendEmailWithHttpMessagesAsync(string resourceGroupName, string certificateOrderName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Verify domain ownership for this certificate order. + /// Resend domain verification email to customer for this certificate + /// order /// /// - /// Description for Verify domain ownership for this certificate order. + /// Resend domain verification ownership email containing steps on how + /// to verify a domain for a given certificate order /// /// /// Name of the resource group to which the resource belongs. @@ -479,10 +481,21 @@ public partial interface IAppServiceCertificateOrdersOperations /// Task ResendRequestEmailsWithHttpMessagesAsync(string resourceGroupName, string certificateOrderName, NameIdentifier nameIdentifier, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Verify domain ownership for this certificate order. + /// This method is used to obtain the site seal information for an + /// issued certificate. /// /// - /// Description for Verify domain ownership for this certificate order. + /// This method is used to obtain the site seal information for an + /// issued certificate. A site seal is a graphic that the certificate + /// purchaser can embed on their web site to show their visitors + /// information about their SSL certificate. If a web site visitor + /// clicks on the site seal image, a pop-up page is displayed that + /// contains detailed information about the SSL certificate. The site + /// seal token is used to link the site seal graphic image to the + /// appropriate certificate details pop-up page display when a user + /// clicks on the site seal. The site seal images are expected to be + /// static images and hosted by the reseller, to minimize delays for + /// customer page load times. /// /// /// Name of the resource group to which the resource belongs. diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServicePlansOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServicePlansOperations.cs index 308908b9006c..ad73ce55fad4 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServicePlansOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServicePlansOperations.cs @@ -577,7 +577,7 @@ public partial interface IAppServicePlansOperations /// /// Thrown when a required parameter is null /// - Task>> ListVnetsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListVnetsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Get a Virtual Network associated with an App Service plan. /// @@ -609,7 +609,7 @@ public partial interface IAppServicePlansOperations /// /// Thrown when a required parameter is null /// - Task> GetVnetFromServerFarmWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetVnetFromServerFarmWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Get a Virtual Network gateway. /// diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificatesOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificatesOperations.cs index 86f6dcfa701d..5267eca72203 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificatesOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificatesOperations.cs @@ -190,6 +190,31 @@ public partial interface ICertificatesOperations /// Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string name, CertificatePatchResource certificateEnvelope, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// Gets all hostname bindings a certificate is used in. + /// + /// + /// Name of the resource group to which the resource belongs. + /// + /// + /// Name of the certificate. + /// + /// + /// 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>> ListHostnameBindingsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Get all certificates for a subscription. /// /// @@ -239,5 +264,27 @@ public partial interface ICertificatesOperations /// Thrown when a required parameter is null /// Task>> ListByResourceGroupNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Gets all hostname bindings a certificate is used in. + /// + /// + /// 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>> ListHostnameBindingsNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDiagnosticsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDiagnosticsOperations.cs index 0c427952c932..f32bfe677fe3 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDiagnosticsOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDiagnosticsOperations.cs @@ -356,7 +356,7 @@ public partial interface IDiagnosticsOperations /// /// Thrown when a required parameter is null /// - Task>> ListSiteDetectorsWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListSiteDetectorsWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Get Detector /// @@ -390,7 +390,7 @@ public partial interface IDiagnosticsOperations /// /// Thrown when a required parameter is null /// - Task> GetSiteDetectorWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetSiteDetectorWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Execute Detector /// @@ -723,7 +723,7 @@ public partial interface IDiagnosticsOperations /// /// Thrown when a required parameter is null /// - Task>> ListSiteDetectorsSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListSiteDetectorsSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Get Detector /// @@ -760,7 +760,7 @@ public partial interface IDiagnosticsOperations /// /// Thrown when a required parameter is null /// - Task> GetSiteDetectorSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetSiteDetectorSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Execute Detector /// @@ -931,7 +931,7 @@ public partial interface IDiagnosticsOperations /// /// Thrown when a required parameter is null /// - Task>> ListSiteDetectorsNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListSiteDetectorsNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// List Site Detector Responses /// @@ -1031,6 +1031,6 @@ public partial interface IDiagnosticsOperations /// /// Thrown when a required parameter is null /// - Task>> ListSiteDetectorsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListSiteDetectorsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs index d48729e3932c..4cafc72f4ae6 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs @@ -758,6 +758,36 @@ public partial interface IWebAppsOperations /// Task> GetAuthSettingsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// Gets site's Authentication / Authorization settings for apps via + /// the V2 format + /// + /// + /// Description for Gets site's Authentication / Authorization settings + /// for apps via the V2 format + /// + /// + /// Name of the resource group to which the resource belongs. + /// + /// + /// Name of the app. + /// + /// + /// 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> GetAuthSettingsV2WithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Updates site's Authentication / Authorization settings for apps via /// the V2 format /// @@ -819,7 +849,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> GetAuthSettingsV2WithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> ListAuthSettingsV2WithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Updates the Azure storage account configurations of an app. /// @@ -11693,7 +11723,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task>> ListVnetConnectionsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListVnetConnectionsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Gets a virtual network the app (or deployment slot) is connected to /// by name. @@ -11730,7 +11760,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> GetVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Adds a Virtual Network connection to an app or slot (PUT) or /// updates the connection properties (PATCH). @@ -11770,7 +11800,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> CreateOrUpdateVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> CreateOrUpdateVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Deletes a connection from an app (or deployment slot to a named /// virtual network. @@ -11844,7 +11874,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> UpdateVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> UpdateVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Gets an app's Virtual Network gateway. /// @@ -12697,7 +12727,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task>> ListVnetConnectionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListVnetConnectionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Gets a virtual network the app (or deployment slot) is connected to /// by name. @@ -12730,7 +12760,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> GetVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Adds a Virtual Network connection to an app or slot (PUT) or /// updates the connection properties (PATCH). @@ -12766,7 +12796,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> CreateOrUpdateVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> CreateOrUpdateVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Deletes a connection from an app (or deployment slot to a named /// virtual network. @@ -12832,7 +12862,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> UpdateVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> UpdateVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Gets an app's Virtual Network gateway. /// diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AllowedAudiencesValidation.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AllowedAudiencesValidation.cs index 7af8c086f3f3..482f69d644e2 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AllowedAudiencesValidation.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AllowedAudiencesValidation.cs @@ -10,15 +10,15 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; using System.Linq; - [Rest.Serialization.JsonTransformation] - public partial class AllowedAudiencesValidation : ProxyOnlyResource + /// + /// The configuration settings of the Allowed Audiences validation flow. + /// + public partial class AllowedAudiencesValidation { /// /// Initializes a new instance of the AllowedAudiencesValidation class. @@ -31,12 +31,10 @@ public AllowedAudiencesValidation() /// /// Initializes a new instance of the AllowedAudiencesValidation class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. - public AllowedAudiencesValidation(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IList allowedAudiences = default(IList)) - : base(id, name, kind, type) + /// The configuration settings of the + /// allowed list of audiences from which to validate the JWT + /// token. + public AllowedAudiencesValidation(IList allowedAudiences = default(IList)) { AllowedAudiences = allowedAudiences; CustomInit(); @@ -48,8 +46,10 @@ public AllowedAudiencesValidation() partial void CustomInit(); /// + /// Gets or sets the configuration settings of the allowed list of + /// audiences from which to validate the JWT token. /// - [JsonProperty(PropertyName = "properties.allowedAudiences")] + [JsonProperty(PropertyName = "allowedAudiences")] public IList AllowedAudiences { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AllowedPrincipals.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AllowedPrincipals.cs new file mode 100644 index 000000000000..c7a907bf8b49 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AllowedPrincipals.cs @@ -0,0 +1,63 @@ +// +// 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.WebSites.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The configuration settings of the Azure Active Directory allowed + /// principals. + /// + public partial class AllowedPrincipals + { + /// + /// Initializes a new instance of the AllowedPrincipals class. + /// + public AllowedPrincipals() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AllowedPrincipals class. + /// + /// The list of the allowed groups. + /// The list of the allowed + /// identities. + public AllowedPrincipals(IList groups = default(IList), IList identities = default(IList)) + { + Groups = groups; + Identities = identities; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the list of the allowed groups. + /// + [JsonProperty(PropertyName = "groups")] + public IList Groups { get; set; } + + /// + /// Gets or sets the list of the allowed identities. + /// + [JsonProperty(PropertyName = "identities")] + public IList Identities { get; set; } + + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppRegistration.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppRegistration.cs index ded5ddc3c77c..54ddc2043ed4 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppRegistration.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppRegistration.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the app registration for providers that /// have app ids and app secrets /// - [Rest.Serialization.JsonTransformation] - public partial class AppRegistration : ProxyOnlyResource + public partial class AppRegistration { /// /// Initializes a new instance of the AppRegistration class. @@ -33,15 +30,10 @@ public AppRegistration() /// /// Initializes a new instance of the AppRegistration class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The App ID of the app used for login. /// The app setting name that /// contains the app secret. - public AppRegistration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string appId = default(string), string appSecretSettingName = default(string)) - : base(id, name, kind, type) + public AppRegistration(string appId = default(string), string appSecretSettingName = default(string)) { AppId = appId; AppSecretSettingName = appSecretSettingName; @@ -56,13 +48,13 @@ public AppRegistration() /// /// Gets or sets the App ID of the app used for login. /// - [JsonProperty(PropertyName = "properties.appId")] + [JsonProperty(PropertyName = "appId")] public string AppId { get; set; } /// /// Gets or sets the app setting name that contains the app secret. /// - [JsonProperty(PropertyName = "properties.appSecretSettingName")] + [JsonProperty(PropertyName = "appSecretSettingName")] public string AppSecretSettingName { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironment.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironment.cs index 312d9255fffd..58cd6e695e99 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironment.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironment.cs @@ -67,7 +67,9 @@ public AppServiceEnvironment() /// Flag that displays whether an ASE has /// linux workers or not /// Dedicated Host Count - public AppServiceEnvironment(VirtualNetworkProfile virtualNetwork, ProvisioningState? provisioningState = default(ProvisioningState?), HostingEnvironmentStatus? status = default(HostingEnvironmentStatus?), string internalLoadBalancingMode = default(string), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string dnsSuffix = default(string), int? maximumNumberOfMachines = default(int?), int? frontEndScaleFactor = default(int?), bool? suspended = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), int? dedicatedHostCount = default(int?)) + /// Whether or not this App Service + /// Environment is zone-redundant. + public AppServiceEnvironment(VirtualNetworkProfile virtualNetwork, ProvisioningState? provisioningState = default(ProvisioningState?), HostingEnvironmentStatus? status = default(HostingEnvironmentStatus?), string internalLoadBalancingMode = default(string), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string dnsSuffix = default(string), int? maximumNumberOfMachines = default(int?), int? frontEndScaleFactor = default(int?), bool? suspended = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), int? dedicatedHostCount = default(int?), bool? zoneRedundant = default(bool?)) { ProvisioningState = provisioningState; Status = status; @@ -84,6 +86,7 @@ public AppServiceEnvironment() UserWhitelistedIpRanges = userWhitelistedIpRanges; HasLinuxWorkers = hasLinuxWorkers; DedicatedHostCount = dedicatedHostCount; + ZoneRedundant = zoneRedundant; CustomInit(); } @@ -189,10 +192,17 @@ public AppServiceEnvironment() public bool? HasLinuxWorkers { get; private set; } /// - /// Gets dedicated Host Count + /// Gets or sets dedicated Host Count /// [JsonProperty(PropertyName = "dedicatedHostCount")] - public int? DedicatedHostCount { get; private set; } + public int? DedicatedHostCount { get; set; } + + /// + /// Gets or sets whether or not this App Service Environment is + /// zone-redundant. + /// + [JsonProperty(PropertyName = "zoneRedundant")] + public bool? ZoneRedundant { get; set; } /// /// Validate the object. diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironmentPatchResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironmentPatchResource.cs index 724562c731b2..261e17cc4c7a 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironmentPatchResource.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironmentPatchResource.cs @@ -75,7 +75,9 @@ public AppServiceEnvironmentPatchResource() /// Flag that displays whether an ASE has /// linux workers or not /// Dedicated Host Count - public AppServiceEnvironmentPatchResource(VirtualNetworkProfile virtualNetwork, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), ProvisioningState? provisioningState = default(ProvisioningState?), HostingEnvironmentStatus? status = default(HostingEnvironmentStatus?), string internalLoadBalancingMode = default(string), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string dnsSuffix = default(string), int? maximumNumberOfMachines = default(int?), int? frontEndScaleFactor = default(int?), bool? suspended = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), int? dedicatedHostCount = default(int?)) + /// Whether or not this App Service + /// Environment is zone-redundant. + public AppServiceEnvironmentPatchResource(VirtualNetworkProfile virtualNetwork, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), ProvisioningState? provisioningState = default(ProvisioningState?), HostingEnvironmentStatus? status = default(HostingEnvironmentStatus?), string internalLoadBalancingMode = default(string), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string dnsSuffix = default(string), int? maximumNumberOfMachines = default(int?), int? frontEndScaleFactor = default(int?), bool? suspended = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), int? dedicatedHostCount = default(int?), bool? zoneRedundant = default(bool?)) : base(id, name, kind, type) { ProvisioningState = provisioningState; @@ -93,6 +95,7 @@ public AppServiceEnvironmentPatchResource() UserWhitelistedIpRanges = userWhitelistedIpRanges; HasLinuxWorkers = hasLinuxWorkers; DedicatedHostCount = dedicatedHostCount; + ZoneRedundant = zoneRedundant; CustomInit(); } @@ -198,10 +201,17 @@ public AppServiceEnvironmentPatchResource() public bool? HasLinuxWorkers { get; private set; } /// - /// Gets dedicated Host Count + /// Gets or sets dedicated Host Count /// [JsonProperty(PropertyName = "properties.dedicatedHostCount")] - public int? DedicatedHostCount { get; private set; } + public int? DedicatedHostCount { get; set; } + + /// + /// Gets or sets whether or not this App Service Environment is + /// zone-redundant. + /// + [JsonProperty(PropertyName = "properties.zoneRedundant")] + public bool? ZoneRedundant { get; set; } /// /// Validate the object. diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironmentResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironmentResource.cs index 25cb6fbebdb6..97d49000082f 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironmentResource.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServiceEnvironmentResource.cs @@ -77,7 +77,9 @@ public AppServiceEnvironmentResource() /// Flag that displays whether an ASE has /// linux workers or not /// Dedicated Host Count - public AppServiceEnvironmentResource(string location, VirtualNetworkProfile virtualNetwork, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary tags = default(IDictionary), ProvisioningState? provisioningState = default(ProvisioningState?), HostingEnvironmentStatus? status = default(HostingEnvironmentStatus?), string internalLoadBalancingMode = default(string), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string dnsSuffix = default(string), int? maximumNumberOfMachines = default(int?), int? frontEndScaleFactor = default(int?), bool? suspended = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), int? dedicatedHostCount = default(int?)) + /// Whether or not this App Service + /// Environment is zone-redundant. + public AppServiceEnvironmentResource(string location, VirtualNetworkProfile virtualNetwork, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary tags = default(IDictionary), ProvisioningState? provisioningState = default(ProvisioningState?), HostingEnvironmentStatus? status = default(HostingEnvironmentStatus?), string internalLoadBalancingMode = default(string), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string dnsSuffix = default(string), int? maximumNumberOfMachines = default(int?), int? frontEndScaleFactor = default(int?), bool? suspended = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), int? dedicatedHostCount = default(int?), bool? zoneRedundant = default(bool?)) : base(location, id, name, kind, type, tags) { ProvisioningState = provisioningState; @@ -95,6 +97,7 @@ public AppServiceEnvironmentResource() UserWhitelistedIpRanges = userWhitelistedIpRanges; HasLinuxWorkers = hasLinuxWorkers; DedicatedHostCount = dedicatedHostCount; + ZoneRedundant = zoneRedundant; CustomInit(); } @@ -200,10 +203,17 @@ public AppServiceEnvironmentResource() public bool? HasLinuxWorkers { get; private set; } /// - /// Gets dedicated Host Count + /// Gets or sets dedicated Host Count /// [JsonProperty(PropertyName = "properties.dedicatedHostCount")] - public int? DedicatedHostCount { get; private set; } + public int? DedicatedHostCount { get; set; } + + /// + /// Gets or sets whether or not this App Service Environment is + /// zone-redundant. + /// + [JsonProperty(PropertyName = "properties.zoneRedundant")] + public bool? ZoneRedundant { get; set; } /// /// Validate the object. diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServicePlan.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServicePlan.cs index 99df81c6036c..5fe15c31b85f 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServicePlan.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServicePlan.cs @@ -87,7 +87,11 @@ public AppServicePlan() /// 'Canceled', 'InProgress', 'Deleting' /// Specification for the /// Kubernetes Environment to use for the App Service plan. - public AppServicePlan(string location, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary tags = default(IDictionary), string workerTierName = default(string), StatusOptions? status = default(StatusOptions?), string subscription = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), int? maximumNumberOfWorkers = default(int?), string geoRegion = default(string), bool? perSiteScaling = default(bool?), bool? elasticScaleEnabled = default(bool?), int? maximumElasticWorkerCount = default(int?), int? numberOfSites = default(int?), bool? isSpot = default(bool?), System.DateTime? spotExpirationTime = default(System.DateTime?), System.DateTime? freeOfferExpirationTime = default(System.DateTime?), string resourceGroup = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), int? targetWorkerCount = default(int?), int? targetWorkerSizeId = default(int?), ProvisioningState? provisioningState = default(ProvisioningState?), KubeEnvironmentProfile kubeEnvironmentProfile = default(KubeEnvironmentProfile), SkuDescription sku = default(SkuDescription), ExtendedLocation extendedLocation = default(ExtendedLocation)) + /// If <code>true</code>, this + /// App Service Plan will perform availability zone balancing. + /// If <code>false</code>, this App Service Plan will not + /// perform availability zone balancing. + public AppServicePlan(string location, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary tags = default(IDictionary), string workerTierName = default(string), StatusOptions? status = default(StatusOptions?), string subscription = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), int? maximumNumberOfWorkers = default(int?), string geoRegion = default(string), bool? perSiteScaling = default(bool?), bool? elasticScaleEnabled = default(bool?), int? maximumElasticWorkerCount = default(int?), int? numberOfSites = default(int?), bool? isSpot = default(bool?), System.DateTime? spotExpirationTime = default(System.DateTime?), System.DateTime? freeOfferExpirationTime = default(System.DateTime?), string resourceGroup = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), int? targetWorkerCount = default(int?), int? targetWorkerSizeId = default(int?), ProvisioningState? provisioningState = default(ProvisioningState?), KubeEnvironmentProfile kubeEnvironmentProfile = default(KubeEnvironmentProfile), bool? zoneRedundant = default(bool?), SkuDescription sku = default(SkuDescription), ExtendedLocation extendedLocation = default(ExtendedLocation)) : base(location, id, name, kind, type, tags) { WorkerTierName = workerTierName; @@ -111,6 +115,7 @@ public AppServicePlan() TargetWorkerSizeId = targetWorkerSizeId; ProvisioningState = provisioningState; KubeEnvironmentProfile = kubeEnvironmentProfile; + ZoneRedundant = zoneRedundant; Sku = sku; ExtendedLocation = extendedLocation; CustomInit(); @@ -266,6 +271,15 @@ public AppServicePlan() [JsonProperty(PropertyName = "properties.kubeEnvironmentProfile")] public KubeEnvironmentProfile KubeEnvironmentProfile { get; set; } + /// + /// Gets or sets if &lt;code&gt;true&lt;/code&gt;, this + /// App Service Plan will perform availability zone balancing. + /// If &lt;code&gt;false&lt;/code&gt;, this App Service + /// Plan will not perform availability zone balancing. + /// + [JsonProperty(PropertyName = "properties.zoneRedundant")] + public bool? ZoneRedundant { get; set; } + /// /// [JsonProperty(PropertyName = "sku")] diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServicePlanPatchResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServicePlanPatchResource.cs index 418fba09030a..c9c12ad353ac 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServicePlanPatchResource.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppServicePlanPatchResource.cs @@ -85,7 +85,11 @@ public AppServicePlanPatchResource() /// 'Canceled', 'InProgress', 'Deleting' /// Specification for the /// Kubernetes Environment to use for the App Service plan. - public AppServicePlanPatchResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string workerTierName = default(string), StatusOptions? status = default(StatusOptions?), string subscription = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), int? maximumNumberOfWorkers = default(int?), string geoRegion = default(string), bool? perSiteScaling = default(bool?), bool? elasticScaleEnabled = default(bool?), int? maximumElasticWorkerCount = default(int?), int? numberOfSites = default(int?), bool? isSpot = default(bool?), System.DateTime? spotExpirationTime = default(System.DateTime?), System.DateTime? freeOfferExpirationTime = default(System.DateTime?), string resourceGroup = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), int? targetWorkerCount = default(int?), int? targetWorkerSizeId = default(int?), ProvisioningState? provisioningState = default(ProvisioningState?), KubeEnvironmentProfile kubeEnvironmentProfile = default(KubeEnvironmentProfile)) + /// If <code>true</code>, this + /// App Service Plan will perform availability zone balancing. + /// If <code>false</code>, this App Service Plan will not + /// perform availability zone balancing. + public AppServicePlanPatchResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string workerTierName = default(string), StatusOptions? status = default(StatusOptions?), string subscription = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), int? maximumNumberOfWorkers = default(int?), string geoRegion = default(string), bool? perSiteScaling = default(bool?), bool? elasticScaleEnabled = default(bool?), int? maximumElasticWorkerCount = default(int?), int? numberOfSites = default(int?), bool? isSpot = default(bool?), System.DateTime? spotExpirationTime = default(System.DateTime?), System.DateTime? freeOfferExpirationTime = default(System.DateTime?), string resourceGroup = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), int? targetWorkerCount = default(int?), int? targetWorkerSizeId = default(int?), ProvisioningState? provisioningState = default(ProvisioningState?), KubeEnvironmentProfile kubeEnvironmentProfile = default(KubeEnvironmentProfile), bool? zoneRedundant = default(bool?)) : base(id, name, kind, type) { WorkerTierName = workerTierName; @@ -109,6 +113,7 @@ public AppServicePlanPatchResource() TargetWorkerSizeId = targetWorkerSizeId; ProvisioningState = provisioningState; KubeEnvironmentProfile = kubeEnvironmentProfile; + ZoneRedundant = zoneRedundant; CustomInit(); } @@ -262,5 +267,14 @@ public AppServicePlanPatchResource() [JsonProperty(PropertyName = "properties.kubeEnvironmentProfile")] public KubeEnvironmentProfile KubeEnvironmentProfile { get; set; } + /// + /// Gets or sets if &lt;code&gt;true&lt;/code&gt;, this + /// App Service Plan will perform availability zone balancing. + /// If &lt;code&gt;false&lt;/code&gt;, this App Service + /// Plan will not perform availability zone balancing. + /// + [JsonProperty(PropertyName = "properties.zoneRedundant")] + public bool? ZoneRedundant { get; set; } + } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Apple.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Apple.cs index 899a3bad46e9..43a78bbe7c7b 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Apple.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Apple.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the Apple provider. /// - [Rest.Serialization.JsonTransformation] - public partial class Apple : ProxyOnlyResource + public partial class Apple { /// /// Initializes a new instance of the Apple class. @@ -32,10 +29,6 @@ public Apple() /// /// Initializes a new instance of the Apple class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the Apple /// provider should not be enabled despite the set registration; /// otherwise, <code>true</code>. @@ -43,8 +36,7 @@ public Apple() /// registration. /// The configuration settings of the login /// flow. - public Apple(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), AppleRegistration registration = default(AppleRegistration), LoginScopes login = default(LoginScopes)) - : base(id, name, kind, type) + public Apple(bool? enabled = default(bool?), AppleRegistration registration = default(AppleRegistration), LoginScopes login = default(LoginScopes)) { Enabled = enabled; Registration = registration; @@ -62,19 +54,19 @@ public Apple() /// Apple provider should not be enabled despite the set registration; /// otherwise, &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// /// Gets or sets the configuration settings of the Apple registration. /// - [JsonProperty(PropertyName = "properties.registration")] + [JsonProperty(PropertyName = "registration")] public AppleRegistration Registration { get; set; } /// /// Gets or sets the configuration settings of the login flow. /// - [JsonProperty(PropertyName = "properties.login")] + [JsonProperty(PropertyName = "login")] public LoginScopes Login { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppleRegistration.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppleRegistration.cs index 7de4212f76b3..146ad5b1d8df 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppleRegistration.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AppleRegistration.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the registration for the Apple provider /// - [Rest.Serialization.JsonTransformation] - public partial class AppleRegistration : ProxyOnlyResource + public partial class AppleRegistration { /// /// Initializes a new instance of the AppleRegistration class. @@ -32,16 +29,11 @@ public AppleRegistration() /// /// Initializes a new instance of the AppleRegistration class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The Client ID of the app used for /// login. /// The app setting name that /// contains the client secret. - public AppleRegistration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string clientId = default(string), string clientSecretSettingName = default(string)) - : base(id, name, kind, type) + public AppleRegistration(string clientId = default(string), string clientSecretSettingName = default(string)) { ClientId = clientId; ClientSecretSettingName = clientSecretSettingName; @@ -56,13 +48,13 @@ public AppleRegistration() /// /// Gets or sets the Client ID of the app used for login. /// - [JsonProperty(PropertyName = "properties.clientId")] + [JsonProperty(PropertyName = "clientId")] public string ClientId { get; set; } /// /// Gets or sets the app setting name that contains the client secret. /// - [JsonProperty(PropertyName = "properties.clientSecretSettingName")] + [JsonProperty(PropertyName = "clientSecretSettingName")] public string ClientSecretSettingName { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AseV3NetworkingConfiguration.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AseV3NetworkingConfiguration.cs index 57dca6849502..2e0798e1f3bf 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AseV3NetworkingConfiguration.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AseV3NetworkingConfiguration.cs @@ -42,11 +42,13 @@ public AseV3NetworkingConfiguration() /// Resource type. /// Property to enable /// and disable new private endpoint connection creation on ASE - public AseV3NetworkingConfiguration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IList windowsOutboundIpAddresses = default(IList), IList linuxOutboundIpAddresses = default(IList), bool? allowNewPrivateEndpointConnections = default(bool?)) + public AseV3NetworkingConfiguration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IList windowsOutboundIpAddresses = default(IList), IList linuxOutboundIpAddresses = default(IList), IList externalInboundIpAddresses = default(IList), IList internalInboundIpAddresses = default(IList), bool? allowNewPrivateEndpointConnections = default(bool?)) : base(id, name, kind, type) { WindowsOutboundIpAddresses = windowsOutboundIpAddresses; LinuxOutboundIpAddresses = linuxOutboundIpAddresses; + ExternalInboundIpAddresses = externalInboundIpAddresses; + InternalInboundIpAddresses = internalInboundIpAddresses; AllowNewPrivateEndpointConnections = allowNewPrivateEndpointConnections; CustomInit(); } @@ -66,6 +68,16 @@ public AseV3NetworkingConfiguration() [JsonProperty(PropertyName = "properties.linuxOutboundIpAddresses")] public IList LinuxOutboundIpAddresses { get; private set; } + /// + /// + [JsonProperty(PropertyName = "properties.externalInboundIpAddresses")] + public IList ExternalInboundIpAddresses { get; private set; } + + /// + /// + [JsonProperty(PropertyName = "properties.internalInboundIpAddresses")] + public IList InternalInboundIpAddresses { get; private set; } + /// /// Gets or sets property to enable and disable new private endpoint /// connection creation on ASE diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AuthPlatform.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AuthPlatform.cs index fc7e0949a009..1a0baed9b5ce 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AuthPlatform.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AuthPlatform.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the platform of App Service /// Authentication/Authorization. /// - [Rest.Serialization.JsonTransformation] - public partial class AuthPlatform : ProxyOnlyResource + public partial class AuthPlatform { /// /// Initializes a new instance of the AuthPlatform class. @@ -33,10 +30,6 @@ public AuthPlatform() /// /// Initializes a new instance of the AuthPlatform class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>true</code> if the /// Authentication / Authorization feature is enabled for the current /// app; otherwise, <code>false</code>. @@ -48,8 +41,7 @@ public AuthPlatform() /// auth settings if they come from a file. /// If the path is relative, base will the site's root /// directory. - public AuthPlatform(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), string runtimeVersion = default(string), string configFilePath = default(string)) - : base(id, name, kind, type) + public AuthPlatform(bool? enabled = default(bool?), string runtimeVersion = default(string), string configFilePath = default(string)) { Enabled = enabled; RuntimeVersion = runtimeVersion; @@ -67,7 +59,7 @@ public AuthPlatform() /// Authentication / Authorization feature is enabled for the current /// app; otherwise, &lt;code&gt;false&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// @@ -76,7 +68,7 @@ public AuthPlatform() /// The setting in this value can control the behavior of certain /// features in the Authentication / Authorization module. /// - [JsonProperty(PropertyName = "properties.runtimeVersion")] + [JsonProperty(PropertyName = "runtimeVersion")] public string RuntimeVersion { get; set; } /// @@ -84,7 +76,7 @@ public AuthPlatform() /// if they come from a file. /// If the path is relative, base will the site's root directory. /// - [JsonProperty(PropertyName = "properties.configFilePath")] + [JsonProperty(PropertyName = "configFilePath")] public string ConfigFilePath { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectory.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectory.cs index 4c5adc65d09f..657115f7de5e 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectory.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectory.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the Azure Active directory provider. /// - [Rest.Serialization.JsonTransformation] - public partial class AzureActiveDirectory : ProxyOnlyResource + public partial class AzureActiveDirectory { /// /// Initializes a new instance of the AzureActiveDirectory class. @@ -32,10 +29,6 @@ public AzureActiveDirectory() /// /// Initializes a new instance of the AzureActiveDirectory class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the Azure /// Active Directory provider should not be enabled despite the set /// registration; otherwise, <code>true</code>. @@ -51,8 +44,7 @@ public AzureActiveDirectory() /// This is an internal flag primarily intended to support the Azure /// Management Portal. Users should not /// read or write to this property. - public AzureActiveDirectory(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), AzureActiveDirectoryRegistration registration = default(AzureActiveDirectoryRegistration), AzureActiveDirectoryLogin login = default(AzureActiveDirectoryLogin), AzureActiveDirectoryValidation validation = default(AzureActiveDirectoryValidation), bool? isAutoProvisioned = default(bool?)) - : base(id, name, kind, type) + public AzureActiveDirectory(bool? enabled = default(bool?), AzureActiveDirectoryRegistration registration = default(AzureActiveDirectoryRegistration), AzureActiveDirectoryLogin login = default(AzureActiveDirectoryLogin), AzureActiveDirectoryValidation validation = default(AzureActiveDirectoryValidation), bool? isAutoProvisioned = default(bool?)) { Enabled = enabled; Registration = registration; @@ -73,28 +65,28 @@ public AzureActiveDirectory() /// set registration; otherwise, /// &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// /// Gets or sets the configuration settings of the Azure Active /// Directory app registration. /// - [JsonProperty(PropertyName = "properties.registration")] + [JsonProperty(PropertyName = "registration")] public AzureActiveDirectoryRegistration Registration { get; set; } /// /// Gets or sets the configuration settings of the Azure Active /// Directory login flow. /// - [JsonProperty(PropertyName = "properties.login")] + [JsonProperty(PropertyName = "login")] public AzureActiveDirectoryLogin Login { get; set; } /// /// Gets or sets the configuration settings of the Azure Active /// Directory token validation flow. /// - [JsonProperty(PropertyName = "properties.validation")] + [JsonProperty(PropertyName = "validation")] public AzureActiveDirectoryValidation Validation { get; set; } /// @@ -104,7 +96,7 @@ public AzureActiveDirectory() /// Management Portal. Users should not /// read or write to this property. /// - [JsonProperty(PropertyName = "properties.isAutoProvisioned")] + [JsonProperty(PropertyName = "isAutoProvisioned")] public bool? IsAutoProvisioned { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryLogin.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryLogin.cs index 5f18bf96b2fe..8486ec2916c9 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryLogin.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryLogin.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -20,8 +18,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// /// The configuration settings of the Azure Active Directory login flow. /// - [Rest.Serialization.JsonTransformation] - public partial class AzureActiveDirectoryLogin : ProxyOnlyResource + public partial class AzureActiveDirectoryLogin { /// /// Initializes a new instance of the AzureActiveDirectoryLogin class. @@ -34,19 +31,17 @@ public AzureActiveDirectoryLogin() /// /// Initializes a new instance of the AzureActiveDirectoryLogin class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// Login parameters to send to the /// OpenID Connect authorization endpoint when /// a user logs in. Each parameter must be in the form /// "key=value". - public AzureActiveDirectoryLogin(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? disableWWWAuthenticate = default(bool?), IList loginParameters = default(IList)) - : base(id, name, kind, type) + /// <code>true</code> + /// if the www-authenticate provider should be omitted from the + /// request; otherwise, <code>false</code>. + public AzureActiveDirectoryLogin(IList loginParameters = default(IList), bool? disableWWWAuthenticate = default(bool?)) { - DisableWWWAuthenticate = disableWWWAuthenticate; LoginParameters = loginParameters; + DisableWWWAuthenticate = disableWWWAuthenticate; CustomInit(); } @@ -55,18 +50,21 @@ public AzureActiveDirectoryLogin() /// partial void CustomInit(); - /// - /// - [JsonProperty(PropertyName = "properties.disableWWWAuthenticate")] - public bool? DisableWWWAuthenticate { get; set; } - /// /// Gets or sets login parameters to send to the OpenID Connect /// authorization endpoint when /// a user logs in. Each parameter must be in the form "key=value". /// - [JsonProperty(PropertyName = "properties.loginParameters")] + [JsonProperty(PropertyName = "loginParameters")] public IList LoginParameters { get; set; } + /// + /// Gets or sets &lt;code&gt;true&lt;/code&gt; if the + /// www-authenticate provider should be omitted from the request; + /// otherwise, &lt;code&gt;false&lt;/code&gt;. + /// + [JsonProperty(PropertyName = "disableWWWAuthenticate")] + public bool? DisableWWWAuthenticate { get; set; } + } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryRegistration.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryRegistration.cs index e8d86b417f10..b6acd7515839 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryRegistration.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryRegistration.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the Azure Active Directory app /// registration. /// - [Rest.Serialization.JsonTransformation] - public partial class AzureActiveDirectoryRegistration : ProxyOnlyResource + public partial class AzureActiveDirectoryRegistration { /// /// Initializes a new instance of the AzureActiveDirectoryRegistration @@ -35,10 +32,6 @@ public AzureActiveDirectoryRegistration() /// Initializes a new instance of the AzureActiveDirectoryRegistration /// class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The OpenID Connect Issuer URI that /// represents the entity which issues access tokens for this /// application. @@ -62,13 +55,25 @@ public AzureActiveDirectoryRegistration() /// the client secret, that is the thumbprint of a certificate used for /// signing purposes. This property acts as /// a replacement for the Client Secret. It is also optional. - public AzureActiveDirectoryRegistration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string openIdIssuer = default(string), string clientId = default(string), string clientSecretSettingName = default(string), string clientSecretCertificateThumbprint = default(string)) - : base(id, name, kind, type) + /// An + /// alternative to the client secret thumbprint, that is the subject + /// alternative name of a certificate used for signing purposes. This + /// property acts as + /// a replacement for the Client Secret Certificate Thumbprint. It is + /// also optional. + /// An alternative to the + /// client secret thumbprint, that is the issuer of a certificate used + /// for signing purposes. This property acts as + /// a replacement for the Client Secret Certificate Thumbprint. It is + /// also optional. + public AzureActiveDirectoryRegistration(string openIdIssuer = default(string), string clientId = default(string), string clientSecretSettingName = default(string), string clientSecretCertificateThumbprint = default(string), string clientSecretCertificateSubjectAlternativeName = default(string), string clientSecretCertificateIssuer = default(string)) { OpenIdIssuer = openIdIssuer; ClientId = clientId; ClientSecretSettingName = clientSecretSettingName; ClientSecretCertificateThumbprint = clientSecretCertificateThumbprint; + ClientSecretCertificateSubjectAlternativeName = clientSecretCertificateSubjectAlternativeName; + ClientSecretCertificateIssuer = clientSecretCertificateIssuer; CustomInit(); } @@ -87,7 +92,7 @@ public AzureActiveDirectoryRegistration() /// More information on OpenID Connect Discovery: /// http://openid.net/specs/openid-connect-discovery-1_0.html /// - [JsonProperty(PropertyName = "properties.openIdIssuer")] + [JsonProperty(PropertyName = "openIdIssuer")] public string OpenIdIssuer { get; set; } /// @@ -99,14 +104,14 @@ public AzureActiveDirectoryRegistration() /// More information on OpenID Connect: /// http://openid.net/specs/openid-connect-core-1_0.html /// - [JsonProperty(PropertyName = "properties.clientId")] + [JsonProperty(PropertyName = "clientId")] public string ClientId { get; set; } /// /// Gets or sets the app setting name that contains the client secret /// of the relying party application. /// - [JsonProperty(PropertyName = "properties.clientSecretSettingName")] + [JsonProperty(PropertyName = "clientSecretSettingName")] public string ClientSecretSettingName { get; set; } /// @@ -115,8 +120,28 @@ public AzureActiveDirectoryRegistration() /// property acts as /// a replacement for the Client Secret. It is also optional. /// - [JsonProperty(PropertyName = "properties.clientSecretCertificateThumbprint")] + [JsonProperty(PropertyName = "clientSecretCertificateThumbprint")] public string ClientSecretCertificateThumbprint { get; set; } + /// + /// Gets or sets an alternative to the client secret thumbprint, that + /// is the subject alternative name of a certificate used for signing + /// purposes. This property acts as + /// a replacement for the Client Secret Certificate Thumbprint. It is + /// also optional. + /// + [JsonProperty(PropertyName = "clientSecretCertificateSubjectAlternativeName")] + public string ClientSecretCertificateSubjectAlternativeName { get; set; } + + /// + /// Gets or sets an alternative to the client secret thumbprint, that + /// is the issuer of a certificate used for signing purposes. This + /// property acts as + /// a replacement for the Client Secret Certificate Thumbprint. It is + /// also optional. + /// + [JsonProperty(PropertyName = "clientSecretCertificateIssuer")] + public string ClientSecretCertificateIssuer { get; set; } + } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryValidation.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryValidation.cs index 3b81d7a90c8b..5cb5944d7f1a 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryValidation.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureActiveDirectoryValidation.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -21,8 +19,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the Azure Active Directory token /// validation flow. /// - [Rest.Serialization.JsonTransformation] - public partial class AzureActiveDirectoryValidation : ProxyOnlyResource + public partial class AzureActiveDirectoryValidation { /// /// Initializes a new instance of the AzureActiveDirectoryValidation @@ -37,19 +34,17 @@ public AzureActiveDirectoryValidation() /// Initializes a new instance of the AzureActiveDirectoryValidation /// class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The configuration settings of the /// checks that should be made while validating the JWT Claims. /// The list of audiences that can make /// successful authentication/authorization requests. - public AzureActiveDirectoryValidation(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), JwtClaimChecks jwtClaimChecks = default(JwtClaimChecks), IList allowedAudiences = default(IList)) - : base(id, name, kind, type) + /// The configuration settings + /// of the default authorization policy. + public AzureActiveDirectoryValidation(JwtClaimChecks jwtClaimChecks = default(JwtClaimChecks), IList allowedAudiences = default(IList), DefaultAuthorizationPolicy defaultAuthorizationPolicy = default(DefaultAuthorizationPolicy)) { JwtClaimChecks = jwtClaimChecks; AllowedAudiences = allowedAudiences; + DefaultAuthorizationPolicy = defaultAuthorizationPolicy; CustomInit(); } @@ -62,15 +57,22 @@ public AzureActiveDirectoryValidation() /// Gets or sets the configuration settings of the checks that should /// be made while validating the JWT Claims. /// - [JsonProperty(PropertyName = "properties.jwtClaimChecks")] + [JsonProperty(PropertyName = "jwtClaimChecks")] public JwtClaimChecks JwtClaimChecks { get; set; } /// /// Gets or sets the list of audiences that can make successful /// authentication/authorization requests. /// - [JsonProperty(PropertyName = "properties.allowedAudiences")] + [JsonProperty(PropertyName = "allowedAudiences")] public IList AllowedAudiences { get; set; } + /// + /// Gets or sets the configuration settings of the default + /// authorization policy. + /// + [JsonProperty(PropertyName = "defaultAuthorizationPolicy")] + public DefaultAuthorizationPolicy DefaultAuthorizationPolicy { get; set; } + } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureStaticWebApps.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureStaticWebApps.cs index 46b15f342424..402802981d6a 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureStaticWebApps.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureStaticWebApps.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the Azure Static Web Apps provider. /// - [Rest.Serialization.JsonTransformation] - public partial class AzureStaticWebApps : ProxyOnlyResource + public partial class AzureStaticWebApps { /// /// Initializes a new instance of the AzureStaticWebApps class. @@ -32,17 +29,12 @@ public AzureStaticWebApps() /// /// Initializes a new instance of the AzureStaticWebApps class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the Azure /// Static Web Apps provider should not be enabled despite the set /// registration; otherwise, <code>true</code>. /// The configuration settings of the Azure /// Static Web Apps registration. - public AzureStaticWebApps(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), AzureStaticWebAppsRegistration registration = default(AzureStaticWebAppsRegistration)) - : base(id, name, kind, type) + public AzureStaticWebApps(bool? enabled = default(bool?), AzureStaticWebAppsRegistration registration = default(AzureStaticWebAppsRegistration)) { Enabled = enabled; Registration = registration; @@ -60,14 +52,14 @@ public AzureStaticWebApps() /// set registration; otherwise, /// &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// /// Gets or sets the configuration settings of the Azure Static Web /// Apps registration. /// - [JsonProperty(PropertyName = "properties.registration")] + [JsonProperty(PropertyName = "registration")] public AzureStaticWebAppsRegistration Registration { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureStaticWebAppsRegistration.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureStaticWebAppsRegistration.cs index 7f65e2ba278d..efecde941530 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureStaticWebAppsRegistration.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AzureStaticWebAppsRegistration.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the registration for the Azure Static Web /// Apps provider /// - [Rest.Serialization.JsonTransformation] - public partial class AzureStaticWebAppsRegistration : ProxyOnlyResource + public partial class AzureStaticWebAppsRegistration { /// /// Initializes a new instance of the AzureStaticWebAppsRegistration @@ -35,14 +32,9 @@ public AzureStaticWebAppsRegistration() /// Initializes a new instance of the AzureStaticWebAppsRegistration /// class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The Client ID of the app used for /// login. - public AzureStaticWebAppsRegistration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string clientId = default(string)) - : base(id, name, kind, type) + public AzureStaticWebAppsRegistration(string clientId = default(string)) { ClientId = clientId; CustomInit(); @@ -56,7 +48,7 @@ public AzureStaticWebAppsRegistration() /// /// Gets or sets the Client ID of the app used for login. /// - [JsonProperty(PropertyName = "properties.clientId")] + [JsonProperty(PropertyName = "clientId")] public string ClientId { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/BlobStorageTokenStore.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/BlobStorageTokenStore.cs index 312e424b75d5..24de4ad0da64 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/BlobStorageTokenStore.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/BlobStorageTokenStore.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the storage of the tokens if blob storage /// is used. /// - [Rest.Serialization.JsonTransformation] - public partial class BlobStorageTokenStore : ProxyOnlyResource + public partial class BlobStorageTokenStore { /// /// Initializes a new instance of the BlobStorageTokenStore class. @@ -33,15 +30,10 @@ public BlobStorageTokenStore() /// /// Initializes a new instance of the BlobStorageTokenStore class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The name of the app setting /// containing the SAS URL of the blob storage containing the /// tokens. - public BlobStorageTokenStore(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string sasUrlSettingName = default(string)) - : base(id, name, kind, type) + public BlobStorageTokenStore(string sasUrlSettingName = default(string)) { SasUrlSettingName = sasUrlSettingName; CustomInit(); @@ -56,7 +48,7 @@ public BlobStorageTokenStore() /// Gets or sets the name of the app setting containing the SAS URL of /// the blob storage containing the tokens. /// - [JsonProperty(PropertyName = "properties.sasUrlSettingName")] + [JsonProperty(PropertyName = "sasUrlSettingName")] public string SasUrlSettingName { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ClientRegistration.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ClientRegistration.cs index 53c9e5bc455f..136b29101b95 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ClientRegistration.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ClientRegistration.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the app registration for providers that /// have client ids and client secrets /// - [Rest.Serialization.JsonTransformation] - public partial class ClientRegistration : ProxyOnlyResource + public partial class ClientRegistration { /// /// Initializes a new instance of the ClientRegistration class. @@ -33,16 +30,11 @@ public ClientRegistration() /// /// Initializes a new instance of the ClientRegistration class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The Client ID of the app used for /// login. /// The app setting name that /// contains the client secret. - public ClientRegistration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string clientId = default(string), string clientSecretSettingName = default(string)) - : base(id, name, kind, type) + public ClientRegistration(string clientId = default(string), string clientSecretSettingName = default(string)) { ClientId = clientId; ClientSecretSettingName = clientSecretSettingName; @@ -57,13 +49,13 @@ public ClientRegistration() /// /// Gets or sets the Client ID of the app used for login. /// - [JsonProperty(PropertyName = "properties.clientId")] + [JsonProperty(PropertyName = "clientId")] public string ClientId { get; set; } /// /// Gets or sets the app setting name that contains the client secret. /// - [JsonProperty(PropertyName = "properties.clientSecretSettingName")] + [JsonProperty(PropertyName = "clientSecretSettingName")] public string ClientSecretSettingName { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CookieExpiration.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CookieExpiration.cs index 8c65dc752591..89a992a8f4d5 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CookieExpiration.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CookieExpiration.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the session cookie's expiration. /// - [Rest.Serialization.JsonTransformation] - public partial class CookieExpiration : ProxyOnlyResource + public partial class CookieExpiration { /// /// Initializes a new instance of the CookieExpiration class. @@ -32,17 +29,12 @@ public CookieExpiration() /// /// Initializes a new instance of the CookieExpiration class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The convention used when determining the /// session cookie's expiration. Possible values include: 'FixedTime', /// 'IdentityProviderDerived' /// The time after the request is made /// when the session cookie should expire. - public CookieExpiration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), CookieExpirationConvention? convention = default(CookieExpirationConvention?), string timeToExpiration = default(string)) - : base(id, name, kind, type) + public CookieExpiration(CookieExpirationConvention? convention = default(CookieExpirationConvention?), string timeToExpiration = default(string)) { Convention = convention; TimeToExpiration = timeToExpiration; @@ -59,14 +51,14 @@ public CookieExpiration() /// cookie's expiration. Possible values include: 'FixedTime', /// 'IdentityProviderDerived' /// - [JsonProperty(PropertyName = "properties.convention")] + [JsonProperty(PropertyName = "convention")] public CookieExpirationConvention? Convention { get; set; } /// /// Gets or sets the time after the request is made when the session /// cookie should expire. /// - [JsonProperty(PropertyName = "properties.timeToExpiration")] + [JsonProperty(PropertyName = "timeToExpiration")] public string TimeToExpiration { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CustomOpenIdConnectProvider.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CustomOpenIdConnectProvider.cs index 3a5ff17ecd4b..9e3e3b998db0 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CustomOpenIdConnectProvider.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CustomOpenIdConnectProvider.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the custom Open ID Connect provider. /// - [Rest.Serialization.JsonTransformation] - public partial class CustomOpenIdConnectProvider : ProxyOnlyResource + public partial class CustomOpenIdConnectProvider { /// /// Initializes a new instance of the CustomOpenIdConnectProvider @@ -34,10 +31,6 @@ public CustomOpenIdConnectProvider() /// Initializes a new instance of the CustomOpenIdConnectProvider /// class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the custom /// Open ID provider provider should not be enabled; otherwise, /// <code>true</code>. @@ -45,8 +38,7 @@ public CustomOpenIdConnectProvider() /// registration for the custom Open ID Connect provider. /// The configuration settings of the login flow of /// the custom Open ID Connect provider. - public CustomOpenIdConnectProvider(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), OpenIdConnectRegistration registration = default(OpenIdConnectRegistration), OpenIdConnectLogin login = default(OpenIdConnectLogin)) - : base(id, name, kind, type) + public CustomOpenIdConnectProvider(bool? enabled = default(bool?), OpenIdConnectRegistration registration = default(OpenIdConnectRegistration), OpenIdConnectLogin login = default(OpenIdConnectLogin)) { Enabled = enabled; Registration = registration; @@ -64,21 +56,21 @@ public CustomOpenIdConnectProvider() /// custom Open ID provider provider should not be enabled; otherwise, /// &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// /// Gets or sets the configuration settings of the app registration for /// the custom Open ID Connect provider. /// - [JsonProperty(PropertyName = "properties.registration")] + [JsonProperty(PropertyName = "registration")] public OpenIdConnectRegistration Registration { get; set; } /// /// Gets or sets the configuration settings of the login flow of the /// custom Open ID Connect provider. /// - [JsonProperty(PropertyName = "properties.login")] + [JsonProperty(PropertyName = "login")] public OpenIdConnectLogin Login { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DefaultAuthorizationPolicy.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DefaultAuthorizationPolicy.cs new file mode 100644 index 000000000000..4127dc17ef27 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DefaultAuthorizationPolicy.cs @@ -0,0 +1,66 @@ +// +// 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.WebSites.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The configuration settings of the Azure Active Directory default + /// authorization policy. + /// + public partial class DefaultAuthorizationPolicy + { + /// + /// Initializes a new instance of the DefaultAuthorizationPolicy class. + /// + public DefaultAuthorizationPolicy() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the DefaultAuthorizationPolicy class. + /// + /// The configuration settings of the + /// Azure Active Directory allowed principals. + /// The configuration settings of the + /// Azure Active Directory allowed applications. + public DefaultAuthorizationPolicy(AllowedPrincipals allowedPrincipals = default(AllowedPrincipals), IList allowedApplications = default(IList)) + { + AllowedPrincipals = allowedPrincipals; + AllowedApplications = allowedApplications; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the configuration settings of the Azure Active + /// Directory allowed principals. + /// + [JsonProperty(PropertyName = "allowedPrincipals")] + public AllowedPrincipals AllowedPrincipals { get; set; } + + /// + /// Gets or sets the configuration settings of the Azure Active + /// Directory allowed applications. + /// + [JsonProperty(PropertyName = "allowedApplications")] + public IList AllowedApplications { get; set; } + + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DetectorDefinition.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DetectorDefinition.cs index bcccb400ddc8..19ffd3d12c0d 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DetectorDefinition.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DetectorDefinition.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// Class representing detector definition /// - [Rest.Serialization.JsonTransformation] - public partial class DetectorDefinition : ProxyOnlyResource + public partial class DetectorDefinition { /// /// Initializes a new instance of the DetectorDefinition class. @@ -32,17 +29,12 @@ public DetectorDefinition() /// /// Initializes a new instance of the DetectorDefinition class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// Display name of the detector /// Description of the detector /// Detector Rank /// Flag representing whether detector is /// enabled or not. - public DetectorDefinition(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string displayName = default(string), string description = default(string), double? rank = default(double?), bool? isEnabled = default(bool?)) - : base(id, name, kind, type) + public DetectorDefinition(string displayName = default(string), string description = default(string), double? rank = default(double?), bool? isEnabled = default(bool?)) { DisplayName = displayName; Description = description; @@ -59,25 +51,25 @@ public DetectorDefinition() /// /// Gets display name of the detector /// - [JsonProperty(PropertyName = "properties.displayName")] + [JsonProperty(PropertyName = "displayName")] public string DisplayName { get; private set; } /// /// Gets description of the detector /// - [JsonProperty(PropertyName = "properties.description")] + [JsonProperty(PropertyName = "description")] public string Description { get; private set; } /// /// Gets detector Rank /// - [JsonProperty(PropertyName = "properties.rank")] + [JsonProperty(PropertyName = "rank")] public double? Rank { get; private set; } /// /// Gets flag representing whether detector is enabled or not. /// - [JsonProperty(PropertyName = "properties.isEnabled")] + [JsonProperty(PropertyName = "isEnabled")] public bool? IsEnabled { get; private set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DetectorDefinitionResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DetectorDefinitionResource.cs new file mode 100644 index 000000000000..2823dba0e9c5 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DetectorDefinitionResource.cs @@ -0,0 +1,84 @@ +// +// 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.WebSites.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Linq; + + /// + /// ARM resource for a detector definition + /// + [Rest.Serialization.JsonTransformation] + public partial class DetectorDefinitionResource : ProxyOnlyResource + { + /// + /// Initializes a new instance of the DetectorDefinitionResource class. + /// + public DetectorDefinitionResource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the DetectorDefinitionResource class. + /// + /// Resource Id. + /// Resource Name. + /// Kind of resource. + /// Resource type. + /// Display name of the detector + /// Description of the detector + /// Detector Rank + /// Flag representing whether detector is + /// enabled or not. + public DetectorDefinitionResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string displayName = default(string), string description = default(string), double? rank = default(double?), bool? isEnabled = default(bool?)) + : base(id, name, kind, type) + { + DisplayName = displayName; + Description = description; + Rank = rank; + IsEnabled = isEnabled; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets display name of the detector + /// + [JsonProperty(PropertyName = "properties.displayName")] + public string DisplayName { get; private set; } + + /// + /// Gets description of the detector + /// + [JsonProperty(PropertyName = "properties.description")] + public string Description { get; private set; } + + /// + /// Gets detector Rank + /// + [JsonProperty(PropertyName = "properties.rank")] + public double? Rank { get; private set; } + + /// + /// Gets flag representing whether detector is enabled or not. + /// + [JsonProperty(PropertyName = "properties.isEnabled")] + public bool? IsEnabled { get; private set; } + + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/EnterpriseGradeCdnStatus.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/EnterpriseGradeCdnStatus.cs new file mode 100644 index 000000000000..60ae58fea6f1 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/EnterpriseGradeCdnStatus.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.WebSites.Models +{ + + /// + /// Defines values for EnterpriseGradeCdnStatus. + /// + public static class EnterpriseGradeCdnStatus + { + public const string Enabled = "Enabled"; + public const string Enabling = "Enabling"; + public const string Disabled = "Disabled"; + public const string Disabling = "Disabling"; + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ErrorEntity.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ErrorEntity.cs index d4452c070a90..2b2a84aac2bc 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ErrorEntity.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ErrorEntity.cs @@ -35,14 +35,18 @@ public ErrorEntity() /// Message template. /// Parameters for the template. /// Inner errors. + /// Error Details. + /// The error target. /// Basic error code. /// Any details of the error. - public ErrorEntity(string extendedCode = default(string), string messageTemplate = default(string), IList parameters = default(IList), IList innerErrors = default(IList), string code = default(string), string message = default(string)) + public ErrorEntity(string extendedCode = default(string), string messageTemplate = default(string), IList parameters = default(IList), IList innerErrors = default(IList), IList details = default(IList), string target = default(string), string code = default(string), string message = default(string)) { ExtendedCode = extendedCode; MessageTemplate = messageTemplate; Parameters = parameters; InnerErrors = innerErrors; + Details = details; + Target = target; Code = code; Message = message; CustomInit(); @@ -77,6 +81,18 @@ public ErrorEntity() [JsonProperty(PropertyName = "innerErrors")] public IList InnerErrors { get; set; } + /// + /// Gets or sets error Details. + /// + [JsonProperty(PropertyName = "details")] + public IList Details { get; set; } + + /// + /// Gets or sets the error target. + /// + [JsonProperty(PropertyName = "target")] + public string Target { get; set; } + /// /// Gets or sets basic error code. /// diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Facebook.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Facebook.cs index 2cab9bdfebc6..69d8edcdb57f 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Facebook.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Facebook.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the Facebook provider. /// - [Rest.Serialization.JsonTransformation] - public partial class Facebook : ProxyOnlyResource + public partial class Facebook { /// /// Initializes a new instance of the Facebook class. @@ -32,10 +29,6 @@ public Facebook() /// /// Initializes a new instance of the Facebook class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the /// Facebook provider should not be enabled despite the set /// registration; otherwise, <code>true</code>. @@ -45,8 +38,7 @@ public Facebook() /// used while logging in. /// The configuration settings of the login /// flow. - public Facebook(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), AppRegistration registration = default(AppRegistration), string graphApiVersion = default(string), LoginScopes login = default(LoginScopes)) - : base(id, name, kind, type) + public Facebook(bool? enabled = default(bool?), AppRegistration registration = default(AppRegistration), string graphApiVersion = default(string), LoginScopes login = default(LoginScopes)) { Enabled = enabled; Registration = registration; @@ -66,27 +58,27 @@ public Facebook() /// registration; otherwise, /// &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// /// Gets or sets the configuration settings of the app registration for /// the Facebook provider. /// - [JsonProperty(PropertyName = "properties.registration")] + [JsonProperty(PropertyName = "registration")] public AppRegistration Registration { get; set; } /// /// Gets or sets the version of the Facebook api to be used while /// logging in. /// - [JsonProperty(PropertyName = "properties.graphApiVersion")] + [JsonProperty(PropertyName = "graphApiVersion")] public string GraphApiVersion { get; set; } /// /// Gets or sets the configuration settings of the login flow. /// - [JsonProperty(PropertyName = "properties.login")] + [JsonProperty(PropertyName = "login")] public LoginScopes Login { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FileSystemTokenStore.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FileSystemTokenStore.cs index 405d456abb74..9615258c10d5 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FileSystemTokenStore.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FileSystemTokenStore.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the storage of the tokens if a file /// system is used. /// - [Rest.Serialization.JsonTransformation] - public partial class FileSystemTokenStore : ProxyOnlyResource + public partial class FileSystemTokenStore { /// /// Initializes a new instance of the FileSystemTokenStore class. @@ -33,14 +30,9 @@ public FileSystemTokenStore() /// /// Initializes a new instance of the FileSystemTokenStore class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The directory in which the tokens will be /// stored. - public FileSystemTokenStore(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string directory = default(string)) - : base(id, name, kind, type) + public FileSystemTokenStore(string directory = default(string)) { Directory = directory; CustomInit(); @@ -54,7 +46,7 @@ public FileSystemTokenStore() /// /// Gets or sets the directory in which the tokens will be stored. /// - [JsonProperty(PropertyName = "properties.directory")] + [JsonProperty(PropertyName = "directory")] public string Directory { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ForwardProxy.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ForwardProxy.cs index bd53d61ffe31..337f4b4b21b6 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ForwardProxy.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ForwardProxy.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of a forward proxy used to make the /// requests. /// - [Rest.Serialization.JsonTransformation] - public partial class ForwardProxy : ProxyOnlyResource + public partial class ForwardProxy { /// /// Initializes a new instance of the ForwardProxy class. @@ -33,10 +30,6 @@ public ForwardProxy() /// /// Initializes a new instance of the ForwardProxy class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The convention used to determine the url /// of the request made. Possible values include: 'NoProxy', /// 'Standard', 'Custom' @@ -44,8 +37,7 @@ public ForwardProxy() /// containing the host of the request. /// The name of the header /// containing the scheme of the request. - public ForwardProxy(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), ForwardProxyConvention? convention = default(ForwardProxyConvention?), string customHostHeaderName = default(string), string customProtoHeaderName = default(string)) - : base(id, name, kind, type) + public ForwardProxy(ForwardProxyConvention? convention = default(ForwardProxyConvention?), string customHostHeaderName = default(string), string customProtoHeaderName = default(string)) { Convention = convention; CustomHostHeaderName = customHostHeaderName; @@ -63,21 +55,21 @@ public ForwardProxy() /// request made. Possible values include: 'NoProxy', 'Standard', /// 'Custom' /// - [JsonProperty(PropertyName = "properties.convention")] + [JsonProperty(PropertyName = "convention")] public ForwardProxyConvention? Convention { get; set; } /// /// Gets or sets the name of the header containing the host of the /// request. /// - [JsonProperty(PropertyName = "properties.customHostHeaderName")] + [JsonProperty(PropertyName = "customHostHeaderName")] public string CustomHostHeaderName { get; set; } /// /// Gets or sets the name of the header containing the scheme of the /// request. /// - [JsonProperty(PropertyName = "properties.customProtoHeaderName")] + [JsonProperty(PropertyName = "customProtoHeaderName")] public string CustomProtoHeaderName { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GitHub.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GitHub.cs index 01a3ecabe7bb..dce8ae3cddcd 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GitHub.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GitHub.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the GitHub provider. /// - [Rest.Serialization.JsonTransformation] - public partial class GitHub : ProxyOnlyResource + public partial class GitHub { /// /// Initializes a new instance of the GitHub class. @@ -32,10 +29,6 @@ public GitHub() /// /// Initializes a new instance of the GitHub class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the GitHub /// provider should not be enabled despite the set registration; /// otherwise, <code>true</code>. @@ -43,8 +36,7 @@ public GitHub() /// registration for the GitHub provider. /// The configuration settings of the login /// flow. - public GitHub(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), ClientRegistration registration = default(ClientRegistration), LoginScopes login = default(LoginScopes)) - : base(id, name, kind, type) + public GitHub(bool? enabled = default(bool?), ClientRegistration registration = default(ClientRegistration), LoginScopes login = default(LoginScopes)) { Enabled = enabled; Registration = registration; @@ -62,20 +54,20 @@ public GitHub() /// GitHub provider should not be enabled despite the set registration; /// otherwise, &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// /// Gets or sets the configuration settings of the app registration for /// the GitHub provider. /// - [JsonProperty(PropertyName = "properties.registration")] + [JsonProperty(PropertyName = "registration")] public ClientRegistration Registration { get; set; } /// /// Gets or sets the configuration settings of the login flow. /// - [JsonProperty(PropertyName = "properties.login")] + [JsonProperty(PropertyName = "login")] public LoginScopes Login { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GlobalValidation.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GlobalValidation.cs index 10a361a69831..65a1db2c3259 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GlobalValidation.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GlobalValidation.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -21,8 +19,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings that determines the validation flow of users /// using App Service Authentication/Authorization. /// - [Rest.Serialization.JsonTransformation] - public partial class GlobalValidation : ProxyOnlyResource + public partial class GlobalValidation { /// /// Initializes a new instance of the GlobalValidation class. @@ -35,10 +32,6 @@ public GlobalValidation() /// /// Initializes a new instance of the GlobalValidation class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>true</code> /// if the authentication flow is required any request is made; /// otherwise, <code>false</code>. @@ -53,8 +46,7 @@ public GlobalValidation() /// action is set to "RedirectToLoginPage". /// The paths for which unauthenticated /// flow would not be redirected to the login page. - public GlobalValidation(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? requireAuthentication = default(bool?), UnauthenticatedClientActionV2? unauthenticatedClientAction = default(UnauthenticatedClientActionV2?), string redirectToProvider = default(string), IList excludedPaths = default(IList)) - : base(id, name, kind, type) + public GlobalValidation(bool? requireAuthentication = default(bool?), UnauthenticatedClientActionV2? unauthenticatedClientAction = default(UnauthenticatedClientActionV2?), string redirectToProvider = default(string), IList excludedPaths = default(IList)) { RequireAuthentication = requireAuthentication; UnauthenticatedClientAction = unauthenticatedClientAction; @@ -73,7 +65,7 @@ public GlobalValidation() /// authentication flow is required any request is made; otherwise, /// &lt;code&gt;false&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.requireAuthentication")] + [JsonProperty(PropertyName = "requireAuthentication")] public bool? RequireAuthentication { get; set; } /// @@ -81,7 +73,7 @@ public GlobalValidation() /// attempts to access the app. Possible values include: /// 'RedirectToLoginPage', 'AllowAnonymous', 'Return401', 'Return403' /// - [JsonProperty(PropertyName = "properties.unauthenticatedClientAction")] + [JsonProperty(PropertyName = "unauthenticatedClientAction")] public UnauthenticatedClientActionV2? UnauthenticatedClientAction { get; set; } /// @@ -91,14 +83,14 @@ public GlobalValidation() /// and the unauthenticated client /// action is set to "RedirectToLoginPage". /// - [JsonProperty(PropertyName = "properties.redirectToProvider")] + [JsonProperty(PropertyName = "redirectToProvider")] public string RedirectToProvider { get; set; } /// /// Gets or sets the paths for which unauthenticated flow would not be /// redirected to the login page. /// - [JsonProperty(PropertyName = "properties.excludedPaths")] + [JsonProperty(PropertyName = "excludedPaths")] public IList ExcludedPaths { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Google.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Google.cs index 88a648867d73..b5312ed9d315 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Google.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Google.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the Google provider. /// - [Rest.Serialization.JsonTransformation] - public partial class Google : ProxyOnlyResource + public partial class Google { /// /// Initializes a new instance of the Google class. @@ -32,10 +29,6 @@ public Google() /// /// Initializes a new instance of the Google class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the Google /// provider should not be enabled despite the set registration; /// otherwise, <code>true</code>. @@ -45,8 +38,7 @@ public Google() /// flow. /// The configuration settings of the Azure /// Active Directory token validation flow. - public Google(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), ClientRegistration registration = default(ClientRegistration), LoginScopes login = default(LoginScopes), AllowedAudiencesValidation validation = default(AllowedAudiencesValidation)) - : base(id, name, kind, type) + public Google(bool? enabled = default(bool?), ClientRegistration registration = default(ClientRegistration), LoginScopes login = default(LoginScopes), AllowedAudiencesValidation validation = default(AllowedAudiencesValidation)) { Enabled = enabled; Registration = registration; @@ -65,27 +57,27 @@ public Google() /// Google provider should not be enabled despite the set registration; /// otherwise, &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// /// Gets or sets the configuration settings of the app registration for /// the Google provider. /// - [JsonProperty(PropertyName = "properties.registration")] + [JsonProperty(PropertyName = "registration")] public ClientRegistration Registration { get; set; } /// /// Gets or sets the configuration settings of the login flow. /// - [JsonProperty(PropertyName = "properties.login")] + [JsonProperty(PropertyName = "login")] public LoginScopes Login { get; set; } /// /// Gets or sets the configuration settings of the Azure Active /// Directory token validation flow. /// - [JsonProperty(PropertyName = "properties.validation")] + [JsonProperty(PropertyName = "validation")] public AllowedAudiencesValidation Validation { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HttpSettings.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HttpSettings.cs index e57e53390fcd..1f52e35038f3 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HttpSettings.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HttpSettings.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -20,8 +18,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// authorization requests made against App Service /// Authentication/Authorization. /// - [Rest.Serialization.JsonTransformation] - public partial class HttpSettings : ProxyOnlyResource + public partial class HttpSettings { /// /// Initializes a new instance of the HttpSettings class. @@ -34,10 +31,6 @@ public HttpSettings() /// /// Initializes a new instance of the HttpSettings class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the /// authentication/authorization responses not having the HTTPS scheme /// are permissible; otherwise, <code>true</code>. @@ -45,8 +38,7 @@ public HttpSettings() /// requests. /// The configuration settings of a forward /// proxy used to make the requests. - public HttpSettings(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? requireHttps = default(bool?), HttpSettingsRoutes routes = default(HttpSettingsRoutes), ForwardProxy forwardProxy = default(ForwardProxy)) - : base(id, name, kind, type) + public HttpSettings(bool? requireHttps = default(bool?), HttpSettingsRoutes routes = default(HttpSettingsRoutes), ForwardProxy forwardProxy = default(ForwardProxy)) { RequireHttps = requireHttps; Routes = routes; @@ -65,20 +57,20 @@ public HttpSettings() /// are permissible; otherwise, /// &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.requireHttps")] + [JsonProperty(PropertyName = "requireHttps")] public bool? RequireHttps { get; set; } /// /// Gets or sets the configuration settings of the paths HTTP requests. /// - [JsonProperty(PropertyName = "properties.routes")] + [JsonProperty(PropertyName = "routes")] public HttpSettingsRoutes Routes { get; set; } /// /// Gets or sets the configuration settings of a forward proxy used to /// make the requests. /// - [JsonProperty(PropertyName = "properties.forwardProxy")] + [JsonProperty(PropertyName = "forwardProxy")] public ForwardProxy ForwardProxy { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HttpSettingsRoutes.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HttpSettingsRoutes.cs index 92ac617b5368..93693d8f9f03 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HttpSettingsRoutes.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HttpSettingsRoutes.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the paths HTTP requests. /// - [Rest.Serialization.JsonTransformation] - public partial class HttpSettingsRoutes : ProxyOnlyResource + public partial class HttpSettingsRoutes { /// /// Initializes a new instance of the HttpSettingsRoutes class. @@ -32,14 +29,9 @@ public HttpSettingsRoutes() /// /// Initializes a new instance of the HttpSettingsRoutes class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The prefix that should precede all the /// authentication/authorization paths. - public HttpSettingsRoutes(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string apiPrefix = default(string)) - : base(id, name, kind, type) + public HttpSettingsRoutes(string apiPrefix = default(string)) { ApiPrefix = apiPrefix; CustomInit(); @@ -54,7 +46,7 @@ public HttpSettingsRoutes() /// Gets or sets the prefix that should precede all the /// authentication/authorization paths. /// - [JsonProperty(PropertyName = "properties.apiPrefix")] + [JsonProperty(PropertyName = "apiPrefix")] public string ApiPrefix { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IdentityProviders.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IdentityProviders.cs index df08efecfb75..ec87d3a0f13b 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IdentityProviders.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IdentityProviders.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -21,8 +19,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of each of the identity providers used to /// configure App Service Authentication/Authorization. /// - [Rest.Serialization.JsonTransformation] - public partial class IdentityProviders : ProxyOnlyResource + public partial class IdentityProviders { /// /// Initializes a new instance of the IdentityProviders class. @@ -35,10 +32,6 @@ public IdentityProviders() /// /// Initializes a new instance of the IdentityProviders class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The configuration settings of /// the Azure Active directory provider. /// The configuration settings of the Facebook @@ -47,30 +40,29 @@ public IdentityProviders() /// provider. /// The configuration settings of the Google /// provider. - /// The configuration settings of the Twitter - /// provider. - /// The map of the name of - /// the alias of each custom Open ID Connect provider to the - /// configuration settings of the custom Open ID Connect - /// provider. /// The configuration settings of /// the legacy Microsoft Account provider. + /// The configuration settings of the Twitter + /// provider. /// The configuration settings of the Apple /// provider. /// The configuration settings of the /// Azure Static Web Apps provider. - public IdentityProviders(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), AzureActiveDirectory azureActiveDirectory = default(AzureActiveDirectory), Facebook facebook = default(Facebook), GitHub gitHub = default(GitHub), Google google = default(Google), Twitter twitter = default(Twitter), IDictionary customOpenIdConnectProviders = default(IDictionary), LegacyMicrosoftAccount legacyMicrosoftAccount = default(LegacyMicrosoftAccount), Apple apple = default(Apple), AzureStaticWebApps azureStaticWebApps = default(AzureStaticWebApps)) - : base(id, name, kind, type) + /// The map of the name of + /// the alias of each custom Open ID Connect provider to the + /// configuration settings of the custom Open ID Connect + /// provider. + public IdentityProviders(AzureActiveDirectory azureActiveDirectory = default(AzureActiveDirectory), Facebook facebook = default(Facebook), GitHub gitHub = default(GitHub), Google google = default(Google), LegacyMicrosoftAccount legacyMicrosoftAccount = default(LegacyMicrosoftAccount), Twitter twitter = default(Twitter), Apple apple = default(Apple), AzureStaticWebApps azureStaticWebApps = default(AzureStaticWebApps), IDictionary customOpenIdConnectProviders = default(IDictionary)) { AzureActiveDirectory = azureActiveDirectory; Facebook = facebook; GitHub = gitHub; Google = google; - Twitter = twitter; - CustomOpenIdConnectProviders = customOpenIdConnectProviders; LegacyMicrosoftAccount = legacyMicrosoftAccount; + Twitter = twitter; Apple = apple; AzureStaticWebApps = azureStaticWebApps; + CustomOpenIdConnectProviders = customOpenIdConnectProviders; CustomInit(); } @@ -83,60 +75,60 @@ public IdentityProviders() /// Gets or sets the configuration settings of the Azure Active /// directory provider. /// - [JsonProperty(PropertyName = "properties.azureActiveDirectory")] + [JsonProperty(PropertyName = "azureActiveDirectory")] public AzureActiveDirectory AzureActiveDirectory { get; set; } /// /// Gets or sets the configuration settings of the Facebook provider. /// - [JsonProperty(PropertyName = "properties.facebook")] + [JsonProperty(PropertyName = "facebook")] public Facebook Facebook { get; set; } /// /// Gets or sets the configuration settings of the GitHub provider. /// - [JsonProperty(PropertyName = "properties.gitHub")] + [JsonProperty(PropertyName = "gitHub")] public GitHub GitHub { get; set; } /// /// Gets or sets the configuration settings of the Google provider. /// - [JsonProperty(PropertyName = "properties.google")] + [JsonProperty(PropertyName = "google")] public Google Google { get; set; } - /// - /// Gets or sets the configuration settings of the Twitter provider. - /// - [JsonProperty(PropertyName = "properties.twitter")] - public Twitter Twitter { get; set; } - - /// - /// Gets or sets the map of the name of the alias of each custom Open - /// ID Connect provider to the - /// configuration settings of the custom Open ID Connect provider. - /// - [JsonProperty(PropertyName = "properties.customOpenIdConnectProviders")] - public IDictionary CustomOpenIdConnectProviders { get; set; } - /// /// Gets or sets the configuration settings of the legacy Microsoft /// Account provider. /// - [JsonProperty(PropertyName = "properties.legacyMicrosoftAccount")] + [JsonProperty(PropertyName = "legacyMicrosoftAccount")] public LegacyMicrosoftAccount LegacyMicrosoftAccount { get; set; } + /// + /// Gets or sets the configuration settings of the Twitter provider. + /// + [JsonProperty(PropertyName = "twitter")] + public Twitter Twitter { get; set; } + /// /// Gets or sets the configuration settings of the Apple provider. /// - [JsonProperty(PropertyName = "properties.apple")] + [JsonProperty(PropertyName = "apple")] public Apple Apple { get; set; } /// /// Gets or sets the configuration settings of the Azure Static Web /// Apps provider. /// - [JsonProperty(PropertyName = "properties.azureStaticWebApps")] + [JsonProperty(PropertyName = "azureStaticWebApps")] public AzureStaticWebApps AzureStaticWebApps { get; set; } + /// + /// Gets or sets the map of the name of the alias of each custom Open + /// ID Connect provider to the + /// configuration settings of the custom Open ID Connect provider. + /// + [JsonProperty(PropertyName = "customOpenIdConnectProviders")] + public IDictionary CustomOpenIdConnectProviders { get; set; } + } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/JwtClaimChecks.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/JwtClaimChecks.cs index 509b9ba41405..987d77ff1840 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/JwtClaimChecks.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/JwtClaimChecks.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -21,8 +19,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the checks that should be made while /// validating the JWT Claims. /// - [Rest.Serialization.JsonTransformation] - public partial class JwtClaimChecks : ProxyOnlyResource + public partial class JwtClaimChecks { /// /// Initializes a new instance of the JwtClaimChecks class. @@ -35,15 +32,10 @@ public JwtClaimChecks() /// /// Initializes a new instance of the JwtClaimChecks class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The list of the allowed groups. /// The list of the allowed /// client applications. - public JwtClaimChecks(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IList allowedGroups = default(IList), IList allowedClientApplications = default(IList)) - : base(id, name, kind, type) + public JwtClaimChecks(IList allowedGroups = default(IList), IList allowedClientApplications = default(IList)) { AllowedGroups = allowedGroups; AllowedClientApplications = allowedClientApplications; @@ -58,13 +50,13 @@ public JwtClaimChecks() /// /// Gets or sets the list of the allowed groups. /// - [JsonProperty(PropertyName = "properties.allowedGroups")] + [JsonProperty(PropertyName = "allowedGroups")] public IList AllowedGroups { get; set; } /// /// Gets or sets the list of the allowed client applications. /// - [JsonProperty(PropertyName = "properties.allowedClientApplications")] + [JsonProperty(PropertyName = "allowedClientApplications")] public IList AllowedClientApplications { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LegacyMicrosoftAccount.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LegacyMicrosoftAccount.cs index 44d19dd1bcfe..40b3d2973b88 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LegacyMicrosoftAccount.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LegacyMicrosoftAccount.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the legacy Microsoft Account provider. /// - [Rest.Serialization.JsonTransformation] - public partial class LegacyMicrosoftAccount : ProxyOnlyResource + public partial class LegacyMicrosoftAccount { /// /// Initializes a new instance of the LegacyMicrosoftAccount class. @@ -32,10 +29,6 @@ public LegacyMicrosoftAccount() /// /// Initializes a new instance of the LegacyMicrosoftAccount class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the legacy /// Microsoft Account provider should not be enabled despite the set /// registration; otherwise, <code>true</code>. @@ -45,8 +38,7 @@ public LegacyMicrosoftAccount() /// flow. /// The configuration settings of the legacy /// Microsoft Account provider token validation flow. - public LegacyMicrosoftAccount(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), ClientRegistration registration = default(ClientRegistration), LoginScopes login = default(LoginScopes), AllowedAudiencesValidation validation = default(AllowedAudiencesValidation)) - : base(id, name, kind, type) + public LegacyMicrosoftAccount(bool? enabled = default(bool?), ClientRegistration registration = default(ClientRegistration), LoginScopes login = default(LoginScopes), AllowedAudiencesValidation validation = default(AllowedAudiencesValidation)) { Enabled = enabled; Registration = registration; @@ -66,27 +58,27 @@ public LegacyMicrosoftAccount() /// set registration; otherwise, /// &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// /// Gets or sets the configuration settings of the app registration for /// the legacy Microsoft Account provider. /// - [JsonProperty(PropertyName = "properties.registration")] + [JsonProperty(PropertyName = "registration")] public ClientRegistration Registration { get; set; } /// /// Gets or sets the configuration settings of the login flow. /// - [JsonProperty(PropertyName = "properties.login")] + [JsonProperty(PropertyName = "login")] public LoginScopes Login { get; set; } /// /// Gets or sets the configuration settings of the legacy Microsoft /// Account provider token validation flow. /// - [JsonProperty(PropertyName = "properties.validation")] + [JsonProperty(PropertyName = "validation")] public AllowedAudiencesValidation Validation { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Login.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Login.cs index f88dd3ce8e9b..8a207a74c728 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Login.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Login.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -21,8 +19,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the login flow of users using App Service /// Authentication/Authorization. /// - [Rest.Serialization.JsonTransformation] - public partial class Login : ProxyOnlyResource + public partial class Login { /// /// Initializes a new instance of the Login class. @@ -35,10 +32,6 @@ public Login() /// /// Initializes a new instance of the Login class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The routes that specify the endpoints used for /// login and logout requests. /// The configuration settings of the token @@ -58,8 +51,7 @@ public Login() /// session cookie's expiration. /// The configuration settings of the nonce used in /// the login flow. - public Login(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), LoginRoutes routes = default(LoginRoutes), TokenStore tokenStore = default(TokenStore), bool? preserveUrlFragmentsForLogins = default(bool?), IList allowedExternalRedirectUrls = default(IList), CookieExpiration cookieExpiration = default(CookieExpiration), Nonce nonce = default(Nonce)) - : base(id, name, kind, type) + public Login(LoginRoutes routes = default(LoginRoutes), TokenStore tokenStore = default(TokenStore), bool? preserveUrlFragmentsForLogins = default(bool?), IList allowedExternalRedirectUrls = default(IList), CookieExpiration cookieExpiration = default(CookieExpiration), Nonce nonce = default(Nonce)) { Routes = routes; TokenStore = tokenStore; @@ -79,13 +71,13 @@ public Login() /// Gets or sets the routes that specify the endpoints used for login /// and logout requests. /// - [JsonProperty(PropertyName = "properties.routes")] + [JsonProperty(PropertyName = "routes")] public LoginRoutes Routes { get; set; } /// /// Gets or sets the configuration settings of the token store. /// - [JsonProperty(PropertyName = "properties.tokenStore")] + [JsonProperty(PropertyName = "tokenStore")] public TokenStore TokenStore { get; set; } /// @@ -93,7 +85,7 @@ public Login() /// fragments from the request are preserved after the login request is /// made; otherwise, &lt;code&gt;false&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.preserveUrlFragmentsForLogins")] + [JsonProperty(PropertyName = "preserveUrlFragmentsForLogins")] public bool? PreserveUrlFragmentsForLogins { get; set; } /// @@ -105,21 +97,21 @@ public Login() /// Note that URLs within the current domain are always implicitly /// allowed. /// - [JsonProperty(PropertyName = "properties.allowedExternalRedirectUrls")] + [JsonProperty(PropertyName = "allowedExternalRedirectUrls")] public IList AllowedExternalRedirectUrls { get; set; } /// /// Gets or sets the configuration settings of the session cookie's /// expiration. /// - [JsonProperty(PropertyName = "properties.cookieExpiration")] + [JsonProperty(PropertyName = "cookieExpiration")] public CookieExpiration CookieExpiration { get; set; } /// /// Gets or sets the configuration settings of the nonce used in the /// login flow. /// - [JsonProperty(PropertyName = "properties.nonce")] + [JsonProperty(PropertyName = "nonce")] public Nonce Nonce { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LoginRoutes.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LoginRoutes.cs index 34b86a866e14..a2a1c6a282a2 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LoginRoutes.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LoginRoutes.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The routes that specify the endpoints used for login and logout /// requests. /// - [Rest.Serialization.JsonTransformation] - public partial class LoginRoutes : ProxyOnlyResource + public partial class LoginRoutes { /// /// Initializes a new instance of the LoginRoutes class. @@ -33,14 +30,9 @@ public LoginRoutes() /// /// Initializes a new instance of the LoginRoutes class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The endpoint at which a logout request /// should be made. - public LoginRoutes(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string logoutEndpoint = default(string)) - : base(id, name, kind, type) + public LoginRoutes(string logoutEndpoint = default(string)) { LogoutEndpoint = logoutEndpoint; CustomInit(); @@ -54,7 +46,7 @@ public LoginRoutes() /// /// Gets or sets the endpoint at which a logout request should be made. /// - [JsonProperty(PropertyName = "properties.logoutEndpoint")] + [JsonProperty(PropertyName = "logoutEndpoint")] public string LogoutEndpoint { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LoginScopes.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LoginScopes.cs index 6c64485bc850..ad066f1a7e3e 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LoginScopes.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LoginScopes.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -21,8 +19,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the login flow, including the scopes that /// should be requested. /// - [Rest.Serialization.JsonTransformation] - public partial class LoginScopes : ProxyOnlyResource + public partial class LoginScopes { /// /// Initializes a new instance of the LoginScopes class. @@ -35,14 +32,9 @@ public LoginScopes() /// /// Initializes a new instance of the LoginScopes class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// A list of the scopes that should be requested /// while authenticating. - public LoginScopes(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IList scopes = default(IList)) - : base(id, name, kind, type) + public LoginScopes(IList scopes = default(IList)) { Scopes = scopes; CustomInit(); @@ -57,7 +49,7 @@ public LoginScopes() /// Gets or sets a list of the scopes that should be requested while /// authenticating. /// - [JsonProperty(PropertyName = "properties.scopes")] + [JsonProperty(PropertyName = "scopes")] public IList Scopes { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Nonce.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Nonce.cs index 97bf46e1c018..454998315915 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Nonce.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Nonce.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the nonce used in the login flow. /// - [Rest.Serialization.JsonTransformation] - public partial class Nonce : ProxyOnlyResource + public partial class Nonce { /// /// Initializes a new instance of the Nonce class. @@ -32,17 +29,12 @@ public Nonce() /// /// Initializes a new instance of the Nonce class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the /// nonce should not be validated while completing the login flow; /// otherwise, <code>true</code>. /// The time after the request is /// made when the nonce should expire. - public Nonce(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? validateNonce = default(bool?), string nonceExpirationInterval = default(string)) - : base(id, name, kind, type) + public Nonce(bool? validateNonce = default(bool?), string nonceExpirationInterval = default(string)) { ValidateNonce = validateNonce; NonceExpirationInterval = nonceExpirationInterval; @@ -59,14 +51,14 @@ public Nonce() /// nonce should not be validated while completing the login flow; /// otherwise, &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.validateNonce")] + [JsonProperty(PropertyName = "validateNonce")] public bool? ValidateNonce { get; set; } /// /// Gets or sets the time after the request is made when the nonce /// should expire. /// - [JsonProperty(PropertyName = "properties.nonceExpirationInterval")] + [JsonProperty(PropertyName = "nonceExpirationInterval")] public string NonceExpirationInterval { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectClientCredential.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectClientCredential.cs index 18a8ac948d82..0520f3fcd5ef 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectClientCredential.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectClientCredential.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The authentication client credentials of the custom Open ID Connect /// provider. /// - [Rest.Serialization.JsonTransformation] - public partial class OpenIdConnectClientCredential : ProxyOnlyResource + public partial class OpenIdConnectClientCredential { /// /// Initializes a new instance of the OpenIdConnectClientCredential @@ -35,16 +32,11 @@ public OpenIdConnectClientCredential() /// Initializes a new instance of the OpenIdConnectClientCredential /// class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The method that should be used to authenticate /// the user. Possible values include: 'ClientSecretPost' /// The app setting that contains /// the client secret for the custom Open ID Connect provider. - public OpenIdConnectClientCredential(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), ClientCredentialMethod? method = default(ClientCredentialMethod?), string clientSecretSettingName = default(string)) - : base(id, name, kind, type) + public OpenIdConnectClientCredential(ClientCredentialMethod? method = default(ClientCredentialMethod?), string clientSecretSettingName = default(string)) { Method = method; ClientSecretSettingName = clientSecretSettingName; @@ -60,14 +52,14 @@ public OpenIdConnectClientCredential() /// Gets or sets the method that should be used to authenticate the /// user. Possible values include: 'ClientSecretPost' /// - [JsonProperty(PropertyName = "properties.method")] + [JsonProperty(PropertyName = "method")] public ClientCredentialMethod? Method { get; set; } /// /// Gets or sets the app setting that contains the client secret for /// the custom Open ID Connect provider. /// - [JsonProperty(PropertyName = "properties.clientSecretSettingName")] + [JsonProperty(PropertyName = "clientSecretSettingName")] public string ClientSecretSettingName { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectConfig.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectConfig.cs index 70fddef9457a..b3a82561a366 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectConfig.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectConfig.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the endpoints used for the custom Open ID /// Connect provider. /// - [Rest.Serialization.JsonTransformation] - public partial class OpenIdConnectConfig : ProxyOnlyResource + public partial class OpenIdConnectConfig { /// /// Initializes a new instance of the OpenIdConnectConfig class. @@ -33,10 +30,6 @@ public OpenIdConnectConfig() /// /// Initializes a new instance of the OpenIdConnectConfig class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The endpoint to be used to make /// an authorization request. /// The endpoint to be used to request a @@ -46,8 +39,7 @@ public OpenIdConnectConfig() /// necessary to validate the token. /// The endpoint that /// contains all the configuration endpoints for the provider. - public OpenIdConnectConfig(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string authorizationEndpoint = default(string), string tokenEndpoint = default(string), string issuer = default(string), string certificationUri = default(string), string wellKnownOpenIdConfiguration = default(string)) - : base(id, name, kind, type) + public OpenIdConnectConfig(string authorizationEndpoint = default(string), string tokenEndpoint = default(string), string issuer = default(string), string certificationUri = default(string), string wellKnownOpenIdConfiguration = default(string)) { AuthorizationEndpoint = authorizationEndpoint; TokenEndpoint = tokenEndpoint; @@ -66,33 +58,33 @@ public OpenIdConnectConfig() /// Gets or sets the endpoint to be used to make an authorization /// request. /// - [JsonProperty(PropertyName = "properties.authorizationEndpoint")] + [JsonProperty(PropertyName = "authorizationEndpoint")] public string AuthorizationEndpoint { get; set; } /// /// Gets or sets the endpoint to be used to request a token. /// - [JsonProperty(PropertyName = "properties.tokenEndpoint")] + [JsonProperty(PropertyName = "tokenEndpoint")] public string TokenEndpoint { get; set; } /// /// Gets or sets the endpoint that issues the token. /// - [JsonProperty(PropertyName = "properties.issuer")] + [JsonProperty(PropertyName = "issuer")] public string Issuer { get; set; } /// /// Gets or sets the endpoint that provides the keys necessary to /// validate the token. /// - [JsonProperty(PropertyName = "properties.certificationUri")] + [JsonProperty(PropertyName = "certificationUri")] public string CertificationUri { get; set; } /// /// Gets or sets the endpoint that contains all the configuration /// endpoints for the provider. /// - [JsonProperty(PropertyName = "properties.wellKnownOpenIdConfiguration")] + [JsonProperty(PropertyName = "wellKnownOpenIdConfiguration")] public string WellKnownOpenIdConfiguration { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectLogin.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectLogin.cs index cc9c4fecabc8..c796661c1cde 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectLogin.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectLogin.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -21,8 +19,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the login flow of the custom Open ID /// Connect provider. /// - [Rest.Serialization.JsonTransformation] - public partial class OpenIdConnectLogin : ProxyOnlyResource + public partial class OpenIdConnectLogin { /// /// Initializes a new instance of the OpenIdConnectLogin class. @@ -35,16 +32,11 @@ public OpenIdConnectLogin() /// /// Initializes a new instance of the OpenIdConnectLogin class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The name of the claim that contains the /// users name. /// A list of the scopes that should be requested /// while authenticating. - public OpenIdConnectLogin(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string nameClaimType = default(string), IList scopes = default(IList)) - : base(id, name, kind, type) + public OpenIdConnectLogin(string nameClaimType = default(string), IList scopes = default(IList)) { NameClaimType = nameClaimType; Scopes = scopes; @@ -59,14 +51,14 @@ public OpenIdConnectLogin() /// /// Gets or sets the name of the claim that contains the users name. /// - [JsonProperty(PropertyName = "properties.nameClaimType")] + [JsonProperty(PropertyName = "nameClaimType")] public string NameClaimType { get; set; } /// /// Gets or sets a list of the scopes that should be requested while /// authenticating. /// - [JsonProperty(PropertyName = "properties.scopes")] + [JsonProperty(PropertyName = "scopes")] public IList Scopes { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectRegistration.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectRegistration.cs index f9ae80692d1a..aa3caa98ff4e 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectRegistration.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/OpenIdConnectRegistration.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the app registration for the custom Open /// ID Connect provider. /// - [Rest.Serialization.JsonTransformation] - public partial class OpenIdConnectRegistration : ProxyOnlyResource + public partial class OpenIdConnectRegistration { /// /// Initializes a new instance of the OpenIdConnectRegistration class. @@ -33,10 +30,6 @@ public OpenIdConnectRegistration() /// /// Initializes a new instance of the OpenIdConnectRegistration class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The client id of the custom Open ID Connect /// provider. /// The authentication credentials of @@ -44,8 +37,7 @@ public OpenIdConnectRegistration() /// The configuration settings /// of the endpoints used for the custom Open ID Connect /// provider. - public OpenIdConnectRegistration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string clientId = default(string), OpenIdConnectClientCredential clientCredential = default(OpenIdConnectClientCredential), OpenIdConnectConfig openIdConnectConfiguration = default(OpenIdConnectConfig)) - : base(id, name, kind, type) + public OpenIdConnectRegistration(string clientId = default(string), OpenIdConnectClientCredential clientCredential = default(OpenIdConnectClientCredential), OpenIdConnectConfig openIdConnectConfiguration = default(OpenIdConnectConfig)) { ClientId = clientId; ClientCredential = clientCredential; @@ -61,21 +53,21 @@ public OpenIdConnectRegistration() /// /// Gets or sets the client id of the custom Open ID Connect provider. /// - [JsonProperty(PropertyName = "properties.clientId")] + [JsonProperty(PropertyName = "clientId")] public string ClientId { get; set; } /// /// Gets or sets the authentication credentials of the custom Open ID /// Connect provider. /// - [JsonProperty(PropertyName = "properties.clientCredential")] + [JsonProperty(PropertyName = "clientCredential")] public OpenIdConnectClientCredential ClientCredential { get; set; } /// /// Gets or sets the configuration settings of the endpoints used for /// the custom Open ID Connect provider. /// - [JsonProperty(PropertyName = "properties.openIdConnectConfiguration")] + [JsonProperty(PropertyName = "openIdConnectConfiguration")] public OpenIdConnectConfig OpenIdConnectConfiguration { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StaticSiteARMResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StaticSiteARMResource.cs index 01182698e415..5126311bab83 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StaticSiteARMResource.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StaticSiteARMResource.cs @@ -70,7 +70,11 @@ public StaticSiteARMResource() /// registered with the static site /// The provider that submitted the last /// deployment to the primary environment of the static site. - public StaticSiteARMResource(string location, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary tags = default(IDictionary), string defaultHostname = default(string), string repositoryUrl = default(string), string branch = default(string), IList customDomains = default(IList), string repositoryToken = default(string), StaticSiteBuildProperties buildProperties = default(StaticSiteBuildProperties), IList privateEndpointConnections = default(IList), StagingEnvironmentPolicy? stagingEnvironmentPolicy = default(StagingEnvironmentPolicy?), bool? allowConfigFileUpdates = default(bool?), StaticSiteTemplateOptions templateProperties = default(StaticSiteTemplateOptions), string contentDistributionEndpoint = default(string), string keyVaultReferenceIdentity = default(string), IList userProvidedFunctionApps = default(IList), string provider = default(string), SkuDescription sku = default(SkuDescription), ManagedServiceIdentity identity = default(ManagedServiceIdentity)) + /// State indicating the status + /// of the enterprise grade CDN serving traffic to the static web app. + /// Possible values include: 'Enabled', 'Enabling', 'Disabled', + /// 'Disabling' + public StaticSiteARMResource(string location, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary tags = default(IDictionary), string defaultHostname = default(string), string repositoryUrl = default(string), string branch = default(string), IList customDomains = default(IList), string repositoryToken = default(string), StaticSiteBuildProperties buildProperties = default(StaticSiteBuildProperties), IList privateEndpointConnections = default(IList), StagingEnvironmentPolicy? stagingEnvironmentPolicy = default(StagingEnvironmentPolicy?), bool? allowConfigFileUpdates = default(bool?), StaticSiteTemplateOptions templateProperties = default(StaticSiteTemplateOptions), string contentDistributionEndpoint = default(string), string keyVaultReferenceIdentity = default(string), IList userProvidedFunctionApps = default(IList), string provider = default(string), string enterpriseGradeCdnStatus = default(string), SkuDescription sku = default(SkuDescription), ManagedServiceIdentity identity = default(ManagedServiceIdentity)) : base(location, id, name, kind, type, tags) { DefaultHostname = defaultHostname; @@ -87,6 +91,7 @@ public StaticSiteARMResource() KeyVaultReferenceIdentity = keyVaultReferenceIdentity; UserProvidedFunctionApps = userProvidedFunctionApps; Provider = provider; + EnterpriseGradeCdnStatus = enterpriseGradeCdnStatus; Sku = sku; Identity = identity; CustomInit(); @@ -181,11 +186,19 @@ public StaticSiteARMResource() public IList UserProvidedFunctionApps { get; private set; } /// - /// Gets the provider that submitted the last deployment to the primary - /// environment of the static site. + /// Gets or sets the provider that submitted the last deployment to the + /// primary environment of the static site. /// [JsonProperty(PropertyName = "properties.provider")] - public string Provider { get; private set; } + public string Provider { get; set; } + + /// + /// Gets or sets state indicating the status of the enterprise grade + /// CDN serving traffic to the static web app. Possible values include: + /// 'Enabled', 'Enabling', 'Disabled', 'Disabling' + /// + [JsonProperty(PropertyName = "properties.enterpriseGradeCdnStatus")] + public string EnterpriseGradeCdnStatus { get; set; } /// /// diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StaticSitePatchResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StaticSitePatchResource.cs index c7c8eb15aff9..9daaabe8e430 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StaticSitePatchResource.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StaticSitePatchResource.cs @@ -68,7 +68,11 @@ public StaticSitePatchResource() /// registered with the static site /// The provider that submitted the last /// deployment to the primary environment of the static site. - public StaticSitePatchResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string defaultHostname = default(string), string repositoryUrl = default(string), string branch = default(string), IList customDomains = default(IList), string repositoryToken = default(string), StaticSiteBuildProperties buildProperties = default(StaticSiteBuildProperties), IList privateEndpointConnections = default(IList), StagingEnvironmentPolicy? stagingEnvironmentPolicy = default(StagingEnvironmentPolicy?), bool? allowConfigFileUpdates = default(bool?), StaticSiteTemplateOptions templateProperties = default(StaticSiteTemplateOptions), string contentDistributionEndpoint = default(string), string keyVaultReferenceIdentity = default(string), IList userProvidedFunctionApps = default(IList), string provider = default(string)) + /// State indicating the status + /// of the enterprise grade CDN serving traffic to the static web app. + /// Possible values include: 'Enabled', 'Enabling', 'Disabled', + /// 'Disabling' + public StaticSitePatchResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string defaultHostname = default(string), string repositoryUrl = default(string), string branch = default(string), IList customDomains = default(IList), string repositoryToken = default(string), StaticSiteBuildProperties buildProperties = default(StaticSiteBuildProperties), IList privateEndpointConnections = default(IList), StagingEnvironmentPolicy? stagingEnvironmentPolicy = default(StagingEnvironmentPolicy?), bool? allowConfigFileUpdates = default(bool?), StaticSiteTemplateOptions templateProperties = default(StaticSiteTemplateOptions), string contentDistributionEndpoint = default(string), string keyVaultReferenceIdentity = default(string), IList userProvidedFunctionApps = default(IList), string provider = default(string), string enterpriseGradeCdnStatus = default(string)) : base(id, name, kind, type) { DefaultHostname = defaultHostname; @@ -85,6 +89,7 @@ public StaticSitePatchResource() KeyVaultReferenceIdentity = keyVaultReferenceIdentity; UserProvidedFunctionApps = userProvidedFunctionApps; Provider = provider; + EnterpriseGradeCdnStatus = enterpriseGradeCdnStatus; CustomInit(); } @@ -177,11 +182,19 @@ public StaticSitePatchResource() public IList UserProvidedFunctionApps { get; private set; } /// - /// Gets the provider that submitted the last deployment to the primary - /// environment of the static site. + /// Gets or sets the provider that submitted the last deployment to the + /// primary environment of the static site. /// [JsonProperty(PropertyName = "properties.provider")] - public string Provider { get; private set; } + public string Provider { get; set; } + + /// + /// Gets or sets state indicating the status of the enterprise grade + /// CDN serving traffic to the static web app. Possible values include: + /// 'Enabled', 'Enabling', 'Disabled', 'Disabling' + /// + [JsonProperty(PropertyName = "properties.enterpriseGradeCdnStatus")] + public string EnterpriseGradeCdnStatus { get; set; } } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TokenStore.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TokenStore.cs index 3bab06bd3ab3..37abd536aaa5 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TokenStore.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TokenStore.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the token store. /// - [Rest.Serialization.JsonTransformation] - public partial class TokenStore : ProxyOnlyResource + public partial class TokenStore { /// /// Initializes a new instance of the TokenStore class. @@ -32,10 +29,6 @@ public TokenStore() /// /// Initializes a new instance of the TokenStore class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>true</code> to durably /// store platform-specific security tokens that are obtained during /// login flows; otherwise, <code>false</code>. @@ -47,8 +40,7 @@ public TokenStore() /// of the tokens if a file system is used. /// The configuration settings of the /// storage of the tokens if blob storage is used. - public TokenStore(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), double? tokenRefreshExtensionHours = default(double?), FileSystemTokenStore fileSystem = default(FileSystemTokenStore), BlobStorageTokenStore azureBlobStorage = default(BlobStorageTokenStore)) - : base(id, name, kind, type) + public TokenStore(bool? enabled = default(bool?), double? tokenRefreshExtensionHours = default(double?), FileSystemTokenStore fileSystem = default(FileSystemTokenStore), BlobStorageTokenStore azureBlobStorage = default(BlobStorageTokenStore)) { Enabled = enabled; TokenRefreshExtensionHours = tokenRefreshExtensionHours; @@ -69,7 +61,7 @@ public TokenStore() /// &lt;code&gt;false&lt;/code&gt;. /// The default is &lt;code&gt;false&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// @@ -77,21 +69,21 @@ public TokenStore() /// that a session token can be used to /// call the token refresh API. The default is 72 hours. /// - [JsonProperty(PropertyName = "properties.tokenRefreshExtensionHours")] + [JsonProperty(PropertyName = "tokenRefreshExtensionHours")] public double? TokenRefreshExtensionHours { get; set; } /// /// Gets or sets the configuration settings of the storage of the /// tokens if a file system is used. /// - [JsonProperty(PropertyName = "properties.fileSystem")] + [JsonProperty(PropertyName = "fileSystem")] public FileSystemTokenStore FileSystem { get; set; } /// /// Gets or sets the configuration settings of the storage of the /// tokens if blob storage is used. /// - [JsonProperty(PropertyName = "properties.azureBlobStorage")] + [JsonProperty(PropertyName = "azureBlobStorage")] public BlobStorageTokenStore AzureBlobStorage { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TriggeredJobRun.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TriggeredJobRun.cs index 976e997acb80..a79fef356dc4 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TriggeredJobRun.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TriggeredJobRun.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// Triggered Web Job Run Information. /// - [Rest.Serialization.JsonTransformation] - public partial class TriggeredJobRun : ProxyOnlyResource + public partial class TriggeredJobRun { /// /// Initializes a new instance of the TriggeredJobRun class. @@ -32,10 +29,6 @@ public TriggeredJobRun() /// /// Initializes a new instance of the TriggeredJobRun class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// Job ID. /// Job name. /// Job status. Possible values include: @@ -48,8 +41,7 @@ public TriggeredJobRun() /// Job URL. /// Job name. /// Job trigger. - public TriggeredJobRun(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string webJobId = default(string), string webJobName = default(string), TriggeredWebJobStatus? status = default(TriggeredWebJobStatus?), System.DateTime? startTime = default(System.DateTime?), System.DateTime? endTime = default(System.DateTime?), string duration = default(string), string outputUrl = default(string), string errorUrl = default(string), string url = default(string), string jobName = default(string), string trigger = default(string)) - : base(id, name, kind, type) + public TriggeredJobRun(string webJobId = default(string), string webJobName = default(string), TriggeredWebJobStatus? status = default(TriggeredWebJobStatus?), System.DateTime? startTime = default(System.DateTime?), System.DateTime? endTime = default(System.DateTime?), string duration = default(string), string outputUrl = default(string), string errorUrl = default(string), string url = default(string), string jobName = default(string), string trigger = default(string)) { WebJobId = webJobId; WebJobName = webJobName; @@ -73,68 +65,68 @@ public TriggeredJobRun() /// /// Gets or sets job ID. /// - [JsonProperty(PropertyName = "properties.web_job_id")] + [JsonProperty(PropertyName = "web_job_id")] public string WebJobId { get; set; } /// /// Gets or sets job name. /// - [JsonProperty(PropertyName = "properties.web_job_name")] + [JsonProperty(PropertyName = "web_job_name")] public string WebJobName { get; set; } /// /// Gets or sets job status. Possible values include: 'Success', /// 'Failed', 'Error' /// - [JsonProperty(PropertyName = "properties.status")] + [JsonProperty(PropertyName = "status")] public TriggeredWebJobStatus? Status { get; set; } /// /// Gets or sets start time. /// - [JsonProperty(PropertyName = "properties.start_time")] + [JsonProperty(PropertyName = "start_time")] public System.DateTime? StartTime { get; set; } /// /// Gets or sets end time. /// - [JsonProperty(PropertyName = "properties.end_time")] + [JsonProperty(PropertyName = "end_time")] public System.DateTime? EndTime { get; set; } /// /// Gets or sets job duration. /// - [JsonProperty(PropertyName = "properties.duration")] + [JsonProperty(PropertyName = "duration")] public string Duration { get; set; } /// /// Gets or sets output URL. /// - [JsonProperty(PropertyName = "properties.output_url")] + [JsonProperty(PropertyName = "output_url")] public string OutputUrl { get; set; } /// /// Gets or sets error URL. /// - [JsonProperty(PropertyName = "properties.error_url")] + [JsonProperty(PropertyName = "error_url")] public string ErrorUrl { get; set; } /// /// Gets or sets job URL. /// - [JsonProperty(PropertyName = "properties.url")] + [JsonProperty(PropertyName = "url")] public string Url { get; set; } /// /// Gets or sets job name. /// - [JsonProperty(PropertyName = "properties.job_name")] + [JsonProperty(PropertyName = "job_name")] public string JobName { get; set; } /// /// Gets or sets job trigger. /// - [JsonProperty(PropertyName = "properties.trigger")] + [JsonProperty(PropertyName = "trigger")] public string Trigger { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Twitter.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Twitter.cs index 32d8b05a116a..75b4126e49b3 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Twitter.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Twitter.cs @@ -10,16 +10,13 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// The configuration settings of the Twitter provider. /// - [Rest.Serialization.JsonTransformation] - public partial class Twitter : ProxyOnlyResource + public partial class Twitter { /// /// Initializes a new instance of the Twitter class. @@ -32,17 +29,12 @@ public Twitter() /// /// Initializes a new instance of the Twitter class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// <code>false</code> if the Twitter /// provider should not be enabled despite the set registration; /// otherwise, <code>true</code>. /// The configuration settings of the app /// registration for the Twitter provider. - public Twitter(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), TwitterRegistration registration = default(TwitterRegistration)) - : base(id, name, kind, type) + public Twitter(bool? enabled = default(bool?), TwitterRegistration registration = default(TwitterRegistration)) { Enabled = enabled; Registration = registration; @@ -60,14 +52,14 @@ public Twitter() /// registration; otherwise, /// &lt;code&gt;true&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.enabled")] + [JsonProperty(PropertyName = "enabled")] public bool? Enabled { get; set; } /// /// Gets or sets the configuration settings of the app registration for /// the Twitter provider. /// - [JsonProperty(PropertyName = "properties.registration")] + [JsonProperty(PropertyName = "registration")] public TwitterRegistration Registration { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TwitterRegistration.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TwitterRegistration.cs index 466cd1f256f8..9ff08bb3bcd8 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TwitterRegistration.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/TwitterRegistration.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; @@ -19,8 +17,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// The configuration settings of the app registration for the Twitter /// provider. /// - [Rest.Serialization.JsonTransformation] - public partial class TwitterRegistration : ProxyOnlyResource + public partial class TwitterRegistration { /// /// Initializes a new instance of the TwitterRegistration class. @@ -33,10 +30,6 @@ public TwitterRegistration() /// /// Initializes a new instance of the TwitterRegistration class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The OAuth 1.0a consumer key of the /// Twitter application used for sign-in. /// This setting is required for enabling Twitter Sign-In. @@ -45,8 +38,7 @@ public TwitterRegistration() /// The app setting name that /// contains the OAuth 1.0a consumer secret of the Twitter /// application used for sign-in. - public TwitterRegistration(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string consumerKey = default(string), string consumerSecretSettingName = default(string)) - : base(id, name, kind, type) + public TwitterRegistration(string consumerKey = default(string), string consumerSecretSettingName = default(string)) { ConsumerKey = consumerKey; ConsumerSecretSettingName = consumerSecretSettingName; @@ -64,7 +56,7 @@ public TwitterRegistration() /// This setting is required for enabling Twitter Sign-In. /// Twitter Sign-In documentation: https://dev.twitter.com/web/sign-in /// - [JsonProperty(PropertyName = "properties.consumerKey")] + [JsonProperty(PropertyName = "consumerKey")] public string ConsumerKey { get; set; } /// @@ -72,7 +64,7 @@ public TwitterRegistration() /// consumer secret of the Twitter /// application used for sign-in. /// - [JsonProperty(PropertyName = "properties.consumerSecretSettingName")] + [JsonProperty(PropertyName = "consumerSecretSettingName")] public string ConsumerSecretSettingName { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VnetInfo.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VnetInfo.cs index 9105621d291e..d2ddf8a0f85e 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VnetInfo.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VnetInfo.cs @@ -10,8 +10,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { - using Microsoft.Rest; - using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -20,8 +18,7 @@ namespace Microsoft.Azure.Management.WebSites.Models /// /// Virtual Network information contract. /// - [Rest.Serialization.JsonTransformation] - public partial class VnetInfo : ProxyOnlyResource + public partial class VnetInfo { /// /// Initializes a new instance of the VnetInfo class. @@ -34,10 +31,6 @@ public VnetInfo() /// /// Initializes a new instance of the VnetInfo class. /// - /// Resource Id. - /// Resource Name. - /// Kind of resource. - /// Resource type. /// The Virtual Network's resource /// ID. /// The client certificate @@ -55,8 +48,7 @@ public VnetInfo() /// addresses. /// Flag that is used to denote if this is VNET /// injection - public VnetInfo(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string vnetResourceId = default(string), string certThumbprint = default(string), string certBlob = default(string), IList routes = default(IList), bool? resyncRequired = default(bool?), string dnsServers = default(string), bool? isSwift = default(bool?)) - : base(id, name, kind, type) + public VnetInfo(string vnetResourceId = default(string), string certThumbprint = default(string), string certBlob = default(string), IList routes = default(IList), bool? resyncRequired = default(bool?), string dnsServers = default(string), bool? isSwift = default(bool?)) { VnetResourceId = vnetResourceId; CertThumbprint = certThumbprint; @@ -76,13 +68,13 @@ public VnetInfo() /// /// Gets or sets the Virtual Network's resource ID. /// - [JsonProperty(PropertyName = "properties.vnetResourceId")] + [JsonProperty(PropertyName = "vnetResourceId")] public string VnetResourceId { get; set; } /// /// Gets the client certificate thumbprint. /// - [JsonProperty(PropertyName = "properties.certThumbprint")] + [JsonProperty(PropertyName = "certThumbprint")] public string CertThumbprint { get; private set; } /// @@ -90,13 +82,13 @@ public VnetInfo() /// key of the private key used to authenticate a /// Point-To-Site VPN connection. /// - [JsonProperty(PropertyName = "properties.certBlob")] + [JsonProperty(PropertyName = "certBlob")] public string CertBlob { get; set; } /// /// Gets the routes that this Virtual Network connection uses. /// - [JsonProperty(PropertyName = "properties.routes")] + [JsonProperty(PropertyName = "routes")] public IList Routes { get; private set; } /// @@ -104,20 +96,20 @@ public VnetInfo() /// required; otherwise, /// &lt;code&gt;false&lt;/code&gt;. /// - [JsonProperty(PropertyName = "properties.resyncRequired")] + [JsonProperty(PropertyName = "resyncRequired")] public bool? ResyncRequired { get; private set; } /// /// Gets or sets DNS servers to be used by this Virtual Network. This /// should be a comma-separated list of IP addresses. /// - [JsonProperty(PropertyName = "properties.dnsServers")] + [JsonProperty(PropertyName = "dnsServers")] public string DnsServers { get; set; } /// /// Gets or sets flag that is used to denote if this is VNET injection /// - [JsonProperty(PropertyName = "properties.isSwift")] + [JsonProperty(PropertyName = "isSwift")] public bool? IsSwift { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VnetInfoResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VnetInfoResource.cs new file mode 100644 index 000000000000..a5be2d141a93 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VnetInfoResource.cs @@ -0,0 +1,124 @@ +// +// 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.WebSites.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Virtual Network information ARM resource. + /// + [Rest.Serialization.JsonTransformation] + public partial class VnetInfoResource : ProxyOnlyResource + { + /// + /// Initializes a new instance of the VnetInfoResource class. + /// + public VnetInfoResource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the VnetInfoResource class. + /// + /// Resource Id. + /// Resource Name. + /// Kind of resource. + /// Resource type. + /// The Virtual Network's resource + /// ID. + /// The client certificate + /// thumbprint. + /// A certificate file (.cer) blob containing + /// the public key of the private key used to authenticate a + /// Point-To-Site VPN connection. + /// The routes that this Virtual Network + /// connection uses. + /// <code>true</code> if a + /// resync is required; otherwise, + /// <code>false</code>. + /// DNS servers to be used by this Virtual + /// Network. This should be a comma-separated list of IP + /// addresses. + /// Flag that is used to denote if this is VNET + /// injection + public VnetInfoResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string vnetResourceId = default(string), string certThumbprint = default(string), string certBlob = default(string), IList routes = default(IList), bool? resyncRequired = default(bool?), string dnsServers = default(string), bool? isSwift = default(bool?)) + : base(id, name, kind, type) + { + VnetResourceId = vnetResourceId; + CertThumbprint = certThumbprint; + CertBlob = certBlob; + Routes = routes; + ResyncRequired = resyncRequired; + DnsServers = dnsServers; + IsSwift = isSwift; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the Virtual Network's resource ID. + /// + [JsonProperty(PropertyName = "properties.vnetResourceId")] + public string VnetResourceId { get; set; } + + /// + /// Gets the client certificate thumbprint. + /// + [JsonProperty(PropertyName = "properties.certThumbprint")] + public string CertThumbprint { get; private set; } + + /// + /// Gets or sets a certificate file (.cer) blob containing the public + /// key of the private key used to authenticate a + /// Point-To-Site VPN connection. + /// + [JsonProperty(PropertyName = "properties.certBlob")] + public string CertBlob { get; set; } + + /// + /// Gets the routes that this Virtual Network connection uses. + /// + [JsonProperty(PropertyName = "properties.routes")] + public IList Routes { get; private set; } + + /// + /// Gets &lt;code&gt;true&lt;/code&gt; if a resync is + /// required; otherwise, + /// &lt;code&gt;false&lt;/code&gt;. + /// + [JsonProperty(PropertyName = "properties.resyncRequired")] + public bool? ResyncRequired { get; private set; } + + /// + /// Gets or sets DNS servers to be used by this Virtual Network. This + /// should be a comma-separated list of IP addresses. + /// + [JsonProperty(PropertyName = "properties.dnsServers")] + public string DnsServers { get; set; } + + /// + /// Gets or sets flag that is used to denote if this is VNET injection + /// + [JsonProperty(PropertyName = "properties.isSwift")] + public bool? IsSwift { get; set; } + + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/SdkInfo_WebSiteManagementClient.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/SdkInfo_WebSiteManagementClient.cs index 35c6e8e27f9b..bff74508e4fe 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/SdkInfo_WebSiteManagementClient.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/SdkInfo_WebSiteManagementClient.cs @@ -19,54 +19,43 @@ public static IEnumerable> ApiInfo_WebSiteManageme { return new Tuple[] { - new Tuple("CertificateRegistration", "AppServiceCertificateOrders", "2021-01-15"), - new Tuple("CertificateRegistration", "CertificateOrdersDiagnostics", "2021-01-15"), - new Tuple("CertificateRegistration", "CertificateRegistrationProvider", "2021-01-15"), - new Tuple("DomainRegistration", "DomainRegistrationProvider", "2021-01-15"), - new Tuple("DomainRegistration", "Domains", "2021-01-15"), - new Tuple("DomainRegistration", "TopLevelDomains", "2021-01-15"), - new Tuple("Web", "AppServiceEnvironments", "2021-01-15"), - new Tuple("Web", "AppServicePlans", "2021-01-15"), - new Tuple("Web", "Certificates", "2021-01-15"), - new Tuple("Web", "CheckNameAvailability", "2021-01-15"), - new Tuple("Web", "DeletedWebApps", "2021-01-15"), - new Tuple("Web", "Diagnostics", "2021-01-15"), - new Tuple("Web", "GenerateGithubAccessTokenForAppserviceCLIAsync", "2021-01-15"), - new Tuple("Web", "GetPublishingUser", "2021-01-15"), - new Tuple("Web", "GetSourceControl", "2021-01-15"), - new Tuple("Web", "GetSubscriptionDeploymentLocations", "2021-01-15"), - new Tuple("Web", "Global", "2021-01-15"), - new Tuple("Web", "KubeEnvironments", "2021-01-15"), - new Tuple("Web", "ListBillingMeters", "2021-01-15"), - new Tuple("Web", "ListGeoRegions", "2021-01-15"), - new Tuple("Web", "ListPremierAddOnOffers", "2021-01-15"), - new Tuple("Web", "ListSiteIdentifiersAssignedToHostName", "2021-01-15"), - new Tuple("Web", "ListSkus", "2021-01-15"), - new Tuple("Web", "ListSourceControls", "2021-01-15"), - new Tuple("Web", "Provider", "2021-01-15"), - new Tuple("Web", "Recommendations", "2021-01-15"), - new Tuple("Web", "ResourceHealthMetadata", "2021-01-15"), - new Tuple("Web", "StaticSites", "2021-01-15"), - new Tuple("Web", "UpdatePublishingUser", "2021-01-15"), - new Tuple("Web", "UpdateSourceControl", "2021-01-15"), - new Tuple("Web", "Validate", "2021-01-15"), - new Tuple("Web", "VerifyHostingEnvironmentVnet", "2021-01-15"), - new Tuple("Web", "WebApps", "2021-01-15"), - new Tuple("WebSiteManagementClient", "Move", "2021-01-15"), - new Tuple("WebSiteManagementClient", "ValidateMove", "2021-01-15"), + new Tuple("CertificateRegistration", "AppServiceCertificateOrders", "2021-03-01"), + new Tuple("CertificateRegistration", "CertificateOrdersDiagnostics", "2021-03-01"), + new Tuple("CertificateRegistration", "CertificateRegistrationProvider", "2021-03-01"), + new Tuple("DomainRegistration", "DomainRegistrationProvider", "2021-03-01"), + new Tuple("DomainRegistration", "Domains", "2021-03-01"), + new Tuple("DomainRegistration", "TopLevelDomains", "2021-03-01"), + new Tuple("Web", "AppServiceEnvironments", "2021-03-01"), + new Tuple("Web", "AppServicePlans", "2021-03-01"), + new Tuple("Web", "Certificates", "2021-03-01"), + new Tuple("Web", "CheckNameAvailability", "2021-03-01"), + new Tuple("Web", "DeletedWebApps", "2021-03-01"), + new Tuple("Web", "Diagnostics", "2021-03-01"), + new Tuple("Web", "GenerateGithubAccessTokenForAppserviceCLIAsync", "2021-03-01"), + new Tuple("Web", "GetPublishingUser", "2021-03-01"), + new Tuple("Web", "GetSourceControl", "2021-03-01"), + new Tuple("Web", "GetSubscriptionDeploymentLocations", "2021-03-01"), + new Tuple("Web", "Global", "2021-03-01"), + new Tuple("Web", "KubeEnvironments", "2021-03-01"), + new Tuple("Web", "ListBillingMeters", "2021-03-01"), + new Tuple("Web", "ListGeoRegions", "2021-03-01"), + new Tuple("Web", "ListPremierAddOnOffers", "2021-03-01"), + new Tuple("Web", "ListSiteIdentifiersAssignedToHostName", "2021-03-01"), + new Tuple("Web", "ListSkus", "2021-03-01"), + new Tuple("Web", "ListSourceControls", "2021-03-01"), + new Tuple("Web", "Provider", "2021-03-01"), + new Tuple("Web", "Recommendations", "2021-03-01"), + new Tuple("Web", "ResourceHealthMetadata", "2021-03-01"), + new Tuple("Web", "StaticSites", "2021-03-01"), + new Tuple("Web", "UpdatePublishingUser", "2021-03-01"), + new Tuple("Web", "UpdateSourceControl", "2021-03-01"), + new Tuple("Web", "Validate", "2021-03-01"), + new Tuple("Web", "VerifyHostingEnvironmentVnet", "2021-03-01"), + new Tuple("Web", "WebApps", "2021-03-01"), + new Tuple("WebSiteManagementClient", "Move", "2021-03-01"), + new Tuple("WebSiteManagementClient", "ValidateMove", "2021-03-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/web/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=K:\\DotNet-SDK\\July-2021\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "9e9017617ee84fd46b0be3fe6a431e13bde18bd2"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs index beae94064edb..0f710c0cc642 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs @@ -4838,6 +4838,217 @@ internal WebAppsOperations(WebSiteManagementClient client) return _result; } + /// + /// Gets site's Authentication / Authorization settings for apps via the V2 + /// format + /// + /// + /// Description for Gets site's Authentication / Authorization settings for + /// apps via the V2 format + /// + /// + /// Name of the resource group to which the resource belongs. + /// + /// + /// Name of the app. + /// + /// + /// 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 + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task> GetAuthSettingsV2WithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$"); + } + } + if (name == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "name"); + } + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // 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("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "GetAuthSettingsV2", 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.Web/sites/{name}/config/authsettingsV2").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 (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); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("GET"); + _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) + { + var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + DefaultErrorResponse _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(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _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; + } + /// /// Updates site's Authentication / Authorization settings for apps via the V2 /// format @@ -5098,7 +5309,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetAuthSettingsV2WithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> ListAuthSettingsV2WithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -5141,7 +5352,7 @@ internal WebAppsOperations(WebSiteManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("name", name); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "GetAuthSettingsV2", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "ListAuthSettingsV2", tracingParameters); } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; @@ -71278,7 +71489,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListVnetConnectionsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListVnetConnectionsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -71428,7 +71639,7 @@ internal WebAppsOperations(WebSiteManagementClient 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")) @@ -71441,7 +71652,7 @@ internal WebAppsOperations(WebSiteManagementClient 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) { @@ -71502,7 +71713,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -71658,7 +71869,7 @@ internal WebAppsOperations(WebSiteManagementClient 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")) @@ -71671,7 +71882,7 @@ internal WebAppsOperations(WebSiteManagementClient 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) { @@ -71735,7 +71946,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> CreateOrUpdateVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> CreateOrUpdateVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -71902,7 +72113,7 @@ internal WebAppsOperations(WebSiteManagementClient 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")) @@ -71915,7 +72126,7 @@ internal WebAppsOperations(WebSiteManagementClient 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) { @@ -72188,7 +72399,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> UpdateVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> UpdateVnetConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -72355,7 +72566,7 @@ internal WebAppsOperations(WebSiteManagementClient 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")) @@ -72368,7 +72579,7 @@ internal WebAppsOperations(WebSiteManagementClient 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) { @@ -77482,7 +77693,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListVnetConnectionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListVnetConnectionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -77626,7 +77837,7 @@ internal WebAppsOperations(WebSiteManagementClient 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")) @@ -77639,7 +77850,7 @@ internal WebAppsOperations(WebSiteManagementClient 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) { @@ -77696,7 +77907,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -77846,7 +78057,7 @@ internal WebAppsOperations(WebSiteManagementClient 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")) @@ -77859,7 +78070,7 @@ internal WebAppsOperations(WebSiteManagementClient 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) { @@ -77919,7 +78130,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> CreateOrUpdateVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> CreateOrUpdateVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -78080,7 +78291,7 @@ internal WebAppsOperations(WebSiteManagementClient 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")) @@ -78093,7 +78304,7 @@ internal WebAppsOperations(WebSiteManagementClient 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) { @@ -78352,7 +78563,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> UpdateVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> UpdateVnetConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -78513,7 +78724,7 @@ internal WebAppsOperations(WebSiteManagementClient 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")) @@ -78526,7 +78737,7 @@ internal WebAppsOperations(WebSiteManagementClient 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/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs index 9878bdb60ca8..bee9f45e7891 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs @@ -1258,6 +1258,56 @@ public static SiteAuthSettings GetAuthSettings(this IWebAppsOperations operation } } + /// + /// Gets site's Authentication / Authorization settings for apps via the V2 + /// format + /// + /// + /// Description for Gets site's Authentication / Authorization settings for + /// apps via the V2 format + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group to which the resource belongs. + /// + /// + /// Name of the app. + /// + public static SiteAuthSettingsV2 GetAuthSettingsV2(this IWebAppsOperations operations, string resourceGroupName, string name) + { + return operations.GetAuthSettingsV2Async(resourceGroupName, name).GetAwaiter().GetResult(); + } + + /// + /// Gets site's Authentication / Authorization settings for apps via the V2 + /// format + /// + /// + /// Description for Gets site's Authentication / Authorization settings for + /// apps via the V2 format + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group to which the resource belongs. + /// + /// + /// Name of the app. + /// + /// + /// The cancellation token. + /// + public static async Task GetAuthSettingsV2Async(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetAuthSettingsV2WithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Updates site's Authentication / Authorization settings for apps via the V2 /// format @@ -1331,9 +1381,9 @@ public static SiteAuthSettingsV2 UpdateAuthSettingsV2(this IWebAppsOperations op /// /// Name of the app. /// - public static SiteAuthSettingsV2 GetAuthSettingsV2(this IWebAppsOperations operations, string resourceGroupName, string name) + public static SiteAuthSettingsV2 ListAuthSettingsV2(this IWebAppsOperations operations, string resourceGroupName, string name) { - return operations.GetAuthSettingsV2Async(resourceGroupName, name).GetAwaiter().GetResult(); + return operations.ListAuthSettingsV2Async(resourceGroupName, name).GetAwaiter().GetResult(); } /// @@ -1356,9 +1406,9 @@ public static SiteAuthSettingsV2 GetAuthSettingsV2(this IWebAppsOperations opera /// /// The cancellation token. /// - public static async Task GetAuthSettingsV2Async(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task ListAuthSettingsV2Async(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.GetAuthSettingsV2WithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.ListAuthSettingsV2WithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } @@ -19767,7 +19817,7 @@ public static void RunTriggeredWebJobSlot(this IWebAppsOperations operations, st /// Name of the deployment slot. If a slot is not specified, the API will get /// virtual network connections for the production slot. /// - public static IList ListVnetConnectionsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot) + public static IList ListVnetConnectionsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot) { return operations.ListVnetConnectionsSlotAsync(resourceGroupName, name, slot).GetAwaiter().GetResult(); } @@ -19795,7 +19845,7 @@ public static IList ListVnetConnectionsSlot(this IWebAppsOperations op /// /// The cancellation token. /// - public static async Task> ListVnetConnectionsSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListVnetConnectionsSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListVnetConnectionsSlotWithHttpMessagesAsync(resourceGroupName, name, slot, null, cancellationToken).ConfigureAwait(false)) { @@ -19827,7 +19877,7 @@ public static IList ListVnetConnectionsSlot(this IWebAppsOperations op /// Name of the deployment slot. If a slot is not specified, the API will get /// the named virtual network for the production slot. /// - public static VnetInfo GetVnetConnectionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, string slot) + public static VnetInfoResource GetVnetConnectionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, string slot) { return operations.GetVnetConnectionSlotAsync(resourceGroupName, name, vnetName, slot).GetAwaiter().GetResult(); } @@ -19859,7 +19909,7 @@ public static VnetInfo GetVnetConnectionSlot(this IWebAppsOperations operations, /// /// The cancellation token. /// - public static async Task GetVnetConnectionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, string slot, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetVnetConnectionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, string slot, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.GetVnetConnectionSlotWithHttpMessagesAsync(resourceGroupName, name, vnetName, slot, null, cancellationToken).ConfigureAwait(false)) { @@ -19894,7 +19944,7 @@ public static VnetInfo GetVnetConnectionSlot(this IWebAppsOperations operations, /// Name of the deployment slot. If a slot is not specified, the API will add /// or update connections for the production slot. /// - public static VnetInfo CreateOrUpdateVnetConnectionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, string slot) + public static VnetInfoResource CreateOrUpdateVnetConnectionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, string slot) { return operations.CreateOrUpdateVnetConnectionSlotAsync(resourceGroupName, name, vnetName, connectionEnvelope, slot).GetAwaiter().GetResult(); } @@ -19929,7 +19979,7 @@ public static VnetInfo CreateOrUpdateVnetConnectionSlot(this IWebAppsOperations /// /// The cancellation token. /// - public static async Task CreateOrUpdateVnetConnectionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, string slot, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateOrUpdateVnetConnectionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, string slot, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.CreateOrUpdateVnetConnectionSlotWithHttpMessagesAsync(resourceGroupName, name, vnetName, connectionEnvelope, slot, null, cancellationToken).ConfigureAwait(false)) { @@ -20025,7 +20075,7 @@ public static void DeleteVnetConnectionSlot(this IWebAppsOperations operations, /// Name of the deployment slot. If a slot is not specified, the API will add /// or update connections for the production slot. /// - public static VnetInfo UpdateVnetConnectionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, string slot) + public static VnetInfoResource UpdateVnetConnectionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, string slot) { return operations.UpdateVnetConnectionSlotAsync(resourceGroupName, name, vnetName, connectionEnvelope, slot).GetAwaiter().GetResult(); } @@ -20060,7 +20110,7 @@ public static VnetInfo UpdateVnetConnectionSlot(this IWebAppsOperations operatio /// /// The cancellation token. /// - public static async Task UpdateVnetConnectionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, string slot, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task UpdateVnetConnectionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, string slot, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.UpdateVnetConnectionSlotWithHttpMessagesAsync(resourceGroupName, name, vnetName, connectionEnvelope, slot, null, cancellationToken).ConfigureAwait(false)) { @@ -21463,7 +21513,7 @@ public static void RunTriggeredWebJob(this IWebAppsOperations operations, string /// /// Name of the app. /// - public static IList ListVnetConnections(this IWebAppsOperations operations, string resourceGroupName, string name) + public static IList ListVnetConnections(this IWebAppsOperations operations, string resourceGroupName, string name) { return operations.ListVnetConnectionsAsync(resourceGroupName, name).GetAwaiter().GetResult(); } @@ -21487,7 +21537,7 @@ public static IList ListVnetConnections(this IWebAppsOperations operat /// /// The cancellation token. /// - public static async Task> ListVnetConnectionsAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListVnetConnectionsAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListVnetConnectionsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) { @@ -21515,7 +21565,7 @@ public static IList ListVnetConnections(this IWebAppsOperations operat /// /// Name of the virtual network. /// - public static VnetInfo GetVnetConnection(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName) + public static VnetInfoResource GetVnetConnection(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName) { return operations.GetVnetConnectionAsync(resourceGroupName, name, vnetName).GetAwaiter().GetResult(); } @@ -21543,7 +21593,7 @@ public static VnetInfo GetVnetConnection(this IWebAppsOperations operations, str /// /// The cancellation token. /// - public static async Task GetVnetConnectionAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetVnetConnectionAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.GetVnetConnectionWithHttpMessagesAsync(resourceGroupName, name, vnetName, null, cancellationToken).ConfigureAwait(false)) { @@ -21574,7 +21624,7 @@ public static VnetInfo GetVnetConnection(this IWebAppsOperations operations, str /// /// Properties of the Virtual Network connection. See example. /// - public static VnetInfo CreateOrUpdateVnetConnection(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope) + public static VnetInfoResource CreateOrUpdateVnetConnection(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope) { return operations.CreateOrUpdateVnetConnectionAsync(resourceGroupName, name, vnetName, connectionEnvelope).GetAwaiter().GetResult(); } @@ -21605,7 +21655,7 @@ public static VnetInfo CreateOrUpdateVnetConnection(this IWebAppsOperations oper /// /// The cancellation token. /// - public static async Task CreateOrUpdateVnetConnectionAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateOrUpdateVnetConnectionAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.CreateOrUpdateVnetConnectionWithHttpMessagesAsync(resourceGroupName, name, vnetName, connectionEnvelope, null, cancellationToken).ConfigureAwait(false)) { @@ -21689,7 +21739,7 @@ public static void DeleteVnetConnection(this IWebAppsOperations operations, stri /// /// Properties of the Virtual Network connection. See example. /// - public static VnetInfo UpdateVnetConnection(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope) + public static VnetInfoResource UpdateVnetConnection(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope) { return operations.UpdateVnetConnectionAsync(resourceGroupName, name, vnetName, connectionEnvelope).GetAwaiter().GetResult(); } @@ -21720,7 +21770,7 @@ public static VnetInfo UpdateVnetConnection(this IWebAppsOperations operations, /// /// The cancellation token. /// - public static async Task UpdateVnetConnectionAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfo connectionEnvelope, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task UpdateVnetConnectionAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string vnetName, VnetInfoResource connectionEnvelope, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.UpdateVnetConnectionWithHttpMessagesAsync(resourceGroupName, name, vnetName, connectionEnvelope, null, cancellationToken).ConfigureAwait(false)) { diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs index 0b3c63e3d794..e1c8dec73e30 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs @@ -427,7 +427,7 @@ private void Initialize() StaticSites = new StaticSitesOperations(this); WebApps = new WebAppsOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2021-01-15"; + ApiVersion = "2021-03-01"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true;