diff --git a/eng/common/templates/steps/wait-for-mcr-image-ingestion.yml b/eng/common/templates/steps/wait-for-mcr-image-ingestion.yml index b65fc017..83263c7f 100644 --- a/eng/common/templates/steps/wait-for-mcr-image-ingestion.yml +++ b/eng/common/templates/steps/wait-for-mcr-image-ingestion.yml @@ -9,6 +9,8 @@ steps: parameters: displayName: Wait for Image Ingestion condition: and(${{ parameters.condition }}, eq(variables['waitForIngestionEnabled'], 'true')) + serviceConnection: $(marStatus.serviceConnectionName) + internalProjectName: 'internal' args: > waitForMcrImageIngestion '${{ parameters.imageInfoPath }}' diff --git a/src/Microsoft.DotNet.ImageBuilder/src/McrStatusClient.cs b/src/Microsoft.DotNet.ImageBuilder/src/McrStatusClient.cs index 29e21f7d..4d5348ea 100644 --- a/src/Microsoft.DotNet.ImageBuilder/src/McrStatusClient.cs +++ b/src/Microsoft.DotNet.ImageBuilder/src/McrStatusClient.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.ImageBuilder [Export(typeof(IMcrStatusClient))] public class McrStatusClient : IMcrStatusClient { - private const string McrStatusResource = "api://c00053c3-a979-4ee6-b94e-941881e62d8e"; + private const string McrStatusResource = "api://c00053c3-a979-4ee6-b94e-941881e62d8e/.default"; // https://msazure.visualstudio.com/MicrosoftContainerRegistry/_git/docs?path=/status/status_v2.yaml private const string BaseUri = "https://status.mscr.io/api/onboardingstatus/v2"; private readonly HttpClient _httpClient; @@ -27,15 +27,8 @@ public class McrStatusClient : IMcrStatusClient [ImportingConstructor] public McrStatusClient(IHttpClientProvider httpClientProvider, ILoggerService loggerService) { - if (loggerService is null) - { - throw new ArgumentNullException(nameof(loggerService)); - } - - if (httpClientProvider is null) - { - throw new ArgumentNullException(nameof(httpClientProvider)); - } + ArgumentNullException.ThrowIfNull(loggerService); + ArgumentNullException.ThrowIfNull(httpClientProvider); _httpClient = httpClientProvider.GetClient(); _httpPolicy = HttpPolicyBuilder.Create()