Skip to content

Commit

Permalink
extract workspace_step_runner_delegate from plan_step_runner
Browse files Browse the repository at this point in the history
  • Loading branch information
krrrr38 committed Jan 5, 2023
1 parent d46b2ae commit 824da7a
Show file tree
Hide file tree
Showing 18 changed files with 613 additions and 518 deletions.
11 changes: 7 additions & 4 deletions server/controllers/events/events_controller_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1069,6 +1069,7 @@ func setupE2E(t *testing.T, repoDir string, opt setupOption) (events_controllers
silenceNoProjects := false

commitStatusUpdater := mocks.NewMockCommitStatusUpdater()
asyncTfExec := runtimemocks.NewMockAsyncTFExec()

mockPreWorkflowHookRunner = runtimemocks.NewMockPreWorkflowHookRunner()
preWorkflowHookURLGenerator := mocks.NewMockPreWorkflowHookURLGenerator()
Expand Down Expand Up @@ -1139,10 +1140,12 @@ func setupE2E(t *testing.T, repoDir string, opt setupOption) (events_controllers
TerraformExecutor: terraformClient,
DefaultTFVersion: defaultTFVersion,
},
PlanStepRunner: &runtime.PlanStepRunner{
TerraformExecutor: terraformClient,
DefaultTFVersion: defaultTFVersion,
},
PlanStepRunner: runtime.NewPlanStepRunner(
terraformClient,
defaultTFVersion,
commitStatusUpdater,
asyncTfExec,
),
ShowStepRunner: showStepRunner,
PolicyCheckStepRunner: policyCheckRunner,
ApplyStepRunner: &runtime.ApplyStepRunner{
Expand Down
10 changes: 5 additions & 5 deletions server/core/runtime/minimum_version_step_runner_delegate.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/runatlantis/atlantis/server/events/command"
)

// MinimumVersionStepRunnerDelegate ensures that a given step runner can't run unless the command version being used
// minimumVersionStepRunnerDelegate ensures that a given step runner can't run unless the command version being used
// is greater than a provided minimum
type MinimumVersionStepRunnerDelegate struct {
type minimumVersionStepRunnerDelegate struct {
minimumVersion *version.Version
defaultTfVersion *version.Version
delegate Runner
Expand All @@ -20,17 +20,17 @@ func NewMinimumVersionStepRunnerDelegate(minimumVersionStr string, defaultVersio
minimumVersion, err := version.NewVersion(minimumVersionStr)

if err != nil {
return &MinimumVersionStepRunnerDelegate{}, errors.Wrap(err, "initializing minimum version")
return &minimumVersionStepRunnerDelegate{}, errors.Wrap(err, "initializing minimum version")
}

return &MinimumVersionStepRunnerDelegate{
return &minimumVersionStepRunnerDelegate{
minimumVersion: minimumVersion,
defaultTfVersion: defaultVersion,
delegate: delegate,
}, nil
}

func (r *MinimumVersionStepRunnerDelegate) Run(ctx command.ProjectContext, extraArgs []string, path string, envs map[string]string) (string, error) {
func (r *minimumVersionStepRunnerDelegate) Run(ctx command.ProjectContext, extraArgs []string, path string, envs map[string]string) (string, error) {
tfVersion := r.defaultTfVersion
if ctx.TerraformVersion != nil {
tfVersion = ctx.TerraformVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestRunMinimumVersionDelegate(t *testing.T) {
expectedOut := "some valid output from delegate"

t.Run("default version success", func(t *testing.T) {
subject := &MinimumVersionStepRunnerDelegate{
subject := &minimumVersionStepRunnerDelegate{
defaultTfVersion: tfVersion12,
minimumVersion: tfVersion12,
delegate: mockDelegate,
Expand All @@ -48,7 +48,7 @@ func TestRunMinimumVersionDelegate(t *testing.T) {
})

t.Run("ctx version success", func(t *testing.T) {
subject := &MinimumVersionStepRunnerDelegate{
subject := &minimumVersionStepRunnerDelegate{
defaultTfVersion: tfVersion11,
minimumVersion: tfVersion12,
delegate: mockDelegate,
Expand All @@ -72,7 +72,7 @@ func TestRunMinimumVersionDelegate(t *testing.T) {
})

t.Run("default version failure", func(t *testing.T) {
subject := &MinimumVersionStepRunnerDelegate{
subject := &minimumVersionStepRunnerDelegate{
defaultTfVersion: tfVersion11,
minimumVersion: tfVersion12,
delegate: mockDelegate,
Expand All @@ -94,7 +94,7 @@ func TestRunMinimumVersionDelegate(t *testing.T) {
})

t.Run("ctx version failure", func(t *testing.T) {
subject := &MinimumVersionStepRunnerDelegate{
subject := &minimumVersionStepRunnerDelegate{
defaultTfVersion: tfVersion12,
minimumVersion: tfVersion12,
delegate: mockDelegate,
Expand Down
33 changes: 33 additions & 0 deletions server/core/runtime/mocks/matchers/recv_chan_of_models_line.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions server/core/runtime/mocks/matchers/send_chan_of_string.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

139 changes: 139 additions & 0 deletions server/core/runtime/mocks/mock_async_tfexec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 824da7a

Please sign in to comment.