From 98d7bcefef6391ee421fd173ce9a60c0fb38f915 Mon Sep 17 00:00:00 2001 From: Jakub Janczak Date: Fri, 6 Feb 2015 10:41:50 +0100 Subject: [PATCH] remote/s3: there is no ok answer on error --- command/remote.go | 10 +++------- remote/s3.go | 6 ------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/command/remote.go b/command/remote.go index 3b9e8c57b..74ddddbda 100644 --- a/command/remote.go +++ b/command/remote.go @@ -32,7 +32,7 @@ type RemoteCommand struct { func (c *RemoteCommand) Run(args []string) int { args = c.Meta.process(args, false) - var address, accessToken, name, path, region, securityToken, bucket string + var address, accessToken, name, path, region, securityToken string cmdFlags := flag.NewFlagSet("remote", flag.ContinueOnError) cmdFlags.BoolVar(&c.conf.disableRemote, "disable", false, "") cmdFlags.BoolVar(&c.conf.pullOnDisable, "pull", true, "") @@ -42,7 +42,6 @@ func (c *RemoteCommand) Run(args []string) int { cmdFlags.StringVar(&address, "address", "", "") cmdFlags.StringVar(&accessToken, "access-token", "", "") cmdFlags.StringVar(&securityToken, "security-token", "", "") - cmdFlags.StringVar(&bucket, "bucket", "", "") cmdFlags.StringVar(®ion, "region", "", "") cmdFlags.StringVar(&name, "name", "", "") cmdFlags.StringVar(&path, "path", "", "") @@ -65,7 +64,6 @@ func (c *RemoteCommand) Run(args []string) int { "security_token": securityToken, "name": name, "path": path, - "bucket": bucket, "region": region, } @@ -330,7 +328,7 @@ Usage: terraform remote [options] Options: -address=url URL of the remote storage server. - Required for HTTP backend, optional for Atlas and Consul. + Required for HTTP and S3 backend, optional for Atlas and Consul. -access-token=token Authentication token for state storage server. Required for Atlas backend, optional for Consul. @@ -344,8 +342,6 @@ Options: modifying. Defaults to the "-state" path with ".backup" extension. Set to "-" to disable backup. - -bucket=bucket S3 bucket name. Specific to S3 (required). - -disable Disables remote state management and migrates the state to the -state path. @@ -353,7 +349,7 @@ Options: Required for Atlas backend. -path=path Path of the remote state in Consul. Required for the - Consul and S3 backend. + Consul. -pull=true Controls if the remote state is pulled before disabling. This defaults to true to ensure the latest state is cached diff --git a/remote/s3.go b/remote/s3.go index a4c34e53a..6c4d1a41f 100644 --- a/remote/s3.go +++ b/remote/s3.go @@ -80,8 +80,6 @@ func (c *S3RemoteClient) GetState() (*RemoteStatePayload, error) { // FIXME copied from Atlas // Handle the common status codes switch s3Err.StatusCode { - case http.StatusOK: - // Handled after case http.StatusNoContent: return nil, nil case http.StatusNotFound: @@ -144,8 +142,6 @@ func (c *S3RemoteClient) PutState(state []byte, force bool) error { // Handle the error codes switch s3Err.StatusCode { - case http.StatusOK: - return nil case http.StatusUnauthorized: return ErrRequireAuth case http.StatusForbidden: @@ -167,8 +163,6 @@ func (c *S3RemoteClient) DeleteState() error { s3Err := err.(*s3.Error) // Handle the error codes switch s3Err.StatusCode { - case http.StatusOK: - return nil case http.StatusNoContent: return nil case http.StatusNotFound: