Revert "try fix license scout issue [didn't work]"

This reverts commit 61f62ea.
chef · Aug 21, 2024 · 4f5d966 · 4f5d966
1 parent 61f62ea
commit 4f5d966
Show file tree

Hide file tree

Showing 8 changed files with 201 additions and 916 deletions.
diff --git a/.expeditor/license_scout.sh b/.expeditor/license_scout.sh
@@ -54,5 +54,4 @@ for dir in "${erlang_install_dirs[@]}"; do
 done
 
 echo "+++ Running License Scout"
-#license_scout /var/cache/omnibus/chef-server/src/oc_bifrost --only-show-failures
-exit 0
+license_scout --only-show-failures
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
@@ -12,14 +12,14 @@ steps:
   # Lint Tests
 #########################################################################
 
-#- label: license-scout
-#  command:
-#    - .expeditor/license_scout.sh
-#  expeditor:
-#    executor:
-#      docker:
-#        environment:
-#          - OCTOKIT_ACCESS_TOKEN
+- label: license-scout
+  command:
+    - .expeditor/license_scout.sh
+  expeditor:
+    executor:
+      docker:
+        environment:
+          - OCTOKIT_ACCESS_TOKEN
 
 #########################################################################
   # Component Tests

diff --git a/.license_scout.yml b/.license_scout.yml
@@ -1,15 +1,14 @@
 ---
 name: chef-server
 directories:
+  - ./
   - ./src/bookshelf
-# - ./
-# - ./src/bookshelf
-# - ./src/chef-server-ctl
-# - ./src/nginx
-# - ./src/oc_bifrost
-# - ./src/oc_erchef
-# - ./src/oc-id
-# - ./src/openresty-noroot
+  - ./src/chef-server-ctl
+  - ./src/nginx
+  - ./src/oc_bifrost
+  - ./src/oc_erchef
+  - ./src/oc-id
+  - ./src/openresty-noroot
 
 habitat:
   channel_for_origin:
@@ -55,12 +54,6 @@ allowed_licenses:
 fallbacks:
   # These erlang overrides are temporary. We may be able to remove some of them once chef/license_scout#194 is resolved
   erlang:
-    - name: cookbooks
-      license_id: Apache-2.0
-      license_content: https://github.com/chef/chef-server/LICENSE
-    - name: server-ctl-cookbooks
-      license_id: Apache-2.0
-      license_content: https://github.com/chef/chef-server/LICENSE
     - name: amqp_client
       license_id: MPL-1.1
       license_content: https://github.com/seth/amqp_client/blob/master/src/amqp_connection.erl
@@ -125,12 +118,6 @@ fallbacks:
       license_id: MIT
       license_content: https://github.com/okeuday/uuid/blob/master/README.markdown
   ruby:
-    - name: cookbooks
-      license_id: Apache-2.0
-      license_content: https://github.com/chef/chef-server/LICENSE
-    - name: server-ctl-cookbooks
-      license_id: Apache-2.0
-      license_content: https://github.com/chef/chef-server/LICENSE
     - name: amqp
       license_id: Ruby
       license_content: https://raw.githubusercontent.com/ruby-amqp/amqp/master/README.md
@@ -168,21 +155,13 @@ fallbacks:
 
 exceptions:
   erlang:
-    - name: cookbooks
-      reason: Historic exception made by Chef Legal (unmodified library, used as-is)
-    - name: server-ctl-cookbooks
-      reason: Historic exception made by Chef Legal (unmodified library, used as-is)
     - name: amqp_client
       reason: Historic exception made by Chef Legal (unmodified library, used as-is)
     - name: erlsom
       reason: Historic exception made by Chef Legal (unmodified library, used as-is)
     - name: rabbit_common
       reason: Historic exception made by Chef Legal (unmodiifed library, used as-is)
   ruby:
-    - name: cookbooks
-      reason: Historic exception made by Chef Legal (unmodified library, used as-is)
-    - name: server-ctl-cookbooks
-      reason: Historic exception made by Chef Legal (unmodified library, used as-is)
     - name: kgio
       reason: Exception made by Chef Legal (unmodified library, used as-is)
     - name: newrelic_rpm

diff --git a/omnibus/files/server-ctl-cookbooks/Gemfile b/omnibus/files/server-ctl-cookbooks/Gemfile