refactor: conditionally use dotfiles in dogfood template #5332
Conversation
This ensures the `coder dotfiles` command only runs if the dotfiles var in the template is not empty.
dogfood/main.tf
Outdated
| @@ -34,6 +45,7 @@ resource "coder_agent" "dev" { | |||
| code-server --auth none --port 13337 & | |||
| sudo service docker start | |||
| coder dotfiles -y 2>&1 | tee ~/.personalize.log | |||
| "if [ -n ${var.dotfiles_uri} ]; then coder dotfiles var.dotfiles_uri -y 2>&1 | tee ~/.personalize.log; fi" | |||
There was a problem hiding this comment.
Unsure if this is the exact way to do this interpolation within the Bash script. Smoke-tested locally using terraform validate. cc @bpmct
Ref: Conditionals
There was a problem hiding this comment.
I think you need to quote the variable in order for -n to work; I'm not sure if terraform will quote it for you.
At least, shellcheck seems to think so.
Also, I believe double brackets are generally preferred for conditionals over single brackets (ref: https://www.baeldung.com/linux/bash-single-vs-double-brackets) Edit: disregard, @mafredri points out that [[ is a bash-ism
There was a problem hiding this comment.
@mafredri Shouldn't we have set pipefail in this script?
There was a problem hiding this comment.
@mtojek Since we're supporting /bin/sh, we should avoid -o pipefail (it's a bash-ism).
dogfood/main.tf
Outdated
| @@ -34,6 +45,7 @@ resource "coder_agent" "dev" { | |||
| code-server --auth none --port 13337 & | |||
| sudo service docker start | |||
| coder dotfiles -y 2>&1 | tee ~/.personalize.log | |||
| "if [ -n ${var.dotfiles_uri} ]; then coder dotfiles var.dotfiles_uri -y 2>&1 | tee ~/.personalize.log; fi" | |||
There was a problem hiding this comment.
Okay found this and these are called Heredoc strings
Now I'm second guessing it. Is this what it should be?
| "if [ -n ${var.dotfiles_uri} ]; then coder dotfiles var.dotfiles_uri -y 2>&1 | tee ~/.personalize.log; fi" | |
| if [ -n "${var.dotfiles_uri}" ]; then coder dotfiles "${var.dotfiles_uri}" -y 2>&1 | tee ~/.personalize.log; fi |
Not sure if the quotes will stay so could be ""${var.dotfilesa-uri}""
There was a problem hiding this comment.
There was a problem hiding this comment.
@jsjoeio I think a great way to deal with variables is to assign them to a shell variable in the scripts, like this:
DOTFILES_URI=${var.dotfiles_uri}
if [ -n "$DOTFILES_URI" ]; then
# ...
fiThis way escaping the value becomes a non-issue because the assignment supports basically any input.
There was a problem hiding this comment.
Genius! I'll see if I can wrap this up at the end of the day!
Description
When I merged 9e4d213, I had forgotten to ask the user for the dotfiles URI and then use it with
coder dotfilesresulting in this log output:Assuming my syntax is correct, this should fix that issue.
Changes