fix: move defer out of retry loop in waitForJob

go.mod

@@ -4,7 +4,9 @@ go 1.25.6
 
 require (
 	cdr.dev/slog/v3 v3.0.0-rc1
-	github.com/coder/coder/v2 v2.31.0
+	github.com/coder/coder/v2 v2.30.1
+	github.com/coder/retry v1.5.1
+	github.com/coder/websocket v1.8.14
 	github.com/docker/docker v28.5.2+incompatible
 	github.com/docker/go-connections v0.6.0
 	github.com/google/uuid v1.6.0
@@ -63,7 +65,6 @@ require (
 	github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 // indirect
 	github.com/coder/serpent v0.13.0 // indirect
 	github.com/coder/terraform-provider-coder/v2 v2.13.1 // indirect
-	github.com/coder/websocket v1.8.14 // indirect
 	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/coreos/go-oidc/v3 v3.17.0 // indirect

go.sum

@@ -118,10 +118,12 @@ github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuh
 github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
 github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
-github.com/coder/coder/v2 v2.31.0 h1:Qx6yLXyaaxZ5k9UOTmUQ9457iz7togEnHtc05xylIks=
-github.com/coder/coder/v2 v2.31.0/go.mod h1:2DE8CPEuDj07THeNcbClDlv0bxR9ThA3A4TOHxBHuZY=
+github.com/coder/coder/v2 v2.30.1 h1:5dxGKxWx80xb6lNd958y8Y4h3fBbQubDgIooHTTv/RQ=
+github.com/coder/coder/v2 v2.30.1/go.mod h1:w40ThqnpVr727SVnu3wwUrK2woxNx1MrV1zVxxABimk=
 github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx9n47SZOKOpgSE1bbJzlE4qPVs=
 github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0/go.mod h1:5UuS2Ts+nTToAMeOjNlnHFkPahrtDkmpydBen/3wgZc=
+github.com/coder/retry v1.5.1 h1:iWu8YnD8YqHs3XwqrqsjoBTAVqT9ml6z9ViJ2wlMiqc=
+github.com/coder/retry v1.5.1/go.mod h1:blHMk9vs6LkoRT9ZHyuZo360cufXEhrxqvEzeMtRGoY=
 github.com/coder/serpent v0.13.0 h1:6EoWjpEypkb8cS6i0eCF4qoAv9vrEVaX26RW+3FMMvo=
 github.com/coder/serpent v0.13.0/go.mod h1:7OIvFBYMd+OqarMy5einBl8AtRr8LliopVU7pyrwucY=
 github.com/coder/terraform-provider-coder/v2 v2.13.1 h1:dtPaJUvueFm+XwBPUMWQCc5Z1QUQBW4B4RNyzX4h4y8=

internal/provider/template_resource.go

@@ -8,11 +8,13 @@ import (
 	"io"
 	"slices"
 	"strings"
+	"time"
 
 	"cdr.dev/slog/v3"
 	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/provisionersdk"
+	"github.com/coder/retry"
 	"github.com/coder/terraform-provider-coderd/internal/codersdkvalidator"
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
@@ -1104,49 +1106,70 @@ func uploadDirectory(ctx context.Context, client *codersdk.Client, logger slog.L
 
 func waitForJob(ctx context.Context, client *codersdk.Client, version *codersdk.TemplateVersion) ([]codersdk.ProvisionerJobLog, error) {
 	const maxRetries = 3
-	var jobLogs []codersdk.ProvisionerJobLog
-	for retries := 0; retries < maxRetries; retries++ {
-		logs, closer, err := client.TemplateVersionLogsAfter(ctx, version.ID, 0)
+	var allLogs []codersdk.ProvisionerJobLog
+	var lastLogID int64
+
+	for attempts, retrier := 0, retry.New(500*time.Millisecond, 5*time.Second); attempts < maxRetries && retrier.Wait(ctx); attempts++ {
+		logs, done, err := waitForJobOnce(ctx, client, version, lastLogID)
+		allLogs = append(allLogs, logs...)
+		if len(logs) > 0 {
+			lastLogID = logs[len(logs)-1].ID
+		}
 		if err != nil {
-			return jobLogs, fmt.Errorf("begin streaming logs: %w", err)
+			return allLogs, err
 		}
-		defer func() {
-			if err := closer.Close(); err != nil {
-				tflog.Warn(ctx, "error closing template version log stream", map[string]any{
-					"error": err,
-				})
-			}
-		}()
-		for {
-			logs, ok := <-logs
-			if !ok {
-				break
-			}
-			tflog.Info(ctx, logs.Output, map[string]interface{}{
-				"job_id":     logs.ID,
-				"job_stage":  logs.Stage,
-				"log_source": logs.Source,
-				"level":      logs.Level,
-				"created_at": logs.CreatedAt,
-			})
-			if logs.Output != "" {
-				jobLogs = append(jobLogs, logs)
-			}
+		if done {
+			return allLogs, nil
 		}
-		latestResp, err := client.TemplateVersion(ctx, version.ID)
-		if err != nil {
-			return jobLogs, err
+		tflog.Warn(ctx, fmt.Sprintf("provisioner job still active, retrying (attempt %d/%d)", attempts+1, maxRetries))
+	}
+
+	if err := ctx.Err(); err != nil {
+		return allLogs, err
+	}
+	return allLogs, fmt.Errorf("provisioner job did not complete after %d retries", maxRetries)
+}
+
+func waitForJobOnce(ctx context.Context, client *codersdk.Client, version *codersdk.TemplateVersion, after int64) ([]codersdk.ProvisionerJobLog, bool, error) {
+	logCh, closer, err := client.TemplateVersionLogsAfter(ctx, version.ID, after)
+	if err != nil {
+		return nil, false, fmt.Errorf("begin streaming logs: %w", err)
+	}
+	defer func() {
+		if err := closer.Close(); err != nil {
+			tflog.Warn(ctx, "error closing template version log stream", map[string]any{
+				"error": err,
+			})
 		}
-		if latestResp.Job.Status.Active() {
-			tflog.Warn(ctx, fmt.Sprintf("provisioner job still active, continuing to wait...: %s", latestResp.Job.Status))
-			continue
+	}()
+	var jobLogs []codersdk.ProvisionerJobLog
+	for {
+		logMsg, ok := <-logCh
+		if !ok {
+			break
 		}
-		if latestResp.Job.Status != codersdk.ProvisionerJobSucceeded {
-			return jobLogs, fmt.Errorf("provisioner job did not succeed: %s (%s)", latestResp.Job.Status, latestResp.Job.Error)
+		tflog.Info(ctx, logMsg.Output, map[string]interface{}{
+			"job_id":     logMsg.ID,
+			"job_stage":  logMsg.Stage,
+			"log_source": logMsg.Source,
+			"level":      logMsg.Level,
+			"created_at": logMsg.CreatedAt,
+		})
+		if logMsg.Output != "" {
+			jobLogs = append(jobLogs, logMsg)
 		}
-		return jobLogs, nil
 	}
-	return jobLogs, fmt.Errorf("provisioner job did not complete after %d retries", maxRetries)
+	latestResp, err := client.TemplateVersion(ctx, version.ID)
+	if err != nil {
+		return jobLogs, false, err
+	}
+	if latestResp.Job.Status.Active() {
+		return jobLogs, false, nil
+	}
+	if latestResp.Job.Status != codersdk.ProvisionerJobSucceeded {
+		return jobLogs, false, fmt.Errorf("provisioner job did not succeed: %s (%s)", latestResp.Job.Status, latestResp.Job.Error)
+	}
+	return jobLogs, true, nil
 }
 
 type newVersionRequest struct {