[step] Remove config indirection.

recipe_engine/run.py

 # Copyright 2017 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Entry point for fully-annotated builds.
 
 This script is part of the effort to move all builds to annotator-based
 systems. Any builder configured to use the AnnotatorFactory.BaseFactory()
 found in scripts/master/factory/annotator_factory.py executes a single
 AddAnnotatedScript step. That step (found in annotator_commands.py) calls
@@ skipping 232 matching lines @@
     Args:
       name (str): The name of the client instance to retrieve.
     """
     return self._clients.get(name)
 
   def run_step(self, step_config):
     """
     Runs a step.
 
     Args:
-      step_config (recipe_api.StepConfig): The step configuration to run.
+      step_config (recipe_api.StepClient.StepConfig): The step configuration to
+        run.
 
     Returns:
       A StepData object containing the result of running the step.
     """
     with util.raises((recipe_api.StepFailure, OSError),
                      self._step_runner.stream_engine):
       step_result = None
 
       self._close_through_level(step_config.nest_level)
 
       open_step = self._step_runner.open_step(step_config)
       self._step_stack.append(self.ActiveStep(
           config=step_config,
           step_result=None,
           open_step=open_step))
 
       step_result = open_step.run()
       self._step_stack[-1] = (
           self._step_stack[-1]._replace(step_result=step_result))
 
       if step_result.retcode in step_config.ok_ret:
         step_result.presentation.status = 'SUCCESS'
         return step_result
+
+      if not step_config.infra_step:
+        state = 'FAILURE'
+        exc = recipe_api.StepFailure
       else:
-        if not step_config.infra_step:
-          state = 'FAILURE'
-          exc = recipe_api.StepFailure
-        else:
-          state = 'EXCEPTION'
-          exc = recipe_api.InfraFailure
+        state = 'EXCEPTION'
+        exc = recipe_api.InfraFailure
 
-        step_result.presentation.status = state
+      step_result.presentation.status = state
 
-        self._step_stack[-1].open_step.stream.write_line(
-            'step returned non-zero exit code: %d' % step_result.retcode)
+      self._step_stack[-1].open_step.stream.write_line(
+          'step returned non-zero exit code: %d' % step_result.retcode)
 
-        raise exc(step_config.name, step_result)
+      raise exc(step_config.name, step_result)
 
   def run(self, recipe_script, api, properties):
     """Run a recipe represented by a recipe_script object.
 
     This function blocks until recipe finishes.
     It mainly executes the recipe, and has some exception handling logic.
 
     Args:
       recipe_script: The recipe to run, as represented by a RecipeScript object.
       api: The api, with loaded module dependencies.
@@ skipping 424 matching lines @@
       ret = run_steps(
           properties, stream_engine,
           step_runner.SubprocessStepRunner(stream_engine, engine_flags),
           universe_view, engine_flags=engine_flags,
           emit_initial_properties=emit_initial_properties)
     finally:
       os.chdir(old_cwd)
 
     return handle_recipe_return(
         ret, args.output_result_json, stream_engine, engine_flags)