Skip to content
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

Jump to bottom

[Storage] Fix issue 14769 #14806

Merged
merged 2 commits into from
Apr 22, 2021
Merged

[Storage] Fix issue 14769 #14806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
667def1
[Storage] Fix issue 14769
blueww Apr 22, 2021
344e261
Merge branch 'master' into 14769
blueww Apr 22, 2021
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
2 changes: 2 additions & 0 deletions src/Storage/Storage.Management/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
- `New-AzStorageAccount`
* Fixed an issue that delete immutable blob will prompt incorrect message.
- `Remove-AzStorageAccount`
* Allowed update Storage Account KeyVault properties by cleanup Keyversion to enable key auto rotation [#14769]
- `Set-AzStorageAccount`
* Added breaking change warning message for upcoming cmdlet breaking change
- `Remove-AzRmStorageShare`

Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Storage.Management/StorageAccount/SetAzureStorageAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public SwitchParameter KeyvaultEncryption
[Parameter(HelpMessage = "Storage Account encryption keySource KeyVault KeyVersion",
Mandatory = false,
ParameterSetName = KeyvaultEncryptionParameterSet)]
[ValidateNotNullOrEmpty]
[ValidateNotNull]
public string KeyVersion { get; set; }

[Parameter(HelpMessage = "Storage Account encryption keySource KeyVault KeyVaultUri",
Expand Down
5 changes: 5 additions & 0 deletions src/Storage/Storage.Management/help/Set-AzStorageAccount.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,15 @@ PS C:\>$keyVault = New-AzKeyVault -VaultName "MyKeyVault" -ResourceGroupName "My
PS C:\>$key = Add-AzKeyVaultKey -VaultName "MyKeyVault" -Name "MyKey" -Destination 'Software'
PS C:\>Set-AzKeyVaultAccessPolicy -VaultName "MyKeyVault" -ObjectId $account.Identity.PrincipalId -PermissionsToKeys wrapkey,unwrapkey,get

# In case to enable key auto rotation, don't set KeyVersion
PS C:\>Set-AzStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "mystorageaccount" -KeyvaultEncryption -KeyName $key.Name -KeyVersion $key.Version -KeyVaultUri $keyVault.VaultUri

# In case to enable key auto rotation after set keyvault proeprites with KeyVersion, can update account by set KeyVersion to empty
PS C:\>Set-AzStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "mystorageaccount" -KeyvaultEncryption -KeyName $key.Name -KeyVersion "" -KeyVaultUri $keyVault.VaultUri
```

This command set Encryption KeySource with a new created Keyvault.
If want to enable key auto rotation, don't set keyversion when set Keyvault properties for the first time, or clean up it by set keyvault properties again with keyversion as empty.

### Example 6: Set Encryption KeySource to "Microsoft.Storage"
```
Expand Down