Merge pull request #68 from coder/stevenmasley/deps

Emyrk · web-flow · commit 923b688a2de5 · 2025-04-09T11:22:21.000-05:00
chore: Update dependency of `terraform-provider-coder`
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/aquasecurity/trivy v0.58.2
 	github.com/coder/guts v1.0.2-0.20250227211802-139809366a22
 	github.com/coder/serpent v0.10.0
-	github.com/coder/terraform-provider-coder/v2 v2.3.1-0.20250407164559-8356ff71938b
+	github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0
 	github.com/coder/websocket v1.8.13
 	github.com/go-chi/chi v4.1.2+incompatible
 	github.com/google/uuid v1.6.0
diff --git a/go.sum b/go.sum
@@ -718,8 +718,8 @@ github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx
 github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0/go.mod h1:5UuS2Ts+nTToAMeOjNlnHFkPahrtDkmpydBen/3wgZc=
 github.com/coder/serpent v0.10.0 h1:ofVk9FJXSek+SmL3yVE3GoArP83M+1tX+H7S4t8BSuM=
 github.com/coder/serpent v0.10.0/go.mod h1:cZFW6/fP+kE9nd/oRkEHJpG6sXCtQ+AX7WMMEHv0Y3Q=
-github.com/coder/terraform-provider-coder/v2 v2.3.1-0.20250407164559-8356ff71938b h1:FTCKE+v4So2jaiBTgXXM7KPv002ayhOGlNSUWaNEGm0=
-github.com/coder/terraform-provider-coder/v2 v2.3.1-0.20250407164559-8356ff71938b/go.mod h1:X28s3rz+aEM5PkBKvk3xcUrQFO2eNPjzRChUg9wb70U=
+github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0 h1:NPt2+FVr+2QJoxrta5ZwyTaxocWMEKdh2WpIumffxfM=
+github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0/go.mod h1:X28s3rz+aEM5PkBKvk3xcUrQFO2eNPjzRChUg9wb70U=
 github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=
 github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
diff --git a/scripts/testdata_version.sh b/scripts/testdata_version.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+# Check if a version argument is provided
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <version_argument>"
+    echo "This script will update the version of the coder provider in all .tf files in the ./testdata/ directory."
+    exit 1
+fi
+
+# Check if the git status is clean in the ./testdata directory
+if ! git diff --quiet -- ./testdata; then
+    echo "Error: Your git status is dirty in the ./testdata directory. Please commit or stash your changes before running this script."
+    exit 1
+fi
+
+VERSION_ARGUMENT=$1
+
+# Find and replace the string in all .tf files in the ./testdata/ directory, excluding any directories with .terraform
+find ./testdata/ -type f -name "*.tf" ! -path "*/.terraform/*" -exec sed -i.bak "/coder = {/{
+    # Capture the entire coder block
+    :a
+    N
+    /}/!ba
+    # Remove any existing version lines
+    s|[ ]*version[ ]*=[^\\n]*\\n||g
+    # Replace the coder block with the new format
+    s|    coder = {\n.*}|    coder = {\n      source = \"coder/coder\"\n      version = \"$VERSION_ARGUMENT\"\n    }|
+}" {} +
+
+# Remove backup files
+find ./testdata/ -type f -name "*.bak" -exec rm {} +
+
+echo "Replacement complete."
diff --git a/testdata/badparam/main.tf b/testdata/badparam/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/conditional/main.tf b/testdata/conditional/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/connections/main.tf b/testdata/connections/main.tf
@@ -11,6 +11,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/count/main.tf b/testdata/count/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     null = {
       source  = "hashicorp/null"
diff --git a/testdata/countsub/main.tf b/testdata/countsub/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/cyclical/main.tf b/testdata/cyclical/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/defexpression/main.tf b/testdata/defexpression/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/testdata/demo/main.tf b/testdata/demo/main.tf
@@ -8,6 +8,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/testdata/demo/modules/base/base.tf b/testdata/demo/modules/base/base.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/demo/modules/deploys/main.tf b/testdata/demo/modules/deploys/main.tf
@@ -4,6 +4,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/demo_flat/jetbrains_ide/main.tf b/testdata/demo_flat/jetbrains_ide/main.tf
@@ -3,8 +3,8 @@ terraform {
 
   required_providers {
     coder = {
-      source  = "coder/coder"
-      version = ">= 0.17"
+      source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     http = {
       source  = "hashicorp/http"
diff --git a/testdata/demo_flat/main.tf b/testdata/demo_flat/main.tf
@@ -8,6 +8,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/testdata/dockerdata/main.tf b/testdata/dockerdata/main.tf
@@ -4,6 +4,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/testdata/dupemodparams/dupe/main.tf b/testdata/dupemodparams/dupe/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/dupemodparams/dupe/nesteddupe/main.tf b/testdata/dupemodparams/dupe/nesteddupe/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/dupemodparams/main.tf b/testdata/dupemodparams/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/dupeparams/main.tf b/testdata/dupeparams/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/dynamicblock/main.tf b/testdata/dynamicblock/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/formtypes/main.tf b/testdata/formtypes/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/groups/main.tf b/testdata/groups/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/http/main.tf b/testdata/http/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/instancelist/main.tf b/testdata/instancelist/main.tf
@@ -6,6 +6,7 @@ terraform {
     }
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/invalid/main.tf b/testdata/invalid/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/manymodules/main.tf b/testdata/manymodules/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/manymodules/one/one.tf b/testdata/manymodules/one/one.tf
@@ -1,7 +1,8 @@
 terraform {
   required_providers {
     coder = {
-      source  = "coder/coder"
+      source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/manymodules/one/onea/onea.tf b/testdata/manymodules/one/onea/onea.tf
@@ -1,7 +1,8 @@
 terraform {
   required_providers {
     coder = {
-      source  = "coder/coder"
+      source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/manymodules/two/two.tf b/testdata/manymodules/two/two.tf
@@ -1,7 +1,8 @@
 terraform {
   required_providers {
     coder = {
-      source  = "coder/coder"
+      source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/module/main.tf b/testdata/module/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/testdata/notstringtag/main.tf b/testdata/notstringtag/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/testdata/paramtags/main.tf b/testdata/paramtags/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/testdata/static/main.tf b/testdata/static/main.tf
@@ -3,6 +3,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/testdata/submodcount/param/main.tf b/testdata/submodcount/param/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/submoduledynamic/main.tf b/testdata/submoduledynamic/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/submoduledynamic/modules/decisions/main.tf b/testdata/submoduledynamic/modules/decisions/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/wordle/main.tf b/testdata/wordle/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }
diff --git a/testdata/wordle/word/main.tf b/testdata/wordle/word/main.tf
@@ -2,6 +2,7 @@ terraform {
   required_providers {
     coder = {
       source = "coder/coder"
+      version = "2.4.0-pre0"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`coder = {`
`4`	`4`	`source = "coder/coder"`
	`5`	`+ version = "2.4.0-pre0"`
`5`	`6`	`}`
`6`	`7`	`}`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ terraform {`
`11`	`11`	`required_providers {`
`12`	`12`	`coder = {`
`13`	`13`	`source = "coder/coder"`
	`14`	`+ version = "2.4.0-pre0"`
`14`	`15`	`}`
`15`	`16`	`}`
`16`	`17`	`}`