mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-07-03 03:52:58 +00:00
Code

fix(vm): only set initialization.upgrade attribute when not using custom cloud-init file (#1253)

Browse Source 
* fix: ignore upgrade parameter when custom cloud-init file is used

Signed-off-by: Kai <nankeen@users.noreply.github.com>

* fix acceptance tests, make `upgrade` computed

Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>

---------

Signed-off-by: Kai <nankeen@users.noreply.github.com>
Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
Co-authored-by: Kai <nankeen@users.noreply.github.com>
Co-authored-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
This commit is contained in:
Kai 2024-05-07 00:16:14 +01:00 committed by GitHub
parent b6af836386
commit 97624052f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fwprovider/tests/resource_vm_test.go
View File

@ -317,7 +317,7 @@ func TestAccResourceVMInitialization(t *testing.T) {
}`), }`),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testResourceAttributes("proxmox_virtual_environment_vm.test_vm_cloudinit", map[string]string{ testResourceAttributes("proxmox_virtual_environment_vm.test_vm_cloudinit", map[string]string{
"initialization.0.upgrade": "true", "initialization.0.upgrade": "false",
}), }),
), ),
}}}, }}},

4
proxmoxtf/resource/vm/vm.go
View File

@ -903,7 +903,7 @@ func VM() *schema.Resource {
Type: schema.TypeBool, Type: schema.TypeBool,
Description: "Whether to do an automatic package upgrade after the first boot", Description: "Whether to do an automatic package upgrade after the first boot",
Optional: true, Optional: true,
Default: dvInitializationUpgrade, Computed: true,
}, },
}, },
}, },
@ -2970,7 +2970,7 @@ func vmGetCloudInitConfig(d *schema.ResourceData) *vms.CustomCloudInitConfig {
initializationConfig.Type = &initializationType initializationConfig.Type = &initializationType
} }
if initializationBlock[mkInitializationUpgrade] != nil { if initializationBlock[mkInitializationUpgrade] != nil && initializationConfig.Files == nil {
v := types.CustomBool(initializationBlock[mkInitializationUpgrade].(bool)) v := types.CustomBool(initializationBlock[mkInitializationUpgrade].(bool))
initializationConfig.Upgrade = &v initializationConfig.Upgrade = &v
} }