Bump main

.circleci/config.yml

@@ -44,12 +44,26 @@ parameters:
   SOURCE_TYPE:
     type: string
     default: "github"
+  CI_TRIGGER:
+    type: boolean
+    default: true
+
 
 jobs:
   publish:
     docker:
       - image: cimg/base:stable
     steps:
+      - run:
+          name: Check CI_TRIGGER
+          command: |
+            if [ "<< pipeline.parameters.CI_TRIGGER >>" != true ]; then
+              echo "CI_TRIGGER is not true. Exiting with success."
+              circleci-agent step halt
+            else
+              echo "CI_TRIGGER is true. Continuing with the workflow."
+            fi
+
       - run:
           name: Install AWS CLI
           command: |
@@ -91,17 +105,32 @@ jobs:
             echo "  });" >> ~/project/decrypt.js
             echo "}" >> ~/project/decrypt.js
             echo "" >> ~/project/decrypt.js
-            echo "const encryptedData = process.argv[2];" >> ~/project/decrypt.js
-            echo "console.log(decryptData(encryptedData));" >> ~/project/decrypt.js
+            echo "const input = process.argv[2];" >> ~/project/decrypt.js
+            echo "try {" >> ~/project/decrypt.js
+            echo "  const parsedJson = JSON.parse(input);" >> ~/project/decrypt.js
+            echo "  const decryptedJson = Object.keys(parsedJson).reduce((acc, key) => {" >> ~/project/decrypt.js
+            echo "    acc[key] = decryptData(parsedJson[key]);" >> ~/project/decrypt.js
+            echo "    return acc;" >> ~/project/decrypt.js
+            echo "  }, {});" >> ~/project/decrypt.js
+            echo "  console.log(JSON.stringify(decryptedJson));" >> ~/project/decrypt.js
+            echo "} catch (e) {" >> ~/project/decrypt.js
+            echo "  // If parsing fails, assume it's a single encrypted token" >> ~/project/decrypt.js
+            echo "  console.log(decryptData(input));" >> ~/project/decrypt.js
+            echo "}" >> ~/project/decrypt.js
 
       - run:
           name: Decode secrets and environment variables
           command: |
             if [ -n "<< pipeline.parameters.SECRETS >>" ]; then
               echo "Decoding secrets..."
-              node ~/project/decrypt.js "<< pipeline.parameters.SECRETS >>" > ~/project/decrypted_secrets.txt
-              sed -i 's/^/export /' ~/project/decrypted_secrets.txt
+              DECRYPTED_JSON=$(node ~/project/decrypt.js '<< pipeline.parameters.SECRETS >>')
+              if [[ $DECRYPTED_JSON == {* ]]; then
+                echo "$DECRYPTED_JSON" | jq -r 'to_entries | map("export \(.key)=\(.value|@sh)") | .[]' > ~/project/decrypted_secrets.txt
+              else
+                echo "export DECRYPTED_SECRET=$DECRYPTED_JSON" > ~/project/decrypted_secrets.txt
+              fi
               source ~/project/decrypted_secrets.txt
+              cat ~/project/decrypted_secrets.txt
             fi
 
             if [ -n "<< pipeline.parameters.ENVIRONMENT_VARIABLES >>" ]; then

.github/workflows/mirror-private-repo.yml

@@ -32,6 +32,13 @@ jobs:
           exit 1
         fi
 
+        # Ensure this is only run in the dashboard-runner repository
+        REPO_NAME=$(basename -s .git `git config --get remote.origin.url`)
+        if [ "$REPO_NAME" != "dashboard-runner" ]; then
+          echo "This action is only allowed to run in the dashboard-runner repository."
+          exit 0
+        fi
+
         # Clone the source repository
         git clone --mirror https://${GH_TOKEN}@github.com/earthfast/dashboard-runner.git source-repo
         cd source-repo

.github/workflows/trigger-circleci.yml

@@ -24,6 +24,14 @@ jobs:
             echo "::set-output name=branch::main"
           fi
 
+      - name: Ensure repository is dashboard-runner
+        run: |
+          REPO_NAME=$(basename -s .git `git config --get remote.origin.url`)
+          if [ "$REPO_NAME" != "dashboard-runner" ]; then
+            echo "This action is only allowed to run in the earthfast/dashboard-runner repository."
+            exit 0
+          fi
+
       - name: Trigger CircleCI Pipeline
         run: |
           curl -X POST \
@@ -41,7 +49,8 @@ jobs:
                 "OUTPUT_DIR": ".",
                 "ENVIRONMENT_VARIABLES": "",
                 "ONE_CLICK_SERVER_URL": "https://jorge.ngrok.pro",
-                "ENVIRONMENT": "${{ steps.env-branch.outputs.environment }}"
+                "ENVIRONMENT": "${{ steps.env-branch.outputs.environment }}",
+                "CI_TRIGGER": true
               }
             }' \
             https://circleci.com/api/v2/project/gh/earthfast/dashboard-runner/pipeline