Fix for artifact purging etag when s3 download falls back to http

cr: https://code.amazon.com/reviews/CR-117487456

Author: gianniLesl

agent/fileutil/artifact/artifact.go

@@ -282,8 +282,6 @@ func s3Download(context context.T, amazonS3URL s3util.AmazonS3URL, destFile stri
 	if err != nil {
 		if req.HTTPResponse == nil || req.HTTPResponse.StatusCode != http.StatusNotModified {
 			log.Debug("failed to download from s3, ", err)
-			fileutil.DeleteFile(destFile)
-			fileutil.DeleteFile(eTagFile)
 			return
 		}
 

agent/fileutil/artifact/artifact_integ_test.go

@@ -18,13 +18,12 @@ package artifact
 
 import (
 	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-
 	"github.com/aws/amazon-ssm-agent/agent/mocks/context"
 	"github.com/aws/amazon-ssm-agent/agent/mocks/log"
 	"github.com/stretchr/testify/assert"
+	"os"
+	"path/filepath"
+	"testing"
 )
 
 type DownloadTest struct {
@@ -234,15 +233,15 @@ func TestDownloads(t *testing.T) {
 }
 
 func TestHttpHttpsDownloadArtifact(t *testing.T) {
-	testFilePath := "https://www.ietf.org/rfc/rfc1350.txt"
+	testFilePath := "https://amazon-ssm-us-east-1.s3.amazonaws.com/3.3.40.0/VERSION"
 	downloadInput := DownloadInput{
 		DestinationDirectory: ".",
 		SourceURL:            testFilePath,
 		SourceChecksums: map[string]string{
-			"sha256": "39c9534e5fa6fecd3ac083ffd6256c2cc9a58f9f1058cb2e472d1782040231f9",
+			"sha256": "0c0f36c238e6c4c00f39d94dc6381930df2851db0ea2e2543d931474ddce1f8f",
 		},
 	}
-	var expectedLocalPath = "dd5335f3e07903892245d100f4d7df03067e6402"
+	var expectedLocalPath = "b9f961391ec1ae061db3afcbed5571b2463139c8"
 	os.Remove(expectedLocalPath)
 	os.Remove(expectedLocalPath + ".etag")
 	expectedOutput := DownloadOutput{
@@ -253,6 +252,11 @@ func TestHttpHttpsDownloadArtifact(t *testing.T) {
 	output, err := Download(mockContext, downloadInput)
 	assert.NoError(t, err, "Failed to download %v", downloadInput)
 	mockLog.Infof("Download Result is %v and err:%v", output, err)
+
+	defer func() {
+		os.Remove(expectedLocalPath)
+		os.Remove(expectedLocalPath + ".etag")
+	}()
 	assert.Equal(t, expectedOutput, output)
 
 	// now since we have downloaded the file, try to download again should result in cache hit!
@@ -264,9 +268,6 @@ func TestHttpHttpsDownloadArtifact(t *testing.T) {
 	assert.NoError(t, err, "Failed to download %v", downloadInput)
 	mockLog.Infof("Download Result is %v and err:%v", output, err)
 	assert.Equal(t, expectedOutput, output)
-
-	os.Remove(expectedLocalPath)
-	os.Remove(expectedLocalPath + ".etag")
 }
 
 func ExampleMd5HashValue() {