Merge pull request #84 from cxpsemea/dev-jc

build: fix labels

Author: jcostacx

cxoneflow/src/cxjirafeedback.py

@@ -1106,61 +1106,58 @@ def __processjiraticket( self, scanner: str, ticketsummary: str, ticket: cxresul
             ticketkey = jiraticket.get('key')
             current_status = jiraticket['fields']['status']['name']
 
-            # >>> TEMP CONDITION TO REMOVE
-            if ticketkey in ['GINFOSEC-75333', 'GINFOSEC-72118', 'GINFOSEC-72120'] :            
-            
-                # If it's not opened, let's reopen it
-                if (str(current_status).lower() in self.jiraparams.closedstatus) :
-                    if self.jiraparams.opentransition :
-                        try :
-                            retdata = self.jira.tickettransition( ticketkey, self.jiraparams.opentransition )
-                        except HTTPError as e:
-                            raise Exception( self.__processjiraexception( False, False, e ) )
-                        except Exception as e:
-                            if str(e) :
-                                raise e
-                            else :
-                                raise Exception( 'Error transitioning jira ticket' )
-                        
-                        reopened = True
-                    else :
-                        cxlogger.logwarning( 'Open transtion missing. Cannot reopen "' + str(ticketkey) + '"' )
-                # Check if description changed
-                newdescription = None
-                if description and (not description == jiraticket['fields'].get('description')) :
-                    newdescription = description
-                # Check if priority changed
-                newpriority = None
-                ticketpriority = None
-                if jiraticket['fields'].get('priority') :
-                    ticketpriority = jiraticket['fields']['priority'].get('name')
-                if priority and (not priority == ticketpriority) :
-                    newpriority = priority
-                # Check if labels changed
-                newlabels   = []
-                existinglabels = jiraticket['fields'].get('labels')
-                if not existinglabels :
-                    existinglabels = []
-                for label in labels :
-                    found = next( filter( lambda el: el == label, existinglabels), None )
-                    if not found :
-                        newlabels.append(label)
-                if len(newlabels) == 0 :
-                    newlabels = None
-                # Check fields
-                if len(fields) == 0 :
-                    fields = None
-                    
-                if newdescription or newpriority or newlabels or fields :
+            # If it's not opened, let's reopen it
+            if (str(current_status).lower() in self.jiraparams.closedstatus) :
+                if self.jiraparams.opentransition :
                     try :
-                        self.jira.projecteditissue( ticketkey, newdescription, fields, newlabels, newpriority )
+                        retdata = self.jira.tickettransition( ticketkey, self.jiraparams.opentransition )
                     except HTTPError as e:
                         raise Exception( self.__processjiraexception( False, False, e ) )
                     except Exception as e:
                         if str(e) :
                             raise e
                         else :
-                            raise Exception( 'Error updating jira ticket' )
+                            raise Exception( 'Error transitioning jira ticket' )
+                    
+                    reopened = True
+                else :
+                    cxlogger.logwarning( 'Open transtion missing. Cannot reopen "' + str(ticketkey) + '"' )
+            # Check if description changed
+            newdescription = None
+            if description and (not description == jiraticket['fields'].get('description')) :
+                newdescription = description
+            # Check if priority changed
+            newpriority = None
+            ticketpriority = None
+            if jiraticket['fields'].get('priority') :
+                ticketpriority = jiraticket['fields']['priority'].get('name')
+            if priority and (not priority == ticketpriority) :
+                newpriority = priority
+            # Check if labels changed
+            newlabels   = []
+            existinglabels = jiraticket['fields'].get('labels')
+            if not existinglabels :
+                existinglabels = []
+            for label in labels :
+                found = next( filter( lambda el: el == label, existinglabels), None )
+                if not found :
+                    newlabels.append(label)
+            if len(newlabels) == 0 :
+                newlabels = None
+            # Check fields
+            if len(fields) == 0 :
+                fields = None
+                
+            if newdescription or newpriority or newlabels or fields :
+                try :
+                    self.jira.projecteditissue( ticketkey, newdescription, fields, newlabels, newpriority )
+                except HTTPError as e:
+                    raise Exception( self.__processjiraexception( False, False, e ) )
+                except Exception as e:
+                    if str(e) :
+                        raise e
+                    else :
+                        raise Exception( 'Error updating jira ticket' )
 
             if reopened :
                 cxlogger.verbose( '- JIRA issue ' + ticketkey + ' re-opened, type ' + scanner.upper() + ', prev status "' + current_status + '", with key "' + ticketsummary + '"' )

cxoneflow/src/cxprocessscan.py

@@ -54,15 +54,25 @@ def results(self) :
 
     # Get scan information, wait for completion
     def __getscandata(self, scanid: str, waitforit: bool = True ) :
+        go: bool = True
         # Get scan and status. Error is thrown if scan does not exists
         scan = self.conn.cxone.get( '/api/scans/' + scanid )
-        while scan['status'] != 'Completed' and waitforit :
+        scanstatus = str(scan['status']).lower()
+        # while scan['status'] != 'Completed' and waitforit :
+        while scanstatus not in ['completed', 'failed', 'partial', 'canceled'] and waitforit :
             # 30 seconds
             time.sleep(30.0)
             scan = self.conn.cxone.get( '/api/scans/' + scanid )
+            scanstatus = str(scan['status']).lower()
+        if scanstatus in ['failed', 'canceled'] :
+            go = False 
+            cxlogger.verbose( 'Aborted processing ' + scanstatus + ' scan' )
+        elif scanstatus == 'partial' :
+            cxlogger.verbose( 'Processing a ' + scanstatus + ' scan' )
         # Get associated project data
         project = self.conn.cxone.get( '/api/projects/' + scan['projectId'] )
         self.__scan.updatescandata( scan, project )
+        return go
 
 
     # Check branch name and scanners for processing go/no-go
@@ -278,9 +288,10 @@ def processscan(self) :
 
         self.__allcounter = 0
 
-        self.__getscandata( self.cxparams.scanid )
+        go = self.__getscandata( self.cxparams.scanid )
 
-        go = self.__checkscandata()
+        if go :
+            go = self.__checkscandata()
 
         if go :