Skip to content

Commit ad9ff03

Browse files
Remove Azure VM, Function App and ARC tests from Integration tests and MSI Helper Service (#5294)
* Update ManagedIdentityTests.NetFwk.cs * Update ManagedIdentityTests.NetFwk.cs * helper * authority --------- Co-authored-by: Gladwin Johnson <[email protected]>
1 parent 3af98c7 commit ad9ff03

File tree

6 files changed

+6
-735
lines changed

6 files changed

+6
-735
lines changed

tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/ManagedIdentityTests.NetFwk.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,9 @@ public class ManagedIdentityTests
6262

6363
[DataTestMethod]
6464
[DataRow(MsiAzureResource.WebApp, "", DisplayName = "System_Identity_Web_App")]
65-
//[DataRow(MsiAzureResource.Function, "", DisplayName = "System_Identity_Function_App")]
66-
//[DataRow(MsiAzureResource.VM, "", DisplayName = "System_Identity_Virtual_Machine")]
6765
[DataRow(MsiAzureResource.WebApp, UserAssignedClientID, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Web_App")]
68-
//[DataRow(MsiAzureResource.Function, UserAssignedClientID, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Function_App")]
69-
//[DataRow(MsiAzureResource.VM, UserAssignedClientID, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Virtual_Machine")]
7066
[DataRow(MsiAzureResource.WebApp, UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Web_App")]
71-
//[DataRow(MsiAzureResource.Function, UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Function_App")]
72-
//[DataRow(MsiAzureResource.VM, UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Virtual_Machine")]
7367
[DataRow(MsiAzureResource.WebApp, UserAssignedObjectID, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectID_Web_App")]
74-
//[DataRow(MsiAzureResource.Function, UserAssignedObjectID, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectID_Function_App")]
75-
//[DataRow(MsiAzureResource.VM, UserAssignedObjectID, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectID_Virtual_Machine")]
76-
#if ENABLE_AZURE_ARC_TESTS
77-
[DataRow(MsiAzureResource.AzureArc, "", DisplayName = "Azure_ARC")]
78-
#endif
7968
public async Task AcquireMSITokenAsync(MsiAzureResource azureResource, string userIdentity, UserAssignedIdentityId userAssignedIdentityId = UserAssignedIdentityId.None)
8069
{
8170
//Arrange
@@ -289,12 +278,6 @@ public async Task AcquireMsiToken_ExchangeForEstsToken_Successfully()
289278
[DataRow(MsiAzureResource.WebApp, SomeRandomGuid, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Web_App")]
290279
[DataRow(MsiAzureResource.WebApp, SomeRandomGuid, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectId_Web_App")]
291280
[DataRow(MsiAzureResource.WebApp, Non_Existent_UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Web_App")]
292-
//[DataRow(MsiAzureResource.Function, SomeRandomGuid, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Function_App")]
293-
//[DataRow(MsiAzureResource.Function, SomeRandomGuid, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectId_Function_App")]
294-
//[DataRow(MsiAzureResource.Function, Non_Existent_UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Function_App")]
295-
//[DataRow(MsiAzureResource.VM, SomeRandomGuid, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_VM")]
296-
//[DataRow(MsiAzureResource.VM, SomeRandomGuid, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectId_VM")]
297-
//[DataRow(MsiAzureResource.VM, Non_Existent_UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_VM")]
298281
public async Task ManagedIdentityRequestFailureCheckAsync(MsiAzureResource azureResource, string userIdentity, UserAssignedIdentityId userAssignedIdentityId)
299282
{
300283
RunOnHelper.AssertFramework(TargetFrameworks.NetCore);

tests/devapps/Managed Identity apps/MSIHelperService/Controllers/EnvironmentVariablesController.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,11 @@ public EnvironmentVariablesController(
5555
MSIHelper.AzureResource.WebApp => await MSIHelper.GetWebAppEnvironmentVariablesAsync(
5656
_logger).ConfigureAwait(false),
5757

58-
MSIHelper.AzureResource.Function => await MSIHelper.GetFunctionAppEnvironmentVariablesAsync(httpClient,
59-
_logger).ConfigureAwait(false),
58+
MSIHelper.AzureResource.Function => throw new NotImplementedException(),
6059

61-
MSIHelper.AzureResource.VM => await MSIHelper.GetVirtualMachineEnvironmentVariables(
62-
_logger).ConfigureAwait(false),
60+
MSIHelper.AzureResource.VM => throw new NotImplementedException(),
6361

64-
MSIHelper.AzureResource.AzureArc => await MSIHelper.GetAzureArcEnvironmentVariables(
65-
_logger).ConfigureAwait(false),
62+
MSIHelper.AzureResource.AzureArc => throw new NotImplementedException(),
6663

6764
MSIHelper.AzureResource.ServiceFabric => throw new NotImplementedException(),
6865

tests/devapps/Managed Identity apps/MSIHelperService/Controllers/MSITokenController.cs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,23 +63,11 @@ public MSITokenController(
6363
httpClient,
6464
_logger).ConfigureAwait(false),
6565

66-
MSIHelper.AzureResource.Function => await MSIHelper.GetFunctionAppMSIToken(
67-
identityHeader,
68-
uri,
69-
httpClient,
70-
_logger).ConfigureAwait(false),
66+
MSIHelper.AzureResource.Function => throw new NotImplementedException(),
7167

72-
MSIHelper.AzureResource.VM => await MSIHelper.GetVirtualMachineMSIToken(
73-
identityHeader,
74-
uri,
75-
httpClient,
76-
_logger).ConfigureAwait(false),
68+
MSIHelper.AzureResource.VM => throw new NotImplementedException(),
7769

78-
MSIHelper.AzureResource.AzureArc => await MSIHelper.GetAzureArcMSIToken(
79-
identityHeader,
80-
uri,
81-
httpClient,
82-
_logger).ConfigureAwait(false),
70+
MSIHelper.AzureResource.AzureArc => throw new NotImplementedException(),
8371

8472
MSIHelper.AzureResource.ServiceFabric => throw new NotImplementedException(),
8573

0 commit comments

Comments
 (0)