From 07a5af66f86045cc65abbdcd445cd6ee5eecd173 Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Fri, 19 Jan 2018 16:20:16 -0800 Subject: [PATCH] remove ctx arg from step.run --- helper/multistep/basic_runner.go | 2 +- helper/multistep/debug_runner.go | 3 +-- helper/multistep/multistep.go | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/helper/multistep/basic_runner.go b/helper/multistep/basic_runner.go index eb5018d36..0c928321e 100644 --- a/helper/multistep/basic_runner.go +++ b/helper/multistep/basic_runner.go @@ -70,7 +70,7 @@ func (b *BasicRunner) Run(state StateBag) { break } - action := step.Run(ctx, state) + action := step.Run(state) defer step.Cleanup(state) if _, ok := state.GetOk(StateCancelled); ok { diff --git a/helper/multistep/debug_runner.go b/helper/multistep/debug_runner.go index 88af01c54..882009494 100644 --- a/helper/multistep/debug_runner.go +++ b/helper/multistep/debug_runner.go @@ -1,7 +1,6 @@ package multistep import ( - "context" "fmt" "reflect" "sync" @@ -114,7 +113,7 @@ type debugStepPause struct { PauseFn DebugPauseFn } -func (s *debugStepPause) Run(_ context.Context, state StateBag) StepAction { +func (s *debugStepPause) Run(state StateBag) StepAction { s.PauseFn(DebugLocationAfterRun, s.StepName, state) return ActionContinue } diff --git a/helper/multistep/multistep.go b/helper/multistep/multistep.go index 7b4e0801f..4e3478dac 100644 --- a/helper/multistep/multistep.go +++ b/helper/multistep/multistep.go @@ -2,8 +2,6 @@ // discrete steps. package multistep -import "context" - // A StepAction determines the next step to take regarding multi-step actions. type StepAction uint @@ -28,7 +26,7 @@ type Step interface { // // The return value determines whether multi-step sequences continue // or should halt. - Run(context.Context, StateBag) StepAction + Run(StateBag) StepAction // Cleanup is called in reverse order of the steps that have run // and allow steps to clean up after themselves. Do not assume if this