From 9ae45e320fa680a2ba4d52f2fce06bc33e6ff2b0 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Fri, 8 Sep 2017 09:30:48 +0200 Subject: [PATCH] backend/remote-state/gcloud: Refactor Backend.DeleteState(). Fixes: * https://github.com/golang/go/wiki/CodeReviewComments#doc-comments * https://github.com/golang/go/wiki/CodeReviewComments#error-strings --- backend/remote-state/gcloud/backend_state.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/backend/remote-state/gcloud/backend_state.go b/backend/remote-state/gcloud/backend_state.go index b9daf63ccd..947a11c468 100644 --- a/backend/remote-state/gcloud/backend_state.go +++ b/backend/remote-state/gcloud/backend_state.go @@ -49,22 +49,18 @@ func (b *Backend) States() ([]string, error) { return states, nil } +// DeleteState deletes the named state. The "default" state cannot be deleted. func (b *Backend) DeleteState(name string) error { - if name == backend.DefaultStateName || name == "" { - return fmt.Errorf("Can't delete default state") + if name == backend.DefaultStateName { + return fmt.Errorf("cowardly refusing to delete the %q state", name) } client, err := b.remoteClient(name) if err != nil { - return fmt.Errorf("Failed to create Google Storage client: %v", err) + return err } - err = client.Delete() - if err != nil { - return fmt.Errorf("Failed to delete state file %v: %v", client.stateFileURL(), err) - } - - return nil + return client.Delete() } // get a remote client configured for this state