Skip to content

Commit 7038d37

Browse files
Robbie-MicrosoftRobbie-Microsoft
committed
Undid changes adding extra whitespace in ManagedIdentityTests.cs
1 parent c2eddde commit 7038d37

File tree

1 file changed

+21
-59
lines changed

1 file changed

+21
-59
lines changed

‎tests/Microsoft.Identity.Test.Unit/ManagedIdentityTests/ManagedIdentityTests.cs‎

Lines changed: 21 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,20 @@ public class ManagedIdentityTests : TestBase
4141
internal const string ExpectedCorrelationId = "Some GUID";
4242

4343
private readonly TestRetryPolicyFactory _testRetryPolicyFactory = new TestRetryPolicyFactory();
44+
private readonly TestValidatedProbeEndpointFactory _testValidatedProbeEndpointFactory = new TestValidatedProbeEndpointFactory();
4445

4546
private void AddImdsV2CsrMockHandlerIfNeeded(
4647
ManagedIdentitySource managedIdentitySource,
47-
MockHttpManager httpManager)
48+
MockHttpManager httpManager,
49+
bool success = false)
4850
{
51+
MockHttpMessageHandler csrResponse = success ?
52+
MockHelpers.MockCsrResponse() :
53+
MockHelpers.MockCsrResponseFailure();
54+
4955
if (managedIdentitySource == ManagedIdentitySource.Imds)
5056
{
51-
httpManager.AddMockHandler(MockHelpers.MockCsrResponseFailure());
57+
httpManager.AddMockHandler(csrResponse);
5258
}
5359
}
5460

@@ -111,10 +117,7 @@ public async Task SAMIHappyPathAsync(
111117

112118
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
113119
.WithHttpManager(httpManager);
114-
115120

116-
117-
118121
var mi = miBuilder.Build();
119122

120123
httpManager.AddManagedIdentityMockHandler(
@@ -211,10 +214,7 @@ public async Task ManagedIdentityDifferentScopesTestAsync(
211214

212215
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
213216
.WithHttpManager(httpManager);
214-
215-
216217

217-
218218
var mi = miBuilder.Build();
219219

220220
httpManager.AddManagedIdentityMockHandler(
@@ -272,10 +272,7 @@ public async Task ManagedIdentityForceRefreshTestAsync(
272272

273273
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
274274
.WithHttpManager(httpManager);
275-
276275

277-
278-
279276
var mi = miBuilder.Build();
280277

281278
httpManager.AddManagedIdentityMockHandler(
@@ -335,10 +332,7 @@ public async Task ManagedIdentityWithClaimsAndCapabilitiesTestAsync(
335332
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
336333
.WithClientCapabilities(TestConstants.ClientCapabilities)
337334
.WithHttpManager(httpManager);
338-
339-
340335

341-
342336
var mi = miBuilder.Build();
343337

344338
httpManager.AddManagedIdentityMockHandler(
@@ -401,10 +395,7 @@ public async Task ManagedIdentityWithClaimsTestAsync(
401395

402396
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
403397
.WithHttpManager(httpManager);
404-
405-
406398

407-
408399
var mi = miBuilder.Build();
409400

410401
httpManager.AddManagedIdentityMockHandler(
@@ -476,10 +467,7 @@ public async Task ManagedIdentityTestWrongScopeAsync(string resource, ManagedIde
476467

477468
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
478469
.WithHttpManager(httpManager);
479-
480470

481-
482-
483471
var mi = miBuilder.Build();
484472

485473
httpManager.AddManagedIdentityMockHandler(endpoint, resource, MockHelpers.GetMsiErrorResponse(managedIdentitySource),
@@ -519,8 +507,6 @@ public async Task ManagedIdentityTestErrorResponseParsing(string errorResponse,
519507

520508
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
521509
.WithHttpManager(httpManager);
522-
523-
524510

525511
var mi = miBuilder.Build();
526512

@@ -585,10 +571,7 @@ public async Task ManagedIdentityErrorResponseNoPayloadTestAsync(ManagedIdentity
585571

586572
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
587573
.WithHttpManager(httpManager);
588-
589574

590-
591-
592575
var mi = miBuilder.Build();
593576

594577
httpManager.AddManagedIdentityMockHandler(endpoint, "scope", "",
@@ -628,10 +611,7 @@ public async Task ManagedIdentityNullResponseAsync(ManagedIdentitySource managed
628611

629612
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
630613
.WithHttpManager(httpManager);
631-
632-
633614

634-
635615
var mi = miBuilder.Build();
636616

637617
httpManager.AddManagedIdentityMockHandler(
@@ -652,6 +632,7 @@ await mi.AcquireTokenForManagedIdentity(Resource)
652632
}
653633
}
654634

635+
// add here
655636
[DataTestMethod]
656637
[DataRow(ManagedIdentitySource.AppService, AppServiceEndpoint)]
657638
[DataRow(ManagedIdentitySource.Imds, ImdsEndpoint)]
@@ -669,10 +650,7 @@ public async Task ManagedIdentityUnreachableNetworkAsync(ManagedIdentitySource m
669650

670651
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
671652
.WithHttpManager(httpManager);
672-
673-
674653

675-
676654
var mi = miBuilder.Build();
677655

678656
httpManager.AddFailingRequest(new HttpRequestException("A socket operation was attempted to an unreachable network.",
@@ -700,10 +678,7 @@ public async Task SystemAssignedManagedIdentityApiIdTestAsync()
700678

701679
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
702680
.WithHttpManager(httpManager);
703-
704681

705-
706-
707682
var mi = miBuilder.Build();
708683

709684
httpManager.AddManagedIdentityMockHandler(
@@ -733,10 +708,7 @@ public async Task UserAssignedManagedIdentityApiIdTestAsync()
733708

734709
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.WithUserAssignedClientId(TestConstants.ClientId))
735710
.WithHttpManager(httpManager);
736-
737-
738711

739-
740712
var mi = miBuilder.Build();
741713

742714
httpManager.AddManagedIdentityMockHandler(
@@ -814,10 +786,7 @@ public async Task ManagedIdentityExpiresOnTestAsync(int expiresInHours, bool ref
814786

815787
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
816788
.WithHttpManager(httpManager);
817-
818789

819-
820-
821790
var mi = miBuilder.Build();
822791

823792
httpManager.AddManagedIdentityMockHandler(
@@ -850,10 +819,7 @@ public async Task ManagedIdentityInvalidRefreshOnThrowsAsync()
850819

851820
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
852821
.WithHttpManager(httpManager);
853-
854-
855822

856-
857823
var mi = miBuilder.Build();
858824

859825
httpManager.AddManagedIdentityMockHandler(
@@ -1124,10 +1090,7 @@ public async Task ManagedIdentityRequestTokensForDifferentScopesTestAsync(
11241090
var miBuilder = ManagedIdentityApplicationBuilder
11251091
.Create(ManagedIdentityId.SystemAssigned)
11261092
.WithHttpManager(httpManager);
1127-
1128-
11291093

1130-
11311094
var mi = miBuilder.Build();
11321095

11331096
// Mock handler for the initial resource request
@@ -1161,35 +1124,36 @@ public async Task ManagedIdentityRequestTokensForDifferentScopesTestAsync(
11611124
}
11621125

11631126
[DataTestMethod]
1164-
[DataRow(ManagedIdentitySource.AppService)]
1165-
[DataRow(ManagedIdentitySource.Imds)]
1166-
[DataRow(ManagedIdentitySource.AzureArc)]
1167-
[DataRow(ManagedIdentitySource.CloudShell)]
11681127
[DataRow(ManagedIdentitySource.ServiceFabric)]
1128+
[DataRow(ManagedIdentitySource.AppService)]
11691129
[DataRow(ManagedIdentitySource.MachineLearning)]
1130+
[DataRow(ManagedIdentitySource.CloudShell)]
1131+
[DataRow(ManagedIdentitySource.AzureArc)]
1132+
[DataRow(ManagedIdentitySource.ImdsV2)]
1133+
[DataRow(ManagedIdentitySource.Imds)]
11701134
public async Task UnsupportedManagedIdentitySource_ThrowsExceptionDuringTokenAcquisitionAsync(
11711135
ManagedIdentitySource managedIdentitySource)
11721136
{
11731137
string UnsupportedEndpoint = "unsupported://endpoint";
11741138

11751139
using (new EnvVariableContext())
1140+
using (var httpManager = new MockHttpManager())
11761141
{
1177-
// Set unsupported environment variable
1142+
bool csrResponseSuccess = managedIdentitySource == ManagedIdentitySource.ImdsV2;
1143+
AddImdsV2CsrMockHandlerIfNeeded(managedIdentitySource, httpManager, csrResponseSuccess);
11781144
SetEnvironmentVariables(managedIdentitySource, UnsupportedEndpoint);
11791145

1180-
// Create the Managed Identity Application
1181-
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned);
1146+
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
1147+
.WithHttpManager(httpManager)
1148+
.WithValidatedProbeEndpointFactory(_testValidatedProbeEndpointFactory);
11821149

1183-
// Build the application
11841150
var mi = miBuilder.Build();
11851151

1186-
// Attempt to acquire a token and verify an exception is thrown
11871152
MsalServiceException ex = await Assert.ThrowsExceptionAsync<MsalServiceException>(async () =>
11881153
await mi.AcquireTokenForManagedIdentity("https://management.azure.com")
11891154
.ExecuteAsync()
11901155
.ConfigureAwait(false)).ConfigureAwait(false);
11911156

1192-
// Verify the exception details
11931157
Assert.IsNotNull(ex);
11941158
Assert.AreEqual(MsalError.ManagedIdentityRequestFailed, ex.ErrorCode);
11951159
}
@@ -1275,6 +1239,7 @@ public async Task MixedUserAndSystemAssignedManagedIdentityTestAsync()
12751239
}
12761240
}
12771241

1242+
// add here
12781243
[DataTestMethod]
12791244
[DataRow(ManagedIdentitySource.AppService, AppServiceEndpoint, HttpStatusCode.NotFound)]
12801245
[DataRow(ManagedIdentitySource.AppService, AppServiceEndpoint, HttpStatusCode.RequestTimeout)]
@@ -1299,10 +1264,7 @@ public async Task ManagedIdentityRetryPolicyLifeTimeIsPerRequestAsync(
12991264
var miBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.SystemAssigned)
13001265
.WithHttpManager(httpManager)
13011266
.WithRetryPolicyFactory(_testRetryPolicyFactory);
1302-
1303-
// Disable cache to avoid pollution
13041267

1305-
13061268
var mi = miBuilder.Build();
13071269

13081270
// Simulate permanent errors (to trigger the maximum number of retries)

0 commit comments

Comments
 (0)