From 53a68cd7496371d6f325f9c7bd8c6808069c4664 Mon Sep 17 00:00:00 2001
From: Sas Swart <sas.swart.cdk@gmail.com>
Date: Thu, 10 Apr 2025 11:52:25 +0200
Subject: [PATCH 01/30] feat: add the option to debug the coder terraform
 provider (#378)

Setting the debug flag runs the provider as a standalone process and provides an environment variable that can be set for Terraform to use it. One can then attach a debugger to the provider process.
---
 main.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index 2eaa5dc5..ef606a6d 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,8 @@
 package main
 
 import (
+	"flag"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
 
 	"github.com/coder/terraform-provider-coder/v2/provider"
@@ -11,8 +13,15 @@ import (
 //go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
 
 func main() {
-	servePprof()
-	plugin.Serve(&plugin.ServeOpts{
+	debug := flag.Bool("debug", false, "Enable debug mode for the provider")
+	flag.Parse()
+
+	opts := &plugin.ServeOpts{
+		Debug:        *debug,
+		ProviderAddr: "registry.terraform.io/coder/coder",
 		ProviderFunc: provider.New,
-	})
+	}
+
+	servePprof()
+	plugin.Serve(opts)
 }

From f66adaca2adfb6b19108200483855c4023fcc982 Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Mon, 14 Apr 2025 09:05:16 -0500
Subject: [PATCH 02/30] chore: enhance parameter validation error messages 
 (#379)

* chore: implement validation in an exported function
* chore: enhance parameter validation error messages
---
 provider/formtype.go       |  28 +++++-
 provider/parameter.go      | 197 +++++++++++++++++++++++++------------
 provider/parameter_test.go |   4 +-
 3 files changed, 159 insertions(+), 70 deletions(-)

diff --git a/provider/formtype.go b/provider/formtype.go
index 753f8945..75d32c46 100644
--- a/provider/formtype.go
+++ b/provider/formtype.go
@@ -115,9 +115,11 @@ var formTypeTruthTable = map[OptionType]map[bool][]ParameterFormType{
 // The use case is when using multi-select. The options are 'string' and the
 // value is 'list(string)'.
 func ValidateFormType(paramType OptionType, optionCount int, specifiedFormType ParameterFormType) (OptionType, ParameterFormType, error) {
-	allowed, ok := formTypeTruthTable[paramType][optionCount > 0]
+	optionsExist := optionCount > 0
+	allowed, ok := formTypeTruthTable[paramType][optionsExist]
 	if !ok || len(allowed) == 0 {
-		return paramType, specifiedFormType, xerrors.Errorf("value type %q is not supported for 'form_types'", paramType)
+		// This error should really never be hit, as the provider sdk does an enum validation.
+		return paramType, specifiedFormType, xerrors.Errorf("\"type\" attribute=%q is not supported, choose one of %v", paramType, OptionTypes())
 	}
 
 	if specifiedFormType == ParameterFormTypeDefault {
@@ -126,7 +128,27 @@ func ValidateFormType(paramType OptionType, optionCount int, specifiedFormType P
 	}
 
 	if !slices.Contains(allowed, specifiedFormType) {
-		return paramType, specifiedFormType, xerrors.Errorf("value type %q is not supported for 'form_types'", specifiedFormType)
+		optionMsg := ""
+		opposite := formTypeTruthTable[paramType][!optionsExist]
+
+		// This extra message tells a user if they are using a valid form_type
+		// for a 'type', but it is invalid because options do/do-not exist.
+		// It serves as a more helpful error message.
+		//
+		// Eg: form_type=slider is valid for type=number, but invalid if options exist.
+		// And this error message is more accurate than just saying "form_type=slider is
+		// not valid for type=number".
+		if slices.Contains(opposite, specifiedFormType) {
+			if optionsExist {
+				optionMsg = " when options exist"
+			} else {
+				optionMsg = " when options do not exist"
+			}
+		}
+		return paramType, specifiedFormType,
+			xerrors.Errorf("\"form_type\" attribute=%q is not supported for \"type\"=%q%s, choose one of %v",
+				specifiedFormType, paramType,
+				optionMsg, toStrings(allowed))
 	}
 
 	// This is the only current special case. If 'multi-select' is selected, the type
diff --git a/provider/parameter.go b/provider/parameter.go
index 4eb8a282..2f7dc662 100644
--- a/provider/parameter.go
+++ b/provider/parameter.go
@@ -124,7 +124,7 @@ func parameterDataSource() *schema.Resource {
 			}
 			var value string
 			if parameter.Default != "" {
-				err := valueIsType(parameter.Type, parameter.Default)
+				err := valueIsType(parameter.Type, parameter.Default, cty.Path{cty.GetAttrStep{Name: "default"}})
 				if err != nil {
 					return err
 				}
@@ -144,6 +144,8 @@ func parameterDataSource() *schema.Resource {
 				return diag.Errorf("ephemeral parameter requires the default property")
 			}
 
+			// TODO: Should we move this into the Valid() function on
+			//  Parameter?
 			if len(parameter.Validation) == 1 {
 				validation := &parameter.Validation[0]
 				err = validation.Valid(parameter.Type, value)
@@ -153,73 +155,27 @@ func parameterDataSource() *schema.Resource {
 			}
 
 			// Validate options
-
-			// optionType might differ from parameter.Type. This is ok, and parameter.Type
-			// should be used for the value type, and optionType for options.
-			var optionType OptionType
-			optionType, parameter.FormType, err = ValidateFormType(parameter.Type, len(parameter.Option), parameter.FormType)
+			_, parameter.FormType, err = ValidateFormType(parameter.Type, len(parameter.Option), parameter.FormType)
 			if err != nil {
-				return diag.FromErr(err)
+				return diag.Diagnostics{
+					{
+						Severity:      diag.Error,
+						Summary:       "Invalid form_type for parameter",
+						Detail:        err.Error(),
+						AttributePath: cty.Path{cty.GetAttrStep{Name: "form_type"}},
+					},
+				}
 			}
 			// Set the form_type back in case the value was changed.
 			// Eg via a default. If a user does not specify, a default value
 			// is used and saved.
 			rd.Set("form_type", parameter.FormType)
 
-			if len(parameter.Option) > 0 {
-				names := map[string]interface{}{}
-				values := map[string]interface{}{}
-				for _, option := range parameter.Option {
-					_, exists := names[option.Name]
-					if exists {
-						return diag.Errorf("multiple options cannot have the same name %q", option.Name)
-					}
-					_, exists = values[option.Value]
-					if exists {
-						return diag.Errorf("multiple options cannot have the same value %q", option.Value)
-					}
-					err := valueIsType(optionType, option.Value)
-					if err != nil {
-						return err
-					}
-					values[option.Value] = nil
-					names[option.Name] = nil
-				}
-
-				if parameter.Default != "" {
-					if parameter.Type == OptionTypeListString && optionType == OptionTypeString {
-						// If the type is list(string) and optionType is string, we have
-						// to ensure all elements of the default exist as options.
-						var defaultValues []string
-						// TODO: We do this unmarshal in a few spots. It should be standardized.
-						err = json.Unmarshal([]byte(parameter.Default), &defaultValues)
-						if err != nil {
-							return diag.Errorf("default value %q is not a list of strings", parameter.Default)
-						}
-
-						// missing is used to construct a more helpful error message
-						var missing []string
-						for _, defaultValue := range defaultValues {
-							_, defaultIsValid := values[defaultValue]
-							if !defaultIsValid {
-								missing = append(missing, defaultValue)
-							}
-						}
-
-						if len(missing) > 0 {
-							return diag.Errorf(
-								"default value %q is not a valid option, values %q are missing from the option",
-								parameter.Default, strings.Join(missing, ", "),
-							)
-						}
-					} else {
-						_, defaultIsValid := values[parameter.Default]
-						if !defaultIsValid {
-							return diag.Errorf("%q default value %q must be defined as one of options", parameter.FormType, parameter.Default)
-						}
-					}
-				}
+			diags := parameter.Valid()
+			if diags.HasError() {
+				return diags
 			}
+
 			return nil
 		},
 		Schema: map[string]*schema.Schema{
@@ -433,7 +389,7 @@ func fixValidationResourceData(rawConfig cty.Value, validation interface{}) (int
 	return vArr, nil
 }
 
-func valueIsType(typ OptionType, value string) diag.Diagnostics {
+func valueIsType(typ OptionType, value string, attrPath cty.Path) diag.Diagnostics {
 	switch typ {
 	case OptionTypeNumber:
 		_, err := strconv.ParseFloat(value, 64)
@@ -446,10 +402,9 @@ func valueIsType(typ OptionType, value string) diag.Diagnostics {
 			return diag.Errorf("%q is not a bool", value)
 		}
 	case OptionTypeListString:
-		var items []string
-		err := json.Unmarshal([]byte(value), &items)
-		if err != nil {
-			return diag.Errorf("%q is not an array of strings", value)
+		_, diags := valueIsListString(value, attrPath)
+		if diags.HasError() {
+			return diags
 		}
 	case OptionTypeString:
 		// Anything is a string!
@@ -459,6 +414,102 @@ func valueIsType(typ OptionType, value string) diag.Diagnostics {
 	return nil
 }
 
+func (v *Parameter) Valid() diag.Diagnostics {
+	// optionType might differ from parameter.Type. This is ok, and parameter.Type
+	// should be used for the value type, and optionType for options.
+	optionType, _, err := ValidateFormType(v.Type, len(v.Option), v.FormType)
+	if err != nil {
+		return diag.Diagnostics{
+			{
+				Severity:      diag.Error,
+				Summary:       "Invalid form_type for parameter",
+				Detail:        err.Error(),
+				AttributePath: cty.Path{cty.GetAttrStep{Name: "form_type"}},
+			},
+		}
+	}
+
+	optionNames := map[string]any{}
+	optionValues := map[string]any{}
+	if len(v.Option) > 0 {
+		for _, option := range v.Option {
+			_, exists := optionNames[option.Name]
+			if exists {
+				return diag.Diagnostics{{
+					Severity: diag.Error,
+					Summary:  "Option names must be unique.",
+					Detail:   fmt.Sprintf("multiple options found with the same name %q", option.Name),
+				},
+				}
+			}
+			_, exists = optionValues[option.Value]
+			if exists {
+				return diag.Diagnostics{
+					{
+						Severity: diag.Error,
+						Summary:  "Option values must be unique.",
+						Detail:   fmt.Sprintf("multiple options found with the same value %q", option.Value),
+					},
+				}
+			}
+			diags := valueIsType(optionType, option.Value, cty.Path{})
+			if diags.HasError() {
+				return diags
+			}
+			optionValues[option.Value] = nil
+			optionNames[option.Name] = nil
+		}
+	}
+
+	if v.Default != "" && len(v.Option) > 0 {
+		if v.Type == OptionTypeListString && optionType == OptionTypeString {
+			// If the type is list(string) and optionType is string, we have
+			// to ensure all elements of the default exist as options.
+			defaultValues, diags := valueIsListString(v.Default, cty.Path{cty.GetAttrStep{Name: "default"}})
+			if diags.HasError() {
+				return diags
+			}
+
+			// missing is used to construct a more helpful error message
+			var missing []string
+			for _, defaultValue := range defaultValues {
+				_, defaultIsValid := optionValues[defaultValue]
+				if !defaultIsValid {
+					missing = append(missing, defaultValue)
+				}
+			}
+
+			if len(missing) > 0 {
+				return diag.Diagnostics{
+					{
+						Severity: diag.Error,
+						Summary:  "Default values must be a valid option",
+						Detail: fmt.Sprintf(
+							"default value %q is not a valid option, values %q are missing from the options",
+							v.Default, strings.Join(missing, ", "),
+						),
+						AttributePath: cty.Path{cty.GetAttrStep{Name: "default"}},
+					},
+				}
+			}
+		} else {
+			_, defaultIsValid := optionValues[v.Default]
+			if !defaultIsValid {
+				return diag.Diagnostics{
+					{
+						Severity:      diag.Error,
+						Summary:       "Default value must be a valid option",
+						Detail:        fmt.Sprintf("the value %q must be defined as one of options", v.Default),
+						AttributePath: cty.Path{cty.GetAttrStep{Name: "default"}},
+					},
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
 func (v *Validation) Valid(typ OptionType, value string) error {
 	if typ != OptionTypeNumber {
 		if !v.MinDisabled {
@@ -519,6 +570,22 @@ func (v *Validation) Valid(typ OptionType, value string) error {
 	return nil
 }
 
+func valueIsListString(value string, path cty.Path) ([]string, diag.Diagnostics) {
+	var items []string
+	err := json.Unmarshal([]byte(value), &items)
+	if err != nil {
+		return nil, diag.Diagnostics{
+			{
+				Severity:      diag.Error,
+				Summary:       "When using list(string) type, value must be a json encoded list of strings",
+				Detail:        fmt.Sprintf("value %q is not a valid list of strings", value),
+				AttributePath: path,
+			},
+		}
+	}
+	return items, nil
+}
+
 // ParameterEnvironmentVariable returns the environment variable to specify for
 // a parameter by it's name. It's hashed because spaces and special characters
 // can be used in parameter names that may not be valid in env vars.
diff --git a/provider/parameter_test.go b/provider/parameter_test.go
index f817280e..4b52d943 100644
--- a/provider/parameter_test.go
+++ b/provider/parameter_test.go
@@ -291,7 +291,7 @@ func TestParameter(t *testing.T) {
 				}
 			}
 			`,
-		ExpectError: regexp.MustCompile("cannot have the same name"),
+		ExpectError: regexp.MustCompile("Option names must be unique"),
 	}, {
 		Name: "DuplicateOptionValue",
 		Config: `
@@ -308,7 +308,7 @@ func TestParameter(t *testing.T) {
 				}
 			}
 			`,
-		ExpectError: regexp.MustCompile("cannot have the same value"),
+		ExpectError: regexp.MustCompile("Option values must be unique"),
 	}, {
 		Name: "RequiredParameterNoDefault",
 		Config: `

From e40c9b9278ad0a7574bbeb067e2119f850b0df5c Mon Sep 17 00:00:00 2001
From: Cian Johnston <cian@coder.com>
Date: Tue, 15 Apr 2025 10:54:10 +0100
Subject: [PATCH 03/30] chore: update to go 1.24.2 (#382)

Co-authored-by: Danny Kopping <dannykopping@gmail.com>
---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 02ea7137..993ba093 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/coder/terraform-provider-coder/v2
 
-go 1.22.9
+go 1.24.2
 
 require (
 	github.com/docker/docker v26.1.5+incompatible

From e51ae3aff8c4c0c3c0559841fabb59eafea1f86a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Apr 2025 10:59:50 +0100
Subject: [PATCH 04/30] build(deps): Bump golang.org/x/crypto from 0.33.0 to
 0.35.0 (#380)

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.33.0 to 0.35.0.
- [Commits](https://github.com/golang/crypto/compare/v0.33.0...v0.35.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.35.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 993ba093..cb415c2b 100644
--- a/go.mod
+++ b/go.mod
@@ -79,7 +79,7 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
 	go.opentelemetry.io/otel/metric v1.31.0 // indirect
 	go.opentelemetry.io/otel/trace v1.31.0 // indirect
-	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/crypto v0.35.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
diff --git a/go.sum b/go.sum
index 2b5ad9c5..870d770d 100644
--- a/go.sum
+++ b/go.sum
@@ -225,8 +225,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=

From c86bb5c3ddcd0735fefe644b264c04f9ecafbd4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Apr 2025 11:02:58 +0100
Subject: [PATCH 05/30] build(deps): Bump golang.org/x/net from 0.34.0 to
 0.38.0 (#383)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.34.0 to 0.38.0.
- [Commits](https://github.com/golang/net/compare/v0.34.0...v0.38.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.38.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 10 +++++-----
 go.sum | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/go.mod b/go.mod
index cb415c2b..848423f4 100644
--- a/go.mod
+++ b/go.mod
@@ -79,11 +79,11 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
 	go.opentelemetry.io/otel/metric v1.31.0 // indirect
 	go.opentelemetry.io/otel/trace v1.31.0 // indirect
-	golang.org/x/crypto v0.35.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.22.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
diff --git a/go.sum b/go.sum
index 870d770d..77c61771 100644
--- a/go.sum
+++ b/go.sum
@@ -225,8 +225,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -240,15 +240,15 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -263,8 +263,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -272,8 +272,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

From f871a43ee9a2615a195da72821148a2045ff0d6d Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Wed, 23 Apr 2025 08:44:20 -0500
Subject: [PATCH 06/30] test: rbac role test assertion to handle site wide
 roles (#385)

Site wide roles have empty string org_ids
---
 integration/integration_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/integration/integration_test.go b/integration/integration_test.go
index 9803aa41..a5019635 100644
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -181,7 +181,8 @@ func TestIntegration(t *testing.T) {
 				"workspace_owner.ssh_private_key":   `(?s)^.+?BEGIN OPENSSH PRIVATE KEY.+?END OPENSSH PRIVATE KEY.+?$`,
 				"workspace_owner.ssh_public_key":    `(?s)^ssh-ed25519.+$`,
 				"workspace_owner.login_type":        `password`,
-				"workspace_owner.rbac_roles":        `(?is)\[(\{"name":"[a-z0-9-:]+","org_id":"[a-f0-9-]+"\},?)+\]`,
+				// org_id will either be a uuid or an empty string for site wide roles.
+				"workspace_owner.rbac_roles": `(?is)\[(\{"name":"[a-z0-9-:]+","org_id":"[a-f0-9-]*"\},?)+\]`,
 			},
 		},
 		{

From ac2f9bf28b20a387661cf9f45444a5ceda0dc689 Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Wed, 30 Apr 2025 14:30:36 -0500
Subject: [PATCH 07/30] test: unit test to document validation behavior of
 parameters (#387)

Documenting validation behavior with a unit test
---
 provider/parameter_test.go           | 232 +++++++++++++++++++++++++++
 provider/testdata/parameter_table.md |  70 ++++++++
 2 files changed, 302 insertions(+)
 create mode 100644 provider/testdata/parameter_table.md

diff --git a/provider/parameter_test.go b/provider/parameter_test.go
index 4b52d943..37a46796 100644
--- a/provider/parameter_test.go
+++ b/provider/parameter_test.go
@@ -2,7 +2,9 @@ package provider_test
 
 import (
 	"fmt"
+	"os"
 	"regexp"
+	"strconv"
 	"strings"
 	"testing"
 
@@ -686,6 +688,217 @@ data "coder_parameter" "region" {
 	}
 }
 
+// TestParameterValidationEnforcement tests various parameter states and the
+// validation enforcement that should be applied to them. The table is described
+// by a markdown table. This is done so that the test cases can be more easily
+// edited and read.
+//
+// Copy and paste the table to https://www.tablesgenerator.com/markdown_tables for easier editing
+//
+//nolint:paralleltest,tparallel // Parameters load values from env vars
+func TestParameterValidationEnforcement(t *testing.T) {
+	// Some interesting observations:
+	// - Validation logic does not apply to the value of 'options'
+	//	- [NumDefInvOpt] So an invalid option can be present and selected, but would fail
+	// - Validation logic does not apply to the default if a value is given
+	//	- [NumIns/DefInv] So the default can be invalid if an input value is valid.
+	//	  The value is therefore not really optional, but it is marked as such.
+	// - [NumInsNotOptsVal | NumsInsNotOpts] values do not need to be in the option set?
+	table, err := os.ReadFile("testdata/parameter_table.md")
+	require.NoError(t, err)
+
+	type row struct {
+		Name        string
+		Types       []string
+		InputValue  string
+		Default     string
+		Options     []string
+		Validation  *provider.Validation
+		OutputValue string
+		Optional    bool
+		Error       *regexp.Regexp
+	}
+
+	rows := make([]row, 0)
+	lines := strings.Split(string(table), "\n")
+	validMinMax := regexp.MustCompile("^[0-9]*-[0-9]*$")
+	for _, line := range lines[2:] {
+		columns := strings.Split(line, "|")
+		columns = columns[1 : len(columns)-1]
+		for i := range columns {
+			// Trim the whitespace from all columns
+			columns[i] = strings.TrimSpace(columns[i])
+		}
+
+		if columns[0] == "" {
+			continue // Skip rows with empty names
+		}
+
+		optional, err := strconv.ParseBool(columns[8])
+		if columns[8] != "" {
+			// Value does not matter if not specified
+			require.NoError(t, err)
+		}
+
+		var rerr *regexp.Regexp
+		if columns[9] != "" {
+			rerr, err = regexp.Compile(columns[9])
+			if err != nil {
+				t.Fatalf("failed to parse error column %q: %v", columns[9], err)
+			}
+		}
+		var options []string
+		if columns[4] != "" {
+			options = strings.Split(columns[4], ",")
+		}
+
+		var validation *provider.Validation
+		if columns[5] != "" {
+			// Min-Max validation should look like:
+			//	1-10    :: min=1, max=10
+			//	-10     :: max=10
+			//	1-      :: min=1
+			if validMinMax.MatchString(columns[5]) {
+				parts := strings.Split(columns[5], "-")
+				min, _ := strconv.ParseInt(parts[0], 10, 64)
+				max, _ := strconv.ParseInt(parts[1], 10, 64)
+				validation = &provider.Validation{
+					Min:         int(min),
+					MinDisabled: parts[0] == "",
+					Max:         int(max),
+					MaxDisabled: parts[1] == "",
+					Monotonic:   "",
+					Regex:       "",
+					Error:       "{min} < {value} < {max}",
+				}
+			} else {
+				validation = &provider.Validation{
+					Min:         0,
+					MinDisabled: true,
+					Max:         0,
+					MaxDisabled: true,
+					Monotonic:   "",
+					Regex:       columns[5],
+					Error:       "regex error",
+				}
+			}
+		}
+
+		rows = append(rows, row{
+			Name:        columns[0],
+			Types:       strings.Split(columns[1], ","),
+			InputValue:  columns[2],
+			Default:     columns[3],
+			Options:     options,
+			Validation:  validation,
+			OutputValue: columns[7],
+			Optional:    optional,
+			Error:       rerr,
+		})
+	}
+
+	stringLiteral := func(s string) string {
+		if s == "" {
+			return `""`
+		}
+		return fmt.Sprintf("%q", s)
+	}
+
+	for rowIndex, row := range rows {
+		for _, rt := range row.Types {
+			//nolint:paralleltest,tparallel // Parameters load values from env vars
+			t.Run(fmt.Sprintf("%d|%s:%s", rowIndex, row.Name, rt), func(t *testing.T) {
+				if row.InputValue != "" {
+					t.Setenv(provider.ParameterEnvironmentVariable("parameter"), row.InputValue)
+				}
+
+				if row.Error != nil {
+					if row.OutputValue != "" {
+						t.Errorf("output value %q should not be set if error is set", row.OutputValue)
+					}
+				}
+
+				var cfg strings.Builder
+				cfg.WriteString("data \"coder_parameter\" \"parameter\" {\n")
+				cfg.WriteString("\tname = \"parameter\"\n")
+				if rt == "multi-select" || rt == "tag-select" {
+					cfg.WriteString(fmt.Sprintf("\ttype = \"%s\"\n", "list(string)"))
+					cfg.WriteString(fmt.Sprintf("\tform_type = \"%s\"\n", rt))
+				} else {
+					cfg.WriteString(fmt.Sprintf("\ttype = \"%s\"\n", rt))
+				}
+				if row.Default != "" {
+					cfg.WriteString(fmt.Sprintf("\tdefault = %s\n", stringLiteral(row.Default)))
+				}
+
+				for _, opt := range row.Options {
+					cfg.WriteString("\toption {\n")
+					cfg.WriteString(fmt.Sprintf("\t\tname = %s\n", stringLiteral(opt)))
+					cfg.WriteString(fmt.Sprintf("\t\tvalue = %s\n", stringLiteral(opt)))
+					cfg.WriteString("\t}\n")
+				}
+
+				if row.Validation != nil {
+					cfg.WriteString("\tvalidation {\n")
+					if !row.Validation.MinDisabled {
+						cfg.WriteString(fmt.Sprintf("\t\tmin = %d\n", row.Validation.Min))
+					}
+					if !row.Validation.MaxDisabled {
+						cfg.WriteString(fmt.Sprintf("\t\tmax = %d\n", row.Validation.Max))
+					}
+					if row.Validation.Monotonic != "" {
+						cfg.WriteString(fmt.Sprintf("\t\tmonotonic = \"%s\"\n", row.Validation.Monotonic))
+					}
+					if row.Validation.Regex != "" {
+						cfg.WriteString(fmt.Sprintf("\t\tregex = %q\n", row.Validation.Regex))
+					}
+					cfg.WriteString(fmt.Sprintf("\t\terror = %q\n", row.Validation.Error))
+					cfg.WriteString("\t}\n")
+				}
+
+				cfg.WriteString("}\n")
+
+				resource.Test(t, resource.TestCase{
+					ProviderFactories: coderFactory(),
+					IsUnitTest:        true,
+					Steps: []resource.TestStep{{
+						Config:      cfg.String(),
+						ExpectError: row.Error,
+						Check: func(state *terraform.State) error {
+							require.Len(t, state.Modules, 1)
+							require.Len(t, state.Modules[0].Resources, 1)
+							param := state.Modules[0].Resources["data.coder_parameter.parameter"]
+							require.NotNil(t, param)
+
+							if row.Default == "" {
+								_, ok := param.Primary.Attributes["default"]
+								require.False(t, ok, "default should not be set")
+							} else {
+								require.Equal(t, strings.Trim(row.Default, `"`), param.Primary.Attributes["default"])
+							}
+
+							if row.OutputValue == "" {
+								_, ok := param.Primary.Attributes["value"]
+								require.False(t, ok, "output value should not be set")
+							} else {
+								require.Equal(t, strings.Trim(row.OutputValue, `"`), param.Primary.Attributes["value"])
+							}
+
+							for key, expected := range map[string]string{
+								"optional": strconv.FormatBool(row.Optional),
+							} {
+								require.Equal(t, expected, param.Primary.Attributes[key], "optional")
+							}
+
+							return nil
+						},
+					}},
+				})
+			})
+		}
+	}
+}
+
 func TestValueValidatesType(t *testing.T) {
 	t.Parallel()
 	for _, tc := range []struct {
@@ -798,6 +1011,25 @@ func TestValueValidatesType(t *testing.T) {
 		Value:       `[]`,
 		MinDisabled: true,
 		MaxDisabled: true,
+	}, {
+		Name:        "ValidListOfStrings",
+		Type:        "list(string)",
+		Value:       `["first","second","third"]`,
+		MinDisabled: true,
+		MaxDisabled: true,
+	}, {
+		Name:        "InvalidListOfStrings",
+		Type:        "list(string)",
+		Value:       `["first","second","third"`,
+		MinDisabled: true,
+		MaxDisabled: true,
+		Error:       regexp.MustCompile("is not valid list of strings"),
+	}, {
+		Name:        "EmptyListOfStrings",
+		Type:        "list(string)",
+		Value:       `[]`,
+		MinDisabled: true,
+		MaxDisabled: true,
 	}} {
 		tc := tc
 		t.Run(tc.Name, func(t *testing.T) {
diff --git a/provider/testdata/parameter_table.md b/provider/testdata/parameter_table.md
new file mode 100644
index 00000000..4c9ee458
--- /dev/null
+++ b/provider/testdata/parameter_table.md
@@ -0,0 +1,70 @@
+| Name                 | Type          | Input     | Default | Options           | Validation | -> | Output | Optional | Error        |
+|----------------------|---------------|-----------|---------|-------------------|------------|----|--------|----------|--------------|
+|                      | Empty Vals    |           |         |                   |            |    |        |          |              |
+| Empty                | string,number |           |         |                   |            |    | ""     | false    |              |
+| EmptyList            | list(string)  |           |         |                   |            |    | ""     | false    |              |
+| EmptyMulti           | tag-select    |           |         |                   |            |    | ""     | false    |              |
+| EmptyOpts            | string,number |           |         | 1,2,3             |            |    | ""     | false    |              |
+| EmptyRegex           | string        |           |         |                   | world      |    |        |          | regex error  |
+| EmptyMin             | number        |           |         |                   | 1-10       |    |        |          | 1 <  < 10    |
+| EmptyMinOpt          | number        |           |         | 1,2,3             | 2-5        |    |        |          | 2 <  < 5     |
+| EmptyRegexOpt        | string        |           |         | "hello","goodbye" | goodbye    |    |        |          | regex error  |
+| EmptyRegexOk         | string        |           |         |                   | .*         |    | ""     | false    |              |
+|                      |               |           |         |                   |            |    |        |          |              |
+|                      | Default Set   | No inputs |         |                   |            |    |        |          |              |
+| NumDef               | number        |           | 5       |                   |            |    | 5      | true     |              |
+| NumDefVal            | number        |           | 5       |                   | 3-7        |    | 5      | true     |              |
+| NumDefInv            | number        |           | 5       |                   | 10-        |    |        |          | 10 < 5 < 0   |
+| NumDefOpts           | number        |           | 5       | 1,3,5,7           | 2-6        |    | 5      | true     |              |
+| NumDefNotOpts        | number        |           | 5       | 1,3,7,9           | 2-6        |    |        |          | valid option |
+| NumDefInvOpt         | number        |           | 5       | 1,3,5,7           | 6-10       |    |        |          | 6 < 5 < 10   |
+|                      |               |           |         |                   |            |    |        |          |              |
+| StrDef               | string        |           | hello   |                   |            |    | hello  | true     |              |
+| StrDefInv            | string        |           | hello   |                   | world      |    |        |          | regex error  |
+| StrDefOpts           | string        |           | a       | a,b,c             |            |    | a      | true     |              |
+| StrDefNotOpts        | string        |           | a       | b,c,d             |            |    |        |          | valid option |
+| StrDefValOpts        | string        |           | a       | a,b,c,d,e,f       | [a-c]      |    | a      | true     |              |
+| StrDefInvOpt         | string        |           | d       | a,b,c,d,e,f       | [a-c]      |    |        |          | regex error  |
+|                      |               |           |         |                   |            |    |        |          |              |
+| LStrDef              | list(string)  |           | ["a"]   |                   |            |    | ["a"]  | true     |              |
+| LStrDefOpts          | list(string)  |           | ["a"]   | ["a"], ["b"]      |            |    | ["a"]  | true     |              |
+| LStrDefNotOpts       | list(string)  |           | ["a"]   | ["b"], ["c"]      |            |    |        |          | valid option |
+|                      |               |           |         |                   |            |    |        |          |              |
+| MulDef               | tag-select    |           | ["a"]   |                   |            |    | ["a"]  | true     |              |
+| MulDefOpts           | multi-select  |           | ["a"]   | a,b               |            |    | ["a"]  | true     |              |
+| MulDefNotOpts        | multi-select  |           | ["a"]   | b,c               |            |    |        |          | valid option |
+|                      |               |           |         |                   |            |    |        |          |              |
+|                      | Input Vals    |           |         |                   |            |    |        |          |              |
+| NumIns               | number        | 3         |         |                   |            |    | 3      | false    |              |
+| NumInsDef            | number        | 3         | 5       |                   |            |    | 3      | true     |              |
+| NumIns/DefInv        | number        | 3         | 5       |                   | 1-3        |    | 3      | true     |              |
+| NumIns=DefInv        | number        | 5         | 5       |                   | 1-3        |    |        |          | 1 < 5 < 3    |
+| NumInsOpts           | number        | 3         | 5       | 1,2,3,4,5         | 1-3        |    | 3      | true     |              |
+| NumInsNotOptsVal     | number        | 3         | 5       | 1,2,4,5           | 1-3        |    | 3      | true     |              |
+| NumInsNotOptsInv     | number        | 3         | 5       | 1,2,4,5           | 1-2        |    |        | true     | 1 < 3 < 2    |
+| NumInsNotOpts        | number        | 3         | 5       | 1,2,4,5           |            |    | 3      | true     |              |
+| NumInsNotOpts/NoDef  | number        | 3         |         | 1,2,4,5           |            |    | 3      | false    |              |
+|                      |               |           |         |                   |            |    |        |          |              |
+| StrIns               | string        | c         |         |                   |            |    | c      | false    |              |
+| StrInsDef            | string        | c         | e       |                   |            |    | c      | true     |              |
+| StrIns/DefInv        | string        | c         | e       |                   | [a-c]      |    | c      | true     |              |
+| StrIns=DefInv        | string        | e         | e       |                   | [a-c]      |    |        |          | regex error  |
+| StrInsOpts           | string        | c         | e       | a,b,c,d,e         | [a-c]      |    | c      | true     |              |
+| StrInsNotOptsVal     | string        | c         | e       | a,b,d,e           | [a-c]      |    | c      | true     |              |
+| StrInsNotOptsInv     | string        | c         | e       | a,b,d,e           | [a-b]      |    |        |          | regex error  |
+| StrInsNotOpts        | string        | c         | e       | a,b,d,e           |            |    | c      | true     |              |
+| StrInsNotOpts/NoDef  | string        | c         |         | a,b,d,e           |            |    | c      | false    |              |
+| StrInsBadVal         | string        | c         |         | a,b,c,d,e         | 1-10       |    |        |          | min cannot   |
+|                      |               |           |         |                   |            |    |        |          |              |
+|                      | list(string)  |           |         |                   |            |    |        |          |              |
+| LStrIns              | list(string)  | ["c"]     |         |                   |            |    | ["c"]  | false    |              |
+| LStrInsDef           | list(string)  | ["c"]     | ["e"]   |                   |            |    | ["c"]  | true     |              |
+| LStrIns/DefInv       | list(string)  | ["c"]     | ["e"]   |                   | [a-c]      |    |        |          | regex cannot |
+| LStrInsOpts          | list(string)  | ["c"]     | ["e"]   | ["c"],["d"],["e"] |            |    | ["c"]  | true     |              |
+| LStrInsNotOpts       | list(string)  | ["c"]     | ["e"]   | ["d"],["e"]       |            |    | ["c"]  | true     |              |
+| LStrInsNotOpts/NoDef | list(string)  | ["c"]     |         | ["d"],["e"]       |            |    | ["c"]  | false    |              |
+|                      |               |           |         |                   |            |    |        |          |              |
+| MulInsOpts           | multi-select  | ["c"]     | ["e"]   | c,d,e             |            |    | ["c"]  | true     |              |
+| MulInsNotOpts        | multi-select  | ["c"]     | ["e"]   | d,e               |            |    | ["c"]  | true     |              |
+| MulInsNotOpts/NoDef  | multi-select  | ["c"]     |         | d,e               |            |    | ["c"]  | false    |              |
+| MulInsInvOpts        | multi-select  | ["c"]     | ["e"]   | c,d,e             | [a-c]      |    |        |          | regex cannot |
\ No newline at end of file

From 4e7da25b24d24b43a0540296a2c50b80002b722a Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Wed, 30 Apr 2025 16:30:22 -0500
Subject: [PATCH 08/30] test: add more validation test cases (#388)

Some of these cases you would expect it to be an error, but the
validation passes
---
 provider/parameter_test.go           | 3 +++
 provider/testdata/parameter_table.md | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/provider/parameter_test.go b/provider/parameter_test.go
index 37a46796..32877c2b 100644
--- a/provider/parameter_test.go
+++ b/provider/parameter_test.go
@@ -704,6 +704,9 @@ func TestParameterValidationEnforcement(t *testing.T) {
 	//	- [NumIns/DefInv] So the default can be invalid if an input value is valid.
 	//	  The value is therefore not really optional, but it is marked as such.
 	// - [NumInsNotOptsVal | NumsInsNotOpts] values do not need to be in the option set?
+	// - [NumInsNotNum] number params do not require the value to be a number
+	// - [LStrInsNotList] list(string) do not require the value to be a list(string)
+	//	- Same with [MulInsNotListOpts]
 	table, err := os.ReadFile("testdata/parameter_table.md")
 	require.NoError(t, err)
 
diff --git a/provider/testdata/parameter_table.md b/provider/testdata/parameter_table.md
index 4c9ee458..f7645efa 100644
--- a/provider/testdata/parameter_table.md
+++ b/provider/testdata/parameter_table.md
@@ -2,7 +2,9 @@
 |----------------------|---------------|-----------|---------|-------------------|------------|----|--------|----------|--------------|
 |                      | Empty Vals    |           |         |                   |            |    |        |          |              |
 | Empty                | string,number |           |         |                   |            |    | ""     | false    |              |
+| EmptyDupeOps         | string,number |           |         | 1,1,1             |            |    |        |          | unique       |
 | EmptyList            | list(string)  |           |         |                   |            |    | ""     | false    |              |
+| EmptyListDupeOpts    | list(string)  |           |         | ["a"],["a"]       |            |    |        |          | unique       |
 | EmptyMulti           | tag-select    |           |         |                   |            |    | ""     | false    |              |
 | EmptyOpts            | string,number |           |         | 1,2,3             |            |    | ""     | false    |              |
 | EmptyRegex           | string        |           |         |                   | world      |    |        |          | regex error  |
@@ -18,6 +20,8 @@
 | NumDefOpts           | number        |           | 5       | 1,3,5,7           | 2-6        |    | 5      | true     |              |
 | NumDefNotOpts        | number        |           | 5       | 1,3,7,9           | 2-6        |    |        |          | valid option |
 | NumDefInvOpt         | number        |           | 5       | 1,3,5,7           | 6-10       |    |        |          | 6 < 5 < 10   |
+| NumDefNotNum         | number        |           | a       |                   |            |    |        |          | a number     |
+| NumDefOptsNotNum     | number        |           | 1       | 1,a,2             |            |    |        |          | a number     |
 |                      |               |           |         |                   |            |    |        |          |              |
 | StrDef               | string        |           | hello   |                   |            |    | hello  | true     |              |
 | StrDefInv            | string        |           | hello   |                   | world      |    |        |          | regex error  |
@@ -36,6 +40,8 @@
 |                      |               |           |         |                   |            |    |        |          |              |
 |                      | Input Vals    |           |         |                   |            |    |        |          |              |
 | NumIns               | number        | 3         |         |                   |            |    | 3      | false    |              |
+| NumInsNotNum         | number        | a         |         |                   |            |    | a      | false    |              |
+| NumInsNotNumInv      | number        | a         |         |                   | 1-3        |    |        |          | 1 < a < 3    |
 | NumInsDef            | number        | 3         | 5       |                   |            |    | 3      | true     |              |
 | NumIns/DefInv        | number        | 3         | 5       |                   | 1-3        |    | 3      | true     |              |
 | NumIns=DefInv        | number        | 5         | 5       |                   | 1-3        |    |        |          | 1 < 5 < 3    |
@@ -46,6 +52,7 @@
 | NumInsNotOpts/NoDef  | number        | 3         |         | 1,2,4,5           |            |    | 3      | false    |              |
 |                      |               |           |         |                   |            |    |        |          |              |
 | StrIns               | string        | c         |         |                   |            |    | c      | false    |              |
+| StrInsDupeOpts       | string        | c         |         | a,b,c,c           |            |    |        |          | unique       |
 | StrInsDef            | string        | c         | e       |                   |            |    | c      | true     |              |
 | StrIns/DefInv        | string        | c         | e       |                   | [a-c]      |    | c      | true     |              |
 | StrIns=DefInv        | string        | e         | e       |                   | [a-c]      |    |        |          | regex error  |
@@ -58,6 +65,7 @@
 |                      |               |           |         |                   |            |    |        |          |              |
 |                      | list(string)  |           |         |                   |            |    |        |          |              |
 | LStrIns              | list(string)  | ["c"]     |         |                   |            |    | ["c"]  | false    |              |
+| LStrInsNotList       | list(string)  | c         |         |                   |            |    | c      | false    |              |
 | LStrInsDef           | list(string)  | ["c"]     | ["e"]   |                   |            |    | ["c"]  | true     |              |
 | LStrIns/DefInv       | list(string)  | ["c"]     | ["e"]   |                   | [a-c]      |    |        |          | regex cannot |
 | LStrInsOpts          | list(string)  | ["c"]     | ["e"]   | ["c"],["d"],["e"] |            |    | ["c"]  | true     |              |
@@ -65,6 +73,7 @@
 | LStrInsNotOpts/NoDef | list(string)  | ["c"]     |         | ["d"],["e"]       |            |    | ["c"]  | false    |              |
 |                      |               |           |         |                   |            |    |        |          |              |
 | MulInsOpts           | multi-select  | ["c"]     | ["e"]   | c,d,e             |            |    | ["c"]  | true     |              |
+| MulInsNotListOpts    | multi-select  | c         | ["e"]   | c,d,e             |            |    | c      | true     |              |
 | MulInsNotOpts        | multi-select  | ["c"]     | ["e"]   | d,e               |            |    | ["c"]  | true     |              |
 | MulInsNotOpts/NoDef  | multi-select  | ["c"]     |         | d,e               |            |    | ["c"]  | false    |              |
 | MulInsInvOpts        | multi-select  | ["c"]     | ["e"]   | c,d,e             | [a-c]      |    |        |          | regex cannot |
\ No newline at end of file

From 5648efbf6db0e02bd7cf79386650ade6cf923681 Mon Sep 17 00:00:00 2001
From: Sas Swart <sas.swart.cdk@gmail.com>
Date: Fri, 2 May 2025 08:57:05 +0200
Subject: [PATCH 09/30] feat: reuse agent tokens when a prebuilt agent
 reinitializes (#374)

* feat: allow presets to define prebuilds

* document prebuild parameters

* remove todo

* make gen

* feat: reuse agent tokens when a prebuilt agent reinitializes

* WIP: get agent.go ready to be merged with support for prebuilds

* fix: ensure the agent token is reused for prebuilds

* lint and make gen

* simplify function

* test: rbac role test assertion to handle site wide roles

Site wide roles have empty string org_ids

---------

Co-authored-by: Steven Masley <stevenmasley@gmail.com>
---
 go.mod                |  2 +-
 provider/agent.go     | 51 ++++++++++++++++++++++++++++++++++++++-----
 provider/workspace.go | 28 +++++++++++++++++++-----
 3 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index 848423f4..2d3db5d0 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/docker/docker v26.1.5+incompatible
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
+	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
 	github.com/masterminds/semver v1.5.0
 	github.com/mitchellh/mapstructure v1.5.0
@@ -50,7 +51,6 @@ require (
 	github.com/hashicorp/terraform-exec v0.22.0 // indirect
 	github.com/hashicorp/terraform-json v0.24.0 // indirect
 	github.com/hashicorp/terraform-plugin-go v0.26.0 // indirect
-	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
 	github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
diff --git a/provider/agent.go b/provider/agent.go
index 3ddae235..ad264030 100644
--- a/provider/agent.go
+++ b/provider/agent.go
@@ -2,6 +2,8 @@ package provider
 
 import (
 	"context"
+	"crypto/sha256"
+	"encoding/hex"
 	"fmt"
 	"path/filepath"
 	"reflect"
@@ -9,6 +11,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/hashicorp/go-cty/cty"
+	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -22,10 +25,12 @@ func agentResource() *schema.Resource {
 		SchemaVersion: 1,
 
 		Description: "Use this resource to associate an agent.",
-		CreateContext: func(_ context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
-			// This should be a real authentication token!
-			resourceData.SetId(uuid.NewString())
-			err := resourceData.Set("token", uuid.NewString())
+		CreateContext: func(ctx context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
+			agentID := uuid.NewString()
+			resourceData.SetId(agentID)
+
+			token := agentAuthToken(ctx, "")
+			err := resourceData.Set("token", token)
 			if err != nil {
 				return diag.FromErr(err)
 			}
@@ -48,10 +53,12 @@ func agentResource() *schema.Resource {
 			return updateInitScript(resourceData, i)
 		},
 		ReadWithoutTimeout: func(ctx context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
-			err := resourceData.Set("token", uuid.NewString())
+			token := agentAuthToken(ctx, "")
+			err := resourceData.Set("token", token)
 			if err != nil {
 				return diag.FromErr(err)
 			}
+
 			if _, ok := resourceData.GetOk("display_apps"); !ok {
 				err = resourceData.Set("display_apps", []interface{}{
 					map[string]bool{
@@ -469,3 +476,37 @@ func updateInitScript(resourceData *schema.ResourceData, i interface{}) diag.Dia
 	}
 	return nil
 }
+
+func agentAuthToken(ctx context.Context, agentID string) string {
+	existingToken := helpers.OptionalEnv(RunningAgentTokenEnvironmentVariable(agentID))
+	if existingToken == "" {
+		// Most of the time, we will generate a new token for the agent.
+		// In the case of a prebuilt workspace being claimed, we will override with
+		// an existing token provided below.
+		token := uuid.NewString()
+		return token
+	}
+
+	// An existing token was provided for this agent. That means that this
+	// is a prebuilt workspace in the process of being claimed.
+	// We should reuse the token.
+	tflog.Info(ctx, "using provided agent token for prebuild", map[string]interface{}{
+		"agent_id": agentID,
+	})
+	return existingToken
+}
+
+// RunningAgentTokenEnvironmentVariable returns the name of an environment variable
+// that contains the token to use for the running agent. This is used for prebuilds,
+// where we want to reuse the same token for the next iteration of a workspace agent
+// before and after the workspace was claimed by a user.
+//
+// By reusing an existing token, we can avoid the need to change a value that may have been
+// used immutably. Thus, allowing us to avoid reprovisioning resources that may take a long time
+// to replace.
+//
+// agentID is unused for now, but will be used as soon as we support multiple agents.
+func RunningAgentTokenEnvironmentVariable(agentID string) string {
+	sum := sha256.Sum256([]byte(agentID))
+	return "CODER_RUNNING_WORKSPACE_AGENT_TOKEN_" + hex.EncodeToString(sum[:])
+}
diff --git a/provider/workspace.go b/provider/workspace.go
index 5ddd3ee8..c477fad6 100644
--- a/provider/workspace.go
+++ b/provider/workspace.go
@@ -27,13 +27,13 @@ func workspaceDataSource() *schema.Resource {
 			}
 			_ = rd.Set("start_count", count)
 
-			prebuild := helpers.OptionalEnv(IsPrebuildEnvironmentVariable())
-			prebuildCount := 0
-			if prebuild == "true" {
-				prebuildCount = 1
+			if isPrebuiltWorkspace() {
+				_ = rd.Set("prebuild_count", 1)
 				_ = rd.Set("is_prebuild", true)
+			} else {
+				_ = rd.Set("prebuild_count", 0)
+				_ = rd.Set("is_prebuild", false)
 			}
-			_ = rd.Set("prebuild_count", prebuildCount)
 
 			name := helpers.OptionalEnvOrDefault("CODER_WORKSPACE_NAME", "default")
 			rd.Set("name", name)
@@ -140,6 +140,24 @@ func workspaceDataSource() *schema.Resource {
 	}
 }
 
+// isPrebuiltWorkspace returns true if the workspace is an unclaimed prebuilt workspace.
+func isPrebuiltWorkspace() bool {
+	return helpers.OptionalEnv(IsPrebuildEnvironmentVariable()) == "true"
+}
+
+// IsPrebuildEnvironmentVariable returns the name of the environment variable that
+// indicates whether the workspace is an unclaimed prebuilt workspace.
+//
+// Knowing whether the workspace is an unclaimed prebuilt workspace allows template
+// authors to conditionally execute code in the template based on whether the workspace
+// has been assigned to a user or not. This allows identity specific configuration to
+// be applied only after the workspace is claimed, while the rest of the workspace can
+// be pre-configured.
+//
+// The value of this environment variable should be set to "true" if the workspace is prebuilt
+// and it has not yet been claimed by a user. Any other values, including "false"
+// and "" will be interpreted to mean that the workspace is not prebuilt, or was
+// prebuilt but has since been claimed by a user.
 func IsPrebuildEnvironmentVariable() string {
 	return "CODER_WORKSPACE_IS_PREBUILD"
 }

From 21147bf3e4f814ce804be47204501d06740fa7dd Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Fri, 2 May 2025 10:08:37 -0500
Subject: [PATCH 10/30] test: fix concurrent map write of TestValidateFormType
 (#390)

---
 provider/formtype_test.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/provider/formtype_test.go b/provider/formtype_test.go
index 599c2e41..eaf7b587 100644
--- a/provider/formtype_test.go
+++ b/provider/formtype_test.go
@@ -6,6 +6,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -53,7 +54,7 @@ func TestValidateFormType(t *testing.T) {
 	// formTypesChecked keeps track of all checks run. It will be used to
 	// ensure all combinations of form_type and option_type are tested.
 	// All untested options are assumed to throw an error.
-	formTypesChecked := make(map[string]struct{})
+	var formTypesChecked sync.Map
 
 	expectType := func(expected provider.ParameterFormType, opts formTypeCheck) formTypeTestCase {
 		ftname := opts.formType
@@ -240,12 +241,12 @@ func TestValidateFormType(t *testing.T) {
 		for _, c := range cases {
 			t.Run(c.name, func(t *testing.T) {
 				t.Parallel()
-				if _, ok := formTypesChecked[c.config.String()]; ok {
+				if _, ok := formTypesChecked.Load(c.config.String()); ok {
 					t.Log("Duplicated form type check, delete this extra test case")
 					t.Fatalf("form type %q already checked", c.config.String())
 				}
 
-				formTypesChecked[c.config.String()] = struct{}{}
+				formTypesChecked.Store(c.config.String(), struct{}{})
 				formTypeTest(t, c)
 			})
 		}
@@ -282,7 +283,7 @@ func TestValidateFormType(t *testing.T) {
 		}
 
 		for _, check := range requiredChecks {
-			if _, alreadyChecked := formTypesChecked[check.String()]; alreadyChecked {
+			if _, alreadyChecked := formTypesChecked.Load(check.String()); alreadyChecked {
 				continue
 			}
 

From 3c748041033c3f80effb41fc7c9120f01003d5bd Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Wed, 7 May 2025 08:01:02 -0500
Subject: [PATCH 11/30] feat: parameter validation refactored to single
 function (#381)

Validation bugs resolved:
- Number parameters require valid number strings
- Input values must be in the option set
---
 provider/parameter.go                | 298 +++++++++++++++++----------
 provider/parameter_test.go           | 187 +++++++++++++++--
 provider/testdata/parameter_table.md | 159 +++++++-------
 3 files changed, 440 insertions(+), 204 deletions(-)

diff --git a/provider/parameter.go b/provider/parameter.go
index 2f7dc662..fd484578 100644
--- a/provider/parameter.go
+++ b/provider/parameter.go
@@ -21,6 +21,10 @@ import (
 	"golang.org/x/xerrors"
 )
 
+var (
+	defaultValuePath = cty.Path{cty.GetAttrStep{Name: "default"}}
+)
+
 type Option struct {
 	Name        string
 	Description string
@@ -46,14 +50,13 @@ const (
 )
 
 type Parameter struct {
-	Value       string
 	Name        string
 	DisplayName string `mapstructure:"display_name"`
 	Description string
 	Type        OptionType
 	FormType    ParameterFormType
 	Mutable     bool
-	Default     string
+	Default     *string
 	Icon        string
 	Option      []Option
 	Validation  []Validation
@@ -82,7 +85,6 @@ func parameterDataSource() *schema.Resource {
 
 			var parameter Parameter
 			err = mapstructure.Decode(struct {
-				Value       interface{}
 				Name        interface{}
 				DisplayName interface{}
 				Description interface{}
@@ -97,17 +99,22 @@ func parameterDataSource() *schema.Resource {
 				Order       interface{}
 				Ephemeral   interface{}
 			}{
-				Value:       rd.Get("value"),
 				Name:        rd.Get("name"),
 				DisplayName: rd.Get("display_name"),
 				Description: rd.Get("description"),
 				Type:        rd.Get("type"),
 				FormType:    rd.Get("form_type"),
 				Mutable:     rd.Get("mutable"),
-				Default:     rd.Get("default"),
-				Icon:        rd.Get("icon"),
-				Option:      rd.Get("option"),
-				Validation:  fixedValidation,
+				Default: func() *string {
+					if rd.GetRawConfig().AsValueMap()["default"].IsNull() {
+						return nil
+					}
+					val, _ := rd.Get("default").(string)
+					return &val
+				}(),
+				Icon:       rd.Get("icon"),
+				Option:     rd.Get("option"),
+				Validation: fixedValidation,
 				Optional: func() bool {
 					// This hack allows for checking if the "default" field is present in the .tf file.
 					// If "default" is missing or is "null", then it means that this field is required,
@@ -122,19 +129,6 @@ func parameterDataSource() *schema.Resource {
 			if err != nil {
 				return diag.Errorf("decode parameter: %s", err)
 			}
-			var value string
-			if parameter.Default != "" {
-				err := valueIsType(parameter.Type, parameter.Default, cty.Path{cty.GetAttrStep{Name: "default"}})
-				if err != nil {
-					return err
-				}
-				value = parameter.Default
-			}
-			envValue, ok := os.LookupEnv(ParameterEnvironmentVariable(parameter.Name))
-			if ok {
-				value = envValue
-			}
-			rd.Set("value", value)
 
 			if !parameter.Mutable && parameter.Ephemeral {
 				return diag.Errorf("parameter can't be immutable and ephemeral")
@@ -144,38 +138,25 @@ func parameterDataSource() *schema.Resource {
 				return diag.Errorf("ephemeral parameter requires the default property")
 			}
 
-			// TODO: Should we move this into the Valid() function on
-			//  Parameter?
-			if len(parameter.Validation) == 1 {
-				validation := &parameter.Validation[0]
-				err = validation.Valid(parameter.Type, value)
-				if err != nil {
-					return diag.FromErr(err)
-				}
-			}
-
-			// Validate options
-			_, parameter.FormType, err = ValidateFormType(parameter.Type, len(parameter.Option), parameter.FormType)
-			if err != nil {
-				return diag.Diagnostics{
-					{
-						Severity:      diag.Error,
-						Summary:       "Invalid form_type for parameter",
-						Detail:        err.Error(),
-						AttributePath: cty.Path{cty.GetAttrStep{Name: "form_type"}},
-					},
-				}
+			var input *string
+			envValue, ok := os.LookupEnv(ParameterEnvironmentVariable(parameter.Name))
+			if ok {
+				input = &envValue
 			}
-			// Set the form_type back in case the value was changed.
-			// Eg via a default. If a user does not specify, a default value
-			// is used and saved.
-			rd.Set("form_type", parameter.FormType)
 
-			diags := parameter.Valid()
+			value, diags := parameter.ValidateInput(input)
 			if diags.HasError() {
 				return diags
 			}
 
+			// Always set back the value, as it can be sourced from the default
+			rd.Set("value", value)
+
+			// Set the form_type, as if it was unset, a default form_type will be updated on
+			// the parameter struct. Always set back the updated form_type to be more
+			// specific than the default empty string.
+			rd.Set("form_type", parameter.FormType)
+
 			return nil
 		},
 		Schema: map[string]*schema.Schema{
@@ -389,37 +370,49 @@ func fixValidationResourceData(rawConfig cty.Value, validation interface{}) (int
 	return vArr, nil
 }
 
-func valueIsType(typ OptionType, value string, attrPath cty.Path) diag.Diagnostics {
+func valueIsType(typ OptionType, value string) error {
 	switch typ {
 	case OptionTypeNumber:
 		_, err := strconv.ParseFloat(value, 64)
 		if err != nil {
-			return diag.Errorf("%q is not a number", value)
+			return fmt.Errorf("%q is not a number", value)
 		}
 	case OptionTypeBoolean:
 		_, err := strconv.ParseBool(value)
 		if err != nil {
-			return diag.Errorf("%q is not a bool", value)
+			return fmt.Errorf("%q is not a bool", value)
 		}
 	case OptionTypeListString:
-		_, diags := valueIsListString(value, attrPath)
-		if diags.HasError() {
-			return diags
+		_, err := valueIsListString(value)
+		if err != nil {
+			return err
 		}
 	case OptionTypeString:
 		// Anything is a string!
 	default:
-		return diag.Errorf("invalid type %q", typ)
+		return fmt.Errorf("invalid type %q", typ)
 	}
 	return nil
 }
 
-func (v *Parameter) Valid() diag.Diagnostics {
+func (v *Parameter) ValidateInput(input *string) (string, diag.Diagnostics) {
+	var err error
+	var optionType OptionType
+
+	valuePath := cty.Path{}
+	value := input
+	if input == nil {
+		value = v.Default
+		if v.Default != nil {
+			valuePath = defaultValuePath
+		}
+	}
+
 	// optionType might differ from parameter.Type. This is ok, and parameter.Type
 	// should be used for the value type, and optionType for options.
-	optionType, _, err := ValidateFormType(v.Type, len(v.Option), v.FormType)
+	optionType, v.FormType, err = ValidateFormType(v.Type, len(v.Option), v.FormType)
 	if err != nil {
-		return diag.Diagnostics{
+		return "", diag.Diagnostics{
 			{
 				Severity:      diag.Error,
 				Summary:       "Invalid form_type for parameter",
@@ -429,53 +422,120 @@ func (v *Parameter) Valid() diag.Diagnostics {
 		}
 	}
 
-	optionNames := map[string]any{}
-	optionValues := map[string]any{}
-	if len(v.Option) > 0 {
-		for _, option := range v.Option {
-			_, exists := optionNames[option.Name]
-			if exists {
-				return diag.Diagnostics{{
-					Severity: diag.Error,
-					Summary:  "Option names must be unique.",
-					Detail:   fmt.Sprintf("multiple options found with the same name %q", option.Name),
-				},
-				}
-			}
-			_, exists = optionValues[option.Value]
-			if exists {
-				return diag.Diagnostics{
-					{
-						Severity: diag.Error,
-						Summary:  "Option values must be unique.",
-						Detail:   fmt.Sprintf("multiple options found with the same value %q", option.Value),
-					},
-				}
-			}
-			diags := valueIsType(optionType, option.Value, cty.Path{})
-			if diags.HasError() {
-				return diags
-			}
-			optionValues[option.Value] = nil
-			optionNames[option.Name] = nil
+	optionValues, diags := v.ValidOptions(optionType)
+	if diags.HasError() {
+		return "", diags
+	}
+
+	// TODO: This is a bit of a hack. The current behavior states if validation
+	//   is given, then apply validation to unset values.
+	//   value == nil should not be accepted in the first place.
+	//   To fix this, value should be coerced to an empty string
+	//   if it is nil. Then let the validation logic always apply.
+	if len(v.Validation) == 0 && value == nil {
+		return "", nil
+	}
+
+	// forcedValue ensures the value is not-nil.
+	var forcedValue string
+	if value != nil {
+		forcedValue = *value
+	}
+
+	d := v.validValue(forcedValue, optionType, optionValues, valuePath)
+	if d.HasError() {
+		return "", d
+	}
+
+	err = valueIsType(v.Type, forcedValue)
+	if err != nil {
+		return "", diag.Diagnostics{
+			{
+				Severity: diag.Error,
+				Summary:  fmt.Sprintf("Parameter value is not of type %q", v.Type),
+				Detail:   err.Error(),
+			},
 		}
 	}
 
-	if v.Default != "" && len(v.Option) > 0 {
+	return forcedValue, nil
+}
+
+func (v *Parameter) ValidOptions(optionType OptionType) (map[string]struct{}, diag.Diagnostics) {
+	optionNames := map[string]struct{}{}
+	optionValues := map[string]struct{}{}
+
+	var diags diag.Diagnostics
+	for _, option := range v.Option {
+		_, exists := optionNames[option.Name]
+		if exists {
+			return nil, diag.Diagnostics{{
+				Severity: diag.Error,
+				Summary:  "Option names must be unique.",
+				Detail:   fmt.Sprintf("multiple options found with the same name %q", option.Name),
+			}}
+		}
+
+		_, exists = optionValues[option.Value]
+		if exists {
+			return nil, diag.Diagnostics{{
+				Severity: diag.Error,
+				Summary:  "Option values must be unique.",
+				Detail:   fmt.Sprintf("multiple options found with the same value %q", option.Value),
+			}}
+		}
+
+		err := valueIsType(optionType, option.Value)
+		if err != nil {
+			diags = append(diags, diag.Diagnostic{
+				Severity: diag.Error,
+				Summary:  fmt.Sprintf("Option %q with value=%q is not of type %q", option.Name, option.Value, optionType),
+				Detail:   err.Error(),
+			})
+			continue
+		}
+		optionValues[option.Value] = struct{}{}
+		optionNames[option.Name] = struct{}{}
+
+		// Option values are assumed to be valid. Do not call validValue on them.
+	}
+
+	if diags != nil && diags.HasError() {
+		return nil, diags
+	}
+	return optionValues, nil
+}
+
+func (v *Parameter) validValue(value string, optionType OptionType, optionValues map[string]struct{}, path cty.Path) diag.Diagnostics {
+	// name is used for constructing more precise error messages.
+	name := "Value"
+	if path.Equals(defaultValuePath) {
+		name = "Default value"
+	}
+
+	// First validate if the value is a valid option
+	if len(optionValues) > 0 {
 		if v.Type == OptionTypeListString && optionType == OptionTypeString {
 			// If the type is list(string) and optionType is string, we have
-			// to ensure all elements of the default exist as options.
-			defaultValues, diags := valueIsListString(v.Default, cty.Path{cty.GetAttrStep{Name: "default"}})
-			if diags.HasError() {
-				return diags
+			// to ensure all elements of the value exist as options.
+			listValues, err := valueIsListString(value)
+			if err != nil {
+				return diag.Diagnostics{
+					{
+						Severity:      diag.Error,
+						Summary:       "When using list(string) type, value must be a json encoded list of strings",
+						Detail:        err.Error(),
+						AttributePath: path,
+					},
+				}
 			}
 
 			// missing is used to construct a more helpful error message
 			var missing []string
-			for _, defaultValue := range defaultValues {
-				_, defaultIsValid := optionValues[defaultValue]
-				if !defaultIsValid {
-					missing = append(missing, defaultValue)
+			for _, listValue := range listValues {
+				_, isValid := optionValues[listValue]
+				if !isValid {
+					missing = append(missing, listValue)
 				}
 			}
 
@@ -483,30 +543,49 @@ func (v *Parameter) Valid() diag.Diagnostics {
 				return diag.Diagnostics{
 					{
 						Severity: diag.Error,
-						Summary:  "Default values must be a valid option",
+						Summary:  fmt.Sprintf("%ss must be a valid option", name),
 						Detail: fmt.Sprintf(
-							"default value %q is not a valid option, values %q are missing from the options",
-							v.Default, strings.Join(missing, ", "),
+							"%s %q is not a valid option, values %q are missing from the options",
+							name, value, strings.Join(missing, ", "),
 						),
-						AttributePath: cty.Path{cty.GetAttrStep{Name: "default"}},
+						AttributePath: path,
 					},
 				}
 			}
 		} else {
-			_, defaultIsValid := optionValues[v.Default]
-			if !defaultIsValid {
+			_, isValid := optionValues[value]
+			if !isValid {
+				extra := ""
+				if value == "" {
+					extra = ". The value is empty, did you forget to set it with a default or from user input?"
+				}
 				return diag.Diagnostics{
 					{
 						Severity:      diag.Error,
-						Summary:       "Default value must be a valid option",
-						Detail:        fmt.Sprintf("the value %q must be defined as one of options", v.Default),
-						AttributePath: cty.Path{cty.GetAttrStep{Name: "default"}},
+						Summary:       fmt.Sprintf("%s must be a valid option%s", name, extra),
+						Detail:        fmt.Sprintf("the value %q must be defined as one of options", value),
+						AttributePath: path,
 					},
 				}
 			}
 		}
 	}
 
+	if len(v.Validation) == 1 {
+		validCheck := &v.Validation[0]
+		err := validCheck.Valid(v.Type, value)
+		if err != nil {
+			return diag.Diagnostics{
+				{
+					Severity:      diag.Error,
+					Summary:       fmt.Sprintf("Invalid parameter %s according to 'validation' block", strings.ToLower(name)),
+					Detail:        err.Error(),
+					AttributePath: path,
+				},
+			}
+		}
+	}
+
 	return nil
 }
 
@@ -570,18 +649,11 @@ func (v *Validation) Valid(typ OptionType, value string) error {
 	return nil
 }
 
-func valueIsListString(value string, path cty.Path) ([]string, diag.Diagnostics) {
+func valueIsListString(value string) ([]string, error) {
 	var items []string
 	err := json.Unmarshal([]byte(value), &items)
 	if err != nil {
-		return nil, diag.Diagnostics{
-			{
-				Severity:      diag.Error,
-				Summary:       "When using list(string) type, value must be a json encoded list of strings",
-				Detail:        fmt.Sprintf("value %q is not a valid list of strings", value),
-				AttributePath: path,
-			},
-		}
+		return nil, fmt.Errorf("value %q is not a valid list of strings", value)
 	}
 	return items, nil
 }
diff --git a/provider/parameter_test.go b/provider/parameter_test.go
index 32877c2b..21842b6a 100644
--- a/provider/parameter_test.go
+++ b/provider/parameter_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/terraform-provider-coder/v2/provider"
@@ -84,6 +85,7 @@ func TestParameter(t *testing.T) {
 			data "coder_parameter" "region" {
 				name = "Region"
 				type = "number"
+				default = 1
 				option {
 					name = "1"
 					value = "1"
@@ -101,6 +103,7 @@ func TestParameter(t *testing.T) {
 			data "coder_parameter" "region" {
 				name = "Region"
 				type = "string"
+				default = "1"
 				option {
 					name = "1"
 					value = "1"
@@ -688,6 +691,168 @@ data "coder_parameter" "region" {
 	}
 }
 
+func TestParameterValidation(t *testing.T) {
+	t.Parallel()
+	opts := func(vals ...string) []provider.Option {
+		options := make([]provider.Option, 0, len(vals))
+		for _, val := range vals {
+			options = append(options, provider.Option{
+				Name:  val,
+				Value: val,
+			})
+		}
+		return options
+	}
+
+	for _, tc := range []struct {
+		Name        string
+		Parameter   provider.Parameter
+		Value       string
+		ExpectError *regexp.Regexp
+	}{
+		{
+			Name: "ValidStringParameter",
+			Parameter: provider.Parameter{
+				Type: "string",
+			},
+			Value: "alpha",
+		},
+		// Test invalid states
+		{
+			Name: "InvalidFormType",
+			Parameter: provider.Parameter{
+				Type:     "string",
+				Option:   opts("alpha", "bravo", "charlie"),
+				FormType: provider.ParameterFormTypeSlider,
+			},
+			Value:       "alpha",
+			ExpectError: regexp.MustCompile("Invalid form_type for parameter"),
+		},
+		{
+			Name: "NotInOptions",
+			Parameter: provider.Parameter{
+				Type:   "string",
+				Option: opts("alpha", "bravo", "charlie"),
+			},
+			Value:       "delta", // not in option set
+			ExpectError: regexp.MustCompile("Value must be a valid option"),
+		},
+		{
+			Name: "NumberNotInOptions",
+			Parameter: provider.Parameter{
+				Type:   "number",
+				Option: opts("1", "2", "3"),
+			},
+			Value:       "0", // not in option set
+			ExpectError: regexp.MustCompile("Value must be a valid option"),
+		},
+		{
+			Name: "NonUniqueOptionNames",
+			Parameter: provider.Parameter{
+				Type:   "string",
+				Option: opts("alpha", "alpha"),
+			},
+			Value:       "alpha",
+			ExpectError: regexp.MustCompile("Option names must be unique"),
+		},
+		{
+			Name: "NonUniqueOptionValues",
+			Parameter: provider.Parameter{
+				Type: "string",
+				Option: []provider.Option{
+					{Name: "Alpha", Value: "alpha"},
+					{Name: "AlphaAgain", Value: "alpha"},
+				},
+			},
+			Value:       "alpha",
+			ExpectError: regexp.MustCompile("Option values must be unique"),
+		},
+		{
+			Name: "IncorrectValueTypeOption",
+			Parameter: provider.Parameter{
+				Type:   "number",
+				Option: opts("not-a-number"),
+			},
+			Value:       "5",
+			ExpectError: regexp.MustCompile("is not a number"),
+		},
+		{
+			Name: "IncorrectValueType",
+			Parameter: provider.Parameter{
+				Type: "number",
+			},
+			Value:       "not-a-number",
+			ExpectError: regexp.MustCompile("Parameter value is not of type \"number\""),
+		},
+		{
+			Name: "NotListStringDefault",
+			Parameter: provider.Parameter{
+				Type:    "list(string)",
+				Default: ptr("not-a-list"),
+			},
+			ExpectError: regexp.MustCompile("not a valid list of strings"),
+		},
+		{
+			Name: "NotListStringDefault",
+			Parameter: provider.Parameter{
+				Type: "list(string)",
+			},
+			Value:       "not-a-list",
+			ExpectError: regexp.MustCompile("not a valid list of strings"),
+		},
+		{
+			Name: "DefaultListStringNotInOptions",
+			Parameter: provider.Parameter{
+				Type:     "list(string)",
+				Default:  ptr(`["red", "yellow", "black"]`),
+				Option:   opts("red", "blue", "green"),
+				FormType: provider.ParameterFormTypeMultiSelect,
+			},
+			Value:       `["red", "yellow", "black"]`,
+			ExpectError: regexp.MustCompile("is not a valid option, values \"yellow, black\" are missing from the options"),
+		},
+		{
+			Name: "ListStringNotInOptions",
+			Parameter: provider.Parameter{
+				Type:     "list(string)",
+				Default:  ptr(`["red"]`),
+				Option:   opts("red", "blue", "green"),
+				FormType: provider.ParameterFormTypeMultiSelect,
+			},
+			Value:       `["red", "yellow", "black"]`,
+			ExpectError: regexp.MustCompile("is not a valid option, values \"yellow, black\" are missing from the options"),
+		},
+		{
+			Name: "InvalidMiniumum",
+			Parameter: provider.Parameter{
+				Type:    "number",
+				Default: ptr("5"),
+				Validation: []provider.Validation{{
+					Min:   10,
+					Error: "must be greater than 10",
+				}},
+			},
+			ExpectError: regexp.MustCompile("must be greater than 10"),
+		},
+	} {
+		tc := tc
+		t.Run(tc.Name, func(t *testing.T) {
+			t.Parallel()
+			value := &tc.Value
+			_, diags := tc.Parameter.ValidateInput(value)
+			if tc.ExpectError != nil {
+				require.True(t, diags.HasError())
+				errMsg := fmt.Sprintf("%+v", diags[0]) // close enough
+				require.Truef(t, tc.ExpectError.MatchString(errMsg), "got: %s", errMsg)
+			} else {
+				if !assert.False(t, diags.HasError()) {
+					t.Logf("got: %+v", diags[0])
+				}
+			}
+		})
+	}
+}
+
 // TestParameterValidationEnforcement tests various parameter states and the
 // validation enforcement that should be applied to them. The table is described
 // by a markdown table. This is done so that the test cases can be more easily
@@ -703,10 +868,6 @@ func TestParameterValidationEnforcement(t *testing.T) {
 	// - Validation logic does not apply to the default if a value is given
 	//	- [NumIns/DefInv] So the default can be invalid if an input value is valid.
 	//	  The value is therefore not really optional, but it is marked as such.
-	// - [NumInsNotOptsVal | NumsInsNotOpts] values do not need to be in the option set?
-	// - [NumInsNotNum] number params do not require the value to be a number
-	// - [LStrInsNotList] list(string) do not require the value to be a list(string)
-	//	- Same with [MulInsNotListOpts]
 	table, err := os.ReadFile("testdata/parameter_table.md")
 	require.NoError(t, err)
 
@@ -719,7 +880,7 @@ func TestParameterValidationEnforcement(t *testing.T) {
 		Validation  *provider.Validation
 		OutputValue string
 		Optional    bool
-		Error       *regexp.Regexp
+		CreateError *regexp.Regexp
 	}
 
 	rows := make([]row, 0)
@@ -750,6 +911,7 @@ func TestParameterValidationEnforcement(t *testing.T) {
 				t.Fatalf("failed to parse error column %q: %v", columns[9], err)
 			}
 		}
+
 		var options []string
 		if columns[4] != "" {
 			options = strings.Split(columns[4], ",")
@@ -796,7 +958,7 @@ func TestParameterValidationEnforcement(t *testing.T) {
 			Validation:  validation,
 			OutputValue: columns[7],
 			Optional:    optional,
-			Error:       rerr,
+			CreateError: rerr,
 		})
 	}
 
@@ -815,10 +977,8 @@ func TestParameterValidationEnforcement(t *testing.T) {
 					t.Setenv(provider.ParameterEnvironmentVariable("parameter"), row.InputValue)
 				}
 
-				if row.Error != nil {
-					if row.OutputValue != "" {
-						t.Errorf("output value %q should not be set if error is set", row.OutputValue)
-					}
+				if row.CreateError != nil && row.OutputValue != "" {
+					t.Errorf("output value %q should not be set if both errors are set", row.OutputValue)
 				}
 
 				var cfg strings.Builder
@@ -860,13 +1020,12 @@ func TestParameterValidationEnforcement(t *testing.T) {
 				}
 
 				cfg.WriteString("}\n")
-
 				resource.Test(t, resource.TestCase{
 					ProviderFactories: coderFactory(),
 					IsUnitTest:        true,
 					Steps: []resource.TestStep{{
 						Config:      cfg.String(),
-						ExpectError: row.Error,
+						ExpectError: row.CreateError,
 						Check: func(state *terraform.State) error {
 							require.Len(t, state.Modules, 1)
 							require.Len(t, state.Modules[0].Resources, 1)
@@ -1096,3 +1255,7 @@ func TestParameterWithManyOptions(t *testing.T) {
 		}},
 	})
 }
+
+func ptr[T any](v T) *T {
+	return &v
+}
diff --git a/provider/testdata/parameter_table.md b/provider/testdata/parameter_table.md
index f7645efa..3df16f06 100644
--- a/provider/testdata/parameter_table.md
+++ b/provider/testdata/parameter_table.md
@@ -1,79 +1,80 @@
-| Name                 | Type          | Input     | Default | Options           | Validation | -> | Output | Optional | Error        |
-|----------------------|---------------|-----------|---------|-------------------|------------|----|--------|----------|--------------|
-|                      | Empty Vals    |           |         |                   |            |    |        |          |              |
-| Empty                | string,number |           |         |                   |            |    | ""     | false    |              |
-| EmptyDupeOps         | string,number |           |         | 1,1,1             |            |    |        |          | unique       |
-| EmptyList            | list(string)  |           |         |                   |            |    | ""     | false    |              |
-| EmptyListDupeOpts    | list(string)  |           |         | ["a"],["a"]       |            |    |        |          | unique       |
-| EmptyMulti           | tag-select    |           |         |                   |            |    | ""     | false    |              |
-| EmptyOpts            | string,number |           |         | 1,2,3             |            |    | ""     | false    |              |
-| EmptyRegex           | string        |           |         |                   | world      |    |        |          | regex error  |
-| EmptyMin             | number        |           |         |                   | 1-10       |    |        |          | 1 <  < 10    |
-| EmptyMinOpt          | number        |           |         | 1,2,3             | 2-5        |    |        |          | 2 <  < 5     |
-| EmptyRegexOpt        | string        |           |         | "hello","goodbye" | goodbye    |    |        |          | regex error  |
-| EmptyRegexOk         | string        |           |         |                   | .*         |    | ""     | false    |              |
-|                      |               |           |         |                   |            |    |        |          |              |
-|                      | Default Set   | No inputs |         |                   |            |    |        |          |              |
-| NumDef               | number        |           | 5       |                   |            |    | 5      | true     |              |
-| NumDefVal            | number        |           | 5       |                   | 3-7        |    | 5      | true     |              |
-| NumDefInv            | number        |           | 5       |                   | 10-        |    |        |          | 10 < 5 < 0   |
-| NumDefOpts           | number        |           | 5       | 1,3,5,7           | 2-6        |    | 5      | true     |              |
-| NumDefNotOpts        | number        |           | 5       | 1,3,7,9           | 2-6        |    |        |          | valid option |
-| NumDefInvOpt         | number        |           | 5       | 1,3,5,7           | 6-10       |    |        |          | 6 < 5 < 10   |
-| NumDefNotNum         | number        |           | a       |                   |            |    |        |          | a number     |
-| NumDefOptsNotNum     | number        |           | 1       | 1,a,2             |            |    |        |          | a number     |
-|                      |               |           |         |                   |            |    |        |          |              |
-| StrDef               | string        |           | hello   |                   |            |    | hello  | true     |              |
-| StrDefInv            | string        |           | hello   |                   | world      |    |        |          | regex error  |
-| StrDefOpts           | string        |           | a       | a,b,c             |            |    | a      | true     |              |
-| StrDefNotOpts        | string        |           | a       | b,c,d             |            |    |        |          | valid option |
-| StrDefValOpts        | string        |           | a       | a,b,c,d,e,f       | [a-c]      |    | a      | true     |              |
-| StrDefInvOpt         | string        |           | d       | a,b,c,d,e,f       | [a-c]      |    |        |          | regex error  |
-|                      |               |           |         |                   |            |    |        |          |              |
-| LStrDef              | list(string)  |           | ["a"]   |                   |            |    | ["a"]  | true     |              |
-| LStrDefOpts          | list(string)  |           | ["a"]   | ["a"], ["b"]      |            |    | ["a"]  | true     |              |
-| LStrDefNotOpts       | list(string)  |           | ["a"]   | ["b"], ["c"]      |            |    |        |          | valid option |
-|                      |               |           |         |                   |            |    |        |          |              |
-| MulDef               | tag-select    |           | ["a"]   |                   |            |    | ["a"]  | true     |              |
-| MulDefOpts           | multi-select  |           | ["a"]   | a,b               |            |    | ["a"]  | true     |              |
-| MulDefNotOpts        | multi-select  |           | ["a"]   | b,c               |            |    |        |          | valid option |
-|                      |               |           |         |                   |            |    |        |          |              |
-|                      | Input Vals    |           |         |                   |            |    |        |          |              |
-| NumIns               | number        | 3         |         |                   |            |    | 3      | false    |              |
-| NumInsNotNum         | number        | a         |         |                   |            |    | a      | false    |              |
-| NumInsNotNumInv      | number        | a         |         |                   | 1-3        |    |        |          | 1 < a < 3    |
-| NumInsDef            | number        | 3         | 5       |                   |            |    | 3      | true     |              |
-| NumIns/DefInv        | number        | 3         | 5       |                   | 1-3        |    | 3      | true     |              |
-| NumIns=DefInv        | number        | 5         | 5       |                   | 1-3        |    |        |          | 1 < 5 < 3    |
-| NumInsOpts           | number        | 3         | 5       | 1,2,3,4,5         | 1-3        |    | 3      | true     |              |
-| NumInsNotOptsVal     | number        | 3         | 5       | 1,2,4,5           | 1-3        |    | 3      | true     |              |
-| NumInsNotOptsInv     | number        | 3         | 5       | 1,2,4,5           | 1-2        |    |        | true     | 1 < 3 < 2    |
-| NumInsNotOpts        | number        | 3         | 5       | 1,2,4,5           |            |    | 3      | true     |              |
-| NumInsNotOpts/NoDef  | number        | 3         |         | 1,2,4,5           |            |    | 3      | false    |              |
-|                      |               |           |         |                   |            |    |        |          |              |
-| StrIns               | string        | c         |         |                   |            |    | c      | false    |              |
-| StrInsDupeOpts       | string        | c         |         | a,b,c,c           |            |    |        |          | unique       |
-| StrInsDef            | string        | c         | e       |                   |            |    | c      | true     |              |
-| StrIns/DefInv        | string        | c         | e       |                   | [a-c]      |    | c      | true     |              |
-| StrIns=DefInv        | string        | e         | e       |                   | [a-c]      |    |        |          | regex error  |
-| StrInsOpts           | string        | c         | e       | a,b,c,d,e         | [a-c]      |    | c      | true     |              |
-| StrInsNotOptsVal     | string        | c         | e       | a,b,d,e           | [a-c]      |    | c      | true     |              |
-| StrInsNotOptsInv     | string        | c         | e       | a,b,d,e           | [a-b]      |    |        |          | regex error  |
-| StrInsNotOpts        | string        | c         | e       | a,b,d,e           |            |    | c      | true     |              |
-| StrInsNotOpts/NoDef  | string        | c         |         | a,b,d,e           |            |    | c      | false    |              |
-| StrInsBadVal         | string        | c         |         | a,b,c,d,e         | 1-10       |    |        |          | min cannot   |
-|                      |               |           |         |                   |            |    |        |          |              |
-|                      | list(string)  |           |         |                   |            |    |        |          |              |
-| LStrIns              | list(string)  | ["c"]     |         |                   |            |    | ["c"]  | false    |              |
-| LStrInsNotList       | list(string)  | c         |         |                   |            |    | c      | false    |              |
-| LStrInsDef           | list(string)  | ["c"]     | ["e"]   |                   |            |    | ["c"]  | true     |              |
-| LStrIns/DefInv       | list(string)  | ["c"]     | ["e"]   |                   | [a-c]      |    |        |          | regex cannot |
-| LStrInsOpts          | list(string)  | ["c"]     | ["e"]   | ["c"],["d"],["e"] |            |    | ["c"]  | true     |              |
-| LStrInsNotOpts       | list(string)  | ["c"]     | ["e"]   | ["d"],["e"]       |            |    | ["c"]  | true     |              |
-| LStrInsNotOpts/NoDef | list(string)  | ["c"]     |         | ["d"],["e"]       |            |    | ["c"]  | false    |              |
-|                      |               |           |         |                   |            |    |        |          |              |
-| MulInsOpts           | multi-select  | ["c"]     | ["e"]   | c,d,e             |            |    | ["c"]  | true     |              |
-| MulInsNotListOpts    | multi-select  | c         | ["e"]   | c,d,e             |            |    | c      | true     |              |
-| MulInsNotOpts        | multi-select  | ["c"]     | ["e"]   | d,e               |            |    | ["c"]  | true     |              |
-| MulInsNotOpts/NoDef  | multi-select  | ["c"]     |         | d,e               |            |    | ["c"]  | false    |              |
-| MulInsInvOpts        | multi-select  | ["c"]     | ["e"]   | c,d,e             | [a-c]      |    |        |          | regex cannot |
\ No newline at end of file
+| Name                 | Type          | Input     | Default | Options           | Validation | -> | Output | Optional | ErrorCreate     |
+|----------------------|---------------|-----------|---------|-------------------|------------|----|--------|----------|-----------------|
+|                      | Empty Vals    |           |         |                   |            |    |        |          |                 |
+| Empty                | string,number |           |         |                   |            |    | ""     | false    |                 |
+| EmptyDupeOps         | string,number |           |         | 1,1,1             |            |    |        |          | unique          |
+| EmptyList            | list(string)  |           |         |                   |            |    | ""     | false    |                 |
+| EmptyListDupeOpts    | list(string)  |           |         | ["a"],["a"]       |            |    |        |          | unique          |
+| EmptyMulti           | tag-select    |           |         |                   |            |    | ""     | false    |                 |
+| EmptyOpts            | string,number |           |         | 1,2,3             |            |    | ""     | false    |                 |
+| EmptyRegex           | string        |           |         |                   | world      |    |        |          | regex error     |
+| EmptyMin             | number        |           |         |                   | 1-10       |    |        |          | 1 <  < 10       |
+| EmptyMinOpt          | number        |           |         | 1,2,3             | 2-5        |    |        |          | valid option    |
+| EmptyRegexOpt        | string        |           |         | "hello","goodbye" | goodbye    |    |        |          | valid option    |
+| EmptyRegexOk         | string        |           |         |                   | .*         |    | ""     | false    |                 |
+|                      |               |           |         |                   |            |    |        |          |                 |
+|                      | Default Set   | No inputs |         |                   |            |    |        |          |                 |
+| NumDef               | number        |           | 5       |                   |            |    | 5      | true     |                 |
+| NumDefVal            | number        |           | 5       |                   | 3-7        |    | 5      | true     |                 |
+| NumDefInv            | number        |           | 5       |                   | 10-        |    |        |          | 10 < 5 < 0      |
+| NumDefOpts           | number        |           | 5       | 1,3,5,7           | 2-6        |    | 5      | true     |                 |
+| NumDefNotOpts        | number        |           | 5       | 1,3,7,9           | 2-6        |    |        |          | valid option    |
+| NumDefInvOpt         | number        |           | 5       | 1,3,5,7           | 6-10       |    |        |          | 6 < 5 < 10      |
+| NumDefNotNum         | number        |           | a       |                   |            |    |        |          | type "number"   |
+| NumDefOptsNotNum     | number        |           | 1       | 1,a,2             |            |    |        |          | type "number"   |
+|                      |               |           |         |                   |            |    |        |          |                 |
+| StrDef               | string        |           | hello   |                   |            |    | hello  | true     |                 |
+| StrDefInv            | string        |           | hello   |                   | world      |    |        |          | regex error     |
+| StrDefOpts           | string        |           | a       | a,b,c             |            |    | a      | true     |                 |
+| StrDefNotOpts        | string        |           | a       | b,c,d             |            |    |        |          | valid option    |
+| StrDefValOpts        | string        |           | a       | a,b,c,d,e,f       | [a-c]      |    | a      | true     |                 |
+| StrDefInvOpt         | string        |           | d       | a,b,c,d,e,f       | [a-c]      |    |        |          | regex error     |
+|                      |               |           |         |                   |            |    |        |          |                 |
+| LStrDef              | list(string)  |           | ["a"]   |                   |            |    | ["a"]  | true     |                 |
+| LStrDefOpts          | list(string)  |           | ["a"]   | ["a"], ["b"]      |            |    | ["a"]  | true     |                 |
+| LStrDefNotOpts       | list(string)  |           | ["a"]   | ["b"], ["c"]      |            |    |        |          | valid option    |
+|                      |               |           |         |                   |            |    |        |          |                 |
+| MulDef               | tag-select    |           | ["a"]   |                   |            |    | ["a"]  | true     |                 |
+| MulDefOpts           | multi-select  |           | ["a"]   | a,b               |            |    | ["a"]  | true     |                 |
+| MulDefNotOpts        | multi-select  |           | ["a"]   | b,c               |            |    |        |          | valid option    |
+|                      |               |           |         |                   |            |    |        |          |                 |
+|                      | Input Vals    |           |         |                   |            |    |        |          |                 |
+| NumIns               | number        | 3         |         |                   |            |    | 3      | false    |                 |
+| NumInsOptsNaN        | number        | 3         | 5       | a,1,2,3,4,5       | 1-3        |    |        |          | type "number"   |
+| NumInsNotNum         | number        | a         |         |                   |            |    |        |          | type "number"   |
+| NumInsNotNumInv      | number        | a         |         |                   | 1-3        |    |        |          | 1 < a < 3       |
+| NumInsDef            | number        | 3         | 5       |                   |            |    | 3      | true     |                 |
+| NumIns/DefInv        | number        | 3         | 5       |                   | 1-3        |    | 3      | true     |                 |
+| NumIns=DefInv        | number        | 5         | 5       |                   | 1-3        |    |        |          | 1 < 5 < 3       |
+| NumInsOpts           | number        | 3         | 5       | 1,2,3,4,5         | 1-3        |    | 3      | true     |                 |
+| NumInsNotOptsVal     | number        | 3         | 5       | 1,2,4,5           | 1-3        |    |        |          | valid option    |
+| NumInsNotOptsInv     | number        | 3         | 5       | 1,2,4,5           | 1-2        |    |        | true     | valid option    |
+| NumInsNotOpts        | number        | 3         | 5       | 1,2,4,5           |            |    |        |          | valid option    |
+| NumInsNotOpts/NoDef  | number        | 3         |         | 1,2,4,5           |            |    |        |          | valid option    |
+|                      |               |           |         |                   |            |    |        |          |                 |
+| StrIns               | string        | c         |         |                   |            |    | c      | false    |                 |
+| StrInsDupeOpts       | string        | c         |         | a,b,c,c           |            |    |        |          | unique          |
+| StrInsDef            | string        | c         | e       |                   |            |    | c      | true     |                 |
+| StrIns/DefInv        | string        | c         | e       |                   | [a-c]      |    | c      | true     |                 |
+| StrIns=DefInv        | string        | e         | e       |                   | [a-c]      |    |        |          | regex error     |
+| StrInsOpts           | string        | c         | e       | a,b,c,d,e         | [a-c]      |    | c      | true     |                 |
+| StrInsNotOptsVal     | string        | c         | e       | a,b,d,e           | [a-c]      |    |        |          | valid option    |
+| StrInsNotOptsInv     | string        | c         | e       | a,b,d,e           | [a-b]      |    |        |          | valid option    |
+| StrInsNotOpts        | string        | c         | e       | a,b,d,e           |            |    |        |          | valid option    |
+| StrInsNotOpts/NoDef  | string        | c         |         | a,b,d,e           |            |    |        |          | valid option    |
+| StrInsBadVal         | string        | c         |         | a,b,c,d,e         | 1-10       |    |        |          | min cannot      |
+|                      |               |           |         |                   |            |    |        |          |                 |
+|                      | list(string)  |           |         |                   |            |    |        |          |                 |
+| LStrIns              | list(string)  | ["c"]     |         |                   |            |    | ["c"]  | false    |                 |
+| LStrInsNotList       | list(string)  | c         |         |                   |            |    |        |          | list of strings |
+| LStrInsDef           | list(string)  | ["c"]     | ["e"]   |                   |            |    | ["c"]  | true     |                 |
+| LStrIns/DefInv       | list(string)  | ["c"]     | ["e"]   |                   | [a-c]      |    |        |          | regex cannot    |
+| LStrInsOpts          | list(string)  | ["c"]     | ["e"]   | ["c"],["d"],["e"] |            |    | ["c"]  | true     |                 |
+| LStrInsNotOpts       | list(string)  | ["c"]     | ["e"]   | ["d"],["e"]       |            |    |        |          | valid option    |
+| LStrInsNotOpts/NoDef | list(string)  | ["c"]     |         | ["d"],["e"]       |            |    |        |          | valid option    |
+|                      |               |           |         |                   |            |    |        |          |                 |
+| MulInsOpts           | multi-select  | ["c"]     | ["e"]   | c,d,e             |            |    | ["c"]  | true     |                 |
+| MulInsNotListOpts    | multi-select  | c         | ["e"]   | c,d,e             |            |    |        |          | json encoded    |
+| MulInsNotOpts        | multi-select  | ["c"]     | ["e"]   | d,e               |            |    |        |          | valid option    |
+| MulInsNotOpts/NoDef  | multi-select  | ["c"]     |         | d,e               |            |    |        |          | valid option    |
+| MulInsInvOpts        | multi-select  | ["c"]     | ["e"]   | c,d,e             | [a-c]      |    |        |          | regex cannot    |
\ No newline at end of file

From 8692a56f55acb7a10f74c16f7f00b896c33ce02b Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Thu, 8 May 2025 09:36:57 -0500
Subject: [PATCH 12/30] feat: enforce monotonicity in terraform provider 
 (#392)

Previous value must come from env var.
---
 provider/parameter.go                |  55 ++++++++-
 provider/parameter_test.go           | 120 ++++++++++++++----
 provider/testdata/parameter_table.md | 175 +++++++++++++++------------
 3 files changed, 241 insertions(+), 109 deletions(-)

diff --git a/provider/parameter.go b/provider/parameter.go
index fd484578..f0a26c99 100644
--- a/provider/parameter.go
+++ b/provider/parameter.go
@@ -144,7 +144,13 @@ func parameterDataSource() *schema.Resource {
 				input = &envValue
 			}
 
-			value, diags := parameter.ValidateInput(input)
+			var previous *string
+			envPreviousValue, ok := os.LookupEnv(ParameterEnvironmentVariablePrevious(parameter.Name))
+			if ok {
+				previous = &envPreviousValue
+			}
+
+			value, diags := parameter.ValidateInput(input, previous)
 			if diags.HasError() {
 				return diags
 			}
@@ -395,7 +401,7 @@ func valueIsType(typ OptionType, value string) error {
 	return nil
 }
 
-func (v *Parameter) ValidateInput(input *string) (string, diag.Diagnostics) {
+func (v *Parameter) ValidateInput(input *string, previous *string) (string, diag.Diagnostics) {
 	var err error
 	var optionType OptionType
 
@@ -442,7 +448,7 @@ func (v *Parameter) ValidateInput(input *string) (string, diag.Diagnostics) {
 		forcedValue = *value
 	}
 
-	d := v.validValue(forcedValue, optionType, optionValues, valuePath)
+	d := v.validValue(forcedValue, previous, optionType, optionValues, valuePath)
 	if d.HasError() {
 		return "", d
 	}
@@ -506,7 +512,7 @@ func (v *Parameter) ValidOptions(optionType OptionType) (map[string]struct{}, di
 	return optionValues, nil
 }
 
-func (v *Parameter) validValue(value string, optionType OptionType, optionValues map[string]struct{}, path cty.Path) diag.Diagnostics {
+func (v *Parameter) validValue(value string, previous *string, optionType OptionType, optionValues map[string]struct{}, path cty.Path) diag.Diagnostics {
 	// name is used for constructing more precise error messages.
 	name := "Value"
 	if path.Equals(defaultValuePath) {
@@ -573,7 +579,7 @@ func (v *Parameter) validValue(value string, optionType OptionType, optionValues
 
 	if len(v.Validation) == 1 {
 		validCheck := &v.Validation[0]
-		err := validCheck.Valid(v.Type, value)
+		err := validCheck.Valid(v.Type, value, previous)
 		if err != nil {
 			return diag.Diagnostics{
 				{
@@ -589,7 +595,7 @@ func (v *Parameter) validValue(value string, optionType OptionType, optionValues
 	return nil
 }
 
-func (v *Validation) Valid(typ OptionType, value string) error {
+func (v *Validation) Valid(typ OptionType, value string, previous *string) error {
 	if typ != OptionTypeNumber {
 		if !v.MinDisabled {
 			return fmt.Errorf("a min cannot be specified for a %s type", typ)
@@ -639,6 +645,34 @@ func (v *Validation) Valid(typ OptionType, value string) error {
 		if v.Monotonic != "" && v.Monotonic != ValidationMonotonicIncreasing && v.Monotonic != ValidationMonotonicDecreasing {
 			return fmt.Errorf("number monotonicity can be either %q or %q", ValidationMonotonicIncreasing, ValidationMonotonicDecreasing)
 		}
+
+		switch v.Monotonic {
+		case "":
+			// No monotonicity check
+		case ValidationMonotonicIncreasing, ValidationMonotonicDecreasing:
+			if previous != nil { // Only check if previous value exists
+				previousNum, err := strconv.Atoi(*previous)
+				if err != nil {
+					// Do not throw an error for the previous value not being a number. Throwing an
+					// error here would cause an unrepairable state for the user. This is
+					// unfortunate, but there is not much we can do at this point.
+					// TODO: Maybe we should enforce this, and have the calling coderd
+					//  do something to resolve it. Such as doing this check before calling
+					//  terraform apply.
+					break
+				}
+
+				if v.Monotonic == ValidationMonotonicIncreasing && !(num >= previousNum) {
+					return fmt.Errorf("parameter value '%d' must be equal or greater than previous value: %d", num, previousNum)
+				}
+
+				if v.Monotonic == ValidationMonotonicDecreasing && !(num <= previousNum) {
+					return fmt.Errorf("parameter value '%d' must be equal or lower than previous value: %d", num, previousNum)
+				}
+			}
+		default:
+			return fmt.Errorf("number monotonicity can be either %q or %q", ValidationMonotonicIncreasing, ValidationMonotonicDecreasing)
+		}
 	case OptionTypeListString:
 		var listOfStrings []string
 		err := json.Unmarshal([]byte(value), &listOfStrings)
@@ -666,6 +700,15 @@ func ParameterEnvironmentVariable(name string) string {
 	return "CODER_PARAMETER_" + hex.EncodeToString(sum[:])
 }
 
+// ParameterEnvironmentVariablePrevious returns the environment variable to
+// specify for a parameter's previous value. This is used for workspace
+// subsequent builds after the first. Primarily to validate monotonicity in the
+// `validation` block.
+func ParameterEnvironmentVariablePrevious(name string) string {
+	sum := sha256.Sum256([]byte(name))
+	return "CODER_PARAMETER_PREVIOUS_" + hex.EncodeToString(sum[:])
+}
+
 func takeFirstError(errs ...error) error {
 	for _, err := range errs {
 		if err != nil {
diff --git a/provider/parameter_test.go b/provider/parameter_test.go
index 21842b6a..9b5e76f1 100644
--- a/provider/parameter_test.go
+++ b/provider/parameter_test.go
@@ -839,7 +839,7 @@ func TestParameterValidation(t *testing.T) {
 		t.Run(tc.Name, func(t *testing.T) {
 			t.Parallel()
 			value := &tc.Value
-			_, diags := tc.Parameter.ValidateInput(value)
+			_, diags := tc.Parameter.ValidateInput(value, nil)
 			if tc.ExpectError != nil {
 				require.True(t, diags.HasError())
 				errMsg := fmt.Sprintf("%+v", diags[0]) // close enough
@@ -881,6 +881,7 @@ func TestParameterValidationEnforcement(t *testing.T) {
 		OutputValue string
 		Optional    bool
 		CreateError *regexp.Regexp
+		Previous    *string
 	}
 
 	rows := make([]row, 0)
@@ -898,33 +899,44 @@ func TestParameterValidationEnforcement(t *testing.T) {
 			continue // Skip rows with empty names
 		}
 
-		optional, err := strconv.ParseBool(columns[8])
-		if columns[8] != "" {
+		cname, ctype, cprev, cinput, cdefault, coptions, cvalidation, _, coutput, coptional, cerr :=
+			columns[0], columns[1], columns[2], columns[3], columns[4], columns[5], columns[6], columns[7], columns[8], columns[9], columns[10]
+
+		optional, err := strconv.ParseBool(coptional)
+		if coptional != "" {
 			// Value does not matter if not specified
 			require.NoError(t, err)
 		}
 
 		var rerr *regexp.Regexp
-		if columns[9] != "" {
-			rerr, err = regexp.Compile(columns[9])
+		if cerr != "" {
+			rerr, err = regexp.Compile(cerr)
 			if err != nil {
-				t.Fatalf("failed to parse error column %q: %v", columns[9], err)
+				t.Fatalf("failed to parse error column %q: %v", cerr, err)
 			}
 		}
 
 		var options []string
-		if columns[4] != "" {
-			options = strings.Split(columns[4], ",")
+		if coptions != "" {
+			options = strings.Split(coptions, ",")
 		}
 
 		var validation *provider.Validation
-		if columns[5] != "" {
-			// Min-Max validation should look like:
-			//	1-10    :: min=1, max=10
-			//	-10     :: max=10
-			//	1-      :: min=1
-			if validMinMax.MatchString(columns[5]) {
-				parts := strings.Split(columns[5], "-")
+		if cvalidation != "" {
+			switch {
+			case cvalidation == provider.ValidationMonotonicIncreasing || cvalidation == provider.ValidationMonotonicDecreasing:
+				validation = &provider.Validation{
+					MinDisabled: true,
+					MaxDisabled: true,
+					Monotonic:   cvalidation,
+					Error:       "monotonicity",
+				}
+			case validMinMax.MatchString(cvalidation):
+				// Min-Max validation should look like:
+				//	1-10    :: min=1, max=10
+				//	-10     :: max=10
+				//	1-      :: min=1
+				parts := strings.Split(cvalidation, "-")
 				min, _ := strconv.ParseInt(parts[0], 10, 64)
 				max, _ := strconv.ParseInt(parts[1], 10, 64)
 				validation = &provider.Validation{
@@ -936,29 +948,37 @@ func TestParameterValidationEnforcement(t *testing.T) {
 					Regex:       "",
 					Error:       "{min} < {value} < {max}",
 				}
-			} else {
+			default:
 				validation = &provider.Validation{
 					Min:         0,
 					MinDisabled: true,
 					Max:         0,
 					MaxDisabled: true,
 					Monotonic:   "",
-					Regex:       columns[5],
+					Regex:       cvalidation,
 					Error:       "regex error",
 				}
 			}
 		}
 
+		var prev *string
+		if cprev != "" {
+			prev = ptr(cprev)
+			if cprev == `""` {
+				prev = ptr("")
+			}
+		}
 		rows = append(rows, row{
-			Name:        columns[0],
-			Types:       strings.Split(columns[1], ","),
-			InputValue:  columns[2],
-			Default:     columns[3],
+			Name:        cname,
+			Types:       strings.Split(ctype, ","),
+			InputValue:  cinput,
+			Default:     cdefault,
 			Options:     options,
 			Validation:  validation,
-			OutputValue: columns[7],
+			OutputValue: coutput,
 			Optional:    optional,
 			CreateError: rerr,
+			Previous:    prev,
 		})
 	}
 
@@ -976,6 +996,9 @@ func TestParameterValidationEnforcement(t *testing.T) {
 				if row.InputValue != "" {
 					t.Setenv(provider.ParameterEnvironmentVariable("parameter"), row.InputValue)
 				}
+				if row.Previous != nil {
+					t.Setenv(provider.ParameterEnvironmentVariablePrevious("parameter"), *row.Previous)
+				}
 
 				if row.CreateError != nil && row.OutputValue != "" {
 					t.Errorf("output value %q should not be set if both errors are set", row.OutputValue)
@@ -1067,6 +1090,7 @@ func TestValueValidatesType(t *testing.T) {
 		Name                     string
 		Type                     provider.OptionType
 		Value                    string
+		Previous                 *string
 		Regex                    string
 		RegexError               string
 		Min                      int
@@ -1154,6 +1178,56 @@ func TestValueValidatesType(t *testing.T) {
 		Min:       0,
 		Max:       2,
 		Monotonic: "decreasing",
+	}, {
+		Name:        "IncreasingMonotonicityEqual",
+		Type:        "number",
+		Previous:    ptr("1"),
+		Value:       "1",
+		Monotonic:   "increasing",
+		MinDisabled: true,
+		MaxDisabled: true,
+	}, {
+		Name:        "DecreasingMonotonicityEqual",
+		Type:        "number",
+		Value:       "1",
+		Previous:    ptr("1"),
+		Monotonic:   "decreasing",
+		MinDisabled: true,
+		MaxDisabled: true,
+	}, {
+		Name:        "IncreasingMonotonicityGreater",
+		Type:        "number",
+		Previous:    ptr("0"),
+		Value:       "1",
+		Monotonic:   "increasing",
+		MinDisabled: true,
+		MaxDisabled: true,
+	}, {
+		Name:        "DecreasingMonotonicityGreater",
+		Type:        "number",
+		Value:       "1",
+		Previous:    ptr("0"),
+		Monotonic:   "decreasing",
+		MinDisabled: true,
+		MaxDisabled: true,
+		Error:       regexp.MustCompile("must be equal or"),
+	}, {
+		Name:        "IncreasingMonotonicityLesser",
+		Type:        "number",
+		Previous:    ptr("2"),
+		Value:       "1",
+		Monotonic:   "increasing",
+		MinDisabled: true,
+		MaxDisabled: true,
+		Error:       regexp.MustCompile("must be equal or"),
+	}, {
+		Name:        "DecreasingMonotonicityLesser",
+		Type:        "number",
+		Value:       "1",
+		Previous:    ptr("2"),
+		Monotonic:   "decreasing",
+		MinDisabled: true,
+		MaxDisabled: true,
 	}, {
 		Name:        "ValidListOfStrings",
 		Type:        "list(string)",
@@ -1205,7 +1279,7 @@ func TestValueValidatesType(t *testing.T) {
 				Regex:       tc.Regex,
 				Error:       tc.RegexError,
 			}
-			err := v.Valid(tc.Type, tc.Value)
+			err := v.Valid(tc.Type, tc.Value, tc.Previous)
 			if tc.Error != nil {
 				require.Error(t, err)
 				require.True(t, tc.Error.MatchString(err.Error()), "got: %s", err.Error())
diff --git a/provider/testdata/parameter_table.md b/provider/testdata/parameter_table.md
index 3df16f06..6087460f 100644
--- a/provider/testdata/parameter_table.md
+++ b/provider/testdata/parameter_table.md
@@ -1,80 +1,95 @@
-| Name                 | Type          | Input     | Default | Options           | Validation | -> | Output | Optional | ErrorCreate     |
-|----------------------|---------------|-----------|---------|-------------------|------------|----|--------|----------|-----------------|
-|                      | Empty Vals    |           |         |                   |            |    |        |          |                 |
-| Empty                | string,number |           |         |                   |            |    | ""     | false    |                 |
-| EmptyDupeOps         | string,number |           |         | 1,1,1             |            |    |        |          | unique          |
-| EmptyList            | list(string)  |           |         |                   |            |    | ""     | false    |                 |
-| EmptyListDupeOpts    | list(string)  |           |         | ["a"],["a"]       |            |    |        |          | unique          |
-| EmptyMulti           | tag-select    |           |         |                   |            |    | ""     | false    |                 |
-| EmptyOpts            | string,number |           |         | 1,2,3             |            |    | ""     | false    |                 |
-| EmptyRegex           | string        |           |         |                   | world      |    |        |          | regex error     |
-| EmptyMin             | number        |           |         |                   | 1-10       |    |        |          | 1 <  < 10       |
-| EmptyMinOpt          | number        |           |         | 1,2,3             | 2-5        |    |        |          | valid option    |
-| EmptyRegexOpt        | string        |           |         | "hello","goodbye" | goodbye    |    |        |          | valid option    |
-| EmptyRegexOk         | string        |           |         |                   | .*         |    | ""     | false    |                 |
-|                      |               |           |         |                   |            |    |        |          |                 |
-|                      | Default Set   | No inputs |         |                   |            |    |        |          |                 |
-| NumDef               | number        |           | 5       |                   |            |    | 5      | true     |                 |
-| NumDefVal            | number        |           | 5       |                   | 3-7        |    | 5      | true     |                 |
-| NumDefInv            | number        |           | 5       |                   | 10-        |    |        |          | 10 < 5 < 0      |
-| NumDefOpts           | number        |           | 5       | 1,3,5,7           | 2-6        |    | 5      | true     |                 |
-| NumDefNotOpts        | number        |           | 5       | 1,3,7,9           | 2-6        |    |        |          | valid option    |
-| NumDefInvOpt         | number        |           | 5       | 1,3,5,7           | 6-10       |    |        |          | 6 < 5 < 10      |
-| NumDefNotNum         | number        |           | a       |                   |            |    |        |          | type "number"   |
-| NumDefOptsNotNum     | number        |           | 1       | 1,a,2             |            |    |        |          | type "number"   |
-|                      |               |           |         |                   |            |    |        |          |                 |
-| StrDef               | string        |           | hello   |                   |            |    | hello  | true     |                 |
-| StrDefInv            | string        |           | hello   |                   | world      |    |        |          | regex error     |
-| StrDefOpts           | string        |           | a       | a,b,c             |            |    | a      | true     |                 |
-| StrDefNotOpts        | string        |           | a       | b,c,d             |            |    |        |          | valid option    |
-| StrDefValOpts        | string        |           | a       | a,b,c,d,e,f       | [a-c]      |    | a      | true     |                 |
-| StrDefInvOpt         | string        |           | d       | a,b,c,d,e,f       | [a-c]      |    |        |          | regex error     |
-|                      |               |           |         |                   |            |    |        |          |                 |
-| LStrDef              | list(string)  |           | ["a"]   |                   |            |    | ["a"]  | true     |                 |
-| LStrDefOpts          | list(string)  |           | ["a"]   | ["a"], ["b"]      |            |    | ["a"]  | true     |                 |
-| LStrDefNotOpts       | list(string)  |           | ["a"]   | ["b"], ["c"]      |            |    |        |          | valid option    |
-|                      |               |           |         |                   |            |    |        |          |                 |
-| MulDef               | tag-select    |           | ["a"]   |                   |            |    | ["a"]  | true     |                 |
-| MulDefOpts           | multi-select  |           | ["a"]   | a,b               |            |    | ["a"]  | true     |                 |
-| MulDefNotOpts        | multi-select  |           | ["a"]   | b,c               |            |    |        |          | valid option    |
-|                      |               |           |         |                   |            |    |        |          |                 |
-|                      | Input Vals    |           |         |                   |            |    |        |          |                 |
-| NumIns               | number        | 3         |         |                   |            |    | 3      | false    |                 |
-| NumInsOptsNaN        | number        | 3         | 5       | a,1,2,3,4,5       | 1-3        |    |        |          | type "number"   |
-| NumInsNotNum         | number        | a         |         |                   |            |    |        |          | type "number"   |
-| NumInsNotNumInv      | number        | a         |         |                   | 1-3        |    |        |          | 1 < a < 3       |
-| NumInsDef            | number        | 3         | 5       |                   |            |    | 3      | true     |                 |
-| NumIns/DefInv        | number        | 3         | 5       |                   | 1-3        |    | 3      | true     |                 |
-| NumIns=DefInv        | number        | 5         | 5       |                   | 1-3        |    |        |          | 1 < 5 < 3       |
-| NumInsOpts           | number        | 3         | 5       | 1,2,3,4,5         | 1-3        |    | 3      | true     |                 |
-| NumInsNotOptsVal     | number        | 3         | 5       | 1,2,4,5           | 1-3        |    |        |          | valid option    |
-| NumInsNotOptsInv     | number        | 3         | 5       | 1,2,4,5           | 1-2        |    |        | true     | valid option    |
-| NumInsNotOpts        | number        | 3         | 5       | 1,2,4,5           |            |    |        |          | valid option    |
-| NumInsNotOpts/NoDef  | number        | 3         |         | 1,2,4,5           |            |    |        |          | valid option    |
-|                      |               |           |         |                   |            |    |        |          |                 |
-| StrIns               | string        | c         |         |                   |            |    | c      | false    |                 |
-| StrInsDupeOpts       | string        | c         |         | a,b,c,c           |            |    |        |          | unique          |
-| StrInsDef            | string        | c         | e       |                   |            |    | c      | true     |                 |
-| StrIns/DefInv        | string        | c         | e       |                   | [a-c]      |    | c      | true     |                 |
-| StrIns=DefInv        | string        | e         | e       |                   | [a-c]      |    |        |          | regex error     |
-| StrInsOpts           | string        | c         | e       | a,b,c,d,e         | [a-c]      |    | c      | true     |                 |
-| StrInsNotOptsVal     | string        | c         | e       | a,b,d,e           | [a-c]      |    |        |          | valid option    |
-| StrInsNotOptsInv     | string        | c         | e       | a,b,d,e           | [a-b]      |    |        |          | valid option    |
-| StrInsNotOpts        | string        | c         | e       | a,b,d,e           |            |    |        |          | valid option    |
-| StrInsNotOpts/NoDef  | string        | c         |         | a,b,d,e           |            |    |        |          | valid option    |
-| StrInsBadVal         | string        | c         |         | a,b,c,d,e         | 1-10       |    |        |          | min cannot      |
-|                      |               |           |         |                   |            |    |        |          |                 |
-|                      | list(string)  |           |         |                   |            |    |        |          |                 |
-| LStrIns              | list(string)  | ["c"]     |         |                   |            |    | ["c"]  | false    |                 |
-| LStrInsNotList       | list(string)  | c         |         |                   |            |    |        |          | list of strings |
-| LStrInsDef           | list(string)  | ["c"]     | ["e"]   |                   |            |    | ["c"]  | true     |                 |
-| LStrIns/DefInv       | list(string)  | ["c"]     | ["e"]   |                   | [a-c]      |    |        |          | regex cannot    |
-| LStrInsOpts          | list(string)  | ["c"]     | ["e"]   | ["c"],["d"],["e"] |            |    | ["c"]  | true     |                 |
-| LStrInsNotOpts       | list(string)  | ["c"]     | ["e"]   | ["d"],["e"]       |            |    |        |          | valid option    |
-| LStrInsNotOpts/NoDef | list(string)  | ["c"]     |         | ["d"],["e"]       |            |    |        |          | valid option    |
-|                      |               |           |         |                   |            |    |        |          |                 |
-| MulInsOpts           | multi-select  | ["c"]     | ["e"]   | c,d,e             |            |    | ["c"]  | true     |                 |
-| MulInsNotListOpts    | multi-select  | c         | ["e"]   | c,d,e             |            |    |        |          | json encoded    |
-| MulInsNotOpts        | multi-select  | ["c"]     | ["e"]   | d,e               |            |    |        |          | valid option    |
-| MulInsNotOpts/NoDef  | multi-select  | ["c"]     |         | d,e               |            |    |        |          | valid option    |
-| MulInsInvOpts        | multi-select  | ["c"]     | ["e"]   | c,d,e             | [a-c]      |    |        |          | regex cannot    |
\ No newline at end of file
+| Name                 | Type          | Previous | Input     | Default | Options           | Validation | -> | Output | Optional | ErrorCreate     |
+|----------------------|---------------|----------|-----------|---------|-------------------|------------|----|--------|----------|-----------------|
+|                      | Empty Vals    |          |           |         |                   |            |    |        |          |                 |
+| Empty                | string,number |          |           |         |                   |            |    | ""     | false    |                 |
+| EmptyDupeOps         | string,number |          |           |         | 1,1,1             |            |    |        |          | unique          |
+| EmptyList            | list(string)  |          |           |         |                   |            |    | ""     | false    |                 |
+| EmptyListDupeOpts    | list(string)  |          |           |         | ["a"],["a"]       |            |    |        |          | unique          |
+| EmptyMulti           | tag-select    |          |           |         |                   |            |    | ""     | false    |                 |
+| EmptyOpts            | string,number |          |           |         | 1,2,3             |            |    | ""     | false    |                 |
+| EmptyRegex           | string        |          |           |         |                   | world      |    |        |          | regex error     |
+| EmptyMin             | number        |          |           |         |                   | 1-10       |    |        |          | 1 <  < 10       |
+| EmptyMinOpt          | number        |          |           |         | 1,2,3             | 2-5        |    |        |          | valid option    |
+| EmptyRegexOpt        | string        |          |           |         | "hello","goodbye" | goodbye    |    |        |          | valid option    |
+| EmptyRegexOk         | string        |          |           |         |                   | .*         |    | ""     | false    |                 |
+|                      |               |          |           |         |                   |            |    |        |          |                 |
+|                      | Default Set   |          | No inputs |         |                   |            |    |        |          |                 |
+| NumDef               | number        |          |           | 5       |                   |            |    | 5      | true     |                 |
+| NumDefVal            | number        |          |           | 5       |                   | 3-7        |    | 5      | true     |                 |
+| NumDefInv            | number        |          |           | 5       |                   | 10-        |    |        |          | 10 < 5 < 0      |
+| NumDefOpts           | number        |          |           | 5       | 1,3,5,7           | 2-6        |    | 5      | true     |                 |
+| NumDefNotOpts        | number        |          |           | 5       | 1,3,7,9           | 2-6        |    |        |          | valid option    |
+| NumDefInvOpt         | number        |          |           | 5       | 1,3,5,7           | 6-10       |    |        |          | 6 < 5 < 10      |
+| NumDefNotNum         | number        |          |           | a       |                   |            |    |        |          | type "number"   |
+| NumDefOptsNotNum     | number        |          |           | 1       | 1,a,2             |            |    |        |          | type "number"   |
+| NumDefInc            | number        | 4        |           | 5       |                   | increasing |    | 5      | true     |                 |
+| NumDefIncBad         | number        | 6        |           | 5       |                   | increasing |    |        |          | greater         |
+| NumDefDec            | number        | 6        |           | 5       |                   | decreasing |    | 5      | true     |                 |
+| NumDefDecBad         | number        | 4        |           | 5       |                   | decreasing |    |        |          | lower           |
+| NumDefDecEq          | number        | 5        |           | 5       |                   | decreasing |    | 5      | true     |                 |
+| NumDefIncEq          | number        | 5        |           | 5       |                   | increasing |    | 5      | true     |                 |
+| NumDefIncNaN         | number        | a        |           | 5       |                   | increasing |    | 5      | true     |                 |
+| NumDefDecNaN         | number        | b        |           | 5       |                   | decreasing |    | 5      | true     |                 |
+|                      |               |          |           |         |                   |            |    |        |          |                 |
+| StrDef               | string        |          |           | hello   |                   |            |    | hello  | true     |                 |
+| StrMonotonicity      | string        |          |           | hello   |                   | increasing |    |        |          | monotonic       |
+| StrDefInv            | string        |          |           | hello   |                   | world      |    |        |          | regex error     |
+| StrDefOpts           | string        |          |           | a       | a,b,c             |            |    | a      | true     |                 |
+| StrDefNotOpts        | string        |          |           | a       | b,c,d             |            |    |        |          | valid option    |
+| StrDefValOpts        | string        |          |           | a       | a,b,c,d,e,f       | [a-c]      |    | a      | true     |                 |
+| StrDefInvOpt         | string        |          |           | d       | a,b,c,d,e,f       | [a-c]      |    |        |          | regex error     |
+|                      |               |          |           |         |                   |            |    |        |          |                 |
+| LStrDef              | list(string)  |          |           | ["a"]   |                   |            |    | ["a"]  | true     |                 |
+| LStrDefOpts          | list(string)  |          |           | ["a"]   | ["a"], ["b"]      |            |    | ["a"]  | true     |                 |
+| LStrDefNotOpts       | list(string)  |          |           | ["a"]   | ["b"], ["c"]      |            |    |        |          | valid option    |
+|                      |               |          |           |         |                   |            |    |        |          |                 |
+| MulDef               | tag-select    |          |           | ["a"]   |                   |            |    | ["a"]  | true     |                 |
+| MulDefOpts           | multi-select  |          |           | ["a"]   | a,b               |            |    | ["a"]  | true     |                 |
+| MulDefNotOpts        | multi-select  |          |           | ["a"]   | b,c               |            |    |        |          | valid option    |
+|                      |               |          |           |         |                   |            |    |        |          |                 |
+|                      | Input Vals    |          |           |         |                   |            |    |        |          |                 |
+| NumIns               | number        |          | 3         |         |                   |            |    | 3      | false    |                 |
+| NumInsOptsNaN        | number        |          | 3         | 5       | a,1,2,3,4,5       | 1-3        |    |        |          | type "number"   |
+| NumInsNotNum         | number        |          | a         |         |                   |            |    |        |          | type "number"   |
+| NumInsNotNumInv      | number        |          | a         |         |                   | 1-3        |    |        |          | 1 < a < 3       |
+| NumInsDef            | number        |          | 3         | 5       |                   |            |    | 3      | true     |                 |
+| NumIns/DefInv        | number        |          | 3         | 5       |                   | 1-3        |    | 3      | true     |                 |
+| NumIns=DefInv        | number        |          | 5         | 5       |                   | 1-3        |    |        |          | 1 < 5 < 3       |
+| NumInsOpts           | number        |          | 3         | 5       | 1,2,3,4,5         | 1-3        |    | 3      | true     |                 |
+| NumInsNotOptsVal     | number        |          | 3         | 5       | 1,2,4,5           | 1-3        |    |        |          | valid option    |
+| NumInsNotOptsInv     | number        |          | 3         | 5       | 1,2,4,5           | 1-2        |    |        | true     | valid option    |
+| NumInsNotOpts        | number        |          | 3         | 5       | 1,2,4,5           |            |    |        |          | valid option    |
+| NumInsNotOpts/NoDef  | number        |          | 3         |         | 1,2,4,5           |            |    |        |          | valid option    |
+| NumInsInc            | number        | 4        | 5         | 3       |                   | increasing |    | 5      | true     |                 |
+| NumInsIncBad         | number        | 6        | 5         | 7       |                   | increasing |    |        |          | greater         |
+| NumInsDec            | number        | 6        | 5         | 7       |                   | decreasing |    | 5      | true     |                 |
+| NumInsDecBad         | number        | 4        | 5         | 3       |                   | decreasing |    |        |          | lower           |
+| NumInsDecEq          | number        | 5        | 5         | 5       |                   | decreasing |    | 5      | true     |                 |
+| NumInsIncEq          | number        | 5        | 5         | 5       |                   | increasing |    | 5      | true     |                 |
+|                      |               |          |           |         |                   |            |    |        |          |                 |
+| StrIns               | string        |          | c         |         |                   |            |    | c      | false    |                 |
+| StrInsDupeOpts       | string        |          | c         |         | a,b,c,c           |            |    |        |          | unique          |
+| StrInsDef            | string        |          | c         | e       |                   |            |    | c      | true     |                 |
+| StrIns/DefInv        | string        |          | c         | e       |                   | [a-c]      |    | c      | true     |                 |
+| StrIns=DefInv        | string        |          | e         | e       |                   | [a-c]      |    |        |          | regex error     |
+| StrInsOpts           | string        |          | c         | e       | a,b,c,d,e         | [a-c]      |    | c      | true     |                 |
+| StrInsNotOptsVal     | string        |          | c         | e       | a,b,d,e           | [a-c]      |    |        |          | valid option    |
+| StrInsNotOptsInv     | string        |          | c         | e       | a,b,d,e           | [a-b]      |    |        |          | valid option    |
+| StrInsNotOpts        | string        |          | c         | e       | a,b,d,e           |            |    |        |          | valid option    |
+| StrInsNotOpts/NoDef  | string        |          | c         |         | a,b,d,e           |            |    |        |          | valid option    |
+| StrInsBadVal         | string        |          | c         |         | a,b,c,d,e         | 1-10       |    |        |          | min cannot      |
+|                      |               |          |           |         |                   |            |    |        |          |                 |
+|                      | list(string)  |          |           |         |                   |            |    |        |          |                 |
+| LStrIns              | list(string)  |          | ["c"]     |         |                   |            |    | ["c"]  | false    |                 |
+| LStrInsNotList       | list(string)  |          | c         |         |                   |            |    |        |          | list of strings |
+| LStrInsDef           | list(string)  |          | ["c"]     | ["e"]   |                   |            |    | ["c"]  | true     |                 |
+| LStrIns/DefInv       | list(string)  |          | ["c"]     | ["e"]   |                   | [a-c]      |    |        |          | regex cannot    |
+| LStrInsOpts          | list(string)  |          | ["c"]     | ["e"]   | ["c"],["d"],["e"] |            |    | ["c"]  | true     |                 |
+| LStrInsNotOpts       | list(string)  |          | ["c"]     | ["e"]   | ["d"],["e"]       |            |    |        |          | valid option    |
+| LStrInsNotOpts/NoDef | list(string)  |          | ["c"]     |         | ["d"],["e"]       |            |    |        |          | valid option    |
+|                      |               |          |           |         |                   |            |    |        |          |                 |
+| MulInsOpts           | multi-select  |          | ["c"]     | ["e"]   | c,d,e             |            |    | ["c"]  | true     |                 |
+| MulInsNotListOpts    | multi-select  |          | c         | ["e"]   | c,d,e             |            |    |        |          | json encoded    |
+| MulInsNotOpts        | multi-select  |          | ["c"]     | ["e"]   | d,e               |            |    |        |          | valid option    |
+| MulInsNotOpts/NoDef  | multi-select  |          | ["c"]     |         | d,e               |            |    |        |          | valid option    |
+| MulInsInvOpts        | multi-select  |          | ["c"]     | ["e"]   | c,d,e             | [a-c]      |    |        |          | regex cannot    |
\ No newline at end of file

From 4126ff41a540cd3c34dbf034fa1e4b269f38da70 Mon Sep 17 00:00:00 2001
From: Sas Swart <sas.swart.cdk@gmail.com>
Date: Fri, 9 May 2025 09:41:58 +0200
Subject: [PATCH 13/30] docs: link to additional documentation for prebuilt
 workspaces (#395)

* docs: link to additional documentation for prebuilt workspaces

* improve wording
---
 docs/data-sources/workspace_preset.md | 6 +++---
 provider/workspace_preset.go          | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/data-sources/workspace_preset.md b/docs/data-sources/workspace_preset.md
index edd61f18..14e235f9 100644
--- a/docs/data-sources/workspace_preset.md
+++ b/docs/data-sources/workspace_preset.md
@@ -3,12 +3,12 @@
 page_title: "coder_workspace_preset Data Source - terraform-provider-coder"
 subcategory: ""
 description: |-
-  Use this data source to predefine common configurations for coder workspaces. Users will have the option to select a defined preset, which will automatically apply the selected configuration. Any parameters defined in the preset will be applied to the workspace. Parameters that are not defined by the preset will still be configurable when creating a workspace.
+  Use this data source to predefine common configurations for coder workspaces. Users will have the option to select a defined preset, which will automatically apply the selected configuration. Any parameters defined in the preset will be applied to the workspace. Parameters that are defined by the template but not defined by the preset will still be configurable when creating a workspace.
 ---
 
 # coder_workspace_preset (Data Source)
 
-Use this data source to predefine common configurations for coder workspaces. Users will have the option to select a defined preset, which will automatically apply the selected configuration. Any parameters defined in the preset will be applied to the workspace. Parameters that are not defined by the preset will still be configurable when creating a workspace.
+Use this data source to predefine common configurations for coder workspaces. Users will have the option to select a defined preset, which will automatically apply the selected configuration. Any parameters defined in the preset will be applied to the workspace. Parameters that are defined by the template but not defined by the preset will still be configurable when creating a workspace.
 
 ## Example Usage
 
@@ -39,7 +39,7 @@ data "coder_workspace_preset" "example" {
 ### Optional
 
 - `parameters` (Map of String) Workspace parameters that will be set by the workspace preset. For simple templates that only need prebuilds, you may define a preset with zero parameters. Because workspace parameters may change between Coder template versions, preset parameters are allowed to define values for parameters that do not exist in the current template version.
-- `prebuilds` (Block Set, Max: 1) Prebuilt workspace configuration related to this workspace preset. Coder will build and maintain workspaces in reserve based on this configuration. When a user creates a new workspace using a preset, they will be assigned a prebuilt workspace, instead of waiting for a new workspace to build. (see [below for nested schema](#nestedblock--prebuilds))
+- `prebuilds` (Block Set, Max: 1) Configuration for prebuilt workspaces associated with this preset. Coder will maintain a pool of standby workspaces based on this configuration. When a user creates a workspace using this preset, they are assigned a prebuilt workspace instead of waiting for a new one to build. See prebuilt workspace documentation [here](https://coder.com/docs/admin/templates/extending-templates/prebuilt-workspaces.md) (see [below for nested schema](#nestedblock--prebuilds))
 
 ### Read-Only
 
diff --git a/provider/workspace_preset.go b/provider/workspace_preset.go
index 2fab0b8a..78466c10 100644
--- a/provider/workspace_preset.go
+++ b/provider/workspace_preset.go
@@ -28,7 +28,8 @@ func workspacePresetDataSource() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
 
-		Description: "Use this data source to predefine common configurations for coder workspaces. Users will have the option to select a defined preset, which will automatically apply the selected configuration. Any parameters defined in the preset will be applied to the workspace. Parameters that are not defined by the preset will still be configurable when creating a workspace.",
+		Description: "Use this data source to predefine common configurations for coder workspaces. Users will have the option to select a defined preset, which will automatically apply the selected configuration. Any parameters defined in the preset will be applied to the workspace. Parameters that are defined by the template but not defined by the preset will still be configurable when creating a workspace.",
+
 		ReadContext: func(ctx context.Context, rd *schema.ResourceData, i interface{}) diag.Diagnostics {
 			var preset WorkspacePreset
 			err := mapstructure.Decode(struct {
@@ -68,7 +69,7 @@ func workspacePresetDataSource() *schema.Resource {
 			},
 			"prebuilds": {
 				Type:        schema.TypeSet,
-				Description: "Prebuilt workspace configuration related to this workspace preset. Coder will build and maintain workspaces in reserve based on this configuration. When a user creates a new workspace using a preset, they will be assigned a prebuilt workspace, instead of waiting for a new workspace to build.",
+				Description: "Configuration for prebuilt workspaces associated with this preset. Coder will maintain a pool of standby workspaces based on this configuration. When a user creates a workspace using this preset, they are assigned a prebuilt workspace instead of waiting for a new one to build. See prebuilt workspace documentation [here](https://coder.com/docs/admin/templates/extending-templates/prebuilt-workspaces.md)",
 				Optional:    true,
 				MaxItems:    1,
 				Elem: &schema.Resource{

From 50ed1c120bb89a31c90881522fde10929f8a0004 Mon Sep 17 00:00:00 2001
From: Danny Kopping <dannykopping@gmail.com>
Date: Fri, 9 May 2025 18:44:08 +0200
Subject: [PATCH 14/30] feat: expose `is_prebuild_claim` attribute (#396)

* feat: expose is_prebuild_claim attribute

Signed-off-by: Danny Kopping <dannykopping@gmail.com>

* fix: string comparison hardening

Signed-off-by: Danny Kopping <dannykopping@gmail.com>

---------

Signed-off-by: Danny Kopping <dannykopping@gmail.com>
---
 docs/data-sources/workspace.md |   1 +
 provider/workspace.go          |  44 +++++++++++-
 provider/workspace_test.go     | 120 +++++++++++++++++++++++++++++++++
 3 files changed, 164 insertions(+), 1 deletion(-)

diff --git a/docs/data-sources/workspace.md b/docs/data-sources/workspace.md
index 29fd9179..4dacdfc3 100644
--- a/docs/data-sources/workspace.md
+++ b/docs/data-sources/workspace.md
@@ -70,6 +70,7 @@ resource "docker_container" "workspace" {
 - `access_url` (String) The access URL of the Coder deployment provisioning this workspace.
 - `id` (String) UUID of the workspace.
 - `is_prebuild` (Boolean) Similar to `prebuild_count`, but a boolean value instead of a count. This is set to true if the workspace is a currently unassigned prebuild. Once the workspace is assigned, this value will be false.
+- `is_prebuild_claim` (Boolean) Indicates whether a prebuilt workspace has just been claimed and this is the first `apply` after that occurrence.
 - `name` (String) Name of the workspace.
 - `prebuild_count` (Number) A computed count, equal to 1 if the workspace is a currently unassigned prebuild. Use this to conditionally act on the status of a prebuild. Actions that do not require user identity can be taken when this value is set to 1. Actions that should only be taken once the workspace has been assigned to a user may be taken when this value is set to 0.
 - `start_count` (Number) A computed count based on `transition` state. If `start`, count will equal 1.
diff --git a/provider/workspace.go b/provider/workspace.go
index c477fad6..58100a88 100644
--- a/provider/workspace.go
+++ b/provider/workspace.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"reflect"
 	"strconv"
+	"strings"
 
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -30,10 +31,23 @@ func workspaceDataSource() *schema.Resource {
 			if isPrebuiltWorkspace() {
 				_ = rd.Set("prebuild_count", 1)
 				_ = rd.Set("is_prebuild", true)
+
+				// A claim can only take place AFTER a prebuild, so it's not logically consistent to have this set to any other value.
+				_ = rd.Set("is_prebuild_claim", false)
 			} else {
 				_ = rd.Set("prebuild_count", 0)
 				_ = rd.Set("is_prebuild", false)
 			}
+			if isPrebuiltWorkspaceClaim() {
+				// Indicate that a prebuild claim has taken place.
+				_ = rd.Set("is_prebuild_claim", true)
+
+				// A claim can only take place AFTER a prebuild, so it's not logically consistent to have these set to any other values.
+				_ = rd.Set("prebuild_count", 0)
+				_ = rd.Set("is_prebuild", false)
+			} else {
+				_ = rd.Set("is_prebuild_claim", false)
+			}
 
 			name := helpers.OptionalEnvOrDefault("CODER_WORKSPACE_NAME", "default")
 			rd.Set("name", name)
@@ -116,6 +130,11 @@ func workspaceDataSource() *schema.Resource {
 				Computed:    true,
 				Description: "Similar to `prebuild_count`, but a boolean value instead of a count. This is set to true if the workspace is a currently unassigned prebuild. Once the workspace is assigned, this value will be false.",
 			},
+			"is_prebuild_claim": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "Indicates whether a prebuilt workspace has just been claimed and this is the first `apply` after that occurrence.",
+			},
 			"name": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -142,7 +161,12 @@ func workspaceDataSource() *schema.Resource {
 
 // isPrebuiltWorkspace returns true if the workspace is an unclaimed prebuilt workspace.
 func isPrebuiltWorkspace() bool {
-	return helpers.OptionalEnv(IsPrebuildEnvironmentVariable()) == "true"
+	return strings.EqualFold(helpers.OptionalEnv(IsPrebuildEnvironmentVariable()), "true")
+}
+
+// isPrebuiltWorkspaceClaim returns true if the workspace is a prebuilt workspace which has just been claimed.
+func isPrebuiltWorkspaceClaim() bool {
+	return strings.EqualFold(helpers.OptionalEnv(IsPrebuildClaimEnvironmentVariable()), "true")
 }
 
 // IsPrebuildEnvironmentVariable returns the name of the environment variable that
@@ -161,3 +185,21 @@ func isPrebuiltWorkspace() bool {
 func IsPrebuildEnvironmentVariable() string {
 	return "CODER_WORKSPACE_IS_PREBUILD"
 }
+
+// IsPrebuildClaimEnvironmentVariable returns the name of the environment variable that
+// indicates whether the workspace is a prebuilt workspace which has just been claimed, and this is the first Terraform
+// apply after that occurrence.
+//
+// Knowing whether the workspace is a claimed prebuilt workspace allows template
+// authors to conditionally execute code in the template based on whether the workspace
+// has been assigned to a user or not. This allows identity specific configuration to
+// be applied only after the workspace is claimed, while the rest of the workspace can
+// be pre-configured.
+//
+// The value of this environment variable should be set to "true" if the workspace is prebuilt
+// and it has just been claimed by a user. Any other values, including "false"
+// and "" will be interpreted to mean that the workspace is not prebuilt, or was
+// prebuilt but has not been claimed by a user.
+func IsPrebuildClaimEnvironmentVariable() string {
+	return "CODER_WORKSPACE_IS_PREBUILD_CLAIM"
+}
diff --git a/provider/workspace_test.go b/provider/workspace_test.go
index e82a1005..17dfabd2 100644
--- a/provider/workspace_test.go
+++ b/provider/workspace_test.go
@@ -4,6 +4,7 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/coder/terraform-provider-coder/v2/provider"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/stretchr/testify/assert"
@@ -102,3 +103,122 @@ func TestWorkspace_MissingTemplateName(t *testing.T) {
 		}},
 	})
 }
+
+// TestWorkspace_PrebuildEnv validates that our handling of input environment variables is correct.
+func TestWorkspace_PrebuildEnv(t *testing.T) {
+	cases := []struct {
+		name  string
+		envs  map[string]string
+		check func(state *terraform.State, resource *terraform.ResourceState) error
+	}{
+		{
+			name: "unused",
+			envs: map[string]string{},
+			check: func(state *terraform.State, resource *terraform.ResourceState) error {
+				attribs := resource.Primary.Attributes
+				assert.Equal(t, "false", attribs["is_prebuild"])
+				assert.Equal(t, "0", attribs["prebuild_count"])
+				assert.Equal(t, "false", attribs["is_prebuild_claim"])
+				return nil
+			},
+		},
+		{
+			name: "prebuild=true",
+			envs: map[string]string{
+				provider.IsPrebuildEnvironmentVariable(): "true",
+			},
+			check: func(state *terraform.State, resource *terraform.ResourceState) error {
+				attribs := resource.Primary.Attributes
+				assert.Equal(t, "true", attribs["is_prebuild"])
+				assert.Equal(t, "1", attribs["prebuild_count"])
+				assert.Equal(t, "false", attribs["is_prebuild_claim"])
+				return nil
+			},
+		},
+		{
+			name: "prebuild=false",
+			envs: map[string]string{
+				provider.IsPrebuildEnvironmentVariable(): "false",
+			},
+			check: func(state *terraform.State, resource *terraform.ResourceState) error {
+				attribs := resource.Primary.Attributes
+				assert.Equal(t, "false", attribs["is_prebuild"])
+				assert.Equal(t, "0", attribs["prebuild_count"])
+				assert.Equal(t, "false", attribs["is_prebuild_claim"])
+				return nil
+			},
+		},
+		{
+			name: "prebuild_claim=true",
+			envs: map[string]string{
+				provider.IsPrebuildClaimEnvironmentVariable(): "true",
+			},
+			check: func(state *terraform.State, resource *terraform.ResourceState) error {
+				attribs := resource.Primary.Attributes
+				assert.Equal(t, "false", attribs["is_prebuild"])
+				assert.Equal(t, "0", attribs["prebuild_count"])
+				assert.Equal(t, "true", attribs["is_prebuild_claim"])
+				return nil
+			},
+		},
+		{
+			name: "prebuild_claim=false",
+			envs: map[string]string{
+				provider.IsPrebuildClaimEnvironmentVariable(): "false",
+			},
+			check: func(state *terraform.State, resource *terraform.ResourceState) error {
+				attribs := resource.Primary.Attributes
+				assert.Equal(t, "false", attribs["is_prebuild"])
+				assert.Equal(t, "0", attribs["prebuild_count"])
+				assert.Equal(t, "false", attribs["is_prebuild_claim"])
+				return nil
+			},
+		},
+		{
+			// Should not ever happen, but let's ensure our defensive check is activated. We can't ever have both flags
+			// being true.
+			name: "prebuild=true,prebuild_claim=true",
+			envs: map[string]string{
+				provider.IsPrebuildEnvironmentVariable():      "true",
+				provider.IsPrebuildClaimEnvironmentVariable(): "true",
+			},
+			check: func(state *terraform.State, resource *terraform.ResourceState) error {
+				attribs := resource.Primary.Attributes
+				assert.Equal(t, "false", attribs["is_prebuild"])
+				assert.Equal(t, "0", attribs["prebuild_count"])
+				assert.Equal(t, "true", attribs["is_prebuild_claim"])
+				return nil
+			},
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			for k, v := range tc.envs {
+				t.Setenv(k, v)
+			}
+
+			resource.Test(t, resource.TestCase{
+				ProviderFactories: coderFactory(),
+				IsUnitTest:        true,
+				Steps: []resource.TestStep{{
+					Config: `
+provider "coder" {
+	url = "https://example.com:8080"
+}
+data "coder_workspace" "me" {
+}`,
+					Check: func(state *terraform.State) error {
+						// Baseline checks
+						require.Len(t, state.Modules, 1)
+						require.Len(t, state.Modules[0].Resources, 1)
+						resource := state.Modules[0].Resources["data.coder_workspace.me"]
+						require.NotNil(t, resource)
+
+						return tc.check(state, resource)
+					},
+				}},
+			})
+		})
+	}
+}

From 760b9fffa39ded6b1f2660fbf6ecb2746c801426 Mon Sep 17 00:00:00 2001
From: Danny Kopping <dannykopping@gmail.com>
Date: Mon, 12 May 2025 09:04:03 +0200
Subject: [PATCH 15/30] chore: add tag_sort option to goreleaser (#398)

Choose more recently-created tag if multiple tags point to same ref

Signed-off-by: Danny Kopping <dannykopping@gmail.com>
---
 .goreleaser.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 658a715c..8b2c0012 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -60,3 +60,5 @@ changelog:
   use: github-native
   sort: asc
   abbrev: 0
+git:
+  tag_sort: -version:creatordate # if two tags reference the same commit, pick the latest one; see https://github.com/goreleaser/goreleaser/issues/4209
\ No newline at end of file

From ff49ef5840f013950b47b20090ae7acdc35fc1a5 Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Mon, 12 May 2025 07:53:13 -0500
Subject: [PATCH 16/30] test: add unit test to document behavior when no new
 value exists (#394)

---
 provider/testdata/parameter_table.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/provider/testdata/parameter_table.md b/provider/testdata/parameter_table.md
index 6087460f..980a6d19 100644
--- a/provider/testdata/parameter_table.md
+++ b/provider/testdata/parameter_table.md
@@ -12,6 +12,8 @@
 | EmptyMinOpt          | number        |          |           |         | 1,2,3             | 2-5        |    |        |          | valid option    |
 | EmptyRegexOpt        | string        |          |           |         | "hello","goodbye" | goodbye    |    |        |          | valid option    |
 | EmptyRegexOk         | string        |          |           |         |                   | .*         |    | ""     | false    |                 |
+| EmptyInc             | number        | 4        |           |         |                   | increasing |    |        |          | monotonicity    |
+| EmptyDec             | number        | 4        |           |         |                   | decreasing |    |        |          | monotonicity    |
 |                      |               |          |           |         |                   |            |    |        |          |                 |
 |                      | Default Set   |          | No inputs |         |                   |            |    |        |          |                 |
 | NumDef               | number        |          |           | 5       |                   |            |    | 5      | true     |                 |

From 01334b626acc918967f0519759618dc86b6f0fb9 Mon Sep 17 00:00:00 2001
From: Thomas Kosiewski <thoma471@googlemail.com>
Date: Thu, 15 May 2025 15:33:50 +0100
Subject: [PATCH 17/30] feat(agent): add api_key_scope to control agent token
 permissions (#391)

---
 .gitignore                                 |  3 +
 docs/resources/agent.md                    |  8 +-
 examples/resources/coder_agent/resource.tf |  7 +-
 flake.lock                                 |  8 +-
 flake.nix                                  |  6 +-
 provider/agent.go                          | 11 +++
 provider/agent_test.go                     | 91 ++++++++++++++++++++++
 7 files changed, 121 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d5d5ad6..ff9f6a53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,6 @@ website/vendor
 
 # Binary
 terraform-provider-coder
+
+# direnv
+.direnv
diff --git a/docs/resources/agent.md b/docs/resources/agent.md
index 7c28b1f4..7df11e34 100644
--- a/docs/resources/agent.md
+++ b/docs/resources/agent.md
@@ -17,9 +17,10 @@ data "coder_workspace" "me" {
 }
 
 resource "coder_agent" "dev" {
-  os   = "linux"
-  arch = "amd64"
-  dir  = "/workspace"
+  os            = "linux"
+  arch          = "amd64"
+  dir           = "/workspace"
+  api_key_scope = "all"
   display_apps {
     vscode          = true
     vscode_insiders = false
@@ -71,6 +72,7 @@ resource "kubernetes_pod" "dev" {
 
 ### Optional
 
+- `api_key_scope` (String) Controls what API routes the agent token can access. Options: 'all' (full access) or 'no_user_data' (blocks /external-auth, /gitsshkey, and /gitauth routes)
 - `auth` (String) The authentication type the agent will use. Must be one of: `"token"`, `"google-instance-identity"`, `"aws-instance-identity"`, `"azure-instance-identity"`.
 - `connection_timeout` (Number) Time in seconds until the agent is marked as timed out when a connection with the server cannot be established. A value of zero never marks the agent as timed out.
 - `dir` (String) The starting directory when a user creates a shell session. Defaults to `"$HOME"`.
diff --git a/examples/resources/coder_agent/resource.tf b/examples/resources/coder_agent/resource.tf
index 6ccb07bf..7c219604 100644
--- a/examples/resources/coder_agent/resource.tf
+++ b/examples/resources/coder_agent/resource.tf
@@ -2,9 +2,10 @@ data "coder_workspace" "me" {
 }
 
 resource "coder_agent" "dev" {
-  os   = "linux"
-  arch = "amd64"
-  dir  = "/workspace"
+  os            = "linux"
+  arch          = "amd64"
+  dir           = "/workspace"
+  api_key_scope = "all"
   display_apps {
     vscode          = true
     vscode_insiders = false
diff --git a/flake.lock b/flake.lock
index d8033e14..ecf99d98 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714272655,
-        "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=",
+        "lastModified": 1746422338,
+        "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf",
+        "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 87719bf4..40ceb861 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,11 @@
   description = "Terraform provider for Coder";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, ... }:
+  outputs = { nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
@@ -21,7 +21,7 @@
           name = "devShell";
           buildInputs = with pkgs; [
             terraform
-            go_1_20
+            go_1_24
           ];
         };
       }
diff --git a/provider/agent.go b/provider/agent.go
index ad264030..ebd8fff5 100644
--- a/provider/agent.go
+++ b/provider/agent.go
@@ -80,6 +80,17 @@ func agentResource() *schema.Resource {
 			return nil
 		},
 		Schema: map[string]*schema.Schema{
+			"api_key_scope": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Default:     "all",
+				ForceNew:    true,
+				Description: "Controls what API routes the agent token can access. Options: 'all' (full access) or 'no_user_data' (blocks /external-auth, /gitsshkey, and /gitauth routes)",
+				ValidateFunc: validation.StringInSlice([]string{
+					"all",
+					"no_user_data",
+				}, false),
+			},
 			"init_script": {
 				Type:        schema.TypeString,
 				Computed:    true,
diff --git a/provider/agent_test.go b/provider/agent_test.go
index a45ac86a..82e8691f 100644
--- a/provider/agent_test.go
+++ b/provider/agent_test.go
@@ -709,5 +709,96 @@ func TestAgent_DisplayApps(t *testing.T) {
 			}},
 		})
 	})
+}
+
+// TestAgent_APIKeyScope tests valid states/transitions and invalid values for api_key_scope.
+func TestAgent_APIKeyScope(t *testing.T) {
+	t.Parallel()
+
+	t.Run("ValidTransitions", func(t *testing.T) {
+		t.Parallel()
+
+		resourceName := "coder_agent.test_scope_valid"
 
+		resource.Test(t, resource.TestCase{
+			ProviderFactories: coderFactory(),
+			IsUnitTest:        true,
+			Steps: []resource.TestStep{
+				// Step 1: Default value
+				{
+					Config: `
+						provider "coder" {
+							url = "https://example.com"
+						}
+						resource "coder_agent" "test_scope_valid" {
+							os   = "linux"
+							arch = "amd64"
+							# api_key_scope is omitted, should default to "default"
+						}
+					`,
+					Check: resource.ComposeTestCheckFunc(
+						resource.TestCheckResourceAttr(resourceName, "api_key_scope", "all"),
+					),
+				},
+				// Step 2: Explicit "default"
+				{
+					Config: `
+						provider "coder" {
+							url = "https://example.com"
+						}
+						resource "coder_agent" "test_scope_valid" {
+							os              = "linux"
+							arch            = "amd64"
+							api_key_scope   = "all"
+						}
+					`,
+					Check: resource.ComposeTestCheckFunc(
+						resource.TestCheckResourceAttr(resourceName, "api_key_scope", "all"),
+					),
+				},
+				// Step 3: Explicit "no_user_data"
+				{
+					Config: `
+						provider "coder" {
+							url = "https://example.com"
+						}
+						resource "coder_agent" "test_scope_valid" {
+							os              = "linux"
+							arch            = "amd64"
+							api_key_scope   = "no_user_data"
+						}
+					`,
+					Check: resource.ComposeTestCheckFunc(
+						resource.TestCheckResourceAttr(resourceName, "api_key_scope", "no_user_data"),
+					),
+				},
+			},
+		})
+	})
+
+	t.Run("InvalidValue", func(t *testing.T) {
+		t.Parallel()
+
+		resource.Test(t, resource.TestCase{
+			ProviderFactories: coderFactory(),
+			IsUnitTest:        true,
+			Steps: []resource.TestStep{
+				// Step 1: Invalid value check
+				{
+					Config: `
+						provider "coder" {
+							url = "https://example.com"
+						}
+						resource "coder_agent" "test_scope_invalid" { // Use unique name
+							os              = "linux"
+							arch            = "amd64"
+							api_key_scope   = "invalid-scope"
+						}
+					`,
+					ExpectError: regexp.MustCompile(`expected api_key_scope to be one of \["all" "no_user_data"\], got invalid-scope`),
+					PlanOnly:    true,
+				},
+			},
+		})
+	})
 }

From ace4462675ffbab17e098dff330ce50ece20b7fe Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Sun, 18 May 2025 09:15:30 -0500
Subject: [PATCH 18/30] fix: allow dropdown form_type for boolean types (#397)

* fix: allow dropdown form_type for boolean types

* add dropdown boolean test
---
 provider/formtype.go      | 2 +-
 provider/formtype_test.go | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/provider/formtype.go b/provider/formtype.go
index 75d32c46..931179da 100644
--- a/provider/formtype.go
+++ b/provider/formtype.go
@@ -99,7 +99,7 @@ var formTypeTruthTable = map[OptionType]map[bool][]ParameterFormType{
 		false: {ParameterFormTypeInput, ParameterFormTypeSlider},
 	},
 	OptionTypeBoolean: {
-		true:  {ParameterFormTypeRadio},
+		true:  {ParameterFormTypeRadio, ParameterFormTypeDropdown},
 		false: {ParameterFormTypeCheckbox, ParameterFormTypeSwitch},
 	},
 	OptionTypeListString: {
diff --git a/provider/formtype_test.go b/provider/formtype_test.go
index eaf7b587..2f3dff53 100644
--- a/provider/formtype_test.go
+++ b/provider/formtype_test.go
@@ -193,6 +193,11 @@ func TestValidateFormType(t *testing.T) {
 			optionType: provider.OptionTypeBoolean,
 			formType:   provider.ParameterFormTypeRadio,
 		}),
+		expectSameFormType(formTypeCheck{
+			options:    true,
+			optionType: provider.OptionTypeBoolean,
+			formType:   provider.ParameterFormTypeDropdown,
+		}),
 		expectSameFormType(formTypeCheck{
 			options:    false,
 			optionType: provider.OptionTypeBoolean,

From 77de38e09cca9ca228b63bb53f32ba0ae75a1f2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 May 2025 09:15:33 +0100
Subject: [PATCH 19/30] build(deps): Bump
 github.com/hashicorp/terraform-plugin-sdk/v2 (#400)

Bumps [github.com/hashicorp/terraform-plugin-sdk/v2](https://github.com/hashicorp/terraform-plugin-sdk) from 2.36.1 to 2.37.0.
- [Release notes](https://github.com/hashicorp/terraform-plugin-sdk/releases)
- [Changelog](https://github.com/hashicorp/terraform-plugin-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/hashicorp/terraform-plugin-sdk/compare/v2.36.1...v2.37.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/terraform-plugin-sdk/v2
  dependency-version: 2.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod |  49 ++++++++++----------
 go.sum | 142 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 94 insertions(+), 97 deletions(-)

diff --git a/go.mod b/go.mod
index 2d3db5d0..7b0b437c 100644
--- a/go.mod
+++ b/go.mod
@@ -5,25 +5,25 @@ go 1.24.2
 require (
 	github.com/docker/docker v26.1.5+incompatible
 	github.com/google/uuid v1.6.0
-	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
+	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
 	github.com/masterminds/semver v1.5.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
-	golang.org/x/mod v0.23.0
+	golang.org/x/mod v0.24.0
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 )
 
 require (
 	github.com/Masterminds/semver v1.5.0 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v1.1.3 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/ProtonMail/go-crypto v1.1.6 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cloudflare/circl v1.6.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
@@ -35,26 +35,25 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.6.2 // indirect
+	github.com/hashicorp/go-plugin v1.6.3 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
-	github.com/hashicorp/hc-install v0.9.1 // indirect
+	github.com/hashicorp/hc-install v0.9.2 // indirect
 	github.com/hashicorp/hcl/v2 v2.23.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.22.0 // indirect
-	github.com/hashicorp/terraform-json v0.24.0 // indirect
-	github.com/hashicorp/terraform-plugin-go v0.26.0 // indirect
-	github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
+	github.com/hashicorp/terraform-exec v0.23.0 // indirect
+	github.com/hashicorp/terraform-json v0.25.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.27.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.5 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -69,27 +68,27 @@ require (
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/zclconf/go-cty v1.16.2 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
-	go.opentelemetry.io/otel v1.31.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
-	go.opentelemetry.io/otel/metric v1.31.0 // indirect
-	go.opentelemetry.io/otel/trace v1.31.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.22.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.69.4 // indirect
-	google.golang.org/protobuf v1.36.3 // indirect
+	google.golang.org/grpc v1.72.1 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.5.1 // indirect
 )
diff --git a/go.sum b/go.sum
index 77c61771..0531c5e1 100644
--- a/go.sum
+++ b/go.sum
@@ -4,10 +4,10 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
-github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
 github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
@@ -17,13 +17,12 @@ github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZ
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
+github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
+github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
-github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
+github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -44,10 +43,10 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.6.0 h1:w2hPNtoehvJIxR00Vb4xX94qHQi/ApZfX+nBE2Cjio8=
-github.com/go-git/go-billy/v5 v5.6.0/go.mod h1:sFDq7xD3fn3E0GOwUSZqHo9lrkmx8xJhA0ZrfvjBRGM=
-github.com/go-git/go-git/v5 v5.13.0 h1:vLn5wlGIh/X78El6r3Jr+30W16Blk0CTcxTYcYPWi5E=
-github.com/go-git/go-git/v5 v5.13.0/go.mod h1:Wjo7/JyVKtQgUNdXYXIepzWfJQkUEIGvkvVkiXRR/zw=
+github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
+github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
+github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi60=
+github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -57,8 +56,8 @@ github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
 github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -66,8 +65,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
@@ -80,14 +79,14 @@ github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuD
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI=
-github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs=
+github.com/hashicorp/go-cty v1.5.0 h1:EkQ/v+dDNUqnuVpmS5fPqyY71NXVgT5gf32+57xY8g0=
+github.com/hashicorp/go-cty v1.5.0/go.mod h1:lFUCG5kd8exDobgSfyj4ONE/dc822kiYMguVKdHGMLM=
 github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.6.2 h1:zdGAEd0V1lCaU0u+MxWQhtSDQmahpkwOun8U8EiRVog=
-github.com/hashicorp/go-plugin v1.6.2/go.mod h1:CkgLQ5CZqNmdL9U9JzM532t8ZiYQ35+pj3b1FD37R0Q=
+github.com/hashicorp/go-plugin v1.6.3 h1:xgHB+ZUSYeuJi96WtxEjzi23uh7YQpznjGh0U0UUrwg=
+github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0=
 github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
 github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -95,24 +94,24 @@ github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/C
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
 github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/hc-install v0.9.1 h1:gkqTfE3vVbafGQo6VZXcy2v5yoz2bE0+nhZXruCuODQ=
-github.com/hashicorp/hc-install v0.9.1/go.mod h1:pWWvN/IrfeBK4XPeXXYkL6EjMufHkCK5DvwxeLKuBf0=
+github.com/hashicorp/hc-install v0.9.2 h1:v80EtNX4fCVHqzL9Lg/2xkp62bbvQMnvPQ0G+OmtO24=
+github.com/hashicorp/hc-install v0.9.2/go.mod h1:XUqBQNnuT4RsxoxiM9ZaUk0NX8hi2h+Lb6/c0OZnC/I=
 github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos=
 github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
 github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/terraform-exec v0.22.0 h1:G5+4Sz6jYZfRYUCg6eQgDsqTzkNXV+fP8l+uRmZHj64=
-github.com/hashicorp/terraform-exec v0.22.0/go.mod h1:bjVbsncaeh8jVdhttWYZuBGj21FcYw6Ia/XfHcNO7lQ=
-github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=
-github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=
-github.com/hashicorp/terraform-plugin-go v0.26.0 h1:cuIzCv4qwigug3OS7iKhpGAbZTiypAfFQmw8aE65O2M=
-github.com/hashicorp/terraform-plugin-go v0.26.0/go.mod h1:+CXjuLDiFgqR+GcrM5a2E2Kal5t5q2jb0E3D57tTdNY=
+github.com/hashicorp/terraform-exec v0.23.0 h1:MUiBM1s0CNlRFsCLJuM5wXZrzA3MnPYEsiXmzATMW/I=
+github.com/hashicorp/terraform-exec v0.23.0/go.mod h1:mA+qnx1R8eePycfwKkCRk3Wy65mwInvlpAeOwmA7vlY=
+github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=
+github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=
+github.com/hashicorp/terraform-plugin-go v0.27.0 h1:ujykws/fWIdsi6oTUT5Or4ukvEan4aN9lY+LOxVP8EE=
+github.com/hashicorp/terraform-plugin-go v0.27.0/go.mod h1:FDa2Bb3uumkTGSkTFpWSOwWJDwA7bf3vdP3ltLDTH6o=
 github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
 github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1 h1:WNMsTLkZf/3ydlgsuXePa3jvZFwAJhruxTxP/c1Viuw=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1/go.mod h1:P6o64QS97plG44iFzSM6rAn6VJIC/Sy9a9IkEtl79K4=
-github.com/hashicorp/terraform-registry-address v0.2.4 h1:JXu/zHB2Ymg/TGVCRu10XqNa4Sh2bWcqCNyKWjnCPJA=
-github.com/hashicorp/terraform-registry-address v0.2.4/go.mod h1:tUNYTVyCtU4OIGXXMDp7WNcJ+0W1B4nmstVDgHMjfAU=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 h1:NFPMacTrY/IdcIcnUB+7hsore1ZaRWU9cnB6jFoBnIM=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0/go.mod h1:QYmYnLfsosrxjCnGY1p9c7Zj6n9thnEE+7RObeYs3fA=
+github.com/hashicorp/terraform-registry-address v0.2.5 h1:2GTftHqmUhVOeuu9CW3kwDkRe4pcBDq0uuK5VJngU1M=
+github.com/hashicorp/terraform-registry-address v0.2.5/go.mod h1:PpzXWINwB5kuVS5CA7m1+eO2f1jKb5ZDIxrOPfpnGkg=
 github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=
 github.com/hashicorp/terraform-svchost v0.1.1/go.mod h1:mNsjQfZyf/Jhz35v6/0LWcv26+X7JPS+buii2c9/ctc=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
@@ -126,8 +125,8 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -165,24 +164,22 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
-github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
-github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
+github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
-github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
+github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
+github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
@@ -203,52 +200,54 @@ github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70
 github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0=
-go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY=
-go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY=
-go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE=
-go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY=
-go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk=
-go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0=
-go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=
-go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
-go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys=
-go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94=
 go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
-golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -263,17 +262,16 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -293,16 +291,16 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs
 google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
-google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
-google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA=
+google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
-google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

From a4f40659a9be991eaaa6d833781fbdb942c2e308 Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Mon, 19 May 2025 11:27:50 -0500
Subject: [PATCH 20/30] fix: map_structure of form_type to match argument name
 (#401)

* fix: map_structure of form_type to match argument name
* chore: required on anonymouse struct too
---
 provider/parameter.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/provider/parameter.go b/provider/parameter.go
index f0a26c99..de6e60f0 100644
--- a/provider/parameter.go
+++ b/provider/parameter.go
@@ -54,7 +54,7 @@ type Parameter struct {
 	DisplayName string `mapstructure:"display_name"`
 	Description string
 	Type        OptionType
-	FormType    ParameterFormType
+	FormType    ParameterFormType `mapstructure:"form_type"`
 	Mutable     bool
 	Default     *string
 	Icon        string
@@ -86,10 +86,10 @@ func parameterDataSource() *schema.Resource {
 			var parameter Parameter
 			err = mapstructure.Decode(struct {
 				Name        interface{}
-				DisplayName interface{}
+				DisplayName interface{} `mapstructure:"display_name"`
 				Description interface{}
 				Type        interface{}
-				FormType    interface{}
+				FormType    interface{} `mapstructure:"form_type"`
 				Mutable     interface{}
 				Default     interface{}
 				Icon        interface{}

From 0c7fd6a3950b2195043df792087d6a33b4e14369 Mon Sep 17 00:00:00 2001
From: Susana Ferreira <ssncferreira@gmail.com>
Date: Wed, 21 May 2025 12:12:26 +0100
Subject: [PATCH 21/30] docs: update README note for local provider testing
 with correct module path (#403)

* docs: update README note for local provider testing with correct module path

* docs: improve sentence structure

* docs: remove extra backtick
---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f055961e..4ae9be15 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,13 @@ to setup your local Terraform to use your local version rather than the registry
    2. Run `terraform init` and observe a warning like `Warning: Provider development overrides are in effect`
 4. Run `make build` to build the provider binary, which Terraform will try locate and execute
 5. All local Terraform runs will now use your local provider!
-6. _**NOTE**: we vendor in this provider into `github.com/coder/coder`, so if you're testing with a local clone then you should also run `go mod edit -replace github.com/coder/terraform-provider-coder=/path/to/terraform-provider-coder` in your clone._
+6. **NOTE**: We vendor this provider into `github.com/coder/coder`, so if you're testing with a local clone, make sure to run the following in your local clone of `coder`:
+   ```console
+   go mod edit -replace github.com/coder/terraform-provider-coder/v2=/path/to/terraform-provider-coder
+   go mod tidy
+   ```
+   ⚠️ Be sure to include `/v2` in the module path as it needs to match the version declared in the provider’s `go.mod`.
+
 
 #### Terraform Acceptance Tests
 

From 74899537ddc92f178bb9129645649889f8e0af32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=B1=E3=82=A4=E3=83=A9?= <mckayla@hey.com>
Date: Wed, 21 May 2025 10:00:16 -0600
Subject: [PATCH 22/30] feat: add `group` attribute to `coder_app` resource
 (#402)

---
 docs/resources/app.md | 1 +
 provider/app.go       | 6 ++++++
 provider/app_test.go  | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/resources/app.md b/docs/resources/app.md
index b3ac728f..338b1837 100644
--- a/docs/resources/app.md
+++ b/docs/resources/app.md
@@ -63,6 +63,7 @@ resource "coder_app" "vim" {
 - `command` (String) A command to run in a terminal opening this app. In the web, this will open in a new tab. In the CLI, this will SSH and execute the command. Either `command` or `url` may be specified, but not both.
 - `display_name` (String) A display name to identify the app. Defaults to the slug.
 - `external` (Boolean) Specifies whether `url` is opened on the client machine instead of proxied through the workspace.
+- `group` (String) The name of a group that this app belongs to.
 - `healthcheck` (Block Set, Max: 1) HTTP health checking to determine the application readiness. (see [below for nested schema](#nestedblock--healthcheck))
 - `hidden` (Boolean) Determines if the app is visible in the UI (minimum Coder version: v2.16).
 - `icon` (String) A URL to an icon that will display in the dashboard. View built-in icons here: https://github.com/coder/coder/tree/main/site/static/icon. Use a built-in icon with `"${data.coder_workspace.me.access_url}/icon/<path>"`.
diff --git a/provider/app.go b/provider/app.go
index 2d0d6b09..213372b4 100644
--- a/provider/app.go
+++ b/provider/app.go
@@ -223,6 +223,12 @@ func appResource() *schema.Resource {
 					},
 				},
 			},
+			"group": {
+				Type:        schema.TypeString,
+				Description: "The name of a group that this app belongs to.",
+				ForceNew:    true,
+				Optional:    true,
+			},
 			"order": {
 				Type:        schema.TypeInt,
 				Description: "The order determines the position of app in the UI presentation. The lowest order is shown first and apps with equal order are sorted by name (ascending order).",
diff --git a/provider/app_test.go b/provider/app_test.go
index 444b6b0d..aeb42d08 100644
--- a/provider/app_test.go
+++ b/provider/app_test.go
@@ -40,6 +40,7 @@ func TestApp(t *testing.T) {
 						interval = 5
 						threshold = 6
 					}
+					group = "Apps"
 					order = 4
 					hidden = false
 					open_in = "slim-window"
@@ -63,6 +64,7 @@ func TestApp(t *testing.T) {
 						"healthcheck.0.url",
 						"healthcheck.0.interval",
 						"healthcheck.0.threshold",
+						"group",
 						"order",
 						"hidden",
 						"open_in",
@@ -476,5 +478,4 @@ func TestApp(t *testing.T) {
 			})
 		}
 	})
-
 }

From 28dae7fbc263efcaaa33f5ec448004fa47109858 Mon Sep 17 00:00:00 2001
From: Susana Ferreira <ssncferreira@gmail.com>
Date: Fri, 23 May 2025 19:45:31 +0100
Subject: [PATCH 23/30] feat: add expiration_policy parameter to prebuild
 resource (#404)

* feat: add cache_invalidation parameter to prebuild resource

* fix: formatting

* fix: remove TODO comment

* fix: cache_invalidation block in integration tests

* fix: main.tf integration test

* fix: test Prebuilds_is_set_with_a_cache_invalidation_field_without_its_required_fields

* fix: remove printf

* chore: add comment about partial match in preset test

* chore: add comment about cache_invalidation struct as slice

* chore: add max validation of 604800 seconds (7 days) for invalidate_after_secs to prevent stale prebuilds

* chores: update terraform schema to expiration_policy.ttl & update max validation ttl value to 1 year

* fix: comment
---
 docs/data-sources/workspace_preset.md | 11 ++++
 integration/integration_test.go       | 11 ++--
 integration/test-data-source/main.tf  |  4 ++
 provider/workspace_preset.go          | 28 ++++++++++
 provider/workspace_preset_test.go     | 77 +++++++++++++++++++++++++++
 5 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/docs/data-sources/workspace_preset.md b/docs/data-sources/workspace_preset.md
index 14e235f9..cd4908c2 100644
--- a/docs/data-sources/workspace_preset.md
+++ b/docs/data-sources/workspace_preset.md
@@ -51,3 +51,14 @@ data "coder_workspace_preset" "example" {
 Required:
 
 - `instances` (Number) The number of workspaces to keep in reserve for this preset.
+
+Optional:
+
+- `expiration_policy` (Block Set, Max: 1) Configuration block that defines TTL (time-to-live) behavior for prebuilds. Use this to automatically invalidate and delete prebuilds after a certain period, ensuring they stay up-to-date. (see [below for nested schema](#nestedblock--prebuilds--expiration_policy))
+
+<a id="nestedblock--prebuilds--expiration_policy"></a>
+### Nested Schema for `prebuilds.expiration_policy`
+
+Required:
+
+- `ttl` (Number) Time in seconds after which an unclaimed prebuild is considered expired and eligible for cleanup.
diff --git a/integration/integration_test.go b/integration/integration_test.go
index a5019635..36612904 100644
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -90,11 +90,12 @@ func TestIntegration(t *testing.T) {
 				// TODO (sasswart): the cli doesn't support presets yet.
 				// once it does, the value for workspace_parameter.value
 				// will be the preset value.
-				"workspace_parameter.value":            `param value`,
-				"workspace_parameter.icon":             `param icon`,
-				"workspace_preset.name":                `preset`,
-				"workspace_preset.parameters.param":    `preset param value`,
-				"workspace_preset.prebuilds.instances": `1`,
+				"workspace_parameter.value":                        `param value`,
+				"workspace_parameter.icon":                         `param icon`,
+				"workspace_preset.name":                            `preset`,
+				"workspace_preset.parameters.param":                `preset param value`,
+				"workspace_preset.prebuilds.instances":             `1`,
+				"workspace_preset.prebuilds.expiration_policy.ttl": `86400`,
 			},
 		},
 		{
diff --git a/integration/test-data-source/main.tf b/integration/test-data-source/main.tf
index f18fa347..50274fff 100644
--- a/integration/test-data-source/main.tf
+++ b/integration/test-data-source/main.tf
@@ -27,6 +27,9 @@ data "coder_workspace_preset" "preset" {
 
   prebuilds {
     instances = 1
+    expiration_policy {
+      ttl = 86400
+    }
   }
 }
 
@@ -52,6 +55,7 @@ locals {
     "workspace_preset.name" : data.coder_workspace_preset.preset.name,
     "workspace_preset.parameters.param" : data.coder_workspace_preset.preset.parameters.param,
     "workspace_preset.prebuilds.instances" : tostring(one(data.coder_workspace_preset.preset.prebuilds).instances),
+    "workspace_preset.prebuilds.expiration_policy.ttl" : tostring(one(one(data.coder_workspace_preset.preset.prebuilds).expiration_policy).ttl),
   }
 }
 
diff --git a/provider/workspace_preset.go b/provider/workspace_preset.go
index 78466c10..e9c697c7 100644
--- a/provider/workspace_preset.go
+++ b/provider/workspace_preset.go
@@ -22,6 +22,16 @@ type WorkspacePreset struct {
 
 type WorkspacePrebuild struct {
 	Instances int `mapstructure:"instances"`
+	// There should always be only one expiration_policy block, but Terraform's type system
+	// still parses them as a slice, so we need to handle it as such. We could use
+	// an anonymous type and rd.Get to avoid a slice here, but that would not be possible
+	// for utilities that parse our terraform output using this type. To remain compatible
+	// with those cases, we use a slice here.
+	ExpirationPolicy []ExpirationPolicy `mapstructure:"expiration_policy"`
+}
+
+type ExpirationPolicy struct {
+	TTL int `mapstructure:"ttl"`
 }
 
 func workspacePresetDataSource() *schema.Resource {
@@ -81,6 +91,24 @@ func workspacePresetDataSource() *schema.Resource {
 							ForceNew:     true,
 							ValidateFunc: validation.IntAtLeast(0),
 						},
+						"expiration_policy": {
+							Type:        schema.TypeSet,
+							Description: "Configuration block that defines TTL (time-to-live) behavior for prebuilds. Use this to automatically invalidate and delete prebuilds after a certain period, ensuring they stay up-to-date.",
+							Optional:    true,
+							MaxItems:    1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"ttl": {
+										Type:        schema.TypeInt,
+										Description: "Time in seconds after which an unclaimed prebuild is considered expired and eligible for cleanup.",
+										Required:    true,
+										ForceNew:    true,
+										// Ensure TTL is between 0 and 31536000 seconds (1 year) to prevent stale prebuilds
+										ValidateFunc: validation.IntBetween(0, 31536000),
+									},
+								},
+							},
+						},
 					},
 				},
 			},
diff --git a/provider/workspace_preset_test.go b/provider/workspace_preset_test.go
index aa1ca0ce..d9f7da46 100644
--- a/provider/workspace_preset_test.go
+++ b/provider/workspace_preset_test.go
@@ -144,6 +144,83 @@ func TestWorkspacePreset(t *testing.T) {
 				return nil
 			},
 		},
+		{
+			Name: "Prebuilds is set with a expiration_policy field without its required fields",
+			Config: `
+			data "coder_workspace_preset" "preset_1" {
+				name = "preset_1"
+				parameters = {
+					"region" = "us-east1-a"
+				}
+				prebuilds {
+					instances = 1
+					expiration_policy {}
+				}
+			}`,
+			ExpectError: regexp.MustCompile("The argument \"ttl\" is required, but no definition was found."),
+		},
+		{
+			Name: "Prebuilds is set with a expiration_policy field with its required fields",
+			Config: `
+			data "coder_workspace_preset" "preset_1" {
+				name = "preset_1"
+				parameters = {
+					"region" = "us-east1-a"
+				}
+				prebuilds {
+					instances = 1
+					expiration_policy {
+						ttl = 86400
+					}
+				}
+			}`,
+			ExpectError: nil,
+			Check: func(state *terraform.State) error {
+				require.Len(t, state.Modules, 1)
+				require.Len(t, state.Modules[0].Resources, 1)
+				resource := state.Modules[0].Resources["data.coder_workspace_preset.preset_1"]
+				require.NotNil(t, resource)
+				attrs := resource.Primary.Attributes
+				require.Equal(t, attrs["name"], "preset_1")
+				require.Equal(t, attrs["prebuilds.0.expiration_policy.0.ttl"], "86400")
+				return nil
+			},
+		},
+		{
+			Name: "Prebuilds block with expiration_policy.ttl set to 2 years (exceeds 1 year limit)",
+			Config: `
+			data "coder_workspace_preset" "preset_1" {
+				name = "preset_1"
+				parameters = {
+					"region" = "us-east1-a"
+				}
+				prebuilds {
+					instances = 1
+					expiration_policy {
+						ttl = 63072000
+					}
+				}
+			}`,
+			ExpectError: regexp.MustCompile(`expected prebuilds.0.expiration_policy.0.ttl to be in the range \(0 - 31536000\), got 63072000`),
+		},
+		{
+			Name: "Prebuilds is set with a expiration_policy field with its required fields and an unexpected argument",
+			Config: `
+			data "coder_workspace_preset" "preset_1" {
+				name = "preset_1"
+				parameters = {
+					"region" = "us-east1-a"
+				}
+				prebuilds {
+					instances = 1
+					expiration_policy {
+						ttl = 86400
+						invalid_argument = "test"
+					}
+				}
+			}`,
+			ExpectError: regexp.MustCompile("An argument named \"invalid_argument\" is not expected here."),
+		},
 	}
 
 	for _, testcase := range testcases {

From 18bfe55780d3f0cd5f9c86c37e3941c80383ac92 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Tue, 27 May 2025 02:57:38 -0700
Subject: [PATCH 24/30] Refactor documentation for parameter types and icons
 (#405)

---
 docs/data-sources/parameter.md | 14 +++++++-------
 docs/resources/agent.md        |  2 +-
 docs/resources/app.md          |  2 +-
 docs/resources/devcontainer.md |  7 +++++--
 provider/agent.go              |  2 +-
 provider/app.go                |  2 +-
 provider/devcontainer.go       |  2 +-
 provider/parameter.go          | 14 +++++++-------
 8 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/docs/data-sources/parameter.md b/docs/data-sources/parameter.md
index 934ae77a..ecba3929 100644
--- a/docs/data-sources/parameter.md
+++ b/docs/data-sources/parameter.md
@@ -145,13 +145,13 @@ data "coder_parameter" "home_volume_size" {
 - `description` (String) Describe what this parameter does.
 - `display_name` (String) The displayed name of the parameter as it will appear in the interface.
 - `ephemeral` (Boolean) The value of an ephemeral parameter will not be preserved between consecutive workspace builds.
-- `form_type` (String) The type of this parameter. Must be one of: [radio, slider, input, dropdown, checkbox, switch, multi-select, tag-select, textarea, error].
+- `form_type` (String) The type of this parameter. Must be one of: `"radio"`, `"slider"`, `"input"`, `"dropdown"`, `"checkbox"`, `"switch"`, `"multi-select"`, `"tag-select"`, `"textarea"`, `"error"`.
 - `icon` (String) A URL to an icon that will display in the dashboard. View built-in icons [here](https://github.com/coder/coder/tree/main/site/static/icon). Use a built-in icon with `"${data.coder_workspace.me.access_url}/icon/<path>"`.
 - `mutable` (Boolean) Whether this value can be changed after workspace creation. This can be destructive for values like region, so use with caution!
 - `option` (Block List) Each `option` block defines a value for a user to select from. (see [below for nested schema](#nestedblock--option))
 - `order` (Number) The order determines the position of a template parameter in the UI/CLI presentation. The lowest order is shown first and parameters with equal order are sorted by name (ascending order).
 - `styling` (String) JSON encoded string containing the metadata for controlling the appearance of this parameter in the UI. This option is purely cosmetic and does not affect the function of the parameter in terraform.
-- `type` (String) The type of this parameter. Must be one of: `"number"`, `"string"`, `"bool"`, or `"list(string)"`.
+- `type` (String) The type of this parameter. Must be one of: `"string"`, `"number"`, `"bool"`, `"list(string)"`.
 - `validation` (Block List, Max: 1) Validate the input of a parameter. (see [below for nested schema](#nestedblock--validation))
 
 ### Read-Only
@@ -179,13 +179,13 @@ Optional:
 
 Optional:
 
-- `error` (String) An error message to display if the value breaks the validation rules. The following placeholders are supported: {max}, {min}, and {value}.
-- `max` (Number) The maximum of a number parameter.
-- `min` (Number) The minimum of a number parameter.
+- `error` (String) An error message to display if the value breaks the validation rules. The following placeholders are supported: `{max}`, `{min}`, and `{value}`.
+- `max` (Number) The maximum value of a number parameter.
+- `min` (Number) The minimum value of a number parameter.
 - `monotonic` (String) Number monotonicity, either increasing or decreasing.
 - `regex` (String) A regex for the input parameter to match against.
 
 Read-Only:
 
-- `max_disabled` (Boolean) Helper field to check if max is present
-- `min_disabled` (Boolean) Helper field to check if min is present
+- `max_disabled` (Boolean) Helper field to check if `max` is present
+- `min_disabled` (Boolean) Helper field to check if `min` is present
diff --git a/docs/resources/agent.md b/docs/resources/agent.md
index 7df11e34..87ab4239 100644
--- a/docs/resources/agent.md
+++ b/docs/resources/agent.md
@@ -72,7 +72,7 @@ resource "kubernetes_pod" "dev" {
 
 ### Optional
 
-- `api_key_scope` (String) Controls what API routes the agent token can access. Options: 'all' (full access) or 'no_user_data' (blocks /external-auth, /gitsshkey, and /gitauth routes)
+- `api_key_scope` (String) Controls what API routes the agent token can access. Options: `all` (full access) or `no_user_data` (blocks `/external-auth`, `/gitsshkey`, and `/gitauth` routes)
 - `auth` (String) The authentication type the agent will use. Must be one of: `"token"`, `"google-instance-identity"`, `"aws-instance-identity"`, `"azure-instance-identity"`.
 - `connection_timeout` (Number) Time in seconds until the agent is marked as timed out when a connection with the server cannot be established. A value of zero never marks the agent as timed out.
 - `dir` (String) The starting directory when a user creates a shell session. Defaults to `"$HOME"`.
diff --git a/docs/resources/app.md b/docs/resources/app.md
index 338b1837..6be99cf3 100644
--- a/docs/resources/app.md
+++ b/docs/resources/app.md
@@ -66,7 +66,7 @@ resource "coder_app" "vim" {
 - `group` (String) The name of a group that this app belongs to.
 - `healthcheck` (Block Set, Max: 1) HTTP health checking to determine the application readiness. (see [below for nested schema](#nestedblock--healthcheck))
 - `hidden` (Boolean) Determines if the app is visible in the UI (minimum Coder version: v2.16).
-- `icon` (String) A URL to an icon that will display in the dashboard. View built-in icons here: https://github.com/coder/coder/tree/main/site/static/icon. Use a built-in icon with `"${data.coder_workspace.me.access_url}/icon/<path>"`.
+- `icon` (String) A URL to an icon that will display in the dashboard. View built-in icons [here](https://github.com/coder/coder/tree/main/site/static/icon). Use a built-in icon with `"${data.coder_workspace.me.access_url}/icon/<path>"`.
 - `open_in` (String) Determines where the app will be opened. Valid values are `"tab"` and `"slim-window" (default)`. `"tab"` opens in a new tab in the same browser window. `"slim-window"` opens a new browser window without navigation controls.
 - `order` (Number) The order determines the position of app in the UI presentation. The lowest order is shown first and apps with equal order are sorted by name (ascending order).
 - `share` (String) Determines the level which the application is shared at. Valid levels are `"owner"` (default), `"authenticated"` and `"public"`. Level `"owner"` disables sharing on the app, so only the workspace owner can access it. Level `"authenticated"` shares the app with all authenticated users. Level `"public"` shares it with any user, including unauthenticated users. Permitted application sharing levels can be configured site-wide via a flag on `coder server` (Enterprise only).
diff --git a/docs/resources/devcontainer.md b/docs/resources/devcontainer.md
index 93d5724b..06d7f6f3 100644
--- a/docs/resources/devcontainer.md
+++ b/docs/resources/devcontainer.md
@@ -3,12 +3,15 @@
 page_title: "coder_devcontainer Resource - terraform-provider-coder"
 subcategory: ""
 description: |-
-  Define a Dev Container the agent should know of and attempt to autostart (minimum Coder version: v2.21).
+  Define a Dev Container the agent should know of and attempt to autostart.
+  -> This resource is only available in Coder v2.21 and later.
 ---
 
 # coder_devcontainer (Resource)
 
-Define a Dev Container the agent should know of and attempt to autostart (minimum Coder version: v2.21).
+Define a Dev Container the agent should know of and attempt to autostart.
+
+-> This resource is only available in Coder v2.21 and later.
 
 
 
diff --git a/provider/agent.go b/provider/agent.go
index ebd8fff5..32da2e58 100644
--- a/provider/agent.go
+++ b/provider/agent.go
@@ -85,7 +85,7 @@ func agentResource() *schema.Resource {
 				Optional:    true,
 				Default:     "all",
 				ForceNew:    true,
-				Description: "Controls what API routes the agent token can access. Options: 'all' (full access) or 'no_user_data' (blocks /external-auth, /gitsshkey, and /gitauth routes)",
+				Description: "Controls what API routes the agent token can access. Options: `all` (full access) or `no_user_data` (blocks `/external-auth`, `/gitsshkey`, and `/gitauth` routes)",
 				ValidateFunc: validation.StringInSlice([]string{
 					"all",
 					"no_user_data",
diff --git a/provider/app.go b/provider/app.go
index 213372b4..fb686794 100644
--- a/provider/app.go
+++ b/provider/app.go
@@ -88,7 +88,7 @@ func appResource() *schema.Resource {
 			"icon": {
 				Type: schema.TypeString,
 				Description: "A URL to an icon that will display in the dashboard. View built-in " +
-					"icons here: https://github.com/coder/coder/tree/main/site/static/icon. Use a " +
+					"icons [here](https://github.com/coder/coder/tree/main/site/static/icon). Use a " +
 					"built-in icon with `\"${data.coder_workspace.me.access_url}/icon/<path>\"`.",
 				ForceNew: true,
 				Optional: true,
diff --git a/provider/devcontainer.go b/provider/devcontainer.go
index 7d1fe0a4..81a31194 100644
--- a/provider/devcontainer.go
+++ b/provider/devcontainer.go
@@ -13,7 +13,7 @@ func devcontainerResource() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
 
-		Description: "Define a Dev Container the agent should know of and attempt to autostart (minimum Coder version: v2.21).",
+		Description: "Define a Dev Container the agent should know of and attempt to autostart.\n\n-> This resource is only available in Coder v2.21 and later.",
 		CreateContext: func(_ context.Context, rd *schema.ResourceData, _ interface{}) diag.Diagnostics {
 			rd.SetId(uuid.NewString())
 
diff --git a/provider/parameter.go b/provider/parameter.go
index de6e60f0..c8284da1 100644
--- a/provider/parameter.go
+++ b/provider/parameter.go
@@ -191,14 +191,14 @@ func parameterDataSource() *schema.Resource {
 				Default:      "string",
 				Optional:     true,
 				ValidateFunc: validation.StringInSlice(toStrings(OptionTypes()), false),
-				Description:  "The type of this parameter. Must be one of: `\"number\"`, `\"string\"`, `\"bool\"`, or `\"list(string)\"`.",
+				Description:  fmt.Sprintf("The type of this parameter. Must be one of: `\"%s\"`.", strings.Join(toStrings(OptionTypes()), "\"`, `\"")),
 			},
 			"form_type": {
 				Type:         schema.TypeString,
 				Default:      ParameterFormTypeDefault,
 				Optional:     true,
 				ValidateFunc: validation.StringInSlice(toStrings(ParameterFormTypes()), false),
-				Description:  fmt.Sprintf("The type of this parameter. Must be one of: [%s].", strings.Join(toStrings(ParameterFormTypes()), ", ")),
+				Description:  fmt.Sprintf("The type of this parameter. Must be one of: `\"%s\"`.", strings.Join(toStrings(ParameterFormTypes()), "\"`, `\"")),
 			},
 			"styling": {
 				Type:    schema.TypeString,
@@ -286,22 +286,22 @@ func parameterDataSource() *schema.Resource {
 						"min": {
 							Type:        schema.TypeInt,
 							Optional:    true,
-							Description: "The minimum of a number parameter.",
+							Description: "The minimum value of a number parameter.",
 						},
 						"min_disabled": {
 							Type:        schema.TypeBool,
 							Computed:    true,
-							Description: "Helper field to check if min is present",
+							Description: "Helper field to check if `min` is present",
 						},
 						"max": {
 							Type:        schema.TypeInt,
 							Optional:    true,
-							Description: "The maximum of a number parameter.",
+							Description: "The maximum value of a number parameter.",
 						},
 						"max_disabled": {
 							Type:        schema.TypeBool,
 							Computed:    true,
-							Description: "Helper field to check if max is present",
+							Description: "Helper field to check if `max` is present",
 						},
 						"monotonic": {
 							Type:        schema.TypeString,
@@ -317,7 +317,7 @@ func parameterDataSource() *schema.Resource {
 						"error": {
 							Type:        schema.TypeString,
 							Optional:    true,
-							Description: "An error message to display if the value breaks the validation rules. The following placeholders are supported: {max}, {min}, and {value}.",
+							Description: "An error message to display if the value breaks the validation rules. The following placeholders are supported: `{max}`, `{min}`, and `{value}`.",
 						},
 					},
 				},

From 01193dc4750e3f2a022b4bc7de4e59bddc371a54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 May 2025 15:00:36 +0500
Subject: [PATCH 25/30] build(deps): Bump goreleaser/goreleaser-action from
 6.2.1 to 6.3.0 (#372)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 33f17b8d..82eb9562 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -91,7 +91,7 @@ jobs:
           passphrase: ${{ secrets.PASSPHRASE }}
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6.2.1
+        uses: goreleaser/goreleaser-action@v6.3.0
         with:
           version: '~> v2'
           args: release --clean

From d0457a71ce7a7b47393ee34cb723a9fae18a0f90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 May 2025 15:00:40 +0500
Subject: [PATCH 26/30] build(deps): Bump crazy-max/ghaction-import-gpg from
 6.2.0 to 6.3.0 (#371)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 82eb9562..f731b412 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -84,7 +84,7 @@ jobs:
 
       - name: Import GPG key
         id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v6.2.0
+        uses: crazy-max/ghaction-import-gpg@v6.3.0
         with:
           # These secrets will need to be configured for the repository:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}

From 442ff2abd9eb47cf7deb65a8d63c58de24b986de Mon Sep 17 00:00:00 2001
From: Susana Ferreira <ssncferreira@gmail.com>
Date: Tue, 27 May 2025 11:04:35 +0100
Subject: [PATCH 27/30] chore: add minimum TTL value for expiration.policy.ttl
 (#406)

* chore: add minimum TTL value for expiration.policy.ttl

* chore: support 0 as a valid ttl value in expiration_policy to disable expiration
---
 provider/workspace_preset.go      | 14 +++++++--
 provider/workspace_preset_test.go | 48 +++++++++++++++++++++++++++++--
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/provider/workspace_preset.go b/provider/workspace_preset.go
index e9c697c7..e0f2276c 100644
--- a/provider/workspace_preset.go
+++ b/provider/workspace_preset.go
@@ -2,6 +2,7 @@ package provider
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -103,8 +104,17 @@ func workspacePresetDataSource() *schema.Resource {
 										Description: "Time in seconds after which an unclaimed prebuild is considered expired and eligible for cleanup.",
 										Required:    true,
 										ForceNew:    true,
-										// Ensure TTL is between 0 and 31536000 seconds (1 year) to prevent stale prebuilds
-										ValidateFunc: validation.IntBetween(0, 31536000),
+										// Ensure TTL is either 0 (to disable expiration) or between 3600 seconds (1 hour) and 31536000 seconds (1 year)
+										ValidateFunc: func(val interface{}, key string) ([]string, []error) {
+											v := val.(int)
+											if v == 0 {
+												return nil, nil
+											}
+											if v < 3600 || v > 31536000 {
+												return nil, []error{fmt.Errorf("%q must be 0 or between 3600 and 31536000, got %d", key, v)}
+											}
+											return nil, nil
+										},
 									},
 								},
 							},
diff --git a/provider/workspace_preset_test.go b/provider/workspace_preset_test.go
index d9f7da46..b8e752ae 100644
--- a/provider/workspace_preset_test.go
+++ b/provider/workspace_preset_test.go
@@ -157,7 +157,7 @@ func TestWorkspacePreset(t *testing.T) {
 					expiration_policy {}
 				}
 			}`,
-			ExpectError: regexp.MustCompile("The argument \"ttl\" is required, but no definition was found."),
+			ExpectError: regexp.MustCompile(`The argument "ttl" is required, but no definition was found.`),
 		},
 		{
 			Name: "Prebuilds is set with a expiration_policy field with its required fields",
@@ -186,6 +186,50 @@ func TestWorkspacePreset(t *testing.T) {
 				return nil
 			},
 		},
+		{
+			Name: "Prebuilds block with expiration_policy.ttl set to 0 seconds (disables expiration)",
+			Config: `
+			data "coder_workspace_preset" "preset_1" {
+				name = "preset_1"
+				parameters = {
+					"region" = "us-east1-a"
+				}
+				prebuilds {
+					instances = 1
+					expiration_policy {
+						ttl = 0
+					}
+				}
+			}`,
+			ExpectError: nil,
+			Check: func(state *terraform.State) error {
+				require.Len(t, state.Modules, 1)
+				require.Len(t, state.Modules[0].Resources, 1)
+				resource := state.Modules[0].Resources["data.coder_workspace_preset.preset_1"]
+				require.NotNil(t, resource)
+				attrs := resource.Primary.Attributes
+				require.Equal(t, attrs["name"], "preset_1")
+				require.Equal(t, attrs["prebuilds.0.expiration_policy.0.ttl"], "0")
+				return nil
+			},
+		},
+		{
+			Name: "Prebuilds block with expiration_policy.ttl set to 30 minutes (below 1 hour limit)",
+			Config: `
+			data "coder_workspace_preset" "preset_1" {
+				name = "preset_1"
+				parameters = {
+					"region" = "us-east1-a"
+				}
+				prebuilds {
+					instances = 1
+					expiration_policy {
+						ttl = 1800
+					}
+				}
+			}`,
+			ExpectError: regexp.MustCompile(`"prebuilds.0.expiration_policy.0.ttl" must be 0 or between 3600 and 31536000, got 1800`),
+		},
 		{
 			Name: "Prebuilds block with expiration_policy.ttl set to 2 years (exceeds 1 year limit)",
 			Config: `
@@ -201,7 +245,7 @@ func TestWorkspacePreset(t *testing.T) {
 					}
 				}
 			}`,
-			ExpectError: regexp.MustCompile(`expected prebuilds.0.expiration_policy.0.ttl to be in the range \(0 - 31536000\), got 63072000`),
+			ExpectError: regexp.MustCompile(`"prebuilds.0.expiration_policy.0.ttl" must be 0 or between 3600 and 31536000, got 63072000`),
 		},
 		{
 			Name: "Prebuilds is set with a expiration_policy field with its required fields and an unexpected argument",

From cfa101df4635e405e66094fa7779f9a89d92f400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=B1=E3=82=A4=E3=83=A9?= <mckayla@hey.com>
Date: Tue, 27 May 2025 14:47:34 -0600
Subject: [PATCH 28/30] fix: limit app group length (#407)

---
 provider/app.go | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/provider/app.go b/provider/app.go
index fb686794..adbbf0e7 100644
--- a/provider/app.go
+++ b/provider/app.go
@@ -23,14 +23,17 @@ var (
 	appSlugRegex = regexp.MustCompile(`^[a-z0-9](-?[a-z0-9])*$`)
 )
 
-const appDisplayNameMaxLength = 64 // database column limit
+const (
+	appDisplayNameMaxLength = 64 // database column limit
+	appGroupNameMaxLength   = 64
+)
 
 func appResource() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
 
 		Description: "Use this resource to define shortcuts to access applications in a workspace.",
-		CreateContext: func(c context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
+		CreateContext: func(c context.Context, resourceData *schema.ResourceData, i any) diag.Diagnostics {
 			resourceData.SetId(uuid.NewString())
 
 			diags := diag.Diagnostics{}
@@ -63,10 +66,10 @@ func appResource() *schema.Resource {
 
 			return diags
 		},
-		ReadContext: func(c context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
+		ReadContext: func(c context.Context, resourceData *schema.ResourceData, i any) diag.Diagnostics {
 			return nil
 		},
-		DeleteContext: func(ctx context.Context, rd *schema.ResourceData, i interface{}) diag.Diagnostics {
+		DeleteContext: func(ctx context.Context, rd *schema.ResourceData, i any) diag.Diagnostics {
 			return nil
 		},
 		Schema: map[string]*schema.Schema{
@@ -92,7 +95,7 @@ func appResource() *schema.Resource {
 					"built-in icon with `\"${data.coder_workspace.me.access_url}/icon/<path>\"`.",
 				ForceNew: true,
 				Optional: true,
-				ValidateFunc: func(i interface{}, s string) ([]string, []error) {
+				ValidateFunc: func(i any, s string) ([]string, []error) {
 					_, err := url.Parse(s)
 					if err != nil {
 						return nil, []error{err}
@@ -108,7 +111,7 @@ func appResource() *schema.Resource {
 					"hyphen or contain two consecutive hyphens.",
 				ForceNew: true,
 				Required: true,
-				ValidateDiagFunc: func(val interface{}, c cty.Path) diag.Diagnostics {
+				ValidateDiagFunc: func(val any, c cty.Path) diag.Diagnostics {
 					valStr, ok := val.(string)
 					if !ok {
 						return diag.Errorf("expected string, got %T", val)
@@ -126,7 +129,7 @@ func appResource() *schema.Resource {
 				Description: "A display name to identify the app. Defaults to the slug.",
 				ForceNew:    true,
 				Optional:    true,
-				ValidateDiagFunc: func(val interface{}, c cty.Path) diag.Diagnostics {
+				ValidateDiagFunc: func(val any, c cty.Path) diag.Diagnostics {
 					valStr, ok := val.(string)
 					if !ok {
 						return diag.Errorf("expected string, got %T", val)
@@ -161,7 +164,7 @@ func appResource() *schema.Resource {
 				ForceNew: true,
 				Optional: true,
 				Default:  "owner",
-				ValidateDiagFunc: func(val interface{}, c cty.Path) diag.Diagnostics {
+				ValidateDiagFunc: func(val any, c cty.Path) diag.Diagnostics {
 					valStr, ok := val.(string)
 					if !ok {
 						return diag.Errorf("expected string, got %T", val)
@@ -228,6 +231,17 @@ func appResource() *schema.Resource {
 				Description: "The name of a group that this app belongs to.",
 				ForceNew:    true,
 				Optional:    true,
+				ValidateDiagFunc: func(val any, c cty.Path) diag.Diagnostics {
+					valStr, ok := val.(string)
+					if !ok {
+						return diag.Errorf("expected string, got %T", val)
+					}
+
+					if len(valStr) > appGroupNameMaxLength {
+						return diag.Errorf("group name is too long (max %d characters)", appGroupNameMaxLength)
+					}
+					return nil
+				},
 			},
 			"order": {
 				Type:        schema.TypeInt,
@@ -250,7 +264,7 @@ func appResource() *schema.Resource {
 				ForceNew: true,
 				Optional: true,
 				Default:  "slim-window",
-				ValidateDiagFunc: func(val interface{}, c cty.Path) diag.Diagnostics {
+				ValidateDiagFunc: func(val any, c cty.Path) diag.Diagnostics {
 					valStr, ok := val.(string)
 					if !ok {
 						return diag.Errorf("expected string, got %T", val)

From c1c33f6d556532e75662c0ca373ed8fdea220eb5 Mon Sep 17 00:00:00 2001
From: Atif Ali <atif@coder.com>
Date: Wed, 4 Jun 2025 08:05:38 -0700
Subject: [PATCH 29/30] chore: add blink-so to CLA allowlist (#410)

---
 .github/workflows/cla.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml
index 71c2e905..45f72487 100644
--- a/.github/workflows/cla.yaml
+++ b/.github/workflows/cla.yaml
@@ -23,4 +23,4 @@ jobs:
           path-to-document: 'https://github.com/coder/cla/blob/main/README.md'
           # branch should not be protected
           branch: 'main'
-          allowlist: dependabot*
+          allowlist: 'dependabot*,blink-so*'

From eee4ed569976995dd0b0d8d453dbecbb79b6b5ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Jun 2025 14:21:48 +0100
Subject: [PATCH 30/30] build(deps): Bump github.com/cloudflare/circl from
 1.6.0 to 1.6.1 (#412)

Bumps [github.com/cloudflare/circl](https://github.com/cloudflare/circl) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/cloudflare/circl/releases)
- [Commits](https://github.com/cloudflare/circl/compare/v1.6.0...v1.6.1)

---
updated-dependencies:
- dependency-name: github.com/cloudflare/circl
  dependency-version: 1.6.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 7b0b437c..fcb25b13 100644
--- a/go.mod
+++ b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/ProtonMail/go-crypto v1.1.6 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/cloudflare/circl v1.6.0 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
diff --git a/go.sum b/go.sum
index 0531c5e1..31e83346 100644
--- a/go.sum
+++ b/go.sum
@@ -17,8 +17,8 @@ github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZ
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
-github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=