Skip to content

feat(provisioner): add support for presets to coder provisioners #16574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 17, 2025
Merged

feat(provisioner): add support for presets to coder provisioners #16574

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39a33ec
bump our dependency on the coder terraform provider to v2
SasSwart Feb 14, 2025
414bacf
add support for presets to coder provisioners
SasSwart Feb 14, 2025
75a5d49
upgrade to v2
SasSwart Feb 14, 2025
272eb51
add e2e tests
SasSwart Feb 14, 2025
b58e0b9
remove comments
SasSwart Feb 14, 2025
3f5e05e
Merge remote-tracking branch 'origin/main' into jjs/presets-provisioner
SasSwart Feb 17, 2025
7a1f91a
revert unwanted testdata generation
SasSwart Feb 17, 2025
7c4c7e5
review notes
SasSwart Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into jjs/presets-provisioner
  • Loading branch information
@SasSwart
SasSwart committed Feb 17, 2025
commit 3f5e05e431e39f99540a3f3fd3048bbbf4662de6
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ 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/v2 v2.1.3
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
Expand Down
7 changes: 5 additions & 2 deletions provisioner/terraform/provision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,11 @@ 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.
// gitAuthAccessTokenEnvironmentVariable is copied from
// github.com/coder/terraform-provider-coder/provider.GitAuthAccessTokenEnvironmentVariable@v1.0.4.
// While removed in v2 of the provider, we keep this to support customers using older templates that
// depend on this environment variable. Once we are certain that no customers are still using v1 of
// the provider, we can remove this function.
func gitAuthAccessTokenEnvironmentVariable(id string) string {
return fmt.Sprintf("CODER_GIT_AUTH_ACCESS_TOKEN_%s", id)
}
You are viewing a condensed version of this merge commit. You can view the full changes here.