Merge pull request #8492 from maddieclayton/wildcard1

Add wildcard support to Compute

Author: Maddie Clayton

src/Accounts/Accounts/ChangeLog.md

@@ -20,6 +20,7 @@
 ## Upcoming Release
 * Update examples for Connect-AzAccount
 * Add additional framework extensions for .Net Framework execution
+* Update common packages to include new wildcard support functions
 
 ## Version 1.3.0
 * Update to latest version of ClientRuntime

src/Compute/Compute.Test/ScenarioTests/AvailabilitySetTests.ps1

@@ -40,6 +40,9 @@ function Test-AvailabilitySet
             $avsetname = $asetName + $i;
             New-AzAvailabilitySet -ResourceGroupName $rgname -Name $avsetname -Location $loc -PlatformUpdateDomainCount $nonDefaultUD -PlatformFaultDomainCount $nonDefaultFD -Sku 'Classic' -Tag @{"a"="b"};
         }
+        
+        $wildcardRgQuery = ($rgname -replace ".$") + "*"
+        $wildcardNameQuery = ($asetName -replace ".$") + "*"
 
         $asets = Get-AzAvailabilitySet;
         Assert-NotNull $asets;
@@ -48,6 +51,30 @@ function Test-AvailabilitySet
         $asets = Get-AzAvailabilitySet -ResourceGroupName $rgname;
         Assert-NotNull $asets;
         Assert-AreEqual $asetName $asets[0].Name;
+        
+        $asets = Get-AzAvailabilitySet -ResourceGroupName $wildcardRgQuery;
+        Assert-NotNull $asets;
+        Assert-AreEqual $asetName $asets[0].Name;
+        
+        $asets = Get-AzAvailabilitySet -Name $wildcardNameQuery;
+        Assert-NotNull $asets;
+        Assert-AreEqual $asetName $asets[0].Name;
+        
+        $asets = Get-AzAvailabilitySet -Name $asetName;
+        Assert-NotNull $asets;
+        Assert-AreEqual $asetName $asets[0].Name;
+        
+        $asets = Get-AzAvailabilitySet -ResourceGroupName $wildcardRgQuery -Name $asetName;
+        Assert-NotNull $asets;
+        Assert-AreEqual $asetName $asets[0].Name;
+        
+        $asets = Get-AzAvailabilitySet -ResourceGroupName $wildcardRgQuery -Name $wildcardNameQuery;
+        Assert-NotNull $asets;
+        Assert-AreEqual $asetName $asets[0].Name;
+        
+        $asets = Get-AzAvailabilitySet -ResourceGroupName $rgname -Name $wildcardNameQuery;
+        Assert-NotNull $asets;
+        Assert-AreEqual $asetName $asets[0].Name;
 
         $aset = Get-AzAvailabilitySet -ResourceGroupName $rgname -Name $asetName;
         Assert-NotNull $aset;

src/Compute/Compute.Test/ScenarioTests/ContainerServiceTests.ps1

@@ -24,7 +24,7 @@ function Test-ContainerService
     try
     {
         # Common
-        $loc = 'australiasoutheast';
+        $loc = 'eastus2';
         New-AzResourceGroup -Name $rgname -Location $loc -Force;
 
         $csName = 'cs' + $rgname;
@@ -51,15 +51,55 @@ function Test-ContainerService
         $result = $job | Wait-Job;
         Assert-AreEqual "Completed" $result.State;
         $container = $job | Receive-Job
-
+        
+        $wildcardRgQuery = ($rgname -replace ".$") + "*"
+        $wildcardNameQuery = ($csName -replace ".$") + "*"
+        
+        $cs = Get-AzContainerService
+        Assert-True { $cs.Count -ge 1 }
+        $output = $cs | Out-String;
+        Assert-False { $output.Contains("AgentPoolProfiles") };
+        
+        $cs = Get-AzContainerService -ResourceGroupName $rgname
+        Assert-AreEqual $rgname $cs.ResourceGroupName
+        $output = $cs | Out-String;
+        Assert-False { $output.Contains("AgentPoolProfiles") };
+        
+        $cs = Get-AzContainerService -ResourceGroupName $wildcardRgQuery
+        Assert-AreEqual $rgname $cs.ResourceGroupName
+        $output = $cs | Out-String;
+        Assert-False { $output.Contains("AgentPoolProfiles") };
+        
+        $cs = Get-AzContainerService -Name $csName;
+        Assert-AreEqual $rgname $cs.ResourceGroupName
+        $output = $cs | Out-String;
+        Assert-False { $output.Contains("AgentPoolProfiles") };
+        
+        $cs = Get-AzContainerService -Name $wildcardNameQuery;
+        Assert-AreEqual $rgname $cs.ResourceGroupName
+        $output = $cs | Out-String;
+        Assert-False { $output.Contains("AgentPoolProfiles") };
+        
+        $cs = Get-AzContainerService -ResourceGroupName $rgname -Name $wildcardNameQuery;
+        Assert-AreEqual $rgname $cs.ResourceGroupName
+        $output = $cs | Out-String;
+        Assert-False { $output.Contains("AgentPoolProfiles") };
+        
+        $cs = Get-AzContainerService -ResourceGroupName $wildcardRgQuery -Name $csName;
+        Assert-AreEqual $rgname $cs.ResourceGroupName
+        $output = $cs | Out-String;
+        Assert-False { $output.Contains("AgentPoolProfiles") };
+        
+        $cs = Get-AzContainerService -ResourceGroupName $wildcardRgQuery -Name $wildcardNameQuery;
+        Assert-AreEqual $rgname $cs.ResourceGroupName
+        $output = $cs | Out-String;
+        Assert-False { $output.Contains("AgentPoolProfiles") };
+        
         $cs = Get-AzContainerService -ResourceGroupName $rgname -Name $csName;
+        Assert-AreEqual $rgname $cs.ResourceGroupName
         $output = $cs | Out-String;
         Assert-True { $output.Contains("AgentPoolProfiles") };
 
-        $cslist = Get-AzContainerService -ResourceGroupName $rgname;
-        $output = $cslist | Out-String;
-        Assert-False { $output.Contains("AgentPoolProfiles") };
-
         $job = Remove-AzContainerService -ResourceGroupName $rgname -Name $csName -Force -AsJob;
         $result = $job | Wait-Job;
         Assert-AreEqual "Completed" $result.State;

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

@@ -66,6 +66,68 @@ function Test-Disk
         Assert-AreEqual "Completed" $result.State;
 
         # Get disk test
+        $wildcardRgQuery = ($rgname -replace ".$") + "*"
+        $wildcardNameQuery = ($diskname -replace ".$") + "*"
+        
+        $disk = Get-AzDisk
+        Assert-True { $disk.Count -ge 1 }
+        
+        $disk = Get-AzDisk -ResourceGroupName $rgname
+        Assert-AreEqual $null $disk.Zones;
+        Assert-AreEqual 5 $disk.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $disk.Sku.Name;
+        Assert-AreEqual Windows $disk.OsType;
+        Assert-AreEqual Empty $disk.CreationData.CreateOption;
+        Assert-AreEqual $false $disk.EncryptionSettings.Enabled;
+        
+        $disk = Get-AzDisk -ResourceGroupName $wildcardRgQuery
+        Assert-AreEqual $null $disk.Zones;
+        Assert-AreEqual 5 $disk.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $disk.Sku.Name;
+        Assert-AreEqual Windows $disk.OsType;
+        Assert-AreEqual Empty $disk.CreationData.CreateOption;
+        Assert-AreEqual $false $disk.EncryptionSettings.Enabled;
+        
+        $disk = Get-AzDisk -Name $diskname
+        Assert-AreEqual $null $disk.Zones;
+        Assert-AreEqual 5 $disk.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $disk.Sku.Name;
+        Assert-AreEqual Windows $disk.OsType;
+        Assert-AreEqual Empty $disk.CreationData.CreateOption;
+        Assert-AreEqual $false $disk.EncryptionSettings.Enabled;
+        
+        $disk = Get-AzDisk -Name $wildcardNameQuery
+        Assert-AreEqual $null $disk.Zones;
+        Assert-AreEqual 5 $disk.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $disk.Sku.Name;
+        Assert-AreEqual Windows $disk.OsType;
+        Assert-AreEqual Empty $disk.CreationData.CreateOption;
+        Assert-AreEqual $false $disk.EncryptionSettings.Enabled;
+        
+        $disk = Get-AzDisk -ResourceGroupName $wildcardRgQuery -Name $diskname
+        Assert-AreEqual $null $disk.Zones;
+        Assert-AreEqual 5 $disk.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $disk.Sku.Name;
+        Assert-AreEqual Windows $disk.OsType;
+        Assert-AreEqual Empty $disk.CreationData.CreateOption;
+        Assert-AreEqual $false $disk.EncryptionSettings.Enabled;
+        
+        $disk = Get-AzDisk -ResourceGroupName $wildcardRgQuery -Name $wildcardNameQuery
+        Assert-AreEqual $null $disk.Zones;
+        Assert-AreEqual 5 $disk.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $disk.Sku.Name;
+        Assert-AreEqual Windows $disk.OsType;
+        Assert-AreEqual Empty $disk.CreationData.CreateOption;
+        Assert-AreEqual $false $disk.EncryptionSettings.Enabled;
+        
+        $disk = Get-AzDisk -ResourceGroupName $rgname -Name $wildcardNameQuery
+        Assert-AreEqual $null $disk.Zones;
+        Assert-AreEqual 5 $disk.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $disk.Sku.Name;
+        Assert-AreEqual Windows $disk.OsType;
+        Assert-AreEqual Empty $disk.CreationData.CreateOption;
+        Assert-AreEqual $false $disk.EncryptionSettings.Enabled;
+        
         $disk = Get-AzDisk -ResourceGroupName $rgname -DiskName $diskname;
         Assert-AreEqual $null $disk.Zones;
         Assert-AreEqual 5 $disk.DiskSizeGB;
@@ -154,6 +216,61 @@ function Test-Snapshot
         Assert-AreEqual "Completed" $result.State;
 
         # Get snapshot test
+        $wildcardRgQuery = ($rgname -replace ".$") + "*"
+        $wildcardNameQuery = ($snapshotname -replace ".$") + "*"
+        
+        $snapshot = Get-AzSnapshot
+        Assert-True { $snapshot.Count -ge 1 }
+        
+        $snapshot = Get-AzSnapshot -ResourceGroupName $rgname
+        Assert-AreEqual 5 $snapshot.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $snapshot.Sku.Name;
+        Assert-AreEqual Windows $snapshot.OsType;
+        Assert-AreEqual Empty $snapshot.CreationData.CreateOption;
+        Assert-AreEqual $false $snapshot.EncryptionSettings.Enabled;
+        
+        $snapshot = Get-AzSnapshot -ResourceGroupName $wildcardRgQuery
+        Assert-AreEqual 5 $snapshot.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $snapshot.Sku.Name;
+        Assert-AreEqual Windows $snapshot.OsType;
+        Assert-AreEqual Empty $snapshot.CreationData.CreateOption;
+        Assert-AreEqual $false $snapshot.EncryptionSettings.Enabled;
+        
+        $snapshot = Get-AzSnapshot -SnapshotName $snapshotname;
+        Assert-AreEqual 5 $snapshot.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $snapshot.Sku.Name;
+        Assert-AreEqual Windows $snapshot.OsType;
+        Assert-AreEqual Empty $snapshot.CreationData.CreateOption;
+        Assert-AreEqual $false $snapshot.EncryptionSettings.Enabled;
+        
+        $snapshot = Get-AzSnapshot -SnapshotName $wildcardNameQuery;
+        Assert-AreEqual 5 $snapshot.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $snapshot.Sku.Name;
+        Assert-AreEqual Windows $snapshot.OsType;
+        Assert-AreEqual Empty $snapshot.CreationData.CreateOption;
+        Assert-AreEqual $false $snapshot.EncryptionSettings.Enabled;
+        
+        $snapshot = Get-AzSnapshot -ResourceGroupName $wildcardRgQuery -SnapshotName $wildcardNameQuery;
+        Assert-AreEqual 5 $snapshot.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $snapshot.Sku.Name;
+        Assert-AreEqual Windows $snapshot.OsType;
+        Assert-AreEqual Empty $snapshot.CreationData.CreateOption;
+        Assert-AreEqual $false $snapshot.EncryptionSettings.Enabled;
+        
+        $snapshot = Get-AzSnapshot -ResourceGroupName $wildcardRgQuery -SnapshotName $snapshotname;
+        Assert-AreEqual 5 $snapshot.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $snapshot.Sku.Name;
+        Assert-AreEqual Windows $snapshot.OsType;
+        Assert-AreEqual Empty $snapshot.CreationData.CreateOption;
+        Assert-AreEqual $false $snapshot.EncryptionSettings.Enabled;
+        
+        $snapshot = Get-AzSnapshot -ResourceGroupName $rgname -SnapshotName $wildcardNameQuery;
+        Assert-AreEqual 5 $snapshot.DiskSizeGB;
+        Assert-AreEqual "Standard_LRS" $snapshot.Sku.Name;
+        Assert-AreEqual Windows $snapshot.OsType;
+        Assert-AreEqual Empty $snapshot.CreationData.CreateOption;
+        Assert-AreEqual $false $snapshot.EncryptionSettings.Enabled;
+        
         $snapshot = Get-AzSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname;
         Assert-AreEqual 5 $snapshot.DiskSizeGB;
         Assert-AreEqual "Standard_LRS" $snapshot.Sku.Name;