Skip to content

Commit e00c3f5

Browse files
johnstcnjohnstcn
committed
expand failing tests
1 parent 14598df commit e00c3f5

File tree

3 files changed

+75
-46
lines changed

3 files changed

+75
-46
lines changed

‎coderd/templateversions_test.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
295295
}
296296
data "coder_parameter" "unrelated" {
297297
name = "unrelated"
298-
type = "string"
299-
default = join("", ["a", "b"])
298+
type = "list(string)"
299+
default = jsonencode(["a", "b"])
300300
}
301301
resource "null_resource" "test" {}`,
302302
},
@@ -316,8 +316,8 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
316316
}
317317
data "coder_parameter" "unrelated" {
318318
name = "unrelated"
319-
type = "string"
320-
default = join("", ["a", "b"])
319+
type = "list(string)"
320+
default = jsonencode(["a", "b"])
321321
}
322322
resource "null_resource" "test" {}
323323
data "coder_workspace_tags" "tags" {
@@ -340,8 +340,8 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
340340
}
341341
data "coder_parameter" "unrelated" {
342342
name = "unrelated"
343-
type = "string"
344-
default = join("", ["a", "b"])
343+
type = "list(string)"
344+
default = jsonencode(["a", "b"])
345345
}
346346
resource "null_resource" "test" {}
347347
data "coder_workspace_tags" "tags" {
@@ -368,8 +368,8 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
368368
}
369369
data "coder_parameter" "unrelated" {
370370
name = "unrelated"
371-
type = "string"
372-
default = join("", ["a", "b"])
371+
type = "list(string)"
372+
default = jsonencode(["a", "b"])
373373
}
374374
resource "null_resource" "test" {}
375375
data "coder_workspace_tags" "tags" {
@@ -397,8 +397,8 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
397397
}
398398
data "coder_parameter" "unrelated" {
399399
name = "unrelated"
400-
type = "string"
401-
default = join("", ["a", "b"])
400+
type = "list(string)"
401+
default = jsonencode(["a", "b"])
402402
}
403403
resource "null_resource" "test" {
404404
name = "foo"
@@ -428,8 +428,8 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
428428
}
429429
data "coder_parameter" "unrelated" {
430430
name = "unrelated"
431-
type = "string"
432-
default = join("", ["a", "b"])
431+
type = "list(string)"
432+
default = jsonencode(["a", "b"])
433433
}
434434
resource "null_resource" "test" {
435435
name = "foo"
@@ -455,8 +455,8 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
455455
`main.tf`: `
456456
data "coder_parameter" "unrelated" {
457457
name = "unrelated"
458-
type = "string"
459-
default = join("", ["a", "b"])
458+
type = "list(string)"
459+
default = jsonencode(["a", "b"])
460460
}
461461
resource "null_resource" "test" {}
462462
data "coder_workspace_tags" "tags" {
@@ -474,8 +474,8 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
474474
`main.tf`: `
475475
data "coder_parameter" "unrelated" {
476476
name = "unrelated"
477-
type = "string"
478-
default = join("", ["a", "b"])
477+
type = "list(string)"
478+
default = jsonencode(["a", "b"])
479479
}
480480
resource "null_resource" "test" {}
481481
data "coder_workspace_tags" "tags" {
@@ -493,8 +493,8 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
493493
`main.tf`: `
494494
data "coder_parameter" "unrelated" {
495495
name = "unrelated"
496-
type = "string"
497-
default = join("", ["a", "b"])
496+
type = "list(string)"
497+
default = jsonencode(["a", "b"])
498498
}
499499
resource "null_resource" "test" {}
500500
data "coder_workspace_tags" "tags" {
@@ -511,10 +511,10 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
511511
files: map[string]string{
512512
`main.tf`: `
513513
data "coder_parameter" "unrelated" {
514-
name = "unrelated"
515-
type = "list(string)"
516-
default = jsonencode(["1", "2", "3", "4"])
517-
}`,
514+
name = "unrelated"
515+
type = "list(string)"
516+
default = jsonencode(["a", "b"])
517+
}`,
518518
},
519519
wantTags: map[string]string{"owner": "", "scope": "organization"},
520520
},

‎enterprise/coderd/workspaces_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,11 @@ func TestWorkspaceTagsTerraform(t *testing.T) {
14121412
provider "coder" {}
14131413
data "coder_workspace" "me" {}
14141414
data "coder_workspace_owner" "me" {}
1415+
data "coder_parameter" "unrelated" {
1416+
name = "unrelated"
1417+
type = "list(string)"
1418+
default = jsonencode(["a", "b"])
1419+
}
14151420
%s
14161421
`
14171422

‎provisioner/terraform/tfparse/tfparse_test.go

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
4949
type = string
5050
default = "us"
5151
}
52-
data "base" "ours" {
53-
all = true
52+
data "coder_parameter" "unrelated" {
53+
name = "unrelated"
54+
type = "list(string)"
55+
default = jsonencode(["a", "b"])
5456
}
5557
data "coder_parameter" "az" {
5658
name = "az"
@@ -71,8 +73,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
7173
type = string
7274
default = "us"
7375
}
74-
data "base" "ours" {
75-
all = true
76+
data "coder_parameter" "unrelated" {
77+
name = "unrelated"
78+
type = "list(string)"
79+
default = jsonencode(["a", "b"])
7680
}
7781
data "coder_parameter" "az" {
7882
name = "az"
@@ -94,8 +98,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
9498
type = string
9599
default = "us"
96100
}
97-
data "base" "ours" {
98-
all = true
101+
data "coder_parameter" "unrelated" {
102+
name = "unrelated"
103+
type = "list(string)"
104+
default = jsonencode(["a", "b"])
99105
}
100106
data "coder_parameter" "az" {
101107
name = "az"
@@ -128,8 +134,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
128134
type = string
129135
default = "${""}${"a"}"
130136
}
131-
data "base" "ours" {
132-
all = true
137+
data "coder_parameter" "unrelated" {
138+
name = "unrelated"
139+
type = "list(string)"
140+
default = jsonencode(["a", "b"])
133141
}
134142
data "coder_parameter" "az" {
135143
name = "az"
@@ -158,8 +166,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
158166
type = string
159167
default = "us"
160168
}
161-
data "base" "ours" {
162-
all = true
169+
data "coder_parameter" "unrelated" {
170+
name = "unrelated"
171+
type = "list(string)"
172+
default = jsonencode(["a", "b"])
163173
}
164174
data "coder_parameter" "az" {
165175
type = string
@@ -195,8 +205,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
195205
type = string
196206
default = "eu"
197207
}
198-
data "base" "ours" {
199-
all = true
208+
data "coder_parameter" "unrelated" {
209+
name = "unrelated"
210+
type = "list(string)"
211+
default = jsonencode(["a", "b"])
200212
}
201213
data "coder_parameter" "az" {
202214
name = "az"
@@ -235,8 +247,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
235247
type = string
236248
default = "us"
237249
}
238-
data "base" "ours" {
239-
all = true
250+
data "coder_parameter" "unrelated" {
251+
name = "unrelated"
252+
type = "list(string)"
253+
default = jsonencode(["a", "b"])
240254
}
241255
data "coder_parameter" "az" {
242256
name = "az"
@@ -263,8 +277,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
263277
type = string
264278
default = "us"
265279
}
266-
data "base" "ours" {
267-
all = true
280+
data "coder_parameter" "unrelated" {
281+
name = "unrelated"
282+
type = "list(string)"
283+
default = jsonencode(["a", "b"])
268284
}
269285
data "coder_parameter" "az" {
270286
name = "az"
@@ -300,8 +316,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
300316
variable "notregion" {
301317
type = string
302318
}
303-
data "base" "ours" {
304-
all = true
319+
data "coder_parameter" "unrelated" {
320+
name = "unrelated"
321+
type = "list(string)"
322+
default = jsonencode(["a", "b"])
305323
}
306324
data "coder_parameter" "az" {
307325
name = "az"
@@ -332,8 +350,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
332350
type = string
333351
default = "us"
334352
}
335-
data "base" "ours" {
336-
all = true
353+
data "coder_parameter" "unrelated" {
354+
name = "unrelated"
355+
type = "list(string)"
356+
default = jsonencode(["a", "b"])
337357
}
338358
data "coder_parameter" "az" {
339359
name = "az"
@@ -368,8 +388,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
368388
type = string
369389
default = "us"
370390
}
371-
data "base" "ours" {
372-
all = true
391+
data "coder_parameter" "unrelated" {
392+
name = "unrelated"
393+
type = "list(string)"
394+
default = jsonencode(["a", "b"])
373395
}
374396
data "coder_parameter" "az" {
375397
name = "az"
@@ -402,8 +424,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
402424
type = string
403425
default = "region.us"
404426
}
405-
data "base" "ours" {
406-
all = true
427+
data "coder_parameter" "unrelated" {
428+
name = "unrelated"
429+
type = "list(string)"
430+
default = jsonencode(["a", "b"])
407431
}
408432
data "coder_parameter" "az" {
409433
name = "az"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy