Move scripts to justfile

.gitea/workflows/ci.yml

@@ -8,10 +8,11 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2
+      - uses: extractions/setup-just@v1
       - name: Init
-        run: ./scripts/terraform/terraform.sh init -backend=false
+        run: just terraform init -backend=false
       - name: Lint
-        run: ./scripts/terraform/lint.sh
+        run: just terraform-lint
 
   ansible:
     runs-on: ubuntu-latest
@@ -21,12 +22,13 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
+      - uses: extractions/setup-just@v1
 
       # HACK: https://docs.ansible.com/ansible/devel/reference_appendices/config.html#cfg-in-world-writable-dir
       - name: Fix permissions
         run: chmod 0755 ansible/
 
       - name: Set up
-        run: ./scripts/ansible/setup.sh
+        run: just ansible-setup
       - name: Lint
-        run: ./scripts/ansible/lint.sh
+        run: just ansible-lint

.yamllint.yml

@@ -6,6 +6,7 @@ ignore: |
   ansible/group_vars/all/vps-hosts.yml
   ansible/roles/traefik/files/traefik.yml
   ansible/roles/nebula/files/nebula.yml
+  env
 
 rules:
   document-start: disable

README.md

@@ -5,11 +5,12 @@
 - Python 3
 - Locally configured SSH config (ideally deployed through [dotfiles](https://github.com/realorangeone/dotfiles))
 - `ansible` installed on the system
+- [`just`](https://github.com/casey/just)
 
 ## Installation
 
-- `./scripts/ansible/setup.sh`
-- `cd terraform/ && ./scripts/terraform/terraform.sh init`
+- `just setup`
+- `just terraform init`
 
 ### Private Settings
 
@@ -21,5 +22,5 @@ Terraform backend secrets need to be placed in `terraform/secrets.sh`.
 
 ## Deploying
 
-- `./scripts/ansible/deploy.sh`
-- `./scripts/terraform/terraform.sh apply`
+- `just ansible-deploy`
+- `juts terraform apply`

ansible/yamllint.yml

@@ -1 +0,0 @@
-../yamllint.yml

justfile

@@ -0,0 +1,46 @@
+
+export PATH := justfile_directory() + "/env/bin:" + env_var("PATH")
+
+# Recipes
+@default:
+  just --list
+
+ansible-setup:
+    python -m venv env
+    pip install -r ansible/dev-requirements.txt
+    cd ansible/ && ansible-galaxy install -r galaxy-requirements.yml --force
+
+# Run terraform with required environment
+terraform +ARGS:
+    #!/usr/bin/env bash
+    cd terraform/
+
+    # Load secrets from env file (if it exists)
+    set -a
+    source ./.env || true
+    set +a
+
+    terraform {{ ARGS }}
+
+# Download secrets
+update-secrets:
+    cd terraform/ && bw get attachment .env --itemid c4f8b44e-ae62-442d-a9e0-02d0621c2454
+
+ansible-deploy *ARGS:
+    cd ansible/ && ansible-playbook main.yml --vault-password-file=vault-pass.sh -K {{ ARGS }}
+
+terraform-lint:
+    just terraform validate
+    just terraform fmt -check -recursive
+
+yamllint:
+    yamllint -s .
+
+ansible-lint: yamllint
+    #!/usr/bin/env bash
+    cd ansible/
+
+    ansible-lint -p
+    ansible-playbook main.yml --syntax-check
+
+lint: terraform-lint ansible-lint

scripts/ansible/deploy.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-cd ansible/
-
-time ansible-playbook main.yml --vault-password-file=vault-pass.sh -K $@

scripts/ansible/lint.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-PATH=${PWD}/env/bin:${PATH}
-
-yamllint -sc ansible/yamllint.yml ansible
-
-cd ansible/
-
-ansible-lint -p
-
-ansible-playbook main.yml --syntax-check

scripts/ansible/setup.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-PATH=${PWD}/env/bin:${PATH}
-
-set -x
-
-python -m venv env
-
-pip install -r ansible/dev-requirements.txt
-
-cd ansible/ && ansible-galaxy install -r galaxy-requirements.yml --force

scripts/terraform/lint.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-./scripts/terraform/terraform.sh validate
-
-./scripts/terraform/terraform.sh fmt -check -recursive

scripts/terraform/terraform.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-cd terraform/
-
-# Load secrets from env file (if it exists)
-set -a
-source ./.env || true
-set +a -x
-
-terraform $@

scripts/terraform/update-secrets.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-cd terraform/
-
-bw get attachment .env --itemid c4f8b44e-ae62-442d-a9e0-02d0621c2454