mirror of
https://github.com/coder/coder.git
synced 2026-06-05 05:58:20 +00:00
Mathias Fredriksson
a6a8fd94d7
`make gen` could not run with `-j` because inter-target dependency edges were missing. Multiple recipes compile `coderd/rbac` (which includes generated files like `object_gen.go`), and without explicit ordering, parallel runs produced syntax errors from mid-write reads. Three main changes: **Dependency graph fixes** declare the compile-time chain through `coderd/rbac` so that `object_gen.go` is written before anything that imports it is compiled. The DB generation targets use a GNU Make 4.3+ grouped target (`&:`) so Make knows `generate.sh` co-produces `querier.go`, `unique_constraint.go`, `dbmetrics`, and `dbauthz` in a single invocation. `SKIP_DUMP_SQL=1` avoids re-entrant `make` inside `generate.sh` when the Makefile already guarantees `dump.sql` is fresh. **`scripts/atomicwrite` package** replaces `os.WriteFile` in all gen scripts with a temp-file-in-same-dir + rename pattern, preventing interrupted runs from leaving partial files. **`.PRECIOUS` and shell atomic writes** protect git-tracked generated files from Make's default delete-on-error behavior. Since these files are committed, deletion is worse than staleness -- `git restore` is the recovery path. CI now runs `make -j --output-sync -B gen` (~32s, down from ~85s serial). | Scenario | Before | After | |-----------------------------------|--------------------|----------| | `make gen` (serial) | 95s | 95s | | `make -j gen` (parallel) | race error | **22s** | | CI `make -j --output-sync -B gen` | forced serial ~85s | **~32s** |
44 lines
1.1 KiB
Go
44 lines
1.1 KiB
Go
// Package main wraps swag init with Strict mode enabled.
|
|
//
|
|
// The upstream swag CLI (v1.16.2) does not expose a --strict
|
|
// flag, so warnings about duplicate routes are silently
|
|
// ignored. This wrapper calls the Go API directly with
|
|
// Strict: true, turning those warnings into hard errors.
|
|
package main
|
|
|
|
import (
|
|
"log"
|
|
"os"
|
|
|
|
"github.com/swaggo/swag/gen"
|
|
)
|
|
|
|
func main() {
|
|
logger := log.New(os.Stdout, "", log.LstdFlags)
|
|
|
|
outputDir := "./coderd/apidoc"
|
|
if d := os.Getenv("SWAG_OUTPUT_DIR"); d != "" {
|
|
outputDir = d
|
|
}
|
|
|
|
err := gen.New().Build(&gen.Config{
|
|
SearchDir: "./coderd,./codersdk,./enterprise/coderd,./enterprise/wsproxy/wsproxysdk",
|
|
MainAPIFile: "coderd.go",
|
|
OutputDir: outputDir,
|
|
OutputTypes: []string{"go", "json"},
|
|
PackageName: "apidoc",
|
|
ParseDependency: 1,
|
|
Strict: true,
|
|
OverridesFile: gen.DefaultOverridesFile,
|
|
ParseGoList: true,
|
|
ParseDepth: 100,
|
|
CollectionFormat: "csv",
|
|
Debugger: logger,
|
|
LeftTemplateDelim: "{{",
|
|
RightTemplateDelim: "}}",
|
|
})
|
|
if err != nil {
|
|
log.Fatalf("swag init failed: %v", err)
|
|
}
|
|
}
|