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>
145 lines
3.1 KiB
Go
145 lines
3.1 KiB
Go
package database
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"log/slog"
|
|
|
|
"go.uber.org/fx"
|
|
"gorm.io/driver/sqlite"
|
|
"gorm.io/gorm"
|
|
_ "modernc.org/sqlite" // Pure Go SQLite driver
|
|
"sneak.berlin/go/webhooker/internal/config"
|
|
"sneak.berlin/go/webhooker/internal/logger"
|
|
)
|
|
|
|
// nolint:revive // DatabaseParams is a standard fx naming convention
|
|
type DatabaseParams struct {
|
|
fx.In
|
|
Config *config.Config
|
|
Logger *logger.Logger
|
|
}
|
|
|
|
type Database struct {
|
|
db *gorm.DB
|
|
log *slog.Logger
|
|
params *DatabaseParams
|
|
}
|
|
|
|
func New(lc fx.Lifecycle, params DatabaseParams) (*Database, error) {
|
|
d := &Database{
|
|
params: ¶ms,
|
|
log: params.Logger.Get(),
|
|
}
|
|
|
|
lc.Append(fx.Hook{
|
|
OnStart: func(_ context.Context) error { // nolint:revive // ctx unused but required by fx
|
|
return d.connect()
|
|
},
|
|
OnStop: func(_ context.Context) error { // nolint:revive // ctx unused but required by fx
|
|
return d.close()
|
|
},
|
|
})
|
|
|
|
return d, nil
|
|
}
|
|
|
|
func (d *Database) connect() error {
|
|
dbURL := d.params.Config.DBURL
|
|
if dbURL == "" {
|
|
// Default to SQLite for development
|
|
dbURL = "file:webhooker.db?cache=shared&mode=rwc"
|
|
}
|
|
|
|
// First, open the database with the pure Go driver
|
|
sqlDB, err := sql.Open("sqlite", dbURL)
|
|
if err != nil {
|
|
d.log.Error("failed to open database", "error", err)
|
|
return err
|
|
}
|
|
|
|
// Then use it with GORM
|
|
db, err := gorm.Open(sqlite.Dialector{
|
|
Conn: sqlDB,
|
|
}, &gorm.Config{})
|
|
if err != nil {
|
|
d.log.Error("failed to connect to database", "error", err)
|
|
return err
|
|
}
|
|
|
|
d.db = db
|
|
d.log.Info("connected to database", "database", dbURL)
|
|
|
|
// Run migrations
|
|
return d.migrate()
|
|
}
|
|
|
|
func (d *Database) migrate() error {
|
|
// Run GORM auto-migrations
|
|
if err := d.Migrate(); err != nil {
|
|
d.log.Error("failed to run database migrations", "error", err)
|
|
return err
|
|
}
|
|
d.log.Info("database migrations completed")
|
|
|
|
// Check if admin user exists
|
|
var userCount int64
|
|
if err := d.db.Model(&User{}).Count(&userCount).Error; err != nil {
|
|
d.log.Error("failed to count users", "error", err)
|
|
return err
|
|
}
|
|
|
|
if userCount == 0 {
|
|
// Create admin user
|
|
d.log.Info("no users found, creating admin user")
|
|
|
|
// Generate random password
|
|
password, err := GenerateRandomPassword(16)
|
|
if err != nil {
|
|
d.log.Error("failed to generate random password", "error", err)
|
|
return err
|
|
}
|
|
|
|
// Hash the password
|
|
hashedPassword, err := HashPassword(password)
|
|
if err != nil {
|
|
d.log.Error("failed to hash password", "error", err)
|
|
return err
|
|
}
|
|
|
|
// Create admin user
|
|
adminUser := &User{
|
|
Username: "admin",
|
|
Password: hashedPassword,
|
|
}
|
|
|
|
if err := d.db.Create(adminUser).Error; err != nil {
|
|
d.log.Error("failed to create admin user", "error", err)
|
|
return err
|
|
}
|
|
|
|
// Log the password - this will only happen once on first startup
|
|
d.log.Info("admin user created",
|
|
"username", "admin",
|
|
"password", password,
|
|
"message", "SAVE THIS PASSWORD - it will not be shown again!")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (d *Database) close() error {
|
|
if d.db != nil {
|
|
sqlDB, err := d.db.DB()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return sqlDB.Close()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (d *Database) DB() *gorm.DB {
|
|
return d.db
|
|
}
|