fixed unit-test

aws · Nov 13, 2024 · a1a0f2c · a1a0f2c
1 parent b551012
commit a1a0f2c
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
@@ -835,14 +835,14 @@ func createTestTLSServer(listenAddr string) (*Server, *tls.Config, error) {
 	if err != nil {
 		return nil, nil, err
 	}
-	httpOptions := []Option{}
-	httpOptions = append(httpOptions, WithTLSConfig(tlsConfig, listenAddr))
-
 	//generate ca bundle
 	bundle, err := readCABundle(caBundle)
 	if err != nil {
 		return nil, nil, err
 	}
+	httpOptions := []Option{}
+	httpOptions = append(httpOptions, WithTLSConfig(tlsConfig, listenAddr))
+
 	allocator := &mockAllocator{targetItems: map[string]*target.Item{
 		"a": target.NewItem("job1", "", model.LabelSet{}, ""),
 	}}