#9 Give a little more details when finding a ticket to be invalid
Merged 5 years ago by mohanboddu. Opened 5 years ago by pingou.
pingou/fedscm-admin error_msg  into  master

file modified
+10 -6
@@ -223,7 +223,7 @@ 

          # If a ValueError is raised, that means it isn't valid JSON

          issue_body = json.loads(issue['content'].strip('`').strip('\n'))

      except ValueError:

-         prompt_to_close_bad_ticket(issue)

+         prompt_to_close_bad_ticket(issue, "Invalid JSON provided")

          return

  

      if 'sls' in issue_body:
@@ -269,7 +269,7 @@ 

      elif issue_body.get('action') == 'new_branch':

          prompt_for_new_branch(issue, issue_body, auto_approve=auto_approve)

      else:

-         prompt_to_close_bad_ticket(issue)

+         prompt_to_close_bad_ticket(issue, "Invalid or missing action field")

          return

  

  
@@ -294,7 +294,8 @@ 

          'monitor']

      for key in required_keys:

          if key not in issue_body_json.keys():

-             prompt_to_close_bad_ticket(issue_json)

+             prompt_to_close_bad_ticket(

+                 issue_json, "Invalid body, missing required field: %s" % key)

              return

  

      requester = issue_json['user']['name']
@@ -334,7 +335,8 @@ 

      try:

          sla_list = sla_dict_to_list(issue_body_json['sls'])

      except ValueError:

-         prompt_to_close_bad_ticket(issue_json)

+         prompt_to_close_bad_ticket(

+             issue_json, "Invalid format for the sls field")

          return

  

      # This should never trigger because if the user requested an EPEL branch
@@ -491,14 +493,16 @@ 

      required_keys = ['action', 'namespace', 'branch', 'sls', 'repo']

      for key in required_keys:

          if key not in issue_body_json.keys():

-             prompt_to_close_bad_ticket(issue_json)

+             prompt_to_close_bad_ticket(

+                 issue_json, "Invalid body, keys: %s missing" % key)

              return

  

      # If the provided SLA is in an invalid format, a ValueError will raise

      try:

          sla_list = sla_dict_to_list(issue_body_json['sls'])

      except ValueError:

-         prompt_to_close_bad_ticket(issue_json)

+         prompt_to_close_bad_ticket(

+             issue_json, "Invalid format of the sls field")

          return

  

      namespace = issue_body_json['namespace'].strip()

Signed-off-by: Pierre-Yves Chibon pingou@pingoured.fr

Pull-Request has been merged by mohanboddu

5 years ago
Metadata