Merge branch 'features/terraform-with-localstack-refactor' into 'master'

update terraform and localstack providers

See merge request all-staff/hashiqube!114

Author: Riaan Nolan

Vagrantfile

@@ -200,10 +200,6 @@ Vagrant::configure("2") do |config|
       # vagrant up --provision-with docsify to only run this on vagrant up
       config.vm.provision "docsify", type: "shell", preserve_order: true, privileged: false, path: "docsify/docsify.sh"
 
-      # install terraform
-      # vagrant up --provision-with terraform to only run this on vagrant up
-      config.vm.provision "terraform", preserve_order: true, type: "shell", privileged: true, path: "hashicorp/terraform.sh"
-
 
       # blast-radius
 
@@ -243,6 +239,10 @@ Vagrant::configure("2") do |config|
       # vagrant up --provision-with sentinel to only run this on vagrant up
       config.vm.provision "sentinel", type: "shell", preserve_order: true, privileged: true, path: "hashicorp/sentinel.sh"
 
+      # install terraform
+      # vagrant up --provision-with terraform to only run this on vagrant up
+      config.vm.provision "terraform", preserve_order: true, type: "shell", privileged: true, path: "hashicorp/terraform.sh"
+
       # install localstack
       # vagrant up --provision-with localstack to only run this on vagrant up
       config.vm.provision "localstack", run: "never", type: "shell", preserve_order: true, privileged: false, path: "localstack/localstack.sh"

hashicorp/packer/linux/ubuntu/playbook.yml

@@ -9,4 +9,4 @@
         owner: root
     - name: Return all kv v2 secrets from a path
       debug:
-        msg: "{{ lookup('hashi_vault', 'secret=kv/ansible token=hvs.CAESIK2fsE_LCBTs3Ikw0d0O4QD9acJSMHZBA873CMnkMOGVGh4KHGh2cy5uOTFGQUFESkhsOWI4RUY5UHFoYlY3U1c url=http://localhost:8200') }}"
+        msg: "{{ lookup('hashi_vault', 'secret=kv/ansible token=hvs.CAESIK_jalLHH-zeL02jowquVi9yQ1ZzSdnELVLJPDZcYuM4Gh4KHGh2cy52emtKM0VuMkNrOXpKMTBLSVlEZDYxSUE url=http://localhost:8200') }}"

hashicorp/terraform.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
 function terraform-install() {
-  
-  # ensure localstack is running
-  # echo -e '\e[38;5;198m'"++++ Ensure Localstack is running.."
-  # sudo bash /vagrant/localstack/localstack.sh
 
   arch=$(lscpu | grep "Architecture" | awk '{print $NF}')
   if [[ $arch == x86_64* ]]; then
@@ -24,34 +20,19 @@ function terraform-install() {
     (cd /usr/local/bin && unzip /tmp/terraform.zip)
     echo -e '\e[38;5;198m'"++++ Installed: `/usr/local/bin/terraform version`"
   fi
-  sudo -i -u vagrant
   pip3 install --upgrade awscli-local
-  rm awscliv2.zip
+  export PATH=$HOME/.local/bin:$PATH
+  sudo rm -rf awscliv2.zip
   # https://aws.amazon.com/blogs/developer/aws-cli-v2-now-available-for-linux-arm/ aarch64
   curl -s "https://awscli.amazonaws.com/awscli-exe-linux-${arch}.zip" -o "awscliv2.zip"
-  rm -rf aws
-  unzip -q awscliv2.zip
+  sudo unzip -q awscliv2.zip
   yes | sudo ./aws/install --update
   echo -e '\e[38;5;198m'"++++ aws --version"
   aws --version
-  cd /vagrant/localstack/
-  echo -e '\e[38;5;198m'"++++ terraform init.."
-  terraform init
-  echo -e '\e[38;5;198m'"++++ terraform fmt.."
-  terraform fmt
-  echo -e '\e[38;5;198m'"++++ terraform validate.."
-  terraform validate
-  echo -e '\e[38;5;198m'"++++ terraform destroy.."
-  terraform destroy --auto-approve
-  echo -e '\e[38;5;198m'"++++ terraform plan.."
-  terraform plan
-  echo -e '\e[38;5;198m'"++++ terraform apply.."
-  terraform apply --auto-approve
-  echo -e '\e[38;5;198m'"++++ awslocal s3 ls.."
-  sudo -i -u vagrant
-  cd /vagrant/localstack/
-  export PATH=$HOME/.local/bin:$PATH
-  awslocal s3 ls || true
+
+  # ensure localstack is running
+  echo -e '\e[38;5;198m'"++++ To Terraform plan, and apply using Localstack, run the following command: vagrant up --provision-with localstack"
+  echo -e '\e[38;5;198m'"++++ See Localstack folder for Terraform files"
 }
 
 terraform-install

localstack/localstack.sh

@@ -12,13 +12,12 @@ elif  [[ $arch == aarch64 ]]; then
 fi
 echo -e '\e[38;5;198m'"CPU is $ARCH"
 
-sudo -i -u vagrant
 pip3 install --upgrade awscli-local
-rm awscliv2.zip
+sudo rm -rf awscliv2.zip
 # https://aws.amazon.com/blogs/developer/aws-cli-v2-now-available-for-linux-arm/ aarch64
 curl -s "https://awscli.amazonaws.com/awscli-exe-linux-${arch}.zip" -o "awscliv2.zip"
-rm -rf aws
-unzip -q awscliv2.zip
+sudo rm -rf aws
+sudo unzip -q awscliv2.zip
 yes | sudo ./aws/install --update
 echo -e '\e[38;5;198m'"aws --version"
 aws --version
@@ -28,3 +27,22 @@ sudo -E docker stop localstack_main
 yes | sudo docker system prune --volumes
 sudo docker run --rm -it -d -p 4566:4566 -p 4571:4571 --rm --privileged --memory 256M --name localstack_main localstack/localstack
 sudo docker ps | grep localstack
+
+cd /vagrant/localstack/
+export PATH=$HOME/.local/bin:$PATH
+echo -e '\e[38;5;198m'"++++ removing previous state files.."
+rm -rf ./terraform.tfstate*
+echo -e '\e[38;5;198m'"++++ terraform init.."
+terraform init
+echo -e '\e[38;5;198m'"++++ terraform fmt.."
+terraform fmt
+echo -e '\e[38;5;198m'"++++ terraform validate.."
+terraform validate
+echo -e '\e[38;5;198m'"++++ terraform plan.."
+terraform plan
+echo -e '\e[38;5;198m'"++++ terraform apply.."
+terraform apply --auto-approve
+echo -e '\e[38;5;198m'"++++ awslocal s3 ls.."
+awslocal s3 ls || true
+echo -e '\e[38;5;198m'"++++ terraform destroy.."
+terraform destroy --auto-approve