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 01/19] 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 02/19] 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 03/19] 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 04/19] 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 05/19] 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 06/19] 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 07/19] 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 08/19] 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 09/19] 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 10/19] 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 11/19] 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 12/19] 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 13/19] 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=
From 657040094038f7a518ebfbfc85aa58f8433e85aa Mon Sep 17 00:00:00 2001
From: Yevhenii Shcherbina <evgeniy.shcherbina.es@gmail.com>
Date: Wed, 18 Jun 2025 16:34:18 -0400
Subject: [PATCH 14/19] feat: add scheduling configuration for prebuilds (#408)
* feat: add autoscaling configuration for prebuilds
* fix: improve schedule validation
* fix: allow DOM and Month fields
* docs: improve documentation for timezone field
* docs: make gen
* Update provider/workspace_preset.go
Co-authored-by: Danny Kopping <dannykopping@gmail.com>
* docs: improve doc comments
* fix: tests
* refactor: rename autoscaling to scheduling
* docs: make gen
* refactor: minor refactor after renaming
* Update provider/helpers/schedule_validation.go
Co-authored-by: Danny Kopping <dannykopping@gmail.com>
* Update provider/helpers/schedule_validation.go
Co-authored-by: Danny Kopping <dannykopping@gmail.com>
* refactor: improve docs
* refactor: improve docs
* test: improve test coverage
* test: improve test coverage
* refactor: check for a specific error in tests
* refactor: check for a specific error in tests
---------
Co-authored-by: Danny Kopping <dannykopping@gmail.com>
---
docs/data-sources/workspace_preset.md | 20 +
integration/integration_test.go | 17 +-
integration/test-data-source/main.tf | 16 +
provider/helpers/schedule_validation.go | 187 ++++++
provider/helpers/schedule_validation_test.go | 585 +++++++++++++++++++
provider/workspace_preset.go | 162 +++++
provider/workspace_preset_test.go | 265 +++++++++
7 files changed, 1246 insertions(+), 6 deletions(-)
create mode 100644 provider/helpers/schedule_validation.go
create mode 100644 provider/helpers/schedule_validation_test.go
diff --git a/docs/data-sources/workspace_preset.md b/docs/data-sources/workspace_preset.md
index cd4908c2..26e597e2 100644
--- a/docs/data-sources/workspace_preset.md
+++ b/docs/data-sources/workspace_preset.md
@@ -55,6 +55,7 @@ Required:
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))
+- `scheduling` (Block List, Max: 1) Configuration block that defines scheduling behavior for prebuilds. Use this to automatically adjust the number of prebuild instances based on a schedule. (see [below for nested schema](#nestedblock--prebuilds--scheduling))
<a id="nestedblock--prebuilds--expiration_policy"></a>
### Nested Schema for `prebuilds.expiration_policy`
@@ -62,3 +63,22 @@ Optional:
Required:
- `ttl` (Number) Time in seconds after which an unclaimed prebuild is considered expired and eligible for cleanup.
+
+
+<a id="nestedblock--prebuilds--scheduling"></a>
+### Nested Schema for `prebuilds.scheduling`
+
+Required:
+
+- `schedule` (Block List, Min: 1) One or more schedule blocks that define when to scale the number of prebuild instances. (see [below for nested schema](#nestedblock--prebuilds--scheduling--schedule))
+- `timezone` (String) The timezone to use for the prebuild schedules (e.g., "UTC", "America/New_York").
+Timezone must be a valid timezone in the IANA timezone database.
+See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones for a complete list of valid timezone identifiers and https://www.iana.org/time-zones for the official IANA timezone database.
+
+<a id="nestedblock--prebuilds--scheduling--schedule"></a>
+### Nested Schema for `prebuilds.scheduling.schedule`
+
+Required:
+
+- `cron` (String) A cron expression that defines when this schedule should be active. The cron expression must be in the format "* HOUR DOM MONTH DAY-OF-WEEK" where HOUR is 0-23, DOM (day-of-month) is 1-31, MONTH is 1-12, and DAY-OF-WEEK is 0-6 (Sunday-Saturday). The minute field must be "*" to ensure the schedule covers entire hours rather than specific minute intervals.
+- `instances` (Number) The number of prebuild instances to maintain during this schedule period.
diff --git a/integration/integration_test.go b/integration/integration_test.go
index 36612904..b075aebd 100644
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -90,12 +90,17 @@ 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_preset.prebuilds.expiration_policy.ttl": `86400`,
+ "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`,
+ "workspace_preset.prebuilds.scheduling.timezone": `UTC`,
+ "workspace_preset.prebuilds.scheduling.schedule0.cron": `\* 8-18 \* \* 1-5`,
+ "workspace_preset.prebuilds.scheduling.schedule0.instances": `3`,
+ "workspace_preset.prebuilds.scheduling.schedule1.cron": `\* 8-14 \* \* 6`,
+ "workspace_preset.prebuilds.scheduling.schedule1.instances": `1`,
},
},
{
diff --git a/integration/test-data-source/main.tf b/integration/test-data-source/main.tf
index 50274fff..12344546 100644
--- a/integration/test-data-source/main.tf
+++ b/integration/test-data-source/main.tf
@@ -30,6 +30,17 @@ data "coder_workspace_preset" "preset" {
expiration_policy {
ttl = 86400
}
+ scheduling {
+ timezone = "UTC"
+ schedule {
+ cron = "* 8-18 * * 1-5"
+ instances = 3
+ }
+ schedule {
+ cron = "* 8-14 * * 6"
+ instances = 1
+ }
+ }
}
}
@@ -56,6 +67,11 @@ locals {
"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),
+ "workspace_preset.prebuilds.scheduling.timezone" : tostring(one(one(data.coder_workspace_preset.preset.prebuilds).scheduling).timezone),
+ "workspace_preset.prebuilds.scheduling.schedule0.cron" : tostring(one(one(data.coder_workspace_preset.preset.prebuilds).scheduling).schedule[0].cron),
+ "workspace_preset.prebuilds.scheduling.schedule0.instances" : tostring(one(one(data.coder_workspace_preset.preset.prebuilds).scheduling).schedule[0].instances),
+ "workspace_preset.prebuilds.scheduling.schedule1.cron" : tostring(one(one(data.coder_workspace_preset.preset.prebuilds).scheduling).schedule[1].cron),
+ "workspace_preset.prebuilds.scheduling.schedule1.instances" : tostring(one(one(data.coder_workspace_preset.preset.prebuilds).scheduling).schedule[1].instances),
}
}
diff --git a/provider/helpers/schedule_validation.go b/provider/helpers/schedule_validation.go
new file mode 100644
index 00000000..c5a6972f
--- /dev/null
+++ b/provider/helpers/schedule_validation.go
@@ -0,0 +1,187 @@
+package helpers
+
+import (
+ "strconv"
+ "strings"
+
+ "golang.org/x/xerrors"
+)
+
+// ValidateSchedules checks if any schedules overlap
+func ValidateSchedules(schedules []string) error {
+ for i := 0; i < len(schedules); i++ {
+ for j := i + 1; j < len(schedules); j++ {
+ overlap, err := SchedulesOverlap(schedules[i], schedules[j])
+ if err != nil {
+ return xerrors.Errorf("invalid schedule: %w", err)
+ }
+ if overlap {
+ return xerrors.Errorf("schedules overlap: %s and %s",
+ schedules[i], schedules[j])
+ }
+ }
+ }
+ return nil
+}
+
+// SchedulesOverlap checks if two schedules overlap by checking
+// all cron fields separately
+func SchedulesOverlap(schedule1, schedule2 string) (bool, error) {
+ // Get cron fields
+ fields1 := strings.Fields(schedule1)
+ fields2 := strings.Fields(schedule2)
+
+ if len(fields1) != 5 {
+ return false, xerrors.Errorf("schedule %q has %d fields, expected 5 fields (minute hour day-of-month month day-of-week)", schedule1, len(fields1))
+ }
+ if len(fields2) != 5 {
+ return false, xerrors.Errorf("schedule %q has %d fields, expected 5 fields (minute hour day-of-month month day-of-week)", schedule2, len(fields2))
+ }
+
+ // Check if months overlap
+ monthsOverlap, err := MonthsOverlap(fields1[3], fields2[3])
+ if err != nil {
+ return false, xerrors.Errorf("invalid month range: %w", err)
+ }
+ if !monthsOverlap {
+ return false, nil
+ }
+
+ // Check if days overlap (DOM OR DOW)
+ daysOverlap, err := DaysOverlap(fields1[2], fields1[4], fields2[2], fields2[4])
+ if err != nil {
+ return false, xerrors.Errorf("invalid day range: %w", err)
+ }
+ if !daysOverlap {
+ return false, nil
+ }
+
+ // Check if hours overlap
+ hoursOverlap, err := HoursOverlap(fields1[1], fields2[1])
+ if err != nil {
+ return false, xerrors.Errorf("invalid hour range: %w", err)
+ }
+
+ return hoursOverlap, nil
+}
+
+// MonthsOverlap checks if two month ranges overlap
+func MonthsOverlap(months1, months2 string) (bool, error) {
+ return CheckOverlap(months1, months2, 12)
+}
+
+// HoursOverlap checks if two hour ranges overlap
+func HoursOverlap(hours1, hours2 string) (bool, error) {
+ return CheckOverlap(hours1, hours2, 23)
+}
+
+// DomOverlap checks if two day-of-month ranges overlap
+func DomOverlap(dom1, dom2 string) (bool, error) {
+ return CheckOverlap(dom1, dom2, 31)
+}
+
+// DowOverlap checks if two day-of-week ranges overlap
+func DowOverlap(dow1, dow2 string) (bool, error) {
+ return CheckOverlap(dow1, dow2, 6)
+}
+
+// DaysOverlap checks if two day ranges overlap, considering both DOM and DOW.
+// Returns true if both DOM and DOW overlap, or if one is * and the other overlaps.
+func DaysOverlap(dom1, dow1, dom2, dow2 string) (bool, error) {
+ // If either DOM is *, we only need to check DOW overlap
+ if dom1 == "*" || dom2 == "*" {
+ return DowOverlap(dow1, dow2)
+ }
+
+ // If either DOW is *, we only need to check DOM overlap
+ if dow1 == "*" || dow2 == "*" {
+ return DomOverlap(dom1, dom2)
+ }
+
+ // If both DOM and DOW are specified, we need to check both
+ // because the schedule runs when either matches
+ domOverlap, err := DomOverlap(dom1, dom2)
+ if err != nil {
+ return false, err
+ }
+ dowOverlap, err := DowOverlap(dow1, dow2)
+ if err != nil {
+ return false, err
+ }
+
+ // If either DOM or DOW overlaps, the schedules overlap
+ return domOverlap || dowOverlap, nil
+}
+
+// CheckOverlap is a function to check if two ranges overlap
+func CheckOverlap(range1, range2 string, maxValue int) (bool, error) {
+ set1, err := ParseRange(range1, maxValue)
+ if err != nil {
+ return false, err
+ }
+ set2, err := ParseRange(range2, maxValue)
+ if err != nil {
+ return false, err
+ }
+
+ for value := range set1 {
+ if set2[value] {
+ return true, nil
+ }
+ }
+ return false, nil
+}
+
+// ParseRange converts a cron range to a set of integers
+// maxValue is the maximum allowed value (e.g., 23 for hours, 6 for DOW, 12 for months, 31 for DOM)
+func ParseRange(input string, maxValue int) (map[int]bool, error) {
+ result := make(map[int]bool)
+
+ // Handle "*" case
+ if input == "*" {
+ for i := 0; i <= maxValue; i++ {
+ result[i] = true
+ }
+ return result, nil
+ }
+
+ // Parse ranges like "1-3,5,7-9"
+ parts := strings.Split(input, ",")
+ for _, part := range parts {
+ if strings.Contains(part, "-") {
+ // Handle range like "1-3"
+ rangeParts := strings.Split(part, "-")
+ start, err := strconv.Atoi(rangeParts[0])
+ if err != nil {
+ return nil, xerrors.Errorf("invalid start value in range: %w", err)
+ }
+ end, err := strconv.Atoi(rangeParts[1])
+ if err != nil {
+ return nil, xerrors.Errorf("invalid end value in range: %w", err)
+ }
+
+ // Validate range
+ if start < 0 || end > maxValue || start > end {
+ return nil, xerrors.Errorf("invalid range %d-%d: values must be between 0 and %d", start, end, maxValue)
+ }
+
+ for i := start; i <= end; i++ {
+ result[i] = true
+ }
+ } else {
+ // Handle single value
+ value, err := strconv.Atoi(part)
+ if err != nil {
+ return nil, xerrors.Errorf("invalid value: %w", err)
+ }
+
+ // Validate value
+ if value < 0 || value > maxValue {
+ return nil, xerrors.Errorf("invalid value %d: must be between 0 and %d", value, maxValue)
+ }
+
+ result[value] = true
+ }
+ }
+ return result, nil
+}
diff --git a/provider/helpers/schedule_validation_test.go b/provider/helpers/schedule_validation_test.go
new file mode 100644
index 00000000..2971fd07
--- /dev/null
+++ b/provider/helpers/schedule_validation_test.go
@@ -0,0 +1,585 @@
+// schedule_validation_test.go
+
+package helpers_test
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ "github.com/coder/terraform-provider-coder/v2/provider/helpers"
+)
+
+func TestParseRange(t *testing.T) {
+ t.Parallel()
+ testCases := []struct {
+ name string
+ input string
+ maxValue int
+ expected map[int]bool
+ expectErr bool
+ }{
+ {
+ name: "Wildcard",
+ input: "*",
+ maxValue: 5,
+ expected: map[int]bool{
+ 0: true, 1: true, 2: true, 3: true, 4: true, 5: true,
+ },
+ },
+ {
+ name: "Single value",
+ input: "3",
+ maxValue: 5,
+ expected: map[int]bool{
+ 3: true,
+ },
+ },
+ {
+ name: "Range",
+ input: "1-3",
+ maxValue: 5,
+ expected: map[int]bool{
+ 1: true, 2: true, 3: true,
+ },
+ },
+ {
+ name: "Complex range",
+ input: "1-3,5,7-9",
+ maxValue: 9,
+ expected: map[int]bool{
+ 1: true, 2: true, 3: true, 5: true, 7: true, 8: true, 9: true,
+ },
+ },
+ {
+ name: "Value too high",
+ input: "6",
+ maxValue: 5,
+ expectErr: true,
+ },
+ {
+ name: "Range too high",
+ input: "4-6",
+ maxValue: 5,
+ expectErr: true,
+ },
+ {
+ name: "Invalid range",
+ input: "3-1",
+ maxValue: 5,
+ expectErr: true,
+ },
+ {
+ name: "Invalid value",
+ input: "abc",
+ maxValue: 5,
+ expectErr: true,
+ },
+ }
+
+ for _, testCase := range testCases {
+ testCase := testCase
+ t.Run(testCase.name, func(t *testing.T) {
+ t.Parallel()
+ result, err := helpers.ParseRange(testCase.input, testCase.maxValue)
+ if testCase.expectErr {
+ require.Error(t, err)
+ return
+ }
+ require.NoError(t, err)
+ require.Equal(t, testCase.expected, result)
+ })
+ }
+}
+
+func TestCheckOverlap(t *testing.T) {
+ t.Parallel()
+ testCases := []struct {
+ name string
+ range1 string
+ range2 string
+ maxValue int
+ overlap bool
+ expectErr bool
+ }{
+ {
+ name: "Same range",
+ range1: "1-5",
+ range2: "1-5",
+ maxValue: 10,
+ overlap: true,
+ },
+ {
+ name: "Different ranges",
+ range1: "1-3",
+ range2: "4-6",
+ maxValue: 10,
+ overlap: false,
+ },
+ {
+ name: "Overlapping ranges",
+ range1: "1-5",
+ range2: "4-8",
+ maxValue: 10,
+ overlap: true,
+ },
+ {
+ name: "Wildcard overlap",
+ range1: "*",
+ range2: "3-5",
+ maxValue: 10,
+ overlap: true,
+ },
+ {
+ name: "Complex ranges",
+ range1: "1-3,5,7-9",
+ range2: "2-4,6,8-10",
+ maxValue: 10,
+ overlap: true,
+ },
+ {
+ name: "Single values",
+ range1: "1",
+ range2: "1",
+ maxValue: 10,
+ overlap: true,
+ },
+ {
+ name: "Single value vs range",
+ range1: "1",
+ range2: "1-3",
+ maxValue: 10,
+ overlap: true,
+ },
+ {
+ name: "Invalid range - value too high",
+ range1: "11",
+ range2: "1-3",
+ maxValue: 10,
+ expectErr: true,
+ },
+ {
+ name: "Invalid range - negative value",
+ range1: "-1",
+ range2: "1-3",
+ maxValue: 10,
+ expectErr: true,
+ },
+ {
+ name: "Invalid range - malformed",
+ range1: "1-",
+ range2: "1-3",
+ maxValue: 10,
+ expectErr: true,
+ },
+ }
+
+ for _, testCase := range testCases {
+ testCase := testCase
+ t.Run(testCase.name, func(t *testing.T) {
+ t.Parallel()
+ overlap, err := helpers.CheckOverlap(testCase.range1, testCase.range2, testCase.maxValue)
+ if testCase.expectErr {
+ require.Error(t, err)
+ return
+ }
+ require.NoError(t, err)
+ require.Equal(t, testCase.overlap, overlap)
+ })
+ }
+}
+
+func TestOverlapWrappers(t *testing.T) {
+ t.Parallel()
+ testCases := []struct {
+ name string
+ range1 string
+ range2 string
+ overlap bool
+ expectErr bool
+ overlapFunc func(string, string) (bool, error)
+ }{
+ // HoursOverlap tests (max 23)
+ {
+ name: "Valid hour range",
+ range1: "23",
+ range2: "23",
+ overlap: true,
+ overlapFunc: helpers.HoursOverlap,
+ },
+ {
+ name: "Invalid hour range",
+ range1: "24",
+ range2: "24",
+ expectErr: true,
+ overlapFunc: helpers.HoursOverlap,
+ },
+
+ // MonthsOverlap tests (max 12)
+ {
+ name: "Valid month range",
+ range1: "12",
+ range2: "12",
+ overlap: true,
+ overlapFunc: helpers.MonthsOverlap,
+ },
+ {
+ name: "Invalid month range",
+ range1: "13",
+ range2: "13",
+ expectErr: true,
+ overlapFunc: helpers.MonthsOverlap,
+ },
+
+ // DomOverlap tests (max 31)
+ {
+ name: "Valid day of month range",
+ range1: "31",
+ range2: "31",
+ overlap: true,
+ overlapFunc: helpers.DomOverlap,
+ },
+ {
+ name: "Invalid day of month range",
+ range1: "32",
+ range2: "32",
+ expectErr: true,
+ overlapFunc: helpers.DomOverlap,
+ },
+
+ // DowOverlap tests (max 6)
+ {
+ name: "Valid day of week range",
+ range1: "6",
+ range2: "6",
+ overlap: true,
+ overlapFunc: helpers.DowOverlap,
+ },
+ {
+ name: "Invalid day of week range",
+ range1: "7",
+ range2: "7",
+ expectErr: true,
+ overlapFunc: helpers.DowOverlap,
+ },
+ }
+
+ for _, testCase := range testCases {
+ testCase := testCase
+ t.Run(testCase.name, func(t *testing.T) {
+ t.Parallel()
+ overlap, err := testCase.overlapFunc(testCase.range1, testCase.range2)
+ if testCase.expectErr {
+ require.Error(t, err)
+ return
+ }
+ require.NoError(t, err)
+ require.Equal(t, testCase.overlap, overlap)
+ })
+ }
+}
+
+func TestDaysOverlap(t *testing.T) {
+ t.Parallel()
+ testCases := []struct {
+ name string
+ dom1 string
+ dow1 string
+ dom2 string
+ dow2 string
+ overlap bool
+ expectErr bool
+ }{
+ {
+ name: "DOM overlap only",
+ dom1: "1-15",
+ dow1: "1-3",
+ dom2: "10-20",
+ dow2: "4-6",
+ overlap: true, // true because DOM overlaps (10-15)
+ },
+ {
+ name: "DOW overlap only",
+ dom1: "1-15",
+ dow1: "1-3",
+ dom2: "16-31",
+ dow2: "3-5",
+ overlap: true, // true because DOW overlaps (3)
+ },
+ {
+ name: "Both DOM and DOW overlap",
+ dom1: "1-15",
+ dow1: "1-3",
+ dom2: "10-20",
+ dow2: "3-5",
+ overlap: true, // true because both overlap
+ },
+ {
+ name: "No overlap",
+ dom1: "1-15",
+ dow1: "1-3",
+ dom2: "16-31",
+ dow2: "4-6",
+ overlap: false, // false because neither overlaps
+ },
+ {
+ name: "Both DOW wildcard - DOM overlaps",
+ dom1: "1-15",
+ dow1: "*",
+ dom2: "10-20",
+ dow2: "*",
+ overlap: true, // true because DOM overlaps (10-15)
+ },
+ {
+ name: "Both DOW wildcard - DOM doesn't overlap",
+ dom1: "1-15",
+ dow1: "*",
+ dom2: "16-31",
+ dow2: "*",
+ overlap: false, // false because DOM doesn't overlap
+ },
+ }
+
+ for _, testCase := range testCases {
+ testCase := testCase
+ t.Run(testCase.name, func(t *testing.T) {
+ t.Parallel()
+ overlap, err := helpers.DaysOverlap(testCase.dom1, testCase.dow1, testCase.dom2, testCase.dow2)
+ if testCase.expectErr {
+ require.Error(t, err)
+ return
+ }
+ require.NoError(t, err)
+ require.Equal(t, testCase.overlap, overlap)
+ })
+ }
+}
+
+func TestSchedulesOverlap(t *testing.T) {
+ t.Parallel()
+ testCases := []struct {
+ name string
+ s1 string
+ s2 string
+ overlap bool
+ expectedErrMsg string
+ }{
+ // Basic overlap cases
+ {
+ name: "Same schedule",
+ s1: "* 9-18 * * 1-5",
+ s2: "* 9-18 * * 1-5",
+ overlap: true,
+ },
+ {
+ name: "Different hours - no overlap",
+ s1: "* 9-12 * * 1-5",
+ s2: "* 13-18 * * 1-5",
+ overlap: false,
+ },
+ {
+ name: "Different hours - partial overlap",
+ s1: "* 9-14 * * 1-5",
+ s2: "* 12-18 * * 1-5",
+ overlap: true,
+ },
+ {
+ name: "Different hours - one contained in another",
+ s1: "* 9-18 * * 1-5",
+ s2: "* 12-14 * * 1-5",
+ overlap: true,
+ },
+
+ // Day of week overlap cases (with wildcard DOM)
+ {
+ name: "Different DOW with wildcard DOM",
+ s1: "* 9-18 * * 1,3,5", // Mon,Wed,Fri
+ s2: "* 9-18 * * 2,4,6", // Tue,Thu,Sat
+ overlap: false, // No overlap because DOW ranges don't overlap
+ },
+ {
+ name: "Different DOW with wildcard DOM - complex ranges",
+ s1: "* 9-18 * * 1-3", // Mon-Wed
+ s2: "* 9-18 * * 4-5", // Thu-Fri
+ overlap: false, // No overlap because DOW ranges don't overlap
+ },
+
+ // Day of week overlap cases (with specific DOM)
+ {
+ name: "Different DOW with specific DOM - no overlap",
+ s1: "* 9-18 1 * 1-3",
+ s2: "* 9-18 2 * 4-5",
+ overlap: false, // No overlap because different DOM and DOW
+ },
+ {
+ name: "Different DOW with specific DOM - partial overlap",
+ s1: "* 9-18 1 * 1-4",
+ s2: "* 9-18 1 * 3-5",
+ overlap: true, // Overlaps because same DOM
+ },
+ {
+ name: "Different DOW with specific DOM - complex ranges",
+ s1: "* 9-18 1 * 1,3,5",
+ s2: "* 9-18 1 * 2,4,6",
+ overlap: true, // Overlaps because same DOM
+ },
+
+ // Wildcard cases
+ {
+ name: "Wildcard hours vs specific hours",
+ s1: "* * * * 1-5",
+ s2: "* 9-18 * * 1-5",
+ overlap: true,
+ },
+ {
+ name: "Wildcard DOW vs specific DOW",
+ s1: "* 9-18 * * *",
+ s2: "* 9-18 * * 1-5",
+ overlap: true,
+ },
+ {
+ name: "Both wildcard DOW",
+ s1: "* 9-18 * * *",
+ s2: "* 9-18 * * *",
+ overlap: true,
+ },
+
+ // Complex time ranges
+ {
+ name: "Complex hour ranges - no overlap",
+ s1: "* 9-11,13-15 * * 1-5",
+ s2: "* 12,16-18 * * 1-5",
+ overlap: false,
+ },
+ {
+ name: "Complex hour ranges - partial overlap",
+ s1: "* 9-11,13-15 * * 1-5",
+ s2: "* 10-12,14-16 * * 1-5",
+ overlap: true,
+ },
+ {
+ name: "Complex hour ranges - contained",
+ s1: "* 9-18 * * 1-5",
+ s2: "* 10-11,13-14 * * 1-5",
+ overlap: true,
+ },
+
+ // Error cases (keeping minimal)
+ {
+ name: "Invalid hour range",
+ s1: "* 25-26 * * 1-5",
+ s2: "* 9-18 * * 1-5",
+ expectedErrMsg: "invalid hour range",
+ },
+ {
+ name: "Invalid month range",
+ s1: "* 9-18 * 13 1-5",
+ s2: "* 9-18 * * 1-5",
+ expectedErrMsg: "invalid month range",
+ },
+ {
+ name: "Invalid field count - too few fields",
+ s1: "* 9-18 * *",
+ s2: "* 9-18 * * 1-5",
+ expectedErrMsg: "has 4 fields, expected 5 fields",
+ },
+ {
+ name: "Invalid field count - too many fields",
+ s1: "* 9-18 * * 1-5 *",
+ s2: "* 9-18 * * 1-5",
+ expectedErrMsg: "has 6 fields, expected 5 fields",
+ },
+ {
+ name: "Invalid field count - s2 has too few fields",
+ s1: "* 9-18 * * 1-5",
+ s2: "* 9-18 * *",
+ expectedErrMsg: "has 4 fields, expected 5 fields",
+ },
+ }
+
+ for _, testCase := range testCases {
+ testCase := testCase
+ t.Run(testCase.name, func(t *testing.T) {
+ t.Parallel()
+
+ overlap, err := helpers.SchedulesOverlap(testCase.s1, testCase.s2)
+ if testCase.expectedErrMsg != "" {
+ require.Error(t, err)
+ require.Contains(t, err.Error(), testCase.expectedErrMsg)
+ } else {
+ require.NoError(t, err)
+ require.Equal(t, testCase.overlap, overlap)
+ }
+ })
+ }
+}
+
+func TestValidateSchedules(t *testing.T) {
+ t.Parallel()
+ testCases := []struct {
+ name string
+ schedules []string
+ expectedErrMsg string
+ }{
+ // Basic validation
+ {
+ name: "Empty schedules",
+ schedules: []string{},
+ },
+ {
+ name: "Single valid schedule",
+ schedules: []string{
+ "* 9-18 * * 1-5",
+ },
+ },
+
+ // Non-overlapping schedules
+ {
+ name: "Multiple valid non-overlapping schedules",
+ schedules: []string{
+ "* 9-12 * * 1-5",
+ "* 13-18 * * 1-5",
+ },
+ },
+ {
+ name: "Multiple valid non-overlapping schedules",
+ schedules: []string{
+ "* 9-18 * * 1-5",
+ "* 9-13 * * 6,0",
+ },
+ },
+
+ // Overlapping schedules
+ {
+ name: "Two overlapping schedules",
+ schedules: []string{
+ "* 9-14 * * 1-5",
+ "* 12-18 * * 1-5",
+ },
+ expectedErrMsg: "schedules overlap: * 9-14 * * 1-5 and * 12-18 * * 1-5",
+ },
+ {
+ name: "Three schedules with only second and third overlapping",
+ schedules: []string{
+ "* 9-11 * * 1-5", // 9AM-11AM (no overlap)
+ "* 12-18 * * 1-5", // 12PM-6PM
+ "* 15-20 * * 1-5", // 3PM-8PM (overlaps with second)
+ },
+ expectedErrMsg: "schedules overlap: * 12-18 * * 1-5 and * 15-20 * * 1-5",
+ },
+ }
+
+ for _, testCase := range testCases {
+ testCase := testCase
+ t.Run(testCase.name, func(t *testing.T) {
+ t.Parallel()
+ err := helpers.ValidateSchedules(testCase.schedules)
+ if testCase.expectedErrMsg != "" {
+ require.Error(t, err)
+ require.Contains(t, err.Error(), testCase.expectedErrMsg)
+ } else {
+ require.NoError(t, err)
+ }
+ })
+ }
+}
diff --git a/provider/workspace_preset.go b/provider/workspace_preset.go
index e0f2276c..0a44b1eb 100644
--- a/provider/workspace_preset.go
+++ b/provider/workspace_preset.go
@@ -3,13 +3,20 @@ package provider
import (
"context"
"fmt"
+ "strings"
+ "time"
+
+ "github.com/coder/terraform-provider-coder/v2/provider/helpers"
"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"
"github.com/mitchellh/mapstructure"
+ rbcron "github.com/robfig/cron/v3"
)
+var PrebuildsCRONParser = rbcron.NewParser(rbcron.Minute | rbcron.Hour | rbcron.Dom | rbcron.Month | rbcron.Dow)
+
type WorkspacePreset struct {
Name string `mapstructure:"name"`
Parameters map[string]string `mapstructure:"parameters"`
@@ -29,12 +36,23 @@ type WorkspacePrebuild struct {
// 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"`
+ Scheduling []Scheduling `mapstructure:"scheduling"`
}
type ExpirationPolicy struct {
TTL int `mapstructure:"ttl"`
}
+type Scheduling struct {
+ Timezone string `mapstructure:"timezone"`
+ Schedule []Schedule `mapstructure:"schedule"`
+}
+
+type Schedule struct {
+ Cron string `mapstructure:"cron"`
+ Instances int `mapstructure:"instances"`
+}
+
func workspacePresetDataSource() *schema.Resource {
return &schema.Resource{
SchemaVersion: 1,
@@ -52,6 +70,12 @@ func workspacePresetDataSource() *schema.Resource {
return diag.Errorf("decode workspace preset: %s", err)
}
+ // Validate schedule overlaps if scheduling is configured
+ err = validateSchedules(rd)
+ if err != nil {
+ return diag.Errorf("schedules overlap with each other: %s", err)
+ }
+
rd.SetId(preset.Name)
return nil
@@ -119,9 +143,147 @@ func workspacePresetDataSource() *schema.Resource {
},
},
},
+ "scheduling": {
+ Type: schema.TypeList,
+ Description: "Configuration block that defines scheduling behavior for prebuilds. Use this to automatically adjust the number of prebuild instances based on a schedule.",
+ Optional: true,
+ MaxItems: 1,
+ Elem: &schema.Resource{
+ Schema: map[string]*schema.Schema{
+ "timezone": {
+ Type: schema.TypeString,
+ Description: `The timezone to use for the prebuild schedules (e.g., "UTC", "America/New_York").
+Timezone must be a valid timezone in the IANA timezone database.
+See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones for a complete list of valid timezone identifiers and https://www.iana.org/time-zones for the official IANA timezone database.`,
+ Required: true,
+ ValidateFunc: func(val interface{}, key string) ([]string, []error) {
+ timezone := val.(string)
+
+ _, err := time.LoadLocation(timezone)
+ if err != nil {
+ return nil, []error{fmt.Errorf("failed to load timezone %q: %w", timezone, err)}
+ }
+
+ return nil, nil
+ },
+ },
+ "schedule": {
+ Type: schema.TypeList,
+ Description: "One or more schedule blocks that define when to scale the number of prebuild instances.",
+ Required: true,
+ MinItems: 1,
+ Elem: &schema.Resource{
+ Schema: map[string]*schema.Schema{
+ "cron": {
+ Type: schema.TypeString,
+ Description: "A cron expression that defines when this schedule should be active. The cron expression must be in the format \"* HOUR DOM MONTH DAY-OF-WEEK\" where HOUR is 0-23, DOM (day-of-month) is 1-31, MONTH is 1-12, and DAY-OF-WEEK is 0-6 (Sunday-Saturday). The minute field must be \"*\" to ensure the schedule covers entire hours rather than specific minute intervals.",
+ Required: true,
+ ValidateFunc: func(val interface{}, key string) ([]string, []error) {
+ cronSpec := val.(string)
+
+ err := validatePrebuildsCronSpec(cronSpec)
+ if err != nil {
+ return nil, []error{fmt.Errorf("cron spec failed validation: %w", err)}
+ }
+
+ _, err = PrebuildsCRONParser.Parse(cronSpec)
+ if err != nil {
+ return nil, []error{fmt.Errorf("failed to parse cron spec: %w", err)}
+ }
+
+ return nil, nil
+ },
+ },
+ "instances": {
+ Type: schema.TypeInt,
+ Description: "The number of prebuild instances to maintain during this schedule period.",
+ Required: true,
+ },
+ },
+ },
+ },
+ },
+ },
+ },
},
},
},
},
}
}
+
+// validatePrebuildsCronSpec ensures that the minute field is set to *.
+// This is required because prebuild schedules represent continuous time ranges,
+// and we want the schedule to cover entire hours rather than specific minute intervals.
+func validatePrebuildsCronSpec(spec string) error {
+ parts := strings.Fields(spec)
+ if len(parts) != 5 {
+ return fmt.Errorf("cron specification should consist of 5 fields")
+ }
+ if parts[0] != "*" {
+ return fmt.Errorf("minute field should be *")
+ }
+
+ return nil
+}
+
+// validateSchedules checks if any of the configured prebuild schedules overlap with each other.
+// It returns an error if overlaps are found, nil otherwise.
+func validateSchedules(rd *schema.ResourceData) error {
+ // TypeSet from schema definition
+ prebuilds := rd.Get("prebuilds").(*schema.Set)
+ if prebuilds.Len() == 0 {
+ return nil
+ }
+
+ // Each element of TypeSet with Elem: &schema.Resource{} should be map[string]interface{}
+ prebuild, ok := prebuilds.List()[0].(map[string]interface{})
+ if !ok {
+ return fmt.Errorf("invalid prebuild configuration: expected map[string]interface{}")
+ }
+
+ // TypeList from schema definition
+ schedulingBlocks, ok := prebuild["scheduling"].([]interface{})
+ if !ok {
+ return fmt.Errorf("invalid scheduling configuration: expected []interface{}")
+ }
+ if len(schedulingBlocks) == 0 {
+ return nil
+ }
+
+ // Each element of TypeList with Elem: &schema.Resource{} should be map[string]interface{}
+ schedulingBlock, ok := schedulingBlocks[0].(map[string]interface{})
+ if !ok {
+ return fmt.Errorf("invalid scheduling configuration: expected map[string]interface{}")
+ }
+
+ // TypeList from schema definition
+ scheduleBlocks, ok := schedulingBlock["schedule"].([]interface{})
+ if !ok {
+ return fmt.Errorf("invalid schedule configuration: expected []interface{}")
+ }
+ if len(scheduleBlocks) == 0 {
+ return nil
+ }
+
+ cronSpecs := make([]string, len(scheduleBlocks))
+ for i, scheduleBlock := range scheduleBlocks {
+ // Each element of TypeList with Elem: &schema.Resource{} should be map[string]interface{}
+ schedule, ok := scheduleBlock.(map[string]interface{})
+ if !ok {
+ return fmt.Errorf("invalid schedule configuration: expected map[string]interface{}")
+ }
+
+ // TypeString from schema definition
+ cronSpec := schedule["cron"].(string)
+
+ cronSpecs[i] = cronSpec
+ }
+
+ err := helpers.ValidateSchedules(cronSpecs)
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
diff --git a/provider/workspace_preset_test.go b/provider/workspace_preset_test.go
index b8e752ae..84dfec17 100644
--- a/provider/workspace_preset_test.go
+++ b/provider/workspace_preset_test.go
@@ -265,6 +265,271 @@ func TestWorkspacePreset(t *testing.T) {
}`,
ExpectError: regexp.MustCompile("An argument named \"invalid_argument\" is not expected here."),
},
+ {
+ Name: "Prebuilds is set with an empty scheduling field",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {}
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`The argument "[^"]+" is required, but no definition was found.`),
+ },
+ {
+ Name: "Prebuilds is set with an scheduling field, but without timezone",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ schedule {
+ cron = "* 8-18 * * 1-5"
+ instances = 3
+ }
+ }
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`The argument "timezone" is required, but no definition was found.`),
+ },
+ {
+ Name: "Prebuilds is set with an scheduling field, but without schedule",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "UTC"
+ }
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`At least 1 "schedule" blocks are required.`),
+ },
+ {
+ Name: "Prebuilds is set with an scheduling.schedule field, but without cron",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "UTC"
+ schedule {
+ instances = 3
+ }
+ }
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`The argument "cron" is required, but no definition was found.`),
+ },
+ {
+ Name: "Prebuilds is set with an scheduling.schedule field, but without instances",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "UTC"
+ schedule {
+ cron = "* 8-18 * * 1-5"
+ }
+ }
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`The argument "instances" is required, but no definition was found.`),
+ },
+ {
+ Name: "Prebuilds is set with an scheduling.schedule field, but with invalid type for instances",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "UTC"
+ schedule {
+ cron = "* 8-18 * * 1-5"
+ instances = "not_a_number"
+ }
+ }
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`Inappropriate value for attribute "instances": a number is required`),
+ },
+ {
+ Name: "Prebuilds is set with an scheduling field with 1 schedule",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "UTC"
+ schedule {
+ cron = "* 8-18 * * 1-5"
+ instances = 3
+ }
+ }
+ }
+ }`,
+ 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.scheduling.0.timezone"], "UTC")
+ require.Equal(t, attrs["prebuilds.0.scheduling.0.schedule.0.cron"], "* 8-18 * * 1-5")
+ require.Equal(t, attrs["prebuilds.0.scheduling.0.schedule.0.instances"], "3")
+ return nil
+ },
+ },
+ {
+ Name: "Prebuilds is set with an scheduling field with 2 schedules",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "UTC"
+ schedule {
+ cron = "* 8-18 * * 1-5"
+ instances = 3
+ }
+ schedule {
+ cron = "* 8-14 * * 6"
+ instances = 1
+ }
+ }
+ }
+ }`,
+ 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.scheduling.0.timezone"], "UTC")
+ require.Equal(t, attrs["prebuilds.0.scheduling.0.schedule.0.cron"], "* 8-18 * * 1-5")
+ require.Equal(t, attrs["prebuilds.0.scheduling.0.schedule.0.instances"], "3")
+ require.Equal(t, attrs["prebuilds.0.scheduling.0.schedule.1.cron"], "* 8-14 * * 6")
+ require.Equal(t, attrs["prebuilds.0.scheduling.0.schedule.1.instances"], "1")
+ return nil
+ },
+ },
+ {
+ Name: "Prebuilds is set with an scheduling.schedule field, but the cron includes a disallowed minute field",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "UTC"
+ schedule {
+ cron = "30 8-18 * * 1-5"
+ instances = "1"
+ }
+ }
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`cron spec failed validation: minute field should be *`),
+ },
+ {
+ Name: "Prebuilds is set with an scheduling.schedule field, but the cron hour field is invalid",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "UTC"
+ schedule {
+ cron = "* 25-26 * * 1-5"
+ instances = "1"
+ }
+ }
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`failed to parse cron spec: end of range \(26\) above maximum \(23\): 25-26`),
+ },
+ {
+ Name: "Prebuilds is set with a valid scheduling.timezone field",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "America/Los_Angeles"
+ schedule {
+ cron = "* 8-18 * * 1-5"
+ instances = 3
+ }
+ }
+ }
+ }`,
+ 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.scheduling.0.timezone"], "America/Los_Angeles")
+ return nil
+ },
+ },
+ {
+ Name: "Prebuilds is set with an invalid scheduling.timezone field",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "InvalidLocation"
+ schedule {
+ cron = "* 8-18 * * 1-5"
+ instances = 3
+ }
+ }
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`failed to load timezone "InvalidLocation": unknown time zone InvalidLocation`),
+ },
+ {
+ Name: "Prebuilds is set with an scheduling field, with 2 overlapping schedules",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ prebuilds {
+ instances = 1
+ scheduling {
+ timezone = "UTC"
+ schedule {
+ cron = "* 8-18 * * 1-5"
+ instances = 3
+ }
+ schedule {
+ cron = "* 18-19 * * 5-6"
+ instances = 1
+ }
+ }
+ }
+ }`,
+ ExpectError: regexp.MustCompile(`schedules overlap with each other: schedules overlap: \* 8-18 \* \* 1-5 and \* 18-19 \* \* 5-6`),
+ },
}
for _, testcase := range testcases {
From c80041b152bd476fad51f3370eacfaf5e17ecbaf Mon Sep 17 00:00:00 2001
From: Danny Kopping <dannykopping@gmail.com>
Date: Thu, 19 Jun 2025 20:24:39 +0200
Subject: [PATCH 15/19] feat: add `coder_ai_task` resource (#413)
---
docs/resources/ai_task.md | 31 +++++++++++++++
provider/ai_task.go | 61 +++++++++++++++++++++++++++++
provider/ai_task_test.go | 82 +++++++++++++++++++++++++++++++++++++++
provider/provider.go | 1 +
4 files changed, 175 insertions(+)
create mode 100644 docs/resources/ai_task.md
create mode 100644 provider/ai_task.go
create mode 100644 provider/ai_task_test.go
diff --git a/docs/resources/ai_task.md b/docs/resources/ai_task.md
new file mode 100644
index 00000000..1922ef59
--- /dev/null
+++ b/docs/resources/ai_task.md
@@ -0,0 +1,31 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "coder_ai_task Resource - terraform-provider-coder"
+subcategory: ""
+description: |-
+ Use this resource to define Coder tasks.
+---
+
+# coder_ai_task (Resource)
+
+Use this resource to define Coder tasks.
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `sidebar_app` (Block Set, Min: 1, Max: 1) The coder_app to display in the sidebar. Usually a chat interface with the AI agent running in the workspace, like https://github.com/coder/agentapi. (see [below for nested schema](#nestedblock--sidebar_app))
+
+### Read-Only
+
+- `id` (String) A unique identifier for this resource.
+
+<a id="nestedblock--sidebar_app"></a>
+### Nested Schema for `sidebar_app`
+
+Required:
+
+- `id` (String) A reference to an existing `coder_app` resource in your template.
diff --git a/provider/ai_task.go b/provider/ai_task.go
new file mode 100644
index 00000000..76b19f3c
--- /dev/null
+++ b/provider/ai_task.go
@@ -0,0 +1,61 @@
+package provider
+
+import (
+ "context"
+
+ "github.com/google/uuid"
+ "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"
+)
+
+type AITask struct {
+ ID string `mapstructure:"id"`
+ SidebarApp []AITaskSidebarApp `mapstructure:"sidebar_app"`
+}
+
+type AITaskSidebarApp struct {
+ ID string `mapstructure:"id"`
+}
+
+// TaskPromptParameterName is the name of the parameter which is *required* to be defined when a coder_ai_task is used.
+const TaskPromptParameterName = "AI Prompt"
+
+func aiTask() *schema.Resource {
+ return &schema.Resource{
+ SchemaVersion: 1,
+
+ Description: "Use this resource to define Coder tasks.",
+ CreateContext: func(c context.Context, resourceData *schema.ResourceData, i any) diag.Diagnostics {
+ resourceData.SetId(uuid.NewString())
+ return nil
+ },
+ ReadContext: schema.NoopContext,
+ DeleteContext: schema.NoopContext,
+ Schema: map[string]*schema.Schema{
+ "id": {
+ Type: schema.TypeString,
+ Description: "A unique identifier for this resource.",
+ Computed: true,
+ },
+ "sidebar_app": {
+ Type: schema.TypeSet,
+ Description: "The coder_app to display in the sidebar. Usually a chat interface with the AI agent running in the workspace, like https://github.com/coder/agentapi.",
+ ForceNew: true,
+ Required: true,
+ MaxItems: 1,
+ Elem: &schema.Resource{
+ Schema: map[string]*schema.Schema{
+ "id": {
+ Type: schema.TypeString,
+ Description: "A reference to an existing `coder_app` resource in your template.",
+ Required: true,
+ ForceNew: true,
+ ValidateFunc: validation.IsUUID,
+ },
+ },
+ },
+ },
+ },
+ }
+}
diff --git a/provider/ai_task_test.go b/provider/ai_task_test.go
new file mode 100644
index 00000000..5f7a8a49
--- /dev/null
+++ b/provider/ai_task_test.go
@@ -0,0 +1,82 @@
+package provider_test
+
+import (
+ "regexp"
+ "testing"
+
+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+ "github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+ "github.com/stretchr/testify/require"
+)
+
+func TestAITask(t *testing.T) {
+ t.Parallel()
+
+ t.Run("OK", func(t *testing.T) {
+ t.Parallel()
+
+ resource.Test(t, resource.TestCase{
+ ProviderFactories: coderFactory(),
+ IsUnitTest: true,
+ Steps: []resource.TestStep{{
+ Config: `
+ provider "coder" {
+ }
+ resource "coder_agent" "dev" {
+ os = "linux"
+ arch = "amd64"
+ }
+ resource "coder_app" "code-server" {
+ agent_id = coder_agent.dev.id
+ slug = "code-server"
+ display_name = "code-server"
+ icon = "builtin:vim"
+ url = "http://localhost:13337"
+ open_in = "slim-window"
+ }
+ resource "coder_ai_task" "test" {
+ sidebar_app {
+ id = coder_app.code-server.id
+ }
+ }
+ `,
+ Check: func(state *terraform.State) error {
+ require.Len(t, state.Modules, 1)
+ resource := state.Modules[0].Resources["coder_ai_task.test"]
+ require.NotNil(t, resource)
+ for _, key := range []string{
+ "id",
+ "sidebar_app.#",
+ } {
+ value := resource.Primary.Attributes[key]
+ require.NotNil(t, value)
+ require.Greater(t, len(value), 0)
+ }
+ require.Equal(t, "1", resource.Primary.Attributes["sidebar_app.#"])
+ return nil
+ },
+ }},
+ })
+ })
+
+ t.Run("InvalidSidebarAppID", func(t *testing.T) {
+ t.Parallel()
+
+ resource.Test(t, resource.TestCase{
+ ProviderFactories: coderFactory(),
+ IsUnitTest: true,
+ Steps: []resource.TestStep{{
+ Config: `
+ provider "coder" {
+ }
+ resource "coder_ai_task" "test" {
+ sidebar_app {
+ id = "not-a-uuid"
+ }
+ }
+ `,
+ ExpectError: regexp.MustCompile(`expected "sidebar_app.0.id" to be a valid UUID`),
+ }},
+ })
+ })
+}
diff --git a/provider/provider.go b/provider/provider.go
index cc2644ef..43e3a6ac 100644
--- a/provider/provider.go
+++ b/provider/provider.go
@@ -72,6 +72,7 @@ func New() *schema.Provider {
ResourcesMap: map[string]*schema.Resource{
"coder_agent": agentResource(),
"coder_agent_instance": agentInstanceResource(),
+ "coder_ai_task": aiTask(),
"coder_app": appResource(),
"coder_metadata": metadataResource(),
"coder_script": scriptResource(),
From e890833351e229dc226db1b7ebcbe7767c228de6 Mon Sep 17 00:00:00 2001
From: Danny Kopping <dannykopping@gmail.com>
Date: Mon, 23 Jun 2025 21:33:13 +0200
Subject: [PATCH 16/19] feat: implement default preset (#414)
---
docs/data-sources/workspace_preset.md | 11 ++++
.../coder_workspace_preset/data-source.tf | 10 ++++
integration/integration_test.go | 1 +
integration/test-data-source/main.tf | 4 +-
provider/workspace_preset.go | 7 +++
provider/workspace_preset_test.go | 56 +++++++++++++++++++
6 files changed, 88 insertions(+), 1 deletion(-)
diff --git a/docs/data-sources/workspace_preset.md b/docs/data-sources/workspace_preset.md
index 26e597e2..69057403 100644
--- a/docs/data-sources/workspace_preset.md
+++ b/docs/data-sources/workspace_preset.md
@@ -27,6 +27,16 @@ data "coder_workspace_preset" "example" {
(data.coder_parameter.ami.name) = "ami-xxxxxxxx"
}
}
+
+# Example of a default preset that will be pre-selected for users
+data "coder_workspace_preset" "standard" {
+ name = "Standard"
+ default = true
+ parameters = {
+ (data.coder_parameter.instance_type.name) = "t3.medium"
+ (data.coder_parameter.region.name) = "us-west-2"
+ }
+}
```
<!-- schema generated by tfplugindocs -->
@@ -38,6 +48,7 @@ data "coder_workspace_preset" "example" {
### Optional
+- `default` (Boolean) Whether this preset should be selected by default when creating a workspace. Only one preset per template can be marked as default.
- `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) 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))
diff --git a/examples/data-sources/coder_workspace_preset/data-source.tf b/examples/data-sources/coder_workspace_preset/data-source.tf
index 4f29a199..3c245f7a 100644
--- a/examples/data-sources/coder_workspace_preset/data-source.tf
+++ b/examples/data-sources/coder_workspace_preset/data-source.tf
@@ -12,3 +12,13 @@ data "coder_workspace_preset" "example" {
(data.coder_parameter.ami.name) = "ami-xxxxxxxx"
}
}
+
+# Example of a default preset that will be pre-selected for users
+data "coder_workspace_preset" "standard" {
+ name = "Standard"
+ default = true
+ parameters = {
+ (data.coder_parameter.instance_type.name) = "t3.medium"
+ (data.coder_parameter.region.name) = "us-west-2"
+ }
+}
diff --git a/integration/integration_test.go b/integration/integration_test.go
index b075aebd..ec0b5e4f 100644
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -93,6 +93,7 @@ func TestIntegration(t *testing.T) {
"workspace_parameter.value": `param value`,
"workspace_parameter.icon": `param icon`,
"workspace_preset.name": `preset`,
+ "workspace_preset.default": `true`,
"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 12344546..5d312b1a 100644
--- a/integration/test-data-source/main.tf
+++ b/integration/test-data-source/main.tf
@@ -20,7 +20,8 @@ data "coder_parameter" "param" {
icon = "param icon"
}
data "coder_workspace_preset" "preset" {
- name = "preset"
+ name = "preset"
+ default = true
parameters = {
(data.coder_parameter.param.name) = "preset param value"
}
@@ -64,6 +65,7 @@ locals {
"workspace_parameter.value" : data.coder_parameter.param.value,
"workspace_parameter.icon" : data.coder_parameter.param.icon,
"workspace_preset.name" : data.coder_workspace_preset.preset.name,
+ "workspace_preset.default" : tostring(data.coder_workspace_preset.preset.default),
"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 0a44b1eb..1d7576e9 100644
--- a/provider/workspace_preset.go
+++ b/provider/workspace_preset.go
@@ -19,6 +19,7 @@ var PrebuildsCRONParser = rbcron.NewParser(rbcron.Minute | rbcron.Hour | rbcron.
type WorkspacePreset struct {
Name string `mapstructure:"name"`
+ Default bool `mapstructure:"default"`
Parameters map[string]string `mapstructure:"parameters"`
// There should always be only one prebuild block, but Terraform's type system
// still parses them as a slice, so we need to handle it as such. We could use
@@ -92,6 +93,12 @@ func workspacePresetDataSource() *schema.Resource {
Required: true,
ValidateFunc: validation.StringIsNotEmpty,
},
+ "default": {
+ Type: schema.TypeBool,
+ Description: "Whether this preset should be selected by default when creating a workspace. Only one preset per template can be marked as default.",
+ Optional: true,
+ Default: false,
+ },
"parameters": {
Type: schema.TypeMap,
Description: "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.",
diff --git a/provider/workspace_preset_test.go b/provider/workspace_preset_test.go
index 84dfec17..073193c6 100644
--- a/provider/workspace_preset_test.go
+++ b/provider/workspace_preset_test.go
@@ -530,6 +530,62 @@ func TestWorkspacePreset(t *testing.T) {
}`,
ExpectError: regexp.MustCompile(`schedules overlap with each other: schedules overlap: \* 8-18 \* \* 1-5 and \* 18-19 \* \* 5-6`),
},
+ {
+ Name: "Default field set to true",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ default = true
+ parameters = {
+ "region" = "us-east1-a"
+ }
+ }`,
+ 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)
+ require.Equal(t, resource.Primary.Attributes["default"], "true")
+ return nil
+ },
+ },
+ {
+ Name: "Default field set to false",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ default = false
+ parameters = {
+ "region" = "us-east1-a"
+ }
+ }`,
+ 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)
+ require.Equal(t, resource.Primary.Attributes["default"], "false")
+ return nil
+ },
+ },
+ {
+ Name: "Default field not provided (defaults to false)",
+ Config: `
+ data "coder_workspace_preset" "preset_1" {
+ name = "preset_1"
+ parameters = {
+ "region" = "us-east1-a"
+ }
+ }`,
+ 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)
+ require.Equal(t, resource.Primary.Attributes["default"], "false")
+ return nil
+ },
+ },
}
for _, testcase := range testcases {
From e6bbd8c7c72323518eb432be8b267ee8a3b6f674 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Jun 2025 19:47:44 +0500
Subject: [PATCH 17/19] build(deps): Bump golang.org/x/mod from 0.24.0 to
0.25.0 (#411)
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 fcb25b13..370fd5f3 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
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.24.0
+ golang.org/x/mod v0.25.0
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
)
diff --git a/go.sum b/go.sum
index 31e83346..ff0ed9c7 100644
--- a/go.sum
+++ b/go.sum
@@ -231,8 +231,8 @@ golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXy
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.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
+golang.org/x/mod v0.25.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=
From 0ce611a8d9fdba7955ebc7a3fe51d9d394758dc8 Mon Sep 17 00:00:00 2001
From: "blink-so[bot]" <211532188+blink-so[bot]@users.noreply.github.com>
Date: Fri, 27 Jun 2025 20:43:57 +0500
Subject: [PATCH 18/19] docs: clarify cron attribute format for coder_script
resource (#409)
Co-authored-by: blink-so[bot] <211532188+blink-so[bot]@users.noreply.github.com>
---
docs/resources/script.md | 19 ++++--
examples/resources/coder_script/resource.tf | 17 ++++-
provider/script.go | 35 ++++++++--
provider/script_test.go | 72 +++++++++++++++++++++
4 files changed, 130 insertions(+), 13 deletions(-)
diff --git a/docs/resources/script.md b/docs/resources/script.md
index 22ac1b50..9058fce4 100644
--- a/docs/resources/script.md
+++ b/docs/resources/script.md
@@ -43,15 +43,26 @@ resource "coder_script" "code-server" {
})
}
-resource "coder_script" "nightly_sleep_reminder" {
+resource "coder_script" "nightly_update" {
agent_id = coder_agent.dev.agent_id
display_name = "Nightly update"
icon = "/icon/database.svg"
- cron = "0 22 * * *"
+ cron = "0 0 22 * * *" # Run at 22:00 (10 PM) every day
script = <<EOF
#!/bin/sh
echo "Running nightly update"
- sudo apt-get install
+ sudo apt-get update
+ EOF
+}
+
+resource "coder_script" "every_5_minutes" {
+ agent_id = coder_agent.dev.agent_id
+ display_name = "Health check"
+ icon = "/icon/heart.svg"
+ cron = "0 */5 * * * *" # Run every 5 minutes
+ script = <<EOF
+ #!/bin/sh
+ echo "Health check at $(date)"
EOF
}
@@ -78,7 +89,7 @@ resource "coder_script" "shutdown" {
### Optional
-- `cron` (String) The cron schedule to run the script on. This is a cron expression.
+- `cron` (String) The cron schedule to run the script on. This uses a 6-field cron expression format: `seconds minutes hours day-of-month month day-of-week`. Note that this differs from the standard Unix 5-field format by including seconds as the first field. Examples: `"0 0 22 * * *"` (daily at 10 PM), `"0 */5 * * * *"` (every 5 minutes), `"30 0 9 * * 1-5"` (weekdays at 9:30 AM).
- `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>"`.
- `log_path` (String) The path of a file to write the logs to. If relative, it will be appended to tmp.
- `run_on_start` (Boolean) This option defines whether or not the script should run when the agent starts. The script should exit when it is done to signal that the agent is ready.
diff --git a/examples/resources/coder_script/resource.tf b/examples/resources/coder_script/resource.tf
index b7fced38..8b3fa661 100644
--- a/examples/resources/coder_script/resource.tf
+++ b/examples/resources/coder_script/resource.tf
@@ -28,15 +28,26 @@ resource "coder_script" "code-server" {
})
}
-resource "coder_script" "nightly_sleep_reminder" {
+resource "coder_script" "nightly_update" {
agent_id = coder_agent.dev.agent_id
display_name = "Nightly update"
icon = "/icon/database.svg"
- cron = "0 22 * * *"
+ cron = "0 0 22 * * *" # Run at 22:00 (10 PM) every day
script = <<EOF
#!/bin/sh
echo "Running nightly update"
- sudo apt-get install
+ sudo apt-get update
+ EOF
+}
+
+resource "coder_script" "every_5_minutes" {
+ agent_id = coder_agent.dev.agent_id
+ display_name = "Health check"
+ icon = "/icon/heart.svg"
+ cron = "0 */5 * * * *" # Run every 5 minutes
+ script = <<EOF
+ #!/bin/sh
+ echo "Health check at $(date)"
EOF
}
diff --git a/provider/script.go b/provider/script.go
index df436ead..23ddec6e 100644
--- a/provider/script.go
+++ b/provider/script.go
@@ -3,6 +3,7 @@ package provider
import (
"context"
"fmt"
+ "strings"
"github.com/google/uuid"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -13,6 +14,32 @@ import (
var ScriptCRONParser = cron.NewParser(cron.Second | cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.DowOptional | cron.Descriptor)
+// ValidateCronExpression validates a cron expression and provides helpful warnings for common mistakes
+func ValidateCronExpression(cronExpr string) (warnings []string, errors []error) {
+ // Check if it looks like a 5-field Unix cron expression
+ fields := strings.Fields(cronExpr)
+ if len(fields) == 5 {
+ // Try to parse as standard Unix cron (without seconds)
+ unixParser := cron.NewParser(cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.DowOptional | cron.Descriptor)
+ if _, err := unixParser.Parse(cronExpr); err == nil {
+ // It's a valid 5-field expression, provide a helpful warning
+ warnings = append(warnings, fmt.Sprintf(
+ "The cron expression '%s' appears to be in Unix 5-field format. "+
+ "Coder uses 6-field format (seconds minutes hours day month day-of-week). "+
+ "Consider prefixing with '0 ' to run at the start of each minute: '0 %s'",
+ cronExpr, cronExpr))
+ }
+ }
+
+ // Validate with the actual 6-field parser
+ _, err := ScriptCRONParser.Parse(cronExpr)
+ if err != nil {
+ errors = append(errors, fmt.Errorf("%s is not a valid cron expression: %w", cronExpr, err))
+ }
+
+ return warnings, errors
+}
+
func scriptResource() *schema.Resource {
return &schema.Resource{
SchemaVersion: 1,
@@ -72,17 +99,13 @@ func scriptResource() *schema.Resource {
ForceNew: true,
Type: schema.TypeString,
Optional: true,
- Description: "The cron schedule to run the script on. This is a cron expression.",
+ Description: "The cron schedule to run the script on. This uses a 6-field cron expression format: `seconds minutes hours day-of-month month day-of-week`. Note that this differs from the standard Unix 5-field format by including seconds as the first field. Examples: `\"0 0 22 * * *\"` (daily at 10 PM), `\"0 */5 * * * *\"` (every 5 minutes), `\"30 0 9 * * 1-5\"` (weekdays at 9:30 AM).",
ValidateFunc: func(i interface{}, _ string) ([]string, []error) {
v, ok := i.(string)
if !ok {
return []string{}, []error{fmt.Errorf("got type %T instead of string", i)}
}
- _, err := ScriptCRONParser.Parse(v)
- if err != nil {
- return []string{}, []error{fmt.Errorf("%s is not a valid cron expression: %w", v, err)}
- }
- return nil, nil
+ return ValidateCronExpression(v)
},
},
"start_blocks_login": {
diff --git a/provider/script_test.go b/provider/script_test.go
index 37f1a819..64808372 100644
--- a/provider/script_test.go
+++ b/provider/script_test.go
@@ -8,6 +8,8 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+
+ "github.com/coder/terraform-provider-coder/v2/provider"
)
func TestScript(t *testing.T) {
@@ -124,3 +126,73 @@ func TestScriptStartBlocksLoginRequiresRunOnStart(t *testing.T) {
}},
})
}
+
+func TestValidateCronExpression(t *testing.T) {
+ t.Parallel()
+
+ tests := []struct {
+ name string
+ cronExpr string
+ expectWarnings bool
+ expectErrors bool
+ warningContains string
+ }{
+ {
+ name: "valid 6-field expression",
+ cronExpr: "0 0 22 * * *",
+ expectWarnings: false,
+ expectErrors: false,
+ },
+ {
+ name: "valid 6-field expression with seconds",
+ cronExpr: "30 0 9 * * 1-5",
+ expectWarnings: false,
+ expectErrors: false,
+ },
+ {
+ name: "5-field Unix format - should warn",
+ cronExpr: "0 22 * * *",
+ expectWarnings: true,
+ expectErrors: false,
+ warningContains: "appears to be in Unix 5-field format",
+ },
+ {
+ name: "5-field every 5 minutes - should warn",
+ cronExpr: "*/5 * * * *",
+ expectWarnings: true,
+ expectErrors: false,
+ warningContains: "Consider prefixing with '0 '",
+ },
+ {
+ name: "invalid expression",
+ cronExpr: "invalid",
+ expectErrors: true,
+ },
+ {
+ name: "too many fields",
+ cronExpr: "0 0 0 0 0 0 0",
+ expectErrors: true,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ warnings, errors := provider.ValidateCronExpression(tt.cronExpr)
+
+ if tt.expectWarnings {
+ require.NotEmpty(t, warnings, "Expected warnings but got none")
+ if tt.warningContains != "" {
+ require.Contains(t, warnings[0], tt.warningContains)
+ }
+ } else {
+ require.Empty(t, warnings, "Expected no warnings but got: %v", warnings)
+ }
+
+ if tt.expectErrors {
+ require.NotEmpty(t, errors, "Expected errors but got none")
+ } else {
+ require.Empty(t, errors, "Expected no errors but got: %v", errors)
+ }
+ })
+ }
+}
From 6a6f740e9e86524f57b392a4a5af7398dd416cc9 Mon Sep 17 00:00:00 2001
From: "blink-so[bot]" <211532188+blink-so[bot]@users.noreply.github.com>
Date: Fri, 27 Jun 2025 21:02:05 +0500
Subject: [PATCH 19/19] Fix coder_script agent_id reference typos (#418)
Co-authored-by: blink-so[bot] <211532188+blink-so[bot]@users.noreply.github.com>
Co-authored-by: matifali <10648092+matifali@users.noreply.github.com>
---
docs/resources/script.md | 8 ++++----
examples/resources/coder_script/resource.tf | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/resources/script.md b/docs/resources/script.md
index 9058fce4..21bfaec9 100644
--- a/docs/resources/script.md
+++ b/docs/resources/script.md
@@ -22,7 +22,7 @@ resource "coder_agent" "dev" {
}
resource "coder_script" "dotfiles" {
- agent_id = coder_agent.dev.agent_id
+ agent_id = coder_agent.dev.id
display_name = "Dotfiles"
icon = "/icon/dotfiles.svg"
run_on_start = true
@@ -33,7 +33,7 @@ resource "coder_script" "dotfiles" {
}
resource "coder_script" "code-server" {
- agent_id = coder_agent.dev.agent_id
+ agent_id = coder_agent.dev.id
display_name = "code-server"
icon = "/icon/code.svg"
run_on_start = true
@@ -44,7 +44,7 @@ resource "coder_script" "code-server" {
}
resource "coder_script" "nightly_update" {
- agent_id = coder_agent.dev.agent_id
+ agent_id = coder_agent.dev.id
display_name = "Nightly update"
icon = "/icon/database.svg"
cron = "0 0 22 * * *" # Run at 22:00 (10 PM) every day
@@ -56,7 +56,7 @@ resource "coder_script" "nightly_update" {
}
resource "coder_script" "every_5_minutes" {
- agent_id = coder_agent.dev.agent_id
+ agent_id = coder_agent.dev.id
display_name = "Health check"
icon = "/icon/heart.svg"
cron = "0 */5 * * * *" # Run every 5 minutes
diff --git a/examples/resources/coder_script/resource.tf b/examples/resources/coder_script/resource.tf
index 8b3fa661..53c9dfb8 100644
--- a/examples/resources/coder_script/resource.tf
+++ b/examples/resources/coder_script/resource.tf
@@ -7,7 +7,7 @@ resource "coder_agent" "dev" {
}
resource "coder_script" "dotfiles" {
- agent_id = coder_agent.dev.agent_id
+ agent_id = coder_agent.dev.id
display_name = "Dotfiles"
icon = "/icon/dotfiles.svg"
run_on_start = true
@@ -18,7 +18,7 @@ resource "coder_script" "dotfiles" {
}
resource "coder_script" "code-server" {
- agent_id = coder_agent.dev.agent_id
+ agent_id = coder_agent.dev.id
display_name = "code-server"
icon = "/icon/code.svg"
run_on_start = true
@@ -29,7 +29,7 @@ resource "coder_script" "code-server" {
}
resource "coder_script" "nightly_update" {
- agent_id = coder_agent.dev.agent_id
+ agent_id = coder_agent.dev.id
display_name = "Nightly update"
icon = "/icon/database.svg"
cron = "0 0 22 * * *" # Run at 22:00 (10 PM) every day
@@ -41,7 +41,7 @@ resource "coder_script" "nightly_update" {
}
resource "coder_script" "every_5_minutes" {
- agent_id = coder_agent.dev.agent_id
+ agent_id = coder_agent.dev.id
display_name = "Health check"
icon = "/icon/heart.svg"
cron = "0 */5 * * * *" # Run every 5 minutes