From fc25f0ae89e74eef02d562e957691559cf930982 Mon Sep 17 00:00:00 2001 From: Carlisia Date: Wed, 24 Apr 2019 12:04:19 -0700 Subject: [PATCH] Clean up + changelog Signed-off-by: Carlisia --- changelogs/unreleased/1390-ncdc,carlisia | 1 + pkg/cloudprovider/aws/object_store.go | 4 +--- pkg/cloudprovider/gcp/object_store.go | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 changelogs/unreleased/1390-ncdc,carlisia diff --git a/changelogs/unreleased/1390-ncdc,carlisia b/changelogs/unreleased/1390-ncdc,carlisia new file mode 100644 index 000000000..d0e407867 --- /dev/null +++ b/changelogs/unreleased/1390-ncdc,carlisia @@ -0,0 +1 @@ +Fail backup if it already exists in object storage. \ No newline at end of file diff --git a/pkg/cloudprovider/aws/object_store.go b/pkg/cloudprovider/aws/object_store.go index 825c3849b..9d3e7aab6 100644 --- a/pkg/cloudprovider/aws/object_store.go +++ b/pkg/cloudprovider/aws/object_store.go @@ -218,9 +218,7 @@ func (o *ObjectStore) ObjectExists(bucket, key string) (bool, error) { } log.Debug("Checking if object exists") - _, err := o.s3.HeadObject(req) - - if err != nil { + if _, err := o.s3.HeadObject(req); err != nil { log.Debug("Checking for AWS specific error information") if aerr, ok := err.(awserr.Error); ok { log.WithFields( diff --git a/pkg/cloudprovider/gcp/object_store.go b/pkg/cloudprovider/gcp/object_store.go index a3a682433..766c8f12b 100644 --- a/pkg/cloudprovider/gcp/object_store.go +++ b/pkg/cloudprovider/gcp/object_store.go @@ -123,9 +123,7 @@ func (o *ObjectStore) PutObject(bucket, key string, body io.Reader) error { } func (o *ObjectStore) ObjectExists(bucket, key string) (bool, error) { - _, err := o.bucketWriter.getAttrs(bucket, key) - - if err != nil { + if _, err := o.bucketWriter.getAttrs(bucket, key); err != nil { if err == storage.ErrObjectNotExist { return false, nil }