diff --git a/sdk/websites/Azure.ResourceManager.AppService/CHANGELOG.md b/sdk/websites/Azure.ResourceManager.AppService/CHANGELOG.md index 55b8d814524d..140d72133e7f 100644 --- a/sdk/websites/Azure.ResourceManager.AppService/CHANGELOG.md +++ b/sdk/websites/Azure.ResourceManager.AppService/CHANGELOG.md @@ -8,6 +8,8 @@ ### Bugs Fixed +- Due to `HealthCheckUri` not being a valid URI, add a new property `HealthCheckUriString` to replace it in order to fix the URI format issue. + ### Other Changes ## 1.1.0-beta.2 (2023-09-06) diff --git a/sdk/websites/Azure.ResourceManager.AppService/api/Azure.ResourceManager.AppService.netstandard2.0.cs b/sdk/websites/Azure.ResourceManager.AppService/api/Azure.ResourceManager.AppService.netstandard2.0.cs index f7d06ce416b6..771f9238c995 100644 --- a/sdk/websites/Azure.ResourceManager.AppService/api/Azure.ResourceManager.AppService.netstandard2.0.cs +++ b/sdk/websites/Azure.ResourceManager.AppService/api/Azure.ResourceManager.AppService.netstandard2.0.cs @@ -3394,7 +3394,10 @@ public WebSiteInstanceStatusData() { } public System.Uri ConsoleUri { get { throw null; } set { } } public System.Collections.Generic.IDictionary Containers { get { throw null; } } public System.Uri DetectorUri { get { throw null; } set { } } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.ObsoleteAttribute("This property is obsolete and will be removed in a future release, please use `HealthCheckUriString` instead", false)] public System.Uri HealthCheckUri { get { throw null; } set { } } + public string HealthCheckUrlString { get { throw null; } set { } } public string Kind { get { throw null; } set { } } public Azure.ResourceManager.AppService.Models.SiteRuntimeState? State { get { throw null; } set { } } public System.Uri StatusUri { get { throw null; } set { } } @@ -5504,7 +5507,7 @@ public static partial class ArmAppServiceModelFactory public static Azure.ResourceManager.AppService.WebJobData WebJobData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, string runCommand = null, System.Uri uri = null, System.Uri extraInfoUri = null, Azure.ResourceManager.AppService.Models.WebJobType? webJobType = default(Azure.ResourceManager.AppService.Models.WebJobType?), string error = null, bool? isUsingSdk = default(bool?), System.Collections.Generic.IDictionary settings = null, string kind = null) { throw null; } public static Azure.ResourceManager.AppService.WebSiteAnalysisDefinitionData WebSiteAnalysisDefinitionData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, string description = null, string kind = null) { throw null; } public static Azure.ResourceManager.AppService.WebSiteData WebSiteData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, System.Collections.Generic.IDictionary tags = null, Azure.Core.AzureLocation location = default(Azure.Core.AzureLocation), Azure.ResourceManager.Models.ManagedServiceIdentity identity = null, Azure.ResourceManager.Resources.Models.ExtendedLocation extendedLocation = null, string state = null, System.Collections.Generic.IEnumerable hostNames = null, string repositorySiteName = null, Azure.ResourceManager.AppService.Models.AppServiceUsageState? usageState = default(Azure.ResourceManager.AppService.Models.AppServiceUsageState?), bool? isEnabled = default(bool?), System.Collections.Generic.IEnumerable enabledHostNames = null, Azure.ResourceManager.AppService.Models.WebSiteAvailabilityState? availabilityState = default(Azure.ResourceManager.AppService.Models.WebSiteAvailabilityState?), System.Collections.Generic.IEnumerable hostNameSslStates = null, Azure.Core.ResourceIdentifier appServicePlanId = null, bool? isReserved = default(bool?), bool? isXenon = default(bool?), bool? isHyperV = default(bool?), System.DateTimeOffset? lastModifiedTimeUtc = default(System.DateTimeOffset?), Azure.ResourceManager.AppService.Models.SiteConfigProperties siteConfig = null, System.Collections.Generic.IEnumerable trafficManagerHostNames = null, bool? isScmSiteAlsoStopped = default(bool?), string targetSwapSlot = null, Azure.ResourceManager.AppService.Models.HostingEnvironmentProfile hostingEnvironmentProfile = null, bool? isClientAffinityEnabled = default(bool?), bool? isClientCertEnabled = default(bool?), Azure.ResourceManager.AppService.Models.ClientCertMode? clientCertMode = default(Azure.ResourceManager.AppService.Models.ClientCertMode?), string clientCertExclusionPaths = null, bool? isHostNameDisabled = default(bool?), string customDomainVerificationId = null, string outboundIPAddresses = null, string possibleOutboundIPAddresses = null, int? containerSize = default(int?), int? dailyMemoryTimeQuota = default(int?), System.DateTimeOffset? suspendOn = default(System.DateTimeOffset?), int? maxNumberOfWorkers = default(int?), Azure.ResourceManager.AppService.Models.CloningInfo cloningInfo = null, string resourceGroup = null, bool? isDefaultContainer = default(bool?), string defaultHostName = null, Azure.ResourceManager.AppService.Models.SlotSwapStatus slotSwapStatus = null, bool? isHttpsOnly = default(bool?), Azure.ResourceManager.AppService.Models.RedundancyMode? redundancyMode = default(Azure.ResourceManager.AppService.Models.RedundancyMode?), System.Guid? inProgressOperationId = default(System.Guid?), bool? isStorageAccountRequired = default(bool?), string keyVaultReferenceIdentity = null, Azure.Core.ResourceIdentifier virtualNetworkSubnetId = null, string kind = null) { throw null; } - public static Azure.ResourceManager.AppService.WebSiteInstanceStatusData WebSiteInstanceStatusData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, Azure.ResourceManager.AppService.Models.SiteRuntimeState? state = default(Azure.ResourceManager.AppService.Models.SiteRuntimeState?), System.Uri statusUri = null, System.Uri detectorUri = null, System.Uri consoleUri = null, System.Uri healthCheckUri = null, System.Collections.Generic.IDictionary containers = null, string kind = null) { throw null; } + public static Azure.ResourceManager.AppService.WebSiteInstanceStatusData WebSiteInstanceStatusData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, Azure.ResourceManager.AppService.Models.SiteRuntimeState? state = default(Azure.ResourceManager.AppService.Models.SiteRuntimeState?), System.Uri statusUri = null, System.Uri detectorUri = null, System.Uri consoleUri = null, string healthCheckUrlString = null, System.Collections.Generic.IDictionary containers = null, string kind = null) { throw null; } public static Azure.ResourceManager.AppService.Models.WindowsJavaContainerSettings WindowsJavaContainerSettings(string javaContainer = null, string javaContainerVersion = null, bool? isPreview = default(bool?), bool? isDeprecated = default(bool?), bool? isHidden = default(bool?), System.DateTimeOffset? endOfLifeOn = default(System.DateTimeOffset?), bool? isAutoUpdate = default(bool?), bool? isEarlyAccess = default(bool?)) { throw null; } } public enum ArtifactStorageType diff --git a/sdk/websites/Azure.ResourceManager.AppService/src/Customization/WebSiteInstanceStatusData.cs b/sdk/websites/Azure.ResourceManager.AppService/src/Customization/WebSiteInstanceStatusData.cs new file mode 100644 index 000000000000..f1cfefceffcb --- /dev/null +++ b/sdk/websites/Azure.ResourceManager.AppService/src/Customization/WebSiteInstanceStatusData.cs @@ -0,0 +1,18 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Text; + +namespace Azure.ResourceManager.AppService +{ + public partial class WebSiteInstanceStatusData + { + /// The ARM URI to the Service Bus relay. + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("This property is obsolete and will be removed in a future release, please use `HealthCheckUriString` instead", false)] + public Uri HealthCheckUri { get; set; } + } +} diff --git a/sdk/websites/Azure.ResourceManager.AppService/src/Generated/ArmAppServiceModelFactory.cs b/sdk/websites/Azure.ResourceManager.AppService/src/Generated/ArmAppServiceModelFactory.cs index 356f027c7131..87c034749a91 100644 --- a/sdk/websites/Azure.ResourceManager.AppService/src/Generated/ArmAppServiceModelFactory.cs +++ b/sdk/websites/Azure.ResourceManager.AppService/src/Generated/ArmAppServiceModelFactory.cs @@ -3381,15 +3381,15 @@ public static RelayServiceConnectionEntityData RelayServiceConnectionEntityData( /// 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. + /// Link to the console to web app instance. /// Dictionary of <ContainerInfo>. /// Kind of resource. /// A new instance for mocking. - public static WebSiteInstanceStatusData WebSiteInstanceStatusData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, SiteRuntimeState? state = null, Uri statusUri = null, Uri detectorUri = null, Uri consoleUri = null, Uri healthCheckUri = null, IDictionary containers = null, string kind = null) + public static WebSiteInstanceStatusData WebSiteInstanceStatusData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, SiteRuntimeState? state = null, Uri statusUri = null, Uri detectorUri = null, Uri consoleUri = null, string healthCheckUrlString = null, IDictionary containers = null, string kind = null) { containers ??= new Dictionary(); - return new WebSiteInstanceStatusData(id, name, resourceType, systemData, state, statusUri, detectorUri, consoleUri, healthCheckUri, containers, kind); + return new WebSiteInstanceStatusData(id, name, resourceType, systemData, state, statusUri, detectorUri, consoleUri, healthCheckUrlString, containers, kind); } /// Initializes a new instance of ProcessInfoData. diff --git a/sdk/websites/Azure.ResourceManager.AppService/src/Generated/Models/WebSiteInstanceStatusData.Serialization.cs b/sdk/websites/Azure.ResourceManager.AppService/src/Generated/Models/WebSiteInstanceStatusData.Serialization.cs index ae15712b0010..dde362faa443 100644 --- a/sdk/websites/Azure.ResourceManager.AppService/src/Generated/Models/WebSiteInstanceStatusData.Serialization.cs +++ b/sdk/websites/Azure.ResourceManager.AppService/src/Generated/Models/WebSiteInstanceStatusData.Serialization.cs @@ -46,10 +46,10 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("consoleUrl"u8); writer.WriteStringValue(ConsoleUri.AbsoluteUri); } - if (Optional.IsDefined(HealthCheckUri)) + if (Optional.IsDefined(HealthCheckUrlString)) { writer.WritePropertyName("healthCheckUrl"u8); - writer.WriteStringValue(HealthCheckUri.AbsoluteUri); + writer.WriteStringValue(HealthCheckUrlString); } if (Optional.IsCollectionDefined(Containers)) { @@ -81,7 +81,7 @@ internal static WebSiteInstanceStatusData DeserializeWebSiteInstanceStatusData(J Optional statusUrl = default; Optional detectorUrl = default; Optional consoleUrl = default; - Optional healthCheckUrl = default; + Optional healthCheckUrl = default; Optional> containers = default; foreach (var property in element.EnumerateObject()) { @@ -161,11 +161,7 @@ internal static WebSiteInstanceStatusData DeserializeWebSiteInstanceStatusData(J } if (property0.NameEquals("healthCheckUrl"u8)) { - if (property0.Value.ValueKind == JsonValueKind.Null || property0.Value.ValueKind == JsonValueKind.String && property0.Value.GetString().Length == 0) - { - continue; - } - healthCheckUrl = new Uri(property0.Value.GetString()); + healthCheckUrl = property0.Value.GetString(); continue; } if (property0.NameEquals("containers"u8)) diff --git a/sdk/websites/Azure.ResourceManager.AppService/src/Generated/WebSiteInstanceStatusData.cs b/sdk/websites/Azure.ResourceManager.AppService/src/Generated/WebSiteInstanceStatusData.cs index b003043fc12c..6860d705e245 100644 --- a/sdk/websites/Azure.ResourceManager.AppService/src/Generated/WebSiteInstanceStatusData.cs +++ b/sdk/websites/Azure.ResourceManager.AppService/src/Generated/WebSiteInstanceStatusData.cs @@ -31,16 +31,16 @@ public WebSiteInstanceStatusData() /// 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. + /// Link to the console to web app instance. /// Dictionary of <ContainerInfo>. /// Kind of resource. - internal WebSiteInstanceStatusData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, SiteRuntimeState? state, Uri statusUri, Uri detectorUri, Uri consoleUri, Uri healthCheckUri, IDictionary containers, string kind) : base(id, name, resourceType, systemData) + internal WebSiteInstanceStatusData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, SiteRuntimeState? state, Uri statusUri, Uri detectorUri, Uri consoleUri, string healthCheckUrlString, IDictionary containers, string kind) : base(id, name, resourceType, systemData) { State = state; StatusUri = statusUri; DetectorUri = detectorUri; ConsoleUri = consoleUri; - HealthCheckUri = healthCheckUri; + HealthCheckUrlString = healthCheckUrlString; Containers = containers; Kind = kind; } @@ -54,7 +54,7 @@ internal WebSiteInstanceStatusData(ResourceIdentifier id, string name, ResourceT /// Link to the console to web app instance. public Uri ConsoleUri { get; set; } /// Link to the console to web app instance. - public Uri HealthCheckUri { get; set; } + public string HealthCheckUrlString { get; set; } /// Dictionary of <ContainerInfo>. public IDictionary Containers { get; } /// Kind of resource. diff --git a/sdk/websites/Azure.ResourceManager.AppService/src/autorest.md b/sdk/websites/Azure.ResourceManager.AppService/src/autorest.md index 9bf51a8b34e5..21772185dc47 100644 --- a/sdk/websites/Azure.ResourceManager.AppService/src/autorest.md +++ b/sdk/websites/Azure.ResourceManager.AppService/src/autorest.md @@ -364,6 +364,7 @@ rename-mapping: AddressResponse.properties.vipMappings: VirtualIPMappings CloningInfo.sourceWebAppLocation: -|azure-location AzureTableStorageApplicationLogsConfig.sasUrl: SasUriString + WebSiteInstanceStatus.properties.healthCheckUrl: healthCheckUrlString # rename resource AppServiceCertificate: AppServiceCertificateProperties