Merge pull request #108 from ajschofield/development

pr: final push, data warehouse is currently empty to test that it uploads through terraform

2 files changed, 59 insertions, 43 deletions

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index 09b8490..0000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: deploy-terraform
-
-on:
-  pull_request:
-    branches:
-      - main
-  push:
-    branches:
-      - main
-      
-
-jobs:
-  deploy-terraform:
-    if: github.ref == 'refs/heads/main'
-    name: Deploy Terraform
-    runs-on: ubuntu-latest
-    #needs: run-checks (must ref on-commit.yml file)
-    environment: production
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-      
-      - name: Install Terraform
-        uses: hashicorp/setup-terraform@v3
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
-
-      - name: Terraform Init
-        working-directory: terraform
-        run: terraform init
-
-      - name: Terraform Plan
-        working-directory: terraform
-        run: terraform plan
-
-      - name: Terraform Apply
-        working-directory: terraform
-        run: terraform apply --auto-approve
diff --git a/.github/workflows/dev-tests.yml b/.github/workflows/dev-tests.yml
new file mode 100644
index 0000000..e183f36
--- /dev/null
+++ b/.github/workflows/dev-tests.yml
@@ -0,0 +1,59 @@
+name: dev-tests
+
+on:
+  pull_request:
+    branches:
+      - development
+  push:
+    branches:
+      - development
+
+env:
+  PYTHONPATH: ${{ github.workspace }}
+
+jobs:
+  validate-and-test:
+    environment: testing
+    name: Validate Terraform and Run Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+      
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+
+      - name: Terraform Init
+        working-directory: terraform
+        run: terraform init -backend=false
+
+      - name: Terraform Validate
+        working-directory: terraform
+        run: terraform validate
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install Python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest pytest-testdox pytest-cov
+          pip install -r requirements.txt
+
+      - name: Run pytest
+        run: pytest -v --cov=src --cov-report=xml --cov-report=term-missing
+        continue-on-error: true
+        id: pytest
+
+      - name: Check on failures
+        if: steps.pytest.outcome == 'failure'
+        run: exit 1
+      
+      - name: Upload Coverage Report'
+        uses: actions/upload-artifact@v4
+        with:
+          name: cov-report
+          path: coverage.xml
+          retention-days: 7