1. fix failing test due to log message assertion (#812)

2. modify log level
tenable · May 26, 2021 · a4d7af9 · a4d7af9
1 parent 0a1912f
commit a4d7af9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/pkg/http-server/webhook-scan-logs.go b/pkg/http-server/webhook-scan-logs.go
@@ -135,7 +135,7 @@ func (g *APIHandler) getLogs(w http.ResponseWriter, r *http.Request) {
 }
 
 func (g *APIHandler) getLogByUID(w http.ResponseWriter, r *http.Request) {
-	zap.S().Info("handle: validating webhook's get log by uid request")
+	zap.S().Debug("handle: validating webhook's get log by uid request")
 
 	if !config.GetK8sAdmissionControl().Dashboard {
 		apiErrorResponse(w, ErrDashboardDisabled.Error(), http.StatusBadRequest)

diff --git a/test/e2e/validatingwebhook/validating_webhook_test.go b/test/e2e/validatingwebhook/validating_webhook_test.go
@@ -112,6 +112,9 @@ var _ = Describe("ValidatingWebhook", func() {
 		os.RemoveAll(certsFolder)
 	})
 
+	// log message to be asserted when sever starts
+	assertLogMessage := "https server listening at port %s"
+
 	Describe("terrascan server as validating webhook with various available config options", func() {
 
 		When("validating webhook with default 'k8s-admission-control' config", func() {
@@ -121,6 +124,7 @@ var _ = Describe("ValidatingWebhook", func() {
 				var session *gexec.Session
 				var webhookConfig *admissionv1.ValidatingWebhookConfiguration
 				var configFileName string
+				port := "9010"
 
 				It("server should start running on port 9010", func() {
 					configFileName = "config1.toml"
@@ -131,11 +135,10 @@ var _ = Describe("ValidatingWebhook", func() {
 					os.Setenv(k8sWebhookAPIKey, apiKeyValue)
 					args := []string{"server", "-c", configFileName, "--cert-path", certFileAbsPath, "--key-path", privKeyFileAbsPath, "-l", "debug"}
 					session = helper.RunCommand(terrascanBinaryPath, outWriter, errWriter, args...)
-					Eventually(session.Err, defaultTimeout).Should(gbytes.Say("http server listening at port 9010"))
+					Eventually(session.Err, defaultTimeout).Should(gbytes.Say(fmt.Sprintf(assertLogMessage, port)))
 				})
 
 				Context("in blind mode, log end points return error response", func() {
-					port := "9010"
 					myIP, err := validatingwebhook.GetIP()
 					When("request is made to the get a single log endpoint", func() {
 						It("should return a 400 bad request response", func() {
@@ -208,7 +211,7 @@ var _ = Describe("ValidatingWebhook", func() {
 				os.Setenv(k8sWebhookAPIKey, apiKeyValue)
 				args := []string{"server", "-c", configFileName, "--cert-path", certFileAbsPath, "--key-path", privKeyFileAbsPath, "-p", port, "-l", "debug"}
 				session = helper.RunCommand(terrascanBinaryPath, outWriter, errWriter, args...)
-				Eventually(session.Err, defaultTimeout).Should(gbytes.Say("http server listening at port 9011"))
+				Eventually(session.Err, defaultTimeout).Should(gbytes.Say(fmt.Sprintf(assertLogMessage, port)))
 			})
 
 			When("request is made to add server as a validating webhook", func() {
@@ -257,7 +260,7 @@ var _ = Describe("ValidatingWebhook", func() {
 					os.Setenv(k8sWebhookAPIKey, apiKeyValue)
 					args := []string{"server", "-c", configFileName, "--cert-path", certFileAbsPath, "--key-path", privKeyFileAbsPath, "-p", port, "-l", "debug"}
 					session = helper.RunCommand(terrascanBinaryPath, outWriter, errWriter, args...)
-					Eventually(session.Err, defaultTimeout).Should(gbytes.Say("http server listening at port 9012"))
+					Eventually(session.Err, defaultTimeout).Should(gbytes.Say(fmt.Sprintf(assertLogMessage, port)))
 				})
 
 				When("request is made to add server as a validating webhook", func() {
@@ -304,7 +307,7 @@ var _ = Describe("ValidatingWebhook", func() {
 					os.Setenv(k8sWebhookAPIKey, apiKeyValue)
 					args := []string{"server", "-c", configFileName, "--cert-path", certFileAbsPath, "--key-path", privKeyFileAbsPath, "-p", port, "-l", "debug"}
 					session = helper.RunCommand(terrascanBinaryPath, outWriter, errWriter, args...)
-					Eventually(session.Err, defaultTimeout).Should(gbytes.Say("http server listening at port 9013"))
+					Eventually(session.Err, defaultTimeout).Should(gbytes.Say(fmt.Sprintf(assertLogMessage, port)))
 				})
 
 				When("request is made to add server as a validating webhook", func() {
@@ -353,7 +356,7 @@ var _ = Describe("ValidatingWebhook", func() {
 					os.Setenv(k8sWebhookAPIKey, apiKeyValue)
 					args := []string{"server", "-c", configFileName, "--cert-path", certFileAbsPath, "--key-path", privKeyFileAbsPath, "-p", port, "-l", "debug"}
 					session = helper.RunCommand(terrascanBinaryPath, outWriter, errWriter, args...)
-					Eventually(session.Err, defaultTimeout).Should(gbytes.Say("http server listening at port 9014"))
+					Eventually(session.Err, defaultTimeout).Should(gbytes.Say(fmt.Sprintf(assertLogMessage, port)))
 				})
 
 				When("request is made to add server as a validating webhook", func() {
@@ -400,7 +403,7 @@ var _ = Describe("ValidatingWebhook", func() {
 					os.Setenv(k8sWebhookAPIKey, apiKeyValue)
 					args := []string{"server", "-c", configFileName, "--cert-path", certFileAbsPath, "--key-path", privKeyFileAbsPath, "-p", port, "-l", "debug"}
 					session = helper.RunCommand(terrascanBinaryPath, outWriter, errWriter, args...)
-					Eventually(session.Err, defaultTimeout).Should(gbytes.Say("http server listening at port 9015"))
+					Eventually(session.Err, defaultTimeout).Should(gbytes.Say(fmt.Sprintf(assertLogMessage, port)))
 				})
 
 				When("request is made to add server as a validating webhook", func() {