Merge pull request #465 from miteshvp/use_declared_licenses

fabric8-analytics · Dec 19, 2017 · f1c854a · f1c854a
2 parents f22d9b4 + 7559ef7
commit f1c854a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/f8a_worker/graphutils.py b/f8a_worker/graphutils.py
@@ -137,7 +137,7 @@ def extract_component_details(component):
             "vulnerabilities": cves
         }
 
-    licenses = component.get("version", {}).get("licenses", [])
+    licenses = component.get("version", {}).get("declared_licenses", [])
     name = component.get("version", {}).get("pname", [""])[0]
     version = component.get("version", {}).get("version", [""])[0]
     ecosystem = component.get("version", {}).get("pecosystem", [""])[0]
@@ -213,7 +213,7 @@ def create_package_dict(graph_results, alt_dict=None):
                 'ecosystem': ecosystem,
                 'name': name,
                 'version': version,
-                'licenses': epv['ver'].get('licenses', []),
+                'licenses': epv['ver'].get('declared_licenses', []),
                 'latest_version': select_latest_version(
                     epv['pkg'].get('libio_latest_version', [''])[0],
                     epv['pkg'].get('latest_version', [''])[0]),

diff --git a/f8a_worker/workers/recommender.py b/f8a_worker/workers/recommender.py
@@ -675,7 +675,7 @@ def apply_license_filter(user_stack_components, epv_list_alt, epv_list_com):
         license_scoring_input = {
             'package': epv.get('pkg', {}).get('name', [''])[0],
             'version': epv.get('ver', {}).get('version', [''])[0],
-            'licenses': epv.get('ver', {}).get('licenses', [])
+            'licenses': epv.get('ver', {}).get('declared_licenses', [])
         }
         license_score_list_alt.append(license_scoring_input)
 
@@ -684,7 +684,7 @@ def apply_license_filter(user_stack_components, epv_list_alt, epv_list_com):
         license_scoring_input = {
             'package': epv.get('pkg', {}).get('name', [''])[0],
             'version': epv.get('ver', {}).get('version', [''])[0],
-            'licenses': epv.get('ver', {}).get('licenses', [])
+            'licenses': epv.get('ver', {}).get('declared_licenses', [])
         }
         license_score_list_com.append(license_scoring_input)
 

diff --git a/f8a_worker/workers/stackaggregator_v2.py b/f8a_worker/workers/stackaggregator_v2.py
@@ -78,7 +78,7 @@ def extract_component_details(component):
         }
         cves.append(component_cve)
 
-    licenses = component.get("version", {}).get("licenses", [])
+    licenses = component.get("version", {}).get("declared_licenses", [])
     name = component.get("version", {}).get("pname", [""])[0]
     version = component.get("version", {}).get("version", [""])[0]
     ecosystem = component.get("version", {}).get("pecosystem", [""])[0]