Fix some health-configs in the tests

cloudfoundry · Mar 17, 2023 · 8498b9b · 8498b9b
1 parent 7084138
commit 8498b9b
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 12 deletions.
diff --git a/src/autoscaler/api/config/config_test.go b/src/autoscaler/api/config/config_test.go
@@ -114,8 +114,10 @@ var _ = Describe("Config", func() {
 					},
 				))
 				Expect(conf.CredHelperImpl).To(Equal("default"))
-			})
-		})
+				Expect(conf.Health.UnprotectedEndpoints).To(
+					ContainElements("/", "/health/liveness", "/health/prometheus", "/debug/pprof"))
+			}) // It
+		}) // Context
 
 		Context("with partial config", func() {
 			BeforeEach(func() {

diff --git a/src/autoscaler/api/config/testdata/valid_config.yml b/src/autoscaler/api/config/testdata/valid_config.yml
@@ -31,6 +31,8 @@ db:
 catalog_schema_path: '../schemas/catalog.schema.json'
 catalog_path: '../exampleconfig/catalog-example.json'
 policy_schema_path: '../exampleconfig/policy.schema.json'
+health:
+  unprotected_endpoints: ["/", "/health/liveness", "/health/prometheus", "/debug/pprof"]
 scheduler:
   scheduler_url: https://localhost:8083
   tls:

diff --git a/src/autoscaler/integration/integration_operator_others_test.go b/src/autoscaler/integration/integration_operator_others_test.go
@@ -42,12 +42,15 @@ var _ = Describe("Integration_Operator_Others", func() {
 			tmpDir)
 		startGolangApiServer()
 
-		scalingEngineConfPath = components.PrepareScalingEngineConfig(dbUrl, components.Ports[ScalingEngine], fakeCCNOAAUAA.URL(), defaultHttpClientTimeout, tmpDir)
+		scalingEngineConfPath = components.PrepareScalingEngineConfig(
+			dbUrl, components.Ports[ScalingEngine], fakeCCNOAAUAA.URL(), defaultHttpClientTimeout,
+			tmpDir)
 		startScalingEngine()
 
-		schedulerConfPath = components.PrepareSchedulerConfig(dbUrl, fmt.Sprintf("https://127.0.0.1:%d", components.Ports[ScalingEngine]), tmpDir, defaultHttpClientTimeout)
+		schedulerConfPath = components.PrepareSchedulerConfig(
+			dbUrl, fmt.Sprintf("https://127.0.0.1:%d", components.Ports[ScalingEngine]), tmpDir,
+			defaultHttpClientTimeout)
 		startScheduler()
-
 	})
 
 	JustBeforeEach(func() {
@@ -69,9 +72,7 @@ var _ = Describe("Integration_Operator_Others", func() {
 	})
 
 	Describe("Synchronizer", func() {
-
 		Describe("Synchronize the active schedules to scaling engine", func() {
-
 			Context("ScalingEngine Server is down when active_schedule changes", func() {
 				JustBeforeEach(func() {
 					stopScalingEngine()
@@ -111,11 +112,9 @@ var _ = Describe("Integration_Operator_Others", func() {
 						Consistently(func() bool { return activeScheduleExists(testAppId) }).
 							WithTimeout(10 * time.Second).
 							WithPolling(1 * time.Second).Should(BeTrue())
-
 					})
 
 					It("should delete an active schedule in scaling engine after restart", func() {
-
 						By("ensure scaling server is down when the active schedule is deleted from scheduler")
 						//TODO there is a better check than waiting 80 seconds for consecutive errors.
 						Consistently(func() error {
@@ -132,7 +131,6 @@ var _ = Describe("Integration_Operator_Others", func() {
 							WithPolling(5*time.Second).
 							ShouldNot(BeTrue(), "Active schedule should be removed after restart")
 					})
-
 				})
 			})
 		})
@@ -248,7 +246,7 @@ var _ = Describe("Integration_Operator_Others", func() {
 
 		})
 
-		It("opeator should remove the staled records ", func() {
+		It("operator should remove the staled records ", func() {
 			Eventually(func() bool {
 				return getAppInstanceMetricTotalCount(testAppId) == 0 &&
 					getScalingHistoryTotalCount(testAppId) == 0 && getScalingHistoryTotalCount(testAppId) == 0

diff --git a/src/autoscaler/metricsforwarder/config/config_test.go b/src/autoscaler/metricsforwarder/config/config_test.go
@@ -6,6 +6,7 @@ import (
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/db"
 	. "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsforwarder/config"
+	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/routes"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -67,6 +68,7 @@ db:
     connection_max_lifetime: 60s
 health:
   port: 9999
+  unprotected_endpoints: ["/", "/health/liveness", "/health/prometheus", "/debug/pprof"]
 cred_helper_impl: default
 `)
 			})
@@ -75,6 +77,8 @@ cred_helper_impl: default
 				Expect(conf.Server.Port).To(Equal(8081))
 				Expect(conf.Logging.Level).To(Equal("debug"))
 				Expect(conf.Health.Port).To(Equal(9999))
+				Expect(conf.Health.UnprotectedEndpoints).To(
+					ContainElements("/", "/health/liveness", "/health/prometheus", "/debug/pprof"))
 				Expect(conf.LoggregatorConfig.MetronAddress).To(Equal("127.0.0.1:3457"))
 				Expect(conf.Db[db.PolicyDb]).To(Equal(
 					db.DatabaseConfig{
@@ -288,6 +292,9 @@ rate_limit:
 			conf.Server.Port = 8081
 			conf.Logging.Level = "debug"
 			conf.Health.Port = 8081
+			conf.Health.UnprotectedEndpoints = []string{"/", routes.LivenessPath,
+				routes.ReadinessPath, routes.PrometheusPath, routes.PprofPath}
+
 			conf.LoggregatorConfig.MetronAddress = "127.0.0.1:3458"
 			conf.LoggregatorConfig.TLS.CACertFile = "../testcerts/ca.crt"
 			conf.LoggregatorConfig.TLS.CertFile = "../testcerts/client.crt"

diff --git a/src/autoscaler/metricsgateway/config/config_test.go b/src/autoscaler/metricsgateway/config/config_test.go
@@ -7,6 +7,7 @@ import (
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/helpers"
 	. "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsgateway/config"
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/models"
+	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/routes"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -844,6 +845,8 @@ health:
 				},
 				Health: models.HealthConfig{
 					Port: 8081,
+					UnprotectedEndpoints: []string{"/", routes.LivenessPath, routes.PrometheusPath,
+						routes.PprofPath},
 				},
 			}
 		})

diff --git a/src/autoscaler/metricsserver/config/config_test.go b/src/autoscaler/metricsserver/config/config_test.go
@@ -9,6 +9,7 @@ import (
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/db"
 	. "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsserver/config"
+	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/routes"
 )
 
 var _ = Describe("Config", func() {
@@ -212,6 +213,8 @@ db:
 			conf.Collector.EnvelopeChannelSize = 300
 			conf.Collector.MetricChannelSize = 300
 			conf.Health.Port = 8081
+			conf.Health.UnprotectedEndpoints = []string{
+				"/", routes.LivenessPath, routes.PrometheusPath, routes.PprofPath}
 		})
 
 		JustBeforeEach(func() {

diff --git a/src/autoscaler/operator/config/config_test.go b/src/autoscaler/operator/config/config_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"time"
 
+	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/routes"
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/testhelpers"
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/db"
@@ -241,8 +242,10 @@ scheduler:
 			conf.AppSyncer.DB.URL = "postgres://pqgotest:[email protected]/pqgotest"
 			conf.DBLock.DB.URL = "postgres://pqgotest:[email protected]/pqgotest"
 			conf.HttpClientTimeout = 10 * time.Second
-			conf.Health.Port = 8081
 
+			conf.Health.Port = 8081
+			conf.Health.UnprotectedEndpoints = []string{"/", routes.LivenessPath,
+				routes.PrometheusPath, routes.PprofPath}
 		})
 
 		JustBeforeEach(func() {

diff --git a/src/autoscaler/scalingengine/config/config_test.go b/src/autoscaler/scalingengine/config/config_test.go
@@ -2,6 +2,7 @@ package config_test
 
 import (
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/db"
+	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/routes"
 	. "code.cloudfoundry.org/app-autoscaler/src/autoscaler/scalingengine/config"
 	. "code.cloudfoundry.org/app-autoscaler/src/autoscaler/testhelpers"
 
@@ -201,6 +202,9 @@ health:
 			conf.DefaultCoolDownSecs = 300
 			conf.LockSize = 32
 			conf.HttpClientTimeout = 10 * time.Second
+			conf.Health.UnprotectedEndpoints = []string{
+				"/", routes.LivenessPath, routes.ReadinessPath, routes.PrometheusPath, routes.PprofPath,
+			}
 		})
 
 		JustBeforeEach(func() {