From 2faf89ea67706cec691ec0d949e4a27bde9659ac Mon Sep 17 00:00:00 2001
From: JonJagger <jon@kosli.com>
Date: Thu, 28 Dec 2023 13:58:15 +0000
Subject: [PATCH] Report aws-prod to staging.app.kosli.com and app.kosli.com

---
 ...{snyk_scan_aws_beta.yml => snyk_scan_aws_beta.yml.off} | 2 +-
 ...{snyk_scan_aws_prod.yml.off => snyk_scan_aws_prod.yml} | 8 +++++---
 snyk_scan_live_artifacts_and_report_to_kosli.sh           | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)
 rename .github/workflows/{snyk_scan_aws_beta.yml => snyk_scan_aws_beta.yml.off} (96%)
 rename .github/workflows/{snyk_scan_aws_prod.yml.off => snyk_scan_aws_prod.yml} (83%)

diff --git a/.github/workflows/snyk_scan_aws_beta.yml b/.github/workflows/snyk_scan_aws_beta.yml.off
similarity index 96%
rename from .github/workflows/snyk_scan_aws_beta.yml
rename to .github/workflows/snyk_scan_aws_beta.yml.off
index 90c3c67..1d0f310 100644
--- a/.github/workflows/snyk_scan_aws_beta.yml
+++ b/.github/workflows/snyk_scan_aws_beta.yml.off
@@ -13,7 +13,7 @@ env:
   KOSLI_HOST_PROD: ${{ vars.KOSLI_HOST }}
   KOSLI_ORG: ${{ vars.KOSLI_ORG }}  # cyber-dojo
   KOSLI_API_TOKEN_STAGING: ${{ secrets.KOSLI_API_TOKEN_STAGING }}
-  KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
+  KOSLI_API_TOKEN_PROD: ${{ secrets.KOSLI_API_TOKEN }}
   SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
   AWS_ACCOUNT_ID: ${{ vars.AWS_ACCOUNT_ID_BETA }}
   AWS_REGION: ${{ vars.AWS_REGION }}
diff --git a/.github/workflows/snyk_scan_aws_prod.yml.off b/.github/workflows/snyk_scan_aws_prod.yml
similarity index 83%
rename from .github/workflows/snyk_scan_aws_prod.yml.off
rename to .github/workflows/snyk_scan_aws_prod.yml
index 20463ec..c6d28a2 100644
--- a/.github/workflows/snyk_scan_aws_prod.yml.off
+++ b/.github/workflows/snyk_scan_aws_prod.yml
@@ -9,11 +9,13 @@ on:
     - cron: '0 9 * * SAT'
 
 env:
-  # KOSLI_HOST: https://app.kosli.com
+  KOSLI_HOST_STAGING: ${{ vars.KOSLI_HOST_STAGING }}
+  KOSLI_HOST_PROD: ${{ vars.KOSLI_HOST }}
   KOSLI_ORG: ${{ vars.KOSLI_ORG }}  # cyber-dojo
-  KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
+  KOSLI_API_TOKEN_STAGING: ${{ secrets.KOSLI_API_TOKEN_STAGING }}
+  KOSLI_API_TOKEN_PROD: ${{ secrets.KOSLI_API_TOKEN }}
   SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-  AWS_ACCOUNT_ID: ${{ vars.AWS_ACCOUNT_ID_PROD }}
+  AWS_ACCOUNT_ID: ${{ vars.AWS_ACCOUNT_ID_BETA }}
   AWS_REGION: ${{ vars.AWS_REGION }}
 
 jobs:
diff --git a/snyk_scan_live_artifacts_and_report_to_kosli.sh b/snyk_scan_live_artifacts_and_report_to_kosli.sh
index 18a41bc..36a0df1 100755
--- a/snyk_scan_live_artifacts_and_report_to_kosli.sh
+++ b/snyk_scan_live_artifacts_and_report_to_kosli.sh
@@ -98,10 +98,10 @@ report_snyk_vulnerabilities_to_kosli()
     }
     docker pull "${image_name}"
 
-    kosli_create_flow
-    kosli_report_artifact
-    kosli_attest_snyk
-    kosli_expect_deployment
+    kosli_create_flow       --host="${KOSLI_HOST_PROD}"    --api-token="${KOSLI_API_TOKEN_PROD}"
+    kosli_report_artifact   --host="${KOSLI_HOST_PROD}"    --api-token="${KOSLI_API_TOKEN_PROD}"
+    kosli_attest_snyk       --host="${KOSLI_HOST_PROD}"    --api-token="${KOSLI_API_TOKEN_PROD}"
+    kosli_expect_deployment --host="${KOSLI_HOST_PROD}"    --api-token="${KOSLI_API_TOKEN_PROD}"
 
     kosli_create_flow       --host="${KOSLI_HOST_STAGING}" --api-token="${KOSLI_API_TOKEN_STAGING}"
     kosli_report_artifact   --host="${KOSLI_HOST_STAGING}" --api-token="${KOSLI_API_TOKEN_STAGING}"