Add step to tag known software in pipeline

    * Change name of Docker step from "find_images_linux_distro" to "find_images_os_and_distro"

Signed-off-by: Jono Yang <[email protected]>

scanpipe/pipelines/windows_docker.py

@@ -20,12 +20,12 @@
 # ScanCode.io is a free software code scanning tool from nexB Inc. and others.
 # Visit https://github.com/nexB/scancode.io for support and download.
 
-from scanpipe.pipelines import docker
+from scanpipe.pipelines.docker import Docker
 from scanpipe.pipes import docker
 from scanpipe.pipes import windows
 
 
-class WindowsDocker(docker.Docker):
+class WindowsDocker(Docker):
     """
     A pipeline to analyze a Windows Docker image.
     """
@@ -35,10 +35,11 @@ def steps(cls):
         return (
             cls.extract_images,
             cls.extract_layers,
-            cls.find_images_linux_distro,
+            cls.find_images_os_and_distro,
             cls.collect_images_information,
             cls.collect_and_create_codebase_resources,
             cls.collect_and_create_system_packages,
+            cls.tag_known_software_packages,
             cls.tag_uninteresting_codebase_resources,
             cls.tag_empty_files,
             cls.scan_for_application_packages,
@@ -47,9 +48,12 @@ def steps(cls):
             cls.tag_not_analyzed_codebase_resources,
         )
 
+    def tag_known_software_packages(self):
+        windows.tag_known_software(self.project)
+
     def tag_uninteresting_codebase_resources(self):
         """
         Flag remaining files not from a system package.
         """
         docker.tag_whiteout_codebase_resources(self.project)
-        windows.tag_uninteresting_codebase_resources(self.project)
+        windows.tag_uninteresting_windows_codebase_resources(self.project)

scanpipe/tests/test_commands.py

@@ -78,7 +78,7 @@ def test_scanpipe_pipelines_pipeline_graph_output_dot(self):
         self.assertIn('"extract_images"[label=<<b>extract_images</b>>', output_dot)
         self.assertIn('"extract_layers"[label=<<b>extract_layers</b>>', output_dot)
         self.assertIn("extract_images -> extract_layers;", output_dot)
-        self.assertIn("extract_layers -> find_images_linux_distro;", output_dot)
+        self.assertIn("extract_layers -> find_images_os_and_distro;", output_dot)
 
     def test_scanpipe_management_command_create_project_base(self):
         out = StringIO()

setup.py

@@ -57,6 +57,7 @@
         ],
         "scancodeio_pipelines": [
             "docker = scanpipe.pipelines.docker:Docker",
+            "windows_docker = scanpipe.pipelines.windows_docker:WindowsDocker",
             "load_inventory = scanpipe.pipelines.load_inventory:LoadInventory",
             "root_filesystems = scanpipe.pipelines.root_filesystems:RootFS",
             "scan_codebase = scanpipe.pipelines.scan_codebase:ScanCodebase",