Skip to content

Commit 9b49e37

Browse files
committed
fix: Use immutable names for volumes in example templates
This contributes towards #3000, #3386 Related #3409
1 parent 7a71180 commit 9b49e37

File tree

9 files changed

+16
-15
lines changed

9 files changed

+16
-15
lines changed

docs/templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ data "coder_workspace" "me" {
187187
resource "docker_volume" "home_volume" {
188188
# persistent resource (remains a workspace is stopped)
189189
count = 1
190-
name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-root"
190+
name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
191191
}
192192

193193
resource "docker_container" "workspace" {

dogfood/main.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ resource "coder_app" "code-server" {
4646

4747

4848
resource "docker_volume" "home_volume" {
49-
name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-home"
49+
name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
5050
}
5151

5252
resource "coder_metadata" "home_info" {
5353
resource_id = docker_volume.home_volume.id
5454
item {
55-
key = "🤫🤫🤫<br/><br/>"
56-
value = "❤️❤️❤️"
55+
key = "🤫🤫🤫<br/><br/>"
56+
value = "❤️❤️❤️"
5757
sensitive = true
5858
}
5959
}
@@ -93,14 +93,14 @@ resource "docker_container" "workspace" {
9393
}
9494

9595
resource "coder_metadata" "container_info" {
96-
count = data.coder_workspace.me.start_count
96+
count = data.coder_workspace.me.start_count
9797
resource_id = docker_container.workspace[0].id
9898
item {
99-
key = "memory"
99+
key = "memory"
100100
value = docker_container.workspace[0].memory
101101
}
102102
item {
103-
key = "runtime"
103+
key = "runtime"
104104
value = docker_container.workspace[0].runtime
105105
}
106106
}

examples/templates/do-linux/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ resource "coder_agent" "main" {
100100

101101
resource "digitalocean_volume" "home_volume" {
102102
region = var.region
103-
name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-home"
103+
name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
104104
size = var.home_volume_size
105105
initial_filesystem_type = "ext4"
106106
initial_filesystem_label = "coder-home"

examples/templates/docker-code-server/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ resource "coder_app" "code-server" {
4444
}
4545

4646
resource "docker_volume" "home_volume" {
47-
name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-root"
47+
name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
4848
}
4949

5050
resource "docker_container" "workspace" {

examples/templates/docker-image-builds/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ variable "docker_image" {
4545
}
4646

4747
resource "docker_volume" "home_volume" {
48-
name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}-root"
48+
name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
4949
}
5050

5151
resource "docker_image" "coder_image" {

examples/templates/docker-with-dotfiles/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ resource "coder_agent" "main" {
4343
}
4444

4545
resource "docker_volume" "home_volume" {
46-
name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}-root"
46+
name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
4747
}
4848

4949
resource "docker_container" "workspace" {

examples/templates/docker/main.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ variable "docker_image" {
6262
}
6363

6464
resource "docker_volume" "home_volume" {
65-
name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}-home"
65+
name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
6666
}
6767

6868
resource "docker_container" "workspace" {
@@ -75,7 +75,8 @@ resource "docker_container" "workspace" {
7575
dns = ["1.1.1.1"]
7676
# Use the docker gateway if the access URL is 127.0.0.1
7777
command = [
78-
"sh", "-c", replace(coder_agent.main.init_script, "localhost", "host.docker.internal")]
78+
"sh", "-c", replace(coder_agent.main.init_script, "localhost", "host.docker.internal")
79+
]
7980
env = ["CODER_AGENT_TOKEN=${coder_agent.main.token}"]
8081
host {
8182
host = "host.docker.internal"

examples/templates/gcp-linux/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ data "coder_workspace" "me" {
3636
}
3737

3838
resource "google_compute_disk" "root" {
39-
name = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}-root"
39+
name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-root"
4040
type = "pd-ssd"
4141
zone = var.zone
4242
image = "debian-cloud/debian-10"

examples/templates/gcp-windows/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ data "google_compute_default_service_account" "default" {
3636
}
3737

3838
resource "google_compute_disk" "root" {
39-
name = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}-root"
39+
name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-root"
4040
type = "pd-ssd"
4141
zone = var.zone
4242
image = "projects/windows-cloud/global/images/windows-server-2022-dc-core-v20220215"

0 commit comments

Comments
 (0)