From d77a36f74816eccd600339665abe5ee607716464 Mon Sep 17 00:00:00 2001
From: Rob DiCiuccio <rob.diciuccio@gmail.com>
Date: Wed, 16 Sep 2020 13:28:04 -0700
Subject: [PATCH] Update FOSSA configuration for new requirements layout
 (#10848)

* Update FOSSA configuration

* test FOSSA failure

* Update FOSSA files changed regex

* Revert "test FOSSA failure"

This reverts commit a97213db785a24a372e8f60e4f10af79de21bf1e.

* pre-commit linting

* remove docker.txt check
---
 .fossa.yml                          | 8 ++------
 .github/workflows/license-check.yml | 2 +-
 scripts/fossa.sh                    | 4 +++-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.fossa.yml b/.fossa.yml
index 11dad8bf3b59..974aa72e7da6 100755
--- a/.fossa.yml
+++ b/.fossa.yml
@@ -28,13 +28,9 @@ analyze:
     type: npm
     target: superset-frontend
     path: superset-frontend
-  - name: docs
-    type: pip
-    target: docs
-    path: docs
-  - name: .
+  - name: base
     type: pip
     target: .
     path: .
     options:
-      requirements: ./requirements/testing.txt
+      requirements: ./requirements/base.txt
diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml
index ad0aa63d9df7..6105dd4c9181 100644
--- a/.github/workflows/license-check.yml
+++ b/.github/workflows/license-check.yml
@@ -33,7 +33,7 @@ jobs:
 
         EOF
 
-        if [[ "${FILES}" =~ (.*package*\.json|requirements/*\.txt|setup\.py) ]]; then
+        if [[ "${FILES}" =~ (.*package*\.json|requirements\/[a-z_-]+\.txt|setup\.py) ]]; then
           echo "Detected dependency changes... running fossa check"
 
           ./scripts/fossa.sh
diff --git a/scripts/fossa.sh b/scripts/fossa.sh
index 5016d7cb3984..d8e0e93237d3 100755
--- a/scripts/fossa.sh
+++ b/scripts/fossa.sh
@@ -18,10 +18,12 @@
 #
 
 # This is the recommended way to install FOSSA's cli per the docs:
-# https://docs.fossa.com/docs/travisci#section-add-fossa-steps-to-travisyml
+# https://docs.fossa.com/docs/generic-ci
 curl -s -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash
 
 # This key is a push-only API key, also recommended for public projects
 # https://docs.fossa.com/docs/api-reference#section-push-only-api-token
 export FOSSA_API_KEY="${FOSSA_API_KEY:-f72e93645bdfeab94bd227c7bbdda4ef}"
+fossa init
 fossa analyze
+fossa test