minor changes to printouts.

fixed possible serialization issue
when writing test_plan file

Author: pyth0n1c

contentctl/actions/detection_testing/infrastructures/DetectionTestingInfrastructure.py

@@ -395,7 +395,7 @@ def execute(self):
             try:
                 self.test_detection(detection)
             except ContainerStoppedException:
-                self.pbar.write(f"Stopped container [{self.get_name()}]")
+                self.pbar.write(f"Warning - container was stopped when trying to execute detection [{self.get_name()}]")
                 self.finish()
                 return
             except Exception as e:
@@ -1356,7 +1356,7 @@ def status(self):
         pass
 
     def finish(self):
-        self.pbar.bar_format = f"Stopped container [{self.get_name()}]"
+        self.pbar.bar_format = f"Finished running tests on instance: [{self.get_name()}]"
         self.pbar.update()
         self.pbar.close()
 

contentctl/actions/detection_testing/infrastructures/DetectionTestingInfrastructureContainer.py

@@ -150,6 +150,8 @@ def removeContainer(self, removeVolumes: bool = True, forceRemove: bool = True):
             # container was found, so now we try to remove it
             # v also removes volumes linked to the container
             container.remove(v=removeVolumes, force=forceRemove)
+            print(f"container [{self.get_name()}] successfully removed")
+
             # remove it even if it is running. remove volumes as well
             # No need to print that the container has been removed, it is expected behavior
 

contentctl/objects/config.py

@@ -591,7 +591,10 @@ def dumpCICDPlanAndQuit(self, githash: str, detections:List[Detection]):
         data['githash'] = str(githash)
 
         #Remove some fields that are not relevant
-        del(data['container_settings'])
+        for k in ['container_settings', 'test_instances']:
+            if k in data:
+                del(data[k]) 
+        
 
 
         try: