Extend parsing logic to other handlers

Signed-off-by: Varsha U N <[email protected]>

Author: VarshaUN

src/packagedcode/dockerfile.py renamed to src/packagedcode/dockerfile_ocilabels.py

@@ -11,23 +11,16 @@
 
 import io
 from pathlib import Path
-from dockerfile_parse import DockerfileParser  
+from dockerfile_parse import DockerfileParser
 from packagedcode import models
 from packagedcode import utils
+from packagedcode.models import NonAssemblableDatafileHandler
 import fnmatch
 
 
-class DockerfileHandler(models.DatafileHandler):
+class DockerOCILabelsHandler(NonAssemblableDatafileHandler):
     datasource_id = 'dockerfile_oci_labels'
-
-    @classmethod 
-    def is_datafile(cls, path): 
-        patterns = ['Dockerfile', 'containerfile', '*.dockerfile'] 
-        filename=os.path.basename(path)
-        for pattern in patterns: 
-            if fnmatch.fnmatch(filename, pattern): 
-                return True 
-        return False
+    path_patterns = ('Dockerfile', 'containerfile', '*.dockerfile')
 
     @classmethod
     def parse(cls, location, package_only=False):
@@ -38,10 +31,10 @@ def parse(cls, location, package_only=False):
         package_data = {
             'datasource_id': cls.datasource_id,
             'type': cls.default_package_type,
-            'name': labels.get('name', 'None'),  
-            'version': labels.get('version', 'None'),  
-            'license_expression': labels.get('license', 'None'),
-            'labels': labels,  
+            'name': labels.get('name', 'None'),
+            'version': labels.get('version', 'None'),
+            'license_expression': labels.get('license'),
+            'labels': labels,
         }
 
         yield models.PackageData.from_data(package_data, package_only)

tests/packagedcode/__pycache__/test_parse_pyproject_toml.cpython-312-pytest-8.3.3.pyc.26520

@@ -0,0 +1,11 @@
+#Copied from https://github.com/kubernetes-sigs/blixt/blob
+
+FROM alpine
+
+WORKDIR /opt/blixt/
+
+LABEL org.opencontainers.image.source=https://github.com/kubernetes-sigs/blixt
+LABEL org.opencontainers.image.licenses=GPL-2.0-only,BSD-2-Clause
+
+COPY dataplane/LICENSE.GPL-2.0 /opt/blixt/LICENSE.GPL-2.0
+COPY dataplane/LICENSE.BSD-2-Clause /opt/blixt/LICENSE.BSD-2-Clause

tests/packagedcode/data/docker/psql-expected.json

@@ -0,0 +1,9 @@
+[
+  {
+    "datasource_id": "docker_oci_labels",
+    "labels": {
+      "org.opencontainers.image.source": "https://github.com/kubernetes-sigs/blixt",
+      "org.opencontainers.image.licenses": "GPL-2.0-only,BSD-2-Clause"
+    }
+  }
+]

tests/packagedcode/data/docker/psql.dockerfile

@@ -0,0 +1,7 @@
+{
+    "datasource_id": "docker_oci_labels",
+    "labels": {
+        "org.opencontainers.image.source": "https://github.com/kubernetes-sigs/blixt",
+        "org.opencontainers.image.licenses": "GPL-2.0-only,BSD-2-Clause"
+    }
+}

tests/packagedcode/data/docker/test-containerfile/test.containerfile

@@ -1,36 +1,21 @@
 #Copied from https://github.com/kanboard/kanboard
 
 FROM alpine:3.21
-
-LABEL org.opencontainers.image.source https://github.com/kanboard/kanboard
+LABEL org.opencontainers.image.source=https://github.com/kanboard/kanboard
 LABEL org.opencontainers.image.title=Kanboard
 LABEL org.opencontainers.image.description="Kanboard is project management software that focuses on the Kanban methodology"
 LABEL org.opencontainers.image.vendor=Kanboard
 LABEL org.opencontainers.image.licenses=MIT
 LABEL org.opencontainers.image.url=https://kanboard.org
 LABEL org.opencontainers.image.documentation=https://docs.kanboard.org
-
 VOLUME /var/www/app/data
 VOLUME /var/www/app/plugins
 VOLUME /etc/nginx/ssl
-
 EXPOSE 80 443
-
 ARG VERSION
-
-RUN apk --no-cache --update add \
-    tzdata openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php83 php83-phar php83-curl \
-    php83-fpm php83-json php83-zlib php83-xml php83-dom php83-ctype php83-opcache php83-zip php83-iconv \
-    php83-pdo php83-pdo_mysql php83-pdo_sqlite php83-pdo_pgsql php83-mbstring php83-session php83-bcmath \
-    php83-gd php83-openssl php83-sockets php83-posix php83-ldap php83-simplexml php83-xmlwriter && \
-    rm -rf /var/www/localhost && \
-    rm -f /etc/php83/php-fpm.d/www.conf && \
-    ln -sf /usr/bin/php83 /usr/bin/php
-
+RUN apk --no-cache --update add ...
 ADD . /var/www/app
 ADD docker/ /
-
 RUN rm -rf /var/www/app/docker && echo $VERSION > /var/www/app/app/version.txt
-
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 CMD []