From 8ddce308985d9a46f0738431d0a2e9b582ed48c9 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 7 Dec 2020 10:05:27 +0000 Subject: [PATCH] CodeGen from PR 11939 in Azure/azure-rest-api-specs [Hub Generated] Public private branch 'credscan-fix' (#11939) * Fix credscan * Fix more credentials --- .../Generated/IRecommendationsOperations.cs | 8 +- .../src/Generated/IWebAppsOperations.cs | 152 +-- .../src/Generated/Models/ApiKVReference.cs | 115 ++ .../Generated/Models/AppServiceEnvironment.cs | 10 +- .../AppServiceEnvironmentPatchResource.cs | 10 +- .../Models/AppServiceEnvironmentResource.cs | 10 +- .../Models/BuiltInAuthenticationProvider.cs | 8 +- .../Models/ConfigReferenceLocation.cs | 54 + .../Generated/Models/ConfigReferenceSource.cs | 54 + .../src/Generated/Models/FunctionSecrets.cs | 16 +- .../Models/InternalLoadBalancingMode.cs | 66 ++ .../src/Generated/Models/IpFilterTag.cs | 45 +- .../Generated/Models/IpSecurityRestriction.cs | 68 +- .../Models/KeyVaultReferenceCollection.cs | 61 + .../Models/KeyVaultReferenceResource.cs | 123 ++ .../src/Generated/Models/LogSpecification.cs | 8 +- .../Generated/Models/MetricSpecification.cs | 8 +- .../src/Generated/Models/ResolveStatus.cs | 102 ++ .../src/Generated/Models/Site.cs | 35 +- .../src/Generated/Models/SiteAuthSettings.cs | 144 +-- .../src/Generated/Models/SiteConfig.cs | 21 +- .../Generated/Models/SiteConfigResource.cs | 21 +- .../src/Generated/Models/SiteInstance.cs | 59 + .../src/Generated/Models/SitePatchResource.cs | 35 +- .../src/Generated/Models/SiteSourceControl.cs | 12 +- .../Generated/Models/WebSiteInstanceStatus.cs | 17 +- .../Generated/RecommendationsOperations.cs | 8 +- .../RecommendationsOperationsExtensions.cs | 16 +- .../SdkInfo_WebSiteManagementClient.cs | 73 +- .../src/Generated/WebAppsOperations.cs | 1047 +++++------------ .../Generated/WebAppsOperationsExtensions.cs | 296 ++--- .../src/Generated/WebSiteManagementClient.cs | 2 +- 32 files changed, 1220 insertions(+), 1484 deletions(-) create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiKVReference.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceLocation.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceSource.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/InternalLoadBalancingMode.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceCollection.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceResource.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResolveStatus.cs create mode 100644 sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteInstance.cs diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IRecommendationsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IRecommendationsOperations.cs index 3ad582f3625d8..7b51a73989875 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IRecommendationsOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IRecommendationsOperations.cs @@ -142,10 +142,10 @@ public partial interface IRecommendationsOperations /// Task>> ListHistoryForHostingEnvironmentWithHttpMessagesAsync(string resourceGroupName, string hostingEnvironmentName, bool? expiredOnly = default(bool?), string filter = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Get all recommendations for a hosting environment. + /// Get all recommendations for an app. /// /// - /// Description for Get all recommendations for a hosting environment. + /// Description for Get all recommendations for an app. /// /// /// Name of the resource group to which the resource belongs. @@ -555,10 +555,10 @@ public partial interface IRecommendationsOperations /// Task>> ListHistoryForHostingEnvironmentNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Get all recommendations for a hosting environment. + /// Get all recommendations for an app. /// /// - /// Description for Get all recommendations for a hosting environment. + /// Description for Get all recommendations for an app. /// /// /// The NextLink from the previous successful call to List operation. 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 4cd486e4521fd..2588d89310366 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs @@ -758,21 +758,20 @@ public partial interface IWebAppsOperations /// Task> GetAuthSettingsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Updates site's Authentication / Authorization settings for apps via - /// the V2 format + /// Updates the Azure storage account configurations of an app. /// /// - /// Description for Updates site's Authentication / Authorization - /// settings for apps via the V2 format + /// Description for Updates the Azure storage account configurations of + /// an app. /// /// /// Name of the resource group to which the resource belongs. /// /// - /// Name of web app. + /// Name of the app. /// - /// - /// Auth settings associated with web app. + /// + /// Azure storage accounts of the app. /// /// /// The headers that will be added to request. @@ -789,14 +788,13 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> UpdateAuthSettingsV2WithHttpMessagesAsync(string resourceGroupName, string name, SiteAuthSettingsV2 siteAuthSettingsV2, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> UpdateAzureStorageAccountsWithHttpMessagesAsync(string resourceGroupName, string name, AzureStoragePropertyDictionaryResource azureStorageAccounts, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Gets site's Authentication / Authorization settings for apps via - /// the V2 format + /// Gets the Azure storage account configurations of an app. /// /// - /// Description for Gets site's Authentication / Authorization settings - /// for apps via the V2 format + /// Description for Gets the Azure storage account configurations of an + /// app. /// /// /// Name of the resource group to which the resource belongs. @@ -819,13 +817,12 @@ 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> ListAzureStorageAccountsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Updates the Azure storage account configurations of an app. + /// Updates the backup configuration of an app. /// /// - /// Description for Updates the Azure storage account configurations of - /// an app. + /// Description for Updates the backup configuration of an app. /// /// /// Name of the resource group to which the resource belongs. @@ -833,8 +830,8 @@ public partial interface IWebAppsOperations /// /// Name of the app. /// - /// - /// Azure storage accounts of the app. + /// + /// Edited backup configuration. /// /// /// The headers that will be added to request. @@ -851,13 +848,12 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> UpdateAzureStorageAccountsWithHttpMessagesAsync(string resourceGroupName, string name, AzureStoragePropertyDictionaryResource azureStorageAccounts, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> UpdateBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, BackupRequest request, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Gets the Azure storage account configurations of an app. + /// Deletes the backup configuration of an app. /// /// - /// Description for Gets the Azure storage account configurations of an - /// app. + /// Description for Deletes the backup configuration of an app. /// /// /// Name of the resource group to which the resource belongs. @@ -874,18 +870,15 @@ public partial interface IWebAppsOperations /// /// Thrown when the operation returned an invalid status code /// - /// - /// Thrown when unable to deserialize the response - /// /// /// Thrown when a required parameter is null /// - Task> ListAzureStorageAccountsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task DeleteBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Updates the backup configuration of an app. + /// Gets the backup configuration of an app. /// /// - /// Description for Updates the backup configuration of an app. + /// Description for Gets the backup configuration of an app. /// /// /// Name of the resource group to which the resource belongs. @@ -893,9 +886,6 @@ public partial interface IWebAppsOperations /// /// Name of the app. /// - /// - /// Edited backup configuration. - /// /// /// The headers that will be added to request. /// @@ -911,12 +901,13 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> UpdateBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, BackupRequest request, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Deletes the backup configuration of an app. + /// Gets the config reference app settings and status of an app /// /// - /// Description for Deletes the backup configuration of an app. + /// Description for Gets the config reference app settings and status + /// of an app /// /// /// Name of the resource group to which the resource belongs. @@ -933,15 +924,18 @@ public partial interface IWebAppsOperations /// /// Thrown when the operation returned an invalid status code /// + /// + /// Thrown when unable to deserialize the response + /// /// /// Thrown when a required parameter is null /// - Task DeleteBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetAppSettingsKeyVaultReferencesWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Gets the backup configuration of an app. + /// Gets the config reference and status of an app /// /// - /// Description for Gets the backup configuration of an app. + /// Description for Gets the config reference and status of an app /// /// /// Name of the resource group to which the resource belongs. @@ -949,6 +943,9 @@ public partial interface IWebAppsOperations /// /// Name of the app. /// + /// + /// App Setting key name. + /// /// /// The headers that will be added to request. /// @@ -964,7 +961,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task> GetBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetAppSettingKeyVaultReferenceWithHttpMessagesAsync(string resourceGroupName, string name, string appSettingKey, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Replaces the connection strings of an app. /// @@ -3053,7 +3050,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task>> ListInstanceIdentifiersWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListInstanceIdentifiersWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Gets all scale-out instances of an app. /// @@ -5657,77 +5654,6 @@ public partial interface IWebAppsOperations /// Task> GetAuthSettingsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Updates site's Authentication / Authorization settings for apps via - /// the V2 format - /// - /// - /// Description for Updates site's Authentication / Authorization - /// settings for apps via the V2 format - /// - /// - /// Name of the resource group to which the resource belongs. - /// - /// - /// Name of web app. - /// - /// - /// Auth settings associated with web app. - /// - /// - /// Name of web app slot. If not specified then will default to - /// production slot. - /// - /// - /// 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> UpdateAuthSettingsV2SlotWithHttpMessagesAsync(string resourceGroupName, string name, SiteAuthSettingsV2 siteAuthSettingsV2, string slot, 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. - /// - /// - /// Name of the deployment slot. If a slot is not specified, the API - /// will get the settings for the production slot. - /// - /// - /// 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> GetAuthSettingsV2SlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// /// Updates the Azure storage account configurations of an app. /// /// @@ -8161,7 +8087,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task>> ListInstanceIdentifiersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListInstanceIdentifiersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Gets all scale-out instances of an app. /// @@ -13890,7 +13816,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task>> ListInstanceIdentifiersNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListInstanceIdentifiersNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Get list of processes for a web site, or a deployment slot, or for /// a specific scaled-out instance in a web site. @@ -14414,7 +14340,7 @@ public partial interface IWebAppsOperations /// /// Thrown when a required parameter is null /// - Task>> ListInstanceIdentifiersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListInstanceIdentifiersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Get list of processes for a web site, or a deployment slot, or for /// a specific scaled-out instance in a web site. diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiKVReference.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiKVReference.cs new file mode 100644 index 0000000000000..89e9a6e20a422 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiKVReference.cs @@ -0,0 +1,115 @@ +// +// 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.Linq; + + /// + /// Description of site key vault references. + /// + public partial class ApiKVReference + { + /// + /// Initializes a new instance of the ApiKVReference class. + /// + public ApiKVReference() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ApiKVReference class. + /// + /// Possible values include: 'Initialized', + /// 'Resolved', 'InvalidSyntax', 'MSINotEnabled', 'VaultNotFound', + /// 'SecretNotFound', 'SecretVersionNotFound', + /// 'AccessToKeyVaultDenied', 'OtherReasons' + /// Possible values include: + /// 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', + /// 'None' + /// Possible values include: 'KeyVault' + /// Possible values include: + /// 'ApplicationSetting' + public ApiKVReference(string reference = default(string), ResolveStatus? status = default(ResolveStatus?), string vaultName = default(string), string secretName = default(string), string secretVersion = default(string), ManagedServiceIdentityType? identityType = default(ManagedServiceIdentityType?), string details = default(string), ConfigReferenceSource? source = default(ConfigReferenceSource?), ConfigReferenceLocation? location = default(ConfigReferenceLocation?)) + { + Reference = reference; + Status = status; + VaultName = vaultName; + SecretName = secretName; + SecretVersion = secretVersion; + IdentityType = identityType; + Details = details; + Source = source; + Location = location; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// + [JsonProperty(PropertyName = "reference")] + public string Reference { get; set; } + + /// + /// Gets or sets possible values include: 'Initialized', 'Resolved', + /// 'InvalidSyntax', 'MSINotEnabled', 'VaultNotFound', + /// 'SecretNotFound', 'SecretVersionNotFound', + /// 'AccessToKeyVaultDenied', 'OtherReasons' + /// + [JsonProperty(PropertyName = "status")] + public ResolveStatus? Status { get; set; } + + /// + /// + [JsonProperty(PropertyName = "vaultName")] + public string VaultName { get; set; } + + /// + /// + [JsonProperty(PropertyName = "secretName")] + public string SecretName { get; set; } + + /// + /// + [JsonProperty(PropertyName = "secretVersion")] + public string SecretVersion { get; set; } + + /// + /// Gets or sets possible values include: 'SystemAssigned', + /// 'UserAssigned', 'SystemAssigned, UserAssigned', 'None' + /// + [JsonProperty(PropertyName = "identityType")] + public ManagedServiceIdentityType? IdentityType { get; set; } + + /// + /// + [JsonProperty(PropertyName = "details")] + public string Details { get; set; } + + /// + /// Gets or sets possible values include: 'KeyVault' + /// + [JsonProperty(PropertyName = "source")] + public ConfigReferenceSource? Source { get; set; } + + /// + /// Gets or sets possible values include: 'ApplicationSetting' + /// + [JsonProperty(PropertyName = "location")] + public ConfigReferenceLocation? Location { 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 d7562b769f246..29ea05a82abc1 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 @@ -52,8 +52,8 @@ public AppServiceEnvironment() /// Subnet of the Virtual Network. /// Specifies which endpoints /// to serve internally in the Virtual Network for the App Service - /// Environment. Possible values include: 'None', 'Web', 'Publishing', - /// 'Web,Publishing' + /// Environment. Possible values include: 'None', 'Web', + /// 'Publishing' /// Front-end VM size, e.g. "Medium", /// "Large". /// Number of front-end instances. @@ -117,7 +117,7 @@ public AppServiceEnvironment() /// Environment default SSL certificate /// Key Vault Secret Name for /// ILB App Service Environment default SSL certificate - public AppServiceEnvironment(string name, string location, VirtualNetworkProfile virtualNetwork, IList workerPools, ProvisioningState? provisioningState = default(ProvisioningState?), HostingEnvironmentStatus? status = default(HostingEnvironmentStatus?), string vnetName = default(string), string vnetResourceGroupName = default(string), string vnetSubnetName = default(string), string internalLoadBalancingMode = default(string), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string databaseEdition = default(string), string databaseServiceObjective = default(string), int? upgradeDomains = default(int?), string subscriptionId = default(string), string dnsSuffix = default(string), string lastAction = default(string), string lastActionResult = default(string), string allowedMultiSizes = default(string), string allowedWorkerSizes = default(string), int? maximumNumberOfMachines = default(int?), IList vipMappings = default(IList), IList environmentCapacities = default(IList), IList networkAccessControlList = default(IList), bool? environmentIsHealthy = default(bool?), string environmentStatus = default(string), string resourceGroup = default(string), int? frontEndScaleFactor = default(int?), int? defaultFrontEndScaleFactor = default(int?), string apiManagementAccountId = default(string), bool? suspended = default(bool?), bool? dynamicCacheEnabled = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), string sslCertKeyVaultId = default(string), string sslCertKeyVaultSecretName = default(string)) + public AppServiceEnvironment(string name, string location, VirtualNetworkProfile virtualNetwork, IList workerPools, ProvisioningState? provisioningState = default(ProvisioningState?), HostingEnvironmentStatus? status = default(HostingEnvironmentStatus?), string vnetName = default(string), string vnetResourceGroupName = default(string), string vnetSubnetName = default(string), InternalLoadBalancingMode? internalLoadBalancingMode = default(InternalLoadBalancingMode?), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string databaseEdition = default(string), string databaseServiceObjective = default(string), int? upgradeDomains = default(int?), string subscriptionId = default(string), string dnsSuffix = default(string), string lastAction = default(string), string lastActionResult = default(string), string allowedMultiSizes = default(string), string allowedWorkerSizes = default(string), int? maximumNumberOfMachines = default(int?), IList vipMappings = default(IList), IList environmentCapacities = default(IList), IList networkAccessControlList = default(IList), bool? environmentIsHealthy = default(bool?), string environmentStatus = default(string), string resourceGroup = default(string), int? frontEndScaleFactor = default(int?), int? defaultFrontEndScaleFactor = default(int?), string apiManagementAccountId = default(string), bool? suspended = default(bool?), bool? dynamicCacheEnabled = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), string sslCertKeyVaultId = default(string), string sslCertKeyVaultSecretName = default(string)) { Name = name; Location = location; @@ -222,10 +222,10 @@ public AppServiceEnvironment() /// /// Gets or sets specifies which endpoints to serve internally in the /// Virtual Network for the App Service Environment. Possible values - /// include: 'None', 'Web', 'Publishing', 'Web,Publishing' + /// include: 'None', 'Web', 'Publishing' /// [JsonProperty(PropertyName = "internalLoadBalancingMode")] - public string InternalLoadBalancingMode { get; set; } + public InternalLoadBalancingMode? InternalLoadBalancingMode { get; set; } /// /// Gets or sets front-end VM size, e.g. "Medium", "Large". 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 bf9e55680b03e..fa7fcacb72a25 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 @@ -61,8 +61,8 @@ public AppServiceEnvironmentPatchResource() /// Subnet of the Virtual Network. /// Specifies which endpoints /// to serve internally in the Virtual Network for the App Service - /// Environment. Possible values include: 'None', 'Web', 'Publishing', - /// 'Web,Publishing' + /// Environment. Possible values include: 'None', 'Web', + /// 'Publishing' /// Front-end VM size, e.g. "Medium", /// "Large". /// Number of front-end instances. @@ -126,7 +126,7 @@ public AppServiceEnvironmentPatchResource() /// Environment default SSL certificate /// Key Vault Secret Name for /// ILB App Service Environment default SSL certificate - public AppServiceEnvironmentPatchResource(string appServiceEnvironmentPatchResourceName, string location, VirtualNetworkProfile virtualNetwork, IList workerPools, 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 vnetName = default(string), string vnetResourceGroupName = default(string), string vnetSubnetName = default(string), string internalLoadBalancingMode = default(string), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string databaseEdition = default(string), string databaseServiceObjective = default(string), int? upgradeDomains = default(int?), string subscriptionId = default(string), string dnsSuffix = default(string), string lastAction = default(string), string lastActionResult = default(string), string allowedMultiSizes = default(string), string allowedWorkerSizes = default(string), int? maximumNumberOfMachines = default(int?), IList vipMappings = default(IList), IList environmentCapacities = default(IList), IList networkAccessControlList = default(IList), bool? environmentIsHealthy = default(bool?), string environmentStatus = default(string), string resourceGroup = default(string), int? frontEndScaleFactor = default(int?), int? defaultFrontEndScaleFactor = default(int?), string apiManagementAccountId = default(string), bool? suspended = default(bool?), bool? dynamicCacheEnabled = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), string sslCertKeyVaultId = default(string), string sslCertKeyVaultSecretName = default(string)) + public AppServiceEnvironmentPatchResource(string appServiceEnvironmentPatchResourceName, string location, VirtualNetworkProfile virtualNetwork, IList workerPools, 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 vnetName = default(string), string vnetResourceGroupName = default(string), string vnetSubnetName = default(string), InternalLoadBalancingMode? internalLoadBalancingMode = default(InternalLoadBalancingMode?), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string databaseEdition = default(string), string databaseServiceObjective = default(string), int? upgradeDomains = default(int?), string subscriptionId = default(string), string dnsSuffix = default(string), string lastAction = default(string), string lastActionResult = default(string), string allowedMultiSizes = default(string), string allowedWorkerSizes = default(string), int? maximumNumberOfMachines = default(int?), IList vipMappings = default(IList), IList environmentCapacities = default(IList), IList networkAccessControlList = default(IList), bool? environmentIsHealthy = default(bool?), string environmentStatus = default(string), string resourceGroup = default(string), int? frontEndScaleFactor = default(int?), int? defaultFrontEndScaleFactor = default(int?), string apiManagementAccountId = default(string), bool? suspended = default(bool?), bool? dynamicCacheEnabled = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), string sslCertKeyVaultId = default(string), string sslCertKeyVaultSecretName = default(string)) : base(id, name, kind, type) { AppServiceEnvironmentPatchResourceName = appServiceEnvironmentPatchResourceName; @@ -232,10 +232,10 @@ public AppServiceEnvironmentPatchResource() /// /// Gets or sets specifies which endpoints to serve internally in the /// Virtual Network for the App Service Environment. Possible values - /// include: 'None', 'Web', 'Publishing', 'Web,Publishing' + /// include: 'None', 'Web', 'Publishing' /// [JsonProperty(PropertyName = "properties.internalLoadBalancingMode")] - public string InternalLoadBalancingMode { get; set; } + public InternalLoadBalancingMode? InternalLoadBalancingMode { get; set; } /// /// Gets or sets front-end VM size, e.g. "Medium", "Large". 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 910c484a40d3e..63564f3f9cb04 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 @@ -63,8 +63,8 @@ public AppServiceEnvironmentResource() /// Subnet of the Virtual Network. /// Specifies which endpoints /// to serve internally in the Virtual Network for the App Service - /// Environment. Possible values include: 'None', 'Web', 'Publishing', - /// 'Web,Publishing' + /// Environment. Possible values include: 'None', 'Web', + /// 'Publishing' /// Front-end VM size, e.g. "Medium", /// "Large". /// Number of front-end instances. @@ -128,7 +128,7 @@ public AppServiceEnvironmentResource() /// Environment default SSL certificate /// Key Vault Secret Name for /// ILB App Service Environment default SSL certificate - public AppServiceEnvironmentResource(string location, string appServiceEnvironmentResourceName, string appServiceEnvironmentResourceLocation, VirtualNetworkProfile virtualNetwork, IList workerPools, 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 vnetName = default(string), string vnetResourceGroupName = default(string), string vnetSubnetName = default(string), string internalLoadBalancingMode = default(string), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string databaseEdition = default(string), string databaseServiceObjective = default(string), int? upgradeDomains = default(int?), string subscriptionId = default(string), string dnsSuffix = default(string), string lastAction = default(string), string lastActionResult = default(string), string allowedMultiSizes = default(string), string allowedWorkerSizes = default(string), int? maximumNumberOfMachines = default(int?), IList vipMappings = default(IList), IList environmentCapacities = default(IList), IList networkAccessControlList = default(IList), bool? environmentIsHealthy = default(bool?), string environmentStatus = default(string), string resourceGroup = default(string), int? frontEndScaleFactor = default(int?), int? defaultFrontEndScaleFactor = default(int?), string apiManagementAccountId = default(string), bool? suspended = default(bool?), bool? dynamicCacheEnabled = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), string sslCertKeyVaultId = default(string), string sslCertKeyVaultSecretName = default(string)) + public AppServiceEnvironmentResource(string location, string appServiceEnvironmentResourceName, string appServiceEnvironmentResourceLocation, VirtualNetworkProfile virtualNetwork, IList workerPools, 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 vnetName = default(string), string vnetResourceGroupName = default(string), string vnetSubnetName = default(string), InternalLoadBalancingMode? internalLoadBalancingMode = default(InternalLoadBalancingMode?), string multiSize = default(string), int? multiRoleCount = default(int?), int? ipsslAddressCount = default(int?), string databaseEdition = default(string), string databaseServiceObjective = default(string), int? upgradeDomains = default(int?), string subscriptionId = default(string), string dnsSuffix = default(string), string lastAction = default(string), string lastActionResult = default(string), string allowedMultiSizes = default(string), string allowedWorkerSizes = default(string), int? maximumNumberOfMachines = default(int?), IList vipMappings = default(IList), IList environmentCapacities = default(IList), IList networkAccessControlList = default(IList), bool? environmentIsHealthy = default(bool?), string environmentStatus = default(string), string resourceGroup = default(string), int? frontEndScaleFactor = default(int?), int? defaultFrontEndScaleFactor = default(int?), string apiManagementAccountId = default(string), bool? suspended = default(bool?), bool? dynamicCacheEnabled = default(bool?), IList clusterSettings = default(IList), IList userWhitelistedIpRanges = default(IList), bool? hasLinuxWorkers = default(bool?), string sslCertKeyVaultId = default(string), string sslCertKeyVaultSecretName = default(string)) : base(location, id, name, kind, type, tags) { AppServiceEnvironmentResourceName = appServiceEnvironmentResourceName; @@ -234,10 +234,10 @@ public AppServiceEnvironmentResource() /// /// Gets or sets specifies which endpoints to serve internally in the /// Virtual Network for the App Service Environment. Possible values - /// include: 'None', 'Web', 'Publishing', 'Web,Publishing' + /// include: 'None', 'Web', 'Publishing' /// [JsonProperty(PropertyName = "properties.internalLoadBalancingMode")] - public string InternalLoadBalancingMode { get; set; } + public InternalLoadBalancingMode? InternalLoadBalancingMode { get; set; } /// /// Gets or sets front-end VM size, e.g. "Medium", "Large". diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/BuiltInAuthenticationProvider.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/BuiltInAuthenticationProvider.cs index 7c1d8d8ded9ab..1d07cbd9e2330 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/BuiltInAuthenticationProvider.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/BuiltInAuthenticationProvider.cs @@ -30,9 +30,7 @@ public enum BuiltInAuthenticationProvider [EnumMember(Value = "MicrosoftAccount")] MicrosoftAccount, [EnumMember(Value = "Twitter")] - Twitter, - [EnumMember(Value = "Github")] - Github + Twitter } internal static class BuiltInAuthenticationProviderEnumExtension { @@ -55,8 +53,6 @@ internal static string ToSerializedValue(this BuiltInAuthenticationProvider valu return "MicrosoftAccount"; case BuiltInAuthenticationProvider.Twitter: return "Twitter"; - case BuiltInAuthenticationProvider.Github: - return "Github"; } return null; } @@ -75,8 +71,6 @@ internal static string ToSerializedValue(this BuiltInAuthenticationProvider valu return BuiltInAuthenticationProvider.MicrosoftAccount; case "Twitter": return BuiltInAuthenticationProvider.Twitter; - case "Github": - return BuiltInAuthenticationProvider.Github; } return null; } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceLocation.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceLocation.cs new file mode 100644 index 0000000000000..74a43ab877e61 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceLocation.cs @@ -0,0 +1,54 @@ +// +// 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 Newtonsoft.Json.Converters; + using System.Runtime; + using System.Runtime.Serialization; + + /// + /// Defines values for ConfigReferenceLocation. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum ConfigReferenceLocation + { + [EnumMember(Value = "ApplicationSetting")] + ApplicationSetting + } + internal static class ConfigReferenceLocationEnumExtension + { + internal static string ToSerializedValue(this ConfigReferenceLocation? value) + { + return value == null ? null : ((ConfigReferenceLocation)value).ToSerializedValue(); + } + + internal static string ToSerializedValue(this ConfigReferenceLocation value) + { + switch( value ) + { + case ConfigReferenceLocation.ApplicationSetting: + return "ApplicationSetting"; + } + return null; + } + + internal static ConfigReferenceLocation? ParseConfigReferenceLocation(this string value) + { + switch( value ) + { + case "ApplicationSetting": + return ConfigReferenceLocation.ApplicationSetting; + } + return null; + } + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceSource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceSource.cs new file mode 100644 index 0000000000000..621c4362c7177 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceSource.cs @@ -0,0 +1,54 @@ +// +// 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 Newtonsoft.Json.Converters; + using System.Runtime; + using System.Runtime.Serialization; + + /// + /// Defines values for ConfigReferenceSource. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum ConfigReferenceSource + { + [EnumMember(Value = "KeyVault")] + KeyVault + } + internal static class ConfigReferenceSourceEnumExtension + { + internal static string ToSerializedValue(this ConfigReferenceSource? value) + { + return value == null ? null : ((ConfigReferenceSource)value).ToSerializedValue(); + } + + internal static string ToSerializedValue(this ConfigReferenceSource value) + { + switch( value ) + { + case ConfigReferenceSource.KeyVault: + return "KeyVault"; + } + return null; + } + + internal static ConfigReferenceSource? ParseConfigReferenceSource(this string value) + { + switch( value ) + { + case "KeyVault": + return ConfigReferenceSource.KeyVault; + } + return null; + } + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FunctionSecrets.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FunctionSecrets.cs index 402dfca0c9297..b69fa5e41d6e5 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FunctionSecrets.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FunctionSecrets.cs @@ -10,13 +10,16 @@ namespace Microsoft.Azure.Management.WebSites.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Linq; /// /// Function secrets. /// - public partial class FunctionSecrets + [Rest.Serialization.JsonTransformation] + public partial class FunctionSecrets : ProxyOnlyResource { /// /// Initializes a new instance of the FunctionSecrets class. @@ -29,9 +32,14 @@ public FunctionSecrets() /// /// Initializes a new instance of the FunctionSecrets class. /// + /// Resource Id. + /// Resource Name. + /// Kind of resource. + /// Resource type. /// Secret key. /// Trigger URL. - public FunctionSecrets(string key = default(string), string triggerUrl = default(string)) + public FunctionSecrets(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string key = default(string), string triggerUrl = default(string)) + : base(id, name, kind, type) { Key = key; TriggerUrl = triggerUrl; @@ -46,13 +54,13 @@ public FunctionSecrets() /// /// Gets or sets secret key. /// - [JsonProperty(PropertyName = "key")] + [JsonProperty(PropertyName = "properties.key")] public string Key { get; set; } /// /// Gets or sets trigger URL. /// - [JsonProperty(PropertyName = "trigger_url")] + [JsonProperty(PropertyName = "properties.trigger_url")] public string TriggerUrl { get; set; } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/InternalLoadBalancingMode.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/InternalLoadBalancingMode.cs new file mode 100644 index 0000000000000..b77fda43f19aa --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/InternalLoadBalancingMode.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 Newtonsoft.Json.Converters; + using System.Runtime; + using System.Runtime.Serialization; + + /// + /// Defines values for InternalLoadBalancingMode. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum InternalLoadBalancingMode + { + [EnumMember(Value = "None")] + None, + [EnumMember(Value = "Web")] + Web, + [EnumMember(Value = "Publishing")] + Publishing + } + internal static class InternalLoadBalancingModeEnumExtension + { + internal static string ToSerializedValue(this InternalLoadBalancingMode? value) + { + return value == null ? null : ((InternalLoadBalancingMode)value).ToSerializedValue(); + } + + internal static string ToSerializedValue(this InternalLoadBalancingMode value) + { + switch( value ) + { + case InternalLoadBalancingMode.None: + return "None"; + case InternalLoadBalancingMode.Web: + return "Web"; + case InternalLoadBalancingMode.Publishing: + return "Publishing"; + } + return null; + } + + internal static InternalLoadBalancingMode? ParseInternalLoadBalancingMode(this string value) + { + switch( value ) + { + case "None": + return InternalLoadBalancingMode.None; + case "Web": + return InternalLoadBalancingMode.Web; + case "Publishing": + return InternalLoadBalancingMode.Publishing; + } + return null; + } + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IpFilterTag.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IpFilterTag.cs index 3b5a6fdf588cd..089e130f08466 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IpFilterTag.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IpFilterTag.cs @@ -10,14 +10,51 @@ namespace Microsoft.Azure.Management.WebSites.Models { + using Newtonsoft.Json; + using Newtonsoft.Json.Converters; + using System.Runtime; + using System.Runtime.Serialization; /// /// Defines values for IpFilterTag. /// - public static class IpFilterTag + [JsonConverter(typeof(StringEnumConverter))] + public enum IpFilterTag { - public const string Default = "Default"; - public const string XffProxy = "XffProxy"; - public const string ServiceTag = "ServiceTag"; + [EnumMember(Value = "Default")] + Default, + [EnumMember(Value = "XffProxy")] + XffProxy + } + internal static class IpFilterTagEnumExtension + { + internal static string ToSerializedValue(this IpFilterTag? value) + { + return value == null ? null : ((IpFilterTag)value).ToSerializedValue(); + } + + internal static string ToSerializedValue(this IpFilterTag value) + { + switch( value ) + { + case IpFilterTag.Default: + return "Default"; + case IpFilterTag.XffProxy: + return "XffProxy"; + } + return null; + } + + internal static IpFilterTag? ParseIpFilterTag(this string value) + { + switch( value ) + { + case "Default": + return IpFilterTag.Default; + case "XffProxy": + return IpFilterTag.XffProxy; + } + return null; + } } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IpSecurityRestriction.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IpSecurityRestriction.cs index 7dee1a54d39a7..9d2010a37c16d 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IpSecurityRestriction.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/IpSecurityRestriction.cs @@ -11,8 +11,6 @@ namespace Microsoft.Azure.Management.WebSites.Models { using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; using System.Linq; /// @@ -48,37 +46,11 @@ public IpSecurityRestriction() /// range. /// Defines what this IP filter will be used for. /// This is to support IP filtering on proxies. Possible values - /// include: 'Default', 'XffProxy', 'ServiceTag' + /// include: 'Default', 'XffProxy' /// Priority of IP restriction rule. /// IP restriction rule name. /// IP restriction rule description. - /// IP restriction rule headers. - /// X-Forwarded-Host - /// (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Host#Examples). - /// The matching logic is .. - /// - If the property is null or empty (default), all hosts(or lack of) - /// are allowed. - /// - A value is compared using ordinal-ignore-case (excluding port - /// number). - /// - Subdomain wildcards are permitted but don't match the root - /// domain. For example, *.contoso.com matches the subdomain - /// foo.contoso.com - /// but not the root domain contoso.com or multi-level - /// foo.bar.contoso.com - /// - Unicode host names are allowed but are converted to Punycode for - /// matching. - /// - /// X-Forwarded-For - /// (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For#Examples). - /// The matching logic is .. - /// - If the property is null or empty (default), any forwarded-for - /// chains (or lack of) are allowed. - /// - If any address (excluding port number) in the chain (comma - /// separated) matches the CIDR defined by the property. - /// - /// X-Azure-FDID and X-FD-HealthProbe. - /// The matching logic is exact match. - public IpSecurityRestriction(string ipAddress = default(string), string subnetMask = default(string), string vnetSubnetResourceId = default(string), int? vnetTrafficTag = default(int?), int? subnetTrafficTag = default(int?), string action = default(string), string tag = default(string), int? priority = default(int?), string name = default(string), string description = default(string), IDictionary> headers = default(IDictionary>)) + public IpSecurityRestriction(string ipAddress = default(string), string subnetMask = default(string), string vnetSubnetResourceId = default(string), int? vnetTrafficTag = default(int?), int? subnetTrafficTag = default(int?), string action = default(string), IpFilterTag? tag = default(IpFilterTag?), int? priority = default(int?), string name = default(string), string description = default(string)) { IpAddress = ipAddress; SubnetMask = subnetMask; @@ -90,7 +62,6 @@ public IpSecurityRestriction() Priority = priority; Name = name; Description = description; - Headers = headers; CustomInit(); } @@ -143,10 +114,10 @@ public IpSecurityRestriction() /// /// Gets or sets defines what this IP filter will be used for. This is /// to support IP filtering on proxies. Possible values include: - /// 'Default', 'XffProxy', 'ServiceTag' + /// 'Default', 'XffProxy' /// [JsonProperty(PropertyName = "tag")] - public string Tag { get; set; } + public IpFilterTag? Tag { get; set; } /// /// Gets or sets priority of IP restriction rule. @@ -166,36 +137,5 @@ public IpSecurityRestriction() [JsonProperty(PropertyName = "description")] public string Description { get; set; } - /// - /// Gets or sets IP restriction rule headers. - /// X-Forwarded-Host - /// (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Host#Examples). - /// The matching logic is .. - /// - If the property is null or empty (default), all hosts(or lack of) - /// are allowed. - /// - A value is compared using ordinal-ignore-case (excluding port - /// number). - /// - Subdomain wildcards are permitted but don't match the root - /// domain. For example, *.contoso.com matches the subdomain - /// foo.contoso.com - /// but not the root domain contoso.com or multi-level - /// foo.bar.contoso.com - /// - Unicode host names are allowed but are converted to Punycode for - /// matching. - /// - /// X-Forwarded-For - /// (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For#Examples). - /// The matching logic is .. - /// - If the property is null or empty (default), any forwarded-for - /// chains (or lack of) are allowed. - /// - If any address (excluding port number) in the chain (comma - /// separated) matches the CIDR defined by the property. - /// - /// X-Azure-FDID and X-FD-HealthProbe. - /// The matching logic is exact match. - /// - [JsonProperty(PropertyName = "headers")] - public IDictionary> Headers { get; set; } - } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceCollection.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceCollection.cs new file mode 100644 index 0000000000000..a0f976b342405 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceCollection.cs @@ -0,0 +1,61 @@ +// +// 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; + + /// + /// Web app key vault reference and status ARM resource. + /// + [Rest.Serialization.JsonTransformation] + public partial class KeyVaultReferenceCollection : ProxyOnlyResource + { + /// + /// Initializes a new instance of the KeyVaultReferenceCollection + /// class. + /// + public KeyVaultReferenceCollection() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the KeyVaultReferenceCollection + /// class. + /// + /// Resource Id. + /// Resource Name. + /// Kind of resource. + /// Resource type. + public KeyVaultReferenceCollection(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary keyToReferenceStatuses = default(IDictionary)) + : base(id, name, kind, type) + { + KeyToReferenceStatuses = keyToReferenceStatuses; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// + [JsonProperty(PropertyName = "properties.keyToReferenceStatuses")] + public IDictionary KeyToReferenceStatuses { get; set; } + + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceResource.cs new file mode 100644 index 0000000000000..77369aa724b0d --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceResource.cs @@ -0,0 +1,123 @@ +// +// 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; + + /// + /// Web app key vault reference and status ARM resource. + /// + [Rest.Serialization.JsonTransformation] + public partial class KeyVaultReferenceResource : ProxyOnlyResource + { + /// + /// Initializes a new instance of the KeyVaultReferenceResource class. + /// + public KeyVaultReferenceResource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the KeyVaultReferenceResource class. + /// + /// Resource Id. + /// Resource Name. + /// Kind of resource. + /// Resource type. + /// Possible values include: 'Initialized', + /// 'Resolved', 'InvalidSyntax', 'MSINotEnabled', 'VaultNotFound', + /// 'SecretNotFound', 'SecretVersionNotFound', + /// 'AccessToKeyVaultDenied', 'OtherReasons' + /// Possible values include: + /// 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', + /// 'None' + /// Possible values include: 'KeyVault' + /// Possible values include: + /// 'ApplicationSetting' + public KeyVaultReferenceResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string reference = default(string), ResolveStatus? status = default(ResolveStatus?), string vaultName = default(string), string secretName = default(string), string secretVersion = default(string), ManagedServiceIdentityType? identityType = default(ManagedServiceIdentityType?), string details = default(string), ConfigReferenceSource? source = default(ConfigReferenceSource?), ConfigReferenceLocation? location = default(ConfigReferenceLocation?)) + : base(id, name, kind, type) + { + Reference = reference; + Status = status; + VaultName = vaultName; + SecretName = secretName; + SecretVersion = secretVersion; + IdentityType = identityType; + Details = details; + Source = source; + Location = location; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// + [JsonProperty(PropertyName = "properties.reference")] + public string Reference { get; set; } + + /// + /// Gets or sets possible values include: 'Initialized', 'Resolved', + /// 'InvalidSyntax', 'MSINotEnabled', 'VaultNotFound', + /// 'SecretNotFound', 'SecretVersionNotFound', + /// 'AccessToKeyVaultDenied', 'OtherReasons' + /// + [JsonProperty(PropertyName = "properties.status")] + public ResolveStatus? Status { get; set; } + + /// + /// + [JsonProperty(PropertyName = "properties.vaultName")] + public string VaultName { get; set; } + + /// + /// + [JsonProperty(PropertyName = "properties.secretName")] + public string SecretName { get; set; } + + /// + /// + [JsonProperty(PropertyName = "properties.secretVersion")] + public string SecretVersion { get; set; } + + /// + /// Gets or sets possible values include: 'SystemAssigned', + /// 'UserAssigned', 'SystemAssigned, UserAssigned', 'None' + /// + [JsonProperty(PropertyName = "properties.identityType")] + public ManagedServiceIdentityType? IdentityType { get; set; } + + /// + /// + [JsonProperty(PropertyName = "properties.details")] + public string Details { get; set; } + + /// + /// Gets or sets possible values include: 'KeyVault' + /// + [JsonProperty(PropertyName = "properties.source")] + public ConfigReferenceSource? Source { get; set; } + + /// + /// Gets or sets possible values include: 'ApplicationSetting' + /// + [JsonProperty(PropertyName = "properties.location")] + public ConfigReferenceLocation? Location { get; set; } + + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LogSpecification.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LogSpecification.cs index 3fe115f189082..a9ccd383483e7 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LogSpecification.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/LogSpecification.cs @@ -29,12 +29,11 @@ public LogSpecification() /// /// Initializes a new instance of the LogSpecification class. /// - public LogSpecification(string name = default(string), string displayName = default(string), string blobDuration = default(string), string logFilterPattern = default(string)) + public LogSpecification(string name = default(string), string displayName = default(string), string blobDuration = default(string)) { Name = name; DisplayName = displayName; BlobDuration = blobDuration; - LogFilterPattern = logFilterPattern; CustomInit(); } @@ -58,10 +57,5 @@ public LogSpecification() [JsonProperty(PropertyName = "blobDuration")] public string BlobDuration { get; set; } - /// - /// - [JsonProperty(PropertyName = "logFilterPattern")] - public string LogFilterPattern { get; set; } - } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricSpecification.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricSpecification.cs index 38a0c42b33598..550a63993cb25 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricSpecification.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricSpecification.cs @@ -31,7 +31,7 @@ public MetricSpecification() /// /// Initializes a new instance of the MetricSpecification class. /// - public MetricSpecification(string name = default(string), string displayName = default(string), string displayDescription = default(string), string unit = default(string), string aggregationType = default(string), bool? supportsInstanceLevelAggregation = default(bool?), bool? enableRegionalMdmAccount = default(bool?), string sourceMdmAccount = default(string), string sourceMdmNamespace = default(string), string metricFilterPattern = default(string), bool? fillGapWithZero = default(bool?), bool? isInternal = default(bool?), IList dimensions = default(IList), string category = default(string), IList availabilities = default(IList), IList supportedTimeGrainTypes = default(IList), IList supportedAggregationTypes = default(IList)) + public MetricSpecification(string name = default(string), string displayName = default(string), string displayDescription = default(string), string unit = default(string), string aggregationType = default(string), bool? supportsInstanceLevelAggregation = default(bool?), bool? enableRegionalMdmAccount = default(bool?), string sourceMdmAccount = default(string), string sourceMdmNamespace = default(string), string metricFilterPattern = default(string), bool? fillGapWithZero = default(bool?), bool? isInternal = default(bool?), IList dimensions = default(IList), string category = default(string), IList availabilities = default(IList), IList supportedTimeGrainTypes = default(IList)) { Name = name; DisplayName = displayName; @@ -49,7 +49,6 @@ public MetricSpecification() Category = category; Availabilities = availabilities; SupportedTimeGrainTypes = supportedTimeGrainTypes; - SupportedAggregationTypes = supportedAggregationTypes; CustomInit(); } @@ -138,10 +137,5 @@ public MetricSpecification() [JsonProperty(PropertyName = "supportedTimeGrainTypes")] public IList SupportedTimeGrainTypes { get; set; } - /// - /// - [JsonProperty(PropertyName = "supportedAggregationTypes")] - public IList SupportedAggregationTypes { get; set; } - } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResolveStatus.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResolveStatus.cs new file mode 100644 index 0000000000000..81b83077e2126 --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResolveStatus.cs @@ -0,0 +1,102 @@ +// +// 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 Newtonsoft.Json.Converters; + using System.Runtime; + using System.Runtime.Serialization; + + /// + /// Defines values for ResolveStatus. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum ResolveStatus + { + [EnumMember(Value = "Initialized")] + Initialized, + [EnumMember(Value = "Resolved")] + Resolved, + [EnumMember(Value = "InvalidSyntax")] + InvalidSyntax, + [EnumMember(Value = "MSINotEnabled")] + MSINotEnabled, + [EnumMember(Value = "VaultNotFound")] + VaultNotFound, + [EnumMember(Value = "SecretNotFound")] + SecretNotFound, + [EnumMember(Value = "SecretVersionNotFound")] + SecretVersionNotFound, + [EnumMember(Value = "AccessToKeyVaultDenied")] + AccessToKeyVaultDenied, + [EnumMember(Value = "OtherReasons")] + OtherReasons + } + internal static class ResolveStatusEnumExtension + { + internal static string ToSerializedValue(this ResolveStatus? value) + { + return value == null ? null : ((ResolveStatus)value).ToSerializedValue(); + } + + internal static string ToSerializedValue(this ResolveStatus value) + { + switch( value ) + { + case ResolveStatus.Initialized: + return "Initialized"; + case ResolveStatus.Resolved: + return "Resolved"; + case ResolveStatus.InvalidSyntax: + return "InvalidSyntax"; + case ResolveStatus.MSINotEnabled: + return "MSINotEnabled"; + case ResolveStatus.VaultNotFound: + return "VaultNotFound"; + case ResolveStatus.SecretNotFound: + return "SecretNotFound"; + case ResolveStatus.SecretVersionNotFound: + return "SecretVersionNotFound"; + case ResolveStatus.AccessToKeyVaultDenied: + return "AccessToKeyVaultDenied"; + case ResolveStatus.OtherReasons: + return "OtherReasons"; + } + return null; + } + + internal static ResolveStatus? ParseResolveStatus(this string value) + { + switch( value ) + { + case "Initialized": + return ResolveStatus.Initialized; + case "Resolved": + return ResolveStatus.Resolved; + case "InvalidSyntax": + return ResolveStatus.InvalidSyntax; + case "MSINotEnabled": + return ResolveStatus.MSINotEnabled; + case "VaultNotFound": + return ResolveStatus.VaultNotFound; + case "SecretNotFound": + return ResolveStatus.SecretNotFound; + case "SecretVersionNotFound": + return ResolveStatus.SecretVersionNotFound; + case "AccessToKeyVaultDenied": + return ResolveStatus.AccessToKeyVaultDenied; + case "OtherReasons": + return ResolveStatus.OtherReasons; + } + return null; + } + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Site.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Site.cs index 5a5d96d804c33..67d1813717fe7 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Site.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Site.cs @@ -88,14 +88,6 @@ public Site() /// enable client certificate authentication (TLS mutual /// authentication); otherwise, <code>false</code>. Default /// is <code>false</code>. - /// This composes with ClientCertEnabled - /// setting. - /// - ClientCertEnabled: false means ClientCert is ignored. - /// - ClientCertEnabled: true and ClientCertMode: Required means - /// ClientCert is required. - /// - ClientCertEnabled: true and ClientCertMode: Optional means - /// ClientCert is optional or accepted. Possible values include: - /// 'Required', 'Optional' /// client certificate /// authentication comma-separated exclusion paths /// <code>true</code> to @@ -103,9 +95,6 @@ public Site() /// <code>false</code>. /// If <code>true</code>, the app is only accessible via /// API management process. - /// Unique identifier that - /// verifies the custom domains assigned to the app. Customer will add - /// this id to a txt record for verification. /// List of IP addresses that the app /// uses for outbound connections (e.g. database access). Includes VIPs /// from tenants that site can be hosted with current settings. @@ -140,7 +129,7 @@ public Site() /// 'GeoRedundant' /// Specifies an operation id if /// this site has a pending operation. - public Site(string location, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary tags = default(IDictionary), string state = default(string), IList hostNames = default(IList), string repositorySiteName = default(string), UsageState? usageState = default(UsageState?), bool? enabled = default(bool?), IList enabledHostNames = default(IList), SiteAvailabilityState? availabilityState = default(SiteAvailabilityState?), IList hostNameSslStates = default(IList), string serverFarmId = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), System.DateTime? lastModifiedTimeUtc = default(System.DateTime?), SiteConfig siteConfig = default(SiteConfig), IList trafficManagerHostNames = default(IList), bool? scmSiteAlsoStopped = default(bool?), string targetSwapSlot = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), bool? clientAffinityEnabled = default(bool?), bool? clientCertEnabled = default(bool?), ClientCertMode? clientCertMode = default(ClientCertMode?), string clientCertExclusionPaths = default(string), bool? hostNamesDisabled = default(bool?), string customDomainVerificationId = default(string), string outboundIpAddresses = default(string), string possibleOutboundIpAddresses = default(string), int? containerSize = default(int?), int? dailyMemoryTimeQuota = default(int?), System.DateTime? suspendedTill = default(System.DateTime?), int? maxNumberOfWorkers = default(int?), CloningInfo cloningInfo = default(CloningInfo), string resourceGroup = default(string), bool? isDefaultContainer = default(bool?), string defaultHostName = default(string), SlotSwapStatus slotSwapStatus = default(SlotSwapStatus), bool? httpsOnly = default(bool?), RedundancyMode? redundancyMode = default(RedundancyMode?), System.Guid? inProgressOperationId = default(System.Guid?), ManagedServiceIdentity identity = default(ManagedServiceIdentity)) + public Site(string location, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary tags = default(IDictionary), string state = default(string), IList hostNames = default(IList), string repositorySiteName = default(string), UsageState? usageState = default(UsageState?), bool? enabled = default(bool?), IList enabledHostNames = default(IList), SiteAvailabilityState? availabilityState = default(SiteAvailabilityState?), IList hostNameSslStates = default(IList), string serverFarmId = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), System.DateTime? lastModifiedTimeUtc = default(System.DateTime?), SiteConfig siteConfig = default(SiteConfig), IList trafficManagerHostNames = default(IList), bool? scmSiteAlsoStopped = default(bool?), string targetSwapSlot = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), bool? clientAffinityEnabled = default(bool?), bool? clientCertEnabled = default(bool?), string clientCertExclusionPaths = default(string), bool? hostNamesDisabled = default(bool?), string outboundIpAddresses = default(string), string possibleOutboundIpAddresses = default(string), int? containerSize = default(int?), int? dailyMemoryTimeQuota = default(int?), System.DateTime? suspendedTill = default(System.DateTime?), int? maxNumberOfWorkers = default(int?), CloningInfo cloningInfo = default(CloningInfo), string resourceGroup = default(string), bool? isDefaultContainer = default(bool?), string defaultHostName = default(string), SlotSwapStatus slotSwapStatus = default(SlotSwapStatus), bool? httpsOnly = default(bool?), RedundancyMode? redundancyMode = default(RedundancyMode?), System.Guid? inProgressOperationId = default(System.Guid?), ManagedServiceIdentity identity = default(ManagedServiceIdentity)) : base(location, id, name, kind, type, tags) { State = state; @@ -163,10 +152,8 @@ public Site() HostingEnvironmentProfile = hostingEnvironmentProfile; ClientAffinityEnabled = clientAffinityEnabled; ClientCertEnabled = clientCertEnabled; - ClientCertMode = clientCertMode; ClientCertExclusionPaths = clientCertExclusionPaths; HostNamesDisabled = hostNamesDisabled; - CustomDomainVerificationId = customDomainVerificationId; OutboundIpAddresses = outboundIpAddresses; PossibleOutboundIpAddresses = possibleOutboundIpAddresses; ContainerSize = containerSize; @@ -337,18 +324,6 @@ public Site() [JsonProperty(PropertyName = "properties.clientCertEnabled")] public bool? ClientCertEnabled { get; set; } - /// - /// Gets or sets this composes with ClientCertEnabled setting. - /// - ClientCertEnabled: false means ClientCert is ignored. - /// - ClientCertEnabled: true and ClientCertMode: Required means - /// ClientCert is required. - /// - ClientCertEnabled: true and ClientCertMode: Optional means - /// ClientCert is optional or accepted. Possible values include: - /// 'Required', 'Optional' - /// - [JsonProperty(PropertyName = "properties.clientCertMode")] - public ClientCertMode? ClientCertMode { get; set; } - /// /// Gets or sets client certificate authentication comma-separated /// exclusion paths @@ -366,14 +341,6 @@ public Site() [JsonProperty(PropertyName = "properties.hostNamesDisabled")] public bool? HostNamesDisabled { get; set; } - /// - /// Gets or sets unique identifier that verifies the custom domains - /// assigned to the app. Customer will add this id to a txt record for - /// verification. - /// - [JsonProperty(PropertyName = "properties.customDomainVerificationId")] - public string CustomDomainVerificationId { get; set; } - /// /// Gets list of IP addresses that the app uses for outbound /// connections (e.g. database access). Includes VIPs from tenants that diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteAuthSettings.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteAuthSettings.cs index a87bf293faac5..03467ae962a66 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteAuthSettings.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteAuthSettings.cs @@ -66,7 +66,7 @@ public SiteAuthSettings() /// and the unauthenticated client /// action is set to "RedirectToLoginPage". Possible values include: /// 'AzureActiveDirectory', 'Facebook', 'Google', 'MicrosoftAccount', - /// 'Twitter', 'Github' + /// 'Twitter' /// The number of hours after /// session token expiration that a session token can be used to /// call the token refresh API. The default is 72 hours. @@ -87,9 +87,6 @@ public SiteAuthSettings() /// authenticate end users. /// More information on OpenID Connect: /// http://openid.net/specs/openid-connect-core-1_0.html - /// The app setting name that - /// contains the client secret of the relying party - /// application. /// An alternative to /// the client secret, that is the thumbprint of a certificate used for /// signing purposes. This property acts as @@ -113,8 +110,6 @@ public SiteAuthSettings() /// OpenID Connect authorization endpoint when /// a user logs in. Each parameter must be in the form /// "key=value". - /// Gets a JSON string containing - /// the Azure AD Acl settings. /// The OpenID Connect Client ID for the /// Google web application. /// This setting is required for enabling Google Sign-In. @@ -125,9 +120,6 @@ public SiteAuthSettings() /// This setting is required for enabling Google Sign-In. /// Google Sign-In documentation: /// https://developers.google.com/identity/sign-in/web/ - /// The app setting name - /// that contains the client secret associated with - /// the Google web application. /// The OAuth 2.0 scopes that will be /// requested as part of Google Sign-In authentication. /// This setting is optional. If not specified, "openid", "profile", @@ -144,25 +136,11 @@ public SiteAuthSettings() /// This setting is required for enabling Facebook Login. /// Facebook Login documentation: /// https://developers.facebook.com/docs/facebook-login - /// The app setting name - /// that contains the app secret used for Facebook Login. /// The OAuth 2.0 scopes that will be /// requested as part of Facebook Login authentication. /// This setting is optional. /// Facebook Login documentation: /// https://developers.facebook.com/docs/facebook-login - /// The Client Id of the GitHub app used - /// for login. - /// This setting is required for enabling Github login - /// The Client Secret of the GitHub - /// app used for Github Login. - /// This setting is required for enabling Github login. - /// The app setting name - /// that contains the client secret of the Github - /// app used for GitHub Login. - /// The OAuth 2.0 scopes that will be - /// requested as part of GitHub Login authentication. - /// This setting is optional /// The OAuth 1.0a consumer key of the /// Twitter application used for sign-in. /// This setting is required for enabling Twitter Sign-In. @@ -173,9 +151,6 @@ public SiteAuthSettings() /// This setting is required for enabling Twitter Sign-In. /// Twitter Sign-In documentation: /// https://dev.twitter.com/web/sign-in - /// The app setting name - /// that contains the OAuth 1.0a consumer secret of the Twitter - /// application used for sign-in. /// The OAuth 2.0 client ID that /// was created for the app used for authentication. /// This setting is required for enabling Microsoft Account @@ -188,24 +163,13 @@ public SiteAuthSettings() /// authentication. /// Microsoft Account OAuth documentation: /// https://dev.onedrive.com/auth/msa_oauth.htm - /// The app - /// setting name containing the OAuth 2.0 client secret that was - /// created for the - /// app used for authentication. /// The OAuth 2.0 scopes that /// will be requested as part of Microsoft Account authentication. /// This setting is optional. If not specified, "wl.basic" is used as /// the default scope. /// Microsoft Account Scopes and permissions documentation: /// https://msdn.microsoft.com/en-us/library/dn631845.aspx - /// "true" if the auth config settings - /// should be read from a file, - /// "false" otherwise - /// The path of the config file containing - /// auth settings. - /// If the path is relative, base will the site's root - /// directory. - public SiteAuthSettings(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), string runtimeVersion = default(string), UnauthenticatedClientAction? unauthenticatedClientAction = default(UnauthenticatedClientAction?), bool? tokenStoreEnabled = default(bool?), IList allowedExternalRedirectUrls = default(IList), BuiltInAuthenticationProvider? defaultProvider = default(BuiltInAuthenticationProvider?), double? tokenRefreshExtensionHours = default(double?), string clientId = default(string), string clientSecret = default(string), string clientSecretSettingName = default(string), string clientSecretCertificateThumbprint = default(string), string issuer = default(string), bool? validateIssuer = default(bool?), IList allowedAudiences = default(IList), IList additionalLoginParams = default(IList), string aadClaimsAuthorization = default(string), string googleClientId = default(string), string googleClientSecret = default(string), string googleClientSecretSettingName = default(string), IList googleOAuthScopes = default(IList), string facebookAppId = default(string), string facebookAppSecret = default(string), string facebookAppSecretSettingName = default(string), IList facebookOAuthScopes = default(IList), string gitHubClientId = default(string), string gitHubClientSecret = default(string), string gitHubClientSecretSettingName = default(string), IList gitHubOAuthScopes = default(IList), string twitterConsumerKey = default(string), string twitterConsumerSecret = default(string), string twitterConsumerSecretSettingName = default(string), string microsoftAccountClientId = default(string), string microsoftAccountClientSecret = default(string), string microsoftAccountClientSecretSettingName = default(string), IList microsoftAccountOAuthScopes = default(IList), string isAuthFromFile = default(string), string authFilePath = default(string)) + public SiteAuthSettings(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), bool? enabled = default(bool?), string runtimeVersion = default(string), UnauthenticatedClientAction? unauthenticatedClientAction = default(UnauthenticatedClientAction?), bool? tokenStoreEnabled = default(bool?), IList allowedExternalRedirectUrls = default(IList), BuiltInAuthenticationProvider? defaultProvider = default(BuiltInAuthenticationProvider?), double? tokenRefreshExtensionHours = default(double?), string clientId = default(string), string clientSecret = default(string), string clientSecretCertificateThumbprint = default(string), string issuer = default(string), bool? validateIssuer = default(bool?), IList allowedAudiences = default(IList), IList additionalLoginParams = default(IList), string googleClientId = default(string), string googleClientSecret = default(string), IList googleOAuthScopes = default(IList), string facebookAppId = default(string), string facebookAppSecret = default(string), IList facebookOAuthScopes = default(IList), string twitterConsumerKey = default(string), string twitterConsumerSecret = default(string), string microsoftAccountClientId = default(string), string microsoftAccountClientSecret = default(string), IList microsoftAccountOAuthScopes = default(IList)) : base(id, name, kind, type) { Enabled = enabled; @@ -217,34 +181,22 @@ public SiteAuthSettings() TokenRefreshExtensionHours = tokenRefreshExtensionHours; ClientId = clientId; ClientSecret = clientSecret; - ClientSecretSettingName = clientSecretSettingName; ClientSecretCertificateThumbprint = clientSecretCertificateThumbprint; Issuer = issuer; ValidateIssuer = validateIssuer; AllowedAudiences = allowedAudiences; AdditionalLoginParams = additionalLoginParams; - AadClaimsAuthorization = aadClaimsAuthorization; GoogleClientId = googleClientId; GoogleClientSecret = googleClientSecret; - GoogleClientSecretSettingName = googleClientSecretSettingName; GoogleOAuthScopes = googleOAuthScopes; FacebookAppId = facebookAppId; FacebookAppSecret = facebookAppSecret; - FacebookAppSecretSettingName = facebookAppSecretSettingName; FacebookOAuthScopes = facebookOAuthScopes; - GitHubClientId = gitHubClientId; - GitHubClientSecret = gitHubClientSecret; - GitHubClientSecretSettingName = gitHubClientSecretSettingName; - GitHubOAuthScopes = gitHubOAuthScopes; TwitterConsumerKey = twitterConsumerKey; TwitterConsumerSecret = twitterConsumerSecret; - TwitterConsumerSecretSettingName = twitterConsumerSecretSettingName; MicrosoftAccountClientId = microsoftAccountClientId; MicrosoftAccountClientSecret = microsoftAccountClientSecret; - MicrosoftAccountClientSecretSettingName = microsoftAccountClientSecretSettingName; MicrosoftAccountOAuthScopes = microsoftAccountOAuthScopes; - IsAuthFromFile = isAuthFromFile; - AuthFilePath = authFilePath; CustomInit(); } @@ -307,7 +259,7 @@ public SiteAuthSettings() /// and the unauthenticated client /// action is set to "RedirectToLoginPage". Possible values include: /// 'AzureActiveDirectory', 'Facebook', 'Google', 'MicrosoftAccount', - /// 'Twitter', 'Github' + /// 'Twitter' /// [JsonProperty(PropertyName = "properties.defaultProvider")] public BuiltInAuthenticationProvider? DefaultProvider { get; set; } @@ -346,13 +298,6 @@ public SiteAuthSettings() [JsonProperty(PropertyName = "properties.clientSecret")] public string ClientSecret { get; set; } - /// - /// Gets or sets the app setting name that contains the client secret - /// of the relying party application. - /// - [JsonProperty(PropertyName = "properties.clientSecretSettingName")] - public string ClientSecretSettingName { get; set; } - /// /// Gets or sets an alternative to the client secret, that is the /// thumbprint of a certificate used for signing purposes. This @@ -400,12 +345,6 @@ public SiteAuthSettings() [JsonProperty(PropertyName = "properties.additionalLoginParams")] public IList AdditionalLoginParams { get; set; } - /// - /// Gets a JSON string containing the Azure AD Acl settings. - /// - [JsonProperty(PropertyName = "properties.aadClaimsAuthorization")] - public string AadClaimsAuthorization { get; set; } - /// /// Gets or sets the OpenID Connect Client ID for the Google web /// application. @@ -426,14 +365,6 @@ public SiteAuthSettings() [JsonProperty(PropertyName = "properties.googleClientSecret")] public string GoogleClientSecret { get; set; } - /// - /// Gets or sets the app setting name that contains the client secret - /// associated with - /// the Google web application. - /// - [JsonProperty(PropertyName = "properties.googleClientSecretSettingName")] - public string GoogleClientSecretSettingName { get; set; } - /// /// Gets or sets the OAuth 2.0 scopes that will be requested as part of /// Google Sign-In authentication. @@ -464,13 +395,6 @@ public SiteAuthSettings() [JsonProperty(PropertyName = "properties.facebookAppSecret")] public string FacebookAppSecret { get; set; } - /// - /// Gets or sets the app setting name that contains the app secret used - /// for Facebook Login. - /// - [JsonProperty(PropertyName = "properties.facebookAppSecretSettingName")] - public string FacebookAppSecretSettingName { get; set; } - /// /// Gets or sets the OAuth 2.0 scopes that will be requested as part of /// Facebook Login authentication. @@ -481,37 +405,6 @@ public SiteAuthSettings() [JsonProperty(PropertyName = "properties.facebookOAuthScopes")] public IList FacebookOAuthScopes { get; set; } - /// - /// Gets or sets the Client Id of the GitHub app used for login. - /// This setting is required for enabling Github login - /// - [JsonProperty(PropertyName = "properties.gitHubClientId")] - public string GitHubClientId { get; set; } - - /// - /// Gets or sets the Client Secret of the GitHub app used for Github - /// Login. - /// This setting is required for enabling Github login. - /// - [JsonProperty(PropertyName = "properties.gitHubClientSecret")] - public string GitHubClientSecret { get; set; } - - /// - /// Gets or sets the app setting name that contains the client secret - /// of the Github - /// app used for GitHub Login. - /// - [JsonProperty(PropertyName = "properties.gitHubClientSecretSettingName")] - public string GitHubClientSecretSettingName { get; set; } - - /// - /// Gets or sets the OAuth 2.0 scopes that will be requested as part of - /// GitHub Login authentication. - /// This setting is optional - /// - [JsonProperty(PropertyName = "properties.gitHubOAuthScopes")] - public IList GitHubOAuthScopes { get; set; } - /// /// Gets or sets the OAuth 1.0a consumer key of the Twitter application /// used for sign-in. @@ -530,14 +423,6 @@ public SiteAuthSettings() [JsonProperty(PropertyName = "properties.twitterConsumerSecret")] public string TwitterConsumerSecret { get; set; } - /// - /// Gets or sets the app setting name that contains the OAuth 1.0a - /// consumer secret of the Twitter - /// application used for sign-in. - /// - [JsonProperty(PropertyName = "properties.twitterConsumerSecretSettingName")] - public string TwitterConsumerSecretSettingName { get; set; } - /// /// Gets or sets the OAuth 2.0 client ID that was created for the app /// used for authentication. @@ -560,14 +445,6 @@ public SiteAuthSettings() [JsonProperty(PropertyName = "properties.microsoftAccountClientSecret")] public string MicrosoftAccountClientSecret { get; set; } - /// - /// Gets or sets the app setting name containing the OAuth 2.0 client - /// secret that was created for the - /// app used for authentication. - /// - [JsonProperty(PropertyName = "properties.microsoftAccountClientSecretSettingName")] - public string MicrosoftAccountClientSecretSettingName { get; set; } - /// /// Gets or sets the OAuth 2.0 scopes that will be requested as part of /// Microsoft Account authentication. @@ -579,20 +456,5 @@ public SiteAuthSettings() [JsonProperty(PropertyName = "properties.microsoftAccountOAuthScopes")] public IList MicrosoftAccountOAuthScopes { get; set; } - /// - /// Gets or sets "true" if the auth config settings should be read from - /// a file, - /// "false" otherwise - /// - [JsonProperty(PropertyName = "properties.isAuthFromFile")] - public string IsAuthFromFile { get; set; } - - /// - /// Gets or sets the path of the config file containing auth settings. - /// If the path is relative, base will the site's root directory. - /// - [JsonProperty(PropertyName = "properties.authFilePath")] - public string AuthFilePath { get; set; } - } } diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfig.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfig.cs index 09a72225be378..f206917e26e5d 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfig.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfig.cs @@ -56,6 +56,10 @@ public SiteConfig() /// <code>true</code> if /// HTTP logging is enabled; otherwise, /// <code>false</code>. + /// Flag to use Managed + /// Identity Creds for ACR pull + /// If using user managed + /// identity, the user managed identity ClientId /// HTTP logs directory size /// limit. /// /// Health check path - public SiteConfig(int? numberOfWorkers = default(int?), IList defaultDocuments = default(IList), string netFrameworkVersion = default(string), string phpVersion = default(string), string pythonVersion = default(string), string nodeVersion = default(string), string powerShellVersion = default(string), string linuxFxVersion = default(string), string windowsFxVersion = default(string), bool? requestTracingEnabled = default(bool?), System.DateTime? requestTracingExpirationTime = default(System.DateTime?), bool? remoteDebuggingEnabled = default(bool?), string remoteDebuggingVersion = default(string), bool? httpLoggingEnabled = default(bool?), int? logsDirectorySizeLimit = default(int?), bool? detailedErrorLoggingEnabled = default(bool?), string publishingUsername = default(string), IList appSettings = default(IList), IList connectionStrings = default(IList), SiteMachineKey machineKey = default(SiteMachineKey), IList handlerMappings = default(IList), string documentRoot = default(string), string scmType = default(string), bool? use32BitWorkerProcess = default(bool?), bool? webSocketsEnabled = default(bool?), bool? alwaysOn = default(bool?), string javaVersion = default(string), string javaContainer = default(string), string javaContainerVersion = default(string), string appCommandLine = default(string), ManagedPipelineMode? managedPipelineMode = default(ManagedPipelineMode?), IList virtualApplications = default(IList), SiteLoadBalancing? loadBalancing = default(SiteLoadBalancing?), Experiments experiments = default(Experiments), SiteLimits limits = default(SiteLimits), bool? autoHealEnabled = default(bool?), AutoHealRules autoHealRules = default(AutoHealRules), string tracingOptions = default(string), string vnetName = default(string), CorsSettings cors = default(CorsSettings), PushSettings push = default(PushSettings), ApiDefinitionInfo apiDefinition = default(ApiDefinitionInfo), ApiManagementConfig apiManagementConfig = default(ApiManagementConfig), string autoSwapSlotName = default(string), bool? localMySqlEnabled = default(bool?), int? managedServiceIdentityId = default(int?), int? xManagedServiceIdentityId = default(int?), IList ipSecurityRestrictions = default(IList), IList scmIpSecurityRestrictions = default(IList), bool? scmIpSecurityRestrictionsUseMain = default(bool?), bool? http20Enabled = default(bool?), string minTlsVersion = default(string), string ftpsState = default(string), int? preWarmedInstanceCount = default(int?), string healthCheckPath = default(string)) + public SiteConfig(int? numberOfWorkers = default(int?), IList defaultDocuments = default(IList), string netFrameworkVersion = default(string), string phpVersion = default(string), string pythonVersion = default(string), string nodeVersion = default(string), string powerShellVersion = default(string), string linuxFxVersion = default(string), string windowsFxVersion = default(string), bool? requestTracingEnabled = default(bool?), System.DateTime? requestTracingExpirationTime = default(System.DateTime?), bool? remoteDebuggingEnabled = default(bool?), string remoteDebuggingVersion = default(string), bool? httpLoggingEnabled = default(bool?), bool? acrUseManagedIdentityCreds = default(bool?), string acrUserManagedIdentityID = default(string), int? logsDirectorySizeLimit = default(int?), bool? detailedErrorLoggingEnabled = default(bool?), string publishingUsername = default(string), IList appSettings = default(IList), IList connectionStrings = default(IList), SiteMachineKey machineKey = default(SiteMachineKey), IList handlerMappings = default(IList), string documentRoot = default(string), string scmType = default(string), bool? use32BitWorkerProcess = default(bool?), bool? webSocketsEnabled = default(bool?), bool? alwaysOn = default(bool?), string javaVersion = default(string), string javaContainer = default(string), string javaContainerVersion = default(string), string appCommandLine = default(string), ManagedPipelineMode? managedPipelineMode = default(ManagedPipelineMode?), IList virtualApplications = default(IList), SiteLoadBalancing? loadBalancing = default(SiteLoadBalancing?), Experiments experiments = default(Experiments), SiteLimits limits = default(SiteLimits), bool? autoHealEnabled = default(bool?), AutoHealRules autoHealRules = default(AutoHealRules), string tracingOptions = default(string), string vnetName = default(string), CorsSettings cors = default(CorsSettings), PushSettings push = default(PushSettings), ApiDefinitionInfo apiDefinition = default(ApiDefinitionInfo), ApiManagementConfig apiManagementConfig = default(ApiManagementConfig), string autoSwapSlotName = default(string), bool? localMySqlEnabled = default(bool?), int? managedServiceIdentityId = default(int?), int? xManagedServiceIdentityId = default(int?), IList ipSecurityRestrictions = default(IList), IList scmIpSecurityRestrictions = default(IList), bool? scmIpSecurityRestrictionsUseMain = default(bool?), bool? http20Enabled = default(bool?), string minTlsVersion = default(string), string ftpsState = default(string), int? preWarmedInstanceCount = default(int?), string healthCheckPath = default(string)) { NumberOfWorkers = numberOfWorkers; DefaultDocuments = defaultDocuments; @@ -146,6 +150,8 @@ public SiteConfig() RemoteDebuggingEnabled = remoteDebuggingEnabled; RemoteDebuggingVersion = remoteDebuggingVersion; HttpLoggingEnabled = httpLoggingEnabled; + AcrUseManagedIdentityCreds = acrUseManagedIdentityCreds; + AcrUserManagedIdentityID = acrUserManagedIdentityID; LogsDirectorySizeLimit = logsDirectorySizeLimit; DetailedErrorLoggingEnabled = detailedErrorLoggingEnabled; PublishingUsername = publishingUsername; @@ -285,6 +291,19 @@ public SiteConfig() [JsonProperty(PropertyName = "httpLoggingEnabled")] public bool? HttpLoggingEnabled { get; set; } + /// + /// Gets or sets flag to use Managed Identity Creds for ACR pull + /// + [JsonProperty(PropertyName = "acrUseManagedIdentityCreds")] + public bool? AcrUseManagedIdentityCreds { get; set; } + + /// + /// Gets or sets if using user managed identity, the user managed + /// identity ClientId + /// + [JsonProperty(PropertyName = "acrUserManagedIdentityID")] + public string AcrUserManagedIdentityID { get; set; } + /// /// Gets or sets HTTP logs directory size limit. /// diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfigResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfigResource.cs index c51daa41c62ea..d41a8560b338f 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfigResource.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfigResource.cs @@ -62,6 +62,10 @@ public SiteConfigResource() /// <code>true</code> if /// HTTP logging is enabled; otherwise, /// <code>false</code>. + /// Flag to use Managed + /// Identity Creds for ACR pull + /// If using user managed + /// identity, the user managed identity ClientId /// HTTP logs directory size /// limit. /// /// Health check path - public SiteConfigResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), int? numberOfWorkers = default(int?), IList defaultDocuments = default(IList), string netFrameworkVersion = default(string), string phpVersion = default(string), string pythonVersion = default(string), string nodeVersion = default(string), string powerShellVersion = default(string), string linuxFxVersion = default(string), string windowsFxVersion = default(string), bool? requestTracingEnabled = default(bool?), System.DateTime? requestTracingExpirationTime = default(System.DateTime?), bool? remoteDebuggingEnabled = default(bool?), string remoteDebuggingVersion = default(string), bool? httpLoggingEnabled = default(bool?), int? logsDirectorySizeLimit = default(int?), bool? detailedErrorLoggingEnabled = default(bool?), string publishingUsername = default(string), IList appSettings = default(IList), IList connectionStrings = default(IList), SiteMachineKey machineKey = default(SiteMachineKey), IList handlerMappings = default(IList), string documentRoot = default(string), string scmType = default(string), bool? use32BitWorkerProcess = default(bool?), bool? webSocketsEnabled = default(bool?), bool? alwaysOn = default(bool?), string javaVersion = default(string), string javaContainer = default(string), string javaContainerVersion = default(string), string appCommandLine = default(string), ManagedPipelineMode? managedPipelineMode = default(ManagedPipelineMode?), IList virtualApplications = default(IList), SiteLoadBalancing? loadBalancing = default(SiteLoadBalancing?), Experiments experiments = default(Experiments), SiteLimits limits = default(SiteLimits), bool? autoHealEnabled = default(bool?), AutoHealRules autoHealRules = default(AutoHealRules), string tracingOptions = default(string), string vnetName = default(string), CorsSettings cors = default(CorsSettings), PushSettings push = default(PushSettings), ApiDefinitionInfo apiDefinition = default(ApiDefinitionInfo), ApiManagementConfig apiManagementConfig = default(ApiManagementConfig), string autoSwapSlotName = default(string), bool? localMySqlEnabled = default(bool?), int? managedServiceIdentityId = default(int?), int? xManagedServiceIdentityId = default(int?), IList ipSecurityRestrictions = default(IList), IList scmIpSecurityRestrictions = default(IList), bool? scmIpSecurityRestrictionsUseMain = default(bool?), bool? http20Enabled = default(bool?), string minTlsVersion = default(string), string ftpsState = default(string), int? preWarmedInstanceCount = default(int?), string healthCheckPath = default(string)) + public SiteConfigResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), int? numberOfWorkers = default(int?), IList defaultDocuments = default(IList), string netFrameworkVersion = default(string), string phpVersion = default(string), string pythonVersion = default(string), string nodeVersion = default(string), string powerShellVersion = default(string), string linuxFxVersion = default(string), string windowsFxVersion = default(string), bool? requestTracingEnabled = default(bool?), System.DateTime? requestTracingExpirationTime = default(System.DateTime?), bool? remoteDebuggingEnabled = default(bool?), string remoteDebuggingVersion = default(string), bool? httpLoggingEnabled = default(bool?), bool? acrUseManagedIdentityCreds = default(bool?), string acrUserManagedIdentityID = default(string), int? logsDirectorySizeLimit = default(int?), bool? detailedErrorLoggingEnabled = default(bool?), string publishingUsername = default(string), IList appSettings = default(IList), IList connectionStrings = default(IList), SiteMachineKey machineKey = default(SiteMachineKey), IList handlerMappings = default(IList), string documentRoot = default(string), string scmType = default(string), bool? use32BitWorkerProcess = default(bool?), bool? webSocketsEnabled = default(bool?), bool? alwaysOn = default(bool?), string javaVersion = default(string), string javaContainer = default(string), string javaContainerVersion = default(string), string appCommandLine = default(string), ManagedPipelineMode? managedPipelineMode = default(ManagedPipelineMode?), IList virtualApplications = default(IList), SiteLoadBalancing? loadBalancing = default(SiteLoadBalancing?), Experiments experiments = default(Experiments), SiteLimits limits = default(SiteLimits), bool? autoHealEnabled = default(bool?), AutoHealRules autoHealRules = default(AutoHealRules), string tracingOptions = default(string), string vnetName = default(string), CorsSettings cors = default(CorsSettings), PushSettings push = default(PushSettings), ApiDefinitionInfo apiDefinition = default(ApiDefinitionInfo), ApiManagementConfig apiManagementConfig = default(ApiManagementConfig), string autoSwapSlotName = default(string), bool? localMySqlEnabled = default(bool?), int? managedServiceIdentityId = default(int?), int? xManagedServiceIdentityId = default(int?), IList ipSecurityRestrictions = default(IList), IList scmIpSecurityRestrictions = default(IList), bool? scmIpSecurityRestrictionsUseMain = default(bool?), bool? http20Enabled = default(bool?), string minTlsVersion = default(string), string ftpsState = default(string), int? preWarmedInstanceCount = default(int?), string healthCheckPath = default(string)) : base(id, name, kind, type) { NumberOfWorkers = numberOfWorkers; @@ -153,6 +157,8 @@ public SiteConfigResource() RemoteDebuggingEnabled = remoteDebuggingEnabled; RemoteDebuggingVersion = remoteDebuggingVersion; HttpLoggingEnabled = httpLoggingEnabled; + AcrUseManagedIdentityCreds = acrUseManagedIdentityCreds; + AcrUserManagedIdentityID = acrUserManagedIdentityID; LogsDirectorySizeLimit = logsDirectorySizeLimit; DetailedErrorLoggingEnabled = detailedErrorLoggingEnabled; PublishingUsername = publishingUsername; @@ -292,6 +298,19 @@ public SiteConfigResource() [JsonProperty(PropertyName = "properties.httpLoggingEnabled")] public bool? HttpLoggingEnabled { get; set; } + /// + /// Gets or sets flag to use Managed Identity Creds for ACR pull + /// + [JsonProperty(PropertyName = "properties.acrUseManagedIdentityCreds")] + public bool? AcrUseManagedIdentityCreds { get; set; } + + /// + /// Gets or sets if using user managed identity, the user managed + /// identity ClientId + /// + [JsonProperty(PropertyName = "properties.acrUserManagedIdentityID")] + public string AcrUserManagedIdentityID { get; set; } + /// /// Gets or sets HTTP logs directory size limit. /// diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteInstance.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteInstance.cs new file mode 100644 index 0000000000000..d35fb267559da --- /dev/null +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteInstance.cs @@ -0,0 +1,59 @@ +// +// 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; + + /// + /// Instance of an app. + /// + [Rest.Serialization.JsonTransformation] + public partial class SiteInstance : ProxyOnlyResource + { + /// + /// Initializes a new instance of the SiteInstance class. + /// + public SiteInstance() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SiteInstance class. + /// + /// Resource Id. + /// Resource Name. + /// Kind of resource. + /// Resource type. + /// Name of instance. + public SiteInstance(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string siteInstanceName = default(string)) + : base(id, name, kind, type) + { + SiteInstanceName = siteInstanceName; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets name of instance. + /// + [JsonProperty(PropertyName = "properties.siteInstanceName")] + public string SiteInstanceName { get; private set; } + + } +} diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SitePatchResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SitePatchResource.cs index 567a5fb54af7c..223c8c2122251 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SitePatchResource.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SitePatchResource.cs @@ -86,14 +86,6 @@ public SitePatchResource() /// enable client certificate authentication (TLS mutual /// authentication); otherwise, <code>false</code>. Default /// is <code>false</code>. - /// This composes with ClientCertEnabled - /// setting. - /// - ClientCertEnabled: false means ClientCert is ignored. - /// - ClientCertEnabled: true and ClientCertMode: Required means - /// ClientCert is required. - /// - ClientCertEnabled: true and ClientCertMode: Optional means - /// ClientCert is optional or accepted. Possible values include: - /// 'Required', 'Optional' /// client certificate /// authentication comma-separated exclusion paths /// <code>true</code> to @@ -101,9 +93,6 @@ public SitePatchResource() /// <code>false</code>. /// If <code>true</code>, the app is only accessible via /// API management process. - /// Unique identifier that - /// verifies the custom domains assigned to the app. Customer will add - /// this id to a txt record for verification. /// List of IP addresses that the app /// uses for outbound connections (e.g. database access). Includes VIPs /// from tenants that site can be hosted with current settings. @@ -138,7 +127,7 @@ public SitePatchResource() /// 'GeoRedundant' /// Specifies an operation id if /// this site has a pending operation. - public SitePatchResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string state = default(string), IList hostNames = default(IList), string repositorySiteName = default(string), UsageState? usageState = default(UsageState?), bool? enabled = default(bool?), IList enabledHostNames = default(IList), SiteAvailabilityState? availabilityState = default(SiteAvailabilityState?), IList hostNameSslStates = default(IList), string serverFarmId = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), System.DateTime? lastModifiedTimeUtc = default(System.DateTime?), SiteConfig siteConfig = default(SiteConfig), IList trafficManagerHostNames = default(IList), bool? scmSiteAlsoStopped = default(bool?), string targetSwapSlot = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), bool? clientAffinityEnabled = default(bool?), bool? clientCertEnabled = default(bool?), ClientCertMode? clientCertMode = default(ClientCertMode?), string clientCertExclusionPaths = default(string), bool? hostNamesDisabled = default(bool?), string customDomainVerificationId = default(string), string outboundIpAddresses = default(string), string possibleOutboundIpAddresses = default(string), int? containerSize = default(int?), int? dailyMemoryTimeQuota = default(int?), System.DateTime? suspendedTill = default(System.DateTime?), int? maxNumberOfWorkers = default(int?), CloningInfo cloningInfo = default(CloningInfo), string resourceGroup = default(string), bool? isDefaultContainer = default(bool?), string defaultHostName = default(string), SlotSwapStatus slotSwapStatus = default(SlotSwapStatus), bool? httpsOnly = default(bool?), RedundancyMode? redundancyMode = default(RedundancyMode?), System.Guid? inProgressOperationId = default(System.Guid?), ManagedServiceIdentity identity = default(ManagedServiceIdentity)) + public SitePatchResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string state = default(string), IList hostNames = default(IList), string repositorySiteName = default(string), UsageState? usageState = default(UsageState?), bool? enabled = default(bool?), IList enabledHostNames = default(IList), SiteAvailabilityState? availabilityState = default(SiteAvailabilityState?), IList hostNameSslStates = default(IList), string serverFarmId = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), System.DateTime? lastModifiedTimeUtc = default(System.DateTime?), SiteConfig siteConfig = default(SiteConfig), IList trafficManagerHostNames = default(IList), bool? scmSiteAlsoStopped = default(bool?), string targetSwapSlot = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), bool? clientAffinityEnabled = default(bool?), bool? clientCertEnabled = default(bool?), string clientCertExclusionPaths = default(string), bool? hostNamesDisabled = default(bool?), string outboundIpAddresses = default(string), string possibleOutboundIpAddresses = default(string), int? containerSize = default(int?), int? dailyMemoryTimeQuota = default(int?), System.DateTime? suspendedTill = default(System.DateTime?), int? maxNumberOfWorkers = default(int?), CloningInfo cloningInfo = default(CloningInfo), string resourceGroup = default(string), bool? isDefaultContainer = default(bool?), string defaultHostName = default(string), SlotSwapStatus slotSwapStatus = default(SlotSwapStatus), bool? httpsOnly = default(bool?), RedundancyMode? redundancyMode = default(RedundancyMode?), System.Guid? inProgressOperationId = default(System.Guid?), ManagedServiceIdentity identity = default(ManagedServiceIdentity)) : base(id, name, kind, type) { State = state; @@ -161,10 +150,8 @@ public SitePatchResource() HostingEnvironmentProfile = hostingEnvironmentProfile; ClientAffinityEnabled = clientAffinityEnabled; ClientCertEnabled = clientCertEnabled; - ClientCertMode = clientCertMode; ClientCertExclusionPaths = clientCertExclusionPaths; HostNamesDisabled = hostNamesDisabled; - CustomDomainVerificationId = customDomainVerificationId; OutboundIpAddresses = outboundIpAddresses; PossibleOutboundIpAddresses = possibleOutboundIpAddresses; ContainerSize = containerSize; @@ -335,18 +322,6 @@ public SitePatchResource() [JsonProperty(PropertyName = "properties.clientCertEnabled")] public bool? ClientCertEnabled { get; set; } - /// - /// Gets or sets this composes with ClientCertEnabled setting. - /// - ClientCertEnabled: false means ClientCert is ignored. - /// - ClientCertEnabled: true and ClientCertMode: Required means - /// ClientCert is required. - /// - ClientCertEnabled: true and ClientCertMode: Optional means - /// ClientCert is optional or accepted. Possible values include: - /// 'Required', 'Optional' - /// - [JsonProperty(PropertyName = "properties.clientCertMode")] - public ClientCertMode? ClientCertMode { get; set; } - /// /// Gets or sets client certificate authentication comma-separated /// exclusion paths @@ -364,14 +339,6 @@ public SitePatchResource() [JsonProperty(PropertyName = "properties.hostNamesDisabled")] public bool? HostNamesDisabled { get; set; } - /// - /// Gets or sets unique identifier that verifies the custom domains - /// assigned to the app. Customer will add this id to a txt record for - /// verification. - /// - [JsonProperty(PropertyName = "properties.customDomainVerificationId")] - public string CustomDomainVerificationId { get; set; } - /// /// Gets list of IP addresses that the app uses for outbound /// connections (e.g. database access). Includes VIPs from tenants that diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteSourceControl.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteSourceControl.cs index c2544d5f558f5..d99dac2f8e3f0 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteSourceControl.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteSourceControl.cs @@ -42,8 +42,6 @@ public SiteSourceControl() /// limit to manual integration; <code>false</code> to /// enable continuous integration (which configures webhooks into /// online repos like GitHub). - /// <code>true</code> if this - /// is deployed via GitHub action. /// <code>true</code> to /// enable deployment rollback; otherwise, @@ -51,13 +49,12 @@ public SiteSourceControl() /// <code>true</code> for a /// Mercurial repository; <code>false</code> for a Git /// repository. - public SiteSourceControl(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string repoUrl = default(string), string branch = default(string), bool? isManualIntegration = default(bool?), bool? isGitHubAction = default(bool?), bool? deploymentRollbackEnabled = default(bool?), bool? isMercurial = default(bool?)) + public SiteSourceControl(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string repoUrl = default(string), string branch = default(string), bool? isManualIntegration = default(bool?), bool? deploymentRollbackEnabled = default(bool?), bool? isMercurial = default(bool?)) : base(id, name, kind, type) { RepoUrl = repoUrl; Branch = branch; IsManualIntegration = isManualIntegration; - IsGitHubAction = isGitHubAction; DeploymentRollbackEnabled = deploymentRollbackEnabled; IsMercurial = isMercurial; CustomInit(); @@ -90,13 +87,6 @@ public SiteSourceControl() [JsonProperty(PropertyName = "properties.isManualIntegration")] public bool? IsManualIntegration { get; set; } - /// - /// Gets or sets &lt;code&gt;true&lt;/code&gt; if this - /// is deployed via GitHub action. - /// - [JsonProperty(PropertyName = "properties.isGitHubAction")] - public bool? IsGitHubAction { get; set; } - /// /// Gets or sets &lt;code&gt;true&lt;/code&gt; to /// enable deployment rollback; otherwise, diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WebSiteInstanceStatus.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WebSiteInstanceStatus.cs index c9e91df2ae59b..797a5dda35b8f 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WebSiteInstanceStatus.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WebSiteInstanceStatus.cs @@ -40,18 +40,15 @@ public WebSiteInstanceStatus() /// Link to the GetStatusApi in Kudu /// Link to the Diagnose and Solve /// Portal - /// Link to the console to web app - /// instance - /// Link to the console to web app - /// instance - public WebSiteInstanceStatus(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), SiteRuntimeState? state = default(SiteRuntimeState?), string statusUrl = default(string), string detectorUrl = default(string), string consoleUrl = default(string), string healthCheckUrl = default(string), IDictionary containers = default(IDictionary)) + /// Link to the Diagnose and Solve + /// Portal + public WebSiteInstanceStatus(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), SiteRuntimeState? state = default(SiteRuntimeState?), string statusUrl = default(string), string detectorUrl = default(string), string consoleUrl = default(string), IDictionary containers = default(IDictionary)) : base(id, name, kind, type) { State = state; StatusUrl = statusUrl; DetectorUrl = detectorUrl; ConsoleUrl = consoleUrl; - HealthCheckUrl = healthCheckUrl; Containers = containers; CustomInit(); } @@ -80,17 +77,11 @@ public WebSiteInstanceStatus() public string DetectorUrl { get; set; } /// - /// Gets or sets link to the console to web app instance + /// Gets or sets link to the Diagnose and Solve Portal /// [JsonProperty(PropertyName = "properties.consoleUrl")] public string ConsoleUrl { get; set; } - /// - /// Gets or sets link to the console to web app instance - /// - [JsonProperty(PropertyName = "properties.healthCheckUrl")] - public string HealthCheckUrl { get; set; } - /// /// [JsonProperty(PropertyName = "properties.containers")] diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperations.cs index 984a84495f08c..bb8740936944d 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperations.cs @@ -802,10 +802,10 @@ internal RecommendationsOperations(WebSiteManagementClient client) } /// - /// Get all recommendations for a hosting environment. + /// Get all recommendations for an app. /// /// - /// Description for Get all recommendations for a hosting environment. + /// Description for Get all recommendations for an app. /// /// /// Name of the resource group to which the resource belongs. @@ -3487,10 +3487,10 @@ internal RecommendationsOperations(WebSiteManagementClient client) } /// - /// Get all recommendations for a hosting environment. + /// Get all recommendations for an app. /// /// - /// Description for Get all recommendations for a hosting environment. + /// Description for Get all recommendations for an app. /// /// /// The NextLink from the previous successful call to List operation. diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperationsExtensions.cs index aa2e5a89276fd..cfcc8df0d39f2 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperationsExtensions.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperationsExtensions.cs @@ -224,10 +224,10 @@ public static void DisableRecommendationForSubscription(this IRecommendationsOpe } /// - /// Get all recommendations for a hosting environment. + /// Get all recommendations for an app. /// /// - /// Description for Get all recommendations for a hosting environment. + /// Description for Get all recommendations for an app. /// /// /// The operations group for this extension method. @@ -254,10 +254,10 @@ public static void DisableRecommendationForSubscription(this IRecommendationsOpe } /// - /// Get all recommendations for a hosting environment. + /// Get all recommendations for an app. /// /// - /// Description for Get all recommendations for a hosting environment. + /// Description for Get all recommendations for an app. /// /// /// The operations group for this extension method. @@ -930,10 +930,10 @@ public static IPage ListHistoryForHostingEnvironmentNext(this IR } /// - /// Get all recommendations for a hosting environment. + /// Get all recommendations for an app. /// /// - /// Description for Get all recommendations for a hosting environment. + /// Description for Get all recommendations for an app. /// /// /// The operations group for this extension method. @@ -947,10 +947,10 @@ public static IPage ListRecommendedRulesForHostingEnvironmentNex } /// - /// Get all recommendations for a hosting environment. + /// Get all recommendations for an app. /// /// - /// Description for Get all recommendations for a hosting environment. + /// Description for Get all recommendations for an app. /// /// /// The operations group for this extension method. 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 1c65562c417c4..4da6c3f203932 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,50 +19,39 @@ public static IEnumerable> ApiInfo_WebSiteManageme { return new Tuple[] { - new Tuple("CertificateRegistration", "AppServiceCertificateOrders", "2020-06-01"), - new Tuple("CertificateRegistration", "CertificateRegistrationProvider", "2020-06-01"), - new Tuple("DomainRegistration", "DomainRegistrationProvider", "2020-06-01"), - new Tuple("DomainRegistration", "Domains", "2020-06-01"), - new Tuple("DomainRegistration", "TopLevelDomains", "2020-06-01"), - new Tuple("Web", "AppServiceEnvironments", "2020-06-01"), - new Tuple("Web", "AppServicePlans", "2020-06-01"), - new Tuple("Web", "Certificates", "2020-06-01"), - new Tuple("Web", "CheckNameAvailability", "2020-06-01"), - new Tuple("Web", "DeletedWebApps", "2020-06-01"), - new Tuple("Web", "Diagnostics", "2020-06-01"), - new Tuple("Web", "GetPublishingUser", "2020-06-01"), - new Tuple("Web", "GetSourceControl", "2020-06-01"), - new Tuple("Web", "GetSubscriptionDeploymentLocations", "2020-06-01"), - new Tuple("Web", "ListBillingMeters", "2020-06-01"), - new Tuple("Web", "ListGeoRegions", "2020-06-01"), - new Tuple("Web", "ListPremierAddOnOffers", "2020-06-01"), - new Tuple("Web", "ListSiteIdentifiersAssignedToHostName", "2020-06-01"), - new Tuple("Web", "ListSkus", "2020-06-01"), - new Tuple("Web", "ListSourceControls", "2020-06-01"), - new Tuple("Web", "Provider", "2020-06-01"), - new Tuple("Web", "Recommendations", "2020-06-01"), - new Tuple("Web", "ResourceHealthMetadata", "2020-06-01"), - new Tuple("Web", "StaticSites", "2020-06-01"), - new Tuple("Web", "UpdatePublishingUser", "2020-06-01"), - new Tuple("Web", "UpdateSourceControl", "2020-06-01"), - new Tuple("Web", "Validate", "2020-06-01"), - new Tuple("Web", "VerifyHostingEnvironmentVnet", "2020-06-01"), - new Tuple("Web", "WebApps", "2020-06-01"), - new Tuple("WebSiteManagementClient", "Move", "2020-06-01"), - new Tuple("WebSiteManagementClient", "ValidateMove", "2020-06-01"), + new Tuple("CertificateRegistration", "AppServiceCertificateOrders", "2019-08-01"), + new Tuple("CertificateRegistration", "CertificateRegistrationProvider", "2019-08-01"), + new Tuple("DomainRegistration", "DomainRegistrationProvider", "2019-08-01"), + new Tuple("DomainRegistration", "Domains", "2019-08-01"), + new Tuple("DomainRegistration", "TopLevelDomains", "2019-08-01"), + new Tuple("Web", "AppServiceEnvironments", "2019-08-01"), + new Tuple("Web", "AppServicePlans", "2019-08-01"), + new Tuple("Web", "Certificates", "2019-08-01"), + new Tuple("Web", "CheckNameAvailability", "2019-08-01"), + new Tuple("Web", "DeletedWebApps", "2019-08-01"), + new Tuple("Web", "Diagnostics", "2019-08-01"), + new Tuple("Web", "GetPublishingUser", "2019-08-01"), + new Tuple("Web", "GetSourceControl", "2019-08-01"), + new Tuple("Web", "GetSubscriptionDeploymentLocations", "2019-08-01"), + new Tuple("Web", "ListBillingMeters", "2019-08-01"), + new Tuple("Web", "ListGeoRegions", "2019-08-01"), + new Tuple("Web", "ListPremierAddOnOffers", "2019-08-01"), + new Tuple("Web", "ListSiteIdentifiersAssignedToHostName", "2019-08-01"), + new Tuple("Web", "ListSkus", "2019-08-01"), + new Tuple("Web", "ListSourceControls", "2019-08-01"), + new Tuple("Web", "Provider", "2019-08-01"), + new Tuple("Web", "Recommendations", "2019-08-01"), + new Tuple("Web", "ResourceHealthMetadata", "2019-08-01"), + new Tuple("Web", "StaticSites", "2019-08-01"), + new Tuple("Web", "UpdatePublishingUser", "2019-08-01"), + new Tuple("Web", "UpdateSourceControl", "2019-08-01"), + new Tuple("Web", "Validate", "2019-08-01"), + new Tuple("Web", "VerifyHostingEnvironmentVnet", "2019-08-01"), + new Tuple("Web", "WebApps", "2019-08-01"), + new Tuple("WebSiteManagementClient", "Move", "2019-08-01"), + new Tuple("WebSiteManagementClient", "ValidateMove", "2019-08-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/web/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2020-06 --csharp-sdks-folder=K:\\DotNet-SDK\\Sep-2020\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "1b04f5fce19cd330dcc0eec11a98e499c0cda50d"; - 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 4329eceb1edfc..2e4ef43d82de6 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs @@ -4839,21 +4839,19 @@ internal WebAppsOperations(WebSiteManagementClient client) } /// - /// Updates site's Authentication / Authorization settings for apps via the V2 - /// format + /// Updates the Azure storage account configurations of an app. /// /// - /// Description for Updates site's Authentication / Authorization settings for - /// apps via the V2 format + /// Description for Updates the Azure storage account configurations of an app. /// /// /// Name of the resource group to which the resource belongs. /// /// - /// Name of web app. + /// Name of the app. /// - /// - /// Auth settings associated with web app. + /// + /// Azure storage accounts of the app. /// /// /// Headers that will be added to request. @@ -4876,7 +4874,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> UpdateAuthSettingsV2WithHttpMessagesAsync(string resourceGroupName, string name, SiteAuthSettingsV2 siteAuthSettingsV2, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> UpdateAzureStorageAccountsWithHttpMessagesAsync(string resourceGroupName, string name, AzureStoragePropertyDictionaryResource azureStorageAccounts, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -4901,9 +4899,9 @@ internal WebAppsOperations(WebSiteManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "name"); } - if (siteAuthSettingsV2 == null) + if (azureStorageAccounts == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "siteAuthSettingsV2"); + throw new ValidationException(ValidationRules.CannotBeNull, "azureStorageAccounts"); } if (Client.SubscriptionId == null) { @@ -4922,13 +4920,13 @@ internal WebAppsOperations(WebSiteManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("name", name); - tracingParameters.Add("siteAuthSettingsV2", siteAuthSettingsV2); + tracingParameters.Add("azureStorageAccounts", azureStorageAccounts); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "UpdateAuthSettingsV2", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "UpdateAzureStorageAccounts", 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(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts").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)); @@ -4975,9 +4973,9 @@ internal WebAppsOperations(WebSiteManagementClient client) // Serialize Request string _requestContent = null; - if(siteAuthSettingsV2 != null) + if(azureStorageAccounts != null) { - _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteAuthSettingsV2, Client.SerializationSettings); + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(azureStorageAccounts, Client.SerializationSettings); _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); } @@ -5031,7 +5029,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")) @@ -5044,7 +5042,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) { @@ -5064,12 +5062,10 @@ internal WebAppsOperations(WebSiteManagementClient client) } /// - /// Gets site's Authentication / Authorization settings for apps via the V2 - /// format + /// Gets the Azure storage account configurations of an app. /// /// - /// Description for Gets site's Authentication / Authorization settings for - /// apps via the V2 format + /// Description for Gets the Azure storage account configurations of an app. /// /// /// Name of the resource group to which the resource belongs. @@ -5098,7 +5094,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> ListAzureStorageAccountsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -5141,11 +5137,11 @@ 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, "ListAzureStorageAccounts", 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/list").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts/list").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)); @@ -5161,7 +5157,7 @@ internal WebAppsOperations(WebSiteManagementClient client) // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("GET"); + _httpRequest.Method = new HttpMethod("POST"); _httpRequest.RequestUri = new System.Uri(_url); // Set Headers if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) @@ -5242,7 +5238,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")) @@ -5255,7 +5251,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) { @@ -5275,10 +5271,10 @@ internal WebAppsOperations(WebSiteManagementClient client) } /// - /// Updates the Azure storage account configurations of an app. + /// Updates the backup configuration of an app. /// /// - /// Description for Updates the Azure storage account configurations of an app. + /// Description for Updates the backup configuration of an app. /// /// /// Name of the resource group to which the resource belongs. @@ -5286,8 +5282,8 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// Name of the app. /// - /// - /// Azure storage accounts of the app. + /// + /// Edited backup configuration. /// /// /// Headers that will be added to request. @@ -5310,7 +5306,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> UpdateAzureStorageAccountsWithHttpMessagesAsync(string resourceGroupName, string name, AzureStoragePropertyDictionaryResource azureStorageAccounts, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> UpdateBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, BackupRequest request, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -5335,9 +5331,13 @@ internal WebAppsOperations(WebSiteManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "name"); } - if (azureStorageAccounts == null) + if (request == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "azureStorageAccounts"); + throw new ValidationException(ValidationRules.CannotBeNull, "request"); + } + if (request != null) + { + request.Validate(); } if (Client.SubscriptionId == null) { @@ -5356,13 +5356,13 @@ internal WebAppsOperations(WebSiteManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("name", name); - tracingParameters.Add("azureStorageAccounts", azureStorageAccounts); + tracingParameters.Add("request", request); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "UpdateAzureStorageAccounts", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "UpdateBackupConfiguration", 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/azurestorageaccounts").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/backup").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)); @@ -5409,9 +5409,9 @@ internal WebAppsOperations(WebSiteManagementClient client) // Serialize Request string _requestContent = null; - if(azureStorageAccounts != null) + if(request != null) { - _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(azureStorageAccounts, Client.SerializationSettings); + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(request, Client.SerializationSettings); _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); } @@ -5465,216 +5465,7 @@ internal WebAppsOperations(WebSiteManagementClient client) 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; - } - - /// - /// Gets the Azure storage account configurations of an app. - /// - /// - /// Description for Gets the Azure storage account configurations of an app. - /// - /// - /// 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> ListAzureStorageAccountsWithHttpMessagesAsync(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, "ListAzureStorageAccounts", 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/azurestorageaccounts/list").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("POST"); - _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(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -5687,7 +5478,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) { @@ -5707,10 +5498,10 @@ internal WebAppsOperations(WebSiteManagementClient client) } /// - /// Updates the backup configuration of an app. + /// Deletes the backup configuration of an app. /// /// - /// Description for Updates the backup configuration of an app. + /// Description for Deletes the backup configuration of an app. /// /// /// Name of the resource group to which the resource belongs. @@ -5718,9 +5509,6 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// Name of the app. /// - /// - /// Edited backup configuration. - /// /// /// Headers that will be added to request. /// @@ -5730,9 +5518,6 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// Thrown when the operation returned an invalid status code /// - /// - /// Thrown when unable to deserialize the response - /// /// /// Thrown when a required parameter is null /// @@ -5742,7 +5527,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> UpdateBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, BackupRequest request, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task DeleteBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -5767,13 +5552,196 @@ internal WebAppsOperations(WebSiteManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "name"); } - if (request == null) + if (Client.SubscriptionId == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "request"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - if (request != null) + if (Client.ApiVersion == null) { - request.Validate(); + 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, "DeleteBackupConfiguration", 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/backup").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("DELETE"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + 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(); + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + + /// + /// Gets the backup configuration of an app. + /// + /// + /// Description for Gets the backup configuration of an app. + /// + /// + /// 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> GetBackupConfigurationWithHttpMessagesAsync(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) { @@ -5792,13 +5760,12 @@ internal WebAppsOperations(WebSiteManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("name", name); - tracingParameters.Add("request", request); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "UpdateBackupConfiguration", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "GetBackupConfiguration", 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/backup").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/backup/list").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)); @@ -5814,7 +5781,7 @@ internal WebAppsOperations(WebSiteManagementClient client) // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("PUT"); + _httpRequest.Method = new HttpMethod("POST"); _httpRequest.RequestUri = new System.Uri(_url); // Set Headers if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) @@ -5845,12 +5812,6 @@ internal WebAppsOperations(WebSiteManagementClient client) // Serialize Request string _requestContent = null; - if(request != null) - { - _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(request, Client.SerializationSettings); - _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); - _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); - } // Set Credentials if (Client.Credentials != null) { @@ -5934,10 +5895,10 @@ internal WebAppsOperations(WebSiteManagementClient client) } /// - /// Deletes the backup configuration of an app. + /// Gets the config reference app settings and status of an app /// /// - /// Description for Deletes the backup configuration of an app. + /// Description for Gets the config reference app settings and status of an app /// /// /// Name of the resource group to which the resource belongs. @@ -5954,6 +5915,9 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// Thrown when the operation returned an invalid status code /// + /// + /// Thrown when unable to deserialize the response + /// /// /// Thrown when a required parameter is null /// @@ -5963,7 +5927,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task DeleteBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetAppSettingsKeyVaultReferencesWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -6006,11 +5970,11 @@ internal WebAppsOperations(WebSiteManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("name", name); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "DeleteBackupConfiguration", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "GetAppSettingsKeyVaultReferences", 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/backup").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/configreferences/appsettings").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)); @@ -6026,7 +5990,7 @@ internal WebAppsOperations(WebSiteManagementClient client) // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("DELETE"); + _httpRequest.Method = new HttpMethod("GET"); _httpRequest.RequestUri = new System.Uri(_url); // Set Headers if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) @@ -6107,13 +6071,31 @@ 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")) { _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); @@ -6122,10 +6104,10 @@ internal WebAppsOperations(WebSiteManagementClient client) } /// - /// Gets the backup configuration of an app. + /// Gets the config reference and status of an app /// /// - /// Description for Gets the backup configuration of an app. + /// Description for Gets the config reference and status of an app /// /// /// Name of the resource group to which the resource belongs. @@ -6133,6 +6115,9 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// Name of the app. /// + /// + /// App Setting key name. + /// /// /// Headers that will be added to request. /// @@ -6154,7 +6139,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetAppSettingKeyVaultReferenceWithHttpMessagesAsync(string resourceGroupName, string name, string appSettingKey, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -6179,6 +6164,10 @@ internal WebAppsOperations(WebSiteManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "name"); } + if (appSettingKey == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "appSettingKey"); + } if (Client.SubscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); @@ -6196,14 +6185,16 @@ internal WebAppsOperations(WebSiteManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("name", name); + tracingParameters.Add("appSettingKey", appSettingKey); tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "GetBackupConfiguration", tracingParameters); + ServiceClientTracing.Enter(_invocationId, this, "GetAppSettingKeyVaultReference", 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/backup/list").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/configreferences/appsettings/{appSettingKey}").ToString(); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); + _url = _url.Replace("{appSettingKey}", System.Uri.EscapeDataString(appSettingKey)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); if (Client.ApiVersion != null) @@ -6217,7 +6208,7 @@ internal WebAppsOperations(WebSiteManagementClient client) // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("POST"); + _httpRequest.Method = new HttpMethod("GET"); _httpRequest.RequestUri = new System.Uri(_url); // Set Headers if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) @@ -6298,7 +6289,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")) @@ -6311,7 +6302,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) { @@ -20020,7 +20011,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListInstanceIdentifiersWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListInstanceIdentifiersWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -20164,7 +20155,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")) @@ -20177,7 +20168,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) { @@ -35383,462 +35374,6 @@ internal WebAppsOperations(WebSiteManagementClient client) return _result; } - /// - /// Updates site's Authentication / Authorization settings for apps via the V2 - /// format - /// - /// - /// Description for Updates site's Authentication / Authorization settings for - /// apps via the V2 format - /// - /// - /// Name of the resource group to which the resource belongs. - /// - /// - /// Name of web app. - /// - /// - /// Auth settings associated with web app. - /// - /// - /// Name of web app slot. If not specified then will default to production - /// slot. - /// - /// - /// 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> UpdateAuthSettingsV2SlotWithHttpMessagesAsync(string resourceGroupName, string name, SiteAuthSettingsV2 siteAuthSettingsV2, string slot, 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 (siteAuthSettingsV2 == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "siteAuthSettingsV2"); - } - if (slot == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "slot"); - } - 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("siteAuthSettingsV2", siteAuthSettingsV2); - tracingParameters.Add("slot", slot); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "UpdateAuthSettingsV2Slot", 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}/slots/{slot}/config/authsettingsV2").ToString(); - _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); - _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); - _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot)); - _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("PUT"); - _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; - if(siteAuthSettingsV2 != null) - { - _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteAuthSettingsV2, Client.SerializationSettings); - _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); - _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); - } - // Set Credentials - if (Client.Credentials != null) - { - 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; - } - - /// - /// 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. - /// - /// - /// Name of the deployment slot. If a slot is not specified, the API will get - /// the settings for the production slot. - /// - /// - /// 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> GetAuthSettingsV2SlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, 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 (slot == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "slot"); - } - 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("slot", slot); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "GetAuthSettingsV2Slot", 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}/slots/{slot}/config/authsettingsV2/list").ToString(); - _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); - _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); - _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot)); - _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 the Azure storage account configurations of an app. /// @@ -50807,7 +50342,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListInstanceIdentifiersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListInstanceIdentifiersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -50957,7 +50492,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")) @@ -50970,7 +50505,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) { @@ -85576,7 +85111,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListInstanceIdentifiersNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListInstanceIdentifiersNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (nextPageLink == null) { @@ -85685,7 +85220,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")) @@ -85698,7 +85233,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) { @@ -89012,7 +88547,7 @@ internal WebAppsOperations(WebSiteManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListInstanceIdentifiersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListInstanceIdentifiersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (nextPageLink == null) { @@ -89121,7 +88656,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")) @@ -89134,7 +88669,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 b268e898aef2b..d5e9d19774b7f 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs @@ -1259,12 +1259,10 @@ public static SiteAuthSettings GetAuthSettings(this IWebAppsOperations operation } /// - /// Updates site's Authentication / Authorization settings for apps via the V2 - /// format + /// Updates the Azure storage account configurations of an app. /// /// - /// Description for Updates site's Authentication / Authorization settings for - /// apps via the V2 format + /// Description for Updates the Azure storage account configurations of an app. /// /// /// The operations group for this extension method. @@ -1273,23 +1271,21 @@ public static SiteAuthSettings GetAuthSettings(this IWebAppsOperations operation /// Name of the resource group to which the resource belongs. /// /// - /// Name of web app. + /// Name of the app. /// - /// - /// Auth settings associated with web app. + /// + /// Azure storage accounts of the app. /// - public static SiteAuthSettingsV2 UpdateAuthSettingsV2(this IWebAppsOperations operations, string resourceGroupName, string name, SiteAuthSettingsV2 siteAuthSettingsV2) + public static AzureStoragePropertyDictionaryResource UpdateAzureStorageAccounts(this IWebAppsOperations operations, string resourceGroupName, string name, AzureStoragePropertyDictionaryResource azureStorageAccounts) { - return operations.UpdateAuthSettingsV2Async(resourceGroupName, name, siteAuthSettingsV2).GetAwaiter().GetResult(); + return operations.UpdateAzureStorageAccountsAsync(resourceGroupName, name, azureStorageAccounts).GetAwaiter().GetResult(); } /// - /// Updates site's Authentication / Authorization settings for apps via the V2 - /// format + /// Updates the Azure storage account configurations of an app. /// /// - /// Description for Updates site's Authentication / Authorization settings for - /// apps via the V2 format + /// Description for Updates the Azure storage account configurations of an app. /// /// /// The operations group for this extension method. @@ -1298,29 +1294,27 @@ public static SiteAuthSettingsV2 UpdateAuthSettingsV2(this IWebAppsOperations op /// Name of the resource group to which the resource belongs. /// /// - /// Name of web app. + /// Name of the app. /// - /// - /// Auth settings associated with web app. + /// + /// Azure storage accounts of the app. /// /// /// The cancellation token. /// - public static async Task UpdateAuthSettingsV2Async(this IWebAppsOperations operations, string resourceGroupName, string name, SiteAuthSettingsV2 siteAuthSettingsV2, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task UpdateAzureStorageAccountsAsync(this IWebAppsOperations operations, string resourceGroupName, string name, AzureStoragePropertyDictionaryResource azureStorageAccounts, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.UpdateAuthSettingsV2WithHttpMessagesAsync(resourceGroupName, name, siteAuthSettingsV2, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.UpdateAzureStorageAccountsWithHttpMessagesAsync(resourceGroupName, name, azureStorageAccounts, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } } /// - /// Gets site's Authentication / Authorization settings for apps via the V2 - /// format + /// Gets the Azure storage account configurations of an app. /// /// - /// Description for Gets site's Authentication / Authorization settings for - /// apps via the V2 format + /// Description for Gets the Azure storage account configurations of an app. /// /// /// The operations group for this extension method. @@ -1331,18 +1325,16 @@ public static SiteAuthSettingsV2 UpdateAuthSettingsV2(this IWebAppsOperations op /// /// Name of the app. /// - public static SiteAuthSettingsV2 GetAuthSettingsV2(this IWebAppsOperations operations, string resourceGroupName, string name) + public static AzureStoragePropertyDictionaryResource ListAzureStorageAccounts(this IWebAppsOperations operations, string resourceGroupName, string name) { - return operations.GetAuthSettingsV2Async(resourceGroupName, name).GetAwaiter().GetResult(); + return operations.ListAzureStorageAccountsAsync(resourceGroupName, name).GetAwaiter().GetResult(); } /// - /// Gets site's Authentication / Authorization settings for apps via the V2 - /// format + /// Gets the Azure storage account configurations of an app. /// /// - /// Description for Gets site's Authentication / Authorization settings for - /// apps via the V2 format + /// Description for Gets the Azure storage account configurations of an app. /// /// /// The operations group for this extension method. @@ -1356,19 +1348,19 @@ 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 ListAzureStorageAccountsAsync(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.ListAzureStorageAccountsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } } /// - /// Updates the Azure storage account configurations of an app. + /// Updates the backup configuration of an app. /// /// - /// Description for Updates the Azure storage account configurations of an app. + /// Description for Updates the backup configuration of an app. /// /// /// The operations group for this extension method. @@ -1379,19 +1371,19 @@ public static SiteAuthSettingsV2 GetAuthSettingsV2(this IWebAppsOperations opera /// /// Name of the app. /// - /// - /// Azure storage accounts of the app. + /// + /// Edited backup configuration. /// - public static AzureStoragePropertyDictionaryResource UpdateAzureStorageAccounts(this IWebAppsOperations operations, string resourceGroupName, string name, AzureStoragePropertyDictionaryResource azureStorageAccounts) + public static BackupRequest UpdateBackupConfiguration(this IWebAppsOperations operations, string resourceGroupName, string name, BackupRequest request) { - return operations.UpdateAzureStorageAccountsAsync(resourceGroupName, name, azureStorageAccounts).GetAwaiter().GetResult(); + return operations.UpdateBackupConfigurationAsync(resourceGroupName, name, request).GetAwaiter().GetResult(); } /// - /// Updates the Azure storage account configurations of an app. + /// Updates the backup configuration of an app. /// /// - /// Description for Updates the Azure storage account configurations of an app. + /// Description for Updates the backup configuration of an app. /// /// /// The operations group for this extension method. @@ -1402,25 +1394,25 @@ public static AzureStoragePropertyDictionaryResource UpdateAzureStorageAccounts( /// /// Name of the app. /// - /// - /// Azure storage accounts of the app. + /// + /// Edited backup configuration. /// /// /// The cancellation token. /// - public static async Task UpdateAzureStorageAccountsAsync(this IWebAppsOperations operations, string resourceGroupName, string name, AzureStoragePropertyDictionaryResource azureStorageAccounts, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task UpdateBackupConfigurationAsync(this IWebAppsOperations operations, string resourceGroupName, string name, BackupRequest request, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.UpdateAzureStorageAccountsWithHttpMessagesAsync(resourceGroupName, name, azureStorageAccounts, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.UpdateBackupConfigurationWithHttpMessagesAsync(resourceGroupName, name, request, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } } /// - /// Gets the Azure storage account configurations of an app. + /// Deletes the backup configuration of an app. /// /// - /// Description for Gets the Azure storage account configurations of an app. + /// Description for Deletes the backup configuration of an app. /// /// /// The operations group for this extension method. @@ -1431,16 +1423,16 @@ public static AzureStoragePropertyDictionaryResource UpdateAzureStorageAccounts( /// /// Name of the app. /// - public static AzureStoragePropertyDictionaryResource ListAzureStorageAccounts(this IWebAppsOperations operations, string resourceGroupName, string name) + public static void DeleteBackupConfiguration(this IWebAppsOperations operations, string resourceGroupName, string name) { - return operations.ListAzureStorageAccountsAsync(resourceGroupName, name).GetAwaiter().GetResult(); + operations.DeleteBackupConfigurationAsync(resourceGroupName, name).GetAwaiter().GetResult(); } /// - /// Gets the Azure storage account configurations of an app. + /// Deletes the backup configuration of an app. /// /// - /// Description for Gets the Azure storage account configurations of an app. + /// Description for Deletes the backup configuration of an app. /// /// /// The operations group for this extension method. @@ -1454,19 +1446,16 @@ public static AzureStoragePropertyDictionaryResource ListAzureStorageAccounts(th /// /// The cancellation token. /// - public static async Task ListAzureStorageAccountsAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task DeleteBackupConfigurationAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.ListAzureStorageAccountsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } + (await operations.DeleteBackupConfigurationWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)).Dispose(); } /// - /// Updates the backup configuration of an app. + /// Gets the backup configuration of an app. /// /// - /// Description for Updates the backup configuration of an app. + /// Description for Gets the backup configuration of an app. /// /// /// The operations group for this extension method. @@ -1477,19 +1466,16 @@ public static AzureStoragePropertyDictionaryResource ListAzureStorageAccounts(th /// /// Name of the app. /// - /// - /// Edited backup configuration. - /// - public static BackupRequest UpdateBackupConfiguration(this IWebAppsOperations operations, string resourceGroupName, string name, BackupRequest request) + public static BackupRequest GetBackupConfiguration(this IWebAppsOperations operations, string resourceGroupName, string name) { - return operations.UpdateBackupConfigurationAsync(resourceGroupName, name, request).GetAwaiter().GetResult(); + return operations.GetBackupConfigurationAsync(resourceGroupName, name).GetAwaiter().GetResult(); } /// - /// Updates the backup configuration of an app. + /// Gets the backup configuration of an app. /// /// - /// Description for Updates the backup configuration of an app. + /// Description for Gets the backup configuration of an app. /// /// /// The operations group for this extension method. @@ -1500,25 +1486,22 @@ public static BackupRequest UpdateBackupConfiguration(this IWebAppsOperations op /// /// Name of the app. /// - /// - /// Edited backup configuration. - /// /// /// The cancellation token. /// - public static async Task UpdateBackupConfigurationAsync(this IWebAppsOperations operations, string resourceGroupName, string name, BackupRequest request, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetBackupConfigurationAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.UpdateBackupConfigurationWithHttpMessagesAsync(resourceGroupName, name, request, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.GetBackupConfigurationWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } } /// - /// Deletes the backup configuration of an app. + /// Gets the config reference app settings and status of an app /// /// - /// Description for Deletes the backup configuration of an app. + /// Description for Gets the config reference app settings and status of an app /// /// /// The operations group for this extension method. @@ -1529,16 +1512,16 @@ public static BackupRequest UpdateBackupConfiguration(this IWebAppsOperations op /// /// Name of the app. /// - public static void DeleteBackupConfiguration(this IWebAppsOperations operations, string resourceGroupName, string name) + public static KeyVaultReferenceCollection GetAppSettingsKeyVaultReferences(this IWebAppsOperations operations, string resourceGroupName, string name) { - operations.DeleteBackupConfigurationAsync(resourceGroupName, name).GetAwaiter().GetResult(); + return operations.GetAppSettingsKeyVaultReferencesAsync(resourceGroupName, name).GetAwaiter().GetResult(); } /// - /// Deletes the backup configuration of an app. + /// Gets the config reference app settings and status of an app /// /// - /// Description for Deletes the backup configuration of an app. + /// Description for Gets the config reference app settings and status of an app /// /// /// The operations group for this extension method. @@ -1552,16 +1535,19 @@ public static void DeleteBackupConfiguration(this IWebAppsOperations operations, /// /// The cancellation token. /// - public static async Task DeleteBackupConfigurationAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetAppSettingsKeyVaultReferencesAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) { - (await operations.DeleteBackupConfigurationWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)).Dispose(); + using (var _result = await operations.GetAppSettingsKeyVaultReferencesWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } } /// - /// Gets the backup configuration of an app. + /// Gets the config reference and status of an app /// /// - /// Description for Gets the backup configuration of an app. + /// Description for Gets the config reference and status of an app /// /// /// The operations group for this extension method. @@ -1572,16 +1558,19 @@ public static void DeleteBackupConfiguration(this IWebAppsOperations operations, /// /// Name of the app. /// - public static BackupRequest GetBackupConfiguration(this IWebAppsOperations operations, string resourceGroupName, string name) + /// + /// App Setting key name. + /// + public static KeyVaultReferenceResource GetAppSettingKeyVaultReference(this IWebAppsOperations operations, string resourceGroupName, string name, string appSettingKey) { - return operations.GetBackupConfigurationAsync(resourceGroupName, name).GetAwaiter().GetResult(); + return operations.GetAppSettingKeyVaultReferenceAsync(resourceGroupName, name, appSettingKey).GetAwaiter().GetResult(); } /// - /// Gets the backup configuration of an app. + /// Gets the config reference and status of an app /// /// - /// Description for Gets the backup configuration of an app. + /// Description for Gets the config reference and status of an app /// /// /// The operations group for this extension method. @@ -1592,12 +1581,15 @@ public static BackupRequest GetBackupConfiguration(this IWebAppsOperations opera /// /// Name of the app. /// + /// + /// App Setting key name. + /// /// /// The cancellation token. /// - public static async Task GetBackupConfigurationAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetAppSettingKeyVaultReferenceAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string appSettingKey, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.GetBackupConfigurationWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.GetAppSettingKeyVaultReferenceWithHttpMessagesAsync(resourceGroupName, name, appSettingKey, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } @@ -5068,7 +5060,7 @@ public static RelayServiceConnectionEntity UpdateRelayServiceConnection(this IWe /// /// Name of the app. /// - public static IPage ListInstanceIdentifiers(this IWebAppsOperations operations, string resourceGroupName, string name) + public static IPage ListInstanceIdentifiers(this IWebAppsOperations operations, string resourceGroupName, string name) { return operations.ListInstanceIdentifiersAsync(resourceGroupName, name).GetAwaiter().GetResult(); } @@ -5091,7 +5083,7 @@ public static IPage ListInstanceIdentifiers(this IWebApps /// /// The cancellation token. /// - public static async Task> ListInstanceIdentifiersAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListInstanceIdentifiersAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListInstanceIdentifiersWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false)) { @@ -9512,128 +9504,6 @@ public static SiteAuthSettings GetAuthSettingsSlot(this IWebAppsOperations opera } } - /// - /// Updates site's Authentication / Authorization settings for apps via the V2 - /// format - /// - /// - /// Description for Updates 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 web app. - /// - /// - /// Auth settings associated with web app. - /// - /// - /// Name of web app slot. If not specified then will default to production - /// slot. - /// - public static SiteAuthSettingsV2 UpdateAuthSettingsV2Slot(this IWebAppsOperations operations, string resourceGroupName, string name, SiteAuthSettingsV2 siteAuthSettingsV2, string slot) - { - return operations.UpdateAuthSettingsV2SlotAsync(resourceGroupName, name, siteAuthSettingsV2, slot).GetAwaiter().GetResult(); - } - - /// - /// Updates site's Authentication / Authorization settings for apps via the V2 - /// format - /// - /// - /// Description for Updates 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 web app. - /// - /// - /// Auth settings associated with web app. - /// - /// - /// Name of web app slot. If not specified then will default to production - /// slot. - /// - /// - /// The cancellation token. - /// - public static async Task UpdateAuthSettingsV2SlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, SiteAuthSettingsV2 siteAuthSettingsV2, string slot, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.UpdateAuthSettingsV2SlotWithHttpMessagesAsync(resourceGroupName, name, siteAuthSettingsV2, slot, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// 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. - /// - /// - /// Name of the deployment slot. If a slot is not specified, the API will get - /// the settings for the production slot. - /// - public static SiteAuthSettingsV2 GetAuthSettingsV2Slot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot) - { - return operations.GetAuthSettingsV2SlotAsync(resourceGroupName, name, slot).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. - /// - /// - /// Name of the deployment slot. If a slot is not specified, the API will get - /// the settings for the production slot. - /// - /// - /// The cancellation token. - /// - public static async Task GetAuthSettingsV2SlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.GetAuthSettingsV2SlotWithHttpMessagesAsync(resourceGroupName, name, slot, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - /// /// Updates the Azure storage account configurations of an app. /// @@ -13752,7 +13622,7 @@ public static RelayServiceConnectionEntity UpdateRelayServiceConnectionSlot(this /// Name of the deployment slot. If a slot is not specified, the API gets the /// production slot instances. /// - public static IPage ListInstanceIdentifiersSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot) + public static IPage ListInstanceIdentifiersSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot) { return operations.ListInstanceIdentifiersSlotAsync(resourceGroupName, name, slot).GetAwaiter().GetResult(); } @@ -13779,7 +13649,7 @@ public static IPage ListInstanceIdentifiersSlot(this IWeb /// /// The cancellation token. /// - public static async Task> ListInstanceIdentifiersSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListInstanceIdentifiersSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListInstanceIdentifiersSlotWithHttpMessagesAsync(resourceGroupName, name, slot, null, cancellationToken).ConfigureAwait(false)) { @@ -23508,7 +23378,7 @@ public static IPage ListHostNameBindingsNext(this IWebAppsOpera /// /// The NextLink from the previous successful call to List operation. /// - public static IPage ListInstanceIdentifiersNext(this IWebAppsOperations operations, string nextPageLink) + public static IPage ListInstanceIdentifiersNext(this IWebAppsOperations operations, string nextPageLink) { return operations.ListInstanceIdentifiersNextAsync(nextPageLink).GetAwaiter().GetResult(); } @@ -23528,7 +23398,7 @@ public static IPage ListInstanceIdentifiersNext(this IWeb /// /// The cancellation token. /// - public static async Task> ListInstanceIdentifiersNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListInstanceIdentifiersNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListInstanceIdentifiersNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) { @@ -24340,7 +24210,7 @@ public static IPage ListHostNameBindingsSlotNext(this IWebAppsO /// /// The NextLink from the previous successful call to List operation. /// - public static IPage ListInstanceIdentifiersSlotNext(this IWebAppsOperations operations, string nextPageLink) + public static IPage ListInstanceIdentifiersSlotNext(this IWebAppsOperations operations, string nextPageLink) { return operations.ListInstanceIdentifiersSlotNextAsync(nextPageLink).GetAwaiter().GetResult(); } @@ -24360,7 +24230,7 @@ public static IPage ListInstanceIdentifiersSlotNext(this /// /// The cancellation token. /// - public static async Task> ListInstanceIdentifiersSlotNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListInstanceIdentifiersSlotNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListInstanceIdentifiersSlotNextWithHttpMessagesAsync(nextPageLink, 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 e13c1b883b348..fabc3f76e72c7 100644 --- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs +++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs @@ -409,7 +409,7 @@ private void Initialize() AppServicePlans = new AppServicePlansOperations(this); ResourceHealthMetadata = new ResourceHealthMetadataOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2020-06-01"; + ApiVersion = "2019-08-01"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true;