diff --git a/.github/actions/setup-tf/action.yaml b/.github/actions/setup-tf/action.yaml index c52f1138e03ca..f130bcdb7d028 100644 --- a/.github/actions/setup-tf/action.yaml +++ b/.github/actions/setup-tf/action.yaml @@ -7,5 +7,5 @@ runs: - name: Install Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2 with: - terraform_version: 1.9.8 + terraform_version: 1.10.5 terraform_wrapper: false diff --git a/docs/install/offline.md b/docs/install/offline.md index 6a41bd9437894..0f83ae4077ee4 100644 --- a/docs/install/offline.md +++ b/docs/install/offline.md @@ -54,7 +54,7 @@ RUN mkdir -p /opt/terraform # The below step is optional if you wish to keep the existing version. # See https://github.com/coder/coder/blob/main/provisioner/terraform/install.go#L23-L24 # for supported Terraform versions. -ARG TERRAFORM_VERSION=1.9.8 +ARG TERRAFORM_VERSION=1.10.5 RUN apk update && \ apk del terraform && \ curl -LOs https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \ diff --git a/dogfood/contents/Dockerfile b/dogfood/contents/Dockerfile index 2de358c5c91e6..8c3613f59d468 100644 --- a/dogfood/contents/Dockerfile +++ b/dogfood/contents/Dockerfile @@ -195,9 +195,9 @@ RUN apt-get update --quiet && apt-get install --yes \ # Configure FIPS-compliant policies update-crypto-policies --set FIPS -# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.9.8. +# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.10.5. # Installing the same version here to match. -RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_amd64.zip" && \ +RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.10.5/terraform_1.10.5_linux_amd64.zip" && \ unzip /tmp/terraform.zip -d /usr/local/bin && \ rm -f /tmp/terraform.zip && \ chmod +x /usr/local/bin/terraform && \ diff --git a/install.sh b/install.sh index 734fd3c44f320..931426c54c5db 100755 --- a/install.sh +++ b/install.sh @@ -273,7 +273,7 @@ EOF main() { MAINLINE=1 STABLE=0 - TERRAFORM_VERSION="1.9.8" + TERRAFORM_VERSION="1.10.5" if [ "${TRACE-}" ]; then set -x diff --git a/provisioner/terraform/install.go b/provisioner/terraform/install.go index 7f6474d022ba1..74229c8539bc0 100644 --- a/provisioner/terraform/install.go +++ b/provisioner/terraform/install.go @@ -20,10 +20,10 @@ var ( // when Terraform is not available on the system. // NOTE: Keep this in sync with the version in scripts/Dockerfile.base. // NOTE: Keep this in sync with the version in install.sh. - TerraformVersion = version.Must(version.NewVersion("1.9.8")) + TerraformVersion = version.Must(version.NewVersion("1.10.5")) minTerraformVersion = version.Must(version.NewVersion("1.1.0")) - maxTerraformVersion = version.Must(version.NewVersion("1.9.9")) // use .9 to automatically allow patch releases + maxTerraformVersion = version.Must(version.NewVersion("1.10.9")) // use .9 to automatically allow patch releases terraformMinorVersionMismatch = xerrors.New("Terraform binary minor version mismatch.") ) diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go index 873627fd67080..5564f51a81ca6 100644 --- a/provisioner/terraform/resources_test.go +++ b/provisioner/terraform/resources_test.go @@ -406,12 +406,12 @@ func TestConvertResources(t *testing.T) { }, Volumes: []*proto.VolumeResourceMonitor{ { - Path: "volume2", + Path: "/volume2", Enabled: false, Threshold: 50, }, { - Path: "volume1", + Path: "/volume1", Enabled: true, Threshold: 80, }, diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tf b/provisioner/terraform/testdata/calling-module/calling-module.tf index 14777169d9994..33fcbb3f1984f 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tf +++ b/provisioner/terraform/testdata/calling-module/calling-module.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json index 6be5318da7f1b..8759627e35398 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -93,7 +91,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -104,14 +101,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -176,7 +171,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "module.module:null": { "name": "null", @@ -259,7 +254,7 @@ ] } ], - "timestamp": "2025-01-29T22:47:46Z", + "timestamp": "2025-02-18T10:58:12Z", "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..0286c44e0412b 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "14f0eb08-1bdb-4d48-ab20-e06584ee5b68", + "id": "6b8c1681-8d24-454f-9674-75aa10a78a66", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "454fffe5-3c59-4a9e-80a0-0d1644ce3b24", + "token": "b10f2c9a-2936-4d64-9d3c-3705fa094272", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -68,7 +66,7 @@ "outputs": { "script": "" }, - "random": "8389680299908922676" + "random": "2818431725852233027" }, "sensitive_values": { "inputs": {}, @@ -83,7 +81,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8124127383117450432", + "id": "2514800225855033412", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf index 3f210452dfee0..6ad44a62de986 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json index 9f2b1d3736e6e..4f478962e7b97 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -83,7 +81,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -94,14 +91,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -154,7 +149,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -204,7 +199,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:48Z", + "timestamp": "2025-02-18T10:58:12Z", "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..d51e2ecb81c71 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "038d5038-be85-4609-bde3-56b7452e4386", + "id": "a4c46a8c-dd2a-4913-8897-e77b24fdd7f1", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "e570d762-5584-4192-a474-be9e137b2f09", + "token": "c263f7b6-c0e7-4106-b3fc-aefbe373ee7a", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,7 +54,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "690495753077748083", + "id": "4299141049988455758", "triggers": null }, "sensitive_values": {}, @@ -73,7 +71,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3238567980725122951", + "id": "8248139888152642631", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf index 8c7b200fca7b0..86585b6a85357 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json index f5218d0c65e0a..57af82397bd20 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -83,7 +81,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -94,14 +91,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -154,7 +149,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -204,7 +199,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:50Z", + "timestamp": "2025-02-18T10:58:12Z", "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..f1e9760fcdac1 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "be15a1b3-f041-4471-9dec-9784c68edb26", + "id": "c5972861-13a8-4c3d-9e7b-c32aab3c5105", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "df2580ad-59cc-48fb-bb21-40a8be5a5a66", + "token": "9c2883aa-0c0e-470f-a40c-588b47e663be", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,7 +54,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "9103672483967127580", + "id": "4167500156989566756", "triggers": null }, "sensitive_values": {}, @@ -72,7 +70,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4372402015997897970", + "id": "2831408390006359178", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tf b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tf index 494e0acafb48f..155b81889540e 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tf +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } 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..f715d1e5b36ef 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 @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -30,7 +30,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -41,7 +40,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -91,7 +89,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -104,7 +101,6 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -113,7 +109,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -145,7 +140,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -203,7 +198,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:53Z", + "timestamp": "2025-02-18T10:58:12Z", "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..8127adf08deb5 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 @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "398e27d3-10cc-4522-9144-34658eedad0e", + "id": "f145f4f8-1d6c-4a66-ba80-abbc077dfe1e", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "33068dbe-54d7-45eb-bfe5-87a9756802e2", + "token": "612a69b3-4b07-4752-b930-ed7dd36dc926", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,7 +54,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5682617535476100233", + "id": "3571714162665255692", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tf b/provisioner/terraform/testdata/display-apps/display-apps.tf index a36b68cd3b1cc..3544ab535ad2f 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tf +++ b/provisioner/terraform/testdata/display-apps/display-apps.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json index 9172849c341a3..b4b3e8d72cb07 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -30,7 +30,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -41,7 +40,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -91,7 +89,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -104,7 +101,6 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -113,7 +109,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -145,7 +140,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -203,7 +198,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:52Z", + "timestamp": "2025-02-18T10:58:12Z", "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..53be3e3041729 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "810cdd01-a27d-442f-9e69-bdaecced8a59", + "id": "df983aa4-ad0a-458a-acd2-1d5c93e4e4d8", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "fade1b71-d52b-4ef2-bb05-961f7795bab9", + "token": "c2ccd3c2-5ac3-46f5-9620-f1d4c633169f", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,7 +54,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5174735461860530782", + "id": "4058093101918806466", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tf b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tf index 0b68bbe5710fe..5f45a88aacb6a 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tf +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } 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..fbd2636bfb68d 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 @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -71,7 +69,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -82,14 +79,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -118,7 +113,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -159,7 +154,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -227,7 +222,7 @@ ] } }, - "timestamp": "2025-01-29T22:47:55Z", + "timestamp": "2025-02-18T10:58:12Z", "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..e439476cc9b52 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 @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -54,17 +54,16 @@ } ], "env": null, - "id": "7ead336b-d366-4991-b38d-bdb8b9333ae9", + "id": "048746d5-8a05-4615-bdf3-5e0ecda12ba0", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "a3d2c620-f065-4b29-ae58-370292e787d4", + "token": "d2a64629-1d18-4704-a3b1-eae300a362d1", "troubleshooting_url": null }, "sensitive_values": { @@ -72,7 +71,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -84,7 +82,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3060850815800759131", + "id": "5369997016721085167", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tf b/provisioner/terraform/testdata/instance-id/instance-id.tf index 1cd4ab828b4f0..84e010a79d6e9 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tf +++ b/provisioner/terraform/testdata/instance-id/instance-id.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json index 04e6c6f0098d7..7c929b496d8fd 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -83,7 +81,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -94,14 +91,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -155,7 +150,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -224,7 +219,7 @@ ] } ], - "timestamp": "2025-01-29T22:47:57Z", + "timestamp": "2025-02-18T10:58:12Z", "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..7f7cdfa6a5055 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "c6e99a38-f10b-4242-a7c6-bd9186008b9d", + "id": "0b84fffb-d2ca-4048-bdab-7b84229bffba", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "ecddacca-df83-4dd2-b6cb-71f439e9e5f5", + "token": "05f05235-a62b-4634-841b-da7fe3763e2e", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,8 +54,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": "0b84fffb-d2ca-4048-bdab-7b84229bffba", + "id": "7d6e9d00-4cf9-4a38-9b4b-1eb6ba98b50c", "instance_id": "example" }, "sensitive_values": {}, @@ -73,7 +71,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1340003819945612525", + "id": "446414716532401482", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tf b/provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tf index 2ae1298904fbb..faa08706de380 100644 --- a/provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tf +++ b/provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tf b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tf index 1e13495d6ebc7..7664ead2b4962 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tf +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json index 7dd1dc173febb..dfcf3ccc7b52f 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -123,7 +121,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -134,14 +131,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -247,7 +242,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -326,7 +321,7 @@ ] } ], - "timestamp": "2025-01-29T22:47:59Z", + "timestamp": "2025-02-18T10:58:12Z", "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..ae0acf1650825 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "18098e15-2e8b-4c83-9362-0823834ae628", + "id": "4b66f4b5-d235-4c57-8b50-7db3643f8070", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "59691c9e-bf9e-4c93-9768-ba3582c68727", + "token": "a39963f7-3429-453f-b23f-961aa3590f06", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -57,14 +55,14 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "18098e15-2e8b-4c83-9362-0823834ae628", + "agent_id": "4b66f4b5-d235-4c57-8b50-7db3643f8070", "command": null, "display_name": "app1", "external": false, "healthcheck": [], "hidden": false, "icon": null, - "id": "8f031ab5-e051-4eff-9f7e-233f5825c3fd", + "id": "e67b9091-a454-42ce-85ee-df929f716c4f", "open_in": "slim-window", "order": null, "share": "owner", @@ -88,14 +86,14 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "18098e15-2e8b-4c83-9362-0823834ae628", + "agent_id": "4b66f4b5-d235-4c57-8b50-7db3643f8070", "command": null, "display_name": "app2", "external": false, "healthcheck": [], "hidden": false, "icon": null, - "id": "5462894e-7fdc-4fd0-8715-7829e53efea2", + "id": "84db109a-484c-42cc-b428-866458a99964", "open_in": "slim-window", "order": null, "share": "owner", @@ -118,7 +116,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2699316377754222096", + "id": "800496923164467286", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tf b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tf index 02c6ff6c1b67f..8ac412b5b3894 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tf +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } 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..4ba8c29b7fa77 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 @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -51,7 +49,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -60,7 +57,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -196,7 +192,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -207,14 +202,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -240,7 +233,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -251,14 +243,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -429,7 +419,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -573,19 +563,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:03Z", + "timestamp": "2025-02-18T10:58:12Z", "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..7ffb9866b4c48 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 @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "00794e64-40d3-43df-885a-4b1cc5f5b965", + "id": "9ba3ef14-bb43-4470-b019-129bf16eb0b2", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "7c0a6e5e-dd2c-46e4-a5f5-f71aae7515c3", + "token": "b40bdbf8-bf41-4822-a71e-03016079ddbe", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -70,17 +68,16 @@ } ], "env": null, - "id": "1b8ddc14-25c2-4eab-b282-71b12d45de73", + "id": "959048f4-3f1d-4cb0-93da-1dfacdbb7976", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "39497aa1-11a1-40c0-854d-554c2e27ef77", + "token": "71ef9752-9257-478c-bf5e-c6713a9f5073", "troubleshooting_url": null }, "sensitive_values": { @@ -88,7 +85,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -100,14 +96,14 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "00794e64-40d3-43df-885a-4b1cc5f5b965", + "agent_id": "9ba3ef14-bb43-4470-b019-129bf16eb0b2", "command": null, "display_name": null, "external": false, "healthcheck": [], "hidden": false, "icon": null, - "id": "c9cf036f-5fd9-408a-8c28-90cde4c5b0cf", + "id": "f125297a-130c-4c29-a1bf-905f95841fff", "open_in": "slim-window", "order": null, "share": "owner", @@ -130,7 +126,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "00794e64-40d3-43df-885a-4b1cc5f5b965", + "agent_id": "9ba3ef14-bb43-4470-b019-129bf16eb0b2", "command": null, "display_name": null, "external": false, @@ -143,7 +139,7 @@ ], "hidden": false, "icon": null, - "id": "e40999b2-8ceb-4e35-962b-c0b7b95c8bc8", + "id": "687e66e5-4888-417d-8fbd-263764dc5011", "open_in": "slim-window", "order": null, "share": "owner", @@ -168,14 +164,14 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "1b8ddc14-25c2-4eab-b282-71b12d45de73", + "agent_id": "959048f4-3f1d-4cb0-93da-1dfacdbb7976", "command": null, "display_name": null, "external": false, "healthcheck": [], "hidden": false, "icon": null, - "id": "4e61c245-271a-41e1-9a37-2badf68bf5cd", + "id": "70f10886-fa90-4089-b290-c2d44c5073ae", "open_in": "slim-window", "order": null, "share": "owner", @@ -198,7 +194,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "7796235346668423309", + "id": "1056762545519872704", "triggers": null }, "sensitive_values": {}, @@ -214,7 +210,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8353198974918613541", + "id": "784993046206959042", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf index d167d44942776..e12a895d14baa 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } 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..7fe81435861e4 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 @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -51,7 +49,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -60,7 +57,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -152,7 +148,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -163,14 +158,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -196,7 +189,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -207,14 +199,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -336,7 +326,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -470,19 +460,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-18T10:58:12Z", "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..f7801ad37220c 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 @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "f1398cbc-4e67-4a0e-92b7-15dc33221872", + "id": "5494b9d3-a230-41a4-8f50-be69397ab4cf", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "acbbabee-e370-4aba-b876-843fb10201e8", + "token": "84f93622-75a4-4bf1-b806-b981066d4870", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -70,17 +68,16 @@ } ], "env": null, - "id": "ea44429d-fc3c-4ea6-ba23-a997dc66cad8", + "id": "a4cb672c-020b-4729-b451-c7fabba4669c", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "51fea695-82dd-4ccd-bf25-2c55a82b4851", + "token": "2861b097-2ea6-4c3a-a64c-5a726b9e3700", "troubleshooting_url": null }, "sensitive_values": { @@ -88,7 +85,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -100,8 +96,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "f1398cbc-4e67-4a0e-92b7-15dc33221872", - "id": "f8f7b3f7-5c4b-47b9-959e-32d2044329e3", + "agent_id": "5494b9d3-a230-41a4-8f50-be69397ab4cf", + "id": "4ec31abd-b84a-45b6-80bd-c78eecf387f1", "name": "ENV_1", "value": "Env 1" }, @@ -118,8 +114,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "f1398cbc-4e67-4a0e-92b7-15dc33221872", - "id": "b7171d98-09c9-4bc4-899d-4b7343cd86ca", + "agent_id": "5494b9d3-a230-41a4-8f50-be69397ab4cf", + "id": "c0f4dac3-2b1a-4903-a0f1-2743f2000f1b", "name": "ENV_2", "value": "Env 2" }, @@ -136,8 +132,8 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "ea44429d-fc3c-4ea6-ba23-a997dc66cad8", - "id": "84021f25-1736-4884-8e5c-553e9c1f6fa6", + "agent_id": "a4cb672c-020b-4729-b451-c7fabba4669c", + "id": "e0ccf967-d767-4077-b521-20132af3217a", "name": "ENV_3", "value": "Env 3" }, @@ -154,7 +150,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "4901314428677246063", + "id": "7748417950448815454", "triggers": null }, "sensitive_values": {}, @@ -170,7 +166,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3203010350140581146", + "id": "1466092153882814278", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tf b/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tf index cb1491ad68caa..f86ceb180edb5 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tf +++ b/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = "2.2.0-pre0" } } } @@ -27,12 +27,12 @@ resource "coder_agent" "dev2" { threshold = 99 } volume { - path = "volume1" + path = "/volume1" enabled = true threshold = 80 } volume { - path = "volume2" + path = "/volume2" enabled = false threshold = 50 } diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.json index 218f5b88396f1..b5481b4c89463 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -79,12 +79,12 @@ "volume": [ { "enabled": false, - "path": "volume2", + "path": "/volume2", "threshold": 50 }, { "enabled": true, - "path": "volume1", + "path": "/volume1", "threshold": 80 } ] @@ -286,12 +286,12 @@ "volume": [ { "enabled": false, - "path": "volume2", + "path": "/volume2", "threshold": 50 }, { "enabled": true, - "path": "volume1", + "path": "/volume1", "threshold": 80 } ] @@ -448,7 +448,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": "2.2.0-pre0" }, "null": { "name": "null", @@ -518,7 +518,7 @@ "constant_value": true }, "path": { - "constant_value": "volume1" + "constant_value": "/volume1" }, "threshold": { "constant_value": 80 @@ -529,7 +529,7 @@ "constant_value": false }, "path": { - "constant_value": "volume2" + "constant_value": "/volume2" }, "threshold": { "constant_value": 50 @@ -618,7 +618,7 @@ ] } ], - "timestamp": "2025-01-29T22:48:06Z", + "timestamp": "2025-02-18T10:58:12Z", "applyable": true, "complete": true, "errored": false diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.json index 0def0a8ff7a58..85ef0a7ccddad 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "2f065c5c-cbed-4abe-b30b-942f410b6109", + "id": "9c36f8be-874a-40f6-a395-f37d6d910a83", "init_script": "", "metadata": [], "motd_file": null, @@ -46,7 +46,7 @@ "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "c34d255f-3dc8-4409-94e0-828ea7ab7793", + "token": "1bed5f78-a309-4049-9805-b5f52a17306d", "troubleshooting_url": null }, "sensitive_values": { @@ -87,7 +87,7 @@ } ], "env": null, - "id": "d62d9086-47e6-44be-88da-d8fc4cb70423", + "id": "23009046-30ce-40d4-81f4-f8e7726335a5", "init_script": "", "metadata": [], "motd_file": null, @@ -104,12 +104,12 @@ "volume": [ { "enabled": false, - "path": "volume2", + "path": "/volume2", "threshold": 50 }, { "enabled": true, - "path": "volume1", + "path": "/volume1", "threshold": 80 } ] @@ -118,7 +118,7 @@ "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "f306a11c-a37e-4086-ab22-6102e255d153", + "token": "3d40e367-25e5-43a3-8b7a-8528b31edbbd", "troubleshooting_url": null }, "sensitive_values": { @@ -148,14 +148,14 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "2f065c5c-cbed-4abe-b30b-942f410b6109", + "agent_id": "9c36f8be-874a-40f6-a395-f37d6d910a83", "command": null, "display_name": null, "external": false, "healthcheck": [], "hidden": false, "icon": null, - "id": "dfd0f1de-9c17-4a69-9a2b-5d3f64f28310", + "id": "c8ff409a-d30d-4e62-a5a1-771f90d712ca", "open_in": "slim-window", "order": null, "share": "owner", @@ -178,7 +178,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "2f065c5c-cbed-4abe-b30b-942f410b6109", + "agent_id": "9c36f8be-874a-40f6-a395-f37d6d910a83", "command": null, "display_name": null, "external": false, @@ -191,7 +191,7 @@ ], "hidden": false, "icon": null, - "id": "70b2d438-0cdd-420a-9fd6-91d019d95a75", + "id": "23c1f02f-cc1a-4e64-b64f-dc2294781c14", "open_in": "slim-window", "order": null, "share": "owner", @@ -216,7 +216,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "6263120086083011264", + "id": "4679211063326469519", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tf b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tf index af041e2da350d..c0aee0d2d97e5 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tf +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } 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..628c97c8563ff 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 @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -51,7 +49,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -60,7 +57,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -173,7 +169,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -184,14 +179,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -217,7 +210,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -228,14 +220,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -378,7 +368,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -521,19 +511,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-01-29T22:48:08Z", + "timestamp": "2025-02-18T10:58:12Z", "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..918dccb57bd11 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 @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "bd762939-8952-4ac7-a9e5-618ec420b518", + "id": "56eebdd7-8348-439a-8ee9-3cd9a4967479", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "f86127e8-2852-4c02-9f07-c376ec04318f", + "token": "bc6f97e3-265d-49e9-b08b-e2bc38736da0", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -70,17 +68,16 @@ } ], "env": null, - "id": "60244093-3c9d-4655-b34f-c4713f7001c1", + "id": "36b8da5b-7a03-4da7-a081-f4ae599d7302", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "cad61f70-873f-440c-ad1c-9d34be2e19c4", + "token": "fa30098e-d8d2-4dad-87ad-3e0a328d2084", "troubleshooting_url": null }, "sensitive_values": { @@ -88,7 +85,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -100,11 +96,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "bd762939-8952-4ac7-a9e5-618ec420b518", + "agent_id": "56eebdd7-8348-439a-8ee9-3cd9a4967479", "cron": null, "display_name": "Foobar Script 1", "icon": null, - "id": "b34b6cd5-e85d-41c8-ad92-eaaceb2404cb", + "id": "29d2f25b-f774-4bb8-9ef4-9aa03a4b3765", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -125,11 +121,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "bd762939-8952-4ac7-a9e5-618ec420b518", + "agent_id": "56eebdd7-8348-439a-8ee9-3cd9a4967479", "cron": null, "display_name": "Foobar Script 2", "icon": null, - "id": "d6f4e24c-3023-417d-b9be-4c83dbdf4802", + "id": "7e7a2376-3028-493c-8ce1-665efd6c5d9c", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -150,11 +146,11 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "60244093-3c9d-4655-b34f-c4713f7001c1", + "agent_id": "36b8da5b-7a03-4da7-a081-f4ae599d7302", "cron": null, "display_name": "Foobar Script 3", "icon": null, - "id": "a19e9106-5eb5-4941-b6ae-72a7724efdf0", + "id": "c6c46bde-7eff-462b-805b-82597a8095d2", "log_path": null, "run_on_start": true, "run_on_stop": false, @@ -175,7 +171,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8576645433635584827", + "id": "3047178084751259009", "triggers": null }, "sensitive_values": {}, @@ -191,7 +187,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "1280398780322015606", + "id": "6983265822377125070", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tf b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tf index 18275b46f8f7f..b9187beb93acf 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tf +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json index 201e09ad767b2..bf0bd8b21d340 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -51,7 +49,6 @@ "motd_file": "/etc/motd", "order": null, "os": "darwin", - "resources_monitoring": [], "shutdown_script": "echo bye bye", "startup_script": null, "startup_script_behavior": "non-blocking", @@ -60,7 +57,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -81,7 +77,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "blocking", @@ -90,7 +85,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -111,7 +105,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -120,7 +113,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -161,7 +153,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -172,14 +163,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -205,7 +194,6 @@ "motd_file": "/etc/motd", "order": null, "os": "darwin", - "resources_monitoring": [], "shutdown_script": "echo bye bye", "startup_script": null, "startup_script_behavior": "non-blocking", @@ -216,14 +204,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -249,7 +235,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "blocking", @@ -260,14 +245,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -293,7 +276,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -304,14 +286,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -343,7 +323,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -451,7 +431,7 @@ ] } }, - "timestamp": "2025-01-29T22:48:01Z", + "timestamp": "2025-02-18T10:58:12Z", "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..71987deb178cc 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "215a9369-35c9-4abe-b1c0-3eb3ab1c1922", + "id": "f65fcb62-ef69-44e8-b8eb-56224c9e9d6f", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "3fdd733c-b02e-4d81-a032-7c8d7ee3dcd8", + "token": "57047ef7-1433-4938-a604-4dd2812b1039", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -70,17 +68,16 @@ } ], "env": null, - "id": "b79acfba-d148-4940-80aa-0c72c037a3ed", + "id": "d366a56f-2899-4e96-b0a1-3e97ac9bd834", "init_script": "", "metadata": [], "motd_file": "/etc/motd", "order": null, "os": "darwin", - "resources_monitoring": [], "shutdown_script": "echo bye bye", "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "e841a152-a794-4b05-9818-95e7440d402d", + "token": "59a6c328-d6ac-450d-a507-de6c14cb16d0", "troubleshooting_url": null }, "sensitive_values": { @@ -88,7 +85,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -114,17 +110,16 @@ } ], "env": null, - "id": "4e863395-523b-443a-83c2-ab27e42a06b2", + "id": "907bbf6b-fa77-4138-a348-ef5d0fb98b15", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "blocking", - "token": "ee0a5e1d-879e-4bff-888e-6cf94533f0bd", + "token": "7f0bb618-c82a-491b-891a-6d9f3abeeca0", "troubleshooting_url": "https://coder.com/troubleshoot" }, "sensitive_values": { @@ -132,7 +127,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -158,17 +152,16 @@ } ], "env": null, - "id": "611c43f5-fa8f-4641-9b5c-a58a8945caa1", + "id": "e9b11e47-0238-4915-9539-ac06617f3398", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "2d2669c7-6385-4ce8-8948-e4b24db45132", + "token": "102a2043-9a42-4490-b0b4-c4fb215552e0", "troubleshooting_url": null }, "sensitive_values": { @@ -176,7 +169,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -188,7 +180,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "5237006672454822031", + "id": "2948336473894256689", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tf b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tf index c7c4f9968b5c3..c52f4a58b36f4 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tf +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json index d5d555e057751..3f18f84cf30ec 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -154,7 +152,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -165,14 +162,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -322,7 +317,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -445,7 +440,7 @@ ] } ], - "timestamp": "2025-01-29T22:48:10Z", + "timestamp": "2025-02-18T10:58:12Z", "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..9a21887d3ed4b 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,17 +26,16 @@ } ], "env": null, - "id": "cae4d590-8332-45b6-9453-e0151ca4f219", + "id": "e7f1e434-ad52-4175-b8d1-4fab9fbe7891", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "6db086ba-440b-4e66-8803-80e021cda61a", + "token": "da1c4966-5bb7-459e-8b7e-ce1cf189e49d", "troubleshooting_url": null }, "sensitive_values": { @@ -44,7 +43,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -56,14 +54,14 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "cae4d590-8332-45b6-9453-e0151ca4f219", + "agent_id": "e7f1e434-ad52-4175-b8d1-4fab9fbe7891", "command": null, "display_name": null, "external": false, "healthcheck": [], "hidden": false, "icon": null, - "id": "64803468-4ec4-49fe-beb7-e65eaf8e01ca", + "id": "41882acb-ad8c-4436-a756-e55160e2eba7", "open_in": "slim-window", "order": null, "share": "owner", @@ -86,7 +84,7 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "cae4d590-8332-45b6-9453-e0151ca4f219", + "agent_id": "e7f1e434-ad52-4175-b8d1-4fab9fbe7891", "command": null, "display_name": null, "external": false, @@ -99,7 +97,7 @@ ], "hidden": false, "icon": null, - "id": "df3f07ab-1796-41c9-8e7d-b957dca031d4", + "id": "28fb460e-746b-47b9-8c88-fc546f2ca6c4", "open_in": "slim-window", "order": null, "share": "owner", @@ -124,14 +122,14 @@ "provider_name": "registry.terraform.io/coder/coder", "schema_version": 1, "values": { - "agent_id": "cae4d590-8332-45b6-9453-e0151ca4f219", + "agent_id": "e7f1e434-ad52-4175-b8d1-4fab9fbe7891", "command": null, "display_name": null, "external": false, "healthcheck": [], "hidden": false, "icon": null, - "id": "fdb06774-4140-42ef-989b-12b98254b27c", + "id": "2751d89f-6c41-4b50-9982-9270ba0660b0", "open_in": "slim-window", "order": null, "share": "owner", @@ -154,7 +152,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8206837964247342986", + "id": "1493563047742372481", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tf b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tf index b316db7c3cdf1..b88a672f0047a 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tf +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } 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..078f6a63738f8 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 @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -30,7 +30,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -41,7 +40,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } }, @@ -147,7 +145,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -160,7 +157,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -169,7 +165,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } } @@ -290,7 +285,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -431,7 +426,7 @@ ] } ], - "timestamp": "2025-01-29T22:48:14Z", + "timestamp": "2025-02-18T10:58:12Z", "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..79b8ec551eb4d 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 @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "b3257d67-247c-4fc6-92a8-fc997501a0e1", + "id": "febc1e16-503f-42c3-b1ab-b067d172a860", "init_script": "", "metadata": [ { @@ -41,11 +41,10 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "ac3563fb-3069-4919-b076-6687c765772b", + "token": "2b609454-ea6a-4ec8-ba03-d305712894d1", "troubleshooting_url": null }, "sensitive_values": { @@ -55,7 +54,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } }, @@ -70,7 +68,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "fcd81afa-64ad-45e3-b000-31d1b19df922", + "id": "0ea63fbe-3e81-4c34-9edc-c2b1ddc62c46", "item": [ { "is_null": false, @@ -85,7 +83,7 @@ "value": "" } ], - "resource_id": "8033209281634385030" + "resource_id": "856574543079218847" }, "sensitive_values": { "item": [ @@ -109,7 +107,7 @@ "daily_cost": 20, "hide": true, "icon": "/icon/server.svg", - "id": "186819f3-a92f-4785-9ee4-d79f57711f63", + "id": "2a367f6b-b055-425c-bdc0-7c63cafdc146", "item": [ { "is_null": false, @@ -118,7 +116,7 @@ "value": "world" } ], - "resource_id": "8033209281634385030" + "resource_id": "856574543079218847" }, "sensitive_values": { "item": [ @@ -138,7 +136,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8033209281634385030", + "id": "856574543079218847", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tf b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tf index cd46057ce8526..eb9f2eff89877 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tf +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json index fd252c9adb16e..f3f97e8b96897 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -30,7 +30,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -41,7 +40,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } }, @@ -134,7 +132,6 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -147,7 +144,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -156,7 +152,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } } @@ -255,7 +250,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -383,7 +378,7 @@ ] } ], - "timestamp": "2025-01-29T22:48:12Z", + "timestamp": "2025-02-18T10:58: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 a0838cc561888..5089c0b42e3e7 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -26,7 +26,7 @@ } ], "env": null, - "id": "066d91d2-860a-4a44-9443-9eaf9315729b", + "id": "bf7c9d15-6b61-4012-9cd8-10ba7ca9a4d8", "init_script": "", "metadata": [ { @@ -41,11 +41,10 @@ "motd_file": null, "order": null, "os": "linux", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "9b6cc6dd-0e02-489f-b651-7a01804c406f", + "token": "91d4aa20-db80-4404-a68c-a19abeb4a5b9", "troubleshooting_url": null }, "sensitive_values": { @@ -55,7 +54,6 @@ "metadata": [ {} ], - "resources_monitoring": [], "token": true } }, @@ -70,7 +68,7 @@ "daily_cost": 29, "hide": true, "icon": "/icon/server.svg", - "id": "fa791d91-9718-420e-9fa8-7a02e7af1563", + "id": "b96f5efa-fe45-4a6a-9bd2-70e2063b7b2a", "item": [ { "is_null": false, @@ -97,7 +95,7 @@ "value": "squirrel" } ], - "resource_id": "2710066198333857753" + "resource_id": "978725577783936679" }, "sensitive_values": { "item": [ @@ -120,7 +118,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "2710066198333857753", + "id": "978725577783936679", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tf b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tf index 82e7a6f95694e..fc684a6e583ee 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tf +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } 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..46ac62ce6f09e 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 @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -71,7 +69,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -82,14 +79,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -118,7 +113,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -135,7 +130,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "e8485920-025a-4c2c-b018-722f61b64347", + "id": "b106fb5a-0ab1-4530-8cc0-9ff9a515dff4", "mutable": false, "name": "Example", "option": null, @@ -162,7 +157,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "6156655b-f893-4eba-914e-e87414f4bf7e", + "id": "5b1c2605-c7a4-4248-bf92-b761e36e0111", "mutable": false, "name": "Sample", "option": null, @@ -185,7 +180,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -268,7 +263,7 @@ ] } }, - "timestamp": "2025-01-29T22:48:18Z", + "timestamp": "2025-02-18T10:58:12Z", "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..bade7edb803c5 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 @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4b774ce8-1e9f-4721-8a14-05efd3eb2dab", + "id": "3f56c659-fe68-47c3-9765-cd09abe69de7", "mutable": false, "name": "Example", "option": null, @@ -44,7 +44,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "447ae720-c046-452e-8d2c-1b5d4060b798", + "id": "2ecde94b-399a-43c7-b50a-3603895aff83", "mutable": false, "name": "Sample", "option": null, @@ -80,17 +80,16 @@ } ], "env": null, - "id": "b8d637c2-a19c-479c-b3e2-374f15ce37c3", + "id": "a2171da1-5f68-446f-97e3-1c2755552840", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "52ce8a0d-12c9-40b5-9f86-dc6240b98d5f", + "token": "a986f085-2697-4d95-a431-6545716ca36b", "troubleshooting_url": null }, "sensitive_values": { @@ -98,7 +97,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -110,7 +108,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "769369130050936586", + "id": "5482122353677678043", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf index c05e8d5d4ae32..8067c0fa9337c 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } 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..1f7a216dc7a3f 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 @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -71,7 +69,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -82,14 +79,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -118,7 +113,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -135,7 +130,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "30116bcb-f109-4807-be06-666a60b6cbb2", + "id": "65767637-5ffa-400f-be3f-f03868bd7070", "mutable": true, "name": "number_example", "option": null, @@ -162,7 +157,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "755395f4-d163-4b90-a8f4-e7ae24e17dd0", + "id": "d8ee017a-1a92-43f2-aaa8-483573c08485", "mutable": false, "name": "number_example_max", "option": null, @@ -201,7 +196,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "dec9fa47-a252-4eb7-868b-10d0fe7bad57", + "id": "1516f72d-71aa-4ae8-95b5-4dbcf999e173", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -240,7 +235,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "57107f82-107b-484d-8491-0787f051dca7", + "id": "720ff4a2-4f26-42d5-a0f8-4e5c92b3133e", "mutable": false, "name": "number_example_min", "option": null, @@ -279,7 +274,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "c21a61f4-26e0-49bb-99c8-56240433c21b", + "id": "395bcef8-1f59-4a4f-b104-f0c4b6686193", "mutable": false, "name": "number_example_min_max", "option": null, @@ -318,7 +313,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4894f5cc-f4e6-4a86-bdfa-36c9d3f8f1a3", + "id": "29b2943d-e736-4635-a553-097ebe51e7ec", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -353,7 +348,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "null": { "name": "null", @@ -550,7 +545,7 @@ ] } }, - "timestamp": "2025-01-29T22:48:20Z", + "timestamp": "2025-02-18T10:58:12Z", "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..1580f18bb97d8 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 @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": true, "icon": null, - "id": "9b5bb411-bfe5-471a-8f2d-9fcc8c17b616", + "id": "35958620-8fa6-479e-b2aa-19202d594b03", "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": "518c5dad-6069-4c24-8e0b-1ee75a52da3b", "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": "050653a6-301b-4916-a871-32d007e1294d", "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": "4704cc0b-6c9d-422d-ba21-c488d780619e", "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": "a8575ac7-8cf3-4deb-a716-ab5a31467e0b", "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": "1efc1290-5939-401c-8287-7b8d6724cdb6", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -248,17 +248,16 @@ } ], "env": null, - "id": "81170f06-8f49-43fb-998f-dc505a29632c", + "id": "356b8996-c71d-479a-b161-ac3828a1831e", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "f8433068-1acc-4225-94c0-725f86cdc002", + "token": "27611e1a-9de5-433b-81e4-cbd9f92dfe06", "troubleshooting_url": null }, "sensitive_values": { @@ -266,7 +265,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -278,7 +276,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "3641782836917385715", + "id": "7456139785400247293", "triggers": null }, "sensitive_values": {}, diff --git a/provisioner/terraform/testdata/rich-parameters/external-module/child-external-module/main.tf b/provisioner/terraform/testdata/rich-parameters/external-module/child-external-module/main.tf index ac6f4c621a9d0..e8afbbf917fb5 100644 --- a/provisioner/terraform/testdata/rich-parameters/external-module/child-external-module/main.tf +++ b/provisioner/terraform/testdata/rich-parameters/external-module/child-external-module/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } docker = { source = "kreuzwerker/docker" diff --git a/provisioner/terraform/testdata/rich-parameters/external-module/main.tf b/provisioner/terraform/testdata/rich-parameters/external-module/main.tf index 55e942ec24e1f..0cf81d0162d07 100644 --- a/provisioner/terraform/testdata/rich-parameters/external-module/main.tf +++ b/provisioner/terraform/testdata/rich-parameters/external-module/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } docker = { source = "kreuzwerker/docker" diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tf b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tf index fc85769c8e9cc..24582eac30a5d 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tf +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tf @@ -2,7 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.22.0" + version = ">=2.0.0" } } } diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json index 387be7249d0ef..e6b5b1cab49dd 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json @@ -1,6 +1,6 @@ { "format_version": "1.2", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "planned_values": { "root_module": { "resources": [ @@ -21,7 +21,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -30,7 +29,6 @@ "sensitive_values": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -71,7 +69,6 @@ "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -82,14 +79,12 @@ "id": true, "init_script": true, "metadata": [], - "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], - "resources_monitoring": [], "token": true } } @@ -118,7 +113,7 @@ ], "prior_state": { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -135,7 +130,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "72f11f9b-8c7f-4e4a-a207-f080b114862b", + "id": "14d20380-9100-4218-afca-15d066dec134", "mutable": false, "name": "Example", "option": [ @@ -179,7 +174,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "b154b8a7-d31f-46f7-b876-e5bfdf50950c", + "id": "fec66abe-d831-4095-8520-8a654ccf309a", "mutable": false, "name": "number_example", "option": null, @@ -206,7 +201,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "8199f88e-8b73-4385-bbb2-315182f753ef", + "id": "9e6cbf84-b49c-4c24-ad71-91195269ec84", "mutable": false, "name": "number_example_max_zero", "option": null, @@ -245,7 +240,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "110c995d-46d7-4277-8f57-a3d3d42733c3", + "id": "5fbb470c-3814-4706-8fa6-c8c7e0f04c19", "mutable": false, "name": "number_example_min_max", "option": null, @@ -284,7 +279,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "e7a1f991-48a8-44c5-8a5c-597db8539cb7", + "id": "3790d994-f401-4e98-ad73-70b6f4e577d2", "mutable": false, "name": "number_example_min_zero", "option": null, @@ -323,7 +318,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "27d12cdf-da7e-466b-907a-4824920305da", + "id": "26b3faa6-2eda-45f0-abbe-f4aba303f7cc", "mutable": false, "name": "Sample", "option": null, @@ -354,7 +349,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "1242389a-5061-482a-8274-410174fb3fc0", + "id": "6027c1aa-dae9-48d9-90f2-b66151bf3129", "mutable": true, "name": "First parameter from module", "option": null, @@ -381,7 +376,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "72418f70-4e3c-400f-9a7d-bf3467598deb", + "id": "62262115-184d-4e14-a756-bedb553405a9", "mutable": true, "name": "Second parameter from module", "option": null, @@ -413,7 +408,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "9b4b60d8-21bb-4d52-910a-536355e9a85f", + "id": "9ced5a2a-0e83-44fe-8088-6db4df59c15e", "mutable": true, "name": "First parameter from child module", "option": null, @@ -440,7 +435,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "4edca123-07bf-4409-ad40-ed26f93beb5f", + "id": "f9564821-9614-4931-b760-2b942d59214a", "mutable": true, "name": "Second parameter from child module", "option": null, @@ -468,7 +463,7 @@ "coder": { "name": "coder", "full_name": "registry.terraform.io/coder/coder", - "version_constraint": "0.22.0" + "version_constraint": ">= 2.0.0" }, "module.this_is_external_module:docker": { "name": "docker", @@ -793,7 +788,7 @@ } } }, - "timestamp": "2025-01-29T22:48:16Z", + "timestamp": "2025-02-18T10:58:12Z", "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..e83a026c81717 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json @@ -1,6 +1,6 @@ { "format_version": "1.0", - "terraform_version": "1.9.8", + "terraform_version": "1.10.5", "values": { "root_module": { "resources": [ @@ -17,7 +17,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "7298c15e-11c8-4a9e-a2ef-044dbc44d519", + "id": "bfd26633-f683-494b-8f71-1697c81488c3", "mutable": false, "name": "Example", "option": [ @@ -61,7 +61,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "a0dda000-20cb-42a7-9f83-1a1de0876e48", + "id": "53a78857-abc2-4447-8329-cc12e160aaba", "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": "2ac0c3b2-f97f-47ad-beda-54264ba69422", "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": "3b06ad67-0ab3-434c-b934-81e409e21565", "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": "6f7c9117-36e4-47d5-8f23-a4e495a62895", "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": "5311db13-4521-4566-aac1-c70db8976ba5", "mutable": false, "name": "Sample", "option": null, @@ -241,17 +241,16 @@ } ], "env": null, - "id": "c5c402bd-215b-487f-862f-eca25fe88a72", + "id": "2d891d31-82ac-4fdd-b922-25c1dfac956c", "init_script": "", "metadata": [], "motd_file": null, "order": null, "os": "windows", - "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", - "token": "b70d10f3-90bc-4abd-8cd9-b11da843954a", + "token": "6942a4c6-24f6-42b5-bcc7-d3e26d00d950", "troubleshooting_url": null }, "sensitive_values": { @@ -259,7 +258,6 @@ {} ], "metadata": [], - "resources_monitoring": [], "token": true } }, @@ -271,7 +269,7 @@ "provider_name": "registry.terraform.io/hashicorp/null", "schema_version": 0, "values": { - "id": "8544034527967282476", + "id": "6111468857109842799", "triggers": null }, "sensitive_values": {}, @@ -296,7 +294,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "68ae438d-7194-4f5b-adeb-9c74059d9888", + "id": "1adeea93-ddc4-4dd8-b328-e167161bbe84", "mutable": true, "name": "First parameter from module", "option": null, @@ -323,7 +321,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "32f0f7f3-26a5-4023-a4e6-d9436cfe8cb4", + "id": "4bb326d9-cf43-4947-b26c-bb668a9f7a80", "mutable": true, "name": "Second parameter from module", "option": null, @@ -355,7 +353,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "5235636a-3319-47ae-8879-b62f9ee9c5aa", + "id": "a2b6d1e4-2e77-4eff-a81b-0fe285750824", "mutable": true, "name": "First parameter from child module", "option": null, @@ -382,7 +380,7 @@ "display_name": null, "ephemeral": false, "icon": null, - "id": "54fa94ff-3048-457d-8de2-c182f6287c8d", + "id": "9dac8aaa-ccf6-4c94-90d2-2009bfbbd596", "mutable": true, "name": "Second parameter from child module", "option": null, diff --git a/provisioner/terraform/testdata/version.txt b/provisioner/terraform/testdata/version.txt index 66beabb5795e7..db77e0ee9760a 100644 --- a/provisioner/terraform/testdata/version.txt +++ b/provisioner/terraform/testdata/version.txt @@ -1 +1 @@ -1.9.8 +1.10.5 diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index 30ef6802ed716..f9d2bf6594b08 100644 --- a/scripts/Dockerfile.base +++ b/scripts/Dockerfile.base @@ -26,7 +26,7 @@ RUN apk add --no-cache \ # Terraform was disabled in the edge repo due to a build issue. # https://gitlab.alpinelinux.org/alpine/aports/-/commit/f3e263d94cfac02d594bef83790c280e045eba35 # Using wget for now. Note that busybox unzip doesn't support streaming. -RUN ARCH="$(arch)"; if [ "${ARCH}" == "x86_64" ]; then ARCH="amd64"; elif [ "${ARCH}" == "aarch64" ]; then ARCH="arm64"; fi; wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_${ARCH}.zip" && \ +RUN ARCH="$(arch)"; if [ "${ARCH}" == "x86_64" ]; then ARCH="amd64"; elif [ "${ARCH}" == "aarch64" ]; then ARCH="arm64"; fi; wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.10.5/terraform_1.10.5_linux_${ARCH}.zip" && \ busybox unzip /tmp/terraform.zip -d /usr/local/bin && \ rm -f /tmp/terraform.zip && \ chmod +x /usr/local/bin/terraform && \