fix: prevent stdlib logging from messing up ssh (#13161)

Fixes https://github.com/coder/coder/issues/13144

(cherry picked from commit 13dd526f11)

.github/actions/setup-tf/action.yaml

@@ -7,5 +7,5 @@ runs:
     - name: Install Terraform
       uses: hashicorp/setup-terraform@v3
       with:
-        terraform_version: 1.5.7
+        terraform_version: 1.7.5
         terraform_wrapper: false

.github/workflows/ci.yaml

@@ -183,6 +183,9 @@ jobs:
       - name: Setup sqlc
         uses: ./.github/actions/setup-sqlc
 
+      - name: Setup Terraform
+        uses: ./.github/actions/setup-tf
+
       - name: go install tools
         run: |
           go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30

.github/workflows/release.yaml

@@ -178,9 +178,9 @@ jobs:
         env:
           EV_SIGNING_CERT: ${{ secrets.EV_SIGNING_CERT }}
 
-      - name: Test migrations from current ref to main
-        run: |
-          make test-migrations
+      # - name: Test migrations from current ref to main
+      #   run: |
+      #     make test-migrations
 
       # Setup GCloud for signing Windows binaries.
       - name: Authenticate to Google Cloud

Makefile

@@ -489,6 +489,7 @@ gen: \
 	coderd/apidoc/swagger.json \
 	.prettierignore.include \
 	.prettierignore \
+	provisioner/terraform/testdata/version \
 	site/.prettierrc.yaml \
 	site/.prettierignore \
 	site/.eslintignore \
@@ -674,6 +675,12 @@ provisioner/terraform/testdata/.gen-golden: $(wildcard provisioner/terraform/tes
 	go test ./provisioner/terraform -run="Test.*Golden$$" -update
 	touch "$@"
 
+provisioner/terraform/testdata/version:
+	if [[ "$(shell cat provisioner/terraform/testdata/version.txt)" != "$(shell terraform version -json | jq -r '.terraform_version')" ]]; then
+		./provisioner/terraform/testdata/generate.sh
+	fi
+.PHONY: provisioner/terraform/testdata/version
+
 scripts/ci-report/testdata/.gen-golden: $(wildcard scripts/ci-report/testdata/*) $(wildcard scripts/ci-report/*.go)
 	go test ./scripts/ci-report -run=TestOutputMatchesGoldenFile -update
 	touch "$@"

cli/server.go

@@ -1441,7 +1441,7 @@ func newProvisionerDaemon(
 
 			connector[string(database.ProvisionerTypeTerraform)] = sdkproto.NewDRPCProvisionerClient(terraformClient)
 		default:
-			return nil, fmt.Errorf("unknown provisioner type %q", provisionerType)
+			return nil, xerrors.Errorf("unknown provisioner type %q", provisionerType)
 		}
 	}
 

cli/ssh.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -79,6 +80,10 @@ func (r *RootCmd) ssh() *serpent.Command {
 			ctx, cancel := context.WithCancel(ctx)
 			defer cancel()
 
+			// Prevent unnecessary logs from the stdlib from messing up the TTY.
+			// See: https://github.com/coder/coder/issues/13144
+			log.SetOutput(io.Discard)
+
 			logger := inv.Logger
 			defer func() {
 				if retErr != nil {

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.5.6
+ARG TERRAFORM_VERSION=1.7.5
 RUN apk update && \
     apk del terraform && \
     curl -LOs https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \

dogfood/Dockerfile

@@ -169,9 +169,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.6.6.
+# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.7.5.
 # Installing the same version here to match.
-RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.6.6/terraform_1.6.6_linux_amd64.zip" && \
+RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_linux_amd64.zip" && \
 		unzip /tmp/terraform.zip -d /usr/local/bin && \
 		rm -f /tmp/terraform.zip && \
 		chmod +x /usr/local/bin/terraform && \

enterprise/tailnet/pgcoord.go

@@ -1485,10 +1485,17 @@ func (h *heartbeats) filter(mappings []mapping) []mapping {
 		ok := m.coordinator == h.self
 		if !ok {
 			_, ok = h.coordinators[m.coordinator]
+			if !ok {
+				// If a mapping exists to a coordinator lost to heartbeats,
+				// still add the mapping as LOST. If a coordinator misses
+				// heartbeats but a client is still connected to it, this may be
+				// the only mapping available for it. Newer mappings will take
+				// precedence.
+				m.kind = proto.CoordinateResponse_PeerUpdate_LOST
+			}
 		}
-		if ok {
-			out = append(out, m)
-		}
+
+		out = append(out, m)
 	}
 	return out
 }

enterprise/tailnet/pgcoord_internal_test.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 	"golang.org/x/xerrors"
@@ -33,9 +34,9 @@ import (
 // make update-golden-files
 var UpdateGoldenFiles = flag.Bool("update", false, "update .golden files")
 
-// TestHeartbeat_Cleanup is internal so that we can overwrite the cleanup period and not wait an hour for the timed
+// TestHeartbeats_Cleanup is internal so that we can overwrite the cleanup period and not wait an hour for the timed
 // cleanup.
-func TestHeartbeat_Cleanup(t *testing.T) {
+func TestHeartbeats_Cleanup(t *testing.T) {
 	t.Parallel()
 
 	ctrl := gomock.NewController(t)
@@ -78,6 +79,41 @@ func TestHeartbeat_Cleanup(t *testing.T) {
 	close(waitForCleanup)
 }
 
+func TestHeartbeats_LostCoordinator_MarkLost(t *testing.T) {
+	t.Parallel()
+
+	ctrl := gomock.NewController(t)
+	mStore := dbmock.NewMockStore(ctrl)
+
+	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
+	defer cancel()
+	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+
+	uut := &heartbeats{
+		ctx:           ctx,
+		logger:        logger,
+		store:         mStore,
+		cleanupPeriod: time.Millisecond,
+		coordinators: map[uuid.UUID]time.Time{
+			uuid.New(): time.Now(),
+		},
+	}
+
+	mpngs := []mapping{{
+		peer:        uuid.New(),
+		coordinator: uuid.New(),
+		updatedAt:   time.Now(),
+		node:        &proto.Node{},
+		kind:        proto.CoordinateResponse_PeerUpdate_NODE,
+	}}
+
+	// Filter should still return the mapping without a coordinator, but marked
+	// as LOST.
+	got := uut.filter(mpngs)
+	require.Len(t, got, 1)
+	assert.Equal(t, proto.CoordinateResponse_PeerUpdate_LOST, got[0].kind)
+}
+
 // TestLostPeerCleanupQueries tests that our SQL queries to clean up lost peers do what we expect,
 // that is, clean up peers and associated tunnels that have been lost for over 24 hours.
 func TestLostPeerCleanupQueries(t *testing.T) {

enterprise/tailnet/pgcoord_test.go

@@ -415,6 +415,52 @@ func TestPGCoordinatorSingle_MissedHeartbeats(t *testing.T) {
 	assertEventuallyLost(ctx, t, store, client.id)
 }
 
+func TestPGCoordinatorSingle_MissedHeartbeats_NoDrop(t *testing.T) {
+	t.Parallel()
+	if !dbtestutil.WillUsePostgres() {
+		t.Skip("test only with postgres")
+	}
+	store, ps := dbtestutil.NewDB(t)
+	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitSuperLong)
+	defer cancel()
+	logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug)
+
+	coordinator, err := tailnet.NewPGCoord(ctx, logger, ps, store)
+	require.NoError(t, err)
+	defer coordinator.Close()
+
+	agentID := uuid.New()
+
+	client := agpltest.NewPeer(ctx, t, coordinator, "client")
+	defer client.Close(ctx)
+	client.AddTunnel(agentID)
+
+	client.UpdateDERP(11)
+
+	// simulate a second coordinator via DB calls only --- our goal is to test
+	// broken heart-beating, so we can't use a real coordinator
+	fCoord2 := &fakeCoordinator{
+		ctx:   ctx,
+		t:     t,
+		store: store,
+		id:    uuid.New(),
+	}
+	// simulate a single heartbeat, the coordinator is healthy
+	fCoord2.heartbeat()
+
+	fCoord2.agentNode(agentID, &agpl.Node{PreferredDERP: 12})
+	// since it's healthy the client should get the new node.
+	client.AssertEventuallyHasDERP(agentID, 12)
+
+	// the heartbeat should then timeout and we'll get sent a LOST update, NOT a
+	// disconnect.
+	client.AssertEventuallyLost(agentID)
+
+	client.Close(ctx)
+
+	assertEventuallyLost(ctx, t, store, client.ID)
+}
+
 func TestPGCoordinatorSingle_SendsHeartbeats(t *testing.T) {
 	t.Parallel()
 	if !dbtestutil.WillUsePostgres() {
@@ -857,6 +903,16 @@ func newTestAgent(t *testing.T, coord agpl.CoordinatorV1, name string, id ...uui
 	return a
 }
 
+func newTestClient(t *testing.T, coord agpl.CoordinatorV1, agentID uuid.UUID, id ...uuid.UUID) *testConn {
+	c := newTestConn(id)
+	go func() {
+		err := coord.ServeClient(c.serverWS, c.id, agentID)
+		assert.NoError(t, err)
+		close(c.closeChan)
+	}()
+	return c
+}
+
 func (c *testConn) close() error {
 	return c.ws.Close()
 }
@@ -902,16 +958,6 @@ func (c *testConn) waitForClose(ctx context.Context, t *testing.T) {
 	}
 }
 
-func newTestClient(t *testing.T, coord agpl.CoordinatorV1, agentID uuid.UUID, id ...uuid.UUID) *testConn {
-	c := newTestConn(id)
-	go func() {
-		err := coord.ServeClient(c.serverWS, c.id, agentID)
-		assert.NoError(t, err)
-		close(c.closeChan)
-	}()
-	return c
-}
-
 func assertEventuallyHasDERPs(ctx context.Context, t *testing.T, c *testConn, expected ...int) {
 	t.Helper()
 	for {

install.sh

@@ -250,7 +250,7 @@ EOF
 main() {
 	MAINLINE=1
 	STABLE=0
-	TERRAFORM_VERSION="1.6.6"
+	TERRAFORM_VERSION="1.7.5"
 
 	if [ "${TRACE-}" ]; then
 		set -x

provisioner/terraform/executor.go

@@ -24,6 +24,8 @@ import (
 	"github.com/coder/coder/v2/provisionersdk/proto"
 )
 
+var version170 = version.Must(version.NewVersion("1.7.0"))
+
 type executor struct {
 	logger     slog.Logger
 	server     *server
@@ -346,8 +348,16 @@ func (e *executor) graph(ctx, killCtx context.Context) (string, error) {
 		return "", ctx.Err()
 	}
 
+	ver, err := e.version(ctx)
+	if err != nil {
+		return "", err
+	}
+	args := []string{"graph"}
+	if ver.GreaterThanOrEqual(version170) {
+		args = append(args, "-type=plan")
+	}
 	var out strings.Builder
-	cmd := exec.CommandContext(killCtx, e.binaryPath, "graph") // #nosec
+	cmd := exec.CommandContext(killCtx, e.binaryPath, args...) // #nosec
 	cmd.Stdout = &out
 	cmd.Dir = e.workdir
 	cmd.Env = e.basicEnv()
@@ -356,7 +366,7 @@ func (e *executor) graph(ctx, killCtx context.Context) (string, error) {
 		slog.F("binary_path", e.binaryPath),
 		slog.F("args", "graph"),
 	)
-	err := cmd.Start()
+	err = cmd.Start()
 	if err != nil {
 		return "", err
 	}

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.6.6"))
+	TerraformVersion = version.Must(version.NewVersion("1.7.5"))
 
 	minTerraformVersion = version.Must(version.NewVersion("1.1.0"))
-	maxTerraformVersion = version.Must(version.NewVersion("1.6.9")) // use .9 to automatically allow patch releases
+	maxTerraformVersion = version.Must(version.NewVersion("1.7.9")) // use .9 to automatically allow patch releases
 
 	terraformMinorVersionMismatch = xerrors.New("Terraform binary minor version mismatch.")
 )

provisioner/terraform/testdata/calling-module/calling-module.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.1"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/calling-module/calling-module.tfplan.dot

@@ -21,4 +21,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/calling-module/calling-module.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -17,11 +17,22 @@
             "connection_timeout": 120,
             "dir": null,
             "env": null,
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
             "troubleshooting_url": null
           },
-          "sensitive_values": {}
+          "sensitive_values": {
+            "display_apps": [],
+            "metadata": []
+          }
         }
       ],
       "child_modules": [
@@ -78,17 +89,29 @@
           "connection_timeout": 120,
           "dir": null,
           "env": null,
+          "login_before_ready": true,
+          "metadata": [],
+          "motd_file": null,
+          "order": null,
           "os": "linux",
+          "shutdown_script": null,
+          "shutdown_script_timeout": 300,
           "startup_script": null,
+          "startup_script_behavior": null,
+          "startup_script_timeout": 300,
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
+          "metadata": [],
           "token": true
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
+          "metadata": [],
           "token": true
         }
       }
@@ -153,7 +176,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.6.1"
+        "version_constraint": "0.22.0"
       },
       "module.module:null": {
         "name": "null",
@@ -236,5 +259,6 @@
       ]
     }
   ],
-  "timestamp": "2023-08-30T19:24:59Z"
+  "timestamp": "2024-05-22T17:02:40Z",
+  "errored": false
 }

provisioner/terraform/testdata/calling-module/calling-module.tfstate.dot

@@ -21,4 +21,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/calling-module/calling-module.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -16,15 +16,36 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "c6fd4a45-dc64-4830-8ff1-9a6c8074fca8",
+            "id": "f26b1d53-799e-4fbb-9fd3-71e60b37eacd",
             "init_script": "",
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
-            "token": "2559767b-afc6-4293-92cf-d57d98bda13a",
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
+            "token": "ce663074-ebea-44cb-b6d1-321f590f7982",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
+            "metadata": [],
             "token": true
           }
         }
@@ -48,7 +69,7 @@
                 "outputs": {
                   "script": ""
                 },
-                "random": "5659889568915200015"
+                "random": "8031375470547649400"
               },
               "sensitive_values": {
                 "inputs": {},
@@ -63,7 +84,7 @@
               "provider_name": "registry.terraform.io/hashicorp/null",
               "schema_version": 0,
               "values": {
-                "id": "4052095409343470524",
+                "id": "3370916843136140681",
                 "triggers": null
               },
               "sensitive_values": {},

provisioner/terraform/testdata/chaining-resources/chaining-resources.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.1"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.dot

@@ -17,4 +17,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -17,11 +17,22 @@
             "connection_timeout": 120,
             "dir": null,
             "env": null,
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
             "troubleshooting_url": null
           },
-          "sensitive_values": {}
+          "sensitive_values": {
+            "display_apps": [],
+            "metadata": []
+          }
         },
         {
           "address": "null_resource.a",
@@ -68,17 +79,29 @@
           "connection_timeout": 120,
           "dir": null,
           "env": null,
+          "login_before_ready": true,
+          "metadata": [],
+          "motd_file": null,
+          "order": null,
           "os": "linux",
+          "shutdown_script": null,
+          "shutdown_script_timeout": 300,
           "startup_script": null,
+          "startup_script_behavior": null,
+          "startup_script_timeout": 300,
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
+          "metadata": [],
           "token": true
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
+          "metadata": [],
           "token": true
         }
       }
@@ -131,7 +154,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.6.1"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -181,5 +204,6 @@
       ]
     }
   },
-  "timestamp": "2023-08-30T19:25:02Z"
+  "timestamp": "2024-05-22T17:02:43Z",
+  "errored": false
 }

provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.dot

@@ -17,4 +17,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -16,15 +16,36 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "9fb263ae-2d96-414f-abfa-7874e73695d2",
+            "id": "9d869fc3-c185-4278-a5d2-873f809a4449",
             "init_script": "",
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
-            "token": "4f391c60-20f9-4d57-906e-92e2f3e1e3c1",
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
+            "token": "418bb1d6-49d8-4340-ac84-ed6991457ff9",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
+            "metadata": [],
             "token": true
           }
         },
@@ -36,7 +57,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "2616597461049838347",
+            "id": "3681188688307687011",
             "triggers": null
           },
           "sensitive_values": {},
@@ -53,7 +74,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "6759504907417146954",
+            "id": "6055360096088266226",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.1"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.dot

@@ -19,4 +19,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -17,11 +17,22 @@
             "connection_timeout": 120,
             "dir": null,
             "env": null,
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
             "troubleshooting_url": null
           },
-          "sensitive_values": {}
+          "sensitive_values": {
+            "display_apps": [],
+            "metadata": []
+          }
         },
         {
           "address": "null_resource.first",
@@ -68,17 +79,29 @@
           "connection_timeout": 120,
           "dir": null,
           "env": null,
+          "login_before_ready": true,
+          "metadata": [],
+          "motd_file": null,
+          "order": null,
           "os": "linux",
+          "shutdown_script": null,
+          "shutdown_script_timeout": 300,
           "startup_script": null,
+          "startup_script_behavior": null,
+          "startup_script_timeout": 300,
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
+          "metadata": [],
           "token": true
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
+          "metadata": [],
           "token": true
         }
       }
@@ -131,7 +154,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.6.1"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -181,5 +204,6 @@
       ]
     }
   },
-  "timestamp": "2023-08-30T19:25:04Z"
+  "timestamp": "2024-05-22T17:02:45Z",
+  "errored": false
 }

provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.dot

@@ -19,4 +19,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -16,15 +16,36 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "56d6f6e2-a7f8-4594-9bc3-044a4fd3b021",
+            "id": "d9c497fe-1dc4-4551-b46d-282f775e9509",
             "init_script": "",
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
-            "token": "715216d1-fca1-4652-9032-d5367072706f",
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
+            "token": "6fa01f69-de93-4610-b942-b787118146f8",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
+            "metadata": [],
             "token": true
           }
         },
@@ -36,7 +57,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "7470209964325643389",
+            "id": "2012753940926517215",
             "triggers": null
           },
           "sensitive_values": {},
@@ -52,7 +73,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "251158623761758523",
+            "id": "2163283012438694669",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.11.2"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.dot

@@ -15,4 +15,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -29,6 +29,7 @@
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -89,6 +90,7 @@
           "login_before_ready": true,
           "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "linux",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -143,7 +145,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.11.2"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -201,5 +203,6 @@
       ]
     }
   },
-  "timestamp": "2023-08-30T19:25:10Z"
+  "timestamp": "2024-05-22T17:02:50Z",
+  "errored": false
 }

provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.dot

@@ -15,4 +15,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -26,18 +26,19 @@
               }
             ],
             "env": null,
-            "id": "ba0faeb0-5a14-4908-946e-360329a8c852",
+            "id": "c55cfcad-5422-46e5-a144-e933660bacd3",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "010c13b9-95aa-4b66-a2ad-5937e467134a",
+            "token": "e170615d-a3a2-4dc4-a65e-4990ceeb79e5",
             "troubleshooting_url": null
           },
           "sensitive_values": {
@@ -56,7 +57,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "7220106781059326067",
+            "id": "3512108359019802900",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/display-apps/display-apps.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.11.2"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/display-apps/display-apps.tfplan.dot

@@ -15,4 +15,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/display-apps/display-apps.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -29,6 +29,7 @@
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -89,6 +90,7 @@
           "login_before_ready": true,
           "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "linux",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -143,7 +145,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.11.2"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -201,5 +203,6 @@
       ]
     }
   },
-  "timestamp": "2023-08-30T19:25:07Z"
+  "timestamp": "2024-05-22T17:02:48Z",
+  "errored": false
 }

provisioner/terraform/testdata/display-apps/display-apps.tfstate.dot

@@ -15,4 +15,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/display-apps/display-apps.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -26,18 +26,19 @@
               }
             ],
             "env": null,
-            "id": "a7b8ff17-66ba-47b4-a4b4-51da1ad835fc",
+            "id": "3fb63a4e-bb0e-4380-9ed9-8b1581943b1f",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "75fc044a-b120-4e86-be94-056cec981bd9",
+            "token": "eb5720a7-91fd-4e37-8085-af3c8205702c",
             "troubleshooting_url": null
           },
           "sensitive_values": {
@@ -56,7 +57,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "4184951391452107661",
+            "id": "2929624824161973000",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.16.0"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.dot

@@ -21,4 +21,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.6.6",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -20,6 +20,7 @@
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -69,6 +70,7 @@
           "login_before_ready": true,
           "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "linux",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -116,7 +118,7 @@
   ],
   "prior_state": {
     "format_version": "1.0",
-    "terraform_version": "1.6.6",
+    "terraform_version": "1.7.5",
     "values": {
       "root_module": {
         "resources": [
@@ -157,7 +159,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.16.0"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -225,6 +227,6 @@
       ]
     }
   },
-  "timestamp": "2024-02-12T23:11:52Z",
+  "timestamp": "2024-05-22T17:02:52Z",
   "errored": false
 }

provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.dot

@@ -21,4 +21,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.6.6",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -54,18 +54,19 @@
               }
             ],
             "env": null,
-            "id": "d1f23602-ef8e-4ecf-aa5a-df8aa476344e",
+            "id": "923df4d0-cf96-4cf8-aaff-426e58927a81",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "90440015-11c8-442b-adba-9f2bd279b5c7",
+            "token": "f5328221-90c7-4056-83b4-7b76d6f46580",
             "troubleshooting_url": null
           },
           "sensitive_values": {
@@ -84,7 +85,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "8183284779544326910",
+            "id": "4621387386750422041",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/generate.sh

@@ -22,11 +22,13 @@ for d in */; do
 	terraform init -upgrade
 	terraform plan -out terraform.tfplan
 	terraform show -json ./terraform.tfplan | jq >"$name".tfplan.json
-	terraform graph >"$name".tfplan.dot
+	terraform graph -type=plan >"$name".tfplan.dot
 	rm terraform.tfplan
 	terraform apply -auto-approve
 	terraform show -json ./terraform.tfstate | jq >"$name".tfstate.json
 	rm terraform.tfstate
-	terraform graph >"$name".tfstate.dot
+	terraform graph -type=plan >"$name".tfstate.dot
 	popd
 done
+
+terraform version -json | jq -r '.terraform_version' >version.txt

provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.13"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfplan.dot

@@ -21,4 +21,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -18,15 +18,21 @@
             "dir": null,
             "env": null,
             "login_before_ready": true,
+            "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
             "startup_script_timeout": 300,
             "troubleshooting_url": null
           },
-          "sensitive_values": {}
+          "sensitive_values": {
+            "display_apps": [],
+            "metadata": []
+          }
         },
         {
           "address": "null_resource.dev",
@@ -62,21 +68,28 @@
           "dir": null,
           "env": null,
           "login_before_ready": true,
+          "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "linux",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
           "startup_script": null,
+          "startup_script_behavior": null,
           "startup_script_timeout": 300,
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
+          "metadata": [],
           "token": true
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
+          "metadata": [],
           "token": true
         }
       }
@@ -105,7 +118,7 @@
   ],
   "prior_state": {
     "format_version": "1.0",
-    "terraform_version": "1.5.5",
+    "terraform_version": "1.7.5",
     "values": {
       "root_module": {
         "resources": [
@@ -144,7 +157,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.6.13"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -209,5 +222,6 @@
       ]
     }
   },
-  "timestamp": "2023-08-30T19:25:13Z"
+  "timestamp": "2024-05-22T17:02:55Z",
+  "errored": false
 }

provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfstate.dot

@@ -21,4 +21,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/git-auth-providers/git-auth-providers.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -42,20 +42,36 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "a8139f31-219b-4ee5-9e64-60d8dd94be27",
+            "id": "48a24332-1a90-48d9-9e03-b4e9f09c6eab",
             "init_script": "",
             "login_before_ready": true,
+            "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "20cdf0ee-2da9-432e-a3ad-674b900ed3c1",
+            "token": "6a2ae93f-3f25-423d-aa97-b2f1c5d9c20b",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
+            "metadata": [],
             "token": true
           }
         },
@@ -67,7 +83,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "8246789295692160686",
+            "id": "8095584601893320918",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/instance-id/instance-id.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.1"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/instance-id/instance-id.tfplan.dot

@@ -17,4 +17,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/instance-id/instance-id.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -17,11 +17,22 @@
             "connection_timeout": 120,
             "dir": null,
             "env": null,
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
             "troubleshooting_url": null
           },
-          "sensitive_values": {}
+          "sensitive_values": {
+            "display_apps": [],
+            "metadata": []
+          }
         },
         {
           "address": "coder_agent_instance.main",
@@ -68,17 +79,29 @@
           "connection_timeout": 120,
           "dir": null,
           "env": null,
+          "login_before_ready": true,
+          "metadata": [],
+          "motd_file": null,
+          "order": null,
           "os": "linux",
+          "shutdown_script": null,
+          "shutdown_script_timeout": 300,
           "startup_script": null,
+          "startup_script_behavior": null,
+          "startup_script_timeout": 300,
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
+          "metadata": [],
           "token": true
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
+          "metadata": [],
           "token": true
         }
       }
@@ -132,7 +155,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.6.1"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -201,5 +224,6 @@
       ]
     }
   ],
-  "timestamp": "2023-08-30T19:25:15Z"
+  "timestamp": "2024-05-22T17:02:57Z",
+  "errored": false
 }

provisioner/terraform/testdata/instance-id/instance-id.tfstate.dot

@@ -17,4 +17,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/instance-id/instance-id.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -16,15 +16,36 @@
             "auth": "google-instance-identity",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "07c39e97-3461-4912-87c6-aab06714fb79",
+            "id": "3bc8e20f-2024-4014-ac11-806e7e1a1e24",
             "init_script": "",
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
-            "token": "4d389c4e-479b-4004-8ad1-b10da989bbdb",
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
+            "token": "6ef0492b-8dbe-4c61-8eb8-a37acb671278",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
+            "metadata": [],
             "token": true
           }
         },
@@ -36,8 +57,8 @@
           "provider_name": "registry.terraform.io/coder/coder",
           "schema_version": 0,
           "values": {
-            "agent_id": "07c39e97-3461-4912-87c6-aab06714fb79",
-            "id": "13ac93bd-54bf-4e93-b2a1-35534139e255",
+            "agent_id": "3bc8e20f-2024-4014-ac11-806e7e1a1e24",
+            "id": "7ba714fa-f2b8-4d33-8987-f67466505033",
             "instance_id": "example"
           },
           "sensitive_values": {},
@@ -53,7 +74,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "8984327635720248545",
+            "id": "4065206823139127011",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.5"
+      version = "0.22.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

provisioner/terraform/testdata/mapped-apps/mapped-apps.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.1"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.dot

@@ -18,4 +18,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -17,11 +17,22 @@
             "connection_timeout": 120,
             "dir": null,
             "env": null,
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
             "troubleshooting_url": null
           },
-          "sensitive_values": {}
+          "sensitive_values": {
+            "display_apps": [],
+            "metadata": []
+          }
         },
         {
           "address": "coder_app.apps[\"app1\"]",
@@ -34,9 +45,11 @@
           "values": {
             "command": null,
             "display_name": "app1",
+            "external": false,
             "healthcheck": [],
             "icon": null,
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app1",
@@ -58,9 +71,11 @@
           "values": {
             "command": null,
             "display_name": "app2",
+            "external": false,
             "healthcheck": [],
             "icon": null,
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app2",
@@ -104,17 +119,29 @@
           "connection_timeout": 120,
           "dir": null,
           "env": null,
+          "login_before_ready": true,
+          "metadata": [],
+          "motd_file": null,
+          "order": null,
           "os": "linux",
+          "shutdown_script": null,
+          "shutdown_script_timeout": 300,
           "startup_script": null,
+          "startup_script_behavior": null,
+          "startup_script_timeout": 300,
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
+          "metadata": [],
           "token": true
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
+          "metadata": [],
           "token": true
         }
       }
@@ -134,9 +161,11 @@
         "after": {
           "command": null,
           "display_name": "app1",
+          "external": false,
           "healthcheck": [],
           "icon": null,
           "name": null,
+          "order": null,
           "relative_path": null,
           "share": "owner",
           "slug": "app1",
@@ -169,9 +198,11 @@
         "after": {
           "command": null,
           "display_name": "app2",
+          "external": false,
           "healthcheck": [],
           "icon": null,
           "name": null,
+          "order": null,
           "relative_path": null,
           "share": "owner",
           "slug": "app2",
@@ -216,7 +247,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.6.1"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -295,5 +326,6 @@
       ]
     }
   ],
-  "timestamp": "2023-08-30T19:25:17Z"
+  "timestamp": "2024-05-22T17:02:59Z",
+  "errored": false
 }

provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.dot

@@ -18,4 +18,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -16,15 +16,36 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "9a8356cf-b5ef-4da0-9b4e-cfeaca1fbfcf",
+            "id": "d8d2ed23-193d-4784-9ce5-7bc0d879bb14",
             "init_script": "",
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
-            "token": "7116ebd2-5205-4427-8cdb-5f86ec819911",
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
+            "token": "0555adfc-e969-4fd2-8cfd-47560bd1b5a3",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
+            "metadata": [],
             "token": true
           }
         },
@@ -37,13 +58,15 @@
           "provider_name": "registry.terraform.io/coder/coder",
           "schema_version": 0,
           "values": {
-            "agent_id": "9a8356cf-b5ef-4da0-9b4e-cfeaca1fbfcf",
+            "agent_id": "d8d2ed23-193d-4784-9ce5-7bc0d879bb14",
             "command": null,
             "display_name": "app1",
+            "external": false,
             "healthcheck": [],
             "icon": null,
-            "id": "8ad9b3c3-0951-4612-adea-5c89ac12642a",
+            "id": "11fa3ff2-d6ba-41ca-b1df-6c98d395c0b8",
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app1",
@@ -66,13 +89,15 @@
           "provider_name": "registry.terraform.io/coder/coder",
           "schema_version": 0,
           "values": {
-            "agent_id": "9a8356cf-b5ef-4da0-9b4e-cfeaca1fbfcf",
+            "agent_id": "d8d2ed23-193d-4784-9ce5-7bc0d879bb14",
             "command": null,
             "display_name": "app2",
+            "external": false,
             "healthcheck": [],
             "icon": null,
-            "id": "b3cbb3eb-62d8-485f-8378-2d2ed751aa38",
+            "id": "cd1a2e37-adbc-49f0-bd99-033c62a1533e",
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app2",
@@ -94,7 +119,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "5757307222275435634",
+            "id": "4490911212417021152",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/multiple-agents/multiple-agents.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.8.3"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.dot

@@ -27,4 +27,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -20,6 +20,7 @@
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -29,6 +30,7 @@
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [],
             "metadata": []
           }
         },
@@ -48,6 +50,7 @@
             "login_before_ready": true,
             "metadata": [],
             "motd_file": "/etc/motd",
+            "order": null,
             "os": "darwin",
             "shutdown_script": "echo bye bye",
             "shutdown_script_timeout": 30,
@@ -57,6 +60,7 @@
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [],
             "metadata": []
           }
         },
@@ -76,6 +80,7 @@
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "windows",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -85,6 +90,7 @@
             "troubleshooting_url": "https://coder.com/troubleshoot"
           },
           "sensitive_values": {
+            "display_apps": [],
             "metadata": []
           }
         },
@@ -104,6 +110,7 @@
             "login_before_ready": false,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -113,6 +120,7 @@
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [],
             "metadata": []
           }
         },
@@ -152,6 +160,7 @@
           "login_before_ready": true,
           "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "linux",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -161,6 +170,7 @@
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
           "metadata": [],
@@ -168,6 +178,7 @@
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
           "metadata": [],
           "token": true
         }
@@ -193,6 +204,7 @@
           "login_before_ready": true,
           "metadata": [],
           "motd_file": "/etc/motd",
+          "order": null,
           "os": "darwin",
           "shutdown_script": "echo bye bye",
           "shutdown_script_timeout": 30,
@@ -202,6 +214,7 @@
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
           "metadata": [],
@@ -209,6 +222,7 @@
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
           "metadata": [],
           "token": true
         }
@@ -234,6 +248,7 @@
           "login_before_ready": true,
           "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "windows",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -243,6 +258,7 @@
           "troubleshooting_url": "https://coder.com/troubleshoot"
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
           "metadata": [],
@@ -250,6 +266,7 @@
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
           "metadata": [],
           "token": true
         }
@@ -275,6 +292,7 @@
           "login_before_ready": false,
           "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "linux",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -284,6 +302,7 @@
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
           "metadata": [],
@@ -291,6 +310,7 @@
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
           "metadata": [],
           "token": true
         }
@@ -323,7 +343,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.8.3"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -440,5 +460,6 @@
       ]
     }
   },
-  "timestamp": "2023-08-30T19:25:20Z"
+  "timestamp": "2024-05-22T17:03:01Z",
+  "errored": false
 }

provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.dot

@@ -27,4 +27,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -16,22 +16,35 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "094d300c-f07a-4357-870f-6ca1fc9154a2",
+            "id": "0ffc6582-b017-404e-b83f-48e4a5ab38bc",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "27bd44bc-0126-4c8d-9b98-8f27619e3656",
+            "token": "b7f0a913-ecb1-4c80-8559-fbcb435d53d0",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
             "metadata": [],
             "token": true
           }
@@ -48,22 +61,35 @@
             "auth": "token",
             "connection_timeout": 1,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "bb844516-2cdd-419c-87e1-d0d3ea69fe78",
+            "id": "1780ae95-844c-4d5c-94fb-6ccfe4a7656d",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [],
             "motd_file": "/etc/motd",
+            "order": null,
             "os": "darwin",
             "shutdown_script": "echo bye bye",
             "shutdown_script_timeout": 30,
             "startup_script": null,
             "startup_script_behavior": "non-blocking",
             "startup_script_timeout": 30,
-            "token": "8a31b688-d3d2-4c22-b37e-c9810b9b329a",
+            "token": "695f8765-3d3d-4da0-9a5a-bb7b1f568bde",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
             "metadata": [],
             "token": true
           }
@@ -80,22 +106,35 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "c6123c01-0543-4102-bdcf-f0ee2a9c1269",
+            "id": "333b7856-24ac-46be-9ae3-e4981b25481d",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "windows",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": "blocking",
             "startup_script_timeout": 300,
-            "token": "64185462-292f-4b75-b350-625326ba596e",
+            "token": "50ddfb93-264f-4f64-8c8d-db7d8d37c0a1",
             "troubleshooting_url": "https://coder.com/troubleshoot"
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
             "metadata": [],
             "token": true
           }
@@ -112,22 +151,35 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "85d0614c-3e44-4f20-b4bf-a015c8dfcaac",
+            "id": "90736626-71c9-4b76-bdfc-f6ce9b3dda05",
             "init_script": "",
             "login_before_ready": false,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "021b1139-fa63-42ba-be1a-85f8456f3c28",
+            "token": "8c4ae7b9-12b7-4a9c-a55a-a98cfb049103",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
             "metadata": [],
             "token": true
           }
@@ -140,7 +192,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "6753149467284740901",
+            "id": "6980014108785645805",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/multiple-apps/multiple-apps.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.1"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.dot

@@ -23,4 +23,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -17,11 +17,22 @@
             "connection_timeout": 120,
             "dir": null,
             "env": null,
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
             "troubleshooting_url": null
           },
-          "sensitive_values": {}
+          "sensitive_values": {
+            "display_apps": [],
+            "metadata": []
+          }
         },
         {
           "address": "coder_app.app1",
@@ -33,9 +44,11 @@
           "values": {
             "command": null,
             "display_name": null,
+            "external": false,
             "healthcheck": [],
             "icon": null,
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app1",
@@ -56,6 +69,7 @@
           "values": {
             "command": null,
             "display_name": null,
+            "external": false,
             "healthcheck": [
               {
                 "interval": 5,
@@ -65,6 +79,7 @@
             ],
             "icon": null,
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app2",
@@ -87,9 +102,11 @@
           "values": {
             "command": null,
             "display_name": null,
+            "external": false,
             "healthcheck": [],
             "icon": null,
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app3",
@@ -133,17 +150,29 @@
           "connection_timeout": 120,
           "dir": null,
           "env": null,
+          "login_before_ready": true,
+          "metadata": [],
+          "motd_file": null,
+          "order": null,
           "os": "linux",
+          "shutdown_script": null,
+          "shutdown_script_timeout": 300,
           "startup_script": null,
+          "startup_script_behavior": null,
+          "startup_script_timeout": 300,
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
+          "metadata": [],
           "token": true
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
+          "metadata": [],
           "token": true
         }
       }
@@ -162,9 +191,11 @@
         "after": {
           "command": null,
           "display_name": null,
+          "external": false,
           "healthcheck": [],
           "icon": null,
           "name": null,
+          "order": null,
           "relative_path": null,
           "share": "owner",
           "slug": "app1",
@@ -196,6 +227,7 @@
         "after": {
           "command": null,
           "display_name": null,
+          "external": false,
           "healthcheck": [
             {
               "interval": 5,
@@ -205,6 +237,7 @@
           ],
           "icon": null,
           "name": null,
+          "order": null,
           "relative_path": null,
           "share": "owner",
           "slug": "app2",
@@ -240,9 +273,11 @@
         "after": {
           "command": null,
           "display_name": null,
+          "external": false,
           "healthcheck": [],
           "icon": null,
           "name": null,
+          "order": null,
           "relative_path": null,
           "share": "owner",
           "slug": "app3",
@@ -287,7 +322,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.6.1"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -410,5 +445,6 @@
       ]
     }
   ],
-  "timestamp": "2023-08-30T19:25:22Z"
+  "timestamp": "2024-05-22T17:03:03Z",
+  "errored": false
 }

provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.dot

@@ -23,4 +23,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -16,15 +16,36 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "c8dab94d-651c-4d9b-a19a-1c067a2976ea",
+            "id": "c950352c-7c4a-41cc-9049-ad07ded85c47",
             "init_script": "",
+            "login_before_ready": true,
+            "metadata": [],
+            "motd_file": null,
+            "order": null,
             "os": "linux",
+            "shutdown_script": null,
+            "shutdown_script_timeout": 300,
             "startup_script": null,
-            "token": "96745539-f607-45f5-aa71-4f70f593ca6a",
+            "startup_script_behavior": null,
+            "startup_script_timeout": 300,
+            "token": "143c3974-49f5-4898-815b-c4044283ebc8",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
+            "metadata": [],
             "token": true
           }
         },
@@ -36,13 +57,15 @@
           "provider_name": "registry.terraform.io/coder/coder",
           "schema_version": 0,
           "values": {
-            "agent_id": "c8dab94d-651c-4d9b-a19a-1c067a2976ea",
+            "agent_id": "c950352c-7c4a-41cc-9049-ad07ded85c47",
             "command": null,
             "display_name": null,
+            "external": false,
             "healthcheck": [],
             "icon": null,
-            "id": "de5959cb-248c-44a0-bd04-9d5f28dfb415",
+            "id": "23135384-0e9f-4efc-b74c-d3e5e878ed67",
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app1",
@@ -64,9 +87,10 @@
           "provider_name": "registry.terraform.io/coder/coder",
           "schema_version": 0,
           "values": {
-            "agent_id": "c8dab94d-651c-4d9b-a19a-1c067a2976ea",
+            "agent_id": "c950352c-7c4a-41cc-9049-ad07ded85c47",
             "command": null,
             "display_name": null,
+            "external": false,
             "healthcheck": [
               {
                 "interval": 5,
@@ -75,8 +99,9 @@
               }
             ],
             "icon": null,
-            "id": "60aaa860-01d1-4d42-804b-2dc689676307",
+            "id": "01e73639-0fd1-4bcb-bd88-d22eb8244627",
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app2",
@@ -100,13 +125,15 @@
           "provider_name": "registry.terraform.io/coder/coder",
           "schema_version": 0,
           "values": {
-            "agent_id": "c8dab94d-651c-4d9b-a19a-1c067a2976ea",
+            "agent_id": "c950352c-7c4a-41cc-9049-ad07ded85c47",
             "command": null,
             "display_name": null,
+            "external": false,
             "healthcheck": [],
             "icon": null,
-            "id": "3455e899-9bf9-4c0e-ac5b-6f861d5541a0",
+            "id": "058c9054-9714-4a5f-9fde-8a451ab58620",
             "name": null,
+            "order": null,
             "relative_path": null,
             "share": "owner",
             "slug": "app3",
@@ -128,7 +155,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "7562947701260361048",
+            "id": "9051436019409847411",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.9.0"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.dot

@@ -20,4 +20,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -23,11 +23,13 @@
                 "display_name": "Process Count",
                 "interval": 5,
                 "key": "process_count",
+                "order": null,
                 "script": "ps -ef | wc -l",
                 "timeout": 1
               }
             ],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -37,6 +39,7 @@
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [],
             "metadata": [
               {}
             ]
@@ -137,11 +140,13 @@
               "display_name": "Process Count",
               "interval": 5,
               "key": "process_count",
+              "order": null,
               "script": "ps -ef | wc -l",
               "timeout": 1
             }
           ],
           "motd_file": null,
+          "order": null,
           "os": "linux",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -151,6 +156,7 @@
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
           "metadata": [
@@ -160,6 +166,7 @@
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
           "metadata": [
             {}
           ],
@@ -283,7 +290,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.9.0"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -424,5 +431,6 @@
       ]
     }
   ],
-  "timestamp": "2023-08-30T19:25:27Z"
+  "timestamp": "2024-05-22T17:03:06Z",
+  "errored": false
 }

provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.dot

@@ -20,4 +20,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -16,8 +16,17 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "4d2791c5-e623-4c79-9c3a-81d70fde0f1d",
+            "id": "8352a117-1250-44ef-bba2-0abdb2a77665",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [
@@ -25,21 +34,26 @@
                 "display_name": "Process Count",
                 "interval": 5,
                 "key": "process_count",
+                "order": 0,
                 "script": "ps -ef | wc -l",
                 "timeout": 1
               }
             ],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "b068b430-4ecb-4116-a103-de3aaa1abd3e",
+            "token": "b46fd197-3be4-42f8-9c47-5a9e71a76ef6",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
             "metadata": [
               {}
             ],
@@ -57,7 +71,7 @@
             "daily_cost": 29,
             "hide": true,
             "icon": "/icon/server.svg",
-            "id": "0a46d060-c676-4324-a016-8dcdc7581d36",
+            "id": "1f7911d4-5b64-4e20-af9b-b6ee2aff602b",
             "item": [
               {
                 "is_null": false,
@@ -72,7 +86,7 @@
                 "value": ""
               }
             ],
-            "resource_id": "6477445272839759515"
+            "resource_id": "7229373774865666851"
           },
           "sensitive_values": {
             "item": [
@@ -96,7 +110,7 @@
             "daily_cost": 20,
             "hide": true,
             "icon": "/icon/server.svg",
-            "id": "77a107bc-073e-4180-9f7f-0e60fc42b6c2",
+            "id": "34fe7a46-2a2f-4628-8946-ef80a7ffdb5e",
             "item": [
               {
                 "is_null": false,
@@ -105,7 +119,7 @@
                 "value": "world"
               }
             ],
-            "resource_id": "6477445272839759515"
+            "resource_id": "7229373774865666851"
           },
           "sensitive_values": {
             "item": [
@@ -125,7 +139,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "6477445272839759515",
+            "id": "7229373774865666851",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/resource-metadata/resource-metadata.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.14.1"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.dot

@@ -1,9 +1,19 @@
-digraph G {
-  rankdir = "RL";
-  node [shape = rect, fontname = "sans-serif"];
-  "coder_agent.main" [label="coder_agent.main"];
-  "coder_metadata.about_info" [label="coder_metadata.about_info"];
-  "null_resource.about" [label="null_resource.about"];
-  "coder_metadata.about_info" -> "null_resource.about";
-  "null_resource.about" -> "coder_agent.main";
+digraph {
+	compound = "true"
+	newrank = "true"
+	subgraph "root" {
+		"[root] coder_agent.main (expand)" [label = "coder_agent.main", shape = "box"]
+		"[root] coder_metadata.about_info (expand)" [label = "coder_metadata.about_info", shape = "box"]
+		"[root] null_resource.about (expand)" [label = "null_resource.about", shape = "box"]
+		"[root] provider[\"registry.terraform.io/coder/coder\"]" [label = "provider[\"registry.terraform.io/coder/coder\"]", shape = "diamond"]
+		"[root] provider[\"registry.terraform.io/hashicorp/null\"]" [label = "provider[\"registry.terraform.io/hashicorp/null\"]", shape = "diamond"]
+		"[root] coder_agent.main (expand)" -> "[root] provider[\"registry.terraform.io/coder/coder\"]"
+		"[root] coder_metadata.about_info (expand)" -> "[root] null_resource.about (expand)"
+		"[root] null_resource.about (expand)" -> "[root] coder_agent.main (expand)"
+		"[root] null_resource.about (expand)" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"]"
+		"[root] provider[\"registry.terraform.io/coder/coder\"] (close)" -> "[root] coder_metadata.about_info (expand)"
+		"[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)" -> "[root] null_resource.about (expand)"
+		"[root] root" -> "[root] provider[\"registry.terraform.io/coder/coder\"] (close)"
+		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
+	}
 }

provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.7.1-dev",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -29,6 +29,7 @@
               }
             ],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -132,6 +133,7 @@
             }
           ],
           "motd_file": null,
+          "order": null,
           "os": "linux",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -253,7 +255,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.14.1"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -381,6 +383,6 @@
       ]
     }
   ],
-  "timestamp": "2024-02-08T11:45:52Z",
+  "timestamp": "2024-05-22T17:03:05Z",
   "errored": false
 }

provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.dot

@@ -1,9 +1,19 @@
-digraph G {
-  rankdir = "RL";
-  node [shape = rect, fontname = "sans-serif"];
-  "coder_agent.main" [label="coder_agent.main"];
-  "coder_metadata.about_info" [label="coder_metadata.about_info"];
-  "null_resource.about" [label="null_resource.about"];
-  "coder_metadata.about_info" -> "null_resource.about";
-  "null_resource.about" -> "coder_agent.main";
+digraph {
+	compound = "true"
+	newrank = "true"
+	subgraph "root" {
+		"[root] coder_agent.main (expand)" [label = "coder_agent.main", shape = "box"]
+		"[root] coder_metadata.about_info (expand)" [label = "coder_metadata.about_info", shape = "box"]
+		"[root] null_resource.about (expand)" [label = "null_resource.about", shape = "box"]
+		"[root] provider[\"registry.terraform.io/coder/coder\"]" [label = "provider[\"registry.terraform.io/coder/coder\"]", shape = "diamond"]
+		"[root] provider[\"registry.terraform.io/hashicorp/null\"]" [label = "provider[\"registry.terraform.io/hashicorp/null\"]", shape = "diamond"]
+		"[root] coder_agent.main (expand)" -> "[root] provider[\"registry.terraform.io/coder/coder\"]"
+		"[root] coder_metadata.about_info (expand)" -> "[root] null_resource.about (expand)"
+		"[root] null_resource.about (expand)" -> "[root] coder_agent.main (expand)"
+		"[root] null_resource.about (expand)" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"]"
+		"[root] provider[\"registry.terraform.io/coder/coder\"] (close)" -> "[root] coder_metadata.about_info (expand)"
+		"[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)" -> "[root] null_resource.about (expand)"
+		"[root] root" -> "[root] provider[\"registry.terraform.io/coder/coder\"] (close)"
+		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
+	}
 }

provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.7.1",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -26,7 +26,7 @@
               }
             ],
             "env": null,
-            "id": "90e2f3da-90d8-4cfd-8cfd-6e9c9da29a37",
+            "id": "847150eb-c3b6-497d-9dad-8e62d478cfff",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [
@@ -40,13 +40,14 @@
               }
             ],
             "motd_file": null,
+            "order": null,
             "os": "linux",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "f6f9a6c5-d352-4029-b476-67edfe802806",
+            "token": "a0c4f2f5-cc40-4731-9028-636033229c9c",
             "troubleshooting_url": null
           },
           "sensitive_values": {
@@ -70,7 +71,7 @@
             "daily_cost": 29,
             "hide": true,
             "icon": "/icon/server.svg",
-            "id": "a485c7b2-2b6c-42ab-b6d5-f51b681a5a41",
+            "id": "3feec3a3-6f9e-4cfb-b122-2273e345def0",
             "item": [
               {
                 "is_null": false,
@@ -97,7 +98,7 @@
                 "value": "squirrel"
               }
             ],
-            "resource_id": "5837178340504502573"
+            "resource_id": "160324296641913729"
           },
           "sensitive_values": {
             "item": [
@@ -120,7 +121,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "5837178340504502573",
+            "id": "160324296641913729",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.9.0"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.dot

@@ -21,4 +21,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -20,6 +20,7 @@
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "windows",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -29,6 +30,7 @@
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [],
             "metadata": []
           }
         },
@@ -68,6 +70,7 @@
           "login_before_ready": true,
           "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "windows",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -77,6 +80,7 @@
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
           "metadata": [],
@@ -84,6 +88,7 @@
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
           "metadata": [],
           "token": true
         }
@@ -113,7 +118,7 @@
   ],
   "prior_state": {
     "format_version": "1.0",
-    "terraform_version": "1.5.5",
+    "terraform_version": "1.7.5",
     "values": {
       "root_module": {
         "resources": [
@@ -128,10 +133,9 @@
               "default": null,
               "description": null,
               "display_name": null,
+              "ephemeral": false,
               "icon": null,
-              "id": "245304bd-d7c0-4dc0-b4b2-90a036245af0",
-              "legacy_variable": null,
-              "legacy_variable_name": null,
+              "id": "7fb346d2-b8c2-4f2a-99d1-a8fd54cc479e",
               "mutable": false,
               "name": "Example",
               "option": null,
@@ -156,10 +160,9 @@
               "default": "ok",
               "description": "blah blah",
               "display_name": null,
+              "ephemeral": false,
               "icon": null,
-              "id": "bccaddc6-97f1-48aa-a1c0-3438cc96139d",
-              "legacy_variable": null,
-              "legacy_variable_name": null,
+              "id": "0581cc2a-9e6d-4f04-93a6-88fcbd0757f0",
               "mutable": false,
               "name": "Sample",
               "option": null,
@@ -182,7 +185,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.9.0"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -265,5 +268,6 @@
       ]
     }
   },
-  "timestamp": "2023-08-30T19:25:32Z"
+  "timestamp": "2024-05-22T17:03:11Z",
+  "errored": false
 }

provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.dot

@@ -21,4 +21,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -15,10 +15,9 @@
             "default": null,
             "description": null,
             "display_name": null,
+            "ephemeral": false,
             "icon": null,
-            "id": "20e486cd-35aa-4916-8cbf-c8b6fd235cd1",
-            "legacy_variable": null,
-            "legacy_variable_name": null,
+            "id": "5c9f037b-3cc1-4616-b4ba-9e7322856575",
             "mutable": false,
             "name": "Example",
             "option": null,
@@ -43,10 +42,9 @@
             "default": "ok",
             "description": "blah blah",
             "display_name": null,
+            "ephemeral": false,
             "icon": null,
-            "id": "6c077b3f-ba6c-482b-9232-12a3d4892700",
-            "legacy_variable": null,
-            "legacy_variable_name": null,
+            "id": "71a4bcc8-bbcb-4619-9641-df3bc296f58e",
             "mutable": false,
             "name": "Sample",
             "option": null,
@@ -72,22 +70,35 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "1414c0f9-be31-4efa-b1c9-57ab7c951b97",
+            "id": "327e8ab1-90be-4c87-ac7d-09630ae46827",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "windows",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "712872cf-fde6-4683-91a3-9ad9fc759e14",
+            "token": "794a8a86-3bb9-4b3d-bbea-acff8b513964",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
             "metadata": [],
             "token": true
           }
@@ -100,7 +111,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "9132401905565595068",
+            "id": "3735840255017039964",
             "triggers": null
           },
           "sensitive_values": {},

provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.11.0"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.dot

@@ -33,4 +33,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -20,6 +20,7 @@
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "windows",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
@@ -29,6 +30,7 @@
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [],
             "metadata": []
           }
         },
@@ -68,6 +70,7 @@
           "login_before_ready": true,
           "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "windows",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
@@ -77,6 +80,7 @@
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
           "metadata": [],
@@ -84,6 +88,7 @@
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
           "metadata": [],
           "token": true
         }
@@ -113,7 +118,7 @@
   ],
   "prior_state": {
     "format_version": "1.0",
-    "terraform_version": "1.5.5",
+    "terraform_version": "1.7.5",
     "values": {
       "root_module": {
         "resources": [
@@ -130,7 +135,7 @@
               "display_name": null,
               "ephemeral": true,
               "icon": null,
-              "id": "858cb978-eef0-47e6-b7b8-7f9093303ad9",
+              "id": "1e85f9f5-54c2-4a6b-ba7f-8627386b94b7",
               "mutable": true,
               "name": "number_example",
               "option": null,
@@ -157,7 +162,7 @@
               "display_name": null,
               "ephemeral": false,
               "icon": null,
-              "id": "0add04ee-5c08-4702-b32e-727fc8c3fcd7",
+              "id": "9908f4c5-87f5-496c-9479-d0f7d49f0fdf",
               "mutable": false,
               "name": "number_example_max",
               "option": null,
@@ -196,7 +201,7 @@
               "display_name": null,
               "ephemeral": false,
               "icon": null,
-              "id": "90bc3085-b65d-496a-b52c-2a6bfda1c439",
+              "id": "3f2d0054-0440-4a00-98f6-befa9475a5f4",
               "mutable": false,
               "name": "number_example_max_zero",
               "option": null,
@@ -235,7 +240,7 @@
               "display_name": null,
               "ephemeral": false,
               "icon": null,
-              "id": "2499264c-7fa4-41da-9c78-6b5c86ddfd9c",
+              "id": "29abca17-5bd3-4ae3-9bd3-1e45301fc509",
               "mutable": false,
               "name": "number_example_min",
               "option": null,
@@ -274,7 +279,7 @@
               "display_name": null,
               "ephemeral": false,
               "icon": null,
-              "id": "dd6c2f30-6320-4e4a-ba82-deef628330f1",
+              "id": "95630cc0-8040-4126-92bb-967dbf8eb2ed",
               "mutable": false,
               "name": "number_example_min_max",
               "option": null,
@@ -313,7 +318,7 @@
               "display_name": null,
               "ephemeral": false,
               "icon": null,
-              "id": "8e04ddc9-c245-408d-92b0-dec669259b4a",
+              "id": "c256c60a-fdfe-42f1-bbaa-27880816a7bf",
               "mutable": false,
               "name": "number_example_min_zero",
               "option": null,
@@ -348,7 +353,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.11.0"
+        "version_constraint": "0.22.0"
       },
       "null": {
         "name": "null",
@@ -545,5 +550,6 @@
       ]
     }
   },
-  "timestamp": "2023-08-30T19:25:35Z"
+  "timestamp": "2024-05-22T17:03:12Z",
+  "errored": false
 }

provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.dot

@@ -33,4 +33,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -17,7 +17,7 @@
             "display_name": null,
             "ephemeral": true,
             "icon": null,
-            "id": "3eac44eb-b74f-471e-ae3a-783083f33b58",
+            "id": "f7cabe8c-f091-4ced-bc9b-873f54edf61b",
             "mutable": true,
             "name": "number_example",
             "option": null,
@@ -44,7 +44,7 @@
             "display_name": null,
             "ephemeral": false,
             "icon": null,
-            "id": "b767a52b-0b1d-4bea-a1b1-23180308a25d",
+            "id": "13b33312-d49b-4df3-af89-5d6ec840a6e4",
             "mutable": false,
             "name": "number_example_max",
             "option": null,
@@ -83,7 +83,7 @@
             "display_name": null,
             "ephemeral": false,
             "icon": null,
-            "id": "f6857c45-04cf-47ae-85bc-caab3341ead5",
+            "id": "d5ff002b-d039-42e6-b638-6bc2e3d54c2b",
             "mutable": false,
             "name": "number_example_max_zero",
             "option": null,
@@ -122,7 +122,7 @@
             "display_name": null,
             "ephemeral": false,
             "icon": null,
-            "id": "634a2e89-47c0-4d4b-aed6-b20177c959d5",
+            "id": "f382fcba-2634-44e7-ab26-866228d0679a",
             "mutable": false,
             "name": "number_example_min",
             "option": null,
@@ -161,7 +161,7 @@
             "display_name": null,
             "ephemeral": false,
             "icon": null,
-            "id": "9ae1f0ff-2fe9-460c-97b8-6bb0cb7fb2c7",
+            "id": "7f1c3032-1ed9-4602-80f8-cc84489bafc9",
             "mutable": false,
             "name": "number_example_min_max",
             "option": null,
@@ -200,7 +200,7 @@
             "display_name": null,
             "ephemeral": false,
             "icon": null,
-            "id": "e6951857-18a9-44b8-bc0d-d78375fdf92d",
+            "id": "c474219f-f1e7-4eca-921a-1ace9a8391ee",
             "mutable": false,
             "name": "number_example_min_zero",
             "option": null,
@@ -238,22 +238,35 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "870767c4-6479-414c-aa08-a3f659ea3ec2",
+            "id": "138f6db3-bd8d-4a9a-8e61-abc1fdf3c3af",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "windows",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
             "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "59f08143-3fcb-48d6-a80d-3a87863cd865",
+            "token": "1ef5dec0-3339-4e24-b781-0166cc6a9820",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
             "metadata": [],
             "token": true
           }
@@ -266,7 +279,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "643597385910559727",
+            "id": "5975950266738511043",
             "triggers": null
           },
           "sensitive_values": {},

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.7.0"
+      version = "0.22.0"
     }
     docker = {
       source  = "kreuzwerker/docker"

provisioner/terraform/testdata/rich-parameters/external-module/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.7.0"
+      version = "0.22.0"
     }
     docker = {
       source  = "kreuzwerker/docker"

provisioner/terraform/testdata/rich-parameters/rich-parameters.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.7.0"
+      version = "0.22.0"
     }
   }
 }

provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.dot

@@ -56,4 +56,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.2",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "planned_values": {
     "root_module": {
       "resources": [
@@ -20,14 +20,17 @@
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "windows",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
             "startup_script_timeout": 300,
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [],
             "metadata": []
           }
         },
@@ -67,14 +70,17 @@
           "login_before_ready": true,
           "metadata": [],
           "motd_file": null,
+          "order": null,
           "os": "windows",
           "shutdown_script": null,
           "shutdown_script_timeout": 300,
           "startup_script": null,
+          "startup_script_behavior": null,
           "startup_script_timeout": 300,
           "troubleshooting_url": null
         },
         "after_unknown": {
+          "display_apps": true,
           "id": true,
           "init_script": true,
           "metadata": [],
@@ -82,6 +88,7 @@
         },
         "before_sensitive": false,
         "after_sensitive": {
+          "display_apps": [],
           "metadata": [],
           "token": true
         }
@@ -111,7 +118,7 @@
   ],
   "prior_state": {
     "format_version": "1.0",
-    "terraform_version": "1.5.5",
+    "terraform_version": "1.7.5",
     "values": {
       "root_module": {
         "resources": [
@@ -126,10 +133,9 @@
               "default": null,
               "description": null,
               "display_name": null,
+              "ephemeral": false,
               "icon": null,
-              "id": "67c923e2-cb0c-4955-b7bb-cdb8b7fab8be",
-              "legacy_variable": null,
-              "legacy_variable_name": null,
+              "id": "2be3cd75-c44b-482e-8f78-679067d8e0a4",
               "mutable": false,
               "name": "Example",
               "option": [
@@ -147,15 +153,17 @@
                 }
               ],
               "optional": false,
+              "order": null,
               "type": "string",
-              "validation": null,
+              "validation": [],
               "value": ""
             },
             "sensitive_values": {
               "option": [
                 {},
                 {}
-              ]
+              ],
+              "validation": []
             }
           },
           {
@@ -169,19 +177,21 @@
               "default": "4",
               "description": null,
               "display_name": null,
+              "ephemeral": false,
               "icon": null,
-              "id": "69ab9bf0-dadf-47ed-8486-b38b8d521c67",
-              "legacy_variable": null,
-              "legacy_variable_name": null,
+              "id": "5a2f0407-8f11-4ac8-980d-75f919959f08",
               "mutable": false,
               "name": "number_example",
               "option": null,
               "optional": true,
+              "order": null,
               "type": "number",
-              "validation": null,
+              "validation": [],
               "value": "4"
             },
-            "sensitive_values": {}
+            "sensitive_values": {
+              "validation": []
+            }
           },
           {
             "address": "data.coder_parameter.number_example_max_zero",
@@ -194,20 +204,22 @@
               "default": "-2",
               "description": null,
               "display_name": null,
+              "ephemeral": false,
               "icon": null,
-              "id": "4dcc41e1-8d07-4018-98df-de5fadce5aa3",
-              "legacy_variable": null,
-              "legacy_variable_name": null,
+              "id": "cf4b28cf-ec3c-4f53-ae27-4733a9f7d71a",
               "mutable": false,
               "name": "number_example_max_zero",
               "option": null,
               "optional": true,
+              "order": null,
               "type": "number",
               "validation": [
                 {
                   "error": "",
                   "max": 0,
+                  "max_disabled": false,
                   "min": -3,
+                  "min_disabled": false,
                   "monotonic": "",
                   "regex": ""
                 }
@@ -231,20 +243,22 @@
               "default": "4",
               "description": null,
               "display_name": null,
+              "ephemeral": false,
               "icon": null,
-              "id": "c64e111c-496f-458d-924c-5ee13460f2ee",
-              "legacy_variable": null,
-              "legacy_variable_name": null,
+              "id": "70d63380-2020-4377-ae05-cecb12c0d709",
               "mutable": false,
               "name": "number_example_min_max",
               "option": null,
               "optional": true,
+              "order": null,
               "type": "number",
               "validation": [
                 {
                   "error": "",
                   "max": 6,
+                  "max_disabled": false,
                   "min": 3,
+                  "min_disabled": false,
                   "monotonic": "",
                   "regex": ""
                 }
@@ -268,20 +282,22 @@
               "default": "4",
               "description": null,
               "display_name": null,
+              "ephemeral": false,
               "icon": null,
-              "id": "ecc13f6b-a8bd-423a-8585-ac08882cd25c",
-              "legacy_variable": null,
-              "legacy_variable_name": null,
+              "id": "ec5827c2-2511-4f16-bd85-6249517c9e5b",
               "mutable": false,
               "name": "number_example_min_zero",
               "option": null,
               "optional": true,
+              "order": null,
               "type": "number",
               "validation": [
                 {
                   "error": "",
                   "max": 6,
+                  "max_disabled": false,
                   "min": 0,
+                  "min_disabled": false,
                   "monotonic": "",
                   "regex": ""
                 }
@@ -305,19 +321,21 @@
               "default": "ok",
               "description": "blah blah",
               "display_name": null,
+              "ephemeral": false,
               "icon": null,
-              "id": "ea6bbb0a-fdf5-46b4-8c68-22b59283fa6d",
-              "legacy_variable": null,
-              "legacy_variable_name": null,
+              "id": "eec8845e-4316-450a-a5b7-eaa9567f469a",
               "mutable": false,
               "name": "Sample",
               "option": null,
               "optional": true,
+              "order": null,
               "type": "string",
-              "validation": null,
+              "validation": [],
               "value": "ok"
             },
-            "sensitive_values": {}
+            "sensitive_values": {
+              "validation": []
+            }
           }
         ],
         "child_modules": [
@@ -334,19 +352,21 @@
                   "default": "abcdef",
                   "description": "First parameter from module",
                   "display_name": null,
+                  "ephemeral": false,
                   "icon": null,
-                  "id": "69e9bbe9-114a-43df-a050-a030efb3b89a",
-                  "legacy_variable": null,
-                  "legacy_variable_name": null,
+                  "id": "3b860d24-85ac-4540-b309-9321e732dfc4",
                   "mutable": true,
                   "name": "First parameter from module",
                   "option": null,
                   "optional": true,
+                  "order": null,
                   "type": "string",
-                  "validation": null,
+                  "validation": [],
                   "value": "abcdef"
                 },
-                "sensitive_values": {}
+                "sensitive_values": {
+                  "validation": []
+                }
               },
               {
                 "address": "module.this_is_external_module.data.coder_parameter.second_parameter_from_module",
@@ -359,19 +379,21 @@
                   "default": "ghijkl",
                   "description": "Second parameter from module",
                   "display_name": null,
+                  "ephemeral": false,
                   "icon": null,
-                  "id": "607e122d-a7fd-4200-834f-c24e0e9a12c5",
-                  "legacy_variable": null,
-                  "legacy_variable_name": null,
+                  "id": "b36105e3-9bf1-43c7-a857-078ef1e8f95d",
                   "mutable": true,
                   "name": "Second parameter from module",
                   "option": null,
                   "optional": true,
+                  "order": null,
                   "type": "string",
-                  "validation": null,
+                  "validation": [],
                   "value": "ghijkl"
                 },
-                "sensitive_values": {}
+                "sensitive_values": {
+                  "validation": []
+                }
               }
             ],
             "address": "module.this_is_external_module",
@@ -389,19 +411,21 @@
                       "default": "abcdef",
                       "description": "First parameter from child module",
                       "display_name": null,
+                      "ephemeral": false,
                       "icon": null,
-                      "id": "8cc5d1b7-391f-43ff-91e6-0293724a915b",
-                      "legacy_variable": null,
-                      "legacy_variable_name": null,
+                      "id": "a2bee9f2-8a3c-404c-839b-01b6cd840707",
                       "mutable": true,
                       "name": "First parameter from child module",
                       "option": null,
                       "optional": true,
+                      "order": null,
                       "type": "string",
-                      "validation": null,
+                      "validation": [],
                       "value": "abcdef"
                     },
-                    "sensitive_values": {}
+                    "sensitive_values": {
+                      "validation": []
+                    }
                   },
                   {
                     "address": "module.this_is_external_module.module.this_is_external_child_module.data.coder_parameter.child_second_parameter_from_module",
@@ -414,19 +438,21 @@
                       "default": "ghijkl",
                       "description": "Second parameter from child module",
                       "display_name": null,
+                      "ephemeral": false,
                       "icon": null,
-                      "id": "dfb6a1c4-82fd-47d3-b58c-65beddcd8b0d",
-                      "legacy_variable": null,
-                      "legacy_variable_name": null,
+                      "id": "deb13c45-ed6d-45b6-b6eb-d319143fa8f2",
                       "mutable": true,
                       "name": "Second parameter from child module",
                       "option": null,
                       "optional": true,
+                      "order": null,
                       "type": "string",
-                      "validation": null,
+                      "validation": [],
                       "value": "ghijkl"
                     },
-                    "sensitive_values": {}
+                    "sensitive_values": {
+                      "validation": []
+                    }
                   }
                 ],
                 "address": "module.this_is_external_module.module.this_is_external_child_module"
@@ -442,7 +468,7 @@
       "coder": {
         "name": "coder",
         "full_name": "registry.terraform.io/coder/coder",
-        "version_constraint": "0.7.0"
+        "version_constraint": "0.22.0"
       },
       "module.this_is_external_module:docker": {
         "name": "docker",
@@ -767,5 +793,6 @@
       }
     }
   },
-  "timestamp": "2023-08-30T19:25:30Z"
+  "timestamp": "2024-05-22T17:03:08Z",
+  "errored": false
 }

provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.dot

@@ -56,4 +56,3 @@ digraph {
 		"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
 	}
 }
-

provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json

@@ -1,6 +1,6 @@
 {
   "format_version": "1.0",
-  "terraform_version": "1.5.5",
+  "terraform_version": "1.7.5",
   "values": {
     "root_module": {
       "resources": [
@@ -15,10 +15,9 @@
             "default": null,
             "description": null,
             "display_name": null,
+            "ephemeral": false,
             "icon": null,
-            "id": "3d3a933a-b52b-4b38-bf91-0937615b1b29",
-            "legacy_variable": null,
-            "legacy_variable_name": null,
+            "id": "7fa1e2f7-36a4-49cd-b92a-b3fc8732d359",
             "mutable": false,
             "name": "Example",
             "option": [
@@ -36,15 +35,17 @@
               }
             ],
             "optional": false,
+            "order": null,
             "type": "string",
-            "validation": null,
+            "validation": [],
             "value": ""
           },
           "sensitive_values": {
             "option": [
               {},
               {}
-            ]
+            ],
+            "validation": []
           }
         },
         {
@@ -58,19 +59,21 @@
             "default": "4",
             "description": null,
             "display_name": null,
+            "ephemeral": false,
             "icon": null,
-            "id": "f8b06fc2-f0c6-4483-8d10-d4601dfdd787",
-            "legacy_variable": null,
-            "legacy_variable_name": null,
+            "id": "86a60580-7221-4bab-b229-9cb61bdb56a0",
             "mutable": false,
             "name": "number_example",
             "option": null,
             "optional": true,
+            "order": null,
             "type": "number",
-            "validation": null,
+            "validation": [],
             "value": "4"
           },
-          "sensitive_values": {}
+          "sensitive_values": {
+            "validation": []
+          }
         },
         {
           "address": "data.coder_parameter.number_example_max_zero",
@@ -83,20 +86,22 @@
             "default": "-2",
             "description": null,
             "display_name": null,
+            "ephemeral": false,
             "icon": null,
-            "id": "886575fc-1863-49be-9a7d-125077df0ca5",
-            "legacy_variable": null,
-            "legacy_variable_name": null,
+            "id": "ed6bc6e5-b4ff-48b9-88b0-df5faa74ae66",
             "mutable": false,
             "name": "number_example_max_zero",
             "option": null,
             "optional": true,
+            "order": null,
             "type": "number",
             "validation": [
               {
                 "error": "",
                 "max": 0,
+                "max_disabled": false,
                 "min": -3,
+                "min_disabled": false,
                 "monotonic": "",
                 "regex": ""
               }
@@ -120,20 +125,22 @@
             "default": "4",
             "description": null,
             "display_name": null,
+            "ephemeral": false,
             "icon": null,
-            "id": "feb32685-cfdc-4aed-b8bd-290d7e41822f",
-            "legacy_variable": null,
-            "legacy_variable_name": null,
+            "id": "340b19e1-f651-4321-96b1-7908c2c66914",
             "mutable": false,
             "name": "number_example_min_max",
             "option": null,
             "optional": true,
+            "order": null,
             "type": "number",
             "validation": [
               {
                 "error": "",
                 "max": 6,
+                "max_disabled": false,
                 "min": 3,
+                "min_disabled": false,
                 "monotonic": "",
                 "regex": ""
               }
@@ -157,20 +164,22 @@
             "default": "4",
             "description": null,
             "display_name": null,
+            "ephemeral": false,
             "icon": null,
-            "id": "a5e72ae7-67f8-442c-837e-cce15f49fff0",
-            "legacy_variable": null,
-            "legacy_variable_name": null,
+            "id": "f19c6763-2e55-40dd-9b49-82e9181e5b1b",
             "mutable": false,
             "name": "number_example_min_zero",
             "option": null,
             "optional": true,
+            "order": null,
             "type": "number",
             "validation": [
               {
                 "error": "",
                 "max": 6,
+                "max_disabled": false,
                 "min": 0,
+                "min_disabled": false,
                 "monotonic": "",
                 "regex": ""
               }
@@ -194,19 +203,21 @@
             "default": "ok",
             "description": "blah blah",
             "display_name": null,
+            "ephemeral": false,
             "icon": null,
-            "id": "1dcf470f-25f5-4c1d-a68e-1833f8239591",
-            "legacy_variable": null,
-            "legacy_variable_name": null,
+            "id": "02169810-8080-4dc6-a656-5fbda745659e",
             "mutable": false,
             "name": "Sample",
             "option": null,
             "optional": true,
+            "order": null,
             "type": "string",
-            "validation": null,
+            "validation": [],
             "value": "ok"
           },
-          "sensitive_values": {}
+          "sensitive_values": {
+            "validation": []
+          }
         },
         {
           "address": "coder_agent.dev",
@@ -220,21 +231,35 @@
             "auth": "token",
             "connection_timeout": 120,
             "dir": null,
+            "display_apps": [
+              {
+                "port_forwarding_helper": true,
+                "ssh_helper": true,
+                "vscode": true,
+                "vscode_insiders": false,
+                "web_terminal": true
+              }
+            ],
             "env": null,
-            "id": "126f2d92-9556-4187-be69-5827ba3e7ddd",
+            "id": "42edc650-ddb6-4ed9-9624-7788d60d1507",
             "init_script": "",
             "login_before_ready": true,
             "metadata": [],
             "motd_file": null,
+            "order": null,
             "os": "windows",
             "shutdown_script": null,
             "shutdown_script_timeout": 300,
             "startup_script": null,
+            "startup_script_behavior": null,
             "startup_script_timeout": 300,
-            "token": "e2021a4f-4db5-4e26-8ecd-c4b6c6e79e92",
+            "token": "c767a648-e670-4c6b-a28b-8559033e92a7",
             "troubleshooting_url": null
           },
           "sensitive_values": {
+            "display_apps": [
+              {}
+            ],
             "metadata": [],
             "token": true
           }
@@ -247,7 +272,7 @@
           "provider_name": "registry.terraform.io/hashicorp/null",
           "schema_version": 0,
           "values": {
-            "id": "3170372688900630060",
+            "id": "7506678111935039701",
             "triggers": null
           },
           "sensitive_values": {},
@@ -270,19 +295,21 @@
                 "default": "abcdef",
                 "description": "First parameter from module",
                 "display_name": null,
+                "ephemeral": false,
                 "icon": null,
-                "id": "24874d90-5faf-4574-b54d-01a12e25159d",
-                "legacy_variable": null,
-                "legacy_variable_name": null,
+                "id": "11b1ae03-cf81-4f60-9be1-bd4c0586516d",
                 "mutable": true,
                 "name": "First parameter from module",
                 "option": null,
                 "optional": true,
+                "order": null,
                 "type": "string",
-                "validation": null,
+                "validation": [],
                 "value": "abcdef"
               },
-              "sensitive_values": {}
+              "sensitive_values": {
+                "validation": []
+              }
             },
             {
               "address": "module.this_is_external_module.data.coder_parameter.second_parameter_from_module",
@@ -295,19 +322,21 @@
                 "default": "ghijkl",
                 "description": "Second parameter from module",
                 "display_name": null,
+                "ephemeral": false,
                 "icon": null,
-                "id": "015a8629-347a-43f9-ba79-33d895f3b5b7",
-                "legacy_variable": null,
-                "legacy_variable_name": null,
+                "id": "79d87261-bfda-46ee-958d-7d62252101ad",
                 "mutable": true,
                 "name": "Second parameter from module",
                 "option": null,
                 "optional": true,
+                "order": null,
                 "type": "string",
-                "validation": null,
+                "validation": [],
                 "value": "ghijkl"
               },
-              "sensitive_values": {}
+              "sensitive_values": {
+                "validation": []
+              }
             }
           ],
           "address": "module.this_is_external_module",
@@ -325,19 +354,21 @@
                     "default": "abcdef",
                     "description": "First parameter from child module",
                     "display_name": null,
+                    "ephemeral": false,
                     "icon": null,
-                    "id": "85793115-42a5-4e52-be7b-77dcf337ffb6",
-                    "legacy_variable": null,
-                    "legacy_variable_name": null,
+                    "id": "30c4c518-116a-4591-a571-886101cfcdfa",
                     "mutable": true,
                     "name": "First parameter from child module",
                     "option": null,
                     "optional": true,
+                    "order": null,
                     "type": "string",
-                    "validation": null,
+                    "validation": [],
                     "value": "abcdef"
                   },
-                  "sensitive_values": {}
+                  "sensitive_values": {
+                    "validation": []
+                  }
                 },
                 {
                   "address": "module.this_is_external_module.module.this_is_external_child_module.data.coder_parameter.child_second_parameter_from_module",
@@ -350,19 +381,21 @@
                     "default": "ghijkl",
                     "description": "Second parameter from child module",
                     "display_name": null,
+                    "ephemeral": false,
                     "icon": null,
-                    "id": "7754596b-a8b1-4a64-9ff1-27dd9473924c",
-                    "legacy_variable": null,
-                    "legacy_variable_name": null,
+                    "id": "4c7d9f15-da45-453e-85eb-1d22c9baa54c",
                     "mutable": true,
                     "name": "Second parameter from child module",
                     "option": null,
                     "optional": true,
+                    "order": null,
                     "type": "string",
-                    "validation": null,
+                    "validation": [],
                     "value": "ghijkl"
                   },
-                  "sensitive_values": {}
+                  "sensitive_values": {
+                    "validation": []
+                  }
                 }
               ],
               "address": "module.this_is_external_module.module.this_is_external_child_module"

provisioner/terraform/testdata/version.txt

@@ -0,0 +1 @@
+1.7.5

scripts/Dockerfile.base

@@ -10,7 +10,7 @@ RUN apk add --no-cache \
 		curl \
 		wget \
 		bash \
-		git \
+		git=2.43.4-r0 \
 		openssl \
 		openssh-client && \
 	addgroup \
@@ -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.6.6/terraform_1.6.6_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.7.5/terraform_1.7.5_linux_${ARCH}.zip" && \
 		busybox unzip /tmp/terraform.zip -d /usr/local/bin && \
 		rm -f /tmp/terraform.zip && \
 		chmod +x /usr/local/bin/terraform && \