From 241b83d936e532abc50bd542e4bd9c12a3587df4 Mon Sep 17 00:00:00 2001
From: Andrew Moore <20435317+andrewmooreio@users.noreply.github.com>
Date: Mon, 2 Dec 2024 11:20:42 +0000
Subject: [PATCH 1/4] fix: matrix env typo (#110)

---
 .github/workflows/opensearch-backup.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/opensearch-backup.yml b/.github/workflows/opensearch-backup.yml
index ac3b5e3..783804e 100644
--- a/.github/workflows/opensearch-backup.yml
+++ b/.github/workflows/opensearch-backup.yml
@@ -16,6 +16,7 @@ on:
           - test
           - stage
           - preprod
+          - prod
           
 jobs:
   backup:
@@ -24,7 +25,7 @@ jobs:
     
     strategy:
       matrix:
-        environment: ${{ github.event_name == 'schedule' && fromJson('["poc," "dev", "test", "stage"]') || fromJson(format('["{0}"]', github.event.inputs.environment)) }}
+        environment: ${{ github.event_name == 'schedule' && fromJson('["poc", "dev", "test", "stage"]') || fromJson(format('["{0}"]', github.event.inputs.environment)) }}
 
     environment: ${{ matrix.environment }}-preapproved
     

From 046783edd334047fbf65f19381102080430f58d7 Mon Sep 17 00:00:00 2001
From: Andrew Moore <20435317+andrewmooreio@users.noreply.github.com>
Date: Mon, 2 Dec 2024 13:15:42 +0000
Subject: [PATCH 2/4] chore: add awscli to utils container (#111)

---
 tools/utils/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/utils/Dockerfile b/tools/utils/Dockerfile
index f6ae61f..e859b34 100644
--- a/tools/utils/Dockerfile
+++ b/tools/utils/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 # Install utils
-RUN apt-get update && apt-get install -y curl jq
+RUN apt-get update && apt-get install -y curl jq awscli
 
 # Create a non-root user and set the home directory
 RUN useradd -u 999 -ms /bin/bash job

From 98ed798eb5b558a6b41cf6da634a562180d94595 Mon Sep 17 00:00:00 2001
From: Andrew Moore <20435317+andrewmooreio@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:24:12 +0000
Subject: [PATCH 3/4] chore: increase timeout for snapshot creation (#114)

---
 .github/workflows/opensearch-backup.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/opensearch-backup.yml b/.github/workflows/opensearch-backup.yml
index 783804e..bc59b91 100644
--- a/.github/workflows/opensearch-backup.yml
+++ b/.github/workflows/opensearch-backup.yml
@@ -50,7 +50,7 @@ jobs:
           helm install opensearch-backup . \
             --set opensearch.environment=${{ matrix.environment || github.event.inputs.environment }}
           
-          kubectl wait job/opensearch-backup --for=condition=complete --timeout=1h
+          kubectl wait job/opensearch-backup --for=condition=complete --timeout=3h
       - name: Output job logs
         run: |
           # Get the pod name from the job

From efd6a6440497c1798e225a90098341e0503df7a4 Mon Sep 17 00:00:00 2001
From: Andrew Moore <20435317+andrewmooreio@users.noreply.github.com>
Date: Wed, 4 Dec 2024 10:24:18 +0000
Subject: [PATCH 4/4] chore: always output job logs (#115)

---
 .github/workflows/opensearch-backup.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/opensearch-backup.yml b/.github/workflows/opensearch-backup.yml
index bc59b91..d98c8c0 100644
--- a/.github/workflows/opensearch-backup.yml
+++ b/.github/workflows/opensearch-backup.yml
@@ -52,6 +52,7 @@ jobs:
           
           kubectl wait job/opensearch-backup --for=condition=complete --timeout=3h
       - name: Output job logs
+        if: always()
         run: |
           # Get the pod name from the job
           POD_NAME=$(kubectl get pods --selector=job-name=opensearch-backup -o jsonpath='{.items[0].metadata.name}')