Clean up + changelog

Signed-off-by: Carlisia <carlisiac@vmware.com>

changelogs/unreleased/1390-ncdc,carlisia

@@ -0,0 +1 @@
+Fail backup if it already exists in object storage.

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(

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
 		}