Restore hard-wired kosli-org in staging workflow (#23)

cyber-dojo · Dec 13, 2023 · 219b4da · 219b4da
1 parent 789b2ed
commit 219b4da
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 32 deletions.
diff --git a/.github/workflows/main_staging.yml b/.github/workflows/main_staging.yml
@@ -19,22 +19,19 @@ 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=https://staging.app.kosli.com" >> ${GITHUB_OUTPUT}
-        echo "kosli_org=cyber-dojo"                     >> ${GITHUB_OUTPUT}
 
   create-kosli-flow:
     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]
@@ -67,7 +64,6 @@ jobs:
       SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
     with:
       KOSLI_HOST: ${{ needs.variables.outputs.kosli_host }}
-      KOSLI_ORG: ${{ needs.variables.outputs.kosli_org }}
       IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}
 
   sdlc-gate:
@@ -77,7 +73,6 @@ jobs:
       KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
     with:
       KOSLI_HOST: ${{ needs.variables.outputs.kosli_host }}
-      KOSLI_ORG: ${{ needs.variables.outputs.kosli_org }}
       IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}
 
   approve-deployment-to-beta:
@@ -87,7 +82,6 @@ jobs:
       KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
     with:
       KOSLI_HOST: ${{ needs.variables.outputs.kosli_host }}
-      KOSLI_ORG: ${{ needs.variables.outputs.kosli_org }}
       KOSLI_ENVIRONMENT: aws-beta
       IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}
 
@@ -98,7 +92,6 @@ jobs:
       KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
     with:
       KOSLI_HOST: ${{ needs.variables.outputs.kosli_host }}
-      KOSLI_ORG: ${{ needs.variables.outputs.kosli_org }}
       KOSLI_ENVIRONMENT: aws-prod
       IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}
 

diff --git a/.github/workflows/sub_approve_deployment.yml b/.github/workflows/sub_approve_deployment.yml
@@ -10,10 +10,6 @@ on:
         default: https://app.kosli.com
         required: false
         type: string
-      KOSLI_ORG:
-        default: cyber-dojo
-        required: false
-        type: string
       KOSLI_ENVIRONMENT:
         required: true
         type: string
@@ -25,7 +21,7 @@ on:
 env:
   KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}
   KOSLI_HOST: ${{ inputs.KOSLI_HOST }}
-  KOSLI_ORG: ${{ inputs.KOSLI_ORG }}
+  KOSLI_ORG: ${{ vars.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,18 +14,14 @@ 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: ${{ inputs.KOSLI_ORG }}
+  KOSLI_ORG: ${{ vars.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,15 +10,11 @@ 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: ${{ inputs.KOSLI_ORG }}
+  KOSLI_ORG: ${{ vars.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,18 +10,14 @@ 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: ${{ inputs.KOSLI_ORG }}
+  KOSLI_ORG: ${{ vars.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,18 +12,14 @@ 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: ${{ inputs.KOSLI_ORG }}
+  KOSLI_ORG: ${{ vars.KOSLI_ORG }}
   KOSLI_FLOW: ${{ vars.KOSLI_FLOW }}
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
   SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}