Skip to content

command: adjust exit code of state rm #22300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pselle merged 8 commits into from
Jun 24, 2020
+12 −11
Merged

command: adjust exit code of state rm #22300

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1151800
command: adjust exit code of state rm and state mv
Aug 1, 2019
7464f5a
command: fix error output in state rm and state mv
Aug 24, 2019
4d712b6
command: fix syntax error
Aug 24, 2019
2dc0b84
command: remove outdated assertion in state_rm_test
Aug 24, 2019
a69e1a0
Merge branch 'master' into fix-state-rm-n-mv-exit-code
Sep 14, 2019
2bd8bd1
command: avoid repetition of a string literal
Sep 14, 2019
026f23f
command: revert changes to state_mv
Sep 27, 2019
c9c63b3
Merge branch 'master' of github.com:hashicorp/terraform into fix-stat…
Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions command/state_mv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,13 +353,19 @@ func (c *StateMvCommand) Run(args []string) int {
}
}

c.showDiagnostics(diags)

if moved == 0 {
c.Ui.Output("No matching objects found.")
} else {
c.Ui.Output(fmt.Sprintf("Successfully moved %d object(s).", moved))
diags = diags.Append(tfdiags.Sourceless(
tfdiags.Error,
"Invalid target address",
"No matching objects found. To view the available instances, use \"terraform state list\". Please modify the address to reference a specific instance.",
))
c.showDiagnostics(diags)
return 1
}

c.showDiagnostics(diags)

c.Ui.Output(fmt.Sprintf("Successfully moved %d object(s).", moved))
return 0
}

Expand Down
14 changes: 10 additions & 4 deletions command/state_rm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,21 @@ func (c *StateRmCommand) Run(args []string) int {
return 1
}

if len(diags) > 0 {
if len(diags) > 0 && isCount != 0 {
c.showDiagnostics(diags)
}

if isCount == 0 {
c.Ui.Output("No matching resource instances found.")
} else {
c.Ui.Output(fmt.Sprintf("Successfully removed %d resource instance(s).", isCount))
diags = diags.Append(tfdiags.Sourceless(
tfdiags.Error,
"Invalid target address",
"No matching objects found. To view the available instances, use \"terraform state list\". Please modify the address to reference a specific instance.",
))
c.showDiagnostics(diags)
return 1
}

c.Ui.Output(fmt.Sprintf("Successfully removed %d resource instance(s).", isCount))
return 0
}

Expand Down
9 changes: 2 additions & 7 deletions command/state_rm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,9 @@ func TestStateRmNonExist(t *testing.T) {
"-state", statePath,
"test_instance.baz", // doesn't exist in the state constructed above
}
if code := c.Run(args); code != 0 {
t.Fatalf("expected exit status %d, got: %d", 0, code)
}

if msg := ui.OutputWriter.String(); !strings.Contains(msg, "No matching resource instances found") {
t.Fatalf("unexpected output:\n%s", msg)
if code := c.Run(args); code != 1 {
t.Fatalf("expected exit status %d, got: %d", 1, code)
}

}

func TestStateRm_backupExplicit(t *testing.T) {
Expand Down