From 6a982417009762f776b60f16dc9aa210f6c0aa4f Mon Sep 17 00:00:00 2001 From: Amanda Lim Date: Thu, 20 Apr 2023 15:10:50 -0700 Subject: [PATCH 1/2] Add DevCenter data plane endpoint --- .../AzureEnvironment.BuiltIn.cs | 4 +++- .../AzureEnvironment.cs | 4 +++- .../AzureEnvironmentConstants.cs | 9 +++++++++ .../Extensions/AzureEnvironmentExtensions.cs | 14 ++++++++++++-- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/Authentication.Abstractions/AzureEnvironment.BuiltIn.cs b/src/Authentication.Abstractions/AzureEnvironment.BuiltIn.cs index d4218841a4..b02184a0fd 100644 --- a/src/Authentication.Abstractions/AzureEnvironment.BuiltIn.cs +++ b/src/Authentication.Abstractions/AzureEnvironment.BuiltIn.cs @@ -162,7 +162,9 @@ private static void SetExtendedProperties(IDictionary azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzurePurviewEndpointResourceId, AzureEnvironmentConstants.AzurePurviewEndpointResourceId); azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureAppConfigurationEndpointSuffix, AzureEnvironmentConstants.AzureAppConfigurationEndpointSuffix); azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureAppConfigurationEndpointResourceId, AzureEnvironmentConstants.AzureAppConfigurationEndpointResourceId); - azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.ContainerRegistryEndpointResourceId, AzureEnvironmentConstants.AzureContainerRegistryEndpointResourceId); + azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.ContainerRegistryEndpointResourceId, AzureEnvironmentConstants.AzureContainerRegistryEndpointResourceId); + azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureDevCenterEndpointSuffix, AzureEnvironmentConstants.AzureDevCenterEndpointSuffix); + azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureDevCenterEndpointResourceId, AzureEnvironmentConstants.AzureDevCenterEndpointResourceId); } if (azureEnvironments.ContainsKey(EnvironmentName.AzureChinaCloud)) diff --git a/src/Authentication.Abstractions/AzureEnvironment.cs b/src/Authentication.Abstractions/AzureEnvironment.cs index 5bbb2bc5a4..0df99b38cb 100644 --- a/src/Authentication.Abstractions/AzureEnvironment.cs +++ b/src/Authentication.Abstractions/AzureEnvironment.cs @@ -563,7 +563,9 @@ public static class ExtendedEndpoint AzurePurviewEndpointResourceId = "AzurePurviewEndpointResourceId", AzureAppConfigurationEndpointSuffix = "AzureAppConfigurationEndpointSuffix", AzureAppConfigurationEndpointResourceId = "AzureAppConfigurationEndpointResourceId", - ContainerRegistryEndpointResourceId = "ContainerRegistryEndpointResourceId"; + ContainerRegistryEndpointResourceId = "ContainerRegistryEndpointResourceId", + AzureDevCenterEndpointSuffix = "AzureDevCenterEndpointSuffix", + AzureDevCenterEndpointResourceId = "AzureDevCenterEndpointResourceId"; } } } diff --git a/src/Authentication.Abstractions/AzureEnvironmentConstants.cs b/src/Authentication.Abstractions/AzureEnvironmentConstants.cs index 5d8d43ebf5..e37e273aa1 100644 --- a/src/Authentication.Abstractions/AzureEnvironmentConstants.cs +++ b/src/Authentication.Abstractions/AzureEnvironmentConstants.cs @@ -281,6 +281,15 @@ public static class AzureEnvironmentConstants         public const string USGovernmentContainerRegistryEndpointResourceId = "https://management.usgovcloudapi.net";         public const string AzureContainerRegistryEndpointResourceId = "https://management.azure.com"; + /// + /// The domain name suffix for Azure DevCenter + /// + public const string AzureDevCenterEndpointSuffix = "devcenter.azure.net"; + + /// + /// The token audience for authorizing DevCenter Service requests + /// + public const string AzureDevCenterEndpointResourceId = "https://devcenter.azure.net"; } } diff --git a/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs b/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs index d7cd61dc77..279f4ab09d 100644 --- a/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs +++ b/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs @@ -321,7 +321,13 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi break; case AzureEnvironment.ExtendedEndpoint.ContainerRegistryEndpointResourceId: environment.SetProperty(AzureEnvironment.ExtendedEndpoint.ContainerRegistryEndpointResourceId, propertyValue); - break; + break; + case AzureEnvironment.ExtendedEndpoint.AzureDevCenterEndpointSuffix: + environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AzureDevCenterEndpointSuffix, propertyValue); + break; + case AzureEnvironment.ExtendedEndpoint.AzureDevCenterEndpointResourceId: + environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AzureDevCenterEndpointResourceId, propertyValue); + break; } } } @@ -385,7 +391,11 @@ public static string GetTokenAudience(this IAzureEnvironment environment, string break; case AzureEnvironment.ExtendedEndpoint.ContainerRegistryEndpointResourceId: resource = AzureEnvironment.ExtendedEndpoint.ContainerRegistryEndpointResourceId; - break; + break; + case AzureEnvironment.ExtendedEndpoint.AzureDevCenterEndpointSuffix: + case AzureEnvironment.ExtendedEndpoint.AzureDevCenterEndpointResourceId: + resource = AzureEnvironment.ExtendedEndpoint.AzureDevCenterEndpointResourceId; + break; default: resource = AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId; break; From dea012171eb854ad30c315151494199cec703abc Mon Sep 17 00:00:00 2001 From: Amanda Lim Date: Thu, 4 May 2023 11:49:46 -0700 Subject: [PATCH 2/2] fix endpoint --- src/Authentication.Abstractions/AzureEnvironmentConstants.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Authentication.Abstractions/AzureEnvironmentConstants.cs b/src/Authentication.Abstractions/AzureEnvironmentConstants.cs index e37e273aa1..a633fa8d96 100644 --- a/src/Authentication.Abstractions/AzureEnvironmentConstants.cs +++ b/src/Authentication.Abstractions/AzureEnvironmentConstants.cs @@ -284,12 +284,12 @@ public static class AzureEnvironmentConstants /// /// The domain name suffix for Azure DevCenter /// - public const string AzureDevCenterEndpointSuffix = "devcenter.azure.net"; + public const string AzureDevCenterEndpointSuffix = "devcenter.azure.com"; /// /// The token audience for authorizing DevCenter Service requests /// - public const string AzureDevCenterEndpointResourceId = "https://devcenter.azure.net"; + public const string AzureDevCenterEndpointResourceId = "https://devcenter.azure.com"; } }