From a8af6e09342f0b65ccd72b936318978607b33dfe Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 6 Dec 2022 22:44:53 +0000
Subject: [PATCH 1/7] feat: add dotfiles_uri var to dogfood template

---
 dogfood/main.tf | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 6bfe3f6262e0d..679387643fe29 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -11,6 +11,17 @@ terraform {
   }
 }
 
+# User parameters
+
+variable "dotfiles_uri" {
+  description = <<-EOF
+  Dotfiles repo URI (optional)
+
+  see https://dotfiles.github.io
+  EOF
+  default     = ""
+}
+
 # Admin parameters
 
 provider "docker" {

From 3fbe100acefc8b9dfe1f95d42e65e56b62a87e8d Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 6 Dec 2022 22:45:19 +0000
Subject: [PATCH 2/7] refactor: use dotfiles if dotfiles var exists

This ensures the `coder dotfiles` command only runs if the dotfiles var
in the template is not empty.
---
 dogfood/main.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 679387643fe29..0501b1d942fe7 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -45,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"
     EOF
 }
 

From 6f79f9debc906acb13dff330bab14297387dbc96 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 7 Dec 2022 09:07:42 -0700
Subject: [PATCH 3/7] Update dogfood/main.tf

---
 dogfood/main.tf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 0501b1d942fe7..f02d50a3aad4a 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -44,7 +44,6 @@ resource "coder_agent" "dev" {
     curl -fsSL https://code-server.dev/install.sh | sh
     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"
     EOF
 }

From 78541c50ab8eb9837fc6c7106f520d8099c7c50e Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 12 Dec 2022 22:49:35 +0000
Subject: [PATCH 4/7] refactor: assign variable to shell variable

---
 dogfood/main.tf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 88b98aa47e435..4fa3d9a27ddbc 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -49,7 +49,10 @@ resource "coder_agent" "dev" {
     curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
     code-server --auth none --port 13337 &
     sudo service docker start
-    "if [ -n ${var.dotfiles_uri} ]; then coder dotfiles var.dotfiles_uri -y 2>&1 | tee  ~/.personalize.log; fi"
+    DOTFILES_URI=${var.dotfiles_uri}
+    if [ -n "$DOTFILES_URI" ]; then
+      coder dotfiles var.dotfiles_uri -y 2>&1 | tee  ~/.personalize.log
+    fi
     EOF
 }
 

From d6d372448b269df192d579a2cc23d4100e516fd2 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 12 Dec 2022 16:00:43 -0700
Subject: [PATCH 5/7] Update dogfood/main.tf

---
 dogfood/main.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 4fa3d9a27ddbc..c4a9b72ed10a8 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -15,6 +15,7 @@ terraform {
 
 variable "dotfiles_uri" {
   description = <<-EOF
+  default     = ""
   Dotfiles repo URI (optional)
 
   see https://dotfiles.github.io

From ee48416bc2b6e527831703ae5ad6f8d61a8f9a96 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 13 Dec 2022 20:57:01 +0000
Subject: [PATCH 6/7] fixup!: add default value

---
 dogfood/main.tf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 4fa3d9a27ddbc..5ed60368091f5 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -14,11 +14,13 @@ terraform {
 # User parameters
 
 variable "dotfiles_uri" {
+  type        = string
   description = <<-EOF
   Dotfiles repo URI (optional)
 
   see https://dotfiles.github.io
   EOF
+  default     = ""
 }  
   
 variable "datocms_api_token" {

From 1d9254f5deb656330622849b1f7305283912f276 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 13 Dec 2022 21:06:51 +0000
Subject: [PATCH 7/7] formatting

---
 dogfood/main.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 7bf1d22da6b3c..0727a8cb1f761 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -22,8 +22,8 @@ variable "dotfiles_uri" {
   see https://dotfiles.github.io
   EOF
   default     = ""
-}  
-  
+}
+
 variable "datocms_api_token" {
   type        = string
   description = "An API token from DATOCMS for usage with building our website."