Skip to content

Commit 8abfd3c

Browse files
authored
Make TrustedLaunch default in for VM and VMSS creation (#22974)
* dev and test * vmss dev and test * initial disk play * disk defaulting dev and test * test play for new vm managed disk scenario * tl disk testing trying * clean * disk clean test good * vm rerecorded tests raw success * clean * test * trying managed disk vm scenario, vmss stuff too * stuff * vmss and vm tests * 2 rerecorded tests * tests so far * fixing most tests, enabling stnd * all compute tests fixed i think * compute tests mostly fixed * clean * recovery services tests * examples and disk standard parts and recoveryservices test fix * changelog * guestattestation removal * removed disableintegritymonitoring parameter * changelog clean * Update BreakingChangeIssues.csv trying to resolve breaking change error with suppression * Update BreakingChangeIssues.csv * example fix * added back in guest attestation logic * Update BreakingChangeIssues.csv undo this * put back guest attestation, fixed tests for that. * Update VirtualMachineScaleSetCreateOrUpdateMethod.cs * Update New-AzVM.md * Update New-AzVmss.md * rerecord tests * fix ssh test * vm test cleanup * cleanups and error safety * simplify based on comments. Match VM images with vmss images * cleanup mostly
1 parent 3d4fb23 commit 8abfd3c

File tree

85 files changed

+63535
-57858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+63535
-57858
lines changed

src/Compute/Compute.Test/ScenarioTests/AEMExtensionTests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,8 @@ function Create-AdvancedVM($rgname, $vmname, $loc, $vmsize, $stotype, $nicCount,
12781278
{
12791279
$zoneparams.Add("Zone", $zone)
12801280
}
1281-
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize @zoneparams;
1281+
$stnd = "Standard";
1282+
$p = New-AzVMConfig -SecurityType $stnd -VMName $vmname -VMSize $vmsize @zoneparams;
12821283
$nul = Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
12831284

12841285
Write-Verbose "Start Create-AdvancedVM - Config done"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ function Test-AvailabilitySetVM
149149
# VM Profile & Hardware
150150
$vmsize = 'Standard_DS1_v2';
151151
$vmname = 'vm' + $rgname;
152-
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -AvailabilitySetId $aset.Id;
152+
$stnd = "Standard";
153+
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -SecurityType $stnd -AvailabilitySetId $aset.Id;
153154
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
154155

155156
# NRP

src/Compute/Compute.Test/ScenarioTests/AvailabilityZoneTests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ function Test-VirtualMachineZone
5959
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
6060
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
6161
$computerName = 'test';
62+
$stnd = "Standard";
6263

63-
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -Zone "1" `
64+
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -Zone "1" -SecurityType $stnd `
6465
| Add-AzVMNetworkInterface -Id $nicId -Primary `
6566
| Set-AzVMOperatingSystem -Windows -ComputerName $computerName -Credential $cred;
6667

src/Compute/Compute.Test/ScenarioTests/ChefExtensionTests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ function Test-SetChefExtensionBasic
3535
# VM Profile & Hardware
3636
$vmsize = 'Standard_A2';
3737
$vmname = 'vm' + $rgname;
38-
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize;
38+
$stnd = "Standard";
39+
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -SecurityType $stnd;
3940
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
4041

4142
# NRP

src/Compute/Compute.Test/ScenarioTests/ComputeTestCommon.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ function Create-VirtualMachine
161161

162162
# VM Profile & Hardware
163163
$vmsize = 'Standard_A2';
164-
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize;
164+
$stnd = "Standard";
165+
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -SecurityType $stnd;
165166
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
166167

167168
# NRP
@@ -267,7 +268,8 @@ function Create-VirtualMachineNoDataDisks
267268

268269
# VM Profile & Hardware
269270
$vmsize = 'Standard_D2S_V3';
270-
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize;
271+
$stnd = "Standard";
272+
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -SecurityType $stnd;
271273
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
272274

273275
# NRP

src/Compute/Compute.Test/ScenarioTests/DedicatedHostTests.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,15 @@ function Test-DedicatedHostVirtualMachine
148148
# VM Profile & Hardware
149149
$vmsize = 'Standard_E2s_v3';
150150
$vmname0 = 'v' + $rgname;
151+
$stnd = "Standard";
151152

152153
# Creating a VM using simple parameter set
153154
$username = "admin01"
154155
$password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
155156
$cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
156157
[string]$domainNameLabel = "$vmname0-$vmname0".tolower();
157158

158-
New-AzVM -ResourceGroupName $rgname -Name $vmname0 -Credential $cred -Zone "2" -Size $vmsize -HostId $dedicatedHostId -DomainNameLabel $domainNameLabel;
159+
New-AzVM -ResourceGroupName $rgname -Name $vmname0 -Credential $cred -Zone "2" -Size $vmsize -HostId $dedicatedHostId -DomainNameLabel $domainNameLabel -SecurityType $stnd;
159160
$vm0 = Get-AzVM -ResourceGroupName $rgname -Name $vmname0;
160161
Assert-AreEqual $dedicatedHostId $vm0.Host.Id;
161162

@@ -177,7 +178,7 @@ function Test-DedicatedHostVirtualMachine
177178
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
178179
$computerName = 'test';
179180

180-
$p = New-AzVMConfig -VMName $vmname1 -VMSize $vmsize -Zone "2" -HostId $dedicatedHostId `
181+
$p = New-AzVMConfig -VMName $vmname1 -VMSize $vmsize -Zone "2" -HostId $dedicatedHostId -SecurityType $stnd `
181182
| Add-AzVMNetworkInterface -Id $nicId -Primary `
182183
| Set-AzVMOperatingSystem -Windows -ComputerName $computerName -Credential $cred;
183184

src/Compute/Compute.Test/ScenarioTests/DiagnosticsExtensionTests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ function Test-VmssDiagnosticsExtension
238238

239239
$adminUsername = 'Foo12';
240240
$adminPassword = Get-PasswordForVM;
241+
$stnd = "Standard";
241242

242243
$imgRef = Get-DefaultCRPImage -loc $loc;
243244
$vhdContainer = "https://" + $stoname + ".blob.core.windows.net/" + $vmssName;
@@ -252,7 +253,7 @@ function Test-VmssDiagnosticsExtension
252253
New-AzStorageAccount -ResourceGroupName $rgname -Name $storagename -Location $loc -Type $storagetype;
253254

254255
$ipCfg = New-AzVmssIPConfig -Name 'test' -SubnetId $subnetId;
255-
$vmss = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A1_v2' -UpgradePolicyMode 'automatic' -NetworkInterfaceConfiguration $netCfg `
256+
$vmss = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A1_v2' -UpgradePolicyMode 'automatic' -NetworkInterfaceConfiguration $netCfg -SecurityType $stnd `
256257
| Add-AzVmssNetworkInterfaceConfiguration -Name 'test' -Primary $true -IPConfiguration $ipCfg `
257258
| Set-AzVmssOSProfile -ComputerNamePrefix 'test' -AdminUsername $adminUsername -AdminPassword $adminPassword `
258259
| Set-AzVmssStorageProfile -Name 'test' -OsDiskCreateOption 'FromImage' -OsDiskCaching 'None' `

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,12 @@ public void TestSecurityProfileStandard()
170170
{
171171
TestRunner.RunTestScript("Test-SecurityProfileStandard");
172172
}
173+
174+
[Fact]
175+
[Trait(Category.AcceptanceType, Category.LiveOnly)]
176+
public void TestNewDiskSecurityTypeDefaulting()
177+
{
178+
TestRunner.RunTestScript("Test-NewDiskSecurityTypeDefaulting");
179+
}
173180
}
174181
}

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,4 +1700,39 @@ function Test-DiskAcceleratedNetworkAndPublicNetworkAccess
17001700
# Cleanup
17011701
Clean-ResourceGroup $rgname;
17021702
}
1703+
}
1704+
1705+
<#
1706+
.SYNOPSIS
1707+
Disk creation defaults to TL when being created from an Image that is HyperVGeneration V2.
1708+
Feature request 1248
1709+
#>
1710+
function Test-NewDiskSecurityTypeDefaulting
1711+
{
1712+
$rgname = Get-ComputeTestResourceName;
1713+
$loc = 'eastus2';
1714+
1715+
try
1716+
{
1717+
New-AzResourceGroup -Name $rgname -Location $loc -Force;
1718+
1719+
$diskname = "d" + $rgname;
1720+
$securityTypeTL = "TrustedLaunch";
1721+
$hyperVGen2 = "V2";
1722+
1723+
$image = Get-AzVMImage -Skus 2022-datacenter-azure-edition -Offer WindowsServer -PublisherName MicrosoftWindowsServer -Location $loc -Version latest;
1724+
$diskconfig = New-AzDiskConfig -DiskSizeGB 127 -AccountType Premium_LRS -OsType Windows -CreateOption FromImage -Location $loc;
1725+
1726+
$diskconfig = Set-AzDiskImageReference -Disk $diskconfig -Id $image.Id;
1727+
1728+
$disk = New-AzDisk -ResourceGroupName $rgname -DiskName $diskname -Disk $diskconfig;
1729+
Assert-AreEqual $disk.SecurityProfile.securityType $securityTypeTL;
1730+
Assert-AreEqual $disk.HyperVGeneration $hyperVGen2;
1731+
1732+
}
1733+
finally
1734+
{
1735+
# Cleanup
1736+
Clean-ResourceGroup $rgname;
1737+
}
17031738
}

src/Compute/Compute.Test/ScenarioTests/DscExtensionTests.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ function Test-GetAzureRmVMDscExtension
2020
# VM Profile & Hardware
2121
$vmsize = 'Standard_A2';
2222
$vmname = 'vm' + $rgname;
23-
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize;
23+
$stnd = "Standard";
24+
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -SecurityType $stnd;
2425
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
2526

2627
# NRP
@@ -116,6 +117,7 @@ function Test-DSCExtensionVMPiping
116117
$vmsize = 'Standard_E2s_v3';
117118
$vmname = 'v' + $rgname;
118119
$domainNameLabel1 = "domain1" + $rgname;
120+
$stnd = "Standard";
119121

120122
# Common
121123
New-AzResourceGroup -Name $rgname -Location $loc -Force;
@@ -124,7 +126,7 @@ function Test-DSCExtensionVMPiping
124126
$password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force;
125127
$cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password;
126128

127-
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize;
129+
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -SecurityType $stnd;
128130

129131
# NRP
130132
$subnet = New-AzVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";

0 commit comments

Comments
 (0)