Skip to content
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

command: Make provider installation interruptible #26405

Merged
merged 2 commits into from
Sep 29, 2020
Merged

command: Make provider installation interruptible #26405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4070f3
command/0.13upgrade: Remove this subcommand
apparentlymart Sep 28, 2020
dce9b65
command: Make provider installation interruptible
apparentlymart Sep 29, 2020
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
8 changes: 4 additions & 4 deletions command/012_config_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ type ZeroTwelveUpgradeCommand struct {

func (c *ZeroTwelveUpgradeCommand) Run(args []string) int {
c.Ui.Output(fmt.Sprintf(`
The 0.12upgrade command is deprecated. You must run this command with Terraform
v0.12 to upgrade your configuration syntax before upgrading to the current
version.`))
The 0.12upgrade command has been removed. You must run this command with
Terraform v0.12 to upgrade your configuration syntax before upgrading to the
current version.`))
return 0
}

func (c *ZeroTwelveUpgradeCommand) Help() string {
helpText := `
Usage: terraform 0.12upgrade

The 0.12upgrade command is deprecated. You must run this command with
The 0.12upgrade command has been removed. You must run this command with
Terraform v0.12 to upgrade your configuration syntax before upgrading to
the current version.
`
Expand Down
2 changes: 1 addition & 1 deletion command/012_config_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestZeroTwelveUpgrade_deprecated(t *testing.T) {
}

output := ui.OutputWriter.String()
if !strings.Contains(output, "The 0.12upgrade command is deprecated.") {
if !strings.Contains(output, "The 0.12upgrade command has been removed.") {
t.Fatal("unexpected output:", output)
}
}
Loading