Ensuren SDK's testing HTTP server usage are cleaned up (#2841)

Ensure HTTP servers are cleaned up during testing after no longer needed. This was creating excessive noise in testing stack traces due to the number of background goroutines active.

Also updated SDK's unit tests to use verbose logging, have shorter runtime, and have a timeout fo 5m.

Related to #2840

Author: jasdel

Makefile

@@ -20,6 +20,8 @@ SDK_TESTING_PKGS=./awstesting/...
 SDK_MODELS_PKGS=./models/...
 SDK_ALL_PKGS=${SDK_COMPA_PKGS} ${SDK_TESTING_PKGS} ${SDK_EXAMPLES_PKGS} ${SDK_MODELS_PKGS}
 
+TEST_TIMEOUT=-timeout 5m
+
 all: generate unit
 
 ###################
@@ -57,20 +59,18 @@ build:
 	go build -o /dev/null -tags ${ALL_TAGS} ${SDK_ALL_PKGS}
 
 unit-no-verify:
-	@echo "go test SDK and vendor packages with no linting"
-	go test -count=1 -tags ${UNIT_TEST_TAGS} ${SDK_ALL_PKGS}
-
-unit: verify build
 	@echo "go test SDK and vendor packages"
-	go test -count=1 -tags ${UNIT_TEST_TAGS} ${SDK_ALL_PKGS}
+	go test ${TEST_TIMEOUT} -v -count=1 -tags ${UNIT_TEST_TAGS} ${SDK_ALL_PKGS}
+
+unit: verify build unit-no-verify
 
 unit-with-race-cover: verify build
 	@echo "go test SDK and vendor packages"
-	go test -v -count=1 -tags ${UNIT_TEST_TAGS} -race -cpu=1,2,4 ${SDK_ALL_PKGS}
+	go test ${TEST_TIMEOUT} -v -count=1 -tags ${UNIT_TEST_TAGS} -race -cpu=1,2,4 ${SDK_ALL_PKGS}
 
 unit-old-go-race-cover:
 	@echo "go test SDK only packages for old Go versions"
-	go test -v -count=1 -race -cpu=1,2,4 ${SDK_COMPA_PKGS}
+	go test ${TEST_TIMEOUT} -v -count=1 -race -cpu=1,2,4 ${SDK_COMPA_PKGS}
 
 ci-test: generate unit-with-race-cover ci-test-generate-validate
 

aws/corehandlers/handlers_1_10_test.go

@@ -3,50 +3,42 @@
 package corehandlers_test
 
 import (
-	"crypto/tls"
+	"bytes"
+	"io"
 	"net/http"
+	"net/http/httptest"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/awstesting"
+	"github.com/aws/aws-sdk-go/awstesting/unit"
 	"github.com/aws/aws-sdk-go/service/s3"
-	"golang.org/x/net/http2"
 )
 
 func TestSendHandler_HEADNoBody(t *testing.T) {
-	TLSBundleCertFile, TLSBundleKeyFile, TLSBundleCAFile, err := awstesting.CreateTLSBundleFiles()
-	if err != nil {
-		panic(err)
-	}
-	defer awstesting.CleanupTLSBundleFiles(TLSBundleCertFile, TLSBundleKeyFile, TLSBundleCAFile)
-
-	endpoint, err := awstesting.CreateTLSServer(TLSBundleCertFile, TLSBundleKeyFile, nil)
-	if err != nil {
-		t.Fatalf("expect no error, got %v", err)
-	}
-
-	transport := http.DefaultTransport.(*http.Transport)
-	// test server's certificate is self-signed certificate
-	transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
-	http2.ConfigureTransport(transport)
-
-	sess, err := session.NewSessionWithOptions(session.Options{
-		Config: aws.Config{
-			HTTPClient:       &http.Client{},
-			Endpoint:         aws.String(endpoint),
-			Region:           aws.String("mock-region"),
-			Credentials:      credentials.AnonymousCredentials,
-			S3ForcePathStyle: aws.Bool(true),
-		},
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		defer r.Body.Close()
+		if e, a := "HEAD", r.Method; e != a {
+			t.Errorf("expected %v method, got %v", e, a)
+		}
+		var buf bytes.Buffer
+		io.Copy(&buf, r.Body)
+
+		if n := buf.Len(); n != 0 {
+			t.Errorf("expect empty body, got %d", n)
+		}
+
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer server.Close()
+
+	svc := s3.New(unit.Session, &aws.Config{
+		Endpoint:         aws.String(server.URL),
+		Credentials:      credentials.AnonymousCredentials,
+		S3ForcePathStyle: aws.Bool(true),
+		DisableSSL:       aws.Bool(true),
 	})
-	if err != nil {
-		t.Fatalf("expect no error, got %v", err)
-	}
-
-	svc := s3.New(sess)
 
 	req, _ := svc.HeadObjectRequest(&s3.HeadObjectInput{
 		Bucket: aws.String("bucketname"),
@@ -57,8 +49,7 @@ func TestSendHandler_HEADNoBody(t *testing.T) {
 		t.Fatalf("expect %T request body, got %T", e, a)
 	}
 
-	err = req.Send()
-	if err != nil {
+	if err := req.Send(); err != nil {
 		t.Fatalf("expect no error, got %v", err)
 	}
 	if e, a := http.StatusOK, req.HTTPResponse.StatusCode; e != a {

aws/corehandlers/handlers_test.go

@@ -239,6 +239,7 @@ func TestSendWithoutFollowRedirects(t *testing.T) {
 			t.Fatalf("expect not to redirect, but was")
 		}
 	}))
+	defer server.Close()
 
 	svc := awstesting.NewClient(&aws.Config{
 		DisableSSL: aws.Bool(true),
@@ -344,6 +345,7 @@ func setupContentLengthTestServer(t *testing.T, hasContentLength bool, contentLe
 
 func TestBuildContentLength_ZeroBody(t *testing.T) {
 	server := setupContentLengthTestServer(t, false, 0)
+	defer server.Close()
 
 	svc := s3.New(unit.Session, &aws.Config{
 		Endpoint:         aws.String(server.URL),
@@ -362,6 +364,7 @@ func TestBuildContentLength_ZeroBody(t *testing.T) {
 
 func TestBuildContentLength_NegativeBody(t *testing.T) {
 	server := setupContentLengthTestServer(t, false, 0)
+	defer server.Close()
 
 	svc := s3.New(unit.Session, &aws.Config{
 		Endpoint:         aws.String(server.URL),
@@ -382,6 +385,7 @@ func TestBuildContentLength_NegativeBody(t *testing.T) {
 
 func TestBuildContentLength_WithBody(t *testing.T) {
 	server := setupContentLengthTestServer(t, true, 1024)
+	defer server.Close()
 
 	svc := s3.New(unit.Session, &aws.Config{
 		Endpoint:         aws.String(server.URL),

aws/credentials/credentials_test.go

@@ -2,6 +2,7 @@ package credentials
 
 import (
 	"math/rand"
+	"sync"
 	"testing"
 	"time"
 
@@ -107,17 +108,20 @@ func TestCredentialsIsExpired_Race(t *testing.T) {
 	creds := NewChainCredentials([]Provider{&MockProvider{}})
 
 	starter := make(chan struct{})
+	var wg sync.WaitGroup
+	wg.Add(10)
 	for i := 0; i < 10; i++ {
 		go func() {
+			defer wg.Done()
 			<-starter
-			for {
+			for i := 0; i < 100; i++ {
 				creds.IsExpired()
 			}
 		}()
 	}
 	close(starter)
 
-	time.Sleep(10 * time.Second)
+	wg.Wait()
 }
 
 func TestCredentialsExpiresAt_NoExpirer(t *testing.T) {

aws/credentials/endpointcreds/provider_test.go

@@ -37,6 +37,7 @@ func TestRetrieveRefreshableCredentials(t *testing.T) {
 			fmt.Println("failed to write out creds", err)
 		}
 	}))
+	defer server.Close()
 
 	client := endpointcreds.NewProviderClient(*unit.Session.Config,
 		unit.Session.Handlers,
@@ -82,6 +83,7 @@ func TestRetrieveStaticCredentials(t *testing.T) {
 			fmt.Println("failed to write out creds", err)
 		}
 	}))
+	defer server.Close()
 
 	client := endpointcreds.NewProviderClient(*unit.Session.Config, unit.Session.Handlers, server.URL)
 	creds, err := client.Retrieve()
@@ -117,6 +119,7 @@ func TestFailedRetrieveCredentials(t *testing.T) {
 			fmt.Println("failed to write error", err)
 		}
 	}))
+	defer server.Close()
 
 	client := endpointcreds.NewProviderClient(*unit.Session.Config, unit.Session.Handlers, server.URL)
 	creds, err := client.Retrieve()
@@ -181,6 +184,7 @@ func TestAuthorizationToken(t *testing.T) {
 			fmt.Println("failed to write out creds", err)
 		}
 	}))
+	defer server.Close()
 
 	client := endpointcreds.NewProviderClient(*unit.Session.Config,
 		unit.Session.Handlers,

aws/csm/reporter_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/client/metadata"
 	"github.com/aws/aws-sdk-go/aws/csm"
 	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/aws/signer/v4"
+	v4 "github.com/aws/aws-sdk-go/aws/signer/v4"
 	"github.com/aws/aws-sdk-go/awstesting/unit"
 	"github.com/aws/aws-sdk-go/private/protocol/jsonrpc"
 )
@@ -277,6 +277,7 @@ func BenchmarkWithCSM(b *testing.B) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte(fmt.Sprintf("{}")))
 	}))
+	defer server.Close()
 
 	cfg := aws.Config{
 		Endpoint: aws.String(server.URL),
@@ -322,6 +323,7 @@ func BenchmarkWithCSMNoUDPConnection(b *testing.B) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte(fmt.Sprintf("{}")))
 	}))
+	defer server.Close()
 
 	cfg := aws.Config{
 		Endpoint: aws.String(server.URL),
@@ -368,6 +370,7 @@ func BenchmarkWithoutCSM(b *testing.B) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte(fmt.Sprintf("{}")))
 	}))
+	defer server.Close()
 
 	cfg := aws.Config{
 		Endpoint: aws.String(server.URL),

aws/ec2metadata/service_test.go

@@ -62,6 +62,7 @@ func TestClientOverrideDefaultHTTPClientTimeoutRace(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte("us-east-1a"))
 	}))
+	defer server.Close()
 
 	cfg := aws.NewConfig().WithEndpoint(server.URL)
 	runEC2MetadataClients(t, cfg, 100)
@@ -71,6 +72,7 @@ func TestClientOverrideDefaultHTTPClientTimeoutRaceWithTransport(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte("us-east-1a"))
 	}))
+	defer server.Close()
 
 	cfg := aws.NewConfig().WithEndpoint(server.URL).WithHTTPClient(&http.Client{
 		Transport: http.DefaultTransport,

aws/request/request_1_8_test.go

@@ -58,6 +58,7 @@ func TestRequest_FollowPUTRedirects(t *testing.T) {
 			t.Fatalf("unexpected endpoint used, %q", r.URL.String())
 		}
 	}))
+	defer server.Close()
 
 	svc := awstesting.NewClient(&aws.Config{
 		Region:     unit.Session.Config.Region,