Restructure helper scripts so they're slightly more useful

.github/workflows/ansible.yml

@@ -12,6 +12,6 @@ jobs:
         with:
           python-version: 3.7
       - name: Install dependencies
-        run: ./scripts/setup.sh
+        run: ./scripts/ansible/setup.sh
       - name: Run linters
-        run: ./scripts/ansible-lint.sh
+        run: ./scripts/ansible/lint.sh

.github/workflows/terraform.yml

@@ -12,6 +12,6 @@ jobs:
         with:
           version: "0.12.20"
       - name: Initialize Terraform
-        run: cd terraform/ && terraform init
+        run: ./scripts/terraform/terraform.sh init
       - name: Lint
-        run: ./scripts/terraform-lint.sh
+        run: ./scripts/terraform/lint.sh

scripts/deploy.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-./scripts/ansible.sh

scripts/terraform-lint.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-cd terraform/
-
-set -x
-
-terraform validate
-
-terraform fmt -check -recursive

scripts/terraform/lint.sh

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