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

fix(vm): allow clone to pass with warnings (#1317)

Browse Source 
Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
This commit is contained in:
Pavel Boldyrev 2024-05-21 20:41:49 -04:00 committed by GitHub
parent 3f97a7b5c3
commit fb1105d93b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
proxmox/nodes/tasks/tasks.go
View File

@ -11,6 +11,7 @@ import (
"errors"
"fmt"
"net/http"
"strings"
"time"
"github.com/avast/retry-go/v4"
@ -86,10 +87,36 @@ func (c *Client) DeleteTask(ctx context.Context, upid string) error {
return nil
}
type taskWaitOptions struct {
ignoreWarnings bool
}
// TaskWaitOption is an option for waiting for a task to complete.
type TaskWaitOption interface {
apply(opts *taskWaitOptions)
}
type withIgnoreWarnings struct{}
// WithIgnoreWarnings is an option to ignore warnings when waiting for a task to complete.
func WithIgnoreWarnings() TaskWaitOption {
return withIgnoreWarnings{}
}
func (w withIgnoreWarnings) apply(opts *taskWaitOptions) {
opts.ignoreWarnings = true
}
// WaitForTask waits for a specific task to complete.
func (c *Client) WaitForTask(ctx context.Context, upid string) error {
func (c *Client) WaitForTask(ctx context.Context, upid string, opts ...TaskWaitOption) error {
errStillRunning := errors.New("still running")
options := &taskWaitOptions{}
for _, opt := range opts {
opt.apply(options)
}
status, err := retry.DoWithData(
func() (*GetTaskStatusResponseData, error) {
status, err := c.GetTaskStatus(ctx, upid)
@ -132,6 +159,11 @@ func (c *Client) WaitForTask(ctx context.Context, upid string) error {
}
if status.ExitCode != "OK" {
if options.ignoreWarnings &&
strings.HasPrefix(status.Status, "WARNINGS: ") && !strings.Contains(status.Status, "ERROR") {
return nil
}
return fmt.Errorf("task %q failed to complete with exit code: %s", upid, status.ExitCode)
}

4
proxmox/nodes/vms/vms.go
View File

@ -21,6 +21,7 @@ import (
"github.com/hashicorp/terraform-plugin-log/tflog"
"github.com/bpg/terraform-provider-proxmox/proxmox/api"
"github.com/bpg/terraform-provider-proxmox/proxmox/nodes/tasks"
)
// CloneVM clones a virtual machine.
@ -44,7 +45,8 @@ func (c *Client) CloneVM(ctx context.Context, retries int, d *CloneRequestBody)
return api.ErrNoDataObjectInResponse
}
return c.Tasks().WaitForTask(ctx, *resBody.Data)
// ignoring warnings as per https://www.mail-archive.com/pve-devel@lists.proxmox.com/msg17724.html
return c.Tasks().WaitForTask(ctx, *resBody.Data, tasks.WithIgnoreWarnings())
}, retry.Attempts(uint(retries)), retry.Delay(10*time.Second))
if err != nil {
return fmt.Errorf("error waiting for VM clone: %w", err)