fix: Only use workspace UUID for volume names

mafredri · mafredri · commit ed5963691b3c · 2022-08-26T16:25:17.000+03:00
diff --git a/docs/templates.md b/docs/templates.md
@@ -187,7 +187,7 @@ data "coder_workspace" "me" {
 resource "docker_volume" "home_volume" {
   # persistent resource (remains a workspace is stopped)
   count = 1
-  name  = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
+  name  = "coder-${data.coder_workspace.me.id}-home"
 }
 
 resource "docker_container" "workspace" {
diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -46,7 +46,7 @@ resource "coder_app" "code-server" {
 
 
 resource "docker_volume" "home_volume" {
-  name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
+  name = "coder-${data.coder_workspace.me.id}-home"
 }
 
 resource "coder_metadata" "home_info" {
diff --git a/examples/templates/do-linux/main.tf b/examples/templates/do-linux/main.tf
@@ -100,7 +100,7 @@ resource "coder_agent" "main" {
 
 resource "digitalocean_volume" "home_volume" {
   region                   = var.region
-  name                     = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
+  name                     = "coder-${data.coder_workspace.me.id}-home"
   size                     = var.home_volume_size
   initial_filesystem_type  = "ext4"
   initial_filesystem_label = "coder-home"
diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
@@ -44,7 +44,7 @@ resource "coder_app" "code-server" {
 }
 
 resource "docker_volume" "home_volume" {
-  name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
+  name = "coder-${data.coder_workspace.me.id}-home"
 }
 
 resource "docker_container" "workspace" {
diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf
@@ -45,7 +45,7 @@ variable "docker_image" {
 }
 
 resource "docker_volume" "home_volume" {
-  name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
+  name = "coder-${data.coder_workspace.me.id}-home"
 }
 
 resource "docker_image" "coder_image" {
diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
@@ -43,7 +43,7 @@ resource "coder_agent" "main" {
 }
 
 resource "docker_volume" "home_volume" {
-  name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
+  name = "coder-${data.coder_workspace.me.id}-home"
 }
 
 resource "docker_container" "workspace" {
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
@@ -62,7 +62,7 @@ variable "docker_image" {
 }
 
 resource "docker_volume" "home_volume" {
-  name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
+  name = "coder-${data.coder_workspace.me.id}-home"
 }
 
 resource "docker_container" "workspace" {
diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
@@ -36,7 +36,7 @@ data "coder_workspace" "me" {
 }
 
 resource "google_compute_disk" "root" {
-  name  = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-root"
+  name  = "coder-${data.coder_workspace.me.id}-root"
   type  = "pd-ssd"
   zone  = var.zone
   image = "debian-cloud/debian-10"
diff --git a/examples/templates/gcp-windows/main.tf b/examples/templates/gcp-windows/main.tf
@@ -36,7 +36,7 @@ data "google_compute_default_service_account" "default" {
 }
 
 resource "google_compute_disk" "root" {
-  name  = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-root"
+  name  = "coder-${data.coder_workspace.me.id}-root"
   type  = "pd-ssd"
   zone  = var.zone
   image = "projects/windows-cloud/global/images/windows-server-2022-dc-core-v20220215"

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ data "coder_workspace" "me" {`
`187`	`187`	`resource "docker_volume" "home_volume" {`
`188`	`188`	`# persistent resource (remains a workspace is stopped)`
`189`	`189`	`count = 1`
`190`		`- name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"`
	`190`	`+ name = "coder-${data.coder_workspace.me.id}-home"`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`resource "docker_container" "workspace" {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ resource "coder_app" "code-server" {`
`46`	`46`
`47`	`47`
`48`	`48`	`resource "docker_volume" "home_volume" {`
`49`		`- name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"`
	`49`	`+ name = "coder-${data.coder_workspace.me.id}-home"`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`resource "coder_metadata" "home_info" {`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ resource "coder_app" "code-server" {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`resource "docker_volume" "home_volume" {`
`47`		`- name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"`
	`47`	`+ name = "coder-${data.coder_workspace.me.id}-home"`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`resource "docker_container" "workspace" {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ variable "docker_image" {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`resource "docker_volume" "home_volume" {`
`48`		`- name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"`
	`48`	`+ name = "coder-${data.coder_workspace.me.id}-home"`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`resource "docker_image" "coder_image" {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ resource "coder_agent" "main" {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`resource "docker_volume" "home_volume" {`
`46`		`- name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"`
	`46`	`+ name = "coder-${data.coder_workspace.me.id}-home"`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`resource "docker_container" "workspace" {`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ variable "docker_image" {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`resource "docker_volume" "home_volume" {`
`65`		`- name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"`
	`65`	`+ name = "coder-${data.coder_workspace.me.id}-home"`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`resource "docker_container" "workspace" {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ data "coder_workspace" "me" {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`resource "google_compute_disk" "root" {`
`39`		`- name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-root"`
	`39`	`+ name = "coder-${data.coder_workspace.me.id}-root"`
`40`	`40`	`type = "pd-ssd"`
`41`	`41`	`zone = var.zone`
`42`	`42`	`image = "debian-cloud/debian-10"`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ data "google_compute_default_service_account" "default" {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`resource "google_compute_disk" "root" {`
`39`		`- name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-root"`
	`39`	`+ name = "coder-${data.coder_workspace.me.id}-root"`
`40`	`40`	`type = "pd-ssd"`
`41`	`41`	`zone = var.zone`
`42`	`42`	`image = "projects/windows-cloud/global/images/windows-server-2022-dc-core-v20220215"`