test: fix log headers (#5222)

* test: fix log headers

* ensure just public types are tested

* fix(postgres): proper statements for setup step 7

---------

Co-authored-by: adlerhurst <silvan.reusser@gmail.com>

cmd/setup/04.go

@@ -18,7 +18,7 @@ type EventstoreIndexes struct {
 }
 
 func (mig *EventstoreIndexes) Execute(ctx context.Context) error {
-	stmt, err := readStmt(mig.dbType)
+	stmt, err := readStmt(stmts, "04", mig.dbType, "index.sql")
 	if err != nil {
 		return err
 	}
@@ -30,7 +30,7 @@ func (mig *EventstoreIndexes) String() string {
 	return "04_eventstore_indexes"
 }
 
-func readStmt(typ string) (string, error) {
-	stmt, err := stmts.ReadFile("04/" + typ + "/index.sql")
+func readStmt(fs embed.FS, folder, typ, filename string) (string, error) {
+	stmt, err := fs.ReadFile(folder + "/" + typ + "/" + filename)
 	return string(stmt), err
 }

cmd/setup/07.go

@@ -3,27 +3,38 @@ package setup
 import (
 	"context"
 	"database/sql"
-	_ "embed"
+	"embed"
 	"strings"
 )
 
 var (
 	//go:embed 07/logstore.sql
 	createLogstoreSchema07 string
-	//go:embed 07/access.sql
-	createAccessLogsTable07 string
-	//go:embed 07/execution.sql
-	createExecutionLogsTable07 string
+	//go:embed 07/cockroach/access.sql
+	//go:embed 07/postgres/access.sql
+	createAccessLogsTable07 embed.FS
+	//go:embed 07/cockroach/execution.sql
+	//go:embed 07/postgres/execution.sql
+	createExecutionLogsTable07 embed.FS
 )
 
 type LogstoreTables struct {
 	dbClient *sql.DB
 	username string
+	dbType   string
 }
 
 func (mig *LogstoreTables) Execute(ctx context.Context) error {
-	stmt := strings.ReplaceAll(createLogstoreSchema07, "%[1]s", mig.username) + createAccessLogsTable07 + createExecutionLogsTable07
-	_, err := mig.dbClient.ExecContext(ctx, stmt)
+	accessStmt, err := readStmt(createAccessLogsTable07, "07", mig.dbType, "access.sql")
+	if err != nil {
+		return err
+	}
+	executionStmt, err := readStmt(createExecutionLogsTable07, "07", mig.dbType, "execution.sql")
+	if err != nil {
+		return err
+	}
+	stmt := strings.ReplaceAll(createLogstoreSchema07, "%[1]s", mig.username) + accessStmt + executionStmt
+	_, err = mig.dbClient.ExecContext(ctx, stmt)
 	return err
 }
 

cmd/setup/07/postgres/access.sql

@@ -0,0 +1,14 @@
+CREATE TABLE IF NOT EXISTS logstore.access (
+    log_date TIMESTAMPTZ NOT NULL
+    , protocol INT NOT NULL
+    , request_url TEXT NOT NULL
+    , response_status INT NOT NULL
+    , request_headers JSONB
+    , response_headers JSONB
+    , instance_id TEXT NOT NULL
+    , project_id TEXT NOT NULL
+    , requested_domain TEXT
+    , requested_host TEXT
+);
+
+CREATE INDEX protocol_date_desc ON logstore.access (instance_id, protocol, log_date DESC) INCLUDE (request_url, response_status, request_headers);

cmd/setup/07/postgres/execution.sql

@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS logstore.execution (
+    log_date TIMESTAMPTZ NOT NULL
+    , took INTERVAL
+    , message TEXT NOT NULL
+    , loglevel INT NOT NULL
+    , instance_id TEXT NOT NULL
+    , action_id TEXT NOT NULL
+    , metadata JSONB
+);
+
+CREATE INDEX log_date_desc ON logstore.execution (instance_id, log_date DESC) INCLUDE (took);

cmd/setup/setup.go

@@ -84,7 +84,7 @@ func Setup(config *Config, steps *Steps, masterKey string) {
 	steps.s4EventstoreIndexes = &EventstoreIndexes{dbClient: dbClient, dbType: config.Database.Type()}
 	steps.s5LastFailed = &LastFailed{dbClient: dbClient}
 	steps.s6OwnerRemoveColumns = &OwnerRemoveColumns{dbClient: dbClient}
-	steps.s7LogstoreTables = &LogstoreTables{dbClient: dbClient, username: config.Database.Username()}
+	steps.s7LogstoreTables = &LogstoreTables{dbClient: dbClient, username: config.Database.Username(), dbType: config.Database.Type()}
 
 	err = projection.Create(ctx, dbClient, eventstoreClient, config.Projections, nil, nil)
 	logging.OnError(err).Fatal("unable to start projections")