fix: update deployment

Reviewed-on: https://git.query.consul/unkin/terraform-nomad/pulls/2

.gitea/workflows/build.yaml

@@ -2,6 +2,9 @@ name: Build
 
 on:
   pull_request:
+  push:
+    branches:
+      - master
 
 jobs:
   build:
@@ -14,11 +17,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Install Terraform/Terragrunt
+      - name: Install Packages
         run: |
-          dnf install terraform terragrunt -y
+          dnf install terraform terragrunt vault jq -y
 
       - name: Run Terraform Plan
+        env:
+          VAULT_ROLEID: ${{ secrets.TERRAFORM_NOMAD_VAULT_ROLEID }}
         run: |
           make plan
 
@@ -26,9 +31,9 @@ jobs:
         run: |
           find /workspace -type f -name "*.plan"
 
-          #- name: Upload Artifacts
+      - name: Upload Artifacts
-          #  uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v3
-          #  with:
+        with:
-          #    name: plans
+          name: plans
-          #    path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
+          path: /workspace/unkin/terraform-nomad/plans/*.plan
 

.gitea/workflows/deploy.yaml

@@ -0,0 +1,33 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: almalinux-8
+    container:
+      image: git.query.consul/unkin/almalinux8-runnerdnd:latest
+      options: --privileged
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: plans
+          path: /workspace/unkin/terraform-nomad/plans
+
+      - name: Install Packages
+        run: |
+          dnf install terraform terragrunt vault jq -y
+
+      - name: Run Terraform Apply
+        env:
+          VAULT_ROLEID: ${{ secrets.TERRAFORM_NOMAD_VAULT_ROLEID }}
+        run: |
+          make apply

.gitignore

@@ -2,3 +2,5 @@
 .terraform.lock.hcl
 environments/*/*.tf
 plans
+.venv
+env

Makefile

@@ -4,7 +4,14 @@ ENV_DIR = environments/$(ENVIRONMENT)
 PLAN_DIR = plans
 PLAN_FILE = ../../$(PLAN_DIR)/$(ENVIRONMENT).plan
 
-.PHONY: clean
+.PHONY: clean init plan apply
+
+define vault_env
+	@export VAULT_ADDR="https://vault.service.consul:8200" && \
+	export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID) && \
+	export $$(vault read -format=json kv/data/service/terraform/nomad | jq -r '.data.data | to_entries[] | "\(.key)=\(.value)"')
+endef
+
 clean:
 	@echo "Cleaning Terraform files..."
 	find environments -type f -name '*.tf' -exec rm -f "{}" \; && \
@@ -12,15 +19,15 @@ clean:
   find environments -type d -name '.terraform' -exec rm -rf "{}" \; && \
 	rm -rf plans
 
-.PHONY: init
 init:
+	$(call vault_env) && \
 	terragrunt --terragrunt-working-dir $(ENV_DIR) init
 
-.PHONY: plan
 plan: init
 	@mkdir -p $(PLAN_DIR)
+	$(call vault_env) && \
 	terragrunt --terragrunt-working-dir $(ENV_DIR) plan -out=$(PLAN_FILE)
 
-.PHONY: apply
 apply:
+	$(call vault_env) && \
 	terragrunt --terragrunt-working-dir $(ENV_DIR) apply $(PLAN_FILE)