DiskRP PS support for DiskRP version 2020-06-30. (#13235)

* updating project version values to 39.0.0

* New-AzDiskConfig cmdlet with new parameters Tier and Sectorsize  (#13191)

* in progress commit. Still investigating

* dev and some testing and project version updates that are likely no longer needed

* diskconfig test

* changelog, help doc for new-azdiskconfig

* New-AzDiskUpdateConfig added parameters Tier, diskIOPSReadOnly, and diskMBpsReadOnly (#13218)

* dev work for New-AzDiskUpdateConfig

* New-AzDiskUpdateConfig test and New-AzDiskConfig changes for tests.
Help doc and changelog.

* recorded test file

* cleanup new-azdiskconfig for merge

* trying to undo new-azdiskconfig changes

* additional cleanup

* commit to re run CI tests

* removing unneeded update

* new cmdlet Get-AzDiskEncryptionSetAssociatedResource (#13212)

* update 1

* help doc, first draft test

* debugging test

* Final draft

* making cmd name not plural

name was plural in the header of the markdown file, seemed to cause CI failures on Generate Help.

* removing 'online version: ' from the top

see if it allows CI checks to pass.

* empty update to rerun ci checks 

ci rerun button is not working.

* Update Get-AzDiskEncryptionSetAssociatedResource.md

Co-authored-by: Adam Sandor <[email protected]>

* new-azdiskupdateconfig dev, test, changelog, help doc (#13232)

* removing extra logical sector size assignment

Co-authored-by: Theodore Chang <[email protected]>

Author: Sandido

src/Compute/Compute.Test/Compute.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="38.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="39.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
   </ItemGroup>

src/Compute/Compute.Test/ScenarioTests/DiskRPTests.cs

@@ -93,6 +93,19 @@ public void TestSnapshotConfigDiskAccessNetworkPolicy()
         {
             TestRunner.RunTestScript("Test-SnapshotConfigDiskAccessNetworkPolicy");
         }
-
+        
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestDiskConfigTierSectorSizeReadOnly()
+        {
+            TestRunner.RunTestScript("Test-DiskConfigTierSectorSizeReadOnly");
+        }
+        
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetDiskEncryptionSetAssociatedResource()
+        {
+            TestRunner.RunTestScript("Test-GetDiskEncryptionSetAssociatedResource");
+        }
     }
 }

src/Compute/Compute.Test/ScenarioTests/DiskRPTests.ps1

@@ -1168,3 +1168,172 @@ function Test-SnapshotConfigDiskAccessNetworkPolicy
         Clean-ResourceGroup $rgname
     }
 }
+
+<#
+.SYNOPSIS
+Testing the Get-DiskEncryptionSetAssociatedResources cmdlet. 
+Creates a DiskEncyptionSet object, 
+then associates a disk to it. 
+Check with the cmdlet,
+add another disk associated to the encryptionset,
+then check with the cmdlet again.
+#>
+function Test-GetDiskEncryptionSetAssociatedResource
+{
+    # Setup
+    $loc = 'eastus';
+    $rgname = 'EncSetAssociTest';
+    $iteration = '4'
+    $vaultName = 'kv'+ $iteration + $rgname ;
+
+    
+    try
+    {
+        # Create keyvault 
+
+        <#
+        # Note: In order to record this test, you need to run the following commands to create KeyValut key and KeyVault secret in a separate Powershell window.
+
+        $kekName = 'key' + $iteration + $rgname;
+        $secretname = 'mysecret00';
+        $secretdata = 'mysecretvalue00';
+        $securestring = ConvertTo-SecureString $secretdata -Force -AsPlainText;
+
+        New-AzResourceGroup -Name $rgname -Location $loc -Force;
+        $vault = New-AzKeyVault -VaultName $vaultName -ResourceGroupName $rgname -Location $loc -Sku Standard -EnablePurgeProtection;
+        $mocksourcevault = $vault.ResourceId;
+        Set-AzKeyVaultAccessPolicy -VaultName $vaultName -ResourceGroupName $rgname -EnabledForDiskEncryption;
+        $kek = Add-AzKeyVaultKey -VaultName $vaultName -Name $kekName -Destination "Software";
+        $secret = Set-AzKeyVaultSecret -VaultName $vaultName -Name $secretname -SecretValue $securestring;
+        $mockkey = $kek.Id
+
+        $sub = Get-AzContext;
+        $subId = $sub.Subscription.id;
+        $mocksourcevault = '/subscriptions/' + $subId + '/resourceGroups/' + $rgname + '/providers/Microsoft.KeyVault/vaults/' + $vaultName;
+
+        # Create DiskEncyptionSet
+        $diskEncryptionSetConfig = New-AzDiskEncryptionSetConfig -Location $loc -KeyUrl $mockkey -SourceVaultId $mocksourcevault -IdentityType "SystemAssigned" 
+        $diskEncryptionSetName = "encryptionSet0" + $iteration;
+        $diskEncryptionSet = New-AzDiskEncryptionSet -ResourceGroupName $rgname -Name $diskEncryptionSetName -inputobject $diskEncryptionSetConfig
+
+        # set access policy for diskencryptionset in keyvault
+        $access = @("get", "wrapkey", "unwrapkey")
+        Set-AzKeyVaultAccessPolicy -vaultname $vaultName -objectId $diskEncryptionSet.Identity.PrincipalId -PermissionsToKeys $access
+
+        #>
+
+        $diskEncryptionSetName = "encryptionSet0" + $iteration;
+        $diskEncryptionSet = Get-AzDiskEncryptionSet -ResourceGroupName $rgname -Name $diskEncryptionSetName;
+        
+        # Create a disk and associate it with EncryptionSet
+        $diskconfig00 = New-AzDiskConfig -Location $loc -Zone "1" -DiskSizeGB 1 -AccountType "Standard_LRS" -OsType "Windows" -CreateOption "Empty" -HyperVGeneration "V1" -diskencryptionsetid $diskEncryptionSet.id -EncryptionType 'EncryptionAtRestWithCustomerKey';
+        $disk00Name = "disk00" + $iteration
+        $disk00 = New-AzDisk -ResourceGroupName $rgname -DiskName $disk00Name -Disk $diskconfig00
+
+        # check association
+        $res = get-AzDiskEncryptionSetAssociatedResource -resourceGroupName $rgname -diskEncryptionSetName $diskEncryptionSetName;
+        Assert-NotNull $res
+        Assert-True { $res.count -eq 1}
+        Assert-AreEqual $res[0] $disk00.id
+
+        # create another disk without disk encryption set association
+        $diskconfig01 = New-AzDiskConfig -Location $loc -Zone "1" -DiskSizeGB 1 -AccountType "Standard_LRS" -OsType "Windows" -CreateOption "Empty" -HyperVGeneration "V1";
+        $disk01Name = "disk01" + $iteration
+        $disk01 = New-AzDisk -ResourceGroupName $rgname -DiskName $disk01Name -Disk $diskconfig01
+
+        # check association (count still 1)
+        $res = get-AzDiskEncryptionSetAssociatedResource -resourceGroupName $rgname -diskEncryptionSetName $diskEncryptionSetName;
+        Assert-True {$res.count -eq 1}
+
+        # Update disk to associate with encryptionset
+        $diskUpdatedConfig = New-AzDiskUpdateConfig -EncryptionType 'EncryptionAtRestWithCustomerKey' -DiskEncryptionSetId $diskEncryptionSet.Id
+        Update-AzDisk -ResourceGroupName $rgname -DiskName $disk01Name -DiskUpdate $diskUpdatedConfig
+
+        # check association (count = 2)
+        $res = get-AzDiskEncryptionSetAssociatedResource -resourceGroupName $rgname -diskEncryptionSetName $diskEncryptionSetName;
+        Assert-True {$res.count -eq 2}
+    }
+    finally
+    {
+        # Cleanup
+        # Clean-ResourceGroup $rgname
+        Remove-AzDisk -ResourceGroupName $rgName -DiskName $disk00Name -Force
+        Remove-AzDisk -ResourceGroupName $rgName -DiskName $disk01Name -Force
+    }
+}
+
+<#
+.SYNOPSIS
+Testing the new parameters 
+Tier
+LogicalSectorSize 
+in the New-AzDiskConfig cmdlet.
+
+Testing the new parameters 
+Tier 
+MaxSharesCount
+DiskIOPSReadOnly
+DiskMBpsReadOnly
+in the New-AzDiskUpdateConfig cmdlet. 
+#>
+function Test-DiskConfigTierSectorSizeReadOnly
+{
+
+        # Setup 
+        $rgname = Get-ComputeTestResourceName;
+        $loc = "eastus2euap";
+
+        try
+        {
+            New-AzResourceGroup -Name $rgname -Location $loc -Force;
+            $diskNameTier = "datadisktier";
+            $diskNameSector = "datadisksector";
+            $tier3 = "P3";
+            $tier40 = "P40";
+            $tier30 = "P30";
+            $sectorSize = 512;
+            $IoPS1 = 100;
+            $IoPS2 = 120;
+            $MbPS1 = 3;
+            $MbPS2 = 20;
+            $maxShares1 = 2;
+            $maxShares2 = 3;
+            
+
+            $diskTier = New-AzDiskConfig -Location $loc -DiskSizeGB 1024 `
+                -SkuName Premium_LRS -OsType Windows -CreateOption Empty -Tier $tier30 -MaxSharesCount $maxShares1 `
+                | New-AzDisk -ResourceGroupName $rgname -DiskName $diskNameTier;
+
+            Assert-AreEqual $tier30 $diskTier.Tier; 
+            Assert-AreEqual $maxShares1 $diskTier.MaxShares;
+
+            $diskSector = New-AzDiskConfig -Location $loc -DiskSizeGB 5 `
+                -SkuName UltraSSD_LRS -OsType Windows -CreateOption Empty -LogicalSectorSize $sectorSize -DiskIOPSReadOnly $IoPS1 -DiskMBpsReadOnly $MbPS1 `
+                | New-AzDisk -ResourceGroupName $rgname -DiskName $diskNameSector;
+
+            Assert-AreEqual $diskSector.CreationData.LogicalSectorSize $sectorSize; 
+
+            # New-AzDiskUpdateConfig
+            # Tier and MaxShares
+            $diskUpdateTierConfig = New-AzDiskUpdateConfig -Tier $tier40 -MaxSharesCount $maxShares2;
+            $diskUp = Update-AzDisk -ResourceGroupName $rgname -DiskName $diskNameTier -DiskUpdate $diskUpdateTierConfig;
+
+            $diskUpdated = Get-AzDisk -ResourceGroupName $rgname -DiskName $diskNameTier;
+
+            Assert-AreEqual $tier40 $diskUpdated.Tier; 
+            Assert-AreEqual $maxShares2 $diskUpdated.MaxShares; 
+
+            # DiskIOPSReadOnly and DiskMBpsReadOnly
+            $diskUpdateReadOnlyConfig = New-AzDiskUpdateConfig -DiskIOPSReadOnly $IoPS2 -DiskMBpsReadOnly $MbPS2;
+            $diskUp = Update-AzDisk -ResourceGroupName $rgname -DiskName $diskNameSector -DiskUpdate $diskUpdateReadOnlyConfig;
+
+            $diskUpdated = Get-AzDisk -ResourceGroupName $rgname -DiskName $diskNameSector;
+            Assert-AreEqual $IoPS2 $diskUpdated.DiskIOPSReadOnly; 
+            Assert-AreEqual $MbPS2 $diskUpdated.DiskMBpsReadOnly; 
+		}
+        finally 
+        {
+            # Cleanup
+            Clean-ResourceGroup $rgname
+		}
+}