Skip to content

Commit e176867

Browse files
johnstcnjohnstcn
authored
chore: update deprecated usage of coder_workspace.owner* fields (coder#13390)
Per https://github.com/coder/terraform-provider-coder/releases/tag/v0.23.0 Performs a mechanical rename of existing usage deprecated fields in the latest version of the coder/coder provider. Closes coder#13382
1 parent 7cc96f5 commit e176867

File tree

34 files changed

+186
-157
lines changed

34 files changed

+186
-157
lines changed

‎.github/pr-deployments/template/main.tf

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ provider "kubernetes" {
8686
}
8787

8888
data "coder_workspace" "me" {}
89+
data "coder_workspace_owner" "me" {}
8990

9091
resource "coder_agent" "main" {
9192
os = "linux"
@@ -175,21 +176,21 @@ resource "coder_app" "code-server" {
175176

176177
resource "kubernetes_persistent_volume_claim" "home" {
177178
metadata {
178-
name = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}-home"
179+
name = "coder-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}-home"
179180
namespace = var.namespace
180181
labels = {
181182
"app.kubernetes.io/name" = "coder-pvc"
182-
"app.kubernetes.io/instance" = "coder-pvc-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}"
183+
"app.kubernetes.io/instance" = "coder-pvc-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}"
183184
"app.kubernetes.io/part-of" = "coder"
184185
//Coder-specific labels.
185186
"com.coder.resource" = "true"
186187
"com.coder.workspace.id" = data.coder_workspace.me.id
187188
"com.coder.workspace.name" = data.coder_workspace.me.name
188-
"com.coder.user.id" = data.coder_workspace.me.owner_id
189-
"com.coder.user.username" = data.coder_workspace.me.owner
189+
"com.coder.user.id" = data.coder_workspace_owner.me.id
190+
"com.coder.user.username" = data.coder_workspace_owner.me.name
190191
}
191192
annotations = {
192-
"com.coder.user.email" = data.coder_workspace.me.owner_email
193+
"com.coder.user.email" = data.coder_workspace_owner.me.email
193194
}
194195
}
195196
wait_until_bound = false
@@ -210,20 +211,20 @@ resource "kubernetes_deployment" "main" {
210211
]
211212
wait_for_rollout = false
212213
metadata {
213-
name = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}"
214+
name = "coder-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}"
214215
namespace = var.namespace
215216
labels = {
216217
"app.kubernetes.io/name" = "coder-workspace"
217-
"app.kubernetes.io/instance" = "coder-workspace-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}"
218+
"app.kubernetes.io/instance" = "coder-workspace-${lower(data.coder_workspace_owner.me.name)}-${lower(data.coder_workspace.me.name)}"
218219
"app.kubernetes.io/part-of" = "coder"
219220
"com.coder.resource" = "true"
220221
"com.coder.workspace.id" = data.coder_workspace.me.id
221222
"com.coder.workspace.name" = data.coder_workspace.me.name
222-
"com.coder.user.id" = data.coder_workspace.me.owner_id
223-
"com.coder.user.username" = data.coder_workspace.me.owner
223+
"com.coder.user.id" = data.coder_workspace_owner.me.id
224+
"com.coder.user.username" = data.coder_workspace_owner.me.name
224225
}
225226
annotations = {
226-
"com.coder.user.email" = data.coder_workspace.me.owner_email
227+
"com.coder.user.email" = data.coder_workspace_owner.me.email
227228
}
228229
}
229230

‎docs/admin/quotas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ compute:
3030

3131
```hcl
3232
resource "docker_volume" "home_volume" {
33-
name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-root"
33+
name = "coder-${data.coder_workspace_owner.me.name}-${data.coder_workspace.me.name}-root"
3434
}
3535
3636
resource "coder_metadata" "home_volume" {

‎docs/faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ This code produces a hashed value that will be difficult to replicate.
315315

316316
```hcl
317317
locals {
318-
concatenated_string = "${data.coder_workspace.me.name}+${data.coder_workspace.me.owner}"
318+
concatenated_string = "${data.coder_workspace.me.name}+${data.coder_workspace_owner.me.name}"
319319
hashed_string = md5(local.concatenated_string)
320320
truncated_hash = substr(local.hashed_string, 0, 16)
321321
}

‎dogfood/main.tf

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ locals {
2424

2525
repo_base_dir = data.coder_parameter.repo_base_dir.value == "~" ? "/home/coder" : replace(data.coder_parameter.repo_base_dir.value, "/^~\\//", "/home/coder/")
2626
repo_dir = replace(module.git-clone.repo_dir, "/^~\\//", "/home/coder/")
27-
container_name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
27+
container_name = "coder-${data.coder_workspace_owner.me.name}-${lower(data.coder_workspace.me.name)}"
2828
}
2929

3030
data "coder_parameter" "repo_base_dir" {
@@ -95,6 +95,7 @@ data "coder_external_auth" "github" {
9595
}
9696

9797
data "coder_workspace" "me" {}
98+
data "coder_workspace_owner" "me" {}
9899

99100
module "slackme" {
100101
source = "registry.coder.com/modules/slackme/coder"
@@ -267,11 +268,11 @@ resource "docker_volume" "home_volume" {
267268
# Add labels in Docker to keep track of orphan resources.
268269
labels {
269270
label = "coder.owner"
270-
value = data.coder_workspace.me.owner
271+
value = data.coder_workspace_owner.me.name
271272
}
272273
labels {
273274
label = "coder.owner_id"
274-
value = data.coder_workspace.me.owner_id
275+
value = data.coder_workspace_owner.me.id
275276
}
276277
labels {
277278
label = "coder.workspace_id"
@@ -309,7 +310,7 @@ resource "docker_container" "workspace" {
309310
# Use the docker gateway if the access URL is 127.0.0.1
310311
entrypoint = ["sh", "-c", coder_agent.dev.init_script]
311312
# CPU limits are unnecessary since Docker will load balance automatically
312-
memory = data.coder_workspace.me.owner == "code-asher" ? 65536 : 32768
313+
memory = data.coder_workspace_owner.me.name == "code-asher" ? 65536 : 32768
313314
runtime = "sysbox-runc"
314315
env = [
315316
"CODER_AGENT_TOKEN=${coder_agent.dev.token}",
@@ -330,11 +331,11 @@ resource "docker_container" "workspace" {
330331
# Add labels in Docker to keep track of orphan resources.
331332
labels {
332333
label = "coder.owner"
333-
value = data.coder_workspace.me.owner
334+
value = data.coder_workspace_owner.me.name
334335
}
335336
labels {
336337
label = "coder.owner_id"
337-
value = data.coder_workspace.me.owner_id
338+
value = data.coder_workspace_owner.me.id
338339
}
339340
labels {
340341
label = "coder.workspace_id"

‎examples/jfrog/docker/main.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ terraform {
1515
locals {
1616
# Make sure to use the same field as the username field in the Artifactory
1717
# It can be either the username or the email address.
18-
artifactory_username = data.coder_workspace.me.owner_email
18+
artifactory_username = data.coder_workspace_owner.me.email
1919
artifactory_repository_keys = {
2020
"npm" = "npm"
2121
"python" = "python"
2222
"go" = "go"
2323
}
24-
workspace_user = data.coder_workspace.me.owner
24+
workspace_user = data.coder_workspace_owner.me.name
2525
jfrog_host = replace(var.jfrog_url, "^https://", "")
2626
}
2727

@@ -30,6 +30,7 @@ data "coder_provisioner" "me" {}
3030
provider "docker" {}
3131

3232
data "coder_workspace" "me" {}
33+
data "coder_workspace_owner" "me" {}
3334

3435
variable "jfrog_url" {
3536
type = string
@@ -83,7 +84,7 @@ resource "coder_agent" "main" {
8384
8485
# Configure the `npm` CLI to use the Artifactory "npm" repository.
8586
cat << EOF > ~/.npmrc
86-
email = ${data.coder_workspace.me.owner_email}
87+
email = ${data.coder_workspace_owner.me.email}
8788
registry = ${var.jfrog_url}/artifactory/api/npm/${local.artifactory_repository_keys["npm"]}
8889
EOF
8990
jf rt curl /api/npm/auth >> .npmrc
@@ -149,7 +150,7 @@ resource "docker_container" "workspace" {
149150
count = data.coder_workspace.me.start_count
150151
image = docker_image.main.name
151152
# Uses lower() to avoid Docker restriction on container names.
152-
name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
153+
name = "coder-${data.coder_workspace_owner.me.name}-${lower(data.coder_workspace.me.name)}"
153154
# Hostname makes the shell more user friendly: coder@my-workspace:~$
154155
hostname = data.coder_workspace.me.name
155156
entrypoint = ["sh", "-c", coder_agent.main.init_script]

‎examples/parameters-dynamic-options/main.tf

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ variable "java_image" {
2020
}
2121

2222
locals {
23-
username = data.coder_workspace.me.owner
23+
username = data.coder_workspace_owner.me.name
2424

2525
images = {
2626
"go" = var.go_image,
@@ -33,6 +33,7 @@ data "coder_provisioner" "me" {
3333

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

3738
data "coder_parameter" "container_image" {
3839
name = "container_image"
@@ -61,10 +62,10 @@ resource "coder_agent" "main" {
6162
EOF
6263

6364
env = {
64-
GIT_AUTHOR_NAME = "${data.coder_workspace.me.owner}"
65-
GIT_COMMITTER_NAME = "${data.coder_workspace.me.owner}"
66-
GIT_AUTHOR_EMAIL = "${data.coder_workspace.me.owner_email}"
67-
GIT_COMMITTER_EMAIL = "${data.coder_workspace.me.owner_email}"
65+
GIT_AUTHOR_NAME = "${data.coder_workspace_owner.me.name}"
66+
GIT_COMMITTER_NAME = "${data.coder_workspace_owner.me.name}"
67+
GIT_AUTHOR_EMAIL = "${data.coder_workspace_owner.me.email}"
68+
GIT_COMMITTER_EMAIL = "${data.coder_workspace_owner.me.email}"
6869
}
6970
}
7071

@@ -91,11 +92,11 @@ resource "docker_volume" "home_volume" {
9192
}
9293
labels {
9394
label = "coder.owner"
94-
value = data.coder_workspace.me.owner
95+
value = data.coder_workspace_owner.me.name
9596
}
9697
labels {
9798
label = "coder.owner_id"
98-
value = data.coder_workspace.me.owner_id
99+
value = data.coder_workspace_owner.me.id
99100
}
100101
labels {
101102
label = "coder.workspace_id"
@@ -119,7 +120,7 @@ resource "coder_metadata" "home_info" {
119120
resource "docker_container" "workspace" {
120121
count = data.coder_workspace.me.start_count
121122
image = local.images[data.coder_parameter.container_image.value]
122-
name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
123+
name = "coder-${data.coder_workspace_owner.me.name}-${lower(data.coder_workspace.me.name)}"
123124
hostname = data.coder_workspace.me.name
124125
entrypoint = ["sh", "-c", replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal")]
125126
env = [
@@ -138,11 +139,11 @@ resource "docker_container" "workspace" {
138139

139140
labels {
140141
label = "coder.owner"
141-
value = data.coder_workspace.me.owner
142+
value = data.coder_workspace_owner.me.name
142143
}
143144
labels {
144145
label = "coder.owner_id"
145-
value = data.coder_workspace.me.owner_id
146+
value = data.coder_workspace_owner.me.id
146147
}
147148
labels {
148149
label = "coder.workspace_id"

‎examples/parameters/main.tf

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ terraform {
1010
}
1111

1212
locals {
13-
username = data.coder_workspace.me.owner
13+
username = data.coder_workspace_owner.me.name
1414
}
1515

1616
data "coder_provisioner" "me" {
@@ -21,6 +21,7 @@ provider "docker" {
2121

2222
data "coder_workspace" "me" {
2323
}
24+
data "coder_workspace_owner" "me" {}
2425

2526
resource "coder_agent" "main" {
2627
arch = data.coder_provisioner.me.arch
@@ -59,11 +60,11 @@ resource "docker_volume" "home_volume" {
5960
# Add labels in Docker to keep track of orphan resources.
6061
labels {
6162
label = "coder.owner"
62-
value = data.coder_workspace.me.owner
63+
value = data.coder_workspace_owner.me.name
6364
}
6465
labels {
6566
label = "coder.owner_id"
66-
value = data.coder_workspace.me.owner_id
67+
value = data.coder_workspace_owner.me.id
6768
}
6869
labels {
6970
label = "coder.workspace_id"
@@ -94,7 +95,7 @@ resource "docker_container" "workspace" {
9495
count = data.coder_workspace.me.start_count
9596
image = docker_image.main.name
9697
# Uses lower() to avoid Docker restriction on container names.
97-
name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
98+
name = "coder-${data.coder_workspace_owner.me.name}-${lower(data.coder_workspace.me.name)}"
9899
# Hostname makes the shell more user friendly: coder@my-workspace:~$
99100
hostname = data.coder_workspace.me.name
100101
# Use the docker gateway if the access URL is 127.0.0.1
@@ -112,11 +113,11 @@ resource "docker_container" "workspace" {
112113
# Add labels in Docker to keep track of orphan resources.
113114
labels {
114115
label = "coder.owner"
115-
value = data.coder_workspace.me.owner
116+
value = data.coder_workspace_owner.me.name
116117
}
117118
labels {
118119
label = "coder.owner_id"
119-
value = data.coder_workspace.me.owner_id
120+
value = data.coder_workspace_owner.me.id
120121
}
121122
labels {
122123
label = "coder.workspace_id"

‎examples/templates/aws-devcontainer/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ provider "aws" {
5252

5353
data "coder_workspace" "me" {
5454
}
55+
data "coder_workspace_owner" "me" {}
5556

5657
data "aws_ami" "ubuntu" {
5758
most_recent = true
@@ -167,7 +168,7 @@ resource "aws_instance" "vm" {
167168

168169
user_data = local.user_data
169170
tags = {
170-
Name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"
171+
Name = "coder-${data.coder_workspace_owner.me.name}-${data.coder_workspace.me.name}"
171172
# Required if you are using our example policy, see template README
172173
Coder_Provisioned = "true"
173174
}

‎examples/templates/aws-linux/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ provider "aws" {
142142

143143
data "coder_workspace" "me" {
144144
}
145+
data "coder_workspace_owner" "me" {}
145146

146147
data "aws_ami" "ubuntu" {
147148
most_recent = true
@@ -249,7 +250,7 @@ resource "aws_instance" "dev" {
249250

250251
user_data = local.user_data
251252
tags = {
252-
Name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"
253+
Name = "coder-${data.coder_workspace_owner.me.name}-${data.coder_workspace.me.name}"
253254
# Required if you are using our example policy, see template README
254255
Coder_Provisioned = "true"
255256
}

‎examples/templates/aws-windows/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ provider "aws" {
142142

143143
data "coder_workspace" "me" {
144144
}
145+
data "coder_workspace_owner" "me" {}
145146

146147
data "aws_ami" "windows" {
147148
most_recent = true
@@ -187,7 +188,7 @@ resource "aws_instance" "dev" {
187188

188189
user_data = data.coder_workspace.me.transition == "start" ? local.user_data_start : local.user_data_end
189190
tags = {
190-
Name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"
191+
Name = "coder-${data.coder_workspace_owner.me.name}-${data.coder_workspace.me.name}"
191192
# Required if you are using our example policy, see template README
192193
Coder_Provisioned = "true"
193194
}

‎examples/templates/azure-linux/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ provider "azurerm" {
221221

222222
data "coder_workspace" "me" {
223223
}
224+
data "coder_workspace_owner" "me" {}
224225

225226
resource "coder_agent" "main" {
226227
arch = "amd64"
@@ -263,7 +264,7 @@ resource "coder_agent" "main" {
263264
}
264265

265266
locals {
266-
prefix = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}"
267+
prefix = "coder-${data.coder_workspace_owner.me.name}-${data.coder_workspace.me.name}"
267268

268269
userdata = templatefile("cloud-config.yaml.tftpl", {
269270
username = "coder" # Ensure this user/group does not exist in your VM image

0 commit comments

Comments
 (0)