unkin-agent
8c796f4087
forgebot applied its schema by executing an inline DDL string on every boot, with no version tracking and no lock, so two API replicas starting together raced and the SQL had nowhere to grow. golib/pg already owns that mechanic for the estate; take it and keep owning the SQL. - Move the schema into migrations/0001_init.sql, embedded via migrations.FS. The DDL is verbatim. - The four legacy-status UPDATEs move into 0001 unchanged. Each reads only retired statuses (pending/failed/running/succeeded/cancelled) and writes only current ones, and no current status is a source, so replaying 0001 once against the live database is a no-op. A test pins that property. - Build the pool with pg.NewMigrated, LockName "forgebot-migrations": the advisory lock serializes replicas, schema_migrations records what ran, and a migration failure fails startup instead of half-migrating. database.New and apiserver.New take a context and logger for it. - Render the DSN with pg.DSN, which percent-escapes the credentials the fmt.Sprintf builder pasted in raw. LoadConfig still reads the environment itself: pg.DSNFromEnv has no defaults for user and database name, where forgebot defaults both to "forgebot", and would newly honour DATABASE_URL and PG*. The deployed DBHOST/DBPORT/DBUSER/DBPASS/DBNAME/DBSSL contract and its defaults are unchanged, and pinned by a test. - Plumb GOPRIVATE=git.unkin.net for the first cross-repo Go dependency: exported by the Makefile, set in both Dockerfiles and the woodpecker Go steps, documented in the README. - gofmt the four files that were already unformatted on main, so the pre-commit step can pass.
61 lines
1.7 KiB
Go
61 lines
1.7 KiB
Go
package apiserver
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strconv"
|
|
|
|
"git.unkin.net/unkin/golib/pg"
|
|
)
|
|
|
|
type Config struct {
|
|
ListenAddr string
|
|
DBHost string
|
|
DBPort int
|
|
DBUser string
|
|
DBPass string
|
|
DBName string
|
|
DBSSL string
|
|
WebhookSecret string
|
|
GiteaURL string
|
|
GiteaToken string
|
|
}
|
|
|
|
// DatabaseDSN renders the connection string with golib's builder, which
|
|
// percent-escapes the credentials — byte-identical to the fmt.Sprintf form it
|
|
// replaces for values without reserved characters.
|
|
//
|
|
// The environment is still read by LoadConfig rather than pg.DSNFromEnv: the
|
|
// library has no defaults for the user and database name, where forgebot
|
|
// defaults both to "forgebot", and it would newly honour DATABASE_URL and the
|
|
// PG* variables. Deployments set the DB* names below and nothing else.
|
|
func (c *Config) DatabaseDSN() string {
|
|
return pg.DSN(c.DBHost, c.DBPort, c.DBUser, c.DBPass, c.DBName, c.DBSSL)
|
|
}
|
|
|
|
func LoadConfig() (*Config, error) {
|
|
dbPort, err := strconv.Atoi(getenv("DBPORT", "5432"))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid DBPORT: %w", err)
|
|
}
|
|
return &Config{
|
|
ListenAddr: getenv("LISTEN_ADDR", ":8000"),
|
|
DBHost: getenv("DBHOST", "localhost"),
|
|
DBPort: dbPort,
|
|
DBUser: getenv("DBUSER", "forgebot"),
|
|
DBPass: getenv("DBPASS", ""),
|
|
DBName: getenv("DBNAME", "forgebot"),
|
|
DBSSL: getenv("DBSSL", "disable"),
|
|
WebhookSecret: getenv("WEBHOOK_SECRET", ""),
|
|
GiteaURL: getenv("GITEA_URL", "https://git.unkin.net"),
|
|
GiteaToken: getenv("GITEA_TOKEN", ""),
|
|
}, nil
|
|
}
|
|
|
|
func getenv(key, fallback string) string {
|
|
if v := os.Getenv(key); v != "" {
|
|
return v
|
|
}
|
|
return fallback
|
|
}
|