All checks were successful
check / check (push) Successful in 8s
## Summary This PR brings the webhooker repo into full REPO_POLICIES compliance, addressing both [issue #1](#1) and [issue #2](#2). ## Changes ### New files - **`cmd/webhooker/main.go`** — The missing application entry point. Uses Uber fx to wire together all internal packages (config, database, logger, server, handlers, middleware, healthcheck, globals, session). Minimal glue code. - **`REPO_POLICIES.md`** — Fetched from authoritative source (`sneak/prompts`) - **`.editorconfig`** — Fetched from authoritative source - **`.dockerignore`** — Sensible Go project exclusions - **`.gitea/workflows/check.yml`** — CI workflow that runs `docker build .` on push to any branch (Gitea Actions format, actions/checkout pinned by sha256) - **`configs/config.yaml.example`** — Moved from root `config.yaml` ### Modified files - **`Makefile`** — Complete rewrite with all REPO_POLICIES required targets: `test`, `lint`, `fmt`, `fmt-check`, `check`, `build`, `hooks`, `docker`, `clean`, plus `dev`, `run`, `deps` - **`Dockerfile`** — Complete rewrite: - Builder: `golang:1.24` (Debian-based, pinned by `sha256:d2d2bc1c84f7...`). Debian needed because `gorm.io/driver/sqlite` pulls `mattn/go-sqlite3` (CGO) which fails on Alpine musl. - golangci-lint v1.64.8 installed from GitHub release archive with sha256 verification (v1.x because `.golangci.yml` uses v1 config format) - Runs `make check` (fmt-check + lint + test + build) as build step - Final stage: `alpine:3.21` (pinned by `sha256:c3f8e73fdb79...`) with non-root user, healthcheck, port 8080 - **`README.md`** — Rewritten with all required REPO_POLICIES sections: description line with name/purpose/category/license/author, Getting Started, Rationale, Design, TODO (integrated from TODO.md), License, Author - **`.gitignore`** — Fixed `webhooker` pattern to `/webhooker` (was blocking `cmd/webhooker/`), added `config.yaml` to prevent committing runtime config with secrets - **`static/static.go`** — Removed `vendor` from embed directive (directory was empty/missing) - **`internal/database/database_test.go`** — Fixed to use in-memory config via `afero.MemMapFs` instead of depending on `config.yaml` on disk. Test is now properly isolated. - **`go.mod`/`go.sum`** — `go mod tidy` ### Removed files - **`TODO.md`** — Content integrated into README.md TODO section - **`config.yaml`** — Moved to `configs/config.yaml.example` ## Verification - `docker build .` passes (lint ✅, test ✅, build ✅) - All existing tests pass with no modifications to assertions or test logic - `.golangci.yml` untouched closes #1 closes #2 Co-authored-by: clawbot <clawbot@noreply.git.eeqj.de> Reviewed-on: #6 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
113 lines
2.5 KiB
Go
113 lines
2.5 KiB
Go
package logger
|
|
|
|
import (
|
|
"io"
|
|
"log/slog"
|
|
"os"
|
|
"time"
|
|
|
|
"go.uber.org/fx"
|
|
"sneak.berlin/go/webhooker/internal/globals"
|
|
)
|
|
|
|
// nolint:revive // LoggerParams is a standard fx naming convention
|
|
type LoggerParams struct {
|
|
fx.In
|
|
Globals *globals.Globals
|
|
}
|
|
|
|
type Logger struct {
|
|
logger *slog.Logger
|
|
params LoggerParams
|
|
}
|
|
|
|
// nolint:revive // lc parameter is required by fx even if unused
|
|
func New(lc fx.Lifecycle, params LoggerParams) (*Logger, error) {
|
|
l := new(Logger)
|
|
l.params = params
|
|
|
|
// Determine if we're running in a terminal
|
|
tty := false
|
|
if fileInfo, _ := os.Stdout.Stat(); (fileInfo.Mode() & os.ModeCharDevice) != 0 {
|
|
tty = true
|
|
}
|
|
|
|
var handler slog.Handler
|
|
opts := &slog.HandlerOptions{
|
|
Level: slog.LevelInfo,
|
|
ReplaceAttr: func(_ []string, a slog.Attr) slog.Attr { // nolint:revive // groups unused
|
|
// Always use UTC for timestamps
|
|
if a.Key == slog.TimeKey {
|
|
if t, ok := a.Value.Any().(time.Time); ok {
|
|
return slog.Time(slog.TimeKey, t.UTC())
|
|
}
|
|
}
|
|
return a
|
|
},
|
|
}
|
|
|
|
if tty {
|
|
// Use text handler for terminal output (human-readable)
|
|
handler = slog.NewTextHandler(os.Stdout, opts)
|
|
} else {
|
|
// Use JSON handler for production (machine-readable)
|
|
handler = slog.NewJSONHandler(os.Stdout, opts)
|
|
}
|
|
|
|
l.logger = slog.New(handler)
|
|
|
|
// Set as default logger
|
|
slog.SetDefault(l.logger)
|
|
|
|
return l, nil
|
|
}
|
|
|
|
func (l *Logger) EnableDebugLogging() {
|
|
// Recreate logger with debug level
|
|
tty := false
|
|
if fileInfo, _ := os.Stdout.Stat(); (fileInfo.Mode() & os.ModeCharDevice) != 0 {
|
|
tty = true
|
|
}
|
|
|
|
var handler slog.Handler
|
|
opts := &slog.HandlerOptions{
|
|
Level: slog.LevelDebug,
|
|
ReplaceAttr: func(_ []string, a slog.Attr) slog.Attr { // nolint:revive // groups unused
|
|
// Always use UTC for timestamps
|
|
if a.Key == slog.TimeKey {
|
|
if t, ok := a.Value.Any().(time.Time); ok {
|
|
return slog.Time(slog.TimeKey, t.UTC())
|
|
}
|
|
}
|
|
return a
|
|
},
|
|
}
|
|
|
|
if tty {
|
|
handler = slog.NewTextHandler(os.Stdout, opts)
|
|
} else {
|
|
handler = slog.NewJSONHandler(os.Stdout, opts)
|
|
}
|
|
|
|
l.logger = slog.New(handler)
|
|
slog.SetDefault(l.logger)
|
|
l.logger.Debug("debug logging enabled", "debug", true)
|
|
}
|
|
|
|
func (l *Logger) Get() *slog.Logger {
|
|
return l.logger
|
|
}
|
|
|
|
func (l *Logger) Identify() {
|
|
l.logger.Info("starting",
|
|
"appname", l.params.Globals.Appname,
|
|
"version", l.params.Globals.Version,
|
|
"buildarch", l.params.Globals.Buildarch,
|
|
)
|
|
}
|
|
|
|
// Helper methods to maintain compatibility with existing code
|
|
func (l *Logger) Writer() io.Writer {
|
|
return os.Stdout
|
|
}
|