From e3a0523abd2099cc2d51c29fc2027e1369a7ba9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ryan=20Pethel=20=F0=9F=9B=B4?= Date: Wed, 3 Apr 2024 14:36:51 -0400 Subject: [PATCH 1/4] adding prop and condition for OperationalInsightsEndpointResourceId --- .../AzureEnvironment.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Authentication.Abstractions/AzureEnvironment.cs b/src/Authentication.Abstractions/AzureEnvironment.cs index 22864e6daf..7c4c88da71 100644 --- a/src/Authentication.Abstractions/AzureEnvironment.cs +++ b/src/Authentication.Abstractions/AzureEnvironment.cs @@ -231,6 +231,17 @@ private static AzureEnvironment MapArmToAzureEnvironment(ArmMetadata armMetadata } } + if (!string.IsNullOrEmpty(armMetadata.LogAnalyticsResourceId)) + { + string api_version = "v1"; + var logAnalyticsEndpoint = armMetadata.LogAnalyticsResourceId + '/' + api_version; + azureEnvironment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, armMetadata.LogAnalyticsResourceId); + if (!string.IsNullOrEmpty(logAnalyticsEndpoint)) + { + azureEnvironment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, logAnalyticsEndpoint); + } + } + //ManagedHsmServiceEndpointSuffix currently uses Built-in endpoint. //In new ArmMedata, ManagedHsmServiceEndpointSuffix is provided as so 'MhsmDns'. //But it doesn't' make sense to just refresh ManagedHsmServiceEndpointSuffix from ARM without AzureManagedHsmServiceEndpointResourceId. @@ -459,6 +470,11 @@ public AzureEnvironment(IAzureEnvironment other) /// public string ContainerRegistryEndpointSuffix { get; set; } + /// + /// The token audience required for communicating with the Log Analytics service in this enviornment + /// + public string OperationalInsightsEndpointResourceId { get; set; } + /// /// The set of Azure Version Profiles supported in this environment /// From 058c1b42ebfd863c084bd8be6002a46224e72f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ryan=20Pethel=20=F0=9F=9B=B4?= Date: Tue, 16 Apr 2024 11:32:13 -0400 Subject: [PATCH 2/4] removing unnecessary conditional --- src/Authentication.Abstractions/AzureEnvironment.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Authentication.Abstractions/AzureEnvironment.cs b/src/Authentication.Abstractions/AzureEnvironment.cs index 7c4c88da71..a6a493a7da 100644 --- a/src/Authentication.Abstractions/AzureEnvironment.cs +++ b/src/Authentication.Abstractions/AzureEnvironment.cs @@ -236,10 +236,7 @@ private static AzureEnvironment MapArmToAzureEnvironment(ArmMetadata armMetadata string api_version = "v1"; var logAnalyticsEndpoint = armMetadata.LogAnalyticsResourceId + '/' + api_version; azureEnvironment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, armMetadata.LogAnalyticsResourceId); - if (!string.IsNullOrEmpty(logAnalyticsEndpoint)) - { - azureEnvironment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, logAnalyticsEndpoint); - } + azureEnvironment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, logAnalyticsEndpoint); } //ManagedHsmServiceEndpointSuffix currently uses Built-in endpoint. From 23b3212e55e1bd5927d0a73b633f7b3f75eede56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ryan=20Pethel=20=F0=9F=9B=B4?= Date: Wed, 24 Apr 2024 14:21:38 -0400 Subject: [PATCH 3/4] removing redundant definition --- src/Authentication.Abstractions/AzureEnvironment.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Authentication.Abstractions/AzureEnvironment.cs b/src/Authentication.Abstractions/AzureEnvironment.cs index a6a493a7da..11545f6773 100644 --- a/src/Authentication.Abstractions/AzureEnvironment.cs +++ b/src/Authentication.Abstractions/AzureEnvironment.cs @@ -466,11 +466,6 @@ public AzureEnvironment(IAzureEnvironment other) /// The domain name suffix for Azure Container Registry /// public string ContainerRegistryEndpointSuffix { get; set; } - - /// - /// The token audience required for communicating with the Log Analytics service in this enviornment - /// - public string OperationalInsightsEndpointResourceId { get; set; } /// /// The set of Azure Version Profiles supported in this environment From e25c769b4268b4c77f6dd2642cbabcb7a021f10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ryan=20Pethel=20=F0=9F=9B=B4?= Date: Wed, 24 Apr 2024 14:26:44 -0400 Subject: [PATCH 4/4] simplifying endpoint value --- src/Authentication.Abstractions/AzureEnvironment.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Authentication.Abstractions/AzureEnvironment.cs b/src/Authentication.Abstractions/AzureEnvironment.cs index 11545f6773..8b0b9e9f7d 100644 --- a/src/Authentication.Abstractions/AzureEnvironment.cs +++ b/src/Authentication.Abstractions/AzureEnvironment.cs @@ -233,10 +233,8 @@ private static AzureEnvironment MapArmToAzureEnvironment(ArmMetadata armMetadata if (!string.IsNullOrEmpty(armMetadata.LogAnalyticsResourceId)) { - string api_version = "v1"; - var logAnalyticsEndpoint = armMetadata.LogAnalyticsResourceId + '/' + api_version; azureEnvironment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, armMetadata.LogAnalyticsResourceId); - azureEnvironment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, logAnalyticsEndpoint); + azureEnvironment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, $"{armMetadata.LogAnalyticsResourceId}/v1"); } //ManagedHsmServiceEndpointSuffix currently uses Built-in endpoint.