fix: atlantis import on workspaces #2937
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
krrrr38
force-pushed
the
fix-import-workspace
branch
from
68c2348 to
5b48836
Compare
krrrr38
force-pushed
the
fix-import-workspace
branch
from
5b48836 to
7d12f31
Compare
krrrr38
commented
Jan 5, 2023
| @@ -100,59 +104,7 @@ func (p *PlanStepRunner) remotePlan(ctx command.ProjectContext, extraArgs []stri | |||
| return p.fmtPlanOutput(output, tfVersion), nil | |||
| } | |||
|
|
|||
| // switchWorkspace changes the terraform workspace if necessary and will create | |||
| // it if it doesn't exist. It handles differences between versions. | |||
| func (p *PlanStepRunner) switchWorkspace(ctx command.ProjectContext, path string, tfVersion *version.Version, envs map[string]string) error { | |||
There was a problem hiding this comment.
this logic is moved into workspace_step_runner_delegate.go (_delegate.go is used like minimum_version_step_runner_delegate.go)
krrrr38
commented
Jan 5, 2023
| @@ -24,358 +25,12 @@ import ( | |||
| . "github.com/runatlantis/atlantis/testing" | |||
| ) | |||
|
|
|||
| func TestRun_NoWorkspaceIn08(t *testing.T) { | |||
There was a problem hiding this comment.
these tests are test for workspace, so moved into workspace_step_runner_delegate_test.go
krrrr38
commented
Jan 5, 2023
| @@ -57,6 +59,22 @@ type Runner interface { | |||
| Run(ctx command.ProjectContext, extraArgs []string, path string, envs map[string]string) (string, error) | |||
| } | |||
|
|
|||
| // NullRunner is a runner that isn't configured for a given plan type but outputs nothing | |||
| type NullRunner struct{} | |||
krrrr38
commented
Jan 5, 2023
| . "github.com/runatlantis/atlantis/testing" | ||
| ) | ||
|
|
||
| func TestRun_NoWorkspaceIn08(t *testing.T) { |
There was a problem hiding this comment.
just moved from plan_step_runner_test.go
krrrr38
commented
Jan 5, 2023
| terraformExecutor: terraformExecutor, | ||
| defaultTFVersion: defaultTfVersion, | ||
| } | ||
| return NewWorkspaceStepRunnerDelegate(terraformExecutor, defaultTfVersion, runner) |
There was a problem hiding this comment.
this delegation is the most important fix in this PR.
nitrocode
changed the title
nitrocode
reviewed
Jan 8, 2023
nitrocode
reviewed
Jan 10, 2023
nitrocode
reviewed
Jan 11, 2023
jamengual
approved these changes
Jan 11, 2023
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
what
why
atlantis importrequireterraform initprocess for initialize dir. At that timeterraform workspace selectis also required like plan_step_runner.Asis impl doesn't switch workspace, so not work
atlantis importon workspace.tests
references
atlantis importdoes not setterraform.workspace#2930