Fix the pipeline error

msJinLei · msJinLei · commit 4a7307fe80d7 · 2025-04-14T14:51:43.000+08:00
diff --git a/src/Accounts/Accounts.Test/AccessTokenCmdletTest.cs b/src/Accounts/Accounts.Test/AccessTokenCmdletTest.cs
@@ -51,11 +51,7 @@ public AccessTokenCmdletTests(ITestOutputHelper output)
         {
             TestExecutionHelpers.SetUpSessionAndProfile();
             XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
-            if (!AzureSession.Instance.TryGetComponent(AuthenticationTelemetry.Name, out AuthenticationTelemetry authenticationTelemetry))
-            {
-                AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
-            }
-
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
             var defaultContext = new AzureContext(
                 new AzureSubscription()
                 {
diff --git a/src/Accounts/Accounts.Test/AutosaveTests.cs b/src/Accounts/Accounts.Test/AutosaveTests.cs
@@ -67,10 +67,7 @@ void ResetState()
             PowerShellTokenCacheProvider tokenProvider = new InMemoryTokenCacheProvider();
             AzureSession.Instance.RegisterComponent(PowerShellTokenCacheProvider.PowerShellTokenCacheProviderKey, () => tokenProvider, true);
             AzureSession.Instance.RegisterComponent(AzKeyStore.Name, () => keyStore, true);
-            if (!AzureSession.Instance.TryGetComponent(nameof(AuthenticationTelemetry), out AuthenticationTelemetry authenticationTelemetry))
-            {
-                AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(nameof(AuthenticationTelemetry), () => new AuthenticationTelemetry());
-            }
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
         }
 
         [Fact]
diff --git a/src/Accounts/Accounts.Test/AzureRMProfileTests.cs b/src/Accounts/Accounts.Test/AzureRMProfileTests.cs
@@ -175,10 +175,7 @@ public AzureRMProfileTests(ITestOutputHelper output)
         {
             TestExecutionHelpers.SetUpSessionAndProfile();
             XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
-            if (!AzureSession.Instance.TryGetComponent(nameof(AuthenticationTelemetry), out AuthenticationTelemetry authenticationTelemetry))
-            {
-                AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(nameof(AuthenticationTelemetry), () => new AuthenticationTelemetry());
-            }
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
         }
 
         [Fact]
diff --git a/src/Accounts/Accounts.Test/AzureSessionTestInitializer.cs b/src/Accounts/Accounts.Test/AzureSessionTestInitializer.cs
@@ -33,6 +33,7 @@ public static void Initialize()
             AzureSession.Instance.RegisterComponent(AuthenticatorBuilder.AuthenticatorBuilderKey, () => builder);
             AzureSession.Instance.RegisterComponent(nameof(AzureCredentialFactory), () => new AzureCredentialFactory());
             AzureSession.Instance.RegisterComponent(nameof(MsalAccessTokenAcquirerFactory), () => new MsalAccessTokenAcquirerFactory());
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
         }
 
     }
diff --git a/src/Accounts/Accounts.Test/ContextCmdletTests.cs b/src/Accounts/Accounts.Test/ContextCmdletTests.cs
@@ -66,6 +66,7 @@ public ContextCmdletTests(ITestOutputHelper output)
             string profilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), Resources.AzureDirectoryName);
             azKeyStore = new AzKeyStore(profilePath, AzureSession.Instance.KeyStoreFile, true, storageMocker.Object);
             AzureSession.Instance.RegisterComponent(AzKeyStore.Name, () => azKeyStore, true);
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
         }
 
         [Fact]
diff --git a/src/Accounts/Accounts.Test/ErrorResolutionTests.cs b/src/Accounts/Accounts.Test/ErrorResolutionTests.cs
@@ -46,10 +46,7 @@ public TestHyakException(string message, CloudHttpRequestErrorInfo request, Clou
         public void DoesNotThrowWithNullError()
         {
             TestExecutionHelpers.SetUpSessionAndProfile();
-            if (!AzureSession.Instance.TryGetComponent(nameof(AuthenticationTelemetry), out AuthenticationTelemetry authenticationTelemetry))
-            {
-                AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(nameof(AuthenticationTelemetry), () => new AuthenticationTelemetry());
-            }
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
             var cmdlet = new ResolveError();
             var output = cmdlet.ExecuteCmdletInPipeline<AzureErrorRecord>("Resolve-Error");
             Assert.True(output == null || output.Count == 0);
@@ -175,10 +172,7 @@ public void HandlesNullValuesInArmExceptions()
         public void LastParameterFindsLastError()
         {
             TestExecutionHelpers.SetUpSessionAndProfile();
-            if (!AzureSession.Instance.TryGetComponent(nameof(AuthenticationTelemetry), out AuthenticationTelemetry authenticationTelemetry))
-            {
-                AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(nameof(AuthenticationTelemetry), () => new AuthenticationTelemetry());
-            }
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
             var mock = new MockCommandRuntime();
             var cmdlet = new ResolveError { CommandRuntime = mock };
             var message = "RuntimeErrorMessage";
diff --git a/src/Accounts/Accounts.Test/ProfileCmdletTests.cs b/src/Accounts/Accounts.Test/ProfileCmdletTests.cs
@@ -55,6 +55,7 @@ public ProfileCmdletTests(ITestOutputHelper output)
             AzureSession.Instance.DataStore = dataStore;
             commandRuntimeMock = new MockCommandRuntime();
             AzureSession.Instance.AuthenticationFactory = new MockTokenAuthenticationFactory();
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
             keyStore = SetMockedAzKeyStore();
         }
 
diff --git a/src/Accounts/Accounts.Test/SilentReAuthByTenantCmdletTest.cs b/src/Accounts/Accounts.Test/SilentReAuthByTenantCmdletTest.cs
@@ -325,10 +325,7 @@ private void InitializeSession()
             };
             cmdlet.profileClient = new RMProfileClient(profile);
 
-            if (!AzureSession.Instance.TryGetComponent(nameof(AuthenticationTelemetry), out AuthenticationTelemetry authenticationTelemetry))
-            {
-                AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(nameof(AuthenticationTelemetry), () => new AuthenticationTelemetry());
-            }
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
         }
 
         ~SilentReAuthByTenantCmdletTest()
diff --git a/src/Accounts/Accounts.Test/TenantCmdletMockTests.cs b/src/Accounts/Accounts.Test/TenantCmdletMockTests.cs
@@ -54,10 +54,7 @@ public TenantCmdletMockTests(ITestOutputHelper output)
         {
             TestExecutionHelpers.SetUpSessionAndProfile();
             XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
-            if (!AzureSession.Instance.TryGetComponent(nameof(AuthenticationTelemetry), out AuthenticationTelemetry authenticationTelemetry))
-            {
-                AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(nameof(AuthenticationTelemetry), () => new AuthenticationTelemetry());
-            }
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
             AzureSession.Instance.AuthenticationFactory = new MockTokenAuthenticationFactory();
             ((MockTokenAuthenticationFactory)AzureSession.Instance.AuthenticationFactory).TokenProvider = (account, environment, tenant) =>
             new MockAccessToken
diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Fix token in auxiliary authentication header.
 * Collected authentication method for telemetry in end process of cmdlet.
 
 ## Version 4.1.0
diff --git a/src/Accounts/Authentication.Test/AuthenticatorsTest/SilentAuthenticatorTests.cs b/src/Accounts/Authentication.Test/AuthenticatorsTest/SilentAuthenticatorTests.cs
@@ -54,10 +54,7 @@ public override ValueTask<AccessToken> GetTokenAsync(TokenRequestContext request
         public SilentAuthenticatorTests(ITestOutputHelper output)
         {
             AzureSessionInitializer.InitializeAzureSession();
-            if (!AzureSession.Instance.TryGetComponent(AuthenticationTelemetry.Name, out AuthenticationTelemetry authenticationTelemetry))
-            {
-                AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
-            }
+            AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());
             Output = output;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,7 @@ public AccessTokenCmdletTests(ITestOutputHelper output)`
`51`	`51`	`{`
`52`	`52`	`TestExecutionHelpers.SetUpSessionAndProfile();`
`53`	`53`	`XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));`
`54`		`- if (!AzureSession.Instance.TryGetComponent(AuthenticationTelemetry.Name, out AuthenticationTelemetry authenticationTelemetry))`
`55`		`- {`
`56`		`- AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());`
`57`		`- }`
`58`		`-`
	`54`	`+ AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());`
`59`	`55`	`var defaultContext = new AzureContext(`
`60`	`56`	`new AzureSubscription()`
`61`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -175,10 +175,7 @@ public AzureRMProfileTests(ITestOutputHelper output)`
`175`	`175`	`{`
`176`	`176`	`TestExecutionHelpers.SetUpSessionAndProfile();`
`177`	`177`	`XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));`
`178`		`- if (!AzureSession.Instance.TryGetComponent(nameof(AuthenticationTelemetry), out AuthenticationTelemetry authenticationTelemetry))`
`179`		`- {`
`180`		`- AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(nameof(AuthenticationTelemetry), () => new AuthenticationTelemetry());`
`181`		`- }`
	`178`	`+ AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());`
`182`	`179`	`}`
`183`	`180`
`184`	`181`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public static void Initialize()`
`33`	`33`	`AzureSession.Instance.RegisterComponent(AuthenticatorBuilder.AuthenticatorBuilderKey, () => builder);`
`34`	`34`	`AzureSession.Instance.RegisterComponent(nameof(AzureCredentialFactory), () => new AzureCredentialFactory());`
`35`	`35`	`AzureSession.Instance.RegisterComponent(nameof(MsalAccessTokenAcquirerFactory), () => new MsalAccessTokenAcquirerFactory());`
	`36`	`+ AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public ContextCmdletTests(ITestOutputHelper output)`
`66`	`66`	`string profilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), Resources.AzureDirectoryName);`
`67`	`67`	`azKeyStore = new AzKeyStore(profilePath, AzureSession.Instance.KeyStoreFile, true, storageMocker.Object);`
`68`	`68`	`AzureSession.Instance.RegisterComponent(AzKeyStore.Name, () => azKeyStore, true);`
	`69`	`+ AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public ProfileCmdletTests(ITestOutputHelper output)`
`55`	`55`	`AzureSession.Instance.DataStore = dataStore;`
`56`	`56`	`commandRuntimeMock = new MockCommandRuntime();`
`57`	`57`	`AzureSession.Instance.AuthenticationFactory = new MockTokenAuthenticationFactory();`
	`58`	`+ AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());`
`58`	`59`	`keyStore = SetMockedAzKeyStore();`
`59`	`60`	`}`
`60`	`61`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,7 @@ public override ValueTask<AccessToken> GetTokenAsync(TokenRequestContext request`
`54`	`54`	`public SilentAuthenticatorTests(ITestOutputHelper output)`
`55`	`55`	`{`
`56`	`56`	`AzureSessionInitializer.InitializeAzureSession();`
`57`		`- if (!AzureSession.Instance.TryGetComponent(AuthenticationTelemetry.Name, out AuthenticationTelemetry authenticationTelemetry))`
`58`		`- {`
`59`		`- AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());`
`60`		`- }`
	`57`	`+ AzureSession.Instance.RegisterComponent<AuthenticationTelemetry>(AuthenticationTelemetry.Name, () => new AuthenticationTelemetry());`
`61`	`58`	`Output = output;`
`62`	`59`	`}`
`63`	`60`