Make KOSLI_ORG a ci parameter (#15)

cyber-dojo · Dec 13, 2023 · ef3aca6 · ef3aca6
1 parent 2ae613e
commit ef3aca6
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/.github/workflows/main_staging.yml b/.github/workflows/main_staging.yml
@@ -19,19 +19,23 @@ jobs:
     outputs:
       image_tag: ${{ steps.vars.outputs.image_tag }}
       kosli_host: ${{ steps.vars.outputs.kosli_host }}
+      kosli_org: ${{ steps.vars.outputs.kosli_org }}
     steps:
     - name: Prepare
       id: vars
       run: |
         echo "image_tag=$(echo $GITHUB_SHA | head -c7)" >> ${GITHUB_OUTPUT}
         echo "kosli_host=${{ env.KOSLI_HOST }}"         >> ${GITHUB_OUTPUT}
+        echo "kosli_org=${{ env.KOSLI_ORG }}"           >> ${GITHUB_OUTPUT}        
 
   create-kosli-flow:
+    needs: [variables]
     uses: ./.github/workflows/sub_create_kosli_flow.yml
     secrets:
       KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
     with:
       KOSLI_HOST: ${{ needs.variables.outputs.kosli_host }}
+      KOSLI_ORG: ${{ needs.variables.outputs.kosli_org }}
 
   wait-for-image:
     needs: [create-kosli-flow]

diff --git a/.github/workflows/sub_approve_deployment.yml b/.github/workflows/sub_approve_deployment.yml
@@ -10,6 +10,10 @@ on:
         default: https://app.kosli.com
         required: false
         type: string
+      KOSLI_ORG:
+        default: cyber-dojo
+        required: false
+        type: string
       IMAGE_TAG:
         required: true
         type: string
@@ -21,7 +25,7 @@ on:
 env:
   KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}
   KOSLI_HOST: ${{ inputs.KOSLI_HOST }}
-  KOSLI_ORG: ${{ vars.KOSLI_ORG }}
+  KOSLI_ORG: ${{ inputs.KOSLI_ORG }}
   KOSLI_FLOW: ${{ vars.KOSLI_FLOW }}
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
 

diff --git a/.github/workflows/sub_build_image.yml b/.github/workflows/sub_build_image.yml
@@ -14,14 +14,18 @@ on:
         default: https://app.kosli.com
         required: false
         type: string
+      KOSLI_ORG:
+        default: cyber-dojo
+        required: false
+        type: string
       IMAGE_TAG:
         required: true
         type: string
 
 env:
   KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}
   KOSLI_HOST: ${{ inputs.KOSLI_HOST }}
-  KOSLI_ORG: ${{ vars.KOSLI_ORG }}
+  KOSLI_ORG: ${{ inputs.KOSLI_ORG }}
   KOSLI_FLOW: ${{ vars.KOSLI_FLOW }}
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
 

diff --git a/.github/workflows/sub_create_kosli_flow.yml b/.github/workflows/sub_create_kosli_flow.yml
@@ -10,11 +10,15 @@ on:
         default: https://app.kosli.com
         required: false
         type: string
+      KOSLI_ORG:
+        default: cyber-dojo
+        required: false
+        type: string
 
 env:
   KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}
   KOSLI_HOST: ${{ inputs.KOSLI_HOST }}
-  KOSLI_ORG: ${{ vars.KOSLI_ORG }}
+  KOSLI_ORG: ${{ inputs.KOSLI_ORG }}
   KOSLI_FLOW: ${{ vars.KOSLI_FLOW }}
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
 

diff --git a/.github/workflows/sub_sdlc_gate.yml b/.github/workflows/sub_sdlc_gate.yml
@@ -10,14 +10,18 @@ on:
         default: https://app.kosli.com
         required: false
         type: string
+      KOSLI_ORG:
+        default: cyber-dojo
+        required: false
+        type: string
       IMAGE_TAG:
         required: true
         type: string
 
 env: 
   KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}
   KOSLI_HOST: ${{ inputs.KOSLI_HOST }}
-  KOSLI_ORG: ${{ vars.KOSLI_ORG }}
+  KOSLI_ORG: ${{ inputs.KOSLI_ORG }}
   KOSLI_FLOW: ${{ vars.KOSLI_FLOW }}
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
 

diff --git a/.github/workflows/sub_test.yml b/.github/workflows/sub_test.yml
@@ -12,14 +12,18 @@ on:
         default: https://app.kosli.com
         required: false
         type: string
+      KOSLI_ORG:
+        default: cyber-dojo
+        required: false
+        type: string
       IMAGE_TAG:
         required: true
         type: string
 
 env: 
   KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}
   KOSLI_HOST: ${{ inputs.KOSLI_HOST }}
-  KOSLI_ORG: ${{ vars.KOSLI_ORG }}
+  KOSLI_ORG: ${{ inputs.KOSLI_ORG }}
   KOSLI_FLOW: ${{ vars.KOSLI_FLOW }}
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
   SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}