mantle/aws: simplify force upload handling of s3 objects

This will make it so we don't have to conditionalize the function
call to API.RemoveImage based on if we are uploading WinLI images
or not.

This is prep for more simplification in the future.

Author: dustymabe

mantle/cmd/ore/aws/upload.go

@@ -207,16 +207,21 @@ func runUpload(cmd *cobra.Command, args []string) error {
 	}
 
 	if uploadForce {
-		var err error
-		if !uploadCreateWinLIAMI {
-			err = API.RemoveImage(uploadAMIName, s3BucketName, s3ObjectPath)
-		} else {
-			err = API.RemoveImage(uploadAMIName, "", "")
-		}
+		err := API.RemoveImage(uploadAMIName)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
 			os.Exit(1)
 		}
+		// Since we are force uploading delete the s3 object used previously too
+		// if it exists. A "NoSuchKey" err means it didn't exist and we can ignore.
+		if uploadSourceObject == "" && uploadSourceSnapshot == "" {
+			if err := API.DeleteObject(s3BucketName, s3ObjectPath); err != nil {
+				if !strings.Contains(err.Error(), "NoSuchKey") {
+					fmt.Fprintf(os.Stderr, "unable to delete object: %v\n", err)
+					os.Exit(1)
+				}
+			}
+		}
 	}
 
 	// if no snapshot was specified, check for an existing one or a

mantle/platform/api/aws/images.go

@@ -478,23 +478,7 @@ func (a *API) deregisterImageIfExists(name string) error {
 }
 
 // Remove all uploaded data associated with an AMI.
-func (a *API) RemoveImage(name, s3BucketName, s3ObjectPath string) error {
-	// Delete S3 object if bucket and path are specified.
-	if s3BucketName != "" && s3ObjectPath != "" {
-		err := a.DeleteObject(s3BucketName, s3ObjectPath)
-		if err != nil {
-			if awsErr, ok := err.(awserr.Error); ok {
-				if awsErr.Code() != "NoSuchKey" {
-					return err
-				}
-			} else {
-				return err
-			}
-		} else {
-			plog.Infof("Deleted existing S3 object bucket:%s path:%s", s3BucketName, s3ObjectPath)
-		}
-	}
-
+func (a *API) RemoveImage(name string) error {
 	// compatibility with old versions of this code, which created HVM
 	// AMIs with an "-hvm" suffix
 	err := a.deregisterImageIfExists(name + "-hvm")