improve precondition

mafredri · mafredri · commit 1b1b4012f91e · 2023-09-13T14:16:10.000Z
diff --git a/scaletest/templates/scaletest-runner/main.tf b/scaletest/templates/scaletest-runner/main.tf
@@ -40,12 +40,8 @@ resource "null_resource" "permission_check" {
   # for the plan, and consequently, updating the template.
   lifecycle {
     precondition {
-      condition     = can(regex("^(default|scaletest)$", data.coder_workspace.me.owner))
-      error_message = "User is not allowed, expected 'scaletest'."
-    }
-    precondition {
-      condition     = can(regex("^(default|runner)$", data.coder_workspace.me.name))
-      error_message = "Workspace name is not allowed, expected 'runner'."
+      condition     = can(regex("^(default/default|scaletest/runner)$", "${data.coder_workspace.me.owner}/${data.coder_workspace.me.name}"))
+      error_message = "User and workspace name is not allowed, expected 'scaletest/runner'."
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,8 @@ resource "null_resource" "permission_check" {`
`40`	`40`	`# for the plan, and consequently, updating the template.`
`41`	`41`	`lifecycle {`
`42`	`42`	`precondition {`
`43`		`- condition = can(regex("^(default\|scaletest)$", data.coder_workspace.me.owner))`
`44`		`- error_message = "User is not allowed, expected 'scaletest'."`
`45`		`- }`
`46`		`- precondition {`
`47`		`- condition = can(regex("^(default\|runner)$", data.coder_workspace.me.name))`
`48`		`- error_message = "Workspace name is not allowed, expected 'runner'."`
	`43`	`+ condition = can(regex("^(default/default\|scaletest/runner)$", "${data.coder_workspace.me.owner}/${data.coder_workspace.me.name}"))`
	`44`	`+ error_message = "User and workspace name is not allowed, expected 'scaletest/runner'."`
`49`	`45`	`}`
`50`	`46`	`}`
`51`	`47`	`}`