From 5c2e945b3cdc2b3a12d08e3f9b07e660bf1d4844 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Thu, 9 Feb 2017 10:27:42 -0500 Subject: [PATCH] Fix format string and typos --- command/meta_backend.go | 4 ++-- state/remote/s3.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/command/meta_backend.go b/command/meta_backend.go index cc1c4ee4e..3a80f146b 100644 --- a/command/meta_backend.go +++ b/command/meta_backend.go @@ -1020,7 +1020,7 @@ func (m *Meta) backend_C_r_S_changed( copy, err := m.confirm(&terraform.InputOpts{ Id: "backend-migrate-to-new", Query: fmt.Sprintf("Do you want to copy the state from %q?", c.Type), - Description: strings.TrimSpace(inputBackendMigrateChange), + Description: strings.TrimSpace(fmt.Sprintf(inputBackendMigrateChange, c.Type, s.Backend.Type)), }) if err != nil { return nil, fmt.Errorf( @@ -1572,7 +1572,7 @@ Current Serial: %[2]d const inputBackendMigrateChange = ` Would you like to copy the state from your prior backend %q to the -newly configured backend %q? If you're reconfiguring the same backend, +newly configured %q backend? If you're reconfiguring the same backend, answering "yes" or "no" shouldn't make a difference. Please answer exactly "yes" or "no". ` diff --git a/state/remote/s3.go b/state/remote/s3.go index ab101d2b7..e21e9d2d5 100644 --- a/state/remote/s3.go +++ b/state/remote/s3.go @@ -231,7 +231,7 @@ func (c *S3Client) Lock(info string) error { resp, err := c.dynClient.GetItem(getParams) if err != nil { - return fmt.Errorf("s3 state file %q locked, failed to retrive info: %s", stateName, err) + return fmt.Errorf("s3 state file %q locked, failed to retrieve info: %s", stateName, err) } var infoData string