structured logging

MadAppGang · Jun 27, 2024 · abcced1 · abcced1
1 parent 4164b0e
commit abcced1
Show file tree

Hide file tree

Showing 123 changed files with 1,323 additions and 811 deletions.
diff --git a/api_test/app_settings_test.go b/api_test/app_settings_test.go
@@ -21,7 +21,7 @@ func TestAppSettings(t *testing.T) {
 		SetHeader("Digest", "SHA-256="+signature).
 		SetHeader("Content-Type", "application/json").
 		Expect(t).
-		// AssertFunc(dumpResponse).
+		// AssertFunc(dumpResponse(t)).
 		Type("json").
 		Status(200).
 		JSONSchema("../test/artifacts/api/app_settings_scheme.json").
@@ -45,15 +45,14 @@ func TestAppSettingsCORS(t *testing.T) {
 		SetHeader("Digest", "SHA-256="+signature).
 		SetHeader("Content-Type", "application/json").
 		Expect(t).
-		// AssertFunc(dumpResponse).
+		// AssertFunc(dumpResponse(t)).
 		AssertFunc(func(rsp *http.Response, r *http.Request) error {
 			header = rsp.Header
 			return nil
 		}).
 		Status(204).
 		Done()
 
-	fmt.Printf("Header %+v\n", header)
 	assert.Contains(t, header.Get("Access-Control-Allow-Origin"), "http://localhost:3000")
 	assert.Contains(t, header.Get("Access-Control-Allow-Methods"), "GET")
 }
diff --git a/api_test/invites_test.go b/api_test/invites_test.go
@@ -35,7 +35,7 @@ func TestInvite(t *testing.T) {
 		SetHeader("Content-Type", "application/json").
 		BodyString(data).
 		Expect(t).
-		// AssertFunc(dumpResponse).
+		// AssertFunc(dumpResponse(t)).
 		Type("json").
 		Status(200).
 		AssertFunc(validateJSON(func(data map[string]interface{}) error {
@@ -47,7 +47,7 @@ func TestInvite(t *testing.T) {
 
 	require.NotEmpty(t, at)
 	data = fmt.Sprintf(`
-	{ 
+	{
 		"email": "%s",
 		"access_role": "%s",
 		"callback_url": "%s",
@@ -65,7 +65,7 @@ func TestInvite(t *testing.T) {
 		SetHeader("Content-Type", "application/json").
 		BodyString(data).
 		Expect(t).
-		AssertFunc(dumpResponse).
+		AssertFunc(dumpResponse(t)).
 		AssertFunc(validateJSON(func(data map[string]interface{}) error {
 			link = data["link"].(string)
 			return nil
@@ -108,7 +108,7 @@ func TestInviteWithCustomLoginAppURL(t *testing.T) {
 		SetHeader("Content-Type", "application/json").
 		BodyString(data).
 		Expect(t).
-		// AssertFunc(dumpResponse).
+		// AssertFunc(dumpResponse(t)).
 		Type("json").
 		Status(200).
 		AssertFunc(validateJSON(func(data map[string]interface{}) error {
@@ -120,7 +120,7 @@ func TestInviteWithCustomLoginAppURL(t *testing.T) {
 
 	require.NotEmpty(t, at)
 	data = fmt.Sprintf(`
-	{ 
+	{
 		"email": "%s",
 		"access_role": "%s",
 		"callback_url": "%s",
@@ -138,7 +138,7 @@ func TestInviteWithCustomLoginAppURL(t *testing.T) {
 		SetHeader("Content-Type", "application/json").
 		BodyString(data).
 		Expect(t).
-		AssertFunc(dumpResponse).
+		AssertFunc(dumpResponse(t)).
 		AssertFunc(validateJSON(func(data map[string]interface{}) error {
 			link = data["link"].(string)
 			return nil

diff --git a/api_test/login_test.go b/api_test/login_test.go
@@ -34,7 +34,7 @@ func TestLogin(t *testing.T) {
 		SetHeader("Content-Type", "application/json").
 		BodyString(data).
 		Expect(t).
-		// AssertFunc(dumpResponse).
+		// AssertFunc(dumpResponse(t)).
 		Type("json").
 		Status(200).
 		JSONSchema("../test/artifacts/api/jwt_token_with_refresh_scheme.json").
@@ -60,7 +60,7 @@ func TestLoginWithNoRefresh(t *testing.T) {
 		SetHeader("Content-Type", "application/json").
 		BodyString(data).
 		Expect(t).
-		// AssertFunc(dumpResponse).
+		// AssertFunc(dumpResponse(t)).
 		AssertFunc(validateJSON(func(data map[string]interface{}) error {
 			g.Expect(data).To(MatchKeys(IgnoreExtras|IgnoreMissing, Keys{
 				"access_token":  Not(BeZero()),
@@ -81,7 +81,7 @@ func TestLoginWithWrongAppID(t *testing.T) {
 	request.Post("/auth/login").
 		SetHeader("X-Identifo-ClientID", "wrong_app_ID").
 		Expect(t).
-		AssertFunc(dumpResponse).
+		AssertFunc(dumpResponse(t)).
 		AssertFunc(validateJSON(func(data map[string]interface{}) error {
 			g.Expect(data["error"]).To(MatchAllKeys(Keys{
 				"id":       Equal(string(l.ErrorStorageAPPFindByIDError)),
@@ -115,7 +115,7 @@ func TestLoginWithWrongSignature(t *testing.T) {
 		SetHeader("Content-Type", "application/json").
 		BodyString(data).
 		Expect(t).
-		AssertFunc(dumpResponse).
+		AssertFunc(dumpResponse(t)).
 		Status(400).
 		AssertFunc(validateJSON(func(data map[string]interface{}) error {
 			g.Expect(data["error"]).To(MatchAllKeys(Keys{
@@ -145,7 +145,7 @@ func TestLoginTokenClaims(t *testing.T) {
 		SetHeader("Content-Type", "application/json").
 		BodyString(data).
 		Expect(t).
-		// AssertFunc(dumpResponse).
+		// AssertFunc(dumpResponse(t)).
 		Type("json").
 		AssertFunc(validateJSON(func(data map[string]interface{}) error {
 			tokenStr = data["access_token"].(string)

diff --git a/api_test/main_test.go b/api_test/main_test.go
@@ -18,6 +18,7 @@ import (
 	"github.com/caarlos0/env"
 	"github.com/joho/godotenv"
 	"github.com/madappgang/identifo/v2/config"
+	"github.com/madappgang/identifo/v2/logging"
 	"github.com/madappgang/identifo/v2/model"
 	"github.com/madappgang/identifo/v2/services/mail/mock"
 	"gopkg.in/h2non/baloo.v3"
@@ -91,7 +92,7 @@ func runServer() (model.Server, *http.Server) {
 		settings, _ = model.ConfigStorageSettingsFromString("file://../test/artifacts/api/config-mongo.yaml")
 	}
 
-	configStorage, err := config.InitConfigurationStorage(settings)
+	configStorage, err := config.InitConfigurationStorage(logging.DefaultLogger, settings)
 	if err != nil {
 		log.Fatalf("Unable to load config with error: %v", err)
 	}
@@ -143,10 +144,12 @@ func stopServer(server *http.Server) {
 // Helper functions
 
 // DumpResponse
-func dumpResponse(res *http.Response, req *http.Request) error {
-	data, err := httputil.DumpResponse(res, true)
-	fmt.Printf("Response: %s \n", string(data))
-	return err
+func dumpResponse(t *testing.T) func(res *http.Response, req *http.Request) error {
+	return func(res *http.Response, req *http.Request) error {
+		data, err := httputil.DumpResponse(res, true)
+		t.Logf("Response: %s \n", string(data))
+		return err
+	}
 }
 
 // DumpResponse

diff --git a/api_test/management_invite_test.go b/api_test/management_invite_test.go
@@ -30,7 +30,7 @@ func TestManagementResetToken(t *testing.T) {
 		Expires:     time.Now().Add(time.Hour).Unix(),
 		Host:        u.Host,
 	}
-	fmt.Println(sd.String())
+	t.Log(sd.String())
 	signature := sig.SignString(sd.String(), []byte(cfg.ManagementKeySecret1))
 
 	request.Post("/management/token/reset_password").
@@ -42,7 +42,7 @@ func TestManagementResetToken(t *testing.T) {
 		SetHeader(sig.KeyIDHeaderKey, cfg.ManagementKeyID1).
 		BodyString(data).
 		Expect(t).
-		AssertFunc(dumpResponse).
+		AssertFunc(dumpResponse(t)).
 		Type("json").
 		Status(200).
 		AssertFunc(validateJSON(func(data map[string]interface{}) error {
@@ -77,7 +77,7 @@ func TestManagementInactiveKey(t *testing.T) {
 		Expires:     time.Now().Add(time.Hour).Unix(),
 		Host:        u.Host,
 	}
-	fmt.Println(sd.String())
+	t.Log(sd.String())
 	signature := sig.SignString(sd.String(), []byte(cfg.ManagementKeySecret2))
 
 	body := ""
@@ -91,7 +91,7 @@ func TestManagementInactiveKey(t *testing.T) {
 		SetHeader(sig.KeyIDHeaderKey, cfg.ManagementKeyID2).
 		BodyString(data).
 		Expect(t).
-		AssertFunc(dumpResponse).
+		AssertFunc(dumpResponse(t)).
 		Status(400).
 		AssertFunc(validateBodyText(func(b string) error {
 			body = b
@@ -115,7 +115,7 @@ func TestManagementInviteNoKeyID(t *testing.T) {
 		SetHeader("Content-Type", "application/json").
 		BodyString(data).
 		Expect(t).
-		AssertFunc(dumpResponse).
+		AssertFunc(dumpResponse(t)).
 		Status(400).
 		AssertFunc(validateBodyText(func(b string) error {
 			body = b
@@ -141,7 +141,7 @@ func TestManagementInviteWrongKeyID(t *testing.T) {
 		SetHeader("X-Nl-Key-Id", "AABBCCDDSS").
 		BodyString(data).
 		Expect(t).
-		AssertFunc(dumpResponse).
+		AssertFunc(dumpResponse(t)).
 		Status(400).
 		AssertFunc(validateBodyText(func(b string) error {
 			body = b

diff --git a/api_test/misconfig_test/cors_test.go b/api_test/misconfig_test/cors_test.go
@@ -16,7 +16,7 @@ func TestCorsAlwaysTrue(t *testing.T) {
 			message = err["message"].(string)
 			return nil
 		})).
-		AssertFunc(dumpResponse).
+		AssertFunc(dumpResponse(t)).
 		Status(500).
 		Done()
 	assert.NotEmpty(t, message)

diff --git a/api_test/misconfig_test/main_test.go b/api_test/misconfig_test/main_test.go
@@ -18,6 +18,7 @@ import (
 	"github.com/caarlos0/env"
 	"github.com/joho/godotenv"
 	"github.com/madappgang/identifo/v2/config"
+	"github.com/madappgang/identifo/v2/logging"
 	"github.com/madappgang/identifo/v2/model"
 	"gopkg.in/h2non/baloo.v3"
 	"gopkg.in/h2non/baloo.v3/assert"
@@ -69,7 +70,7 @@ func runServer() (model.Server, *httptest.Server) {
 	os.Remove("./db.db")
 	settings, _ = model.ConfigStorageSettingsFromString("file://./config.yaml")
 
-	configStorage, err := config.InitConfigurationStorage(settings)
+	configStorage, err := config.InitConfigurationStorage(logging.DefaultLogger, settings)
 	if err != nil {
 		log.Fatalf("Unable to load config with error: %v", err)
 	}
@@ -95,10 +96,12 @@ func stopServer(server *httptest.Server) {
 // Helper functions
 
 // DumpResponse
-func dumpResponse(res *http.Response, req *http.Request) error {
-	data, err := httputil.DumpResponse(res, true)
-	fmt.Printf("Response: %s \n", string(data))
-	return err
+func dumpResponse(t *testing.T) func(res *http.Response, req *http.Request) error {
+	return func(res *http.Response, req *http.Request) error {
+		data, err := httputil.DumpResponse(res, true)
+		t.Logf("Response: %s \n", string(data))
+		return err
+	}
 }
 
 // DumpResponse

diff --git a/api_test/mongo_app_test.go b/api_test/mongo_app_test.go
@@ -4,6 +4,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/madappgang/identifo/v2/logging"
 	"github.com/madappgang/identifo/v2/model"
 	"github.com/madappgang/identifo/v2/storage/mongo"
 	"github.com/stretchr/testify/assert"
@@ -17,10 +18,12 @@ func TestAppCRUD(t *testing.T) {
 
 	connStr := os.Getenv("IDENTIFO_STORAGE_MONGO_CONN")
 
-	s, err := mongo.NewAppStorage(model.MongoDatabaseSettings{
-		ConnectionString: connStr,
-		DatabaseName:     "test_users",
-	})
+	s, err := mongo.NewAppStorage(
+		logging.DefaultLogger,
+		model.MongoDatabaseSettings{
+			ConnectionString: connStr,
+			DatabaseName:     "test_users",
+		})
 	require.NoError(t, err)
 
 	expectedApp := model.AppData{

diff --git a/api_test/mongo_user_integration_test.go b/api_test/mongo_user_integration_test.go
@@ -4,6 +4,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/madappgang/identifo/v2/logging"
 	"github.com/madappgang/identifo/v2/model"
 	"github.com/madappgang/identifo/v2/storage/mongo"
 	"github.com/stretchr/testify/assert"
@@ -18,10 +19,12 @@ func TestFetchUser(t *testing.T) {
 
 	connStr := os.Getenv("IDENTIFO_STORAGE_MONGO_CONN")
 
-	s, err := mongo.NewUserStorage(model.MongoDatabaseSettings{
-		ConnectionString: connStr,
-		DatabaseName:     "test_users",
-	})
+	s, err := mongo.NewUserStorage(
+		logging.DefaultLogger,
+		model.MongoDatabaseSettings{
+			ConnectionString: connStr,
+			DatabaseName:     "test_users",
+		})
 	require.NoError(t, err)
 
 	s.(*mongo.UserStorage).ClearAllUserData()