fixed unit-test

aws · Nov 13, 2024 · d59fed3 · d59fed3
1 parent b551012
commit d59fed3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/cmd/amazon-cloudwatch-agent-target-allocator/server/server.go b/cmd/amazon-cloudwatch-agent-target-allocator/server/server.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -73,7 +74,13 @@ func WithTLSConfig(tlsConfig *tls.Config, httpsListenAddr string) Option {
 		s.setRouter(httpsRouter)
 
 		s.httpsServer = &http.Server{Addr: httpsListenAddr, Handler: httpsRouter, ReadHeaderTimeout: 90 * time.Second, TLSConfig: tlsConfig}
-		s.server.Shutdown(context.Background())
+		err := s.server.Shutdown(context.Background())
+		if err != nil {
+			s.logger.Error(err, "Failed to shutdown http server")
+		}
+		if errors.Is(err, http.ErrServerClosed) {
+			s.logger.Info("Http server is already closed")
+		}
 		s.server = s.httpsServer
 	}
 }

diff --git a/cmd/amazon-cloudwatch-agent-target-allocator/server/server_test.go b/cmd/amazon-cloudwatch-agent-target-allocator/server/server_test.go
@@ -680,7 +680,7 @@ func TestServer_Readiness(t *testing.T) {
 }
 
 func TestServer_ValidCAonTLS(t *testing.T) {
-	listenAddr := ":8443"
+	listenAddr := ""
 	server, clientTlsConfig, err := createTestTLSServer(listenAddr)
 	assert.NoError(t, err)
 	go func() {
@@ -735,7 +735,7 @@ func TestServer_ValidCAonTLS(t *testing.T) {
 }
 
 func TestServer_MissingCAonTLS(t *testing.T) {
-	listenAddr := ":8443"
+	listenAddr := ""
 	server, _, err := createTestTLSServer(listenAddr)
 	assert.NoError(t, err)
 	go func() {
@@ -780,7 +780,7 @@ func TestServer_MissingCAonTLS(t *testing.T) {
 }
 
 func TestServer_HTTPOnTLS(t *testing.T) {
-	listenAddr := ":8443"
+	listenAddr := ""
 	server, _, err := createTestTLSServer(listenAddr)
 	assert.NoError(t, err)
 	go func() {