Skip to content

Commit 1da8ba7

Browse files
committed
fix integration tests
1 parent d14d6ee commit 1da8ba7

File tree

2 files changed

+12
-33
lines changed

2 files changed

+12
-33
lines changed

integration/integration_test.go

+12-26
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,18 @@ func TestIntegration(t *testing.T) {
7171
name: "test-data-source",
7272
minVersion: "v0.0.0",
7373
expectedOutput: map[string]string{
74-
"provisioner.arch": runtime.GOARCH,
75-
"provisioner.id": `[a-zA-Z0-9-]+`,
76-
"provisioner.os": runtime.GOOS,
77-
"workspace.access_port": `\d+`,
78-
"workspace.access_url": `https?://\D+:\d+`,
79-
"workspace.id": `[a-zA-z0-9-]+`,
80-
"workspace.name": `test-data-source`,
81-
"workspace.owner": `testing`,
82-
"workspace.owner_email": `testing@coder\.com`,
83-
"workspace.owner_groups": `\[\]`,
84-
"workspace.owner_id": `[a-zA-Z0-9]+`,
85-
"workspace.owner_name": `default`,
86-
"workspace.owner_oidc_access_token": `^$`, // TODO: need a test OIDC integration
87-
"workspace.owner_session_token": `[a-zA-Z0-9-]+`,
88-
"workspace.start_count": `1`,
89-
"workspace.template_id": `[a-zA-Z0-9-]+`,
90-
"workspace.template_name": `test-data-source`,
91-
"workspace.template_version": `.+`,
92-
"workspace.transition": `start`,
74+
"provisioner.arch": runtime.GOARCH,
75+
"provisioner.id": `[a-zA-Z0-9-]+`,
76+
"provisioner.os": runtime.GOOS,
77+
"workspace.access_port": `\d+`,
78+
"workspace.access_url": `https?://\D+:\d+`,
79+
"workspace.id": `[a-zA-z0-9-]+`,
80+
"workspace.name": `test-data-source`,
81+
"workspace.start_count": `1`,
82+
"workspace.template_id": `[a-zA-Z0-9-]+`,
83+
"workspace.template_name": `test-data-source`,
84+
"workspace.template_version": `.+`,
85+
"workspace.transition": `start`,
9386
},
9487
},
9588
{
@@ -103,13 +96,6 @@ func TestIntegration(t *testing.T) {
10396
"workspace.access_url": `https?://\D+:\d+`,
10497
"workspace.id": `[a-zA-z0-9-]+`,
10598
"workspace.name": ``,
106-
"workspace.owner": `testing`,
107-
"workspace.owner_email": `testing@coder\.com`,
108-
"workspace.owner_groups": `\[\]`,
109-
"workspace.owner_id": `[a-zA-Z0-9]+`,
110-
"workspace.owner_name": `default`,
111-
"workspace.owner_oidc_access_token": `^$`, // TODO: need a test OIDC integration
112-
"workspace.owner_session_token": `[a-zA-Z0-9-]+`,
11399
"workspace.start_count": `1`,
114100
"workspace.template_id": `[a-zA-Z0-9-]+`,
115101
"workspace.template_name": `workspace-owner`,

integration/workspace-owner/main.tf

-7
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ locals {
2626
"workspace.access_url" : data.coder_workspace.me.access_url,
2727
"workspace.id" : data.coder_workspace.me.id,
2828
"workspace.name" : data.coder_workspace.me.name,
29-
"workspace.owner" : data.coder_workspace.me.owner,
30-
"workspace.owner_email" : data.coder_workspace.me.owner_email,
31-
"workspace.owner_groups" : jsonencode(data.coder_workspace.me.owner_groups),
32-
"workspace.owner_id" : data.coder_workspace.me.owner_id,
33-
"workspace.owner_name" : data.coder_workspace.me.owner_name,
34-
"workspace.owner_oidc_access_token" : data.coder_workspace.me.owner_oidc_access_token,
35-
"workspace.owner_session_token" : data.coder_workspace.me.owner_session_token,
3629
"workspace.start_count" : tostring(data.coder_workspace.me.start_count),
3730
"workspace.template_id" : data.coder_workspace.me.template_id,
3831
"workspace.template_name" : data.coder_workspace.me.template_name,

0 commit comments

Comments
 (0)