From 7342405490ef2eb544da07510c4e187bebc3cf45 Mon Sep 17 00:00:00 2001
From: Elaine Laguerta <elaguerta@newrelic.com>
Date: Mon, 27 May 2024 11:30:36 -0700
Subject: [PATCH] fixup: check env secrets and outputs

Pass FOSSA_API_KEY secret from caller to check_env
Pass HAS_FOSSA_API_KEY output form check_end to caller
---
 .github/workflows/fossa-caos.yml         | 2 ++
 .github/workflows/fossa-check-env.yml    | 9 +++++++--
 .github/workflows/fossa-default.yml      | 3 ++-
 .github/workflows/fossa-elixir.yml       | 2 ++
 .github/workflows/fossa-gradle.yml       | 2 ++
 .github/workflows/fossa-ruby-bundler.yml | 2 ++
 .github/workflows/fossa-scala.yml        | 2 ++
 7 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/fossa-caos.yml b/.github/workflows/fossa-caos.yml
index d9e5b0d..b8d6831 100644
--- a/.github/workflows/fossa-caos.yml
+++ b/.github/workflows/fossa-caos.yml
@@ -6,6 +6,8 @@ on:
 jobs:
   check_env:
     uses: newrelic-csec/.github/.github/workflows/fossa-check-env.yml@reusable
+    secrets:
+      FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
 
   fossa:
     needs: check_env
diff --git a/.github/workflows/fossa-check-env.yml b/.github/workflows/fossa-check-env.yml
index 214267e..76206a5 100644
--- a/.github/workflows/fossa-check-env.yml
+++ b/.github/workflows/fossa-check-env.yml
@@ -4,14 +4,19 @@ on:
     secrets:
       FOSSA_API_KEY:
        required: false
+    outputs:
+      HAS_FOSSA_API_KEY:
+        description: "True if FOSSA API key is available."
+        value: ${{ jobs.check_env.outputs.check }}
 
 jobs:
   check_env:
     runs-on: ubuntu-latest
     env:
       HAS_FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY != '' }}
+    outputs:
+      HAS_FOSSA_API_KEY: ${{ steps.check-fossa-api-key.outputs.check }}
     steps:
       - id: check-fossa-api-key
         run: echo "check=$HAS_FOSSA_API_KEY" >> "$GITHUB_OUTPUT"
-    outputs:
-      HAS_FOSSA_API_KEY: ${{ steps.check-fossa-api-key.outputs.check }}
+
diff --git a/.github/workflows/fossa-default.yml b/.github/workflows/fossa-default.yml
index 1f07162..3a83e21 100644
--- a/.github/workflows/fossa-default.yml
+++ b/.github/workflows/fossa-default.yml
@@ -2,11 +2,12 @@ name: FOSSA CLI Analysis - Default
 on:
   pull_request:
     branches: [ $default-branch ]
-  workflow_call:
 
 jobs:
   check_env:
     uses: newrelic-csec/.github/.github/workflows/fossa-check-env.yml@reusable
+    secrets:
+      FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
 
   fossa:
     needs: check_env
diff --git a/.github/workflows/fossa-elixir.yml b/.github/workflows/fossa-elixir.yml
index c0cc2b2..2a64007 100644
--- a/.github/workflows/fossa-elixir.yml
+++ b/.github/workflows/fossa-elixir.yml
@@ -6,6 +6,8 @@ on:
 jobs:
   check_env:
     uses: newrelic-csec/.github/.github/workflows/fossa-check-env.yml@reusable
+    secrets:
+      FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
 
   fossa:
     needs: check_env
diff --git a/.github/workflows/fossa-gradle.yml b/.github/workflows/fossa-gradle.yml
index 274c0d6..3008e66 100644
--- a/.github/workflows/fossa-gradle.yml
+++ b/.github/workflows/fossa-gradle.yml
@@ -6,6 +6,8 @@ on:
 jobs:
   check_env:
     uses: newrelic-csec/.github/.github/workflows/fossa-check-env.yml@reusable
+    secrets:
+      FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
 
   fossa:
     needs: check_env
diff --git a/.github/workflows/fossa-ruby-bundler.yml b/.github/workflows/fossa-ruby-bundler.yml
index 8d31961..ce6f7a2 100644
--- a/.github/workflows/fossa-ruby-bundler.yml
+++ b/.github/workflows/fossa-ruby-bundler.yml
@@ -6,6 +6,8 @@ on:
 jobs:
   check_env:
     uses: newrelic-csec/.github/.github/workflows/fossa-check-env.yml@reusable
+    secrets:
+      FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
 
   fossa_ruby:
     needs: check_env
diff --git a/.github/workflows/fossa-scala.yml b/.github/workflows/fossa-scala.yml
index 43128a0..edd608d 100644
--- a/.github/workflows/fossa-scala.yml
+++ b/.github/workflows/fossa-scala.yml
@@ -6,6 +6,8 @@ on:
 jobs:
   check_env:
     uses: newrelic-csec/.github/.github/workflows/fossa-check-env.yml@reusable
+    secrets:
+      FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
 
   fossa:
     needs: check_env