return err on .Start() and expose a function to retrieve url via .URL()

cloudfoundry · Jun 14, 2024 · 16f04ba · 16f04ba
1 parent 3fdc401
commit 16f04ba
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 21 deletions.
diff --git a/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go b/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go
@@ -185,11 +185,12 @@ var _ = Describe("MetricPoller", func() {
 					},
 				},
 			}, nil)
-			mockLogCacheEndpoint := mockLogCache.Start(3000 + GinkgoParallelProcess())
+			err = mockLogCache.Start(3000 + GinkgoParallelProcess())
+			Expect(err).ToNot(HaveOccurred())
 
 			metricClient = NewMetricClientFactory().GetMetricClient(logger, &config.Config{
 				MetricCollector: config.MetricCollectorConfig{
-					MetricCollectorURL: mockLogCacheEndpoint,
+					MetricCollectorURL: mockLogCache.URL(),
 					TLSClientCerts: models.TLSCerts{
 						KeyFile:    filepath.Join(testCertDir, "log-cache.key"),
 						CertFile:   filepath.Join(testCertDir, "log-cache.crt"),

diff --git a/src/autoscaler/eventgenerator/cmd/eventgenerator/eventgenerator_suite_test.go b/src/autoscaler/eventgenerator/cmd/eventgenerator/eventgenerator_suite_test.go
@@ -35,17 +35,16 @@ var (
 	metricType = "a-metric-type"
 	metricUnit = "a-metric-unit"
 
-	regPath              = regexp.MustCompile(`^/v1/apps/.*/scale$`)
-	configFile           *os.File
-	conf                 config.Config
-	egPort               int
-	healthport           int
-	httpClient           *http.Client
-	healthHttpClient     *http.Client
-	mockLogCache         *testhelpers.MockLogCache
-	mockLogCacheEndpoint string
-	mockScalingEngine    *ghttp.Server
-	breachDurationSecs   = 10
+	regPath            = regexp.MustCompile(`^/v1/apps/.*/scale$`)
+	configFile         *os.File
+	conf               config.Config
+	egPort             int
+	healthport         int
+	httpClient         *http.Client
+	healthHttpClient   *http.Client
+	mockLogCache       *testhelpers.MockLogCache
+	mockScalingEngine  *ghttp.Server
+	breachDurationSecs = 10
 
 	scalingResult = &models.AppScalingResult{
 		AppId:             testAppId,
@@ -225,7 +224,8 @@ func initHttpEndPoints() {
 			},
 		},
 	}, nil)
-	mockLogCacheEndpoint = mockLogCache.Start(10000 + GinkgoParallelProcess())
+	err = mockLogCache.Start(10000 + GinkgoParallelProcess())
+	Expect(err).ToNot(HaveOccurred())
 
 	mockScalingEngine = ghttp.NewUnstartedServer()
 	mockScalingEngine.HTTPTestServer.TLS = testhelpers.ServerTlsConfig("scalingengine")
@@ -293,7 +293,7 @@ func initConfig() {
 			},
 		},
 		MetricCollector: config.MetricCollectorConfig{
-			MetricCollectorURL: mockLogCacheEndpoint,
+			MetricCollectorURL: mockLogCache.URL(),
 			TLSClientCerts: models.TLSCerts{
 				KeyFile:    filepath.Join(testCertDir, "eventgenerator.key"),
 				CertFile:   filepath.Join(testCertDir, "eventgenerator.crt"),

diff --git a/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go b/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go
@@ -25,7 +25,7 @@ var _ = Describe("Integration_Eventgenerator_Scalingengine", func() {
 	})
 
 	JustBeforeEach(func() {
-		eventGeneratorConfPath = components.PrepareEventGeneratorConfig(dbUrl, components.Ports[EventGenerator], fmt.Sprintf("127.0.0.1:%d", mockLogCachePort), fmt.Sprintf("https://127.0.0.1:%d", components.Ports[ScalingEngine]), aggregatorExecuteInterval, policyPollerInterval, saveInterval, evaluationManagerInterval, defaultHttpClientTimeout, tmpDir)
+		eventGeneratorConfPath = components.PrepareEventGeneratorConfig(dbUrl, components.Ports[EventGenerator], mockLogCache.URL(), fmt.Sprintf("https://127.0.0.1:%d", components.Ports[ScalingEngine]), aggregatorExecuteInterval, policyPollerInterval, saveInterval, evaluationManagerInterval, defaultHttpClientTimeout, tmpDir)
 		scalingEngineConfPath = components.PrepareScalingEngineConfig(dbUrl, components.Ports[ScalingEngine], fakeCCNOAAUAA.URL(), defaultHttpClientTimeout, tmpDir)
 
 		startEventGenerator()

diff --git a/src/autoscaler/integration/integration_suite_test.go b/src/autoscaler/integration/integration_suite_test.go
@@ -55,7 +55,6 @@ var (
 	testUserScope           = []string{"cloud_controller.read", "cloud_controller.write", "password.write", "openid", "network.admin", "network.write", "uaa.user"}
 	processMap              = map[string]ifrit.Process{}
 	mockLogCache            = &MockLogCache{}
-	mockLogCachePort        = 20000 + GinkgoParallelProcess()
 
 	defaultHttpClientTimeout = 10 * time.Second
 
@@ -202,7 +201,8 @@ func startMockLogCache() {
 	Expect(err).ToNot(HaveOccurred())
 
 	mockLogCache = NewMockLogCache(tlsConfig)
-	mockLogCache.Start(mockLogCachePort)
+	err = mockLogCache.Start(20000 + GinkgoParallelProcess())
+	Expect(err).ToNot(HaveOccurred())
 }
 
 func stopGolangApiServer() {

diff --git a/src/autoscaler/testhelpers/log_cache_mock.go b/src/autoscaler/testhelpers/log_cache_mock.go
@@ -5,7 +5,6 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"log"
 	"net"
 	"os"
 	"strings"
@@ -49,11 +48,11 @@ func NewMockLogCache(tlsConfig *tls.Config) *MockLogCache {
 	}
 }
 
-func (m *MockLogCache) Start(port int) string {
+func (m *MockLogCache) Start(port int) error {
 	var err error
 	m.lis, err = net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", port))
 	if err != nil {
-		log.Fatalf("failed to listen: %v", err)
+		return err
 	}
 
 	var srv *grpc.Server
@@ -69,6 +68,10 @@ func (m *MockLogCache) Start(port int) string {
 	//nolint:errcheck
 	go srv.Serve(m.lis)
 
+	return nil
+}
+
+func (m *MockLogCache) URL() string {
 	return m.lis.Addr().String()
 }