Merge pull request #4 from co-cddo/refactor-zendesk-backup

Refactor zendesk backup
co-cddo · May 1, 2024 · c588769 · c588769
2 parents d127c99 + e41979a
commit c588769
Show file tree

Hide file tree

Showing 30 changed files with 383 additions and 179 deletions.
diff --git a/.github/workflows/lambda_crawler-govuk-reference-content_deploy.yml b/.github/workflows/lambda_crawler-govuk-reference-content_deploy.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "main" ]
     paths:
-      - lambda/crawler-govuk-reference-content/**
+      - lambda_/crawler-govuk-reference-content/**
       - .github/workflows/lambda_crawler-govuk-reference-content_deploy.yml
   workflow_dispatch:
 env:
@@ -48,7 +48,7 @@ jobs:
         echo "github.ref: ${{ github.ref }}"
         ls -lah
         bash build.sh
-      working-directory: lambda/crawler-govuk-reference-content/
+      working-directory: lambda_/crawler-govuk-reference-content/
 
     - name: configure aws credentials
       uses: aws-actions/configure-aws-credentials@v2
@@ -61,17 +61,17 @@ jobs:
       run: |
         aws sts get-caller-identity
         ls -lah
-      working-directory: lambda/crawler-govuk-reference-content/
+      working-directory: lambda_/crawler-govuk-reference-content/
 
     # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc.
     - name: Terraform Init
       run: terraform init
-      working-directory: lambda/crawler-govuk-reference-content/
+      working-directory: lambda_/crawler-govuk-reference-content/
 
     # Checks that all Terraform configuration files adhere to a canonical format
     - name: Terraform Format
       run: terraform fmt -check
-      working-directory: lambda/crawler-govuk-reference-content/
+      working-directory: lambda_/crawler-govuk-reference-content/
 
     # Generates an execution plan for Terraform
     - name: Terraform Apply
@@ -83,4 +83,4 @@ jobs:
           -var="production_iam_role=${{ secrets.PRODUCTION_IAM_ROLE }}"
       env:
         TERRAFORM_WORKSPACE: ${{ matrix.environment }}
-      working-directory: lambda/crawler-govuk-reference-content/
+      working-directory: lambda_/crawler-govuk-reference-content/
diff --git a/.github/workflows/lambda_email-forwarder_deploy.yml b/.github/workflows/lambda_email-forwarder_deploy.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
     paths:
-      - lambda/email-forwarder/**
+      - lambda_/email-forwarder/**
   workflow_dispatch:
 
 permissions:
@@ -52,12 +52,12 @@ jobs:
       # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc.
       - name: Terraform Init
         run: terraform init
-        working-directory: lambda/email-forwarder/
+        working-directory: lambda_/email-forwarder/
 
       # Checks that all Terraform configuration files adhere to a canonical format
       - name: Terraform Format
         run: terraform fmt -check
-        working-directory: lambda/email-forwarder/
+        working-directory: lambda_/email-forwarder/
 
       # Generates an execution plan for Terraform
       - name: Terraform Apply
@@ -68,4 +68,4 @@ jobs:
             -var="production_iam_role=${{ secrets.PRODUCTION_IAM_ROLE }}"
         env:
           TF_WORKSPACE: ${{ matrix.environment }}
-        working-directory: lambda/email-forwarder/
+        working-directory: lambda_/email-forwarder/
diff --git a/.github/workflows/lambda_hackerone-zendesk-integration_deploy.yml b/.github/workflows/lambda_hackerone-zendesk-integration_deploy.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
     paths:
-      - lambda/hackerone-zendesk-integration/**
+      - lambda_/hackerone-zendesk-integration/**
   workflow_dispatch:
 
 permissions:
@@ -42,7 +42,7 @@ jobs:
         run: |
           ls -lah
           bash build.sh
-        working-directory: lambda/hackerone-zendesk-integration/
+        working-directory: lambda_/hackerone-zendesk-integration/
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -58,12 +58,12 @@ jobs:
       # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc.
       - name: Terraform Init
         run: terraform init
-        working-directory: lambda/hackerone-zendesk-integration/
+        working-directory: lambda_/hackerone-zendesk-integration/
 
       # Checks that all Terraform configuration files adhere to a canonical format
       - name: Terraform Format
         run: terraform fmt -check
-        working-directory: lambda/hackerone-zendesk-integration/
+        working-directory: lambda_/hackerone-zendesk-integration/
 
       # Generates an execution plan for Terraform
       - name: Terraform Apply
@@ -74,4 +74,4 @@ jobs:
             -var="production_iam_role=${{ secrets.PRODUCTION_IAM_ROLE }}"
         env:
           TF_WORKSPACE: ${{ matrix.environment }}
-        working-directory: lambda/hackerone-zendesk-integration/
+        working-directory: lambda_/hackerone-zendesk-integration/
diff --git a/.github/workflows/lambda_zendesk-backup_deploy.yml b/.github/workflows/lambda_zendesk-backup_deploy.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
     paths:
-      - lambda/zendesk-backup/**
+      - lambda_/zendesk_backup/**
   workflow_dispatch:
 
 permissions:
@@ -42,7 +42,7 @@ jobs:
         run: |
           ls -lah
           bash build.sh
-        working-directory: lambda/zendesk-backup/
+        working-directory: lambda_/zendesk_backup/
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -58,12 +58,12 @@ jobs:
       # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc.
       - name: Terraform Init
         run: terraform init
-        working-directory: lambda/zendesk-backup/
+        working-directory: lambda_/zendesk_backup/
 
       # Checks that all Terraform configuration files adhere to a canonical format
       - name: Terraform Format
         run: terraform fmt -check
-        working-directory: lambda/zendesk-backup/
+        working-directory: lambda_/zendesk_backup/
 
       # Generates an execution plan for Terraform
       - name: Terraform Apply
@@ -74,4 +74,4 @@ jobs:
             -var="production_iam_role=${{ secrets.PRODUCTION_IAM_ROLE }}"
         env:
           TF_WORKSPACE: ${{ matrix.environment }}
-        working-directory: lambda/zendesk-backup/
+        working-directory: lambda_/zendesk_backup/
diff --git a/lambda/zendesk-backup/main.py b/lambda/zendesk-backup/main.py
diff --git a/.../crawler-govuk-reference-content/build.sh → .../crawler-govuk-reference-content/build.sh b/.../crawler-govuk-reference-content/build.sh → .../crawler-govuk-reference-content/build.sh
diff --git a/...uk-reference-content/dev-requirements.txt → ...uk-reference-content/dev-requirements.txt b/...uk-reference-content/dev-requirements.txt → ...uk-reference-content/dev-requirements.txt
diff --git a/...crawler-govuk-reference-content/lambda.tf → ...crawler-govuk-reference-content/lambda.tf b/...crawler-govuk-reference-content/lambda.tf → ...crawler-govuk-reference-content/lambda.tf
diff --git a/...a/crawler-govuk-reference-content/main.py → ..._/crawler-govuk-reference-content/main.py b/...a/crawler-govuk-reference-content/main.py → ..._/crawler-govuk-reference-content/main.py
diff --git a/lambda/email-forwarder/aws.tf → lambda_/email-forwarder/aws.tf b/lambda/email-forwarder/aws.tf → lambda_/email-forwarder/aws.tf
diff --git a/lambda/email-forwarder/lambda.tf → lambda_/email-forwarder/lambda.tf b/lambda/email-forwarder/lambda.tf → lambda_/email-forwarder/lambda.tf
diff --git a/lambda/email-forwarder/main.py → lambda_/email-forwarder/main.py b/lambda/email-forwarder/main.py → lambda_/email-forwarder/main.py
diff --git a/lambda/email-forwarder/s3.tf → lambda_/email-forwarder/s3.tf b/lambda/email-forwarder/s3.tf → lambda_/email-forwarder/s3.tf
diff --git a/lambda/email-forwarder/variables.tf → lambda_/email-forwarder/variables.tf b/lambda/email-forwarder/variables.tf → lambda_/email-forwarder/variables.tf
diff --git a/...da/hackerone-zendesk-integration/build.sh → ...a_/hackerone-zendesk-integration/build.sh b/...da/hackerone-zendesk-integration/build.sh → ...a_/hackerone-zendesk-integration/build.sh
diff --git a/...ackerone-zendesk-integration/hackerone.py → ...ackerone-zendesk-integration/hackerone.py b/...ackerone-zendesk-integration/hackerone.py → ...ackerone-zendesk-integration/hackerone.py
diff --git a/...a/hackerone-zendesk-integration/lambda.tf → ..._/hackerone-zendesk-integration/lambda.tf b/...a/hackerone-zendesk-integration/lambda.tf → ..._/hackerone-zendesk-integration/lambda.tf
diff --git a/lambda/hackerone-zendesk-integration/main.py → ...da_/hackerone-zendesk-integration/main.py b/lambda/hackerone-zendesk-integration/main.py → ...da_/hackerone-zendesk-integration/main.py
diff --git a/...rone-zendesk-integration/requirements.txt → ...rone-zendesk-integration/requirements.txt b/...rone-zendesk-integration/requirements.txt → ...rone-zendesk-integration/requirements.txt
diff --git a/.../hackerone-zendesk-integration/zendesk.py → .../hackerone-zendesk-integration/zendesk.py b/.../hackerone-zendesk-integration/zendesk.py → .../hackerone-zendesk-integration/zendesk.py
diff --git a/...aintenance-load-athena-partitions/main.py → ...aintenance-load-athena-partitions/main.py b/...aintenance-load-athena-partitions/main.py → ...aintenance-load-athena-partitions/main.py
diff --git a/lambda_/zendesk_backup/__init__.py b/lambda_/zendesk_backup/__init__.py
diff --git a/lambda/zendesk-backup/build.sh → lambda_/zendesk_backup/build.sh b/lambda/zendesk-backup/build.sh → lambda_/zendesk_backup/build.sh
diff --git a/lambda/zendesk-backup/eventbridge.tf → lambda_/zendesk_backup/eventbridge.tf b/lambda/zendesk-backup/eventbridge.tf → lambda_/zendesk_backup/eventbridge.tf
diff --git a/lambda/zendesk-backup/lambda.tf → lambda_/zendesk_backup/lambda.tf b/lambda/zendesk-backup/lambda.tf → lambda_/zendesk_backup/lambda.tf