Skip to content

, #270

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

Merged
merged 3 commits into from
Dec 23, 2015
Merged

, #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25c7a48
Fixing PowerShell in Fairfax by removing dependency to AD cmdlets:
pomortaz Dec 22, 2015
b090c09
Updated the recorded sessions to use object ID instead of UPN
pomortaz Dec 22, 2015
c637897
Merge pull request #1536 from pomortaz/dev
Dec 23, 2015
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
64 changes: 48 additions & 16 deletions src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

using System.Linq;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Microsoft.Azure.Management.Resources;
using Xunit;
using Microsoft.Azure.Test;
using Microsoft.Azure.Graph.RBAC;
Expand Down Expand Up @@ -300,10 +299,13 @@ public void TestSetRemoveAccessPolicyByObjectId()
{
string upn = "";
_data.ResetPreCreatedVault();
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(

KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
controller.RunPsTestWorkflow(
() =>
{
return new[] { string.Format("{0} {1} {2} {3}", "Test-SetRemoveAccessPolicyByObjectId", _data.preCreatedVault, _data.resourceGroupName, upn) };
var objId = GetUserObjectId(controller, upn);
return new[] { string.Format("{0} {1} {2} {3}", "Test-SetRemoveAccessPolicyByObjectId", _data.preCreatedVault, _data.resourceGroupName, objId) };
},
(env) =>
{
Expand Down Expand Up @@ -345,10 +347,13 @@ public void TestSetRemoveAccessPolicyByCompoundId()
string upn = "";
Guid? appId = null;
_data.ResetPreCreatedVault();
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(

KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
controller.RunPsTestWorkflow(
() =>
{
return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-SetRemoveAccessPolicyByCompoundId", _data.preCreatedVault, _data.resourceGroupName, upn, appId) };
var objId = GetUserObjectId(controller, upn);
return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-SetRemoveAccessPolicyByCompoundId", _data.preCreatedVault, _data.resourceGroupName, appId, objId) };
},
(env) =>
{
Expand All @@ -367,13 +372,17 @@ public void TestSetRemoveAccessPolicyByCompoundId()
public void TestRemoveAccessPolicyWithCompoundIdPolicies()
{
string upn = "";

Guid? appId1 = null;
Guid? appId2 = null;
_data.ResetPreCreatedVault();
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(

KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
controller.RunPsTestWorkflow(
() =>
{
return new[] { string.Format("{0} {1} {2} {3} {4} {5}", "Test-RemoveAccessPolicyWithCompoundIdPolicies", _data.preCreatedVault, _data.resourceGroupName, upn, appId1, appId2) };
var objId = GetUserObjectId(controller, upn);
return new[] { string.Format("{0} {1} {2} {3} {4} {5}", "Test-RemoveAccessPolicyWithCompoundIdPolicies", _data.preCreatedVault, _data.resourceGroupName, appId1, appId2, objId) };
},
(env) =>
{
Expand All @@ -395,10 +404,13 @@ public void TestSetCompoundIdAccessPolicy()
string upn = "";
Guid? appId = null;
_data.ResetPreCreatedVault();
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(

KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
controller.RunPsTestWorkflow(
() =>
{
return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-SetCompoundIdAccessPolicy", _data.preCreatedVault, _data.resourceGroupName, upn, appId) };
var objId = GetUserObjectId(controller, upn);
return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-SetCompoundIdAccessPolicy", _data.preCreatedVault, _data.resourceGroupName, appId, objId) };
},
(env) =>
{
Expand Down Expand Up @@ -455,14 +467,18 @@ public void TestModifyAccessPolicy()
{
string upn = "";

KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
_data.ResetPreCreatedVault();
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(

controller.RunPsTestWorkflow(
() =>
{
return new[] { string.Format("{0} {1} {2} {3}", "Test-ModifyAccessPolicy", _data.preCreatedVault, _data.resourceGroupName, upn) };

var objId = GetUserObjectId(controller, upn);
return new[] { string.Format("{0} {1} {2} {3}", "Test-ModifyAccessPolicy", _data.preCreatedVault, _data.resourceGroupName, objId) };
},
(env) =>
{
{
Initialize();
upn = GetUser(env.GetTestEnvironment());
},
Expand Down Expand Up @@ -573,15 +589,17 @@ public void TestModifyAccessPolicyNegativeCases()
public void TestRemoveNonExistentAccessPolicyDoesNotThrow()
{
string upn = "";

_data.ResetPreCreatedVault();
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(

KeyVaultManagementController controller = KeyVaultManagementController.NewInstance;
controller.RunPsTestWorkflow(
() =>
{
return new[] { string.Format("{0} {1} {2} {3}", "Test-RemoveNonExistentAccessPolicyDoesNotThrow", _data.preCreatedVault, _data.resourceGroupName, upn) };
var objId = GetUserObjectId(controller, upn);
return new[] { string.Format("{0} {1} {2} {3}", "Test-RemoveNonExistentAccessPolicyDoesNotThrow", _data.preCreatedVault, _data.resourceGroupName, objId) };
},
(env) =>
{
{
Initialize();
upn = GetUser(env.GetTestEnvironment());
},
Expand Down Expand Up @@ -623,6 +641,20 @@ private string GetUser(TestEnvironment environment)
}
}

private string GetUserObjectId(KeyVaultManagementController controllerAdmin, string upn)
{
if (HttpMockServer.Mode == HttpRecorderMode.Record)
{
var result = controllerAdmin.GraphClient.User.Get(upn);
HttpMockServer.Variables["ObjectId"] = result.User.ObjectId;
return result.User.ObjectId;
}
else
{
return HttpMockServer.Variables["ObjectId"];
}
}

private Guid GetApplicationId(TestEnvironment environment, int appNum)
{
if (appNum < 0)
Expand Down
Loading