adds integration test for presign url and moves the unit test to serv…

…ice/s3 folder

service/internal/integrationtest/s3/presign_test.go

@@ -2,7 +2,22 @@
 
 package s3
 
+import (
+	"bytes"
+	"context"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/internal/integrationtest"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+)
+
 func TestInteg_PresignURL_PutObject(t *testing.T) {
+	key := integrationtest.UniqueID()
 
 	ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancelFn()
@@ -14,12 +29,9 @@ func TestInteg_PresignURL_PutObject(t *testing.T) {
 
 	client := s3.NewFromConfig(cfg)
 
-	bucketName := "mockbucket-01"
-	key := "random"
-
 	params := &s3.PutObjectInput{
-		Bucket: &bucketName,
-		Key:    &key,
+		Bucket: &setupMetadata.Buckets.Source.Name,
+		Key:    aws.String(key),
 		Body:   bytes.NewReader([]byte(`Hello-world`)),
 	}
 
@@ -32,34 +44,32 @@ func TestInteg_PresignURL_PutObject(t *testing.T) {
 		t.Errorf("expect no error, got %v", err)
 	}
 
-	// Putobject
-	t.Logf("url : %v \n", presignRequest.URL)
-	t.Logf("method : %v \n", presignRequest.Method)
-	t.Logf("signed headers : %v \n", presignRequest.SignedHeader)
-
-	t.Logf("attempting to put request")
-
+	// create a http request
 	req, err := http.NewRequest(presignRequest.Method, presignRequest.URL, nil)
 	if err != nil {
 		t.Fatalf("failed to build presigned request, %v", err)
 	}
 
+	// assign the signed headers onto the http request
 	for k, vs := range presignRequest.SignedHeader {
 		for _, v := range vs {
 			req.Header.Add(k, v)
 		}
 	}
 
 	// Need to ensure that the content length member is set of the HTTP Request
-	// or the request will not be transmitted correctly with a content length
+	// or the request will NOT be transmitted correctly with a content length
 	// value across the wire.
 	if contLen := req.Header.Get("Content-Length"); len(contLen) > 0 {
 		req.ContentLength, _ = strconv.ParseInt(contLen, 10, 64)
 	}
 
-	req.Body = ioutil.NopCloser(params.Body)
+	// assign the request body if not nil
+	if params.Body != nil {
+		req.Body = ioutil.NopCloser(params.Body)
+	}
 
-	// Upload the file contents to S3.
+	// Upload the object to S3.
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		t.Fatalf("failed to do PUT request, %v", err)

service/internal/featuretest/s3/presign_test.go → service/s3/internal/customizations/presign_test.go

@@ -1,4 +1,4 @@
-package unit_test
+package customizations_test
 
 import (
 	"bytes"