Commit75a5d49

committed

upgrade to v2

1 parent414bacf commit75a5d49Copy full SHA for 75a5d49

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

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`	`funcValidateNewWorkspaceParameters(richParameters []TemplateVersionParameter,buildParameters []WorkspaceBuildParameter)error {`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ require (`
`94`	`94`	`github.com/coder/quartzv0.1.2`
`95`	`95`	`github.com/coder/retryv1.5.1`
`96`	`96`	`github.com/coder/serpentv0.10.0`
`97`		`-github.com/coder/terraform-provider-coderv1.0.4`
`98`	`97`	`github.com/coder/websocketv1.8.12`
`99`	`98`	`github.com/coder/wgtunnelv0.1.13-0.20240522110300-ade90dfb2da0`
`100`	`99`	`github.com/coreos/go-oidc/v3v3.12.0`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,6 @@ github.com/coder/tailscale v1.1.1-0.20250129014916-8086c871eae6 h1:prDIwUcsSEKbs`
`240`	`240`	`github.com/coder/tailscalev1.1.1-0.20250129014916-8086c871eae6/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=`
`241`	`241`	`github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0=`
`242`	`242`	`github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=`
`243`		`-github.com/coder/terraform-provider-coderv1.0.4 h1:MJldCvykIQzzqBVUDjCJpPyqvKelAAHrtJKfIIx4Qxo=`
`244`		`-github.com/coder/terraform-provider-coderv1.0.4/go.mod h1:dQ1e/IccUxnmh/1bXTA3PopSoBkHMyWT6EkdBw8Lx6Y=`
`245`	`243`	`github.com/coder/terraform-provider-coder/v2v2.1.3 h1:zB7ObGsiOGBHcJUUMmcSauEPlTWRIYmMYieF05LxHSc=`
`246`	`244`	`github.com/coder/terraform-provider-coder/v2v2.1.3/go.mod h1:RHGyb+ghiy8UpDAMJM8duRFuzd+1VqA3AtkRLh2P3Ug=`
`247`	`245`	`github.com/coder/websocketv1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=`

Lines changed: 8 additions & 2 deletions

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:=rangeexternalAuth {`
`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`	`returnstring(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`	`+funcgitAuthAccessTokenEnvironmentVariable(idstring)string {`
	`357`	`+returnfmt.Sprintf("CODER_GIT_AUTH_ACCESS_TOKEN_%s",id)`
	`358`	`+}`

Comments

(0)