Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

Commit 72eaf8a

Browse files
johnstcnjohnstcn
authored
Merge pull request #256 from coder/cj/deprecated_owner_fields
chore: remove usage of deprecated fields coder_workspace.owner_*
2 parents c6b457e + 249cb2f commit 72eaf8a

File tree

9 files changed

+48
-29
lines changed

9 files changed

+48
-29
lines changed

‎coder-login/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
coder = {
66
source = "coder/coder"
7-
version = ">= 0.12"
7+
version = ">= 0.23"
88
}
99
}
1010
}
@@ -15,11 +15,12 @@ variable "agent_id" {
1515
}
1616

1717
data "coder_workspace" "me" {}
18+
data "coder_workspace_owner" "me" {}
1819

1920
resource "coder_script" "coder-login" {
2021
agent_id = var.agent_id
2122
script = templatefile("${path.module}/run.sh", {
22-
CODER_USER_TOKEN : data.coder_workspace.me.owner_session_token,
23+
CODER_USER_TOKEN : data.coder_workspace_owner.me.session_token,
2324
CODER_DEPLOYMENT_URL : data.coder_workspace.me.access_url
2425
})
2526
display_name = "Coder Login"

‎git-config/main.test.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ describe("git-config", async () => {
2020
});
2121

2222
const resources = state.resources;
23-
expect(resources).toHaveLength(5);
23+
expect(resources).toHaveLength(6);
2424
expect(resources).toMatchObject([
2525
{ type: "coder_workspace", name: "me" },
26+
{ type: "coder_workspace_owner", name: "me" },
2627
{ type: "coder_env", name: "git_author_email" },
2728
{ type: "coder_env", name: "git_author_name" },
2829
{ type: "coder_env", name: "git_commmiter_email" },
@@ -37,11 +38,12 @@ describe("git-config", async () => {
3738
});
3839

3940
const resources = state.resources;
40-
expect(resources).toHaveLength(7);
41+
expect(resources).toHaveLength(8);
4142
expect(resources).toMatchObject([
4243
{ type: "coder_parameter", name: "user_email" },
4344
{ type: "coder_parameter", name: "username" },
4445
{ type: "coder_workspace", name: "me" },
46+
{ type: "coder_workspace_owner", name: "me" },
4547
{ type: "coder_env", name: "git_author_email" },
4648
{ type: "coder_env", name: "git_author_name" },
4749
{ type: "coder_env", name: "git_commmiter_email" },
@@ -61,9 +63,10 @@ describe("git-config", async () => {
6163
);
6264

6365
const resources = state.resources;
64-
expect(resources).toHaveLength(5);
66+
expect(resources).toHaveLength(6);
6567
expect(resources).toMatchObject([
6668
{ type: "coder_workspace", name: "me" },
69+
{ type: "coder_workspace_owner", name: "me" },
6770
{ type: "coder_env", name: "git_author_email" },
6871
{ type: "coder_env", name: "git_author_name" },
6972
{ type: "coder_env", name: "git_commmiter_email" },
@@ -80,11 +83,12 @@ describe("git-config", async () => {
8083
coder_parameter_order: order.toString(),
8184
});
8285
const resources = state.resources;
83-
expect(resources).toHaveLength(7);
86+
expect(resources).toHaveLength(8);
8487
expect(resources).toMatchObject([
8588
{ type: "coder_parameter", name: "user_email" },
8689
{ type: "coder_parameter", name: "username" },
8790
{ type: "coder_workspace", name: "me" },
91+
{ type: "coder_workspace_owner", name: "me" },
8892
{ type: "coder_env", name: "git_author_email" },
8993
{ type: "coder_env", name: "git_author_name" },
9094
{ type: "coder_env", name: "git_commmiter_email" },
@@ -106,10 +110,11 @@ describe("git-config", async () => {
106110
coder_parameter_order: order.toString(),
107111
});
108112
const resources = state.resources;
109-
expect(resources).toHaveLength(6);
113+
expect(resources).toHaveLength(7);
110114
expect(resources).toMatchObject([
111115
{ type: "coder_parameter", name: "username" },
112116
{ type: "coder_workspace", name: "me" },
117+
{ type: "coder_workspace_owner", name: "me" },
113118
{ type: "coder_env", name: "git_author_email" },
114119
{ type: "coder_env", name: "git_author_name" },
115120
{ type: "coder_env", name: "git_commmiter_email" },

‎git-config/main.tf‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
coder = {
66
source = "coder/coder"
7-
version = ">= 0.22"
7+
version = ">= 0.23"
88
}
99
}
1010
}
@@ -33,6 +33,7 @@ variable "coder_parameter_order" {
3333
}
3434

3535
data "coder_workspace" "me" {}
36+
data "coder_workspace_owner" "me" {}
3637

3738
data "coder_parameter" "user_email" {
3839
count = var.allow_email_change ? 1 : 0
@@ -59,25 +60,25 @@ data "coder_parameter" "username" {
5960
resource "coder_env" "git_author_name" {
6061
agent_id = var.agent_id
6162
name = "GIT_AUTHOR_NAME"
62-
value = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace.me.owner_name, data.coder_workspace.me.owner)
63+
value = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
6364
}
6465

6566
resource "coder_env" "git_commmiter_name" {
6667
agent_id = var.agent_id
6768
name = "GIT_COMMITTER_NAME"
68-
value = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace.me.owner_name, data.coder_workspace.me.owner)
69+
value = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
6970
}
7071

7172
resource "coder_env" "git_author_email" {
7273
agent_id = var.agent_id
7374
name = "GIT_AUTHOR_EMAIL"
74-
value = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace.me.owner_email)
75-
count = data.coder_workspace.me.owner_email != "" ? 1 : 0
75+
value = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace_owner.me.email)
76+
count = data.coder_workspace_owner.me.email != "" ? 1 : 0
7677
}
7778

7879
resource "coder_env" "git_commmiter_email" {
7980
agent_id = var.agent_id
8081
name = "GIT_COMMITTER_EMAIL"
81-
value = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace.me.owner_email)
82-
count = data.coder_workspace.me.owner_email != "" ? 1 : 0
82+
value = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace_owner.me.email)
83+
count = data.coder_workspace_owner.me.email != "" ? 1 : 0
8384
}

‎github-upload-public-key/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
coder = {
66
source = "coder/coder"
7-
version = ">= 0.12"
7+
version = ">= 0.23"
88
}
99
}
1010
}
@@ -27,11 +27,12 @@ variable "github_api_url" {
2727
}
2828

2929
data "coder_workspace" "me" {}
30+
data "coder_workspace_owner" "me" {}
3031

3132
resource "coder_script" "github_upload_public_key" {
3233
agent_id = var.agent_id
3334
script = templatefile("${path.module}/run.sh", {
34-
CODER_OWNER_SESSION_TOKEN : data.coder_workspace.me.owner_session_token,
35+
CODER_OWNER_SESSION_TOKEN : data.coder_workspace_owner.me.session_token,
3536
CODER_ACCESS_URL : data.coder_workspace.me.access_url,
3637
CODER_EXTERNAL_AUTH_ID : var.external_auth_id,
3738
GITHUB_API_URL : var.github_api_url,

‎jfrog-oauth/main.tf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
coder = {
66
source = "coder/coder"
7-
version = ">= 0.12.4"
7+
version = ">= 0.23"
88
}
99
}
1010
}
@@ -68,11 +68,12 @@ EOF
6868

6969
locals {
7070
# The username field to use for artifactory
71-
username = var.username_field == "email" ? data.coder_workspace.me.owner_email : data.coder_workspace.me.owner
71+
username = var.username_field == "email" ? data.coder_workspace_owner.me.email : data.coder_workspace_owner.me.name
7272
jfrog_host = replace(var.jfrog_url, "https://", "")
7373
}
7474

7575
data "coder_workspace" "me" {}
76+
data "coder_workspace_owner" "me" {}
7677

7778
data "coder_external_auth" "jfrog" {
7879
id = var.external_auth_id
@@ -87,7 +88,7 @@ resource "coder_script" "jfrog" {
8788
JFROG_HOST : local.jfrog_host,
8889
JFROG_SERVER_ID : var.jfrog_server_id,
8990
ARTIFACTORY_USERNAME : local.username,
90-
ARTIFACTORY_EMAIL : data.coder_workspace.me.owner_email,
91+
ARTIFACTORY_EMAIL : data.coder_workspace_owner.me.email,
9192
ARTIFACTORY_ACCESS_TOKEN : data.coder_external_auth.jfrog.access_token,
9293
CONFIGURE_CODE_SERVER : var.configure_code_server,
9394
REPOSITORY_NPM : lookup(var.package_managers, "npm", ""),

‎jfrog-token/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ module "jfrog" {
9898
agent_id = coder_agent.example.id
9999
jfrog_url = "https://XXXX.jfrog.io"
100100
artifactory_access_token = var.artifactory_access_token
101-
token_description = "Token for Coder workspace: ${data.coder_workspace.me.owner}/${data.coder_workspace.me.name}"
101+
token_description = "Token for Coder workspace: ${data.coder_workspace_owner.me.name}/${data.coder_workspace.me.name}"
102102
package_managers = {
103103
"npm" : "npm",
104104
"go" : "go",

‎jfrog-token/main.tf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
coder = {
66
source = "coder/coder"
7-
version = ">= 0.12.4"
7+
version = ">= 0.23"
88
}
99
artifactory = {
1010
source = "registry.terraform.io/jfrog/artifactory"
@@ -95,7 +95,7 @@ EOF
9595

9696
locals {
9797
# The username field to use for artifactory
98-
username = var.username_field == "email" ? data.coder_workspace.me.owner_email : data.coder_workspace.me.owner
98+
username = var.username_field == "email" ? data.coder_workspace_owner.me.email : data.coder_workspace_owner.me.name
9999
jfrog_host = replace(var.jfrog_url, "https://", "")
100100
}
101101

@@ -117,6 +117,7 @@ resource "artifactory_scoped_token" "me" {
117117
}
118118

119119
data "coder_workspace" "me" {}
120+
data "coder_workspace_owner" "me" {}
120121

121122
resource "coder_script" "jfrog" {
122123
agent_id = var.agent_id
@@ -127,7 +128,7 @@ resource "coder_script" "jfrog" {
127128
JFROG_HOST : local.jfrog_host,
128129
JFROG_SERVER_ID : var.jfrog_server_id,
129130
ARTIFACTORY_USERNAME : local.username,
130-
ARTIFACTORY_EMAIL : data.coder_workspace.me.owner_email,
131+
ARTIFACTORY_EMAIL : data.coder_workspace_owner.me.email,
131132
ARTIFACTORY_ACCESS_TOKEN : artifactory_scoped_token.me.access_token,
132133
CONFIGURE_CODE_SERVER : var.configure_code_server,
133134
REPOSITORY_NPM : lookup(var.package_managers, "npm", ""),

‎vscode-desktop/main.test.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@ describe("vscode-desktop", async () => {
2121
"vscode://coder.coder-remote/open?owner=default&workspace=default&url=https://mydeployment.coder.com&token=$SESSION_TOKEN",
2222
);
2323

24-
const resources: any = state.resources;
25-
expect(resources[1].instances[0].attributes.order).toBeNull();
24+
const coder_app = state.resources.find(
25+
(res) => res.type == "coder_app" && res.name == "vscode",
26+
);
27+
expect(coder_app).not.toBeNull();
28+
expect(coder_app.instances.length).toBe(1);
29+
expect(coder_app.instances[0].attributes.order).toBeNull();
2630
});
2731

2832
it("adds folder", async () => {
@@ -73,7 +77,11 @@ describe("vscode-desktop", async () => {
7377
order: "22",
7478
});
7579

76-
const resources: any = state.resources;
77-
expect(resources[1].instances[0].attributes.order).toBe(22);
80+
const coder_app = state.resources.find(
81+
(res) => res.type == "coder_app" && res.name == "vscode",
82+
);
83+
expect(coder_app).not.toBeNull();
84+
expect(coder_app.instances.length).toBe(1);
85+
expect(coder_app.instances[0].attributes.order).toBe(22);
7886
});
7987
});

‎vscode-desktop/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
coder = {
66
source = "coder/coder"
7-
version = ">= 0.17"
7+
version = ">= 0.23"
88
}
99
}
1010
}
@@ -33,6 +33,7 @@ variable "order" {
3333
}
3434

3535
data "coder_workspace" "me" {}
36+
data "coder_workspace_owner" "me" {}
3637

3738
resource "coder_app" "vscode" {
3839
agent_id = var.agent_id
@@ -44,7 +45,7 @@ resource "coder_app" "vscode" {
4445
url = join("", [
4546
"vscode://coder.coder-remote/open",
4647
"?owner=",
47-
data.coder_workspace.me.owner,
48+
data.coder_workspace_owner.me.name,
4849
"&workspace=",
4950
data.coder_workspace.me.name,
5051
var.folder != "" ? join("", ["&folder=", var.folder]) : "",

0 commit comments

Comments
 (0)