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

fix(vm): unable to clone as non-root due to hook_script (#756)

Browse Source 
* fix(vm): unable to clone as non-root due to `hook_script`

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

* fix linter error

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

---------

Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
This commit is contained in:
Pavel Boldyrev 2023-11-29 23:24:16 -05:00 committed by GitHub
parent cd24cf238c
commit 728eceb5e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/settings.json vendored
View File

@ -5,5 +5,9 @@
"qcow", "qcow",
"virtio" "virtio"
], ],
"go.lintTool": "golangci-lint",
"go.lintFlags": [
"--fast",
],
"go.testEnvFile": "${workspaceFolder}/test.env", "go.testEnvFile": "${workspaceFolder}/test.env",
} }

16
proxmoxtf/resource/vm.go
View File

@ -2001,6 +2001,11 @@ func vmCreateClone(ctx context.Context, d *schema.ResourceData, m interface{}) d
} }
} }
vmConfig, err := vmAPI.GetVM(ctx)
if err != nil {
return diag.FromErr(err)
}
if len(initialization) > 0 { if len(initialization) > 0 {
tflog.Trace(ctx, "Preparing the CloudInit configuration") tflog.Trace(ctx, "Preparing the CloudInit configuration")
@ -2008,11 +2013,6 @@ func vmCreateClone(ctx context.Context, d *schema.ResourceData, m interface{}) d
initializationDatastoreID := initializationBlock[mkResourceVirtualEnvironmentVMInitializationDatastoreID].(string) initializationDatastoreID := initializationBlock[mkResourceVirtualEnvironmentVMInitializationDatastoreID].(string)
initializationInterface := initializationBlock[mkResourceVirtualEnvironmentVMInitializationInterface].(string) initializationInterface := initializationBlock[mkResourceVirtualEnvironmentVMInitializationInterface].(string)
vmConfig, err := vmAPI.GetVM(ctx)
if err != nil {
return diag.FromErr(err)
}
existingInterface := findExistingCloudInitDrive(vmConfig, vmID, "ide2") existingInterface := findExistingCloudInitDrive(vmConfig, vmID, "ide2")
if initializationInterface == "" { if initializationInterface == "" {
initializationInterface = existingInterface initializationInterface = existingInterface
@ -2131,9 +2131,11 @@ func vmCreateClone(ctx context.Context, d *schema.ResourceData, m interface{}) d
} }
hookScript := d.Get(mkResourceVirtualEnvironmentVMHookScriptFileID).(string) hookScript := d.Get(mkResourceVirtualEnvironmentVMHookScriptFileID).(string)
currentHookScript := vmConfig.HookScript
if len(hookScript) > 0 { if len(hookScript) > 0 {
updateBody.HookScript = &hookScript updateBody.HookScript = &hookScript
} else { } else if currentHookScript != nil {
del = append(del, "hookscript") del = append(del, "hookscript")
} }
@ -2147,7 +2149,7 @@ func vmCreateClone(ctx context.Context, d *schema.ResourceData, m interface{}) d
disk := d.Get(mkResourceVirtualEnvironmentVMDisk).([]interface{}) disk := d.Get(mkResourceVirtualEnvironmentVMDisk).([]interface{})
efiDisk := d.Get(mkResourceVirtualEnvironmentVMEFIDisk).([]interface{}) efiDisk := d.Get(mkResourceVirtualEnvironmentVMEFIDisk).([]interface{})
vmConfig, e := vmAPI.GetVM(ctx) vmConfig, e = vmAPI.GetVM(ctx)
if e != nil { if e != nil {
if strings.Contains(e.Error(), "HTTP 404") || if strings.Contains(e.Error(), "HTTP 404") ||
(strings.Contains(e.Error(), "HTTP 500") && strings.Contains(e.Error(), "does not exist")) { (strings.Contains(e.Error(), "HTTP 500") && strings.Contains(e.Error(), "does not exist")) {