From 9d84d807d863dc4ea7db3c7a14ec3639f7226846 Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Mon, 17 Feb 2025 07:35:09 +0000 Subject: [PATCH 1/6] chore: upgrade terraform-provider-coder to v2 --- codersdk/richparameters.go | 2 +- go.mod | 17 +++++++++------- go.sum | 32 +++++++++++++++--------------- provisioner/terraform/provision.go | 10 ++++++++-- provisioner/terraform/resources.go | 2 +- 5 files changed, 36 insertions(+), 27 deletions(-) diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go index a0848d3cdffec..6fd082d5faf6c 100644 --- a/codersdk/richparameters.go +++ b/codersdk/richparameters.go @@ -5,7 +5,7 @@ import ( "golang.org/x/xerrors" - "github.com/coder/terraform-provider-coder/provider" + "github.com/coder/terraform-provider-coder/v2/provider" ) func ValidateNewWorkspaceParameters(richParameters []TemplateVersionParameter, buildParameters []WorkspaceBuildParameter) error { diff --git a/go.mod b/go.mod index b63645a6746cf..88a8dc9db1b3c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/coder/coder/v2 -go 1.22.8 +go 1.22.9 + +toolchain go1.23.6 // Required until a v3 of chroma is created to lazily initialize all XML files. // None of our dependencies seem to use the registries anyways, so this @@ -94,7 +96,6 @@ require ( github.com/coder/quartz v0.1.2 github.com/coder/retry v1.5.1 github.com/coder/serpent v0.10.0 - github.com/coder/terraform-provider-coder v1.0.4 github.com/coder/websocket v1.8.12 github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 github.com/coreos/go-oidc/v3 v3.12.0 @@ -132,7 +133,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-reap v0.0.0-20170704170343-bf58d8a43e7b github.com/hashicorp/go-version v1.7.0 - github.com/hashicorp/hc-install v0.9.0 + github.com/hashicorp/hc-install v0.9.1 github.com/hashicorp/terraform-config-inspect v0.0.0-20211115214459-90acf1ca460f github.com/hashicorp/terraform-json v0.24.0 github.com/hashicorp/yamux v0.1.2 @@ -238,7 +239,7 @@ require ( github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/OneOfOne/xxhash v1.2.8 // indirect - github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect + github.com/ProtonMail/go-crypto v1.1.3 // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/agnivade/levenshtein v1.2.0 // indirect github.com/akutz/memconn v0.1.0 // indirect @@ -338,9 +339,9 @@ require ( github.com/hashicorp/hcl v1.0.1-vault-5 // indirect github.com/hashicorp/hcl/v2 v2.23.0 github.com/hashicorp/logutils v1.0.0 // indirect - github.com/hashicorp/terraform-plugin-go v0.25.0 // indirect + github.com/hashicorp/terraform-plugin-go v0.26.0 // indirect github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect - github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0 // indirect + github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0 // indirect github.com/hdevalence/ed25519consensus v0.1.0 // indirect github.com/illarion/gonotify v1.0.1 // indirect github.com/insomniacslk/dhcp v0.0.0-20231206064809-8c70d406f6d2 // indirect @@ -438,7 +439,7 @@ require ( github.com/yuin/goldmark v1.7.8 // indirect github.com/yuin/goldmark-emoji v1.0.4 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - github.com/zclconf/go-cty v1.16.0 + github.com/zclconf/go-cty v1.16.2 github.com/zeebo/errs v1.3.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/component v0.104.0 // indirect @@ -467,3 +468,5 @@ require ( kernel.org/pub/linux/libs/security/libcap/psx v1.2.73 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +require github.com/coder/terraform-provider-coder/v2 v2.1.3 diff --git a/go.sum b/go.sum index 3e0e247cce31b..24cf821dde54a 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEV github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8= github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= -github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg= -github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +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/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY= @@ -240,8 +240,8 @@ github.com/coder/tailscale v1.1.1-0.20250129014916-8086c871eae6 h1:prDIwUcsSEKbs github.com/coder/tailscale v1.1.1-0.20250129014916-8086c871eae6/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko= github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0= github.com/coder/terraform-config-inspect v0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI= -github.com/coder/terraform-provider-coder v1.0.4 h1:MJldCvykIQzzqBVUDjCJpPyqvKelAAHrtJKfIIx4Qxo= -github.com/coder/terraform-provider-coder v1.0.4/go.mod h1:dQ1e/IccUxnmh/1bXTA3PopSoBkHMyWT6EkdBw8Lx6Y= +github.com/coder/terraform-provider-coder/v2 v2.1.3 h1:zB7ObGsiOGBHcJUUMmcSauEPlTWRIYmMYieF05LxHSc= +github.com/coder/terraform-provider-coder/v2 v2.1.3/go.mod h1:RHGyb+ghiy8UpDAMJM8duRFuzd+1VqA3AtkRLh2P3Ug= github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo= github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 h1:C2/eCr+r0a5Auuw3YOiSyLNHkdMtyCZHPFBx7syN4rk= @@ -535,26 +535,26 @@ github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= -github.com/hashicorp/hc-install v0.9.0 h1:2dIk8LcvANwtv3QZLckxcjyF5w8KVtiMxu6G6eLhghE= -github.com/hashicorp/hc-install v0.9.0/go.mod h1:+6vOP+mf3tuGgMApVYtmsnDoKWMDcFXeTxCACYZ8SFg= +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/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM= github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM= 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.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ= -github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg= +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.25.0 h1:oi13cx7xXA6QciMcpcFi/rwA974rdTxjqEhXJjbAyks= -github.com/hashicorp/terraform-plugin-go v0.25.0/go.mod h1:+SYagMYadJP86Kvn+TGeV+ofr/R3g4/If0O5sO96MVw= +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-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.35.0 h1:wyKCCtn6pBBL46c1uIIBNUOWlNfYXfXpVo16iDyLp8Y= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0/go.mod h1:B0Al8NyYVr8Mp/KLwssKXG1RqnTk7FySqSn4fRuLNgw= -github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI= -github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0 h1:7/iejAPyCRBhqAg3jOx+4UcAhY0A+Sg8B+0+d/GxSfM= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0/go.mod h1:TiQwXAjFrgBf5tg5rvBRz8/ubPULpU0HjSaVi5UoJf8= +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-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.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8= @@ -969,8 +969,8 @@ github.com/yuin/goldmark-emoji v1.0.4 h1:vCwMkPZSNefSUnOW2ZKRUjBSD5Ok3W78IXhGxxA github.com/yuin/goldmark-emoji v1.0.4/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -github.com/zclconf/go-cty v1.16.0 h1:xPKEhst+BW5D0wxebMZkxgapvOE/dw7bFTlgSc9nD6w= -github.com/zclconf/go-cty v1.16.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +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= github.com/zclconf/go-cty-yaml v1.1.0 h1:nP+jp0qPHv2IhUVqmQSzjvqAWcObN0KBkUl2rWBdig0= diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go index 3025e5de36469..7be4d27c7b359 100644 --- a/provisioner/terraform/provision.go +++ b/provisioner/terraform/provision.go @@ -16,7 +16,7 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog" - "github.com/coder/terraform-provider-coder/provider" + "github.com/coder/terraform-provider-coder/v2/provider" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/tracing" @@ -269,7 +269,7 @@ func provisionEnv( env = append(env, provider.ParameterEnvironmentVariable(param.Name)+"="+param.Value) } for _, extAuth := range externalAuth { - env = append(env, provider.GitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken) + env = append(env, gitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken) env = append(env, provider.ExternalAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken) } @@ -350,3 +350,9 @@ func tryGettingCoderProviderStacktrace(sess *provisionersdk.Session) string { } return string(stacktraces) } + +// gitAuthAccessTokenEnvironmentVariable was copied from provider.GitAuthAccessTokenEnvironmentVariable +// in v1.0.4 of github.com/coder/terraform-provider-coder/provider when we upgraded to v2. +func gitAuthAccessTokenEnvironmentVariable(id string) string { + return fmt.Sprintf("CODER_GIT_AUTH_ACCESS_TOKEN_%s", id) +} diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go index 800bfa7ddcdf1..d1be90dddf961 100644 --- a/provisioner/terraform/resources.go +++ b/provisioner/terraform/resources.go @@ -12,7 +12,7 @@ import ( "cdr.dev/slog" - "github.com/coder/terraform-provider-coder/provider" + "github.com/coder/terraform-provider-coder/v2/provider" tfaddr "github.com/hashicorp/go-terraform-address" From 0c216b2798718c53b069166282cedf1cd27b7d74 Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Mon, 17 Feb 2025 07:44:10 +0000 Subject: [PATCH 2/6] regenerate test data --- .../calling-module/calling-module.tfplan.json | 21 ++--- .../calling-module.tfstate.json | 17 +++-- .../chaining-resources.tfplan.json | 21 ++--- .../chaining-resources.tfstate.json | 17 +++-- .../conflicting-resources.tfplan.json | 21 ++--- .../conflicting-resources.tfstate.json | 17 +++-- .../display-apps-disabled.tfplan.json | 21 ++--- .../display-apps-disabled.tfstate.json | 15 ++-- .../display-apps/display-apps.tfplan.json | 21 ++--- .../display-apps/display-apps.tfstate.json | 15 ++-- .../external-auth-providers.tfplan.json | 21 ++--- .../external-auth-providers.tfstate.json | 15 ++-- .../instance-id/instance-id.tfplan.json | 21 ++--- .../instance-id/instance-id.tfstate.json | 19 ++--- .../mapped-apps/mapped-apps.tfplan.json | 43 ++++++----- .../mapped-apps/mapped-apps.tfstate.json | 35 ++++----- .../multiple-agents-multiple-apps.tfplan.json | 76 ++++++++++--------- ...multiple-agents-multiple-apps.tfstate.json | 60 ++++++++------- .../multiple-agents-multiple-envs.tfplan.json | 56 +++++++------- ...multiple-agents-multiple-envs.tfstate.json | 48 ++++++------ ...ltiple-agents-multiple-scripts.tfplan.json | 52 +++++++------ ...tiple-agents-multiple-scripts.tfstate.json | 48 ++++++------ .../multiple-agents.tfplan.json | 70 +++++++++-------- .../multiple-agents.tfstate.json | 50 ++++++------ .../multiple-apps/multiple-apps.tfplan.json | 57 +++++++------- .../multiple-apps/multiple-apps.tfstate.json | 45 +++++------ .../resource-metadata-duplicate.tfplan.json | 29 +++---- .../resource-metadata-duplicate.tfstate.json | 27 +++---- .../resource-metadata.tfplan.json | 25 +++--- .../resource-metadata.tfstate.json | 21 ++--- .../rich-parameters-order.tfplan.json | 25 +++--- .../rich-parameters-order.tfstate.json | 19 ++--- .../rich-parameters-validation.tfplan.json | 33 ++++---- .../rich-parameters-validation.tfstate.json | 27 +++---- .../rich-parameters.tfplan.json | 41 +++++----- .../rich-parameters.tfstate.json | 35 ++++----- 36 files changed, 616 insertions(+), 568 deletions(-) diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json index 6be5318da7f1b..e1d32801cd3bf 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -89,14 +90,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -104,14 +107,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -200,7 +201,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 } ], "module_calls": { @@ -259,7 +260,7 @@ ] } ], - "timestamp": "2025-01-29T22:47:46Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json index 73aeed2d3a68a..039f7c60ba3b1 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "14f0eb08-1bdb-4d48-ab20-e06584ee5b68", + "id": "ffa21ce9-e565-4a02-9453-15b036263be4", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "454fffe5-3c59-4a9e-80a0-0d1644ce3b24", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "5d18ae6c-e7c2-4051-a76e-12d196b32bf9", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -68,7 +69,7 @@ "outputs": { "script": "" }, - "random": "8389680299908922676" + "random": "2302358862924788424" }, "sensitive_values": { "inputs": {}, @@ -83,7 +84,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8124127383117450432", + "id": "6236093485278712336", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json index 9f2b1d3736e6e..31741ded5f255 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -79,14 +80,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -94,14 +97,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -177,7 +178,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.a", @@ -204,7 +205,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:48Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json index fc6241b86e73a..dfa3555cbfe4d 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "038d5038-be85-4609-bde3-56b7452e4386", + "id": "1977ff27-3076-4699-b78d-62c7f88b627a", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "e570d762-5584-4192-a474-be9e137b2f09", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "3c0519d9-bcbd-4ae9-b8f4-045302ffd10b", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "690495753077748083", + "id": "4078562106562961498", "triggers": null }, "sensitive_values": {}, @@ -73,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3238567980725122951", + "id": "55585383008969295", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json index f5218d0c65e0a..7de175d0a3be8 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -79,14 +80,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -94,14 +97,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -177,7 +178,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.first", @@ -204,7 +205,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:50Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json index 44bca5b6abc30..222da8066fca3 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "be15a1b3-f041-4471-9dec-9784c68edb26", + "id": "61a9462e-35d7-4f01-aad9-a243a9b77504", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "df2580ad-59cc-48fb-bb21-40a8be5a5a66", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "dc4c5cdd-e9e2-4f67-a9ba-adf8641843a2", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "9103672483967127580", + "id": "1760586578107252540", "triggers": null }, "sensitive_values": {}, @@ -72,7 +73,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4372402015997897970", + "id": "832440145757325680", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json index 826ba9da95576..53b7262920838 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,14 +26,16 @@ } ], "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { @@ -41,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -87,14 +88,16 @@ } ], "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -104,7 +107,6 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -113,7 +115,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -187,7 +188,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev", @@ -203,7 +204,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:53Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json index 1948baf7137a8..dd9b125adc073 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "398e27d3-10cc-4522-9144-34658eedad0e", + "id": "8d9cd7ab-b9cf-4d70-b96f-eeba1420f3ff", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "33068dbe-54d7-45eb-bfe5-87a9756802e2", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "6b88a94e-61ee-4043-97e0-0e612d23cdb5", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5682617535476100233", + "id": "4826119572317006529", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json index 9172849c341a3..c4aa22d4c99d1 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,14 +26,16 @@ } ], "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { @@ -41,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -87,14 +88,16 @@ } ], "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -104,7 +107,6 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -113,7 +115,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -187,7 +188,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev", @@ -203,7 +204,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:52Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json index 88e4d0f768d1e..1cef038a0f2fa 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "810cdd01-a27d-442f-9e69-bdaecced8a59", + "id": "9e751ba0-9fae-43d5-86a4-e1d83aa58154", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "fade1b71-d52b-4ef2-bb05-961f7795bab9", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "50dfcef5-15c0-465c-b0a6-15f6939e8f29", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5174735461860530782", + "id": "2293698738523751505", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json index 654ce7464aad6..e45ba68ab939b 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -67,14 +68,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -82,14 +85,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -182,7 +183,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev", @@ -227,7 +228,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:55Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json index 733c9dd3acdb2..33d22893cbce4 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json @@ -38,7 +38,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -54,17 +54,19 @@ } ], "env": null, - "id": "7ead336b-d366-4991-b38d-bdb8b9333ae9", + "id": "fc300a5a-f402-434e-b906-c7df4d81d3b4", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "a3d2c620-f065-4b29-ae58-370292e787d4", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "6cdced7d-bdea-4366-9ae4-4817c15f9b65", "troubleshooting_url": null }, "sensitive_values": { @@ -72,7 +74,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -84,7 +85,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3060850815800759131", + "id": "3073503026698792476", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json index 04e6c6f0098d7..ba750d6aa9ba4 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "google-instance-identity", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -79,14 +80,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -94,14 +97,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -181,7 +182,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_agent_instance.main", @@ -224,7 +225,7 @@ ] } ], - "timestamp": "2025-01-29T22:47:57Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json index e884830606a23..9348c3c883c5c 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "google-instance-identity", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "c6e99a38-f10b-4242-a7c6-bd9186008b9d", + "id": "6782a80f-1514-4c8f-9d9e-d32519948f40", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "ecddacca-df83-4dd2-b6cb-71f439e9e5f5", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "fd5e8369-33ad-48be-a5f9-49ff05350abe", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,8 +57,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "c6e99a38-f10b-4242-a7c6-bd9186008b9d", - "id": "0ed215f9-07b0-455f-828d-faee5f63ea93", + "agent_id": "6782a80f-1514-4c8f-9d9e-d32519948f40", + "id": "3237e9ee-d82d-44b1-88e2-a88b7ae83086", "instance_id": "example" }, "sensitive_values": {}, @@ -73,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1340003819945612525", + "id": "4437025614079652379", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json index 7dd1dc173febb..cfa7ed54e9815 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -41,16 +42,16 @@ "name": "apps", "index": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "command": null, "display_name": "app1", "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -67,16 +68,16 @@ "name": "apps", "index": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "command": null, "display_name": "app2", "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app2", "subdomain": null, @@ -119,14 +120,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -134,14 +137,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -163,10 +164,10 @@ "display_name": "app1", "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -200,10 +201,10 @@ "display_name": "app2", "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app2", "subdomain": null, @@ -270,7 +271,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_app.apps", @@ -297,7 +298,7 @@ ] } }, - "schema_version": 1, + "schema_version": 0, "for_each_expression": { "references": [ "local.apps_map" @@ -326,7 +327,7 @@ ] } ], - "timestamp": "2025-01-29T22:47:59Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json index fb32d22e2c358..471aeabb55281 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "18098e15-2e8b-4c83-9362-0823834ae628", + "id": "029eeed6-8e12-4606-84cf-7a301915c2bf", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "59691c9e-bf9e-4c93-9768-ba3582c68727", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "838d73bf-5b16-4c64-b01f-a38656b32e95", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -55,18 +56,18 @@ "name": "apps", "index": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "18098e15-2e8b-4c83-9362-0823834ae628", + "agent_id": "029eeed6-8e12-4606-84cf-7a301915c2bf", "command": null, "display_name": "app1", "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "id": "8f031ab5-e051-4eff-9f7e-233f5825c3fd", - "open_in": "slim-window", + "id": "c852c1c3-5a8a-4ea7-81eb-b60c1b5aca76", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -86,18 +87,18 @@ "name": "apps", "index": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "18098e15-2e8b-4c83-9362-0823834ae628", + "agent_id": "029eeed6-8e12-4606-84cf-7a301915c2bf", "command": null, "display_name": "app2", "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "id": "5462894e-7fdc-4fd0-8715-7829e53efea2", - "open_in": "slim-window", + "id": "603f8423-bafa-4538-89a6-ad4c08042b4f", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app2", "subdomain": null, @@ -118,7 +119,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2699316377754222096", + "id": "1160847275473092386", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json index 69600fed24390..9d38e0f7094de 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -40,27 +41,28 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -70,16 +72,16 @@ "type": "coder_app", "name": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "command": null, "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -95,7 +97,7 @@ "type": "coder_app", "name": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "command": null, "display_name": null, @@ -107,10 +109,10 @@ "url": "http://localhost:13337/healthz" } ], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -128,16 +130,16 @@ "type": "coder_app", "name": "app3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "command": null, "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -192,14 +194,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -207,14 +211,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -236,14 +238,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -251,14 +255,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -279,10 +281,10 @@ "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -321,10 +323,10 @@ "url": "http://localhost:13337/healthz" } ], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -361,10 +363,10 @@ "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -452,7 +454,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_agent.dev2", @@ -468,7 +470,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_app.app1", @@ -487,7 +489,7 @@ "constant_value": "app1" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_app.app2", @@ -522,7 +524,7 @@ "constant_value": true } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_app.app3", @@ -544,7 +546,7 @@ "constant_value": false } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev1", @@ -585,7 +587,7 @@ ] } ], - "timestamp": "2025-01-29T22:48:03Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json index db2617701b508..d490512fc8258 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "00794e64-40d3-43df-885a-4b1cc5f5b965", + "id": "b4a206cd-94ed-4e32-a2e7-0adf626c27c5", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "7c0a6e5e-dd2c-46e4-a5f5-f71aae7515c3", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "ee19e275-2893-46bc-bed7-b69d8736e413", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -54,7 +55,7 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -70,17 +71,19 @@ } ], "env": null, - "id": "1b8ddc14-25c2-4eab-b282-71b12d45de73", + "id": "699cb19a-289f-4ec4-90df-e181579d915d", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "39497aa1-11a1-40c0-854d-554c2e27ef77", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "d05314e8-dc4a-414b-87ad-42b634e38ace", "troubleshooting_url": null }, "sensitive_values": { @@ -88,7 +91,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -98,18 +100,18 @@ "type": "coder_app", "name": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "00794e64-40d3-43df-885a-4b1cc5f5b965", + "agent_id": "b4a206cd-94ed-4e32-a2e7-0adf626c27c5", "command": null, "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "id": "c9cf036f-5fd9-408a-8c28-90cde4c5b0cf", - "open_in": "slim-window", + "id": "5ff73f22-b3c8-4df9-b96d-97f6ef2ed366", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -128,9 +130,9 @@ "type": "coder_app", "name": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "00794e64-40d3-43df-885a-4b1cc5f5b965", + "agent_id": "b4a206cd-94ed-4e32-a2e7-0adf626c27c5", "command": null, "display_name": null, "external": false, @@ -141,11 +143,11 @@ "url": "http://localhost:13337/healthz" } ], - "hidden": false, "icon": null, - "id": "e40999b2-8ceb-4e35-962b-c0b7b95c8bc8", - "open_in": "slim-window", + "id": "86f3e59b-ac58-4a2c-a9fa-400e0e5e92f8", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -166,18 +168,18 @@ "type": "coder_app", "name": "app3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "1b8ddc14-25c2-4eab-b282-71b12d45de73", + "agent_id": "699cb19a-289f-4ec4-90df-e181579d915d", "command": null, "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "id": "4e61c245-271a-41e1-9a37-2badf68bf5cd", - "open_in": "slim-window", + "id": "4cabd0ad-6580-4e20-adc8-7c90f4133036", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -198,7 +200,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7796235346668423309", + "id": "8408345137776084999", "triggers": null }, "sensitive_values": {}, @@ -214,7 +216,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8353198974918613541", + "id": "7989321687483635016", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json index da3f19c548339..3078937d8e1e4 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -40,27 +41,28 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -70,7 +72,7 @@ "type": "coder_env", "name": "env1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "name": "ENV_1", "value": "Env 1" @@ -83,7 +85,7 @@ "type": "coder_env", "name": "env2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "name": "ENV_2", "value": "Env 2" @@ -96,7 +98,7 @@ "type": "coder_env", "name": "env3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "name": "ENV_3", "value": "Env 3" @@ -148,14 +150,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -163,14 +167,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -192,14 +194,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -207,14 +211,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -359,7 +361,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_agent.dev2", @@ -375,7 +377,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_env.env1", @@ -397,7 +399,7 @@ "constant_value": "Env 1" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_env.env2", @@ -419,7 +421,7 @@ "constant_value": "Env 2" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_env.env3", @@ -441,7 +443,7 @@ "constant_value": "Env 3" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev1", @@ -470,19 +472,19 @@ }, "relevant_attributes": [ { - "resource": "coder_agent.dev1", + "resource": "coder_agent.dev2", "attribute": [ "id" ] }, { - "resource": "coder_agent.dev2", + "resource": "coder_agent.dev1", "attribute": [ "id" ] } ], - "timestamp": "2025-01-29T22:48:05Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json index 6b2f13b3e8ae8..c6ed88da5fe33 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "f1398cbc-4e67-4a0e-92b7-15dc33221872", + "id": "d8015b6f-dae8-4332-a401-5f35e1116b31", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "acbbabee-e370-4aba-b876-843fb10201e8", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "a7523677-fc6f-4a79-be19-256002948831", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -54,7 +55,7 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -70,17 +71,19 @@ } ], "env": null, - "id": "ea44429d-fc3c-4ea6-ba23-a997dc66cad8", + "id": "da35429b-c9fd-4993-9707-222cbb4a76c1", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "51fea695-82dd-4ccd-bf25-2c55a82b4851", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "aaba5bce-5072-40a2-b726-b60f70c4c295", "troubleshooting_url": null }, "sensitive_values": { @@ -88,7 +91,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -98,10 +100,10 @@ "type": "coder_env", "name": "env1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "f1398cbc-4e67-4a0e-92b7-15dc33221872", - "id": "f8f7b3f7-5c4b-47b9-959e-32d2044329e3", + "agent_id": "d8015b6f-dae8-4332-a401-5f35e1116b31", + "id": "fc09a138-8d36-4579-9ca1-03c4e47cae9f", "name": "ENV_1", "value": "Env 1" }, @@ -116,10 +118,10 @@ "type": "coder_env", "name": "env2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "f1398cbc-4e67-4a0e-92b7-15dc33221872", - "id": "b7171d98-09c9-4bc4-899d-4b7343cd86ca", + "agent_id": "d8015b6f-dae8-4332-a401-5f35e1116b31", + "id": "c2e96a98-dccf-4884-b34c-58cc5aea8238", "name": "ENV_2", "value": "Env 2" }, @@ -134,10 +136,10 @@ "type": "coder_env", "name": "env3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "ea44429d-fc3c-4ea6-ba23-a997dc66cad8", - "id": "84021f25-1736-4884-8e5c-553e9c1f6fa6", + "agent_id": "da35429b-c9fd-4993-9707-222cbb4a76c1", + "id": "e79afa5c-ce2c-43bf-9ed7-31c8e7ecc350", "name": "ENV_3", "value": "Env 3" }, @@ -154,7 +156,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4901314428677246063", + "id": "360628295827910670", "triggers": null }, "sensitive_values": {}, @@ -170,7 +172,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3203010350140581146", + "id": "8777072939157429354", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json index 7724005431a92..5a403fbc28f5c 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -40,27 +41,28 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -70,7 +72,7 @@ "type": "coder_script", "name": "script1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "cron": null, "display_name": "Foobar Script 1", @@ -90,7 +92,7 @@ "type": "coder_script", "name": "script2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "cron": null, "display_name": "Foobar Script 2", @@ -110,7 +112,7 @@ "type": "coder_script", "name": "script3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "cron": null, "display_name": "Foobar Script 3", @@ -169,14 +171,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -184,14 +188,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -213,14 +215,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -228,14 +232,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -401,7 +403,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_agent.dev2", @@ -417,7 +419,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_script.script1", @@ -442,7 +444,7 @@ "constant_value": "echo foobar 1" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_script.script2", @@ -467,7 +469,7 @@ "constant_value": "echo foobar 2" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_script.script3", @@ -492,7 +494,7 @@ "constant_value": "echo foobar 3" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev1", @@ -533,7 +535,7 @@ ] } ], - "timestamp": "2025-01-29T22:48:08Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json index c5db3c24d2f1e..4e4463db3a9cf 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "bd762939-8952-4ac7-a9e5-618ec420b518", + "id": "07557c1d-cb65-4866-8e9f-2419a9a47d5e", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "f86127e8-2852-4c02-9f07-c376ec04318f", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "6e23b221-287e-4e56-ba2a-86ceade041fe", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -54,7 +55,7 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -70,17 +71,19 @@ } ], "env": null, - "id": "60244093-3c9d-4655-b34f-c4713f7001c1", + "id": "1e7069fa-b83b-421b-8c6a-76736cac2600", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "cad61f70-873f-440c-ad1c-9d34be2e19c4", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "5c006a29-b007-437e-83f9-31ed28a77e1b", "troubleshooting_url": null }, "sensitive_values": { @@ -88,7 +91,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -98,13 +100,13 @@ "type": "coder_script", "name": "script1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "bd762939-8952-4ac7-a9e5-618ec420b518", + "agent_id": "07557c1d-cb65-4866-8e9f-2419a9a47d5e", "cron": null, "display_name": "Foobar Script 1", "icon": null, - "id": "b34b6cd5-e85d-41c8-ad92-eaaceb2404cb", + "id": "aa8aa1b3-9398-4079-a123-97edadb04a34", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -123,13 +125,13 @@ "type": "coder_script", "name": "script2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "bd762939-8952-4ac7-a9e5-618ec420b518", + "agent_id": "07557c1d-cb65-4866-8e9f-2419a9a47d5e", "cron": null, "display_name": "Foobar Script 2", "icon": null, - "id": "d6f4e24c-3023-417d-b9be-4c83dbdf4802", + "id": "78ccc55d-160d-44d1-9814-7dcd3f69ab0f", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -148,13 +150,13 @@ "type": "coder_script", "name": "script3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "60244093-3c9d-4655-b34f-c4713f7001c1", + "agent_id": "1e7069fa-b83b-421b-8c6a-76736cac2600", "cron": null, "display_name": "Foobar Script 3", "icon": null, - "id": "a19e9106-5eb5-4941-b6ae-72a7724efdf0", + "id": "05654b40-55d9-4bc4-be04-9d80e376add1", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -175,7 +177,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8576645433635584827", + "id": "956607104963680515", "triggers": null }, "sensitive_values": {}, @@ -191,7 +193,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1280398780322015606", + "id": "8073345625147206841", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json index 201e09ad767b2..f3b6c67a7a18b 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -40,27 +41,28 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 1, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": "/etc/motd", "order": null, "os": "darwin", - "resources_monitoring": [], "shutdown_script": "echo bye bye", + "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "non-blocking", + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -70,27 +72,28 @@ "type": "coder_agent", "name": "dev3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "arm64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "blocking", + "startup_script_timeout": 300, "troubleshooting_url": "https://coder.com/troubleshoot" }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -100,27 +103,28 @@ "type": "coder_agent", "name": "dev4", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -157,14 +161,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -172,14 +178,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -201,14 +205,16 @@ "connection_timeout": 1, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": "/etc/motd", "order": null, "os": "darwin", - "resources_monitoring": [], "shutdown_script": "echo bye bye", + "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "non-blocking", + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -216,14 +222,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -245,14 +249,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "blocking", + "startup_script_timeout": 300, "troubleshooting_url": "https://coder.com/troubleshoot" }, "after_unknown": { @@ -260,14 +266,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -289,14 +293,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -304,14 +310,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -366,7 +370,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_agent.dev2", @@ -394,7 +398,7 @@ "constant_value": "non-blocking" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_agent.dev3", @@ -416,7 +420,7 @@ "constant_value": "https://coder.com/troubleshoot" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_agent.dev4", @@ -432,7 +436,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev", @@ -451,7 +455,7 @@ ] } }, - "timestamp": "2025-01-29T22:48:01Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json index 53335cffd6582..3e10e0a01bde9 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "215a9369-35c9-4abe-b1c0-3eb3ab1c1922", + "id": "10a81f1f-f959-4893-84c8-7e361f26593f", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "3fdd733c-b02e-4d81-a032-7c8d7ee3dcd8", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "42b7b694-fa5f-44b9-8202-31a9a36c5aa9", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -54,7 +55,7 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -70,17 +71,19 @@ } ], "env": null, - "id": "b79acfba-d148-4940-80aa-0c72c037a3ed", + "id": "957cb8fe-8d33-4c3c-99d8-c186d7d7cab4", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": "/etc/motd", "order": null, "os": "darwin", - "resources_monitoring": [], "shutdown_script": "echo bye bye", + "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "e841a152-a794-4b05-9818-95e7440d402d", + "startup_script_timeout": 300, + "token": "e7f05b6e-2aca-48fb-b57e-ef771b62f17a", "troubleshooting_url": null }, "sensitive_values": { @@ -88,7 +91,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -98,7 +100,7 @@ "type": "coder_agent", "name": "dev3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "arm64", "auth": "token", @@ -114,17 +116,19 @@ } ], "env": null, - "id": "4e863395-523b-443a-83c2-ab27e42a06b2", + "id": "d22a4bcb-317f-4aa2-9368-85fd6176e4c6", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "blocking", - "token": "ee0a5e1d-879e-4bff-888e-6cf94533f0bd", + "startup_script_timeout": 300, + "token": "1435035a-f9e2-4a7a-8b09-d840ad00b189", "troubleshooting_url": "https://coder.com/troubleshoot" }, "sensitive_values": { @@ -132,7 +136,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -142,7 +145,7 @@ "type": "coder_agent", "name": "dev4", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -158,17 +161,19 @@ } ], "env": null, - "id": "611c43f5-fa8f-4641-9b5c-a58a8945caa1", + "id": "1f052fbe-23d8-4538-89be-e9a1bdb5da82", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "2d2669c7-6385-4ce8-8948-e4b24db45132", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "0821601b-d07d-4402-ab4d-4f50aade3eb3", "troubleshooting_url": null }, "sensitive_values": { @@ -176,7 +181,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -188,7 +192,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5237006672454822031", + "id": "7701524828249280322", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json index d5d555e057751..cd8afd53713df 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -40,16 +41,16 @@ "type": "coder_app", "name": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "command": null, "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -65,7 +66,7 @@ "type": "coder_app", "name": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "command": null, "display_name": null, @@ -77,10 +78,10 @@ "url": "http://localhost:13337/healthz" } ], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -98,16 +99,16 @@ "type": "coder_app", "name": "app3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "command": null, "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -150,14 +151,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -165,14 +168,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -193,10 +194,10 @@ "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -235,10 +236,10 @@ "url": "http://localhost:13337/healthz" } ], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -275,10 +276,10 @@ "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "open_in": "slim-window", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -345,7 +346,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_app.app1", @@ -364,7 +365,7 @@ "constant_value": "app1" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_app.app2", @@ -399,7 +400,7 @@ "constant_value": true } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_app.app3", @@ -421,7 +422,7 @@ "constant_value": false } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev", @@ -445,7 +446,7 @@ ] } ], - "timestamp": "2025-01-29T22:48:10Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json index 9bad98304438c..68f84d207ee49 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,17 +26,19 @@ } ], "env": null, - "id": "cae4d590-8332-45b6-9453-e0151ca4f219", + "id": "977b92cb-3803-4b51-b87d-c93a4b245a20", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "6db086ba-440b-4e66-8803-80e021cda61a", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "9e780632-3eff-4e64-b977-9cc0949b2b0d", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +46,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -54,18 +55,18 @@ "type": "coder_app", "name": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "cae4d590-8332-45b6-9453-e0151ca4f219", + "agent_id": "977b92cb-3803-4b51-b87d-c93a4b245a20", "command": null, "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "id": "64803468-4ec4-49fe-beb7-e65eaf8e01ca", - "open_in": "slim-window", + "id": "4cb7da20-e797-4d85-bd5a-b88778f72f57", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -84,9 +85,9 @@ "type": "coder_app", "name": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "cae4d590-8332-45b6-9453-e0151ca4f219", + "agent_id": "977b92cb-3803-4b51-b87d-c93a4b245a20", "command": null, "display_name": null, "external": false, @@ -97,11 +98,11 @@ "url": "http://localhost:13337/healthz" } ], - "hidden": false, "icon": null, - "id": "df3f07ab-1796-41c9-8e7d-b957dca031d4", - "open_in": "slim-window", + "id": "c742e1a0-e24e-429e-bcc7-b543efa85923", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -122,18 +123,18 @@ "type": "coder_app", "name": "app3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { - "agent_id": "cae4d590-8332-45b6-9453-e0151ca4f219", + "agent_id": "977b92cb-3803-4b51-b87d-c93a4b245a20", "command": null, "display_name": null, "external": false, "healthcheck": [], - "hidden": false, "icon": null, - "id": "fdb06774-4140-42ef-989b-12b98254b27c", - "open_in": "slim-window", + "id": "35638c70-0519-45a7-9645-d44d8d06dad7", + "name": null, "order": null, + "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -154,7 +155,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8206837964247342986", + "id": "3654212995577484362", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json index 6354226c4cbfc..d65da69ee5c7b 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json @@ -10,13 +10,14 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -30,10 +31,11 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { @@ -41,7 +43,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } }, @@ -51,7 +52,7 @@ "type": "coder_metadata", "name": "about_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "daily_cost": 29, "hide": true, @@ -82,7 +83,7 @@ "type": "coder_metadata", "name": "other_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "daily_cost": 20, "hide": true, @@ -134,6 +135,7 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -147,10 +149,11 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -160,7 +163,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -169,7 +171,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } } @@ -332,7 +333,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_metadata.about_info", @@ -372,7 +373,7 @@ ] } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_metadata.other_info", @@ -407,7 +408,7 @@ ] } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.about", @@ -431,7 +432,7 @@ ] } ], - "timestamp": "2025-01-29T22:48:14Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json index 82eed92f364a8..6de846a449b63 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,8 +26,9 @@ } ], "env": null, - "id": "b3257d67-247c-4fc6-92a8-fc997501a0e1", + "id": "1cb702fa-c7e9-44bb-9f7e-6e486d3cc736", "init_script": "", + "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -41,11 +42,12 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "ac3563fb-3069-4919-b076-6687c765772b", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "b73e245b-dda8-4242-b453-d26be9c06571", "troubleshooting_url": null }, "sensitive_values": { @@ -55,7 +57,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } }, @@ -65,12 +66,12 @@ "type": "coder_metadata", "name": "about_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "fcd81afa-64ad-45e3-b000-31d1b19df922", + "id": "7d52790c-3764-4929-bb07-0199353a2fe7", "item": [ { "is_null": false, @@ -85,7 +86,7 @@ "value": "" } ], - "resource_id": "8033209281634385030" + "resource_id": "730850883312217353" }, "sensitive_values": { "item": [ @@ -104,12 +105,12 @@ "type": "coder_metadata", "name": "other_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "daily_cost": 20, "hide": true, "icon": "/icon/server.svg", - "id": "186819f3-a92f-4785-9ee4-d79f57711f63", + "id": "8ad34ce7-0d5a-467f-8e39-ee6021756e2d", "item": [ { "is_null": false, @@ -118,7 +119,7 @@ "value": "world" } ], - "resource_id": "8033209281634385030" + "resource_id": "730850883312217353" }, "sensitive_values": { "item": [ @@ -138,7 +139,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8033209281634385030", + "id": "730850883312217353", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json index fd252c9adb16e..1234dec7bb095 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json @@ -10,13 +10,14 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -30,10 +31,11 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { @@ -41,7 +43,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } }, @@ -51,7 +52,7 @@ "type": "coder_metadata", "name": "about_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "daily_cost": 29, "hide": true, @@ -121,6 +122,7 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -134,10 +136,11 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -147,7 +150,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -156,7 +158,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } } @@ -300,7 +301,7 @@ "constant_value": "linux" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "coder_metadata.about_info", @@ -359,7 +360,7 @@ ] } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.about", @@ -383,7 +384,7 @@ ] } ], - "timestamp": "2025-01-29T22:48:12Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json index a0838cc561888..95d3a1e831b6d 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "amd64", "auth": "token", @@ -26,8 +26,9 @@ } ], "env": null, - "id": "066d91d2-860a-4a44-9443-9eaf9315729b", + "id": "d23eab8d-26a3-473a-aace-db4ea106a0e8", "init_script": "", + "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -41,11 +42,12 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "9b6cc6dd-0e02-489f-b651-7a01804c406f", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "0161bde2-f019-4c2a-a4bd-f78424f34464", "troubleshooting_url": null }, "sensitive_values": { @@ -55,7 +57,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } }, @@ -65,12 +66,12 @@ "type": "coder_metadata", "name": "about_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "fa791d91-9718-420e-9fa8-7a02e7af1563", + "id": "c2048aab-63cb-4fa5-84fd-ebaf461ca614", "item": [ { "is_null": false, @@ -97,7 +98,7 @@ "value": "squirrel" } ], - "resource_id": "2710066198333857753" + "resource_id": "6489628105083470326" }, "sensitive_values": { "item": [ @@ -120,7 +121,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2710066198333857753", + "id": "6489628105083470326", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json index 95fb198c1eb82..9365d0426c40e 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "arm64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -67,14 +68,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -82,14 +85,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -135,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "e8485920-025a-4c2c-b018-722f61b64347", + "id": "eadc4346-c9f1-4f19-a45a-1166cada818a", "mutable": false, "name": "Example", "option": null, @@ -162,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "6156655b-f893-4eba-914e-e87414f4bf7e", + "id": "995788a7-dab0-4019-ac77-c21492e0443d", "mutable": false, "name": "Sample", "option": null, @@ -208,7 +209,7 @@ "constant_value": "windows" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev", @@ -268,7 +269,7 @@ ] } }, - "timestamp": "2025-01-29T22:48:18Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json index 2cc48c837a1d2..fb1f401e42b23 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4b774ce8-1e9f-4721-8a14-05efd3eb2dab", + "id": "8433407b-a2de-465a-8dbe-782bada9b0a0", "mutable": false, "name": "Example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "447ae720-c046-452e-8d2c-1b5d4060b798", + "id": "96081930-7bdd-462a-9213-3980affd7699", "mutable": false, "name": "Sample", "option": null, @@ -64,7 +64,7 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "arm64", "auth": "token", @@ -80,17 +80,19 @@ } ], "env": null, - "id": "b8d637c2-a19c-479c-b3e2-374f15ce37c3", + "id": "3d086142-983a-4f37-a44f-02e9ce7c7d5a", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "52ce8a0d-12c9-40b5-9f86-dc6240b98d5f", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "f3b75983-f9a1-42a3-89d2-bd5146922261", "troubleshooting_url": null }, "sensitive_values": { @@ -98,7 +100,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -110,7 +111,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "769369130050936586", + "id": "6461975914215495896", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json index 691c168418111..71ce06b7b0141 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "arm64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -67,14 +68,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -82,14 +85,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -135,7 +136,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "30116bcb-f109-4807-be06-666a60b6cbb2", + "id": "37d86cd2-9634-4478-87c9-68ead3560e82", "mutable": true, "name": "number_example", "option": null, @@ -162,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "755395f4-d163-4b90-a8f4-e7ae24e17dd0", + "id": "0d550e7b-0b61-458e-a871-e8ff26a2130a", "mutable": false, "name": "number_example_max", "option": null, @@ -201,7 +202,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "dec9fa47-a252-4eb7-868b-10d0fe7bad57", + "id": "1aa39c57-317c-43a6-814c-2a9b8237d412", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -240,7 +241,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "57107f82-107b-484d-8491-0787f051dca7", + "id": "b98aa540-76ae-4cdc-8ea0-40e58e752183", "mutable": false, "name": "number_example_min", "option": null, @@ -279,7 +280,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "c21a61f4-26e0-49bb-99c8-56240433c21b", + "id": "6fe112e5-0d1a-4e58-8eb7-bc39cd093399", "mutable": false, "name": "number_example_min_max", "option": null, @@ -318,7 +319,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4894f5cc-f4e6-4a86-bdfa-36c9d3f8f1a3", + "id": "a1d38f92-b8d2-473f-b4b0-479a8e8c00d2", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -376,7 +377,7 @@ "constant_value": "windows" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev", @@ -550,7 +551,7 @@ ] } }, - "timestamp": "2025-01-29T22:48:20Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json index 1ad55291deaab..70df3be8099ff 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "9b5bb411-bfe5-471a-8f2d-9fcc8c17b616", + "id": "db1d384f-1bc9-4169-ae2b-5bc05f9539ca", "mutable": true, "name": "number_example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "2ebaf3ec-9272-48f4-981d-09485ae7960e", + "id": "0ab34adc-6a08-48b9-90a2-613aa2b8283a", "mutable": false, "name": "number_example_max", "option": null, @@ -83,7 +83,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "d05a833c-d0ca-4f22-8b80-40851c111b61", + "id": "c49cd43c-1030-4f3a-a482-978a8a46d1b0", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -122,7 +122,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "de0cd614-72b3-4404-80a1-e3c780823fc9", + "id": "cd3dbd4a-15c0-4639-8ea0-b1fffb080a7c", "mutable": false, "name": "number_example_min", "option": null, @@ -161,7 +161,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "66eae3e1-9bb5-44f8-8f15-2b400628d0e7", + "id": "cf05e284-fa47-43db-8f29-55582956c948", "mutable": false, "name": "number_example_min_max", "option": null, @@ -200,7 +200,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "d24d37f9-5a91-4c7f-9915-bfc10f6d353d", + "id": "f2d213d2-f2c3-4a05-b838-3ca745b25024", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -232,7 +232,7 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "arm64", "auth": "token", @@ -248,17 +248,19 @@ } ], "env": null, - "id": "81170f06-8f49-43fb-998f-dc505a29632c", + "id": "1bf80049-a5cb-4686-b6ac-25f0991cbf09", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "f8433068-1acc-4225-94c0-725f86cdc002", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "7075da5e-3d77-4fd7-8904-51dc5d42278d", "troubleshooting_url": null }, "sensitive_values": { @@ -266,7 +268,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -278,7 +279,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3641782836917385715", + "id": "6188732597064570549", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json index 387be7249d0ef..fd4ada5253934 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json @@ -10,27 +10,28 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "arm64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -67,14 +68,16 @@ "connection_timeout": 120, "dir": null, "env": null, + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", + "startup_script_behavior": null, + "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -82,14 +85,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -135,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "72f11f9b-8c7f-4e4a-a207-f080b114862b", + "id": "98d56c24-ee32-4bea-acb0-5e061a158119", "mutable": false, "name": "Example", "option": [ @@ -179,7 +180,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "b154b8a7-d31f-46f7-b876-e5bfdf50950c", + "id": "aa6f1bef-a7f8-453b-ba61-d4f502e6c421", "mutable": false, "name": "number_example", "option": null, @@ -206,7 +207,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "8199f88e-8b73-4385-bbb2-315182f753ef", + "id": "889f3c12-fe3f-40c3-8ff8-f39384d687f7", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -245,7 +246,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "110c995d-46d7-4277-8f57-a3d3d42733c3", + "id": "f906399b-42bd-4e10-becc-50035a1d189c", "mutable": false, "name": "number_example_min_max", "option": null, @@ -284,7 +285,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "e7a1f991-48a8-44c5-8a5c-597db8539cb7", + "id": "f4917c7e-3104-4dee-a0d9-514a4db21b82", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -323,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "27d12cdf-da7e-466b-907a-4824920305da", + "id": "38495dda-af9b-483f-92b9-bd575b0b185a", "mutable": false, "name": "Sample", "option": null, @@ -354,7 +355,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "1242389a-5061-482a-8274-410174fb3fc0", + "id": "c1e16447-5a75-4e6f-8774-e4dd9e50348c", "mutable": true, "name": "First parameter from module", "option": null, @@ -381,7 +382,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "72418f70-4e3c-400f-9a7d-bf3467598deb", + "id": "925ce4a5-68b8-4c5c-961e-bb011f8e983c", "mutable": true, "name": "Second parameter from module", "option": null, @@ -413,7 +414,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9b4b60d8-21bb-4d52-910a-536355e9a85f", + "id": "4608a722-183a-4ce2-95bb-76546a287610", "mutable": true, "name": "First parameter from child module", "option": null, @@ -440,7 +441,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4edca123-07bf-4409-ad40-ed26f93beb5f", + "id": "584a127c-2c60-4e72-9305-ff6a0482b0f7", "mutable": true, "name": "Second parameter from child module", "option": null, @@ -497,7 +498,7 @@ "constant_value": "windows" } }, - "schema_version": 1 + "schema_version": 0 }, { "address": "null_resource.dev", @@ -793,7 +794,7 @@ } } }, - "timestamp": "2025-01-29T22:48:16Z", + "timestamp": "2025-02-17T07:42:25Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json index 0c8abfa386ecf..d99734afe4618 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "7298c15e-11c8-4a9e-a2ef-044dbc44d519", + "id": "fe48c68b-f6c0-41c9-ac3b-1c642f3e791b", "mutable": false, "name": "Example", "option": [ @@ -61,7 +61,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "a0dda000-20cb-42a7-9f83-1a1de0876e48", + "id": "5ab1bff7-7c1e-46b0-a8ee-44e019053f62", "mutable": false, "name": "number_example", "option": null, @@ -88,7 +88,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "82a297b9-bbcb-4807-9de3-7217953dc6b0", + "id": "52c86a92-d36a-4fbb-9552-9b59cb8a5718", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -127,7 +127,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "ae1c376b-e28b-456a-b36e-125b3bc6d938", + "id": "d1589a5b-8f67-4f4c-843f-e26a5eb99005", "mutable": false, "name": "number_example_min_max", "option": null, @@ -166,7 +166,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "57573ac3-5610-4887-b269-376071867eb5", + "id": "810c49da-2aee-407a-8fba-0c61ef521a25", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -205,7 +205,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "0e08645d-0105-49ef-b278-26cdc30a826c", + "id": "8df6582a-9e39-4773-a7c7-57e93582e69f", "mutable": false, "name": "Sample", "option": null, @@ -225,7 +225,7 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 1, + "schema_version": 0, "values": { "arch": "arm64", "auth": "token", @@ -241,17 +241,19 @@ } ], "env": null, - "id": "c5c402bd-215b-487f-862f-eca25fe88a72", + "id": "227756e8-2087-4635-bb93-da22db957bb5", "init_script": "", + "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, + "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": "non-blocking", - "token": "b70d10f3-90bc-4abd-8cd9-b11da843954a", + "startup_script_behavior": null, + "startup_script_timeout": 300, + "token": "71047444-320a-456c-b6a0-c9014741dfcf", "troubleshooting_url": null }, "sensitive_values": { @@ -259,7 +261,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -271,7 +272,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8544034527967282476", + "id": "5503685898610482095", "triggers": null }, "sensitive_values": {}, @@ -296,7 +297,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "68ae438d-7194-4f5b-adeb-9c74059d9888", + "id": "7acd0ec0-4852-4fed-b474-492ad6cacbb1", "mutable": true, "name": "First parameter from module", "option": null, @@ -323,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "32f0f7f3-26a5-4023-a4e6-d9436cfe8cb4", + "id": "227ea21a-dedc-423e-a13e-2b70463c17bf", "mutable": true, "name": "Second parameter from module", "option": null, @@ -355,7 +356,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "5235636a-3319-47ae-8879-b62f9ee9c5aa", + "id": "c766f4e6-270d-4a4d-b742-bc21546bc4a2", "mutable": true, "name": "First parameter from child module", "option": null, @@ -382,7 +383,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "54fa94ff-3048-457d-8de2-c182f6287c8d", + "id": "73ee1c41-2978-4473-bf54-d399e3df0c63", "mutable": true, "name": "Second parameter from child module", "option": null, From fbb60a5fe3306a890165b710a5471e5b2c55fd9c Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Mon, 17 Feb 2025 07:49:58 +0000 Subject: [PATCH 3/6] fix go.mod dependency order --- go.mod | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 88a8dc9db1b3c..653997d9514e3 100644 --- a/go.mod +++ b/go.mod @@ -96,6 +96,7 @@ require ( github.com/coder/quartz v0.1.2 github.com/coder/retry v1.5.1 github.com/coder/serpent v0.10.0 + github.com/coder/terraform-provider-coder/v2 v2.1.3 github.com/coder/websocket v1.8.12 github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 github.com/coreos/go-oidc/v3 v3.12.0 @@ -468,5 +469,3 @@ require ( kernel.org/pub/linux/libs/security/libcap/psx v1.2.73 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) - -require github.com/coder/terraform-provider-coder/v2 v2.1.3 From 0c575576124c6899d62c3740103b2a399953271c Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Mon, 17 Feb 2025 07:58:20 +0000 Subject: [PATCH 4/6] clarify documentation of gitAuthAccessTokenEnvironmentVariable --- provisioner/terraform/provision.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go index 7be4d27c7b359..bbb91a96cb3dd 100644 --- a/provisioner/terraform/provision.go +++ b/provisioner/terraform/provision.go @@ -351,8 +351,11 @@ func tryGettingCoderProviderStacktrace(sess *provisionersdk.Session) string { return string(stacktraces) } -// gitAuthAccessTokenEnvironmentVariable was copied from provider.GitAuthAccessTokenEnvironmentVariable -// in v1.0.4 of github.com/coder/terraform-provider-coder/provider when we upgraded to v2. +// gitAuthAccessTokenEnvironmentVariable is copied from +// github.com/coder/terraform-provider-coder/provider.GitAuthAccessTokenEnvironmentVariable@v1.0.4. +// While removed in v2 of the provider, we keep this to support customers using older templates that +// depend on this environment variable. Once we are certain that no customers are still using v1 of +// the provider, we can remove this function. func gitAuthAccessTokenEnvironmentVariable(id string) string { return fmt.Sprintf("CODER_GIT_AUTH_ACCESS_TOKEN_%s", id) } From 1f6015af30ffb86a88fa9a747f12efce8cc6fc61 Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Mon, 17 Feb 2025 08:06:52 +0000 Subject: [PATCH 5/6] make -B lint --- go.mod | 2 -- .../calling-module/calling-module.tfplan.json | 2 +- .../calling-module.tfstate.json | 8 +++--- .../chaining-resources.tfplan.json | 2 +- .../chaining-resources.tfstate.json | 8 +++--- .../conflicting-resources.tfplan.json | 2 +- .../conflicting-resources.tfstate.json | 8 +++--- .../display-apps-disabled.tfplan.json | 2 +- .../display-apps-disabled.tfstate.json | 6 ++--- .../display-apps/display-apps.tfplan.json | 2 +- .../display-apps/display-apps.tfstate.json | 6 ++--- .../external-auth-providers.tfplan.json | 2 +- .../external-auth-providers.tfstate.json | 6 ++--- .../instance-id/instance-id.tfplan.json | 2 +- .../instance-id/instance-id.tfstate.json | 10 +++---- .../mapped-apps/mapped-apps.tfplan.json | 2 +- .../mapped-apps/mapped-apps.tfstate.json | 14 +++++----- .../multiple-agents-multiple-apps.tfplan.json | 6 ++--- ...multiple-agents-multiple-apps.tfstate.json | 24 ++++++++--------- .../multiple-agents-multiple-envs.tfplan.json | 6 ++--- ...multiple-agents-multiple-envs.tfstate.json | 24 ++++++++--------- ...ltiple-agents-multiple-scripts.tfplan.json | 6 ++--- ...tiple-agents-multiple-scripts.tfstate.json | 24 ++++++++--------- .../multiple-agents.tfplan.json | 2 +- .../multiple-agents.tfstate.json | 18 ++++++------- .../multiple-apps/multiple-apps.tfplan.json | 2 +- .../multiple-apps/multiple-apps.tfstate.json | 18 ++++++------- .../resource-metadata-duplicate.tfplan.json | 2 +- .../resource-metadata-duplicate.tfstate.json | 14 +++++----- .../resource-metadata.tfplan.json | 2 +- .../resource-metadata.tfstate.json | 10 +++---- .../rich-parameters-order.tfplan.json | 6 ++--- .../rich-parameters-order.tfstate.json | 10 +++---- .../rich-parameters-validation.tfplan.json | 14 +++++----- .../rich-parameters-validation.tfstate.json | 18 ++++++------- .../rich-parameters.tfplan.json | 22 ++++++++-------- .../rich-parameters.tfstate.json | 26 +++++++++---------- 37 files changed, 168 insertions(+), 170 deletions(-) diff --git a/go.mod b/go.mod index 653997d9514e3..c8324bdb0181a 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/coder/coder/v2 go 1.22.9 -toolchain go1.23.6 - // Required until a v3 of chroma is created to lazily initialize all XML files. // None of our dependencies seem to use the registries anyways, so this // should be fine... diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json index e1d32801cd3bf..086d1f1ccc2e8 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json @@ -260,7 +260,7 @@ ] } ], - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json index 039f7c60ba3b1..c600318ca6922 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "ffa21ce9-e565-4a02-9453-15b036263be4", + "id": "246b2e70-366d-4610-a2f3-f41ed0707629", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "5d18ae6c-e7c2-4051-a76e-12d196b32bf9", + "token": "e83d1134-be62-43be-9dda-824c7e41c6ee", "troubleshooting_url": null }, "sensitive_values": { @@ -69,7 +69,7 @@ "outputs": { "script": "" }, - "random": "2302358862924788424" + "random": "6805516663999826595" }, "sensitive_values": { "inputs": {}, @@ -84,7 +84,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6236093485278712336", + "id": "3006804652274736053", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json index 31741ded5f255..915e78b833e46 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json @@ -205,7 +205,7 @@ ] } }, - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json index dfa3555cbfe4d..c3051463c0623 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "1977ff27-3076-4699-b78d-62c7f88b627a", + "id": "4daf6d77-ebed-4796-8be2-5befeb32c925", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "3c0519d9-bcbd-4ae9-b8f4-045302ffd10b", + "token": "445806ea-2f6b-4acd-b82c-4bd108bedd39", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4078562106562961498", + "id": "3806873213294600316", "triggers": null }, "sensitive_values": {}, @@ -74,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "55585383008969295", + "id": "8006735684599421658", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json index 7de175d0a3be8..a326a16fcd19c 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json @@ -205,7 +205,7 @@ ] } }, - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json index 222da8066fca3..e84707581dfba 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "61a9462e-35d7-4f01-aad9-a243a9b77504", + "id": "d92142c4-1cce-49c8-a88d-09253414a02c", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "dc4c5cdd-e9e2-4f67-a9ba-adf8641843a2", + "token": "c3ed6734-2462-4ea0-ba44-9b47127f3f4b", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1760586578107252540", + "id": "3110617068153727272", "triggers": null }, "sensitive_values": {}, @@ -73,7 +73,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "832440145757325680", + "id": "6570658214510207228", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json index 53b7262920838..bc638f21b7952 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json @@ -204,7 +204,7 @@ ] } }, - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json index dd9b125adc073..6f11d90b5f353 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "8d9cd7ab-b9cf-4d70-b96f-eeba1420f3ff", + "id": "cccfe159-7cc6-46f9-880a-5f89679aa6f1", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "6b88a94e-61ee-4043-97e0-0e612d23cdb5", + "token": "a75ef39b-40c9-4433-928d-63d8c9bedaf3", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4826119572317006529", + "id": "8451712369296777218", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json index c4aa22d4c99d1..9fd5a5058512f 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json @@ -204,7 +204,7 @@ ] } }, - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json index 1cef038a0f2fa..e52bc1fc97e5c 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "9e751ba0-9fae-43d5-86a4-e1d83aa58154", + "id": "42ab7718-4f21-4354-94fc-1b17419773cc", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "50dfcef5-15c0-465c-b0a6-15f6939e8f29", + "token": "d5d85dd4-167f-4085-af28-66faeb29ff7b", "troubleshooting_url": null }, "sensitive_values": { @@ -57,7 +57,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2293698738523751505", + "id": "1856302384240211120", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json index e45ba68ab939b..cf4cd4a8ef39e 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json @@ -228,7 +228,7 @@ ] } }, - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json index 33d22893cbce4..29e9f5c84e6a7 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json @@ -54,7 +54,7 @@ } ], "env": null, - "id": "fc300a5a-f402-434e-b906-c7df4d81d3b4", + "id": "1bef34c1-a59f-44c3-b90e-14b7e5ea2365", "init_script": "", "login_before_ready": true, "metadata": [], @@ -66,7 +66,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "6cdced7d-bdea-4366-9ae4-4817c15f9b65", + "token": "a266b7f9-747d-48cf-8ec6-2083357a3fb3", "troubleshooting_url": null }, "sensitive_values": { @@ -85,7 +85,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3073503026698792476", + "id": "5448013025585173297", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json index ba750d6aa9ba4..838d7ce0301c2 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json @@ -225,7 +225,7 @@ ] } ], - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json index 9348c3c883c5c..51a52dd7541c7 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "6782a80f-1514-4c8f-9d9e-d32519948f40", + "id": "3f177501-a597-4e62-8ed5-7590f8c3dbfd", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "fd5e8369-33ad-48be-a5f9-49ff05350abe", + "token": "9715bbf6-35f8-451a-b678-eccaccbf27c1", "troubleshooting_url": null }, "sensitive_values": { @@ -57,8 +57,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "6782a80f-1514-4c8f-9d9e-d32519948f40", - "id": "3237e9ee-d82d-44b1-88e2-a88b7ae83086", + "agent_id": "3f177501-a597-4e62-8ed5-7590f8c3dbfd", + "id": "33a7844c-24c6-4e3d-9a0d-9040b4531905", "instance_id": "example" }, "sensitive_values": {}, @@ -74,7 +74,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4437025614079652379", + "id": "6817986893282284877", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json index cfa7ed54e9815..ddeb79fa5e09c 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json @@ -327,7 +327,7 @@ ] } ], - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json index 471aeabb55281..f504151b7d63a 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "029eeed6-8e12-4606-84cf-7a301915c2bf", + "id": "4fafe4d0-806b-4014-a837-8ee8f6ed268a", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "838d73bf-5b16-4c64-b01f-a38656b32e95", + "token": "cfb3af3d-26a5-4ae7-bf8b-35d9fc2d9ad9", "troubleshooting_url": null }, "sensitive_values": { @@ -58,13 +58,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "029eeed6-8e12-4606-84cf-7a301915c2bf", + "agent_id": "4fafe4d0-806b-4014-a837-8ee8f6ed268a", "command": null, "display_name": "app1", "external": false, "healthcheck": [], "icon": null, - "id": "c852c1c3-5a8a-4ea7-81eb-b60c1b5aca76", + "id": "e78e4bf2-4796-4e51-9358-19ff0275de4d", "name": null, "order": null, "relative_path": null, @@ -89,13 +89,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "029eeed6-8e12-4606-84cf-7a301915c2bf", + "agent_id": "4fafe4d0-806b-4014-a837-8ee8f6ed268a", "command": null, "display_name": "app2", "external": false, "healthcheck": [], "icon": null, - "id": "603f8423-bafa-4538-89a6-ad4c08042b4f", + "id": "b311a085-5f50-43ac-a8aa-b3cb618805df", "name": null, "order": null, "relative_path": null, @@ -119,7 +119,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1160847275473092386", + "id": "1480143277295860801", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json index 9d38e0f7094de..7935f051a4c13 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json @@ -575,19 +575,19 @@ }, "relevant_attributes": [ { - "resource": "coder_agent.dev1", + "resource": "coder_agent.dev2", "attribute": [ "id" ] }, { - "resource": "coder_agent.dev2", + "resource": "coder_agent.dev1", "attribute": [ "id" ] } ], - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json index d490512fc8258..3d87a9b060dfa 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "b4a206cd-94ed-4e32-a2e7-0adf626c27c5", + "id": "4e5cfc98-bcfd-4b82-ab74-d0e629821a1b", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "ee19e275-2893-46bc-bed7-b69d8736e413", + "token": "150f506e-f851-4f40-bd03-91ce78be05e3", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "699cb19a-289f-4ec4-90df-e181579d915d", + "id": "2c1ebbc9-f686-4110-bb0e-4e4c129ac9e6", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "d05314e8-dc4a-414b-87ad-42b634e38ace", + "token": "7d5dc9aa-2cf8-471f-ac7f-22eb4da85f56", "troubleshooting_url": null }, "sensitive_values": { @@ -102,13 +102,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "b4a206cd-94ed-4e32-a2e7-0adf626c27c5", + "agent_id": "4e5cfc98-bcfd-4b82-ab74-d0e629821a1b", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "5ff73f22-b3c8-4df9-b96d-97f6ef2ed366", + "id": "2974764d-5a62-481a-b817-e4e41e2b9fb4", "name": null, "order": null, "relative_path": null, @@ -132,7 +132,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "b4a206cd-94ed-4e32-a2e7-0adf626c27c5", + "agent_id": "4e5cfc98-bcfd-4b82-ab74-d0e629821a1b", "command": null, "display_name": null, "external": false, @@ -144,7 +144,7 @@ } ], "icon": null, - "id": "86f3e59b-ac58-4a2c-a9fa-400e0e5e92f8", + "id": "1f131e71-4d30-48ee-9293-e100d7f2f93e", "name": null, "order": null, "relative_path": null, @@ -170,13 +170,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "699cb19a-289f-4ec4-90df-e181579d915d", + "agent_id": "2c1ebbc9-f686-4110-bb0e-4e4c129ac9e6", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "4cabd0ad-6580-4e20-adc8-7c90f4133036", + "id": "0a3f2b30-8c70-4507-aceb-5b48c81a0301", "name": null, "order": null, "relative_path": null, @@ -200,7 +200,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8408345137776084999", + "id": "2990901857056833713", "triggers": null }, "sensitive_values": {}, @@ -216,7 +216,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7989321687483635016", + "id": "6703096005003194800", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json index 3078937d8e1e4..8a80e5480f936 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json @@ -472,19 +472,19 @@ }, "relevant_attributes": [ { - "resource": "coder_agent.dev2", + "resource": "coder_agent.dev1", "attribute": [ "id" ] }, { - "resource": "coder_agent.dev1", + "resource": "coder_agent.dev2", "attribute": [ "id" ] } ], - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json index c6ed88da5fe33..37081372a238a 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "d8015b6f-dae8-4332-a401-5f35e1116b31", + "id": "4ebb9bc8-ddb8-474d-bd06-5ada2e990e3f", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "a7523677-fc6f-4a79-be19-256002948831", + "token": "a42924a9-339c-459b-8f43-29d4434fbb3a", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "da35429b-c9fd-4993-9707-222cbb4a76c1", + "id": "3162694f-f747-4f01-837c-16e77617b4ba", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "aaba5bce-5072-40a2-b726-b60f70c4c295", + "token": "cb2daa5d-0409-47e1-a62e-3a7081d1a452", "troubleshooting_url": null }, "sensitive_values": { @@ -102,8 +102,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "d8015b6f-dae8-4332-a401-5f35e1116b31", - "id": "fc09a138-8d36-4579-9ca1-03c4e47cae9f", + "agent_id": "4ebb9bc8-ddb8-474d-bd06-5ada2e990e3f", + "id": "9f52a88a-59dc-4d69-aa98-16aeec507cf0", "name": "ENV_1", "value": "Env 1" }, @@ -120,8 +120,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "d8015b6f-dae8-4332-a401-5f35e1116b31", - "id": "c2e96a98-dccf-4884-b34c-58cc5aea8238", + "agent_id": "4ebb9bc8-ddb8-474d-bd06-5ada2e990e3f", + "id": "a645186e-04c8-4462-a16a-2e9a1ff0c8b9", "name": "ENV_2", "value": "Env 2" }, @@ -138,8 +138,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "da35429b-c9fd-4993-9707-222cbb4a76c1", - "id": "e79afa5c-ce2c-43bf-9ed7-31c8e7ecc350", + "agent_id": "3162694f-f747-4f01-837c-16e77617b4ba", + "id": "2944ab68-a99d-4f01-854d-9602d8d2e47c", "name": "ENV_3", "value": "Env 3" }, @@ -156,7 +156,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "360628295827910670", + "id": "3825576014142112781", "triggers": null }, "sensitive_values": {}, @@ -172,7 +172,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8777072939157429354", + "id": "7404789264617185387", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json index 5a403fbc28f5c..a44ed3548ea8f 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json @@ -523,19 +523,19 @@ }, "relevant_attributes": [ { - "resource": "coder_agent.dev2", + "resource": "coder_agent.dev1", "attribute": [ "id" ] }, { - "resource": "coder_agent.dev1", + "resource": "coder_agent.dev2", "attribute": [ "id" ] } ], - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json index 4e4463db3a9cf..a23a82237539e 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "07557c1d-cb65-4866-8e9f-2419a9a47d5e", + "id": "3d06016d-2ffa-4792-bc45-5a795d9adb54", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "6e23b221-287e-4e56-ba2a-86ceade041fe", + "token": "6c6255fd-80b8-41bc-9d6a-a5849c625732", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "1e7069fa-b83b-421b-8c6a-76736cac2600", + "id": "915aa8b5-d553-4003-b0d3-6db8ab2c8e1f", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "5c006a29-b007-437e-83f9-31ed28a77e1b", + "token": "e151197b-49f5-4452-8221-fc3aa240f0b6", "troubleshooting_url": null }, "sensitive_values": { @@ -102,11 +102,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "07557c1d-cb65-4866-8e9f-2419a9a47d5e", + "agent_id": "3d06016d-2ffa-4792-bc45-5a795d9adb54", "cron": null, "display_name": "Foobar Script 1", "icon": null, - "id": "aa8aa1b3-9398-4079-a123-97edadb04a34", + "id": "d3a1a465-010c-48b5-9b39-933680cb2caa", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -127,11 +127,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "07557c1d-cb65-4866-8e9f-2419a9a47d5e", + "agent_id": "3d06016d-2ffa-4792-bc45-5a795d9adb54", "cron": null, "display_name": "Foobar Script 2", "icon": null, - "id": "78ccc55d-160d-44d1-9814-7dcd3f69ab0f", + "id": "e7b3b13e-7f06-41af-bacc-54a521b3128f", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -152,11 +152,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "1e7069fa-b83b-421b-8c6a-76736cac2600", + "agent_id": "915aa8b5-d553-4003-b0d3-6db8ab2c8e1f", "cron": null, "display_name": "Foobar Script 3", "icon": null, - "id": "05654b40-55d9-4bc4-be04-9d80e376add1", + "id": "10d85cfc-a857-474c-811c-2cbb2f68164f", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -177,7 +177,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "956607104963680515", + "id": "6602030669549037192", "triggers": null }, "sensitive_values": {}, @@ -193,7 +193,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8073345625147206841", + "id": "3000973025373832517", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json index f3b6c67a7a18b..ee4241623de60 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json @@ -455,7 +455,7 @@ ] } }, - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json index 3e10e0a01bde9..b33eaf4755fdc 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "10a81f1f-f959-4893-84c8-7e361f26593f", + "id": "f5c3b5ec-d609-46fa-b483-2d7778324244", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "42b7b694-fa5f-44b9-8202-31a9a36c5aa9", + "token": "756dfc6c-adf9-4987-a12c-ce520485584f", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ } ], "env": null, - "id": "957cb8fe-8d33-4c3c-99d8-c186d7d7cab4", + "id": "c65b2828-de95-495b-983c-fe8a7b16325c", "init_script": "", "login_before_ready": true, "metadata": [], @@ -83,7 +83,7 @@ "startup_script": null, "startup_script_behavior": "non-blocking", "startup_script_timeout": 300, - "token": "e7f05b6e-2aca-48fb-b57e-ef771b62f17a", + "token": "2adee50e-c284-4e16-a022-b6b446a350c1", "troubleshooting_url": null }, "sensitive_values": { @@ -116,7 +116,7 @@ } ], "env": null, - "id": "d22a4bcb-317f-4aa2-9368-85fd6176e4c6", + "id": "97a23a3b-e347-4185-b3f0-0858d60a9739", "init_script": "", "login_before_ready": true, "metadata": [], @@ -128,7 +128,7 @@ "startup_script": null, "startup_script_behavior": "blocking", "startup_script_timeout": 300, - "token": "1435035a-f9e2-4a7a-8b09-d840ad00b189", + "token": "839b821f-cae1-4deb-b6be-530ceaf2ce3c", "troubleshooting_url": "https://coder.com/troubleshoot" }, "sensitive_values": { @@ -161,7 +161,7 @@ } ], "env": null, - "id": "1f052fbe-23d8-4538-89be-e9a1bdb5da82", + "id": "ca8728f6-2359-4b89-af47-22faafff7ce9", "init_script": "", "login_before_ready": true, "metadata": [], @@ -173,7 +173,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "0821601b-d07d-4402-ab4d-4f50aade3eb3", + "token": "0dcb8ef1-7c36-4a66-98b5-5457108f1f2f", "troubleshooting_url": null }, "sensitive_values": { @@ -192,7 +192,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7701524828249280322", + "id": "7360397834688654491", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json index cd8afd53713df..b20fde49f4913 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json @@ -446,7 +446,7 @@ ] } ], - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json index 68f84d207ee49..e31fe93582a5f 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "977b92cb-3803-4b51-b87d-c93a4b245a20", + "id": "d4d1d876-f010-4eb7-b18c-a175967117fd", "init_script": "", "login_before_ready": true, "metadata": [], @@ -38,7 +38,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "9e780632-3eff-4e64-b977-9cc0949b2b0d", + "token": "2a3f19f7-9633-42d3-a9d7-dbe4f4ffd697", "troubleshooting_url": null }, "sensitive_values": { @@ -57,13 +57,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "977b92cb-3803-4b51-b87d-c93a4b245a20", + "agent_id": "d4d1d876-f010-4eb7-b18c-a175967117fd", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "4cb7da20-e797-4d85-bd5a-b88778f72f57", + "id": "bb6c6e6a-4641-4af4-9f83-3043b9995774", "name": null, "order": null, "relative_path": null, @@ -87,7 +87,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "977b92cb-3803-4b51-b87d-c93a4b245a20", + "agent_id": "d4d1d876-f010-4eb7-b18c-a175967117fd", "command": null, "display_name": null, "external": false, @@ -99,7 +99,7 @@ } ], "icon": null, - "id": "c742e1a0-e24e-429e-bcc7-b543efa85923", + "id": "42fb07a8-50d6-4890-b754-e74ad7c1b4bd", "name": null, "order": null, "relative_path": null, @@ -125,13 +125,13 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "977b92cb-3803-4b51-b87d-c93a4b245a20", + "agent_id": "d4d1d876-f010-4eb7-b18c-a175967117fd", "command": null, "display_name": null, "external": false, "healthcheck": [], "icon": null, - "id": "35638c70-0519-45a7-9645-d44d8d06dad7", + "id": "383bb5b8-aaf5-44ba-9e9d-d18ba9a5a2a1", "name": null, "order": null, "relative_path": null, @@ -155,7 +155,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3654212995577484362", + "id": "1619301723440820833", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json index d65da69ee5c7b..2ee13d783a560 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json @@ -432,7 +432,7 @@ ] } ], - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json index 6de846a449b63..00ef389c869a7 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "1cb702fa-c7e9-44bb-9f7e-6e486d3cc736", + "id": "7061180b-a88c-466b-9685-ff31c71f11d7", "init_script": "", "login_before_ready": true, "metadata": [ @@ -47,7 +47,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "b73e245b-dda8-4242-b453-d26be9c06571", + "token": "a4864d63-5605-468b-a015-a5f42798ea84", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "7d52790c-3764-4929-bb07-0199353a2fe7", + "id": "9cad854f-e818-4a64-b523-b95a9c18ce23", "item": [ { "is_null": false, @@ -86,7 +86,7 @@ "value": "" } ], - "resource_id": "730850883312217353" + "resource_id": "4478768709310452498" }, "sensitive_values": { "item": [ @@ -110,7 +110,7 @@ "daily_cost": 20, "hide": true, "icon": "/icon/server.svg", - "id": "8ad34ce7-0d5a-467f-8e39-ee6021756e2d", + "id": "09d1f38c-b929-4e18-b0f9-09bbe19bce5f", "item": [ { "is_null": false, @@ -119,7 +119,7 @@ "value": "world" } ], - "resource_id": "730850883312217353" + "resource_id": "4478768709310452498" }, "sensitive_values": { "item": [ @@ -139,7 +139,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "730850883312217353", + "id": "4478768709310452498", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json index 1234dec7bb095..9db21b75c34c9 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json @@ -384,7 +384,7 @@ ] } ], - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json index 95d3a1e831b6d..036f03f07b05b 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json @@ -26,7 +26,7 @@ } ], "env": null, - "id": "d23eab8d-26a3-473a-aace-db4ea106a0e8", + "id": "193dd372-e2cc-4033-9a7a-58ab06bbfad9", "init_script": "", "login_before_ready": true, "metadata": [ @@ -47,7 +47,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "0161bde2-f019-4c2a-a4bd-f78424f34464", + "token": "f4fff09b-b927-4ab1-9951-beab5d20da13", "troubleshooting_url": null }, "sensitive_values": { @@ -71,7 +71,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "c2048aab-63cb-4fa5-84fd-ebaf461ca614", + "id": "0bcdb676-61eb-460b-a1e3-e0428006123c", "item": [ { "is_null": false, @@ -98,7 +98,7 @@ "value": "squirrel" } ], - "resource_id": "6489628105083470326" + "resource_id": "2203989413539542687" }, "sensitive_values": { "item": [ @@ -121,7 +121,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6489628105083470326", + "id": "2203989413539542687", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json index 9365d0426c40e..75266b7f96443 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json @@ -136,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "eadc4346-c9f1-4f19-a45a-1166cada818a", + "id": "a7052578-164a-4a65-b82b-8fb1dd18bb9f", "mutable": false, "name": "Example", "option": null, @@ -163,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "995788a7-dab0-4019-ac77-c21492e0443d", + "id": "74ad670f-c830-4cc2-8a6c-9c849b64f00e", "mutable": false, "name": "Sample", "option": null, @@ -269,7 +269,7 @@ ] } }, - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json index fb1f401e42b23..e0dcfefa13d36 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "8433407b-a2de-465a-8dbe-782bada9b0a0", + "id": "74b74e19-b03e-4048-921d-57af97776981", "mutable": false, "name": "Example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "96081930-7bdd-462a-9213-3980affd7699", + "id": "8643afff-6a08-43bb-b035-b5dff416db3c", "mutable": false, "name": "Sample", "option": null, @@ -80,7 +80,7 @@ } ], "env": null, - "id": "3d086142-983a-4f37-a44f-02e9ce7c7d5a", + "id": "871105a1-c92e-4616-b75f-fd9bc967024b", "init_script": "", "login_before_ready": true, "metadata": [], @@ -92,7 +92,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "f3b75983-f9a1-42a3-89d2-bd5146922261", + "token": "ca9c2bf9-4f44-4593-b635-a8e6a62e29f3", "troubleshooting_url": null }, "sensitive_values": { @@ -111,7 +111,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6461975914215495896", + "id": "1278146984662612186", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json index 71ce06b7b0141..1053fa1f856e8 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json @@ -136,7 +136,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "37d86cd2-9634-4478-87c9-68ead3560e82", + "id": "52c11b76-8fcc-496e-92c8-35c71840b3d1", "mutable": true, "name": "number_example", "option": null, @@ -163,7 +163,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "0d550e7b-0b61-458e-a871-e8ff26a2130a", + "id": "f5c91f00-8683-4ee1-8445-af9091531d0a", "mutable": false, "name": "number_example_max", "option": null, @@ -202,7 +202,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "1aa39c57-317c-43a6-814c-2a9b8237d412", + "id": "41eee251-1bdd-4e0b-a033-a993dcd30439", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -241,7 +241,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "b98aa540-76ae-4cdc-8ea0-40e58e752183", + "id": "ea49a527-c4ac-465e-abd7-5001e9f7f8d2", "mutable": false, "name": "number_example_min", "option": null, @@ -280,7 +280,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "6fe112e5-0d1a-4e58-8eb7-bc39cd093399", + "id": "6264b123-76ca-4a04-aab6-1bed0d7f1c3f", "mutable": false, "name": "number_example_min_max", "option": null, @@ -319,7 +319,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "a1d38f92-b8d2-473f-b4b0-479a8e8c00d2", + "id": "0f94b55a-b169-4807-9c25-294830afeb73", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -551,7 +551,7 @@ ] } }, - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json index 70df3be8099ff..f932e87ef6928 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "db1d384f-1bc9-4169-ae2b-5bc05f9539ca", + "id": "cad89d35-cd11-483c-bd36-a1dfeeaf1422", "mutable": true, "name": "number_example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "0ab34adc-6a08-48b9-90a2-613aa2b8283a", + "id": "9fe9a9f0-05e6-40a5-a28a-fdfc1880336a", "mutable": false, "name": "number_example_max", "option": null, @@ -83,7 +83,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "c49cd43c-1030-4f3a-a482-978a8a46d1b0", + "id": "f59ecaaf-0771-4fbb-bd86-c8318c92d50c", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -122,7 +122,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "cd3dbd4a-15c0-4639-8ea0-b1fffb080a7c", + "id": "094144fe-cd08-4df4-9b7c-52a15eb5ef8b", "mutable": false, "name": "number_example_min", "option": null, @@ -161,7 +161,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "cf05e284-fa47-43db-8f29-55582956c948", + "id": "47fa2481-369a-49c0-b7bc-492110ec7551", "mutable": false, "name": "number_example_min_max", "option": null, @@ -200,7 +200,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "f2d213d2-f2c3-4a05-b838-3ca745b25024", + "id": "178a245b-15d3-476f-9189-727179f64623", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -248,7 +248,7 @@ } ], "env": null, - "id": "1bf80049-a5cb-4686-b6ac-25f0991cbf09", + "id": "29991019-7834-40f2-80b0-c4727651d1fd", "init_script": "", "login_before_ready": true, "metadata": [], @@ -260,7 +260,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "7075da5e-3d77-4fd7-8904-51dc5d42278d", + "token": "28237cde-dcd4-47e2-96c6-44daf5a1c15f", "troubleshooting_url": null }, "sensitive_values": { @@ -279,7 +279,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6188732597064570549", + "id": "1740579577860451542", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json index fd4ada5253934..8bebd6a6c0861 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json @@ -136,7 +136,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "98d56c24-ee32-4bea-acb0-5e061a158119", + "id": "273c34be-18f5-4602-bdac-a1b76fe51f62", "mutable": false, "name": "Example", "option": [ @@ -180,7 +180,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "aa6f1bef-a7f8-453b-ba61-d4f502e6c421", + "id": "223e5056-087e-4844-a324-00b478e9bb3d", "mutable": false, "name": "number_example", "option": null, @@ -207,7 +207,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "889f3c12-fe3f-40c3-8ff8-f39384d687f7", + "id": "aad915c3-f11c-4f2c-a9e4-db99d58f90ce", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -246,7 +246,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "f906399b-42bd-4e10-becc-50035a1d189c", + "id": "030953d9-3015-40a4-8c78-0fbbe0ac11b4", "mutable": false, "name": "number_example_min_max", "option": null, @@ -285,7 +285,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "f4917c7e-3104-4dee-a0d9-514a4db21b82", + "id": "8fb89a6f-c39a-4c86-9126-4ab7235999d2", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -324,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "38495dda-af9b-483f-92b9-bd575b0b185a", + "id": "9216b30e-60bb-423d-a7db-e7e92707c930", "mutable": false, "name": "Sample", "option": null, @@ -355,7 +355,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "c1e16447-5a75-4e6f-8774-e4dd9e50348c", + "id": "ae736b92-370f-45fc-9583-9f941be249c7", "mutable": true, "name": "First parameter from module", "option": null, @@ -382,7 +382,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "925ce4a5-68b8-4c5c-961e-bb011f8e983c", + "id": "cfd00c6c-cb54-4fc8-a6c5-16229b2e7253", "mutable": true, "name": "Second parameter from module", "option": null, @@ -414,7 +414,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4608a722-183a-4ce2-95bb-76546a287610", + "id": "beefa36e-8f4e-4c46-8d07-44a2a8862df1", "mutable": true, "name": "First parameter from child module", "option": null, @@ -441,7 +441,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "584a127c-2c60-4e72-9305-ff6a0482b0f7", + "id": "1ab1e9e9-1082-4f07-8ca3-cffe81a8fb19", "mutable": true, "name": "Second parameter from child module", "option": null, @@ -794,7 +794,7 @@ } } }, - "timestamp": "2025-02-17T07:42:25Z", + "timestamp": "2025-02-17T08:05:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json index d99734afe4618..9129ba7e5bc77 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "fe48c68b-f6c0-41c9-ac3b-1c642f3e791b", + "id": "71b5910f-fb0e-4364-af04-74232f1cedbc", "mutable": false, "name": "Example", "option": [ @@ -61,7 +61,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "5ab1bff7-7c1e-46b0-a8ee-44e019053f62", + "id": "eb48cbd9-8d00-4983-b8f1-214fe998a7b4", "mutable": false, "name": "number_example", "option": null, @@ -88,7 +88,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "52c86a92-d36a-4fbb-9552-9b59cb8a5718", + "id": "28b3cd4e-a9d2-4bbb-b0d6-08d385bac36f", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -127,7 +127,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "d1589a5b-8f67-4f4c-843f-e26a5eb99005", + "id": "974d2595-c597-4de5-b6d4-1e80cd76e1c6", "mutable": false, "name": "number_example_min_max", "option": null, @@ -166,7 +166,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "810c49da-2aee-407a-8fba-0c61ef521a25", + "id": "581b09a6-cc6b-40a6-b77f-18b4d7acb826", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -205,7 +205,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "8df6582a-9e39-4773-a7c7-57e93582e69f", + "id": "3511b6d3-ae9a-4111-bac9-81c8811c3327", "mutable": false, "name": "Sample", "option": null, @@ -241,7 +241,7 @@ } ], "env": null, - "id": "227756e8-2087-4635-bb93-da22db957bb5", + "id": "40f17825-b210-434a-8683-2de660b54671", "init_script": "", "login_before_ready": true, "metadata": [], @@ -253,7 +253,7 @@ "startup_script": null, "startup_script_behavior": null, "startup_script_timeout": 300, - "token": "71047444-320a-456c-b6a0-c9014741dfcf", + "token": "1f46f0a4-f83d-40fe-9e2b-3c36e14b3747", "troubleshooting_url": null }, "sensitive_values": { @@ -272,7 +272,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5503685898610482095", + "id": "3925531947409543464", "triggers": null }, "sensitive_values": {}, @@ -297,7 +297,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "7acd0ec0-4852-4fed-b474-492ad6cacbb1", + "id": "1a2965c4-4659-4420-be95-468cb75c4606", "mutable": true, "name": "First parameter from module", "option": null, @@ -324,7 +324,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "227ea21a-dedc-423e-a13e-2b70463c17bf", + "id": "826bfe04-c025-4c42-939f-69dd69772da0", "mutable": true, "name": "Second parameter from module", "option": null, @@ -356,7 +356,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "c766f4e6-270d-4a4d-b742-bc21546bc4a2", + "id": "9b2e4b39-e103-4c1c-b338-9cce6a256956", "mutable": true, "name": "First parameter from child module", "option": null, @@ -383,7 +383,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "73ee1c41-2978-4473-bf54-d399e3df0c63", + "id": "16733c90-261e-4ab3-a1b5-7adf360cd789", "mutable": true, "name": "Second parameter from child module", "option": null, From b94081a869ce2f90a1726bb8115af22303024e8d Mon Sep 17 00:00:00 2001 From: Sas Swart Date: Mon, 17 Feb 2025 08:47:10 +0000 Subject: [PATCH 6/6] revert testdata generation --- .../calling-module/calling-module.tfplan.json | 21 +++-- .../calling-module.tfstate.json | 17 ++-- .../chaining-resources.tfplan.json | 21 +++-- .../chaining-resources.tfstate.json | 17 ++-- .../conflicting-resources.tfplan.json | 21 +++-- .../conflicting-resources.tfstate.json | 17 ++-- .../display-apps-disabled.tfplan.json | 21 +++-- .../display-apps-disabled.tfstate.json | 15 ++-- .../display-apps/display-apps.tfplan.json | 21 +++-- .../display-apps/display-apps.tfstate.json | 15 ++-- .../external-auth-providers.tfplan.json | 21 +++-- .../external-auth-providers.tfstate.json | 15 ++-- .../instance-id/instance-id.tfplan.json | 21 +++-- .../instance-id/instance-id.tfstate.json | 19 +++-- .../mapped-apps/mapped-apps.tfplan.json | 43 +++++----- .../mapped-apps/mapped-apps.tfstate.json | 35 ++++---- .../multiple-agents-multiple-apps.tfplan.json | 80 +++++++++---------- ...multiple-agents-multiple-apps.tfstate.json | 60 +++++++------- .../multiple-agents-multiple-envs.tfplan.json | 52 ++++++------ ...multiple-agents-multiple-envs.tfstate.json | 48 ++++++----- ...ltiple-agents-multiple-scripts.tfplan.json | 56 +++++++------ ...tiple-agents-multiple-scripts.tfstate.json | 48 ++++++----- .../multiple-agents.tfplan.json | 70 ++++++++-------- .../multiple-agents.tfstate.json | 50 ++++++------ .../multiple-apps/multiple-apps.tfplan.json | 57 +++++++------ .../multiple-apps/multiple-apps.tfstate.json | 45 +++++------ .../resource-metadata-duplicate.tfplan.json | 29 ++++--- .../resource-metadata-duplicate.tfstate.json | 27 +++---- .../resource-metadata.tfplan.json | 25 +++--- .../resource-metadata.tfstate.json | 21 +++-- .../rich-parameters-order.tfplan.json | 25 +++--- .../rich-parameters-order.tfstate.json | 19 +++-- .../rich-parameters-validation.tfplan.json | 33 ++++---- .../rich-parameters-validation.tfstate.json | 27 +++---- .../rich-parameters.tfplan.json | 41 +++++----- .../rich-parameters.tfstate.json | 35 ++++---- 36 files changed, 570 insertions(+), 618 deletions(-) diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json index 086d1f1ccc2e8..6be5318da7f1b 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -90,16 +89,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -107,12 +104,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -201,7 +200,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 } ], "module_calls": { @@ -260,7 +259,7 @@ ] } ], - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:47:46Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json index c600318ca6922..73aeed2d3a68a 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "246b2e70-366d-4610-a2f3-f41ed0707629", + "id": "14f0eb08-1bdb-4d48-ab20-e06584ee5b68", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "e83d1134-be62-43be-9dda-824c7e41c6ee", + "startup_script_behavior": "non-blocking", + "token": "454fffe5-3c59-4a9e-80a0-0d1644ce3b24", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -69,7 +68,7 @@ "outputs": { "script": "" }, - "random": "6805516663999826595" + "random": "8389680299908922676" }, "sensitive_values": { "inputs": {}, @@ -84,7 +83,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3006804652274736053", + "id": "8124127383117450432", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json index 915e78b833e46..9f2b1d3736e6e 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -80,16 +79,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -97,12 +94,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -178,7 +177,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.a", @@ -205,7 +204,7 @@ ] } }, - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:47:48Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json index c3051463c0623..fc6241b86e73a 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "4daf6d77-ebed-4796-8be2-5befeb32c925", + "id": "038d5038-be85-4609-bde3-56b7452e4386", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "445806ea-2f6b-4acd-b82c-4bd108bedd39", + "startup_script_behavior": "non-blocking", + "token": "e570d762-5584-4192-a474-be9e137b2f09", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -57,7 +56,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3806873213294600316", + "id": "690495753077748083", "triggers": null }, "sensitive_values": {}, @@ -74,7 +73,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8006735684599421658", + "id": "3238567980725122951", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json index a326a16fcd19c..f5218d0c65e0a 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -80,16 +79,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -97,12 +94,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -178,7 +177,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.first", @@ -205,7 +204,7 @@ ] } }, - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:47:50Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json index e84707581dfba..44bca5b6abc30 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "d92142c4-1cce-49c8-a88d-09253414a02c", + "id": "be15a1b3-f041-4471-9dec-9784c68edb26", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "c3ed6734-2462-4ea0-ba44-9b47127f3f4b", + "startup_script_behavior": "non-blocking", + "token": "df2580ad-59cc-48fb-bb21-40a8be5a5a66", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -57,7 +56,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3110617068153727272", + "id": "9103672483967127580", "triggers": null }, "sensitive_values": {}, @@ -73,7 +72,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6570658214510207228", + "id": "4372402015997897970", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json index bc638f21b7952..826ba9da95576 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,16 +26,14 @@ } ], "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { @@ -43,6 +41,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -88,16 +87,14 @@ } ], "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -107,6 +104,7 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -115,6 +113,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -188,7 +187,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev", @@ -204,7 +203,7 @@ ] } }, - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:47:53Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json index 6f11d90b5f353..1948baf7137a8 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "cccfe159-7cc6-46f9-880a-5f89679aa6f1", + "id": "398e27d3-10cc-4522-9144-34658eedad0e", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "a75ef39b-40c9-4433-928d-63d8c9bedaf3", + "startup_script_behavior": "non-blocking", + "token": "33068dbe-54d7-45eb-bfe5-87a9756802e2", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -57,7 +56,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8451712369296777218", + "id": "5682617535476100233", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json index 9fd5a5058512f..9172849c341a3 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,16 +26,14 @@ } ], "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { @@ -43,6 +41,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -88,16 +87,14 @@ } ], "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -107,6 +104,7 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -115,6 +113,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -188,7 +187,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev", @@ -204,7 +203,7 @@ ] } }, - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:47:52Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json index e52bc1fc97e5c..88e4d0f768d1e 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "42ab7718-4f21-4354-94fc-1b17419773cc", + "id": "810cdd01-a27d-442f-9e69-bdaecced8a59", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "d5d85dd4-167f-4085-af28-66faeb29ff7b", + "startup_script_behavior": "non-blocking", + "token": "fade1b71-d52b-4ef2-bb05-961f7795bab9", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -57,7 +56,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1856302384240211120", + "id": "5174735461860530782", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json index cf4cd4a8ef39e..654ce7464aad6 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -68,16 +67,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -85,12 +82,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -183,7 +182,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev", @@ -228,7 +227,7 @@ ] } }, - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:47:55Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json index 29e9f5c84e6a7..733c9dd3acdb2 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json @@ -38,7 +38,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -54,19 +54,17 @@ } ], "env": null, - "id": "1bef34c1-a59f-44c3-b90e-14b7e5ea2365", + "id": "7ead336b-d366-4991-b38d-bdb8b9333ae9", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "a266b7f9-747d-48cf-8ec6-2083357a3fb3", + "startup_script_behavior": "non-blocking", + "token": "a3d2c620-f065-4b29-ae58-370292e787d4", "troubleshooting_url": null }, "sensitive_values": { @@ -74,6 +72,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -85,7 +84,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5448013025585173297", + "id": "3060850815800759131", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json index 838d7ce0301c2..04e6c6f0098d7 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "google-instance-identity", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -80,16 +79,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -97,12 +94,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -182,7 +181,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_agent_instance.main", @@ -225,7 +224,7 @@ ] } ], - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:47:57Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json index 51a52dd7541c7..e884830606a23 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "google-instance-identity", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "3f177501-a597-4e62-8ed5-7590f8c3dbfd", + "id": "c6e99a38-f10b-4242-a7c6-bd9186008b9d", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "9715bbf6-35f8-451a-b678-eccaccbf27c1", + "startup_script_behavior": "non-blocking", + "token": "ecddacca-df83-4dd2-b6cb-71f439e9e5f5", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -57,8 +56,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 0, "values": { - "agent_id": "3f177501-a597-4e62-8ed5-7590f8c3dbfd", - "id": "33a7844c-24c6-4e3d-9a0d-9040b4531905", + "agent_id": "c6e99a38-f10b-4242-a7c6-bd9186008b9d", + "id": "0ed215f9-07b0-455f-828d-faee5f63ea93", "instance_id": "example" }, "sensitive_values": {}, @@ -74,7 +73,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6817986893282284877", + "id": "1340003819945612525", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json index ddeb79fa5e09c..7dd1dc173febb 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -42,16 +41,16 @@ "name": "apps", "index": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "command": null, "display_name": "app1", "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -68,16 +67,16 @@ "name": "apps", "index": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "command": null, "display_name": "app2", "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app2", "subdomain": null, @@ -120,16 +119,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -137,12 +134,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -164,10 +163,10 @@ "display_name": "app1", "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -201,10 +200,10 @@ "display_name": "app2", "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app2", "subdomain": null, @@ -271,7 +270,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_app.apps", @@ -298,7 +297,7 @@ ] } }, - "schema_version": 0, + "schema_version": 1, "for_each_expression": { "references": [ "local.apps_map" @@ -327,7 +326,7 @@ ] } ], - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:47:59Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json index f504151b7d63a..fb32d22e2c358 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "4fafe4d0-806b-4014-a837-8ee8f6ed268a", + "id": "18098e15-2e8b-4c83-9362-0823834ae628", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "cfb3af3d-26a5-4ae7-bf8b-35d9fc2d9ad9", + "startup_script_behavior": "non-blocking", + "token": "59691c9e-bf9e-4c93-9768-ba3582c68727", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -56,18 +55,18 @@ "name": "apps", "index": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "4fafe4d0-806b-4014-a837-8ee8f6ed268a", + "agent_id": "18098e15-2e8b-4c83-9362-0823834ae628", "command": null, "display_name": "app1", "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "id": "e78e4bf2-4796-4e51-9358-19ff0275de4d", - "name": null, + "id": "8f031ab5-e051-4eff-9f7e-233f5825c3fd", + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -87,18 +86,18 @@ "name": "apps", "index": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "4fafe4d0-806b-4014-a837-8ee8f6ed268a", + "agent_id": "18098e15-2e8b-4c83-9362-0823834ae628", "command": null, "display_name": "app2", "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "id": "b311a085-5f50-43ac-a8aa-b3cb618805df", - "name": null, + "id": "5462894e-7fdc-4fd0-8715-7829e53efea2", + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app2", "subdomain": null, @@ -119,7 +118,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1480143277295860801", + "id": "2699316377754222096", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json index 7935f051a4c13..69600fed24390 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -41,28 +40,27 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -72,16 +70,16 @@ "type": "coder_app", "name": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "command": null, "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -97,7 +95,7 @@ "type": "coder_app", "name": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "command": null, "display_name": null, @@ -109,10 +107,10 @@ "url": "http://localhost:13337/healthz" } ], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -130,16 +128,16 @@ "type": "coder_app", "name": "app3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "command": null, "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -194,16 +192,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -211,12 +207,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -238,16 +236,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -255,12 +251,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -281,10 +279,10 @@ "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -323,10 +321,10 @@ "url": "http://localhost:13337/healthz" } ], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -363,10 +361,10 @@ "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -454,7 +452,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_agent.dev2", @@ -470,7 +468,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_app.app1", @@ -489,7 +487,7 @@ "constant_value": "app1" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_app.app2", @@ -524,7 +522,7 @@ "constant_value": true } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_app.app3", @@ -546,7 +544,7 @@ "constant_value": false } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev1", @@ -575,19 +573,19 @@ }, "relevant_attributes": [ { - "resource": "coder_agent.dev2", + "resource": "coder_agent.dev1", "attribute": [ "id" ] }, { - "resource": "coder_agent.dev1", + "resource": "coder_agent.dev2", "attribute": [ "id" ] } ], - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:03Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json index 3d87a9b060dfa..db2617701b508 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "4e5cfc98-bcfd-4b82-ab74-d0e629821a1b", + "id": "00794e64-40d3-43df-885a-4b1cc5f5b965", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "150f506e-f851-4f40-bd03-91ce78be05e3", + "startup_script_behavior": "non-blocking", + "token": "7c0a6e5e-dd2c-46e4-a5f5-f71aae7515c3", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -55,7 +54,7 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -71,19 +70,17 @@ } ], "env": null, - "id": "2c1ebbc9-f686-4110-bb0e-4e4c129ac9e6", + "id": "1b8ddc14-25c2-4eab-b282-71b12d45de73", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "7d5dc9aa-2cf8-471f-ac7f-22eb4da85f56", + "startup_script_behavior": "non-blocking", + "token": "39497aa1-11a1-40c0-854d-554c2e27ef77", "troubleshooting_url": null }, "sensitive_values": { @@ -91,6 +88,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -100,18 +98,18 @@ "type": "coder_app", "name": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "4e5cfc98-bcfd-4b82-ab74-d0e629821a1b", + "agent_id": "00794e64-40d3-43df-885a-4b1cc5f5b965", "command": null, "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "id": "2974764d-5a62-481a-b817-e4e41e2b9fb4", - "name": null, + "id": "c9cf036f-5fd9-408a-8c28-90cde4c5b0cf", + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -130,9 +128,9 @@ "type": "coder_app", "name": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "4e5cfc98-bcfd-4b82-ab74-d0e629821a1b", + "agent_id": "00794e64-40d3-43df-885a-4b1cc5f5b965", "command": null, "display_name": null, "external": false, @@ -143,11 +141,11 @@ "url": "http://localhost:13337/healthz" } ], + "hidden": false, "icon": null, - "id": "1f131e71-4d30-48ee-9293-e100d7f2f93e", - "name": null, + "id": "e40999b2-8ceb-4e35-962b-c0b7b95c8bc8", + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -168,18 +166,18 @@ "type": "coder_app", "name": "app3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "2c1ebbc9-f686-4110-bb0e-4e4c129ac9e6", + "agent_id": "1b8ddc14-25c2-4eab-b282-71b12d45de73", "command": null, "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "id": "0a3f2b30-8c70-4507-aceb-5b48c81a0301", - "name": null, + "id": "4e61c245-271a-41e1-9a37-2badf68bf5cd", + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -200,7 +198,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2990901857056833713", + "id": "7796235346668423309", "triggers": null }, "sensitive_values": {}, @@ -216,7 +214,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6703096005003194800", + "id": "8353198974918613541", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json index 8a80e5480f936..da3f19c548339 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -41,28 +40,27 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -72,7 +70,7 @@ "type": "coder_env", "name": "env1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "name": "ENV_1", "value": "Env 1" @@ -85,7 +83,7 @@ "type": "coder_env", "name": "env2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "name": "ENV_2", "value": "Env 2" @@ -98,7 +96,7 @@ "type": "coder_env", "name": "env3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "name": "ENV_3", "value": "Env 3" @@ -150,16 +148,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -167,12 +163,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -194,16 +192,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -211,12 +207,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -361,7 +359,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_agent.dev2", @@ -377,7 +375,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_env.env1", @@ -399,7 +397,7 @@ "constant_value": "Env 1" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_env.env2", @@ -421,7 +419,7 @@ "constant_value": "Env 2" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_env.env3", @@ -443,7 +441,7 @@ "constant_value": "Env 3" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev1", @@ -484,7 +482,7 @@ ] } ], - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:05Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json index 37081372a238a..6b2f13b3e8ae8 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "4ebb9bc8-ddb8-474d-bd06-5ada2e990e3f", + "id": "f1398cbc-4e67-4a0e-92b7-15dc33221872", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "a42924a9-339c-459b-8f43-29d4434fbb3a", + "startup_script_behavior": "non-blocking", + "token": "acbbabee-e370-4aba-b876-843fb10201e8", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -55,7 +54,7 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -71,19 +70,17 @@ } ], "env": null, - "id": "3162694f-f747-4f01-837c-16e77617b4ba", + "id": "ea44429d-fc3c-4ea6-ba23-a997dc66cad8", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "cb2daa5d-0409-47e1-a62e-3a7081d1a452", + "startup_script_behavior": "non-blocking", + "token": "51fea695-82dd-4ccd-bf25-2c55a82b4851", "troubleshooting_url": null }, "sensitive_values": { @@ -91,6 +88,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -100,10 +98,10 @@ "type": "coder_env", "name": "env1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "4ebb9bc8-ddb8-474d-bd06-5ada2e990e3f", - "id": "9f52a88a-59dc-4d69-aa98-16aeec507cf0", + "agent_id": "f1398cbc-4e67-4a0e-92b7-15dc33221872", + "id": "f8f7b3f7-5c4b-47b9-959e-32d2044329e3", "name": "ENV_1", "value": "Env 1" }, @@ -118,10 +116,10 @@ "type": "coder_env", "name": "env2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "4ebb9bc8-ddb8-474d-bd06-5ada2e990e3f", - "id": "a645186e-04c8-4462-a16a-2e9a1ff0c8b9", + "agent_id": "f1398cbc-4e67-4a0e-92b7-15dc33221872", + "id": "b7171d98-09c9-4bc4-899d-4b7343cd86ca", "name": "ENV_2", "value": "Env 2" }, @@ -136,10 +134,10 @@ "type": "coder_env", "name": "env3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "3162694f-f747-4f01-837c-16e77617b4ba", - "id": "2944ab68-a99d-4f01-854d-9602d8d2e47c", + "agent_id": "ea44429d-fc3c-4ea6-ba23-a997dc66cad8", + "id": "84021f25-1736-4884-8e5c-553e9c1f6fa6", "name": "ENV_3", "value": "Env 3" }, @@ -156,7 +154,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3825576014142112781", + "id": "4901314428677246063", "triggers": null }, "sensitive_values": {}, @@ -172,7 +170,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7404789264617185387", + "id": "3203010350140581146", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json index a44ed3548ea8f..7724005431a92 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -41,28 +40,27 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -72,7 +70,7 @@ "type": "coder_script", "name": "script1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "cron": null, "display_name": "Foobar Script 1", @@ -92,7 +90,7 @@ "type": "coder_script", "name": "script2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "cron": null, "display_name": "Foobar Script 2", @@ -112,7 +110,7 @@ "type": "coder_script", "name": "script3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "cron": null, "display_name": "Foobar Script 3", @@ -171,16 +169,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -188,12 +184,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -215,16 +213,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -232,12 +228,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -403,7 +401,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_agent.dev2", @@ -419,7 +417,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_script.script1", @@ -444,7 +442,7 @@ "constant_value": "echo foobar 1" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_script.script2", @@ -469,7 +467,7 @@ "constant_value": "echo foobar 2" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_script.script3", @@ -494,7 +492,7 @@ "constant_value": "echo foobar 3" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev1", @@ -523,19 +521,19 @@ }, "relevant_attributes": [ { - "resource": "coder_agent.dev1", + "resource": "coder_agent.dev2", "attribute": [ "id" ] }, { - "resource": "coder_agent.dev2", + "resource": "coder_agent.dev1", "attribute": [ "id" ] } ], - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:08Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json index a23a82237539e..c5db3c24d2f1e 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "3d06016d-2ffa-4792-bc45-5a795d9adb54", + "id": "bd762939-8952-4ac7-a9e5-618ec420b518", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "6c6255fd-80b8-41bc-9d6a-a5849c625732", + "startup_script_behavior": "non-blocking", + "token": "f86127e8-2852-4c02-9f07-c376ec04318f", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -55,7 +54,7 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -71,19 +70,17 @@ } ], "env": null, - "id": "915aa8b5-d553-4003-b0d3-6db8ab2c8e1f", + "id": "60244093-3c9d-4655-b34f-c4713f7001c1", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "e151197b-49f5-4452-8221-fc3aa240f0b6", + "startup_script_behavior": "non-blocking", + "token": "cad61f70-873f-440c-ad1c-9d34be2e19c4", "troubleshooting_url": null }, "sensitive_values": { @@ -91,6 +88,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -100,13 +98,13 @@ "type": "coder_script", "name": "script1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "3d06016d-2ffa-4792-bc45-5a795d9adb54", + "agent_id": "bd762939-8952-4ac7-a9e5-618ec420b518", "cron": null, "display_name": "Foobar Script 1", "icon": null, - "id": "d3a1a465-010c-48b5-9b39-933680cb2caa", + "id": "b34b6cd5-e85d-41c8-ad92-eaaceb2404cb", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -125,13 +123,13 @@ "type": "coder_script", "name": "script2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "3d06016d-2ffa-4792-bc45-5a795d9adb54", + "agent_id": "bd762939-8952-4ac7-a9e5-618ec420b518", "cron": null, "display_name": "Foobar Script 2", "icon": null, - "id": "e7b3b13e-7f06-41af-bacc-54a521b3128f", + "id": "d6f4e24c-3023-417d-b9be-4c83dbdf4802", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -150,13 +148,13 @@ "type": "coder_script", "name": "script3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "915aa8b5-d553-4003-b0d3-6db8ab2c8e1f", + "agent_id": "60244093-3c9d-4655-b34f-c4713f7001c1", "cron": null, "display_name": "Foobar Script 3", "icon": null, - "id": "10d85cfc-a857-474c-811c-2cbb2f68164f", + "id": "a19e9106-5eb5-4941-b6ae-72a7724efdf0", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -177,7 +175,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6602030669549037192", + "id": "8576645433635584827", "triggers": null }, "sensitive_values": {}, @@ -193,7 +191,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3000973025373832517", + "id": "1280398780322015606", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json index ee4241623de60..201e09ad767b2 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -41,28 +40,27 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 1, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": "/etc/motd", "order": null, "os": "darwin", + "resources_monitoring": [], "shutdown_script": "echo bye bye", - "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "non-blocking", - "startup_script_timeout": 300, "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -72,28 +70,27 @@ "type": "coder_agent", "name": "dev3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "arm64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "blocking", - "startup_script_timeout": 300, "troubleshooting_url": "https://coder.com/troubleshoot" }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -103,28 +100,27 @@ "type": "coder_agent", "name": "dev4", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -161,16 +157,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -178,12 +172,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -205,16 +201,14 @@ "connection_timeout": 1, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": "/etc/motd", "order": null, "os": "darwin", + "resources_monitoring": [], "shutdown_script": "echo bye bye", - "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "non-blocking", - "startup_script_timeout": 300, "troubleshooting_url": null }, "after_unknown": { @@ -222,12 +216,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -249,16 +245,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "blocking", - "startup_script_timeout": 300, "troubleshooting_url": "https://coder.com/troubleshoot" }, "after_unknown": { @@ -266,12 +260,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -293,16 +289,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -310,12 +304,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -370,7 +366,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_agent.dev2", @@ -398,7 +394,7 @@ "constant_value": "non-blocking" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_agent.dev3", @@ -420,7 +416,7 @@ "constant_value": "https://coder.com/troubleshoot" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_agent.dev4", @@ -436,7 +432,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev", @@ -455,7 +451,7 @@ ] } }, - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:01Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json index b33eaf4755fdc..53335cffd6582 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "f5c3b5ec-d609-46fa-b483-2d7778324244", + "id": "215a9369-35c9-4abe-b1c0-3eb3ab1c1922", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "756dfc6c-adf9-4987-a12c-ce520485584f", + "startup_script_behavior": "non-blocking", + "token": "3fdd733c-b02e-4d81-a032-7c8d7ee3dcd8", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -55,7 +54,7 @@ "type": "coder_agent", "name": "dev2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -71,19 +70,17 @@ } ], "env": null, - "id": "c65b2828-de95-495b-983c-fe8a7b16325c", + "id": "b79acfba-d148-4940-80aa-0c72c037a3ed", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": "/etc/motd", "order": null, "os": "darwin", + "resources_monitoring": [], "shutdown_script": "echo bye bye", - "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "non-blocking", - "startup_script_timeout": 300, - "token": "2adee50e-c284-4e16-a022-b6b446a350c1", + "token": "e841a152-a794-4b05-9818-95e7440d402d", "troubleshooting_url": null }, "sensitive_values": { @@ -91,6 +88,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -100,7 +98,7 @@ "type": "coder_agent", "name": "dev3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "arm64", "auth": "token", @@ -116,19 +114,17 @@ } ], "env": null, - "id": "97a23a3b-e347-4185-b3f0-0858d60a9739", + "id": "4e863395-523b-443a-83c2-ab27e42a06b2", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, "startup_script_behavior": "blocking", - "startup_script_timeout": 300, - "token": "839b821f-cae1-4deb-b6be-530ceaf2ce3c", + "token": "ee0a5e1d-879e-4bff-888e-6cf94533f0bd", "troubleshooting_url": "https://coder.com/troubleshoot" }, "sensitive_values": { @@ -136,6 +132,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -145,7 +142,7 @@ "type": "coder_agent", "name": "dev4", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -161,19 +158,17 @@ } ], "env": null, - "id": "ca8728f6-2359-4b89-af47-22faafff7ce9", + "id": "611c43f5-fa8f-4641-9b5c-a58a8945caa1", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "0dcb8ef1-7c36-4a66-98b5-5457108f1f2f", + "startup_script_behavior": "non-blocking", + "token": "2d2669c7-6385-4ce8-8948-e4b24db45132", "troubleshooting_url": null }, "sensitive_values": { @@ -181,6 +176,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -192,7 +188,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7360397834688654491", + "id": "5237006672454822031", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json index b20fde49f4913..d5d555e057751 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -41,16 +40,16 @@ "type": "coder_app", "name": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "command": null, "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -66,7 +65,7 @@ "type": "coder_app", "name": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "command": null, "display_name": null, @@ -78,10 +77,10 @@ "url": "http://localhost:13337/healthz" } ], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -99,16 +98,16 @@ "type": "coder_app", "name": "app3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "command": null, "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -151,16 +150,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -168,12 +165,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -194,10 +193,10 @@ "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -236,10 +235,10 @@ "url": "http://localhost:13337/healthz" } ], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -276,10 +275,10 @@ "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "name": null, + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -346,7 +345,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_app.app1", @@ -365,7 +364,7 @@ "constant_value": "app1" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_app.app2", @@ -400,7 +399,7 @@ "constant_value": true } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_app.app3", @@ -422,7 +421,7 @@ "constant_value": false } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev", @@ -446,7 +445,7 @@ ] } ], - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:10Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json index e31fe93582a5f..9bad98304438c 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "dev1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,19 +26,17 @@ } ], "env": null, - "id": "d4d1d876-f010-4eb7-b18c-a175967117fd", + "id": "cae4d590-8332-45b6-9453-e0151ca4f219", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "2a3f19f7-9633-42d3-a9d7-dbe4f4ffd697", + "startup_script_behavior": "non-blocking", + "token": "6db086ba-440b-4e66-8803-80e021cda61a", "troubleshooting_url": null }, "sensitive_values": { @@ -46,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -55,18 +54,18 @@ "type": "coder_app", "name": "app1", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "d4d1d876-f010-4eb7-b18c-a175967117fd", + "agent_id": "cae4d590-8332-45b6-9453-e0151ca4f219", "command": null, "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "id": "bb6c6e6a-4641-4af4-9f83-3043b9995774", - "name": null, + "id": "64803468-4ec4-49fe-beb7-e65eaf8e01ca", + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app1", "subdomain": null, @@ -85,9 +84,9 @@ "type": "coder_app", "name": "app2", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "d4d1d876-f010-4eb7-b18c-a175967117fd", + "agent_id": "cae4d590-8332-45b6-9453-e0151ca4f219", "command": null, "display_name": null, "external": false, @@ -98,11 +97,11 @@ "url": "http://localhost:13337/healthz" } ], + "hidden": false, "icon": null, - "id": "42fb07a8-50d6-4890-b754-e74ad7c1b4bd", - "name": null, + "id": "df3f07ab-1796-41c9-8e7d-b957dca031d4", + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app2", "subdomain": true, @@ -123,18 +122,18 @@ "type": "coder_app", "name": "app3", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { - "agent_id": "d4d1d876-f010-4eb7-b18c-a175967117fd", + "agent_id": "cae4d590-8332-45b6-9453-e0151ca4f219", "command": null, "display_name": null, "external": false, "healthcheck": [], + "hidden": false, "icon": null, - "id": "383bb5b8-aaf5-44ba-9e9d-d18ba9a5a2a1", - "name": null, + "id": "fdb06774-4140-42ef-989b-12b98254b27c", + "open_in": "slim-window", "order": null, - "relative_path": null, "share": "owner", "slug": "app3", "subdomain": false, @@ -155,7 +154,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1619301723440820833", + "id": "8206837964247342986", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json index 2ee13d783a560..6354226c4cbfc 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json @@ -10,14 +10,13 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -31,11 +30,10 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { @@ -43,6 +41,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } }, @@ -52,7 +51,7 @@ "type": "coder_metadata", "name": "about_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "daily_cost": 29, "hide": true, @@ -83,7 +82,7 @@ "type": "coder_metadata", "name": "other_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "daily_cost": 20, "hide": true, @@ -135,7 +134,6 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -149,11 +147,10 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -163,6 +160,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -171,6 +169,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } } @@ -333,7 +332,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_metadata.about_info", @@ -373,7 +372,7 @@ ] } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_metadata.other_info", @@ -408,7 +407,7 @@ ] } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.about", @@ -432,7 +431,7 @@ ] } ], - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:14Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json index 00ef389c869a7..82eed92f364a8 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,9 +26,8 @@ } ], "env": null, - "id": "7061180b-a88c-466b-9685-ff31c71f11d7", + "id": "b3257d67-247c-4fc6-92a8-fc997501a0e1", "init_script": "", - "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -42,12 +41,11 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "a4864d63-5605-468b-a015-a5f42798ea84", + "startup_script_behavior": "non-blocking", + "token": "ac3563fb-3069-4919-b076-6687c765772b", "troubleshooting_url": null }, "sensitive_values": { @@ -57,6 +55,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } }, @@ -66,12 +65,12 @@ "type": "coder_metadata", "name": "about_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "9cad854f-e818-4a64-b523-b95a9c18ce23", + "id": "fcd81afa-64ad-45e3-b000-31d1b19df922", "item": [ { "is_null": false, @@ -86,7 +85,7 @@ "value": "" } ], - "resource_id": "4478768709310452498" + "resource_id": "8033209281634385030" }, "sensitive_values": { "item": [ @@ -105,12 +104,12 @@ "type": "coder_metadata", "name": "other_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "daily_cost": 20, "hide": true, "icon": "/icon/server.svg", - "id": "09d1f38c-b929-4e18-b0f9-09bbe19bce5f", + "id": "186819f3-a92f-4785-9ee4-d79f57711f63", "item": [ { "is_null": false, @@ -119,7 +118,7 @@ "value": "world" } ], - "resource_id": "4478768709310452498" + "resource_id": "8033209281634385030" }, "sensitive_values": { "item": [ @@ -139,7 +138,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4478768709310452498", + "id": "8033209281634385030", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json index 9db21b75c34c9..fd252c9adb16e 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json @@ -10,14 +10,13 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -31,11 +30,10 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { @@ -43,6 +41,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } }, @@ -52,7 +51,7 @@ "type": "coder_metadata", "name": "about_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "daily_cost": 29, "hide": true, @@ -122,7 +121,6 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -136,11 +134,10 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -150,6 +147,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -158,6 +156,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } } @@ -301,7 +300,7 @@ "constant_value": "linux" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "coder_metadata.about_info", @@ -360,7 +359,7 @@ ] } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.about", @@ -384,7 +383,7 @@ ] } ], - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:12Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json index 036f03f07b05b..a0838cc561888 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json @@ -10,7 +10,7 @@ "type": "coder_agent", "name": "main", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "amd64", "auth": "token", @@ -26,9 +26,8 @@ } ], "env": null, - "id": "193dd372-e2cc-4033-9a7a-58ab06bbfad9", + "id": "066d91d2-860a-4a44-9443-9eaf9315729b", "init_script": "", - "login_before_ready": true, "metadata": [ { "display_name": "Process Count", @@ -42,12 +41,11 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "f4fff09b-b927-4ab1-9951-beab5d20da13", + "startup_script_behavior": "non-blocking", + "token": "9b6cc6dd-0e02-489f-b651-7a01804c406f", "troubleshooting_url": null }, "sensitive_values": { @@ -57,6 +55,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } }, @@ -66,12 +65,12 @@ "type": "coder_metadata", "name": "about_info", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "0bcdb676-61eb-460b-a1e3-e0428006123c", + "id": "fa791d91-9718-420e-9fa8-7a02e7af1563", "item": [ { "is_null": false, @@ -98,7 +97,7 @@ "value": "squirrel" } ], - "resource_id": "2203989413539542687" + "resource_id": "2710066198333857753" }, "sensitive_values": { "item": [ @@ -121,7 +120,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2203989413539542687", + "id": "2710066198333857753", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json index 75266b7f96443..95fb198c1eb82 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "arm64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -68,16 +67,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -85,12 +82,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -136,7 +135,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "a7052578-164a-4a65-b82b-8fb1dd18bb9f", + "id": "e8485920-025a-4c2c-b018-722f61b64347", "mutable": false, "name": "Example", "option": null, @@ -163,7 +162,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "74ad670f-c830-4cc2-8a6c-9c849b64f00e", + "id": "6156655b-f893-4eba-914e-e87414f4bf7e", "mutable": false, "name": "Sample", "option": null, @@ -209,7 +208,7 @@ "constant_value": "windows" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev", @@ -269,7 +268,7 @@ ] } }, - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:18Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json index e0dcfefa13d36..2cc48c837a1d2 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "74b74e19-b03e-4048-921d-57af97776981", + "id": "4b774ce8-1e9f-4721-8a14-05efd3eb2dab", "mutable": false, "name": "Example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "8643afff-6a08-43bb-b035-b5dff416db3c", + "id": "447ae720-c046-452e-8d2c-1b5d4060b798", "mutable": false, "name": "Sample", "option": null, @@ -64,7 +64,7 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "arm64", "auth": "token", @@ -80,19 +80,17 @@ } ], "env": null, - "id": "871105a1-c92e-4616-b75f-fd9bc967024b", + "id": "b8d637c2-a19c-479c-b3e2-374f15ce37c3", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "ca9c2bf9-4f44-4593-b635-a8e6a62e29f3", + "startup_script_behavior": "non-blocking", + "token": "52ce8a0d-12c9-40b5-9f86-dc6240b98d5f", "troubleshooting_url": null }, "sensitive_values": { @@ -100,6 +98,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -111,7 +110,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1278146984662612186", + "id": "769369130050936586", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json index 1053fa1f856e8..691c168418111 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "arm64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -68,16 +67,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -85,12 +82,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -136,7 +135,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "52c11b76-8fcc-496e-92c8-35c71840b3d1", + "id": "30116bcb-f109-4807-be06-666a60b6cbb2", "mutable": true, "name": "number_example", "option": null, @@ -163,7 +162,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "f5c91f00-8683-4ee1-8445-af9091531d0a", + "id": "755395f4-d163-4b90-a8f4-e7ae24e17dd0", "mutable": false, "name": "number_example_max", "option": null, @@ -202,7 +201,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "41eee251-1bdd-4e0b-a033-a993dcd30439", + "id": "dec9fa47-a252-4eb7-868b-10d0fe7bad57", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -241,7 +240,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "ea49a527-c4ac-465e-abd7-5001e9f7f8d2", + "id": "57107f82-107b-484d-8491-0787f051dca7", "mutable": false, "name": "number_example_min", "option": null, @@ -280,7 +279,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "6264b123-76ca-4a04-aab6-1bed0d7f1c3f", + "id": "c21a61f4-26e0-49bb-99c8-56240433c21b", "mutable": false, "name": "number_example_min_max", "option": null, @@ -319,7 +318,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "0f94b55a-b169-4807-9c25-294830afeb73", + "id": "4894f5cc-f4e6-4a86-bdfa-36c9d3f8f1a3", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -377,7 +376,7 @@ "constant_value": "windows" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev", @@ -551,7 +550,7 @@ ] } }, - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:20Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json index f932e87ef6928..1ad55291deaab 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "cad89d35-cd11-483c-bd36-a1dfeeaf1422", + "id": "9b5bb411-bfe5-471a-8f2d-9fcc8c17b616", "mutable": true, "name": "number_example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9fe9a9f0-05e6-40a5-a28a-fdfc1880336a", + "id": "2ebaf3ec-9272-48f4-981d-09485ae7960e", "mutable": false, "name": "number_example_max", "option": null, @@ -83,7 +83,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "f59ecaaf-0771-4fbb-bd86-c8318c92d50c", + "id": "d05a833c-d0ca-4f22-8b80-40851c111b61", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -122,7 +122,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "094144fe-cd08-4df4-9b7c-52a15eb5ef8b", + "id": "de0cd614-72b3-4404-80a1-e3c780823fc9", "mutable": false, "name": "number_example_min", "option": null, @@ -161,7 +161,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "47fa2481-369a-49c0-b7bc-492110ec7551", + "id": "66eae3e1-9bb5-44f8-8f15-2b400628d0e7", "mutable": false, "name": "number_example_min_max", "option": null, @@ -200,7 +200,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "178a245b-15d3-476f-9189-727179f64623", + "id": "d24d37f9-5a91-4c7f-9915-bfc10f6d353d", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -232,7 +232,7 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "arm64", "auth": "token", @@ -248,19 +248,17 @@ } ], "env": null, - "id": "29991019-7834-40f2-80b0-c4727651d1fd", + "id": "81170f06-8f49-43fb-998f-dc505a29632c", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "28237cde-dcd4-47e2-96c6-44daf5a1c15f", + "startup_script_behavior": "non-blocking", + "token": "f8433068-1acc-4225-94c0-725f86cdc002", "troubleshooting_url": null }, "sensitive_values": { @@ -268,6 +266,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -279,7 +278,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1740579577860451542", + "id": "3641782836917385715", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json index 8bebd6a6c0861..387be7249d0ef 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json @@ -10,28 +10,27 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "arm64", "auth": "token", "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -68,16 +67,14 @@ "connection_timeout": 120, "dir": null, "env": null, - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, + "startup_script_behavior": "non-blocking", "troubleshooting_url": null }, "after_unknown": { @@ -85,12 +82,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -136,7 +135,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "273c34be-18f5-4602-bdac-a1b76fe51f62", + "id": "72f11f9b-8c7f-4e4a-a207-f080b114862b", "mutable": false, "name": "Example", "option": [ @@ -180,7 +179,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "223e5056-087e-4844-a324-00b478e9bb3d", + "id": "b154b8a7-d31f-46f7-b876-e5bfdf50950c", "mutable": false, "name": "number_example", "option": null, @@ -207,7 +206,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "aad915c3-f11c-4f2c-a9e4-db99d58f90ce", + "id": "8199f88e-8b73-4385-bbb2-315182f753ef", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -246,7 +245,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "030953d9-3015-40a4-8c78-0fbbe0ac11b4", + "id": "110c995d-46d7-4277-8f57-a3d3d42733c3", "mutable": false, "name": "number_example_min_max", "option": null, @@ -285,7 +284,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "8fb89a6f-c39a-4c86-9126-4ab7235999d2", + "id": "e7a1f991-48a8-44c5-8a5c-597db8539cb7", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -324,7 +323,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9216b30e-60bb-423d-a7db-e7e92707c930", + "id": "27d12cdf-da7e-466b-907a-4824920305da", "mutable": false, "name": "Sample", "option": null, @@ -355,7 +354,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "ae736b92-370f-45fc-9583-9f941be249c7", + "id": "1242389a-5061-482a-8274-410174fb3fc0", "mutable": true, "name": "First parameter from module", "option": null, @@ -382,7 +381,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "cfd00c6c-cb54-4fc8-a6c5-16229b2e7253", + "id": "72418f70-4e3c-400f-9a7d-bf3467598deb", "mutable": true, "name": "Second parameter from module", "option": null, @@ -414,7 +413,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "beefa36e-8f4e-4c46-8d07-44a2a8862df1", + "id": "9b4b60d8-21bb-4d52-910a-536355e9a85f", "mutable": true, "name": "First parameter from child module", "option": null, @@ -441,7 +440,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "1ab1e9e9-1082-4f07-8ca3-cffe81a8fb19", + "id": "4edca123-07bf-4409-ad40-ed26f93beb5f", "mutable": true, "name": "Second parameter from child module", "option": null, @@ -498,7 +497,7 @@ "constant_value": "windows" } }, - "schema_version": 0 + "schema_version": 1 }, { "address": "null_resource.dev", @@ -794,7 +793,7 @@ } } }, - "timestamp": "2025-02-17T08:05:59Z", + "timestamp": "2025-01-29T22:48:16Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json index 9129ba7e5bc77..0c8abfa386ecf 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "71b5910f-fb0e-4364-af04-74232f1cedbc", + "id": "7298c15e-11c8-4a9e-a2ef-044dbc44d519", "mutable": false, "name": "Example", "option": [ @@ -61,7 +61,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "eb48cbd9-8d00-4983-b8f1-214fe998a7b4", + "id": "a0dda000-20cb-42a7-9f83-1a1de0876e48", "mutable": false, "name": "number_example", "option": null, @@ -88,7 +88,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "28b3cd4e-a9d2-4bbb-b0d6-08d385bac36f", + "id": "82a297b9-bbcb-4807-9de3-7217953dc6b0", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -127,7 +127,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "974d2595-c597-4de5-b6d4-1e80cd76e1c6", + "id": "ae1c376b-e28b-456a-b36e-125b3bc6d938", "mutable": false, "name": "number_example_min_max", "option": null, @@ -166,7 +166,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "581b09a6-cc6b-40a6-b77f-18b4d7acb826", + "id": "57573ac3-5610-4887-b269-376071867eb5", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -205,7 +205,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "3511b6d3-ae9a-4111-bac9-81c8811c3327", + "id": "0e08645d-0105-49ef-b278-26cdc30a826c", "mutable": false, "name": "Sample", "option": null, @@ -225,7 +225,7 @@ "type": "coder_agent", "name": "dev", "provider_name": "registry.terraform.io/coder/coder", - "schema_version": 0, + "schema_version": 1, "values": { "arch": "arm64", "auth": "token", @@ -241,19 +241,17 @@ } ], "env": null, - "id": "40f17825-b210-434a-8683-2de660b54671", + "id": "c5c402bd-215b-487f-862f-eca25fe88a72", "init_script": "", - "login_before_ready": true, "metadata": [], "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, - "shutdown_script_timeout": 300, "startup_script": null, - "startup_script_behavior": null, - "startup_script_timeout": 300, - "token": "1f46f0a4-f83d-40fe-9e2b-3c36e14b3747", + "startup_script_behavior": "non-blocking", + "token": "b70d10f3-90bc-4abd-8cd9-b11da843954a", "troubleshooting_url": null }, "sensitive_values": { @@ -261,6 +259,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -272,7 +271,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3925531947409543464", + "id": "8544034527967282476", "triggers": null }, "sensitive_values": {}, @@ -297,7 +296,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "1a2965c4-4659-4420-be95-468cb75c4606", + "id": "68ae438d-7194-4f5b-adeb-9c74059d9888", "mutable": true, "name": "First parameter from module", "option": null, @@ -324,7 +323,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "826bfe04-c025-4c42-939f-69dd69772da0", + "id": "32f0f7f3-26a5-4023-a4e6-d9436cfe8cb4", "mutable": true, "name": "Second parameter from module", "option": null, @@ -356,7 +355,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9b2e4b39-e103-4c1c-b338-9cce6a256956", + "id": "5235636a-3319-47ae-8879-b62f9ee9c5aa", "mutable": true, "name": "First parameter from child module", "option": null, @@ -383,7 +382,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "16733c90-261e-4ab3-a1b5-7adf360cd789", + "id": "54fa94ff-3048-457d-8de2-c182f6287c8d", "mutable": true, "name": "Second parameter from child module", "option": null,