From d456a9b860a076378b168a0c15b448f40bdba6fe Mon Sep 17 00:00:00 2001
From: Yoriyasu Yano <430092+yorinasub17@users.noreply.github.com>
Date: Fri, 16 Apr 2021 16:15:55 -0500
Subject: [PATCH 1/3] Temporary workaround for broken build

---
 .circleci/config.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4fcc228e0..0cdbb5138 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ env: &env
     TERRAFORM_VERSION: 0.14.0
     TERRAGRUNT_VERSION: v0.24.2
     PACKER_VERSION: 1.6.6
-    GOLANG_VERSION: 1.14
+    GO_VERSION: 1.14
     K8S_VERSION: v1.15.0  # Same as EKS
     MINIKUBE_VERSION: v1.9.2
     HELM_VERSION: v3.1.1
@@ -41,9 +41,19 @@ install_gruntwork_utils: &install_gruntwork_utils
       --terraform-version ${TERRAFORM_VERSION} \
       --terragrunt-version ${TERRAGRUNT_VERSION} \
       --packer-version ${PACKER_VERSION} \
-      --go-version ${GOLANG_VERSION} \
+      --go-version NONE \
       --go-src-path ./
 
+    # Temporary fix for installing go - remove when we can update gruntwork-module-circleci-helpers to version with fix
+    echo "Installing Go version $version"
+    curl -O --silent --location --fail --show-error "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz"
+    sudo rm -rf /usr/local/go
+    sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
+    sudo ln -s /usr/local/go/bin/go /usr/bin/go
+    local installed_version
+    installed_version="$(go version)"
+    echo "The installed version of Go is now $installed_version"
+
 configure_environment_for_gcp: &configure_environment_for_gcp
   name: configure environment for gcp
   command: |

From 51a41418cf8e5a1cb1f6ab46249b4cb86de892e8 Mon Sep 17 00:00:00 2001
From: Yoriyasu Yano <430092+yorinasub17@users.noreply.github.com>
Date: Fri, 16 Apr 2021 16:17:48 -0500
Subject: [PATCH 2/3] Don't install go modules

---
 .circleci/config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0cdbb5138..0bad98331 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,8 +41,7 @@ install_gruntwork_utils: &install_gruntwork_utils
       --terraform-version ${TERRAFORM_VERSION} \
       --terragrunt-version ${TERRAGRUNT_VERSION} \
       --packer-version ${PACKER_VERSION} \
-      --go-version NONE \
-      --go-src-path ./
+      --go-version NONE
 
     # Temporary fix for installing go - remove when we can update gruntwork-module-circleci-helpers to version with fix
     echo "Installing Go version $version"

From 2a8f11b9d44cbc401683d6121df48aa75ab0dd21 Mon Sep 17 00:00:00 2001
From: Yoriyasu Yano <430092+yorinasub17@users.noreply.github.com>
Date: Fri, 16 Apr 2021 16:20:02 -0500
Subject: [PATCH 3/3] Fix bashism

---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0bad98331..064140b1a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,9 +49,7 @@ install_gruntwork_utils: &install_gruntwork_utils
     sudo rm -rf /usr/local/go
     sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
     sudo ln -s /usr/local/go/bin/go /usr/bin/go
-    local installed_version
-    installed_version="$(go version)"
-    echo "The installed version of Go is now $installed_version"
+    echo "The installed version of Go is now $(go version)"
 
 configure_environment_for_gcp: &configure_environment_for_gcp
   name: configure environment for gcp