diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00fd83ec..3e732956 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.6 + go-version: 1.21.9 - name: Import GPG key id: import_gpg diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5830a500..3f0594b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.21" id: go - name: Check out code into the Go module directory @@ -58,7 +58,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.21" id: go - uses: hashicorp/setup-terraform@v3 @@ -88,7 +88,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.21" id: go - uses: hashicorp/setup-terraform@v3 diff --git a/examples/resources/coder_parameter/resource.tf b/examples/resources/coder_parameter/resource.tf index 4efc3320..57dad58f 100644 --- a/examples/resources/coder_parameter/resource.tf +++ b/examples/resources/coder_parameter/resource.tf @@ -1,5 +1,3 @@ -provider "coder" {} - data "coder_parameter" "example" { name = "Region" description = "Specify a region to place your workspace." diff --git a/examples/resources/coder_workspace_tags/resource.tf b/examples/resources/coder_workspace_tags/resource.tf index 6c26b061..842902dc 100644 --- a/examples/resources/coder_workspace_tags/resource.tf +++ b/examples/resources/coder_workspace_tags/resource.tf @@ -1,5 +1,3 @@ -provider "coder" {} - data "coder_parameter" "os_selector" { name = "os_selector" display_name = "Operating System" diff --git a/go.mod b/go.mod index d3547c72..56dbff10 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/coder/terraform-provider-coder -go 1.20 +go 1.21 + +toolchain go1.21.9 require ( github.com/google/uuid v1.6.0 diff --git a/go.sum b/go.sum index 6aaf23ea..9d7cfb64 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg= github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= @@ -8,22 +10,30 @@ github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJE github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= +github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= +github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= +github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -79,8 +89,11 @@ github.com/hashicorp/terraform-svchost v0.1.1/go.mod h1:mNsjQfZyf/Jhz35v6/0LWcv2 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= @@ -110,6 +123,7 @@ github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -119,7 +133,9 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= +github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= @@ -132,10 +148,12 @@ github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY34Wul7O/MSKey3txpPYyCqVO5ZyceuQJEI= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= @@ -153,6 +171,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -201,5 +220,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/provider/agent_test.go b/provider/agent_test.go index 491e59f9..a7e24849 100644 --- a/provider/agent_test.go +++ b/provider/agent_test.go @@ -22,9 +22,6 @@ func TestAgent(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - url = "https://example.com" - } resource "coder_agent" "new" { os = "linux" arch = "amd64" @@ -174,9 +171,6 @@ func TestAgent_Instance(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - url = "https://example.com" - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -215,9 +209,6 @@ func TestAgent_Metadata(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - url = "https://example.com" - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -263,9 +254,6 @@ func TestAgent_MetadataDuplicateKeys(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - url = "https://example.com" - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -301,9 +289,6 @@ func TestAgent_DisplayApps(t *testing.T) { Steps: []resource.TestStep{{ // Test the fields with non-default values. Config: ` - provider "coder" { - url = "https://example.com" - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -354,9 +339,6 @@ func TestAgent_DisplayApps(t *testing.T) { Steps: []resource.TestStep{{ // Test the fields with non-default values. Config: ` - provider "coder" { - url = "https://example.com" - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -400,9 +382,6 @@ func TestAgent_DisplayApps(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - url = "https://example.com" - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -446,9 +425,6 @@ func TestAgent_DisplayApps(t *testing.T) { Steps: []resource.TestStep{{ // Test the fields with non-default values. Config: ` - provider "coder" { - url = "https://example.com" - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" diff --git a/provider/app_test.go b/provider/app_test.go index f17513e1..9724fe1e 100644 --- a/provider/app_test.go +++ b/provider/app_test.go @@ -26,8 +26,6 @@ func TestApp(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -89,7 +87,6 @@ func TestApp(t *testing.T) { }{{ name: "Valid", config: ` - provider "coder" {} resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -106,7 +103,6 @@ func TestApp(t *testing.T) { }, { name: "ConflictsWithSubdomain", config: ` - provider "coder" {} resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -195,8 +191,6 @@ func TestApp(t *testing.T) { sharingLine = fmt.Sprintf("share = %q", c.value) } config := fmt.Sprintf(` - provider "coder" { - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" diff --git a/provider/env_test.go b/provider/env_test.go index 66925f5e..1109c6c6 100644 --- a/provider/env_test.go +++ b/provider/env_test.go @@ -22,8 +22,6 @@ func TestEnv(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_env" "example" { agent_id = "king" name = "MESSAGE" @@ -59,8 +57,6 @@ func TestEnvEmptyValue(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_env" "example" { agent_id = "king" name = "MESSAGE" @@ -95,8 +91,6 @@ func TestEnvBadName(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_env" "example" { agent_id = "" name = "bad-name" @@ -117,8 +111,6 @@ func TestEnvNoName(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_env" "example" { agent_id = "" } diff --git a/provider/externalauth_test.go b/provider/externalauth_test.go index 826f0a91..6ed8589a 100644 --- a/provider/externalauth_test.go +++ b/provider/externalauth_test.go @@ -22,8 +22,6 @@ func TestExternalAuth(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } data "coder_external_auth" "github" { id = "github" } @@ -54,8 +52,6 @@ func TestOptionalExternalAuth(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } data "coder_external_auth" "github" { id = "github" optional = true diff --git a/provider/gitauth_test.go b/provider/gitauth_test.go index 481d79f5..f08ba226 100644 --- a/provider/gitauth_test.go +++ b/provider/gitauth_test.go @@ -22,8 +22,6 @@ func TestGitAuth(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } data "coder_git_auth" "github" { id = "github" } diff --git a/provider/metadata_test.go b/provider/metadata_test.go index 0243f48d..27974146 100644 --- a/provider/metadata_test.go +++ b/provider/metadata_test.go @@ -21,8 +21,6 @@ func TestMetadata(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" @@ -103,8 +101,6 @@ func TestMetadataDuplicateKeys(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_agent" "dev" { os = "linux" arch = "amd64" diff --git a/provider/provider_test.go b/provider/provider_test.go index c1e3c686..3ff3b4c8 100644 --- a/provider/provider_test.go +++ b/provider/provider_test.go @@ -30,7 +30,6 @@ func TestProviderEmpty(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" {} data "coder_provisioner" "me" {} data "coder_workspace" "me" {} data "coder_external_auth" "git" { diff --git a/provider/provisioner_test.go b/provider/provisioner_test.go index f1521ef9..83295c4a 100644 --- a/provider/provisioner_test.go +++ b/provider/provisioner_test.go @@ -20,8 +20,6 @@ func TestProvisioner(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } data "coder_provisioner" "me" { }`, Check: func(state *terraform.State) error { diff --git a/provider/script_test.go b/provider/script_test.go index 937c6008..fc502dec 100644 --- a/provider/script_test.go +++ b/provider/script_test.go @@ -22,8 +22,6 @@ func TestScript(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_script" "example" { agent_id = "some id" display_name = "Hey" @@ -61,8 +59,6 @@ func TestScriptNeverRuns(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_script" "example" { agent_id = "" display_name = "Hey" @@ -84,8 +80,6 @@ func TestScriptStartBlocksLoginRequiresRunOnStart(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_script" "example" { agent_id = "" display_name = "Hey" @@ -104,8 +98,6 @@ func TestScriptStartBlocksLoginRequiresRunOnStart(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } resource "coder_script" "example" { agent_id = "" display_name = "Hey" diff --git a/provider/workspace_tags_test.go b/provider/workspace_tags_test.go index 2d0f1c49..1dcad8a0 100644 --- a/provider/workspace_tags_test.go +++ b/provider/workspace_tags_test.go @@ -19,8 +19,6 @@ func TestWorkspaceTags(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - } data "coder_parameter" "animal" { name = "animal" type = "string" diff --git a/provider/workspace_test.go b/provider/workspace_test.go index d5866af5..d38bb374 100644 --- a/provider/workspace_test.go +++ b/provider/workspace_test.go @@ -21,6 +21,7 @@ func TestWorkspace(t *testing.T) { t.Setenv("CODER_WORKSPACE_TEMPLATE_ID", "templateID") t.Setenv("CODER_WORKSPACE_TEMPLATE_NAME", "template123") t.Setenv("CODER_WORKSPACE_TEMPLATE_VERSION", "v1.2.3") + t.Setenv("CODER_AGENT_URL", "https://example.com:8080") resource.Test(t, resource.TestCase{ Providers: map[string]*schema.Provider{ @@ -29,9 +30,6 @@ func TestWorkspace(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - url = "https://example.com:8080" - } data "coder_workspace" "me" { }`, Check: func(state *terraform.State) error { @@ -67,6 +65,7 @@ func TestWorkspace_UndefinedOwner(t *testing.T) { t.Setenv("CODER_WORKSPACE_TEMPLATE_ID", "templateID") t.Setenv("CODER_WORKSPACE_TEMPLATE_NAME", "template123") t.Setenv("CODER_WORKSPACE_TEMPLATE_VERSION", "v1.2.3") + t.Setenv("CODER_AGENT_URL", "https://example.com:8080") resource.Test(t, resource.TestCase{ Providers: map[string]*schema.Provider{ @@ -75,9 +74,6 @@ func TestWorkspace_UndefinedOwner(t *testing.T) { IsUnitTest: true, Steps: []resource.TestStep{{ Config: ` - provider "coder" { - url = "https://example.com:8080" - } data "coder_workspace" "me" { }`, Check: func(state *terraform.State) error {