Fix random errors from tests

cmd/web-api/main.go

@@ -66,10 +66,9 @@ func main() {
 
 	// =========================================================================
 	// Logging
-	log.SetFlags(log.LstdFlags|log.Lmicroseconds|log.Lshortfile)
+	log.SetFlags(log.LstdFlags | log.Lmicroseconds | log.Lshortfile)
-	log.SetPrefix(service+" : ")
+	log.SetPrefix(service + " : ")
-	log := log.New(os.Stdout, log.Prefix() , log.Flags())
+	log := log.New(os.Stdout, log.Prefix(), log.Flags())
-
 
 	// =========================================================================
 	// Configuration

cmd/web-app/handlers/projects.go

@@ -73,7 +73,7 @@ func (h *Projects) Index(ctx context.Context, w http.ResponseWriter, r *http.Req
 			var v datatable.ColumnValue
 			switch col.Field {
 			case "id":
-				v.Value = fmt.Sprintf("%d", q.ID)
+				v.Value = fmt.Sprintf("%s", q.ID)
 			case "name":
 				v.Value = q.Name
 				v.Formatted = fmt.Sprintf("<a href='%s'>%s</a>", urlProjectsView(q.ID), v.Value)

cmd/web-app/handlers/users.go

@@ -100,7 +100,7 @@ func (h *Users) Index(ctx context.Context, w http.ResponseWriter, r *http.Reques
 			var v datatable.ColumnValue
 			switch col.Field {
 			case "id":
-				v.Value = fmt.Sprintf("%d", q.ID)
+				v.Value = fmt.Sprintf("%s", q.ID)
 			case "name":
 				if strings.TrimSpace(q.Name) == "" {
 					v.Value = q.Email

cmd/web-app/main.go

@@ -66,10 +66,9 @@ func main() {
 
 	// =========================================================================
 	// Logging
-	log.SetFlags(log.LstdFlags|log.Lmicroseconds|log.Lshortfile)
+	log.SetFlags(log.LstdFlags | log.Lmicroseconds | log.Lshortfile)
-	log.SetPrefix(service+" : ")
+	log.SetPrefix(service + " : ")
-	log := log.New(os.Stdout, log.Prefix() , log.Flags())
+	log := log.New(os.Stdout, log.Prefix(), log.Flags())
-
 
 	// =========================================================================
 	// Configuration
@@ -474,7 +473,7 @@ func main() {
 	// URL Formatter
 	projectRoutes, err := project_routes.New(cfg.Service.WebApiBaseUrl, cfg.Service.BaseUrl)
 	if err != nil {
-		log.Fatalf("main : project routes : %+v", cfg.Service.BaseUrl, err)
+		log.Fatalf("main : project routes : %s : %+v", cfg.Service.BaseUrl, err)
 	}
 
 	// s3UrlFormatter is a help function used by to convert an s3 key to

internal/mid/saas-swagger/example/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
 	"log"
 	"net/http"
 	"os"
@@ -135,7 +136,7 @@ func main() {
 func API(shutdown chan os.Signal, log *log.Logger) http.Handler {
 
 	// Construct the web.App which holds all routes as well as common Middleware.
-	app := web.NewApp(shutdown, log, mid.Trace(), mid.Logger(log), mid.Errors(log), mid.Metrics(), mid.Panics())
+	app := web.NewApp(shutdown, log, webcontext.Env_Dev, mid.Logger(log))
 
 	app.Handle("GET", "/swagger/", saasSwagger.WrapHandler)
 	app.Handle("GET", "/swagger/*", saasSwagger.WrapHandler)

internal/mid/saas-swagger/swagger_test.go

@@ -9,6 +9,7 @@ import (
 
 	_ "geeks-accelerator/oss/saas-starter-kit/internal/mid/saas-swagger/example/docs"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web"
+	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -17,7 +18,7 @@ func TestWrapHandler(t *testing.T) {
 	log := log.New(os.Stdout, "", log.LstdFlags|log.Lmicroseconds|log.Lshortfile)
 	log.SetOutput(ioutil.Discard)
 
-	app := web.NewApp(nil, log)
+	app := web.NewApp(nil, log, webcontext.Env_Dev)
 	app.Handle("GET", "/swagger/*", WrapHandler)
 
 	w1 := performRequest("GET", "/swagger/index.html", app)

internal/platform/logger/log.go

@@ -3,12 +3,13 @@ package logger
 import (
 	"context"
 	"fmt"
-	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web"
+
+	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
 )
 
 // WithContext manual injects context values to log message including Trace ID
 func WithContext(ctx context.Context, msg string) string {
-	v, ok := ctx.Value(web.KeyValues).(*web.Values)
+	v, ok := ctx.Value(webcontext.KeyValues).(*webcontext.Values)
 	if !ok {
 		return msg
 	}