Skip to content

Commit 4538b66

Browse files
author
Dragos Avadanei
committed
addressing PR feedback: renamed New-AKVMSAK to Update-AKVMSAK, Set-AKVMSAC to Add-AKVMSAC, test+help updates
1 parent b302a3e commit 4538b66

14 files changed

+75
-51
lines changed

‎src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ CmdletsToExport = 'Add-AzureKeyVaultCertificate',
102102
'New-AzureKeyVaultCertificateOrganizationDetails',
103103
'Backup-AzureKeyVaultSecret', 'Restore-AzureKeyVaultSecret',
104104
'Get-AzureKeyVaultManagedStorageAccount',
105-
'Set-AzureKeyVaultManagedStorageAccount',
105+
'Add-AzureKeyVaultManagedStorageAccount',
106106
'Remove-AzureKeyVaultManagedStorageAccount',
107107
'Update-AzureKeyVaultManagedStorageAccount',
108-
'New-AzureKeyVaultManagedStorageAccountKey',
108+
'Update-AzureKeyVaultManagedStorageAccountKey',
109109
'Get-AzureKeyVaultManagedStorageSasDefinition',
110110
'Set-AzureKeyVaultManagedStorageSasDefinition',
111111
'Remove-AzureKeyVaultManagedStorageSasDefinition'

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/VaultManagedStorageAccountTests.ps1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function Test_SetAzureKeyVaultManagedStorageAccountAndSasDefinition
7171
$storageAccountResourceId = Get-KeyVaultManagedStorageResourceId
7272

7373
# set key vault managed storage account
74-
$managedStorageAccount = Set-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -DisableAutoRegenerateKey
74+
$managedStorageAccount = Add-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -DisableAutoRegenerateKey
7575
Assert-NotNull $managedStorageAccount
7676

7777
$command = "Set-AzureKeyVaultManagedStorageSasDefinition -VaultName $($keyVault) -AccountName $($managedStorageAccountName) $($paramatersSubCommand)"
@@ -100,10 +100,10 @@ function Test_SetAzureKeyVaultManagedStorageAccountAndSasDefinitionPipeTest
100100
$storageAccountResourceId = Get-KeyVaultManagedStorageResourceId
101101

102102
# set key vault managed storage account
103-
$managedStorageAccount1 = Set-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName1 -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -DisableAutoRegenerateKey
103+
$managedStorageAccount1 = Add-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName1 -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -DisableAutoRegenerateKey
104104
Assert-NotNull $managedStorageAccount1
105105

106-
$managedStorageAccount2 = Get-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName1 | Set-AzureKeyVaultManagedStorageAccount -AccountName $managedStorageAccountName2
106+
$managedStorageAccount2 = Get-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName1 | Add-AzureKeyVaultManagedStorageAccount -AccountName $managedStorageAccountName2
107107
Assert-NotNull $managedStorageAccount2
108108

109109
$managedStorageSasDefinitionName1 = Get-ManagedStorageSasDefinitionName 'mngsas8'
@@ -142,9 +142,9 @@ function Test_SetAzureKeyVaultManagedStorageAccountAndSasDefinitionAttribute
142142
$storageAccountResourceId = Get-KeyVaultManagedStorageResourceId
143143

144144
# set key vault managed storage account
145-
$managedStorageAccount1 = Set-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName1 -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -DisableAutoRegenerateKey
145+
$managedStorageAccount1 = Add-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName1 -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -DisableAutoRegenerateKey
146146
Assert-NotNull $managedStorageAccount1
147-
$managedStorageAccount2 = Get-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName1 | Set-AzureKeyVaultManagedStorageAccount -AccountName $managedStorageAccountName2 -Tag @{"tag1"="value1";"tag2"="value2"} -Disable
147+
$managedStorageAccount2 = Get-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName1 | Add-AzureKeyVaultManagedStorageAccount -AccountName $managedStorageAccountName2 -Tag @{"tag1"="value1";"tag2"="value2"} -Disable
148148
Assert-NotNull $managedStorageAccount2
149149

150150
Assert-True { $managedStorageAccount1.Attributes.Enabled }
@@ -169,7 +169,7 @@ function Test_UpdateAzureKeyVaultManagedStorageAccount
169169
$storageAccountResourceId = Get-KeyVaultManagedStorageResourceId
170170

171171
# set key vault managed storage account
172-
$managedStorageAccount = Set-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -RegenerationPeriod ([System.Timespan]::FromDays(30))
172+
$managedStorageAccount = Add-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -RegenerationPeriod ([System.Timespan]::FromDays(30))
173173
Assert-NotNull $managedStorageAccount
174174

175175
$managedStorageAccountUpdate = Update-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName -ActiveKeyName 'key2' -Tag @{"tag3"="value3"} -PassThru
@@ -187,10 +187,10 @@ function Test_RegenerateAzureKeyVaultManagedStorageAccountAndSasDefinition
187187
$storageAccountResourceId = Get-KeyVaultManagedStorageResourceId
188188

189189
# set key vault managed storage account
190-
$managedStorageAccount = Set-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -RegenerationPeriod ([System.Timespan]::FromDays(30))
190+
$managedStorageAccount = Add-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -RegenerationPeriod ([System.Timespan]::FromDays(30))
191191
Assert-NotNull $managedStorageAccount
192192

193-
$managedStorageAccountUpdate = New-AzureKeyVaultManagedStorageAccountKey -VaultName $keyVault -AccountName $managedStorageAccountName -KeyName 'key2' -Force -Confirm:$false -PassThru
193+
$managedStorageAccountUpdate = Update-AzureKeyVaultManagedStorageAccountKey -VaultName $keyVault -AccountName $managedStorageAccountName -KeyName 'key2' -Force -Confirm:$false -PassThru
194194
Assert-NotNull $managedStorageAccountUpdate
195195

196196
Assert-True { $managedStorageAccountUpdate.ActiveKeyName.Equals("key2") }
@@ -202,11 +202,11 @@ function Test_ListKeyVaultAzureKeyVaultManagedStorageAccounts
202202
$managedStorageAccountName01 = Get-ManagedStorageAccountName 'listmngSt1'
203203
$storageAccountResourceId = Get-KeyVaultManagedStorageResourceId
204204

205-
$createdmanagedStorageAccountName01 = Set-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName01 -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -RegenerationPeriod ([System.Timespan]::FromDays(30))
205+
$createdmanagedStorageAccountName01 = Add-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName01 -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -RegenerationPeriod ([System.Timespan]::FromDays(30))
206206
Assert-NotNull $createdmanagedStorageAccountName01
207207

208208
$managedStorageAccountName02 = Get-ManagedStorageAccountName 'listmngSt2'
209-
$createdmanagedStorageAccountName02 = Set-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName02 -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -RegenerationPeriod ([System.Timespan]::FromDays(30))
209+
$createdmanagedStorageAccountName02 = Add-AzureKeyVaultManagedStorageAccount -VaultName $keyVault -AccountName $managedStorageAccountName02 -AccountResourceId $storageAccountResourceId -ActiveKeyName 'key1' -RegenerationPeriod ([System.Timespan]::FromDays(30))
210210
Assert-NotNull $createdmanagedStorageAccountName02
211211

212212
$managedStorageAccounts = Get-AzureKeyVaultManagedStorageAccount $keyVault

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/VaultUITests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function CreateAKVManagedStorageAccount(
2121
[string] $managedStorageAccountName)
2222
{
2323
$storageAccountResourceId = Get-KeyVaultManagedStorageResourceId
24-
$createdManagedStorageAccount = Set-AzureKeyVaultManagedStorageAccount $keyVault $managedStorageAccountName $storageAccountResourceId 'key1' -DisableAutoRegenerateKey
24+
$createdManagedStorageAccount = Add-AzureKeyVaultManagedStorageAccount $keyVault $managedStorageAccountName $storageAccountResourceId 'key1' -DisableAutoRegenerateKey
2525
return $createdManagedStorageAccount
2626
}
2727

@@ -31,7 +31,7 @@ function CreateAKVManagedStorageSasDefinition(
3131
[string] $managedStorageSasDefinitionName)
3232
{
3333
$storageAccountResourceId = Get-KeyVaultManagedStorageResourceId
34-
Set-AzureKeyVaultManagedStorageAccount $keyVault $managedStorageAccountName $storageAccountResourceId 'key1' -DisableAutoRegenerateKey
34+
Add-AzureKeyVaultManagedStorageAccount $keyVault $managedStorageAccountName $storageAccountResourceId 'key1' -DisableAutoRegenerateKey
3535
$createdManagedStorageSasDefinition = Set-AzureKeyVaultManagedStorageSasDefinition $keyVault $managedStorageAccountName $managedStorageSasDefinitionName -Parameter @{"sasType"="service";"serviceSasType"="blob";"signedResourceTypes"="b";"signedVersion"="2016-05-31";"signedProtocols"="https";"signedIp"="168.1.5.60-168.1.5.70";"validityPeriod"="P30D";"signedPermissions"="ra";"blobName"="blob1";"containerName"="container1";"rscd"="";"rscc"=""}
3636
return $createdManagedStorageSasDefinition
3737
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@
5656
<Compile Include="Commands\ManagedStorageAccounts\GetAzureKeyVaultManagedStorageAccount.cs" />
5757
<Compile Include="Commands\RestoreAzureKeyVaultSecret.cs" />
5858
<Compile Include="Commands\ManagedStorageAccounts\GetAzureKeyVaultManagedStorageSasDefinition.cs" />
59-
<Compile Include="Commands\ManagedStorageAccounts\NewAzureKeyVaultManagedStorageAccountKey.cs" />
59+
<Compile Include="Commands\ManagedStorageAccounts\UpdateAzureKeyVaultManagedStorageAccountKey.cs" />
6060
<Compile Include="Commands\ManagedStorageAccounts\RemoveAzureKeyVaultManagedStorageAccount.cs" />
6161
<Compile Include="Commands\ManagedStorageAccounts\RemoveAzureKeyVaultManagedStorageSasDefinition.cs" />
6262
<Compile Include="Commands\ManagedStorageAccounts\SasDefinitionParameterConstants.cs" />
63-
<Compile Include="Commands\ManagedStorageAccounts\SetAzureKeyVaultManagedStorageAccount.cs" />
63+
<Compile Include="Commands\ManagedStorageAccounts\AddAzureKeyVaultManagedStorageAccount.cs" />
6464
<Compile Include="Commands\ManagedStorageAccounts\UpdateAzureKeyVaultManagedStorageAccount.cs" />
6565
<Compile Include="Commands\ManagedStorageAccounts\SetAzureKeyVaultManagedStorageSasDefinition.Account.cs" />
6666
<Compile Include="Commands\ManagedStorageAccounts\SetAzureKeyVaultManagedStorageSasDefinition.cs" />

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/ManagedStorageAccounts/SetAzureKeyVaultManagedStorageAccount.cs renamed to ‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/ManagedStorageAccounts/AddAzureKeyVaultManagedStorageAccount.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
namespace Microsoft.Azure.Commands.KeyVault
2121
{
22-
[Cmdlet( VerbsCommon.Set, CmdletNoun.AzureKeyVaultManagedStorageAccount,
22+
[Cmdlet( VerbsCommon.Add, CmdletNoun.AzureKeyVaultManagedStorageAccount,
2323
SupportsShouldProcess = true,
2424
HelpUri = Constants.KeyVaultHelpUri)]
2525
[OutputType(typeof(ManagedStorageAccount))]
26-
public class SetAzureKeyVaultManagedStorageAccount : KeyVaultCmdletBase
26+
public class AddAzureKeyVaultManagedStorageAccount : KeyVaultCmdletBase
2727
{
2828
#region Input Parameter Definitions
2929
[Parameter(Mandatory = true,
@@ -82,7 +82,7 @@ public class SetAzureKeyVaultManagedStorageAccount : KeyVaultCmdletBase
8282

8383
public override void ExecuteCmdlet()
8484
{
85-
if ( ShouldProcess( AccountName, Properties.Resources.SetManagedStorageAccount ) )
85+
if ( ShouldProcess( AccountName, Properties.Resources.AddManagedStorageAccount ) )
8686
{
8787
var managedStorageAccount = DataServiceClient.SetManagedStorageAccount(
8888
VaultName,

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/ManagedStorageAccounts/RemoveAzureKeyVaultManagedStorageAccount.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.KeyVault
2121
{
2222
[Cmdlet( VerbsCommon.Remove, CmdletNoun.AzureKeyVaultManagedStorageAccount,
2323
SupportsShouldProcess = true,
24-
ConfirmImpact = ConfirmImpact.High,
24+
ConfirmImpact = ConfirmImpact.Medium,
2525
HelpUri = Constants.KeyVaultHelpUri )]
2626
[OutputType( typeof( ManagedStorageAccount ) )]
2727
public class RemoveAzureKeyVaultManagedStorageAccount : KeyVaultCmdletBase

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/ManagedStorageAccounts/RemoveAzureKeyVaultManagedStorageSasDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.KeyVault
2121
{
2222
[Cmdlet( VerbsCommon.Remove, CmdletNoun.AzureKeyVaultManagedStorageSasDefinition,
2323
SupportsShouldProcess = true,
24-
ConfirmImpact = ConfirmImpact.High,
24+
ConfirmImpact = ConfirmImpact.Medium,
2525
HelpUri = Constants.KeyVaultHelpUri )]
2626
[OutputType( typeof( ManagedStorageSasDefinition ) )]
2727
public class RemoveAzureKeyVaultSasDefinition : KeyVaultCmdletBase

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/ManagedStorageAccounts/SetAzureKeyVaultManagedStorageSasDefinition.Service.Share.File.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public partial class SetAzureKeyVaultManagedStorageSasDefinition
3030
private const string ParameterSetStoredPolicyServiceFileSas = "StoredPolicyServiceFileSas";
3131

3232
private const string PathHelpMessage = "Path to the cloud file to generate sas token against.";
33+
3334
[Parameter( Mandatory = true, HelpMessage = PathHelpMessage, ParameterSetName = ParameterSetAdhocServiceFileSas )]
3435
[Parameter( Mandatory = true, HelpMessage = PathHelpMessage, ParameterSetName = ParameterSetStoredPolicyServiceFileSas )]
35-
3636
[ValidateNotNullOrEmpty]
3737
public string Path { get; set; }
3838

@@ -41,6 +41,7 @@ private KeyValuePair<string, string>? PathParameter
4141
get
4242
{
4343
if ( string.IsNullOrWhiteSpace( Path ) ) return null;
44+
4445
return new KeyValuePair<string, string>( SasDefinitionParameterConstants.PathName, Path );
4546
}
4647
}

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/ManagedStorageAccounts/NewAzureKeyVaultManagedStorageAccountKey.cs renamed to ‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/ManagedStorageAccounts/UpdateAzureKeyVaultManagedStorageAccountKey.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
namespace Microsoft.Azure.Commands.KeyVault
2121
{
22-
[Cmdlet( VerbsCommon.New, CmdletNoun.AzureKeyVaultManagedStorageAccountKey,
22+
[Cmdlet( VerbsData.Update, CmdletNoun.AzureKeyVaultManagedStorageAccountKey,
2323
SupportsShouldProcess = true,
24-
ConfirmImpact = ConfirmImpact.High,
24+
ConfirmImpact = ConfirmImpact.High,
2525
HelpUri = Constants.KeyVaultHelpUri )]
2626
[OutputType( typeof( ManagedStorageAccount ) )]
27-
public class NewAzureKeyVaultManagedStorageAccountKey : KeyVaultCmdletBase
27+
public class UpdateAzureKeyVaultManagedStorageAccountKey : KeyVaultCmdletBase
2828
{
2929
#region Input Parameter Definitions
3030
[Parameter( Mandatory = true,
@@ -55,7 +55,7 @@ public class NewAzureKeyVaultManagedStorageAccountKey : KeyVaultCmdletBase
5555
[Parameter( Mandatory = false, HelpMessage = "Do not ask for confirmation." )]
5656
public SwitchParameter Force { get; set; }
5757

58-
[Parameter( Mandatory = false,
58+
[ Parameter( Mandatory = false,
5959
HelpMessage = "Cmdlet does not return an object by default. If this switch is specified, cmdlet returns the managed storage account." )]
6060
public SwitchParameter PassThru { get; set; }
6161

‎src/ResourceManager/KeyVault/Commands.KeyVault/Properties/Resources.Designer.cs

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)