From 219b4da00d66a2cd0c24bd566ebfc79462515e48 Mon Sep 17 00:00:00 2001 From: Jon Jagger Date: Wed, 13 Dec 2023 11:14:25 +0000 Subject: [PATCH] Restore hard-wired kosli-org in staging workflow (#23) --- .github/workflows/main_staging.yml | 7 ------- .github/workflows/sub_approve_deployment.yml | 6 +----- .github/workflows/sub_build_image.yml | 6 +----- .github/workflows/sub_create_kosli_flow.yml | 6 +----- .github/workflows/sub_sdlc_gate.yml | 6 +----- .github/workflows/sub_test.yml | 6 +----- 6 files changed, 5 insertions(+), 32 deletions(-) diff --git a/.github/workflows/main_staging.yml b/.github/workflows/main_staging.yml index 130dd16a..baa0da31 100644 --- a/.github/workflows/main_staging.yml +++ b/.github/workflows/main_staging.yml @@ -19,14 +19,12 @@ 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 @@ -34,7 +32,6 @@ jobs: 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 index 18381d42..2fae2495 100644 --- 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 index 9ab6904a..c763dfe7 100644 --- a/.github/workflows/sub_build_image.yml +++ b/.github/workflows/sub_build_image.yml @@ -14,10 +14,6 @@ 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 @@ -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_create_kosli_flow.yml b/.github/workflows/sub_create_kosli_flow.yml index b17104a9..a5028ec1 100644 --- 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 index 85c3fe12..683a0f06 100644 --- a/.github/workflows/sub_sdlc_gate.yml +++ b/.github/workflows/sub_sdlc_gate.yml @@ -10,10 +10,6 @@ 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 +17,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_test.yml b/.github/workflows/sub_test.yml index f4cee4b0..3e1879dc 100644 --- a/.github/workflows/sub_test.yml +++ b/.github/workflows/sub_test.yml @@ -12,10 +12,6 @@ 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 @@ -23,7 +19,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 }} SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}