Merge branch 'main' into celery-init-fix

cds-snc · Oct 11, 2023 · 96d7db6 · 96d7db6
2 parents 0a30a7e + bdba843
commit 96d7db6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/export_github_data.yml b/.github/workflows/export_github_data.yml
@@ -14,7 +14,7 @@ jobs:
           DNS_PROXY_FORWARDTOSENTINEL: "true"
           DNS_PROXY_LOGANALYTICSWORKSPACEID: ${{ secrets.LOG_ANALYTICS_WORKSPACE_ID }}
           DNS_PROXY_LOGANALYTICSSHAREDKEY: ${{ secrets.LOG_ANALYTICS_WORKSPACE_KEY }}
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: Export Data
         uses: cds-snc/github-repository-metadata-exporter@main
         with:

diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -20,12 +20,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@b687393d2370bdf6d960ea972ff690c9ed797189
+        uses: ossf/scorecard-action@2fa1e2fa153141e2950c7e1299ed05e2081ead0c
         with:
           results_file: ossf-results.json
           results_format: json

diff --git a/.github/workflows/s3-backup.yml b/.github/workflows/s3-backup.yml
@@ -10,12 +10,12 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       with:
         fetch-depth: 0 # retrieve all history
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 # v4.0.0
+      uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
       with:
         aws-access-key-id: ${{ secrets.AWS_S3_BACKUP_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_S3_BACKUP_SECRET_ACCESS_KEY }}

diff --git a/scripts/run_celery.sh b/scripts/run_celery.sh
@@ -6,6 +6,7 @@ set -e
 
 # Check and see if this is running in K8s and if so, wait for cloudwatch agent
 if [[ ! -z "${STATSD_HOST}" ]]; then
+
     echo "Initializing... Waiting for CWAgent to become ready."
     while :
     do

diff --git a/scripts/run_celery_no_sms_sending.sh b/scripts/run_celery_no_sms_sending.sh
@@ -18,7 +18,8 @@ if [[ ! -z "${STATSD_HOST}" ]]; then
             echo "Waiting for CWAgent to become ready."
             sleep 1
         fi
-    done fi
+    done
+fi
 
 echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}"
 

diff --git a/scripts/run_celery_sms.sh b/scripts/run_celery_sms.sh
@@ -4,6 +4,7 @@
 
 set -e
 
+
 if [[ ! -z "${STATSD_HOST}" ]]; then
     echo "Initializing... Waiting for CWAgent to become ready."
     while :
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ set -e @@
     # Check and see if this is running in K8s and if so, wait for cloudwatch agent
     if [[ ! -z "${STATSD_HOST}" ]]; then
         echo "Initializing... Waiting for CWAgent to become ready."
         while :
         do
@@ Expand Down @@