Apr 7, 2025 · Mar 12, 2025 · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
 if err != nil {
 return xerrors.Errorf("insert preset parameters: %w", err)
 }

 if protoPreset.Prebuild != nil {
 _, err := tx.InsertPresetPrebuild(ctx, database.InsertPresetPrebuildParams{
 ID:                  uuid.New(),
 PresetID:            dbPreset.ID,
 DesiredInstances:    protoPreset.Prebuild.Instances,
 InvalidateAfterSecs: 0, // TODO: implement cache invalidation
 })
 if err != nil {
 return xerrors.Errorf("insert preset prebuild: %w", err)
 }
 }
 return nil
 }, nil)
 if err != nil {
diff --git a/go.mod b/go.mod
 kernel.org/pub/linux/libs/security/libcap/psx v1.2.73 // indirect
 sigs.k8s.io/yaml v1.4.0 // indirect
 )

 replace github.com/coder/terraform-provider-coder/v2 => github.com/coder/terraform-provider-coder/v2 v2.1.4-0.20250211100915-129c295afed8
diff --git a/go.sum b/go.sum
 github.com/coder/tailscale v1.1.1-0.20250227024825-c9983534152a/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=
 github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0=
 github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=
 github.com/coder/terraform-provider-coder/v2 v2.1.3 h1:zB7ObGsiOGBHcJUUMmcSauEPlTWRIYmMYieF05LxHSc=
 github.com/coder/terraform-provider-coder/v2 v2.1.3/go.mod h1:RHGyb+ghiy8UpDAMJM8duRFuzd+1VqA3AtkRLh2P3Ug=
 github.com/coder/terraform-provider-coder/v2 v2.1.4-0.20250211100915-129c295afed8 h1:qslh7kQytybvJHlqTI3XKUuFRnZWgvEjzZKq6e1aQ2M=
 github.com/coder/terraform-provider-coder/v2 v2.1.4-0.20250211100915-129c295afed8/go.mod h1:RHGyb+ghiy8UpDAMJM8duRFuzd+1VqA3AtkRLh2P3Ug=
 github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
 github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 h1:C2/eCr+r0a5Auuw3YOiSyLNHkdMtyCZHPFBx7syN4rk=
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
 Name:       preset.Name,
 Parameters: presetParameters,
 }

 if len(preset.Prebuild) > 1 {
 // The provider template schema should prevent this, but we're being defensive here.
 logger.Info(ctx, "coder_workspace_preset has more than 1 prebuild, only using the first one", slog.F("name", preset.Name))
 }
 if len(preset.Prebuild) == 1 {
 protoPreset.Prebuild = &proto.Prebuild{
 Instances: int32(preset.Prebuild[0].Instances),
 }
 }

 if slice.Contains(duplicatedPresetNames, preset.Name) {
 duplicatedPresetNames = append(duplicatedPresetNames, preset.Name)
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1866,6 +1866,18 @@ func InsertWorkspacePresetAndParameters(ctx context.Context, db database.Store,
		if err != nil {
		return xerrors.Errorf("insert preset parameters: %w", err)
		}

		if protoPreset.Prebuild != nil {
		_, err := tx.InsertPresetPrebuild(ctx, database.InsertPresetPrebuildParams{
		ID: uuid.New(),
		PresetID: dbPreset.ID,
		DesiredInstances: protoPreset.Prebuild.Instances,
		InvalidateAfterSecs: 0, // TODO: implement cache invalidation
		})
		if err != nil {
		return xerrors.Errorf("insert preset prebuild: %w", err)
		}
		}
		return nil
		}, nil)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -468,3 +468,5 @@ require (
		kernel.org/pub/linux/libs/security/libcap/psx v1.2.73 // indirect
		sigs.k8s.io/yaml v1.4.0 // indirect
		)

SasSwart marked this conversation as resolved. Show resolvedHide resolved
		replace github.com/coder/terraform-provider-coder/v2 => github.com/coder/terraform-provider-coder/v2 v2.1.4-0.20250211100915-129c295afed8
Original file line number	Diff line number	Diff line change
Expand Up		@@ -240,8 +240,8 @@ github.com/coder/tailscale v1.1.1-0.20250227024825-c9983534152a h1:18TQ03KlYrkW8
		github.com/coder/tailscale v1.1.1-0.20250227024825-c9983534152a/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=
		github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0=
		github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=
		github.com/coder/terraform-provider-coder/v2 v2.1.3 h1:zB7ObGsiOGBHcJUUMmcSauEPlTWRIYmMYieF05LxHSc=
		github.com/coder/terraform-provider-coder/v2 v2.1.3/go.mod h1:RHGyb+ghiy8UpDAMJM8duRFuzd+1VqA3AtkRLh2P3Ug=
		github.com/coder/terraform-provider-coder/v2 v2.1.4-0.20250211100915-129c295afed8 h1:qslh7kQytybvJHlqTI3XKUuFRnZWgvEjzZKq6e1aQ2M=
		github.com/coder/terraform-provider-coder/v2 v2.1.4-0.20250211100915-129c295afed8/go.mod h1:RHGyb+ghiy8UpDAMJM8duRFuzd+1VqA3AtkRLh2P3Ug=
		github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
		github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
		github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 h1:C2/eCr+r0a5Auuw3YOiSyLNHkdMtyCZHPFBx7syN4rk=
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -853,6 +853,17 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
		Name: preset.Name,
		Parameters: presetParameters,
		}

		if len(preset.Prebuild) > 1 {
SasSwart marked this conversation as resolved. OutdatedShow resolvedHide resolved
		// The provider template schema should prevent this, but we're being defensive here.
		logger.Info(ctx, "coder_workspace_preset has more than 1 prebuild, only using the first one", slog.F("name", preset.Name))
		}
		if len(preset.Prebuild) == 1 {
		protoPreset.Prebuild = &proto.Prebuild{
		Instances: int32(preset.Prebuild[0].Instances),
		}
		}

		if slice.Contains(duplicatedPresetNames, preset.Name) {
		duplicatedPresetNames = append(duplicatedPresetNames, preset.Name)
		}
Expand Down