Skip to content

Commit 07041a9

Browse files
divyagandhi01divyagandhi01
committed
Addressing code review feedback.
1 parent 662a6b4 commit 07041a9

17 files changed

+62
-245
lines changed

‎src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -86,39 +86,14 @@ public void SetupSomeOfManagementClients(params object[] initializedManagementCl
8686
AzureSession.ClientFactory = new MockClientFactory(initializedManagementClients, false);
8787
}
8888

89-
public void SetupEnvironment(AzureModule mode, bool setupUserAndTenant = false)
89+
public void SetupEnvironment(AzureModule mode)
9090
{
91-
SetupAzureEnvironmentFromEnvironmentVariables(mode, setupUserAndTenant);
91+
SetupAzureEnvironmentFromEnvironmentVariables(mode);
9292

9393
ProfileClient.Profile.Save();
9494
}
95-
96-
private string GetTenantId(TestEnvironment environment)
97-
{
98-
if (HttpMockServer.Mode == HttpRecorderMode.Record)
99-
{
100-
HttpMockServer.Variables["TenantId"] = environment.AuthorizationContext.TenatId;
101-
return environment.AuthorizationContext.TenatId;
102-
}
103-
else
104-
{
105-
return HttpMockServer.Variables["TenantId"];
106-
}
107-
}
108-
109-
private string GetUser(TestEnvironment environment)
110-
{
111-
if (HttpMockServer.Mode == HttpRecorderMode.Record)
112-
{
113-
HttpMockServer.Variables["User"] = environment.AuthorizationContext.UserId;
114-
return environment.AuthorizationContext.UserId;
115-
}
116-
else
117-
{
118-
return HttpMockServer.Variables["User"];
119-
}
120-
}
121-
private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode, bool setupUserAndTenant)
95+
96+
private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
12297
{
12398
TestEnvironment rdfeEnvironment = new RDFETestEnvironmentFactory().GetTestEnvironment();
12499
TestEnvironment csmEnvironment = new CSMTestEnvironmentFactory().GetTestEnvironment();
@@ -180,13 +155,6 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode, boo
180155
}
181156
};
182157

183-
if (setupUserAndTenant)
184-
{
185-
testSubscription.Account = GetUser(currentEnvironment);
186-
testSubscription.Properties.Add(AzureSubscription.Property.Tenants, GetTenantId(currentEnvironment));
187-
testAccount.Id = testSubscription.Account;
188-
}
189-
190158
ProfileClient.Profile.Subscriptions[testSubscription.Id] = testSubscription;
191159
ProfileClient.Profile.Accounts[testAccount.Id] = testAccount;
192160
ProfileClient.SetSubscriptionAsDefault(testSubscription.Name, testSubscription.Account);

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
<DependentUpon>Resource.resx</DependentUpon>
144144
</Compile>
145145
<Compile Include="Properties\AssemblyInfo.cs" />
146+
<Compile Include="ScenarioTests\KeyVaultEnvSetupHelper.cs" />
146147
<Compile Include="ScenarioTests\KeyVaultManagementController.cs" />
147148
<Compile Include="ScenarioTests\KeyVaultManagementTests.cs" />
148149
<Compile Include="ScenarioTests\KeyVaultTestFixture.cs" />

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementController.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class KeyVaultManagementController
3232
{
3333

3434
private CSMTestEnvironmentFactory csmTestFactory;
35-
private EnvironmentSetupHelper helper;
35+
private KeyVaultEnvSetupHelper helper;
3636
private const string TenantIdKey = "TenantId";
3737
private const string DomainKey = "Domain";
3838

@@ -58,10 +58,9 @@ public static KeyVaultManagementController NewInstance
5858
}
5959
}
6060

61-
6261
public KeyVaultManagementController()
6362
{
64-
helper = new EnvironmentSetupHelper();
63+
helper = new KeyVaultEnvSetupHelper();
6564
}
6665

6766
public void RunPsTest(params string[] scripts)
@@ -101,7 +100,7 @@ public void RunPsTestWorkflow(
101100

102101
SetupManagementClients();
103102

104-
helper.SetupEnvironment(AzureModule.AzureResourceManager, true);
103+
helper.SetupEnvironment();
105104

106105
var callingClassName = callingClassType
107106
.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
@@ -132,7 +131,7 @@ public void RunPsTestWorkflow(
132131
}
133132
}
134133
}
135-
134+
136135
private void SetupManagementClients()
137136
{
138137
ResourceManagementClient = GetResourceManagementClient();

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
using System.Linq;
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
16+
using System.Linq;
217
using Microsoft.WindowsAzure.Commands.ScenarioTest;
318
using Microsoft.Azure.Management.Resources;
419
using Xunit;

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ function Test-SetRemoveAccessPolicyBySPN
257257

258258
Assert-AreEqual $spn (Get-AzureADServicePrincipal -ObjectId $vault.AccessPolicies[0].ObjectId)[0].ServicePrincipalName
259259

260-
$vault = Remove-AzureKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -ServicePrincipalName $spn -PassThru
260+
$vault = Remove-AzureKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -SPN $spn -PassThru
261261
Assert-AreEqual 0 $vault.AccessPolicies.Count
262262
}
263263

@@ -292,7 +292,7 @@ function Test-ModifyAccessPolicy
292292
# Add perms to start off
293293
$PermToKeys = @("encrypt", "decrypt", "unwrapKey", "wrapKey", "verify", "sign", "get", "list", "update", "create", "import", "delete", "backup", "restore")
294294
$PermToSecrets = @("get", "list", "set", "delete")
295-
$vault = Set-AzureKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -UserPrincipalName $upn -PermissionsToKeys $PermToKeys -PermissionsToSecrets $PermToSecrets -PassThru
295+
$vault = Set-AzureKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -UPN $upn -PermissionsToKeys $PermToKeys -PermissionsToSecrets $PermToSecrets -PassThru
296296

297297
CheckVaultAccessPolicy $vault $PermToKeys $PermToSecrets
298298
Assert-AreEqual $upn (Get-AzureADUser -ObjectId $vault.AccessPolicies[0].ObjectId)[0].UserPrincipalName
@@ -335,7 +335,7 @@ function Test-SetAccessPolicyNegativeCases
335335
function Test-RemoveNonExistentAccessPolicyDoesNotThrow
336336
{
337337
Param($existingVaultName, $rgName, $upn)
338-
$vault = Remove-AzureKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -UserPrincipalName $upn -PassThru
338+
$vault = Remove-AzureKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -UPN $upn -PassThru
339339
Assert-AreEqual 0 $vault.AccessPolicies.Count
340340
}
341341

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
<Compile Include="Commands\Constants.cs" />
5353
<Compile Include="Models\VaultManagementClient.cs" />
5454
<Compile Include="Models\ModelExtensions.cs" />
55-
<Compile Include="Models\Vault.cs" />
56-
<Compile Include="Models\VaultAccessPolicy.cs" />
55+
<Compile Include="Models\PSVault.cs" />
56+
<Compile Include="Models\PSVaultAccessPolicy.cs" />
5757
<Compile Include="Models\VaultCreationParameters.cs" />
58-
<Compile Include="Models\VaultIdentityItem.cs" />
58+
<Compile Include="Models\PSVaultIdentityItem.cs" />
5959
<Compile Include="Commands\GetAzureKeyVault.cs" />
6060
<Compile Include="Commands\NewAzureKeyVault.cs" />
6161
<Compile Include="Commands\RemoveAzureKeyVault.cs" />

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVault.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace Microsoft.Azure.Commands.KeyVault
2424
{
2525
[Cmdlet(VerbsCommon.Get, "AzureKeyVault", HelpUri = Constants.KeyVaultHelpUri)]
26-
[OutputType(typeof(PSKeyVaultModels.Vault), typeof(List<PSKeyVaultModels.VaultIdentityItem>))]
26+
[OutputType(typeof(PSKeyVaultModels.PSVault), typeof(List<PSKeyVaultModels.PSVaultIdentityItem>))]
2727
public class GetAzureKeyVault : KeyVaultManagementCmdletBase
2828
{
2929
#region Parameter Set Names
@@ -80,7 +80,7 @@ public override void ExecuteCmdlet()
8080
{
8181
case GetVaultParameterSet:
8282
ResourceGroupName = string.IsNullOrWhiteSpace(ResourceGroupName) ? GetResourceGroupName(VaultName) : ResourceGroupName;
83-
PSKeyVaultModels.Vault vault = null;
83+
PSKeyVaultModels.PSVault vault = null;
8484

8585
if (!string.IsNullOrWhiteSpace(ResourceGroupName))
8686
vault = KeyVaultManagementClient.GetVault(

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/NewAzureKeyVault.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.KeyVault
2525
/// Create a new key vault.
2626
/// </summary>
2727
[Cmdlet(VerbsCommon.New, "AzureKeyVault", HelpUri = Constants.KeyVaultHelpUri)]
28-
[OutputType(typeof (PSKeyVaultModels.Vault))]
28+
[OutputType(typeof (PSKeyVaultModels.PSVault))]
2929
public class NewAzureKeyVault : KeyVaultManagementCmdletBase
3030
{
3131
#region Input Parameter Definitions
@@ -66,7 +66,7 @@ public class NewAzureKeyVault : KeyVaultManagementCmdletBase
6666
[Parameter(Mandatory = false,
6767
ValueFromPipelineByPropertyName = true,
6868
HelpMessage =
69-
"If specified, the key vault will be enabled for deployment."
69+
"If specified, enables secrets to be retrieved from this key vault by the Microsoft.Compute resource provider when referenced in resource creation."
7070
)]
7171
public SwitchParameter EnabledForDeployment { get; set; }
7272

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVault.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.KeyVault
2525
SupportsShouldProcess = true,
2626
ConfirmImpact = ConfirmImpact.High,
2727
HelpUri = Constants.KeyVaultHelpUri)]
28-
[OutputType(typeof(PSKeyVaultModels.Vault))]
28+
[OutputType(typeof(PSKeyVaultModels.PSVault))]
2929
public class RemoveAzureKeyVault : KeyVaultManagementCmdletBase
3030
{
3131
#region Input Parameter Definitions

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultAccessPolicy.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public class RemoveAzureKeyVaultAccessPolicy : KeyVaultManagementCmdletBase
6262
ValueFromPipelineByPropertyName = true,
6363
HelpMessage = "Specifies the service principal name of the application whose permissions you want to remove. Specify the application ID, also known as client ID, registered for the application in Azure Active Directory.")]
6464
[ValidateNotNullOrEmpty()]
65+
[Alias("SPN")]
6566
public string ServicePrincipalName { get; set; }
6667

6768
/// <summary>
@@ -72,6 +73,7 @@ public class RemoveAzureKeyVaultAccessPolicy : KeyVaultManagementCmdletBase
7273
ValueFromPipelineByPropertyName = true,
7374
HelpMessage = "Specifies the user principal name of the user whose access you want to remove.")]
7475
[ValidateNotNullOrEmpty()]
76+
[Alias("UPN")]
7577
public string UserPrincipalName { get; set; }
7678

7779
/// <summary>
@@ -89,7 +91,7 @@ public class RemoveAzureKeyVaultAccessPolicy : KeyVaultManagementCmdletBase
8991
/// </summary>
9092
[Parameter(Mandatory = false,
9193
ValueFromPipelineByPropertyName = true,
92-
HelpMessage = "If specified, the key vault will be disabled for deployment.")]
94+
HelpMessage = "If specified, disables the retrieval of secrets from this key vault by the Microsoft.Compute resource provider when referenced in resource creation.")]
9395
public SwitchParameter EnabledForDeployment { get; set; }
9496

9597
/// <summary>
@@ -107,7 +109,7 @@ public override void ExecuteCmdlet()
107109
ResourceGroupName = string.IsNullOrWhiteSpace(ResourceGroupName) ? GetResourceGroupName(VaultName) : ResourceGroupName;
108110

109111
// Get the vault to be updated
110-
PSKeyVaultModels.Vault existingVault = null;
112+
PSKeyVaultModels.PSVault existingVault = null;
111113

112114
if (!string.IsNullOrWhiteSpace(ResourceGroupName))
113115
existingVault = KeyVaultManagementClient.GetVault(

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultAccessPolicy.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
namespace Microsoft.Azure.Commands.KeyVault
2323
{
2424
[Cmdlet(VerbsCommon.Set, "AzureKeyVaultAccessPolicy", DefaultParameterSetName = ByObjectId, HelpUri = Constants.KeyVaultHelpUri)]
25-
[OutputType(typeof(PSKeyVaultModels.Vault))]
25+
[OutputType(typeof(PSKeyVaultModels.PSVault))]
2626
public class SetAzureKeyVaultAccessPolicy : KeyVaultManagementCmdletBase
2727
{
2828
#region Parameter Set Names
@@ -63,6 +63,7 @@ public class SetAzureKeyVaultAccessPolicy : KeyVaultManagementCmdletBase
6363
ValueFromPipelineByPropertyName = true,
6464
HelpMessage = "Specifies the service principal name of the application to which to grant permissions. Specify the application ID, also known as client ID, registered for the application in Azure Active Directory. The application with the service principal name that this parameter specifies must be registered in the Azure directory that contains your current subscription.")]
6565
[ValidateNotNullOrEmpty()]
66+
[Alias("SPN")]
6667
public string ServicePrincipalName { get; set; }
6768

6869
/// <summary>
@@ -73,6 +74,7 @@ public class SetAzureKeyVaultAccessPolicy : KeyVaultManagementCmdletBase
7374
ValueFromPipelineByPropertyName = true,
7475
HelpMessage = "Specifies the user principal name of the user to whom to grant permissions. This user principal name must exist in the directory associated with the current subscription.")]
7576
[ValidateNotNullOrEmpty()]
77+
[Alias("UPN")]
7678
public string UserPrincipalName { get; set; }
7779

7880
/// <summary>
@@ -124,19 +126,19 @@ public class SetAzureKeyVaultAccessPolicy : KeyVaultManagementCmdletBase
124126
[Parameter(Mandatory = false,
125127
ParameterSetName = ByObjectId,
126128
ValueFromPipelineByPropertyName = true,
127-
HelpMessage = "If specified, the key vault will be enabled for deployment.")]
129+
HelpMessage = "If specified, enables secrets to be retrieved from this key vault by the Microsoft.Compute resource provider when referenced in resource creation.")]
128130
[Parameter(Mandatory = false,
129131
ParameterSetName = ByServicePrincipalName,
130132
ValueFromPipelineByPropertyName = true,
131-
HelpMessage = "If specified, the key vault will be enabled for deployment.")]
133+
HelpMessage = "If specified, enables secrets to be retrieved from this key vault by the Microsoft.Compute resource provider when referenced in resource creation.")]
132134
[Parameter(Mandatory = false,
133135
ParameterSetName = ByUserPrincipalName,
134136
ValueFromPipelineByPropertyName = true,
135-
HelpMessage = "If specified, the key vault will be enabled for deployment.")]
137+
HelpMessage = "If specified, enables secrets to be retrieved from this key vault by the Microsoft.Compute resource provider when referenced in resource creation.")]
136138
[Parameter(Mandatory = true,
137139
ParameterSetName = "None",
138140
ValueFromPipelineByPropertyName = true,
139-
HelpMessage = "If specified, the key vault will be enabled for deployment.")]
141+
HelpMessage = "If specified, enables secrets to be retrieved from this key vault by the Microsoft.Compute resource provider when referenced in resource creation.")]
140142
public SwitchParameter EnabledForDeployment { get; set; }
141143

142144
[Parameter(Mandatory = false,
@@ -148,7 +150,7 @@ public class SetAzureKeyVaultAccessPolicy : KeyVaultManagementCmdletBase
148150
public override void ExecuteCmdlet()
149151
{
150152
ResourceGroupName = string.IsNullOrWhiteSpace(ResourceGroupName) ? GetResourceGroupName(VaultName) : ResourceGroupName;
151-
PSKeyVaultModels.Vault vault = null;
153+
PSKeyVaultModels.PSVault vault = null;
152154

153155
// Get the vault to be updated
154156
if (!string.IsNullOrWhiteSpace(ResourceGroupName))
@@ -161,7 +163,7 @@ public override void ExecuteCmdlet()
161163
}
162164

163165
// Update vault policies
164-
PSKeyVaultModels.VaultAccessPolicy[] updatedListOfAccessPolicies = vault.AccessPolicies;
166+
PSKeyVaultModels.PSVaultAccessPolicy[] updatedListOfAccessPolicies = vault.AccessPolicies;
165167
if (!string.IsNullOrEmpty(UserPrincipalName) || !string.IsNullOrEmpty(ServicePrincipalName) || (ObjectId != null && ObjectId != Guid.Empty))
166168
{
167169
Guid objId = GetObjectId(this.ObjectId, this.UserPrincipalName, this.ServicePrincipalName);
@@ -193,7 +195,7 @@ public override void ExecuteCmdlet()
193195
(existingPolicy != null && existingPolicy.PermissionsToSecrets != null ?
194196
existingPolicy.PermissionsToSecrets.ToArray() : null);
195197

196-
var policy = new PSKeyVaultModels.VaultAccessPolicy(vault.TenantId, objId, keys, secrets);
198+
var policy = new PSKeyVaultModels.PSVaultAccessPolicy(vault.TenantId, objId, keys, secrets);
197199

198200
//Remove old policies for this object ID and add a new one with the right permission arrays
199201
updatedListOfAccessPolicies = vault.AccessPolicies.Where(ap => ap.ObjectId != objId).Concat(new[] { policy }).ToArray();

‎src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultManagementCmdletBase.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public PSResourceManagerModels.ResourcesClient ResourcesClient
8484
set { this._resourcesClient = value; }
8585
}
8686

87-
protected List<PSKeyVaultModels.VaultIdentityItem> ListVaults(string resourceGroupName, Hashtable tag)
87+
protected List<PSKeyVaultModels.PSVaultIdentityItem> ListVaults(string resourceGroupName, Hashtable tag)
8888
{
8989
IResourceManagementClient armClient = this.ResourcesClient.ResourceManagementClient;
9090

@@ -105,18 +105,18 @@ public PSResourceManagerModels.ResourcesClient ResourcesClient
105105
TagValue = tagValuePair.Value
106106
});
107107

108-
List<PSKeyVaultModels.VaultIdentityItem> vaults = new List<PSKeyVaultModels.VaultIdentityItem>();
108+
List<PSKeyVaultModels.PSVaultIdentityItem> vaults = new List<PSKeyVaultModels.PSVaultIdentityItem>();
109109
if (listResult.Resources != null)
110110
{
111-
vaults.AddRange(listResult.Resources.Where(r => r.Type == KeyVaultManagementClient.VaultsResourceType).Select(r => new PSKeyVaultModels.VaultIdentityItem(r)));
111+
vaults.AddRange(listResult.Resources.Where(r => r.Type == KeyVaultManagementClient.VaultsResourceType).Select(r => new PSKeyVaultModels.PSVaultIdentityItem(r)));
112112
}
113113

114114
while (!string.IsNullOrEmpty(listResult.NextLink))
115115
{
116116
listResult = armClient.Resources.ListNext(listResult.NextLink);
117117
if (listResult.Resources != null)
118118
{
119-
vaults.AddRange(listResult.Resources.Select(r => new PSKeyVaultModels.VaultIdentityItem(r)));
119+
vaults.AddRange(listResult.Resources.Select(r => new PSKeyVaultModels.PSVaultIdentityItem(r)));
120120
}
121121
}
122122

‎src/ResourceManager/KeyVault/Commands.KeyVault/Models/ModelExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static class ModelExtensions
5757
// };
5858
//}
5959

60-
public static string ConstructAccessPoliciesTableAsTable(IEnumerable<PSModels.VaultAccessPolicy> policies)
60+
public static string ConstructAccessPoliciesTableAsTable(IEnumerable<PSModels.PSVaultAccessPolicy> policies)
6161
{
6262
StringBuilder sb = new StringBuilder();
6363

@@ -82,7 +82,7 @@ public static string ConstructAccessPoliciesTableAsTable(IEnumerable<PSModels.Va
8282
return sb.ToString();
8383
}
8484

85-
public static string ConstructAccessPoliciesList(IEnumerable<PSModels.VaultAccessPolicy> policies)
85+
public static string ConstructAccessPoliciesList(IEnumerable<PSModels.PSVaultAccessPolicy> policies)
8686
{
8787
StringBuilder sb = new StringBuilder();
8888

0 commit comments

Comments
 (0)