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

azurerm_linux|windows_virtual_machine_scale_set - Support extensions_time_budget #10298

Merged
merged 4 commits into from
Jan 28, 2021
Merged

azurerm_linux|windows_virtual_machine_scale_set - Support extensions_time_budget #10298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f9d6b1
Support extensions_time_budget for linux VMSS
ArcturusZhang Nov 12, 2020
487e912
Support extensions_time_budget for windows vmss
ArcturusZhang Nov 12, 2020
3ef8d3d
Update website/docs/r/windows_virtual_machine_scale_set.html.markdown
katbyte Jan 28, 2021
8747543
Update website/docs/r/linux_virtual_machine_scale_set.html.markdown
katbyte Jan 28, 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
208 changes: 208 additions & 0 deletions azurerm/internal/services/compute/linux_virtual_machine_scale_set_other_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,102 @@ func TestAccLinuxVirtualMachineScaleSet_otherVmExtensionsUpdate(t *testing.T) {
})
}

func TestAccAzureRMLinuxVirtualMachineScaleSet_otherVmExtensionsWithExtensionsTimeBudget(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_linux_virtual_machine_scale_set", "test")
r := LinuxVirtualMachineScaleSetResource{}

data.ResourceTest(t, r, []resource.TestStep{
{
Config: r.otherVmExtensionsWithExtensionsTimeBudget(data, "PT30M"),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
// TODO - extension should be changed to extension.0.protected_settings when either binary testing is available or this feature is promoted from beta
data.ImportStep("admin_password", "extension"),
})
}

func TestAccAzureRMLinuxVirtualMachineScaleSet_otherVmExtensionsWithExtensionsTimeBudgetUpdate(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_linux_virtual_machine_scale_set", "test")
r := LinuxVirtualMachineScaleSetResource{}

data.ResourceTest(t, r, []resource.TestStep{
{
Config: r.otherVmExtensionsWithExtensionsTimeBudget(data, "PT30M"),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
// TODO - extension should be changed to extension.0.protected_settings when either binary testing is available or this feature is promoted from beta
data.ImportStep("admin_password", "extension"),
{
Config: r.otherVmExtensionsWithExtensionsTimeBudget(data, "PT1H"),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
// TODO - extension should be changed to extension.0.protected_settings when either binary testing is available or this feature is promoted from beta
data.ImportStep("admin_password", "extension"),
{
Config: r.otherVmExtensionsWithExtensionsTimeBudget(data, "PT30M"),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
// TODO - extension should be changed to extension.0.protected_settings when either binary testing is available or this feature is promoted from beta
data.ImportStep("admin_password", "extension"),
})
}

func TestAccAzureRMLinuxVirtualMachineScaleSet_otherExtensionsTimeBudgetWithoutExtensions(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_linux_virtual_machine_scale_set", "test")
r := LinuxVirtualMachineScaleSetResource{}

data.ResourceTest(t, r, []resource.TestStep{
{
Config: r.otherExtensionsTimeBudgetWithoutExtensions(data, "PT30M"),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
// TODO - extension should be changed to extension.0.protected_settings when either binary testing is available or this feature is promoted from beta
data.ImportStep("admin_password", "extension"),
})
}

func TestAccAzureRMLinuxVirtualMachineScaleSet_otherExtensionsTimeBudgetWithoutExtensionsUpdate(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_linux_virtual_machine_scale_set", "test")
r := LinuxVirtualMachineScaleSetResource{}

data.ResourceTest(t, r, []resource.TestStep{
{
Config: r.otherExtensionsTimeBudgetWithoutExtensions(data, "PT30M"),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
// TODO - extension should be changed to extension.0.protected_settings when either binary testing is available or this feature is promoted from beta
data.ImportStep("admin_password", "extension"),
{
Config: r.otherExtensionsTimeBudgetWithoutExtensions(data, "PT1H"),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
// TODO - extension should be changed to extension.0.protected_settings when either binary testing is available or this feature is promoted from beta
data.ImportStep("admin_password", "extension"),
{
Config: r.otherExtensionsTimeBudgetWithoutExtensions(data, "PT30M"),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
// TODO - extension should be changed to extension.0.protected_settings when either binary testing is available or this feature is promoted from beta
data.ImportStep("admin_password", "extension"),
})
}

func TestAccLinuxVirtualMachineScaleSet_otherEncryptionAtHost(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_linux_virtual_machine_scale_set", "test")
r := LinuxVirtualMachineScaleSetResource{}
Expand Down Expand Up @@ -2442,6 +2538,118 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
`, r.template(data), data.RandomInteger)
}

func (r LinuxVirtualMachineScaleSetResource) otherVmExtensionsWithExtensionsTimeBudget(data acceptance.TestData, duration string) string {
template := r.template(data)
return fmt.Sprintf(`
%s

provider "azurerm" {
features {}
}

resource "azurerm_linux_virtual_machine_scale_set" "test" {
name = "acctestvmss-%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
sku = "Standard_F2"
instances = 1
admin_username = "adminuser"
admin_password = "P@ssword1234!"

disable_password_authentication = false

source_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
version = "latest"
}

os_disk {
storage_account_type = "Standard_LRS"
caching = "ReadWrite"
}

network_interface {
name = "example"
primary = true

ip_configuration {
name = "internal"
primary = true
subnet_id = azurerm_subnet.test.id
}
}

extension {
name = "CustomScript"
publisher = "Microsoft.Azure.Extensions"
type = "CustomScript"
type_handler_version = "2.0"
auto_upgrade_minor_version = true

settings = jsonencode({
"commandToExecute" = "echo $HOSTNAME"
})

protected_settings = jsonencode({
"managedIdentity" = {}
})
}

extensions_time_budget = "%s"
}
`, template, data.RandomInteger, duration)
}

func (r LinuxVirtualMachineScaleSetResource) otherExtensionsTimeBudgetWithoutExtensions(data acceptance.TestData, duration string) string {
template := r.template(data)
return fmt.Sprintf(`
%s

provider "azurerm" {
features {}
}

resource "azurerm_linux_virtual_machine_scale_set" "test" {
name = "acctestvmss-%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
sku = "Standard_F2"
instances = 1
admin_username = "adminuser"
admin_password = "P@ssword1234!"

disable_password_authentication = false

source_image_reference {
publisher = "Canonical"
offer = "UbuntuServer"
sku = "16.04-LTS"
version = "latest"
}

os_disk {
storage_account_type = "Standard_LRS"
caching = "ReadWrite"
}

network_interface {
name = "example"
primary = true

ip_configuration {
name = "internal"
primary = true
subnet_id = azurerm_subnet.test.id
}
}

extensions_time_budget = "%s"
}
`, template, data.RandomInteger, duration)
}

func (r LinuxVirtualMachineScaleSetResource) otherEncryptionAtHost(data acceptance.TestData, enabled bool) string {
return fmt.Sprintf(`
%s
Expand Down
28 changes: 28 additions & 0 deletions azurerm/internal/services/compute/linux_virtual_machine_scale_set_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
azValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/compute/parse"
Expand Down Expand Up @@ -144,6 +145,13 @@ func resourceLinuxVirtualMachineScaleSet() *schema.Resource {

"extension": VirtualMachineScaleSetExtensionsSchema(),

"extensions_time_budget": {
Type: schema.TypeString,
Optional: true,
Default: "PT1H30M",
ValidateFunc: azValidate.ISO8601DurationBetween("PT15M", "PT2H"),
},

"health_probe_id": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -422,6 +430,13 @@ func resourceLinuxVirtualMachineScaleSetCreate(d *schema.ResourceData, meta inte
}
}

if v, ok := d.GetOk("extensions_time_budget"); ok {
if virtualMachineProfile.ExtensionProfile == nil {
virtualMachineProfile.ExtensionProfile = &compute.VirtualMachineScaleSetExtensionProfile{}
}
virtualMachineProfile.ExtensionProfile.ExtensionsTimeBudget = utils.String(v.(string))
}

if adminPassword, ok := d.GetOk("admin_password"); ok {
virtualMachineProfile.OsProfile.AdminPassword = utils.String(adminPassword.(string))
}
Expand Down Expand Up @@ -801,6 +816,13 @@ func resourceLinuxVirtualMachineScaleSetUpdate(d *schema.ResourceData, meta inte
}
}

if d.HasChange("extensions_time_budget") {
if updateProps.VirtualMachineProfile.ExtensionProfile == nil {
updateProps.VirtualMachineProfile.ExtensionProfile = &compute.VirtualMachineScaleSetExtensionProfile{}
}
updateProps.VirtualMachineProfile.ExtensionProfile.ExtensionsTimeBudget = utils.String(d.Get("extensions_time_budget").(string))
}

if d.HasChange("tags") {
update.Tags = tags.Expand(d.Get("tags").(map[string]interface{}))
}
Expand Down Expand Up @@ -992,6 +1014,12 @@ func resourceLinuxVirtualMachineScaleSetRead(d *schema.ResourceData, meta interf
d.Set("extension", extensionProfile)
}

extensionsTimeBudget := "PT1H30M"
if profile.ExtensionProfile != nil && profile.ExtensionProfile.ExtensionsTimeBudget != nil {
extensionsTimeBudget = *profile.ExtensionProfile.ExtensionsTimeBudget
}
d.Set("extensions_time_budget", extensionsTimeBudget)

encryptionAtHostEnabled := false
if profile.SecurityProfile != nil && profile.SecurityProfile.EncryptionAtHost != nil {
encryptionAtHostEnabled = *profile.SecurityProfile.EncryptionAtHost
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/compute/linux_virtual_machine_scale_set_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
type LinuxVirtualMachineScaleSetResource struct {
}

func (t LinuxVirtualMachineScaleSetResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) {
func (r LinuxVirtualMachineScaleSetResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) {
id, err := parse.VirtualMachineScaleSetID(state.ID)
if err != nil {
return nil, err
Expand Down
Loading