upgrade to v2

SasSwart · SasSwart · commit 75a5d4953049 · 2025-02-14T13:18:54.000Z
diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/xerrors"
 
-	"github.com/coder/terraform-provider-coder/provider"
+	"github.com/coder/terraform-provider-coder/v2/provider"
 )
 
 func ValidateNewWorkspaceParameters(richParameters []TemplateVersionParameter, buildParameters []WorkspaceBuildParameter) error {
diff --git a/go.mod b/go.mod
@@ -94,7 +94,6 @@ require (
 	github.com/coder/quartz v0.1.2
 	github.com/coder/retry v1.5.1
 	github.com/coder/serpent v0.10.0
-	github.com/coder/terraform-provider-coder v1.0.4
 	github.com/coder/websocket v1.8.12
 	github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0
 	github.com/coreos/go-oidc/v3 v3.12.0
diff --git a/go.sum b/go.sum
@@ -240,8 +240,6 @@ github.com/coder/tailscale v1.1.1-0.20250129014916-8086c871eae6 h1:prDIwUcsSEKbs
 github.com/coder/tailscale v1.1.1-0.20250129014916-8086c871eae6/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=
 github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0=
 github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=
-github.com/coder/terraform-provider-coder v1.0.4 h1:MJldCvykIQzzqBVUDjCJpPyqvKelAAHrtJKfIIx4Qxo=
-github.com/coder/terraform-provider-coder v1.0.4/go.mod h1:dQ1e/IccUxnmh/1bXTA3PopSoBkHMyWT6EkdBw8Lx6Y=
 github.com/coder/terraform-provider-coder/v2 v2.1.3 h1:zB7ObGsiOGBHcJUUMmcSauEPlTWRIYmMYieF05LxHSc=
 github.com/coder/terraform-provider-coder/v2 v2.1.3/go.mod h1:RHGyb+ghiy8UpDAMJM8duRFuzd+1VqA3AtkRLh2P3Ug=
 github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -16,7 +16,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"cdr.dev/slog"
-	"github.com/coder/terraform-provider-coder/provider"
+	"github.com/coder/terraform-provider-coder/v2/provider"
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/tracing"
@@ -269,7 +269,7 @@ func provisionEnv(
 		env = append(env, provider.ParameterEnvironmentVariable(param.Name)+"="+param.Value)
 	}
 	for _, extAuth := range externalAuth {
-		env = append(env, provider.GitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)
+		env = append(env, gitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)
 		env = append(env, provider.ExternalAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)
 	}
 
@@ -350,3 +350,9 @@ func tryGettingCoderProviderStacktrace(sess *provisionersdk.Session) string {
 	}
 	return string(stacktraces)
 }
+
+// gitAuthAccessTokenEnvironmentVariable was copied from provider.GitAuthAccessTokenEnvironmentVariable
+// in v1.0.4 of github.com/coder/terraform-provider-coder/provider when we upgraded to v2.
+func gitAuthAccessTokenEnvironmentVariable(id string) string {
+	return fmt.Sprintf("CODER_GIT_AUTH_ACCESS_TOKEN_%s", id)
+}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"golang.org/x/xerrors"`
`7`	`7`
`8`		`- "github.com/coder/terraform-provider-coder/provider"`
	`8`	`+ "github.com/coder/terraform-provider-coder/v2/provider"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func ValidateNewWorkspaceParameters(richParameters []TemplateVersionParameter, buildParameters []WorkspaceBuildParameter) error {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"golang.org/x/xerrors"`
`17`	`17`
`18`	`18`	`"cdr.dev/slog"`
`19`		`- "github.com/coder/terraform-provider-coder/provider"`
	`19`	`+ "github.com/coder/terraform-provider-coder/v2/provider"`
`20`	`20`
`21`	`21`	`"github.com/coder/coder/v2/coderd/database"`
`22`	`22`	`"github.com/coder/coder/v2/coderd/tracing"`
`@@ -269,7 +269,7 @@ func provisionEnv(`
`269`	`269`	`env = append(env, provider.ParameterEnvironmentVariable(param.Name)+"="+param.Value)`
`270`	`270`	`}`
`271`	`271`	`for _, extAuth := range externalAuth {`
`272`		`- env = append(env, provider.GitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)`
	`272`	`+ env = append(env, gitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)`
`273`	`273`	`env = append(env, provider.ExternalAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)`
`274`	`274`	`}`
`275`	`275`
`@@ -350,3 +350,9 @@ func tryGettingCoderProviderStacktrace(sess *provisionersdk.Session) string {`
`350`	`350`	`}`
`351`	`351`	`return string(stacktraces)`
`352`	`352`	`}`
	`353`	`+`
	`354`	`+// gitAuthAccessTokenEnvironmentVariable was copied from provider.GitAuthAccessTokenEnvironmentVariable`
	`355`	`+// in v1.0.4 of github.com/coder/terraform-provider-coder/provider when we upgraded to v2.`
	`356`	`+func gitAuthAccessTokenEnvironmentVariable(id string) string {`
	`357`	`+ return fmt.Sprintf("CODER_GIT_AUTH_ACCESS_TOKEN_%s", id)`
	`358`	`+}`