use ultimate direclty without condition

Author: y0urself

selene/schema/scan_configs/mutations.py

@@ -115,12 +115,9 @@ def mutate(_root, info, scan_config_ids=None, ultimate=None):
  if len(scan_config_ids) != len(found_ids):
  return DeleteScanConfigsByIds(ok=False)
  for scan_config_id in scan_config_ids:
- if ultimate:
- gmp.delete_scan_config(
- config_id=str(scan_config_id), ultimate=True
- )
- else:
- gmp.delete_scan_config(config_id=str(scan_config_id))
+ gmp.delete_scan_config(
+ config_id=str(scan_config_id), ultimate=ultimate
+ )
 
  return DeleteScanConfigsByIds(ok=True)
 
@@ -156,10 +153,7 @@ def mutate(_root, info, filter_string: str = None, ultimate: bool = None):
  configs = configs_xml.findall('config')
  for config in configs:
  scan_config_id = str(config.get('id'))
- if ultimate:
- gmp.delete_scan_config(config_id=scan_config_id, ultimate=True)
- else:
- gmp.delete_scan_config(config_id=scan_config_id)
+ gmp.delete_scan_config(config_id=scan_config_id, ultimate=ultimate)
 
  return DeleteScanConfigsByFilter(ok=True)
 

selene/tests/scan_configs/test_delete_scan_config_by_filter.py

@@ -57,7 +57,7 @@ def test_require_authentication(self, _mock_gmp: GmpMockFactory):
 
  self.assertResponseAuthenticationRequired(response)
 
- def test_delte_scan_configs_by_filter(self, mock_gmp: GmpMockFactory):
+ def test_delete_scan_configs_by_filter(self, mock_gmp: GmpMockFactory):
  mock_gmp.mock_response('get_scan_configs', self.xml)
 
  self.login('foo', 'bar')
@@ -87,8 +87,8 @@ def test_delte_scan_configs_by_filter(self, mock_gmp: GmpMockFactory):
  )
 
  mock_gmp.gmp_protocol.delete_scan_config.assert_any_call(
- config_id=str(self.id1)
+ config_id=str(self.id1), ultimate=False
  )
  mock_gmp.gmp_protocol.delete_scan_config.assert_any_call(
- config_id=str(self.id2)
+ config_id=str(self.id2), ultimate=False
  )