trigger_script: remove auth-service-account flag

This is not used anymore.
https://source.chromium.org/search?q=%22--auth-service-account-json%22%20f:recipe

Bug: 1127205
Change-Id: Ia6cb9dc263a238073ac988210c99079c173f0f18
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2642656
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845721}

testing/trigger_scripts/base_test_triggerer.py

@@ -155,8 +155,7 @@ class BaseTestTriggerer(object):
   # swarming to its own object to make trigger logic more clear.
   def query_swarming(self, api, query_args, verbose,
                      limit='0',
-                     server='chromium-swarm.appspot.com',
-                     service_account=None):
+                     server='chromium-swarm.appspot.com'):
     try:
       temp_file = self.make_temp_file(prefix='base_trigger_dimensions',
                                       suffix='.json')
@@ -168,10 +167,6 @@ class BaseTestTriggerer(object):
              limit,
              '--json',
              temp_file]
-      # Add in service account auth if present
-      if service_account:
-        args.append('--auth-service-account-json')
-        args.append(service_account)
       # Append the query at the end
       args.append(('%s?%s' % (api, encoded_args)))
       ret = self.run_swarming(args, verbose)

testing/trigger_scripts/perf_device_trigger.py

@@ -84,7 +84,6 @@ class PerfDeviceTriggerer(base_test_triggerer.BaseTestTriggerer):
       # Store what swarming server we need and whether or not we need
       # to send down authentication with it
       self._swarming_server = self._get_swarming_server(swarming_args)
-      self._service_account = self._get_service_account(swarming_args)
 
       # Map of all existing bots in swarming that satisfy the current
       # set of dimensions indexed by bot id.
@@ -234,8 +233,7 @@ class PerfDeviceTriggerer(base_test_triggerer.BaseTestTriggerer):
       values.append(('dimensions', '%s:%s' % (key, value)))
 
     query_result = self.query_swarming(
-        'bots/list', values, True, server=self._swarming_server,
-        service_account=self._service_account)
+        'bots/list', values, True, server=self._swarming_server)
     if 'items' not in query_result:
       return {}
     perf_bots = {}
@@ -269,8 +267,7 @@ class PerfDeviceTriggerer(base_test_triggerer.BaseTestTriggerer):
 
     # Query for the last task that ran with these dimensions and this shard
     query_result = self.query_swarming(
-          'tasks/list', values, True, limit='1', server=self._swarming_server,
-         service_account=self._service_account)
+          'tasks/list', values, True, limit='1', server=self._swarming_server)
     tasks = query_result.get('items')
     if tasks:
       # We queried with a limit of 1 so we could only get back
@@ -299,10 +296,6 @@ class PerfDeviceTriggerer(base_test_triggerer.BaseTestTriggerer):
         # Strip out the protocol
         return server[slashes_index:]
 
-  def _get_service_account(self, args):
-    for i in xrange(len(args) - 1):
-      if '--auth-service-account-json' in args[i]:
-        return args[i+1]
 
 def main():
   logging.basicConfig(
@@ -319,4 +312,3 @@ def main():
 
 if __name__ == '__main__':
   sys.exit(main())
-

testing/trigger_scripts/perf_device_trigger_unittest.py

@@ -72,8 +72,6 @@ class UnitTest(unittest.TestCase):
         'trigger',
         '--swarming',
         'http://foo_server',
-        '--auth-service-account-json',
-        '/creds/test_service_account',
         '--dimension',
         'pool',
         'chrome-perf-fyi',
@@ -182,9 +180,6 @@ class UnitTest(unittest.TestCase):
       self.assertTrue('query' in triggerer._swarming_runs[i])
       self.assertTrue(self.list_contains_sublist(
         triggerer._swarming_runs[i], ['-S', 'foo_server']))
-      self.assertTrue(self.list_contains_sublist(
-        triggerer._swarming_runs[i], ['--auth-service-account-json',
-                                      '/creds/test_service_account']))
 
   def get_triggered_shard_to_bot(self, triggerer, num_shards):
     self.assert_query_swarming_args(triggerer, num_shards)