Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update AAD token request target resource uri for ACR access #4654

Merged
merged 9 commits into from
Oct 2, 2024
Merged

Update AAD token request target resource uri for ACR access #4654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2904f70
update target resource uri
ShaunDonn2 Sep 27, 2024
63ed8c9
resolve build errors
ShaunDonn2 Sep 30, 2024
ccab174
update comment
ShaunDonn2 Sep 30, 2024
26f6541
re-add ArmResourceManagerId
ShaunDonn2 Sep 30, 2024
4b65ec4
add obsolete attribute
ShaunDonn2 Oct 1, 2024
674d713
make uri non-configurable
ShaunDonn2 Oct 1, 2024
2a9dfdb
remove local var
ShaunDonn2 Oct 1, 2024
fe9b47f
move uri to config
ShaunDonn2 Oct 1, 2024
2269ec2
set as default ARM uri to avoid breaking OSS scenarios
ShaunDonn2 Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...icrosoft.Health.Fhir.Azure/ContainerRegistry/AzureContainerRegistryAccessTokenProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public async Task<string> GetTokenAsync(string registryServer, CancellationToken
{
EnsureArg.IsNotNullOrEmpty(registryServer, nameof(registryServer));

var aadResourceUri = new Uri(_convertDataConfiguration.ArmResourceManagerId);
var aadResourceUri = _convertDataConfiguration.AcrTargetResourceUri;
ShaunDonn2 marked this conversation as resolved.
Show resolved Hide resolved
string aadToken;
try
{
Expand Down
11 changes: 10 additions & 1 deletion src/Microsoft.Health.Fhir.Core/Configs/ConvertDataConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,19 @@ public class ConvertDataConfiguration
public ICollection<string> ContainerRegistryServers { get; } = new List<string>();

/// <summary>
/// ArmResourceManagerId to aquire AAD token for ACR access token since ACR is not an AAD resource.
/// AcrTargetResourceUri to acquire AAD token for ACR access token since ACR is not an AAD resource.
/// The value is "https://management.azure.com/" for AzureCloud and DogFood. Could be changed to "https://management.usgovcloudapi.net/" for Azure Government and "https://management.chinacloudapi.cn/ " for Azure China.
/// To enable Trusted Services scenarios, we must use the ACR-specific URI rather than the more generic ARM URI. https://dev.azure.com/msazure/AzureContainerRegistry/_wiki/wikis/ACR%20Specs/480000/TrustedServicesPatterns
/// The value is "https://containerregistry.azure.net/" for all cloud environments.
/// </summary>
public Uri AcrTargetResourceUri { get; set; } = new Uri("https://management.azure.com/");

/// <summary>
/// ArmResourceManagerId to acquire AAD token for ACR access token since ACR is not an AAD resource.
/// The value is "https://management.azure.com/" for AzureCloud and DogFood.
/// Could be changed to "https://management.usgovcloudapi.net/" for Azure Government and "https://management.chinacloudapi.cn/ " for Azure China.
/// </summary>
[Obsolete("Use AcrTargetResourceUri instead.")]
public string ArmResourceManagerId { get; set; } = "https://management.azure.com/";

/// <summary>
Expand Down
Loading