Skip to content

Commit be48941

Browse files
johnstcnjohnstcn
committed
chore: remove extraneous provider{} blocks from test cases
1 parent d9feed5 commit be48941

13 files changed

+2
-71
lines changed

‎examples/resources/coder_parameter/resource.tf

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
provider "coder" {}
2-
31
data "coder_parameter" "example" {
42
name = "Region"
53
description = "Specify a region to place your workspace."

‎examples/resources/coder_workspace_tags/resource.tf

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
provider "coder" {}
2-
31
data "coder_parameter" "os_selector" {
42
name = "os_selector"
53
display_name = "Operating System"

‎provider/agent_test.go

-24
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ func TestAgent(t *testing.T) {
2222
IsUnitTest: true,
2323
Steps: []resource.TestStep{{
2424
Config: `
25-
provider "coder" {
26-
url = "https://example.com"
27-
}
2825
resource "coder_agent" "new" {
2926
os = "linux"
3027
arch = "amd64"
@@ -174,9 +171,6 @@ func TestAgent_Instance(t *testing.T) {
174171
IsUnitTest: true,
175172
Steps: []resource.TestStep{{
176173
Config: `
177-
provider "coder" {
178-
url = "https://example.com"
179-
}
180174
resource "coder_agent" "dev" {
181175
os = "linux"
182176
arch = "amd64"
@@ -215,9 +209,6 @@ func TestAgent_Metadata(t *testing.T) {
215209
IsUnitTest: true,
216210
Steps: []resource.TestStep{{
217211
Config: `
218-
provider "coder" {
219-
url = "https://example.com"
220-
}
221212
resource "coder_agent" "dev" {
222213
os = "linux"
223214
arch = "amd64"
@@ -263,9 +254,6 @@ func TestAgent_MetadataDuplicateKeys(t *testing.T) {
263254
IsUnitTest: true,
264255
Steps: []resource.TestStep{{
265256
Config: `
266-
provider "coder" {
267-
url = "https://example.com"
268-
}
269257
resource "coder_agent" "dev" {
270258
os = "linux"
271259
arch = "amd64"
@@ -301,9 +289,6 @@ func TestAgent_DisplayApps(t *testing.T) {
301289
Steps: []resource.TestStep{{
302290
// Test the fields with non-default values.
303291
Config: `
304-
provider "coder" {
305-
url = "https://example.com"
306-
}
307292
resource "coder_agent" "dev" {
308293
os = "linux"
309294
arch = "amd64"
@@ -354,9 +339,6 @@ func TestAgent_DisplayApps(t *testing.T) {
354339
Steps: []resource.TestStep{{
355340
// Test the fields with non-default values.
356341
Config: `
357-
provider "coder" {
358-
url = "https://example.com"
359-
}
360342
resource "coder_agent" "dev" {
361343
os = "linux"
362344
arch = "amd64"
@@ -400,9 +382,6 @@ func TestAgent_DisplayApps(t *testing.T) {
400382
IsUnitTest: true,
401383
Steps: []resource.TestStep{{
402384
Config: `
403-
provider "coder" {
404-
url = "https://example.com"
405-
}
406385
resource "coder_agent" "dev" {
407386
os = "linux"
408387
arch = "amd64"
@@ -446,9 +425,6 @@ func TestAgent_DisplayApps(t *testing.T) {
446425
Steps: []resource.TestStep{{
447426
// Test the fields with non-default values.
448427
Config: `
449-
provider "coder" {
450-
url = "https://example.com"
451-
}
452428
resource "coder_agent" "dev" {
453429
os = "linux"
454430
arch = "amd64"

‎provider/app_test.go

-6
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ func TestApp(t *testing.T) {
2626
IsUnitTest: true,
2727
Steps: []resource.TestStep{{
2828
Config: `
29-
provider "coder" {
30-
}
3129
resource "coder_agent" "dev" {
3230
os = "linux"
3331
arch = "amd64"
@@ -89,7 +87,6 @@ func TestApp(t *testing.T) {
8987
}{{
9088
name: "Valid",
9189
config: `
92-
provider "coder" {}
9390
resource "coder_agent" "dev" {
9491
os = "linux"
9592
arch = "amd64"
@@ -106,7 +103,6 @@ func TestApp(t *testing.T) {
106103
}, {
107104
name: "ConflictsWithSubdomain",
108105
config: `
109-
provider "coder" {}
110106
resource "coder_agent" "dev" {
111107
os = "linux"
112108
arch = "amd64"
@@ -195,8 +191,6 @@ func TestApp(t *testing.T) {
195191
sharingLine = fmt.Sprintf("share = %q", c.value)
196192
}
197193
config := fmt.Sprintf(`
198-
provider "coder" {
199-
}
200194
resource "coder_agent" "dev" {
201195
os = "linux"
202196
arch = "amd64"

‎provider/env_test.go

-8
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ func TestEnv(t *testing.T) {
2222
IsUnitTest: true,
2323
Steps: []resource.TestStep{{
2424
Config: `
25-
provider "coder" {
26-
}
2725
resource "coder_env" "example" {
2826
agent_id = "king"
2927
name = "MESSAGE"
@@ -59,8 +57,6 @@ func TestEnvEmptyValue(t *testing.T) {
5957
IsUnitTest: true,
6058
Steps: []resource.TestStep{{
6159
Config: `
62-
provider "coder" {
63-
}
6460
resource "coder_env" "example" {
6561
agent_id = "king"
6662
name = "MESSAGE"
@@ -95,8 +91,6 @@ func TestEnvBadName(t *testing.T) {
9591
IsUnitTest: true,
9692
Steps: []resource.TestStep{{
9793
Config: `
98-
provider "coder" {
99-
}
10094
resource "coder_env" "example" {
10195
agent_id = ""
10296
name = "bad-name"
@@ -117,8 +111,6 @@ func TestEnvNoName(t *testing.T) {
117111
IsUnitTest: true,
118112
Steps: []resource.TestStep{{
119113
Config: `
120-
provider "coder" {
121-
}
122114
resource "coder_env" "example" {
123115
agent_id = ""
124116
}

‎provider/externalauth_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ func TestExternalAuth(t *testing.T) {
2222
IsUnitTest: true,
2323
Steps: []resource.TestStep{{
2424
Config: `
25-
provider "coder" {
26-
}
2725
data "coder_external_auth" "github" {
2826
id = "github"
2927
}
@@ -54,8 +52,6 @@ func TestOptionalExternalAuth(t *testing.T) {
5452
IsUnitTest: true,
5553
Steps: []resource.TestStep{{
5654
Config: `
57-
provider "coder" {
58-
}
5955
data "coder_external_auth" "github" {
6056
id = "github"
6157
optional = true

‎provider/gitauth_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ func TestGitAuth(t *testing.T) {
2222
IsUnitTest: true,
2323
Steps: []resource.TestStep{{
2424
Config: `
25-
provider "coder" {
26-
}
2725
data "coder_git_auth" "github" {
2826
id = "github"
2927
}

‎provider/metadata_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ func TestMetadata(t *testing.T) {
2121
IsUnitTest: true,
2222
Steps: []resource.TestStep{{
2323
Config: `
24-
provider "coder" {
25-
}
2624
resource "coder_agent" "dev" {
2725
os = "linux"
2826
arch = "amd64"
@@ -103,8 +101,6 @@ func TestMetadataDuplicateKeys(t *testing.T) {
103101
IsUnitTest: true,
104102
Steps: []resource.TestStep{{
105103
Config: `
106-
provider "coder" {
107-
}
108104
resource "coder_agent" "dev" {
109105
os = "linux"
110106
arch = "amd64"

‎provider/provider_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ func TestProviderEmpty(t *testing.T) {
3030
IsUnitTest: true,
3131
Steps: []resource.TestStep{{
3232
Config: `
33-
provider "coder" {}
3433
data "coder_provisioner" "me" {}
3534
data "coder_workspace" "me" {}
3635
data "coder_external_auth" "git" {

‎provider/provisioner_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ func TestProvisioner(t *testing.T) {
2020
IsUnitTest: true,
2121
Steps: []resource.TestStep{{
2222
Config: `
23-
provider "coder" {
24-
}
2523
data "coder_provisioner" "me" {
2624
}`,
2725
Check: func(state *terraform.State) error {

‎provider/script_test.go

-8
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ func TestScript(t *testing.T) {
2222
IsUnitTest: true,
2323
Steps: []resource.TestStep{{
2424
Config: `
25-
provider "coder" {
26-
}
2725
resource "coder_script" "example" {
2826
agent_id = "some id"
2927
display_name = "Hey"
@@ -61,8 +59,6 @@ func TestScriptNeverRuns(t *testing.T) {
6159
IsUnitTest: true,
6260
Steps: []resource.TestStep{{
6361
Config: `
64-
provider "coder" {
65-
}
6662
resource "coder_script" "example" {
6763
agent_id = ""
6864
display_name = "Hey"
@@ -84,8 +80,6 @@ func TestScriptStartBlocksLoginRequiresRunOnStart(t *testing.T) {
8480
IsUnitTest: true,
8581
Steps: []resource.TestStep{{
8682
Config: `
87-
provider "coder" {
88-
}
8983
resource "coder_script" "example" {
9084
agent_id = ""
9185
display_name = "Hey"
@@ -104,8 +98,6 @@ func TestScriptStartBlocksLoginRequiresRunOnStart(t *testing.T) {
10498
IsUnitTest: true,
10599
Steps: []resource.TestStep{{
106100
Config: `
107-
provider "coder" {
108-
}
109101
resource "coder_script" "example" {
110102
agent_id = ""
111103
display_name = "Hey"

‎provider/workspace_tags_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ func TestWorkspaceTags(t *testing.T) {
1919
IsUnitTest: true,
2020
Steps: []resource.TestStep{{
2121
Config: `
22-
provider "coder" {
23-
}
2422
data "coder_parameter" "animal" {
2523
name = "animal"
2624
type = "string"

‎provider/workspace_test.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ func TestWorkspace(t *testing.T) {
2121
t.Setenv("CODER_WORKSPACE_TEMPLATE_ID", "templateID")
2222
t.Setenv("CODER_WORKSPACE_TEMPLATE_NAME", "template123")
2323
t.Setenv("CODER_WORKSPACE_TEMPLATE_VERSION", "v1.2.3")
24+
t.Setenv("CODER_AGENT_URL", "https://example.com:8080")
2425

2526
resource.Test(t, resource.TestCase{
2627
Providers: map[string]*schema.Provider{
@@ -29,9 +30,6 @@ func TestWorkspace(t *testing.T) {
2930
IsUnitTest: true,
3031
Steps: []resource.TestStep{{
3132
Config: `
32-
provider "coder" {
33-
url = "https://example.com:8080"
34-
}
3533
data "coder_workspace" "me" {
3634
}`,
3735
Check: func(state *terraform.State) error {
@@ -67,6 +65,7 @@ func TestWorkspace_UndefinedOwner(t *testing.T) {
6765
t.Setenv("CODER_WORKSPACE_TEMPLATE_ID", "templateID")
6866
t.Setenv("CODER_WORKSPACE_TEMPLATE_NAME", "template123")
6967
t.Setenv("CODER_WORKSPACE_TEMPLATE_VERSION", "v1.2.3")
68+
t.Setenv("CODER_AGENT_URL", "https://example.com:8080")
7069

7170
resource.Test(t, resource.TestCase{
7271
Providers: map[string]*schema.Provider{
@@ -75,9 +74,6 @@ func TestWorkspace_UndefinedOwner(t *testing.T) {
7574
IsUnitTest: true,
7675
Steps: []resource.TestStep{{
7776
Config: `
78-
provider "coder" {
79-
url = "https://example.com:8080"
80-
}
8177
data "coder_workspace" "me" {
8278
}`,
8379
Check: func(state *terraform.State) error {

0 commit comments

Comments
 (0)