Merge branch 'main' into feat/auth

Signed-off-by: marius-williams <marius-williams@users.noreply.github.com>
Guidewire · May 15, 2024 · a9ee7e5 · a9ee7e5
2 parents 16ce187 + 8e063e9
commit a9ee7e5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,3 @@
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/Guidewire/fern-reporter/badge)](https://securityscorecards.dev/viewer/?uri=github.com/Guidewire/fern-reporter)
-![Coverage](https://img.shields.io/badge/Coverage-73.9%25-brightgreen)
-
 ![Fern](https://github.com/guidewire/fern-reporter/raw/main/docs/images/logo-no-background.png)
 
 <p align="center">

diff --git a/config/config.go b/config/config.go
@@ -13,6 +13,7 @@ type config struct {
 	Db     *dbConfig
 	Server *serverConfig
 	Auth   *authConfig
+	Header string
 }
 
 type dbConfig struct {
@@ -76,6 +77,8 @@ func LoadConfig() (*config, error) {
 	}
 	if os.Getenv("AUTH_KEYS_ENDPOINT") != "" {
 		configuration.Auth.KeysEndpoint = os.Getenv("AUTH_KEYS_ENDPOINT")
+	if os.Getenv("FERN_HEADER_NAME") != "" {
+		configuration.Header = os.Getenv("FERN_HEADER_NAME")
 	}
 
 	return configuration, nil
@@ -91,4 +94,7 @@ func GetServer() *serverConfig {
 
 func GetAuth() *authConfig {
 	return configuration.Auth
+
+func GetHeaderName() string {
+	return configuration.Header
 }
diff --git a/config/config.yaml b/config/config.yaml
@@ -12,3 +12,4 @@ server:
   port: :8080
 auth:
   keys-endpoint: ""
+header: "Fern Acceptance Test Report"
diff --git a/config/config_test.go b/config/config_test.go
@@ -37,6 +37,7 @@ var _ = Describe("When LoadConfig is invoked", func() {
 			Expect(appConfig.Db.DetailLog).To(BeTrue())
 			Expect(appConfig.Db.MaxOpenConns).To(Equal(100))
 			Expect(appConfig.Db.MaxIdleConns).To(Equal(10))
+			Expect(appConfig.Header).To(Equal("Fern Acceptance Test Report"))
 		})
 
 		It("should get non-nil DB", func() {
@@ -65,6 +66,7 @@ var _ = Describe("When LoadConfig is invoked", func() {
 		os.Setenv("FERN_HOST", "localhost")
 		os.Setenv("FERN_PORT", "5432")
 		os.Setenv("FERN_DATABASE", "fern")
+		os.Setenv("FERN_HEADER_NAME", "Custom Fern Report Header")
 
 		//v := viper.New()
 		result, err := config.LoadConfig()
@@ -77,6 +79,7 @@ var _ = Describe("When LoadConfig is invoked", func() {
 		Expect(result.Db.Port).To(Equal("5432"))
 		Expect(result.Db.Database).To(Equal("fern"))
 		Expect(result.Auth.KeysEndpoint).To(Equal("https://test-idp-base-url.com/oauth2/abc123/v1/keys"))
+		Expect(result.Header).To(Equal("Custom Fern Report Header"))
 	})
 
 })
diff --git a/pkg/api/handlers/handlers.go b/pkg/api/handlers/handlers.go
@@ -3,6 +3,7 @@ package handlers
 import (
 	"errors"
 	"fmt"
+	"github.com/guidewire/fern-reporter/config"
 	"log"
 	"net/http"
 	"strconv"
@@ -149,7 +150,8 @@ func (h *Handler) ReportTestRunAll(c *gin.Context) {
 	var testRuns []models.TestRun
 	h.db.Preload("SuiteRuns.SpecRuns.Tags").Find(&testRuns)
 	c.HTML(http.StatusOK, "test_runs.html", gin.H{
-		"testRuns": testRuns,
+		"reportHeader": config.GetHeaderName(),
+		"testRuns":     testRuns,
 	})
 }
 
@@ -158,7 +160,8 @@ func (h *Handler) ReportTestRunById(c *gin.Context) {
 	id := c.Param("id")
 	h.db.Preload("SuiteRuns.SpecRuns").Where("id = ?", id).First(&testRun)
 	c.HTML(http.StatusOK, "test_runs.html", gin.H{
-		"testRuns": []models.TestRun{testRun},
+		"reportHeader": config.GetHeaderName(),
+		"testRuns":     []models.TestRun{testRun},
 	})
 }
 

diff --git a/pkg/views/test_runs.html b/pkg/views/test_runs.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>ATMOS Acceptance Tests</title>
+    <title>{{ .reportHeader }}</title>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css">
     <style>
       body {
@@ -66,7 +66,7 @@
   </head>
   <body>
     <div class="container">
-      <h1 class="title is-3 has-text-centered has-background-primary has-text-white p-4">ATMOS Acceptance Tests</h1>
+      <h1 class="title is-3 has-text-centered has-background-primary has-text-white p-4">{{ .reportHeader }}</h1>
       <div>
         <table style="width: 100%;">
           <tr>