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

r/azurerm_linux|windows_virtual_machine_scale_set - updating do_not_run_extensions_on_overprovisioned_machines #6917

Merged
merged 2 commits into from May 14, 2020
Merged

r/azurerm_linux|windows_virtual_machine_scale_set - updating do_not_run_extensions_on_overprovisioned_machines #6917

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
fccba04
Fix #6830
ArcturusZhang May 12, 2020
215526d
Fix fmt flag
ArcturusZhang May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions azurerm/internal/services/compute/linux_virtual_machine_scale_set_resource.go
View file
Open in desktop
Expand Up @@ -677,6 +677,11 @@ func resourceArmLinuxVirtualMachineScaleSetUpdate(d *schema.ResourceData, meta i
updateProps.VirtualMachineProfile.DiagnosticsProfile = expandBootDiagnostics(bootDiagnosticsRaw)
}

if d.HasChange("do_not_run_extensions_on_overprovisioned_machines") {
v := d.Get("do_not_run_extensions_on_overprovisioned_machines").(bool)
updateProps.DoNotRunExtensionsOnOverprovisionedVMs = utils.Bool(v)
}

if d.HasChange("scale_in_policy") {
scaleInPolicy := d.Get("scale_in_policy").(string)
updateProps.ScaleInPolicy = &compute.ScaleInPolicy{
Expand Down
47 changes: 43 additions & 4 deletions ...rm/internal/services/compute/tests/linux_virtual_machine_scale_set_other_resource_test.go
View file
Open in desktop
Expand Up @@ -140,7 +140,46 @@ func TestAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProv
CheckDestroy: testCheckAzureRMLinuxVirtualMachineScaleSetDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data),
Config: testAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data, true),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLinuxVirtualMachineScaleSetExists(data.ResourceName),
),
},
data.ImportStep(
"admin_password",
),
},
})
}

func TestAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachinesUpdate(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_linux_virtual_machine_scale_set", "test")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMLinuxVirtualMachineScaleSetDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data, false),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLinuxVirtualMachineScaleSetExists(data.ResourceName),
),
},
data.ImportStep(
"admin_password",
),
{
Config: testAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data, true),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLinuxVirtualMachineScaleSetExists(data.ResourceName),
),
},
data.ImportStep(
"admin_password",
),
{
Config: testAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data, false),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLinuxVirtualMachineScaleSetExists(data.ResourceName),
),
Expand Down Expand Up @@ -761,7 +800,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
`, template, data.RandomInteger, customData)
}

func testAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data acceptance.TestData) string {
func testAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data acceptance.TestData, enabled bool) string {
template := testAccAzureRMLinuxVirtualMachineScaleSet_template(data)
return fmt.Sprintf(`
%s
Expand All @@ -777,7 +816,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
overprovision = true

disable_password_authentication = false
do_not_run_extensions_on_overprovisioned_machines = true
do_not_run_extensions_on_overprovisioned_machines = %t

source_image_reference {
publisher = "Canonical"
Expand All @@ -802,7 +841,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
}
}
}
`, template, data.RandomInteger)
`, template, data.RandomInteger, enabled)
}

func testAccAzureRMLinuxVirtualMachineScaleSet_otherPrioritySpot(data acceptance.TestData, evictionPolicy string) string {
Expand Down
47 changes: 43 additions & 4 deletions .../internal/services/compute/tests/windows_virtual_machine_scale_set_other_resource_test.go
View file
Open in desktop
Expand Up @@ -162,7 +162,46 @@ func TestAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverPr
CheckDestroy: testCheckAzureRMWindowsVirtualMachineScaleSetDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data),
Config: testAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data, true),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMWindowsVirtualMachineScaleSetExists(data.ResourceName),
),
},
data.ImportStep(
"admin_password",
),
},
})
}

func TestAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachinesUpdate(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_windows_virtual_machine_scale_set", "test")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMWindowsVirtualMachineScaleSetDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data, false),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMWindowsVirtualMachineScaleSetExists(data.ResourceName),
),
},
data.ImportStep(
"admin_password",
),
{
Config: testAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data, true),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMWindowsVirtualMachineScaleSetExists(data.ResourceName),
),
},
data.ImportStep(
"admin_password",
),
{
Config: testAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data, false),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMWindowsVirtualMachineScaleSetExists(data.ResourceName),
),
Expand Down Expand Up @@ -921,7 +960,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
`, template, customData)
}

func testAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data acceptance.TestData) string {
func testAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProvisionedMachines(data acceptance.TestData, enabled bool) string {
template := testAccAzureRMWindowsVirtualMachineScaleSet_template(data)
return fmt.Sprintf(`
%s
Expand All @@ -936,7 +975,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
admin_password = "P@ssword1234!"
overprovision = true

do_not_run_extensions_on_overprovisioned_machines = true
do_not_run_extensions_on_overprovisioned_machines = %t

source_image_reference {
publisher = "MicrosoftWindowsServer"
Expand All @@ -961,7 +1000,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
}
}
}
`, template)
`, template, enabled)
}

func testAccAzureRMWindowsVirtualMachineScaleSet_otherEnableAutomaticUpdatesDisabled(data acceptance.TestData) string {
Expand Down
5 changes: 5 additions & 0 deletions azurerm/internal/services/compute/windows_virtual_machine_scale_set_resource.go
View file
Open in desktop
Expand Up @@ -707,6 +707,11 @@ func resourceArmWindowsVirtualMachineScaleSetUpdate(d *schema.ResourceData, meta
updateProps.VirtualMachineProfile.DiagnosticsProfile = expandBootDiagnostics(bootDiagnosticsRaw)
}

if d.HasChange("do_not_run_extensions_on_overprovisioned_machines") {
v := d.Get("do_not_run_extensions_on_overprovisioned_machines").(bool)
updateProps.DoNotRunExtensionsOnOverprovisionedVMs = utils.Bool(v)
}

if d.HasChange("scale_in_policy") {
scaleInPolicy := d.Get("scale_in_policy").(string)
updateProps.ScaleInPolicy = &compute.ScaleInPolicy{
Expand Down