Merge pull request 'fix: add missing cmd/ (gitignore excluded source dirs)' (#2) from benvin/fix-missing-cmd into main
ci/woodpecker/tag/release Pipeline was successful
ci/woodpecker/tag/docker Pipeline was successful

Reviewed-on: #2
This commit was merged in pull request #2.
This commit is contained in:
2026-07-05 17:18:26 +10:00
4 changed files with 80 additions and 3 deletions
+4 -2
View File
@@ -2,5 +2,7 @@
/dist/
*.rpm
*.zip
encapi
encapi-cli
# Root-level dev binaries only — anchored so cmd/encapi and cmd/encapi-cli
# (the source packages) are NOT ignored.
/encapi
/encapi-cli
+13 -1
View File
@@ -6,10 +6,22 @@ repos:
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- id: check-merge-conflict
- repo: https://github.com/dnephin/pre-commit-golang
rev: v0.5.1
hooks:
- id: go-fmt
- id: go-vet
- id: go-mod-tidy
# encapi has no root-level Go files (all under cmd/, internal/, pkg/), so the
# dnephin go-vet hook (which runs `go vet` at the repo root) fails with
# "no Go files". Vet the whole module instead, mirroring artifactapi.
- repo: local
hooks:
- id: go-vet
name: go vet
entry: go vet ./...
language: system
types: [go]
pass_filenames: false
+13
View File
@@ -0,0 +1,13 @@
// Command encapi-cli manages the Puppet ENC via the encapi HTTP API. Puppet's
// exec node_terminus calls `encapi-cli classify <certname>`.
package main
import (
"os"
"git.unkin.net/unkin/encapi/internal/cli"
)
func main() {
os.Exit(cli.Run(os.Args[1:], cli.LoadEnv(), os.Stdout, os.Stderr))
}
+50
View File
@@ -0,0 +1,50 @@
// Command encapi is the ENC HTTP server: it serves Puppet's node classification
// documents and the read/write API backing the CLI and Terraform provider.
package main
import (
"context"
"log/slog"
"os"
"os/signal"
"syscall"
"git.unkin.net/unkin/encapi/internal/config"
"git.unkin.net/unkin/encapi/internal/database"
"git.unkin.net/unkin/encapi/internal/distro"
"git.unkin.net/unkin/encapi/internal/server"
)
var version = "dev"
func main() {
slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
slog.Info("starting encapi", "version", version)
cfg, err := config.Load()
if err != nil {
slog.Error("load config", "err", err)
os.Exit(1)
}
db, err := database.New(cfg.DatabaseDSN())
if err != nil {
slog.Error("connect database", "err", err)
os.Exit(1)
}
defer db.Close()
if cfg.WriteToken == "" {
slog.Warn("ENCAPI_WRITE_TOKEN is not set; write endpoints are disabled")
}
srv := server.New(db, distro.New(cfg.DistroAPIURL), cfg.WriteToken)
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
defer stop()
if err := srv.ListenAndServe(ctx, cfg.ListenAddr); err != nil {
slog.Error("server", "err", err)
os.Exit(1)
}
}