Remove license refs for validated SPDX licenses

Since SPDX license expression validation is available some
licenses don't use refs anymore, so they don't extracted text
information

Signed-off-by: Ivana Atanasova <[email protected]>

Author: ivanayov

tern/formats/spdx/spdxjson/image_helpers.py

@@ -31,9 +31,10 @@ def get_image_extracted_licenses(image_obj):
                 unique_licenses.add(package.pkg_license)
     extracted_texts = []
     for lic in list(unique_licenses):
-        extracted_texts.append(json_formats.get_extracted_text_dict(
-            extracted_text=lic, license_ref=spdx_common.get_license_ref(
-                lic)))
+        if not spdx_common.is_spdx_license_expression(lic):
+            extracted_texts.append(json_formats.get_extracted_text_dict(
+                extracted_text=lic, license_ref=spdx_common.get_license_ref(
+                    lic)))
     return extracted_texts
 
 

tern/formats/spdx/spdxjson/layer_helpers.py

@@ -39,9 +39,10 @@ def get_layer_extracted_licenses(layer_obj):
             unique_licenses.add(package.pkg_license)
     extracted_texts = []
     for lic in list(unique_licenses):
-        extracted_texts.append(json_formats.get_extracted_text_dict(
-            extracted_text=lic, license_ref=spdx_common.get_license_ref(
-                lic)))
+        if not spdx_common.is_spdx_license_expression(lic):
+            extracted_texts.append(json_formats.get_extracted_text_dict(
+                extracted_text=lic, license_ref=spdx_common.get_license_ref(
+                    lic)))
     return extracted_texts
 
 

tern/formats/spdx/spdxtagvalue/image_helpers.py

@@ -57,9 +57,10 @@ def get_image_packages_license_block(image_obj):
             if package.pkg_license:
                 licenses.add(package.pkg_license)
     for lic in licenses:
-        block += spdx_formats.license_id.format(
-            license_ref=spdx_common.get_license_ref(lic)) + '\n'
-        block += spdx_formats.extracted_text.format(orig_license=lic) + '\n'
+        if not spdx_common.is_spdx_license_expression(lic):
+            block += spdx_formats.license_id.format(
+                license_ref=spdx_common.get_license_ref(lic)) + '\n'
+            block += spdx_formats.extracted_text.format(orig_license=lic) + '\n'
     return block
 
 
@@ -74,9 +75,10 @@ def get_image_file_license_block(image_obj):
             for lic in spdx_common.get_layer_licenses(layer):
                 licenses.add(lic)
     for lic in licenses:
-        block += spdx_formats.license_id.format(
-            license_ref=spdx_common.get_license_ref(lic)) + '\n'
-        block += spdx_formats.extracted_text.format(orig_license=lic) + '\n'
+        if not spdx_common.is_spdx_license_expression(lic):
+            block += spdx_formats.license_id.format(
+                license_ref=spdx_common.get_license_ref(lic)) + '\n'
+            block += spdx_formats.extracted_text.format(orig_license=lic) + '\n'
     return block