mirror of
https://github.com/hanzoai/o11y-foundry.git
synced 2026-11-03 02:08:34 +00:00
PandeyandGitHub
09b16ec619
## Summary Reshape foundryctl's output contract so it composes with agents and shell pipelines. Three changes that fall out of the same observation: **stdout, stderr, and exit codes should be a stable contract — today they're conflated.** - **Logger to stderr, silent by default.** `instrumentation.NewLogger` writes to `os.Stderr` (was `os.Stdout`) and uses `slog.DiscardHandler` unless `--debug` is set. Matches helm/aws CLI convention. stdout is now reserved for command results. - **Typed exit codes.** `internal/errors.typ` carries a `code int` field; `errors.ExitCode(err)` walks the wrap chain via `errors.As` and returns a deterministic code: `InvalidInput=2, NotFound=3, Unsupported=4, Internal=5, Fatal=6`, untyped=1, nil=0. Compact 1-6 scheme rather than sysexits.h because sysexits would collapse `Internal` and `Fatal` into the same `EX_SOFTWARE (70)`, losing a distinction we care about (Fatal = recovered panic; Internal = expected-but-failed path). `cmd/foundryctl/main.go` now exits with `errors.ExitCode(err)`. - **`fmt.Errorf` forbidden by lint.** New forbidigo rules in `.golangci.yml` ban `fmt.Errorf` and `fmt.Print*` / `print` / `println`. 168 call sites across 38 files converted to `errors.Newf` / `errors.Wrapf` with contextually-chosen types. Narrow exception for `internal/errors/error_test.go` so the ExitCode wrap-chain test stays authentic. Sites of note for review: - `internal/errors/type.go` — exit code mapping table (one source of truth) - `internal/errors/error.go` — `ExitCode(err)` helper - `internal/instrumentation/logger.go` — `slog.DiscardHandler` default - `.golangci.yml` — forbidigo config + the single narrow test exclusion ## Test plan - [x] `go build ./...` - [x] `go test ./...` (all packages pass; new `TestExitCode` covers 9 cases: nil, untyped, each typed, fmt.Errorf-wrapped, foundry-Wrapf-wrapped) - [x] `golangci-lint run ./...` — 0 issues - [x] Manual: `foundryctl forge` on a missing file exits non-zero and emits nothing on stdout (logs hidden); `--debug` emits JSON on stderr only - [x] Manual: end-to-end forge + cast against the docker/compose flavor still produces a healthy stack
60 lines
1.7 KiB
Go
60 lines
1.7 KiB
Go
package v1alpha1
|
|
|
|
import (
|
|
"encoding/json"
|
|
"reflect"
|
|
|
|
"github.com/signoz/foundry/internal/errors"
|
|
"k8s.io/apimachinery/pkg/util/strategicpatch"
|
|
)
|
|
|
|
// Merge applies an override onto a base via Kubernetes strategic merge patch
|
|
// and mutates base in place. Both arguments must be pointers to the same
|
|
// concrete struct type. Fields typed as any are replaced wholesale rather than
|
|
// recursively merged.
|
|
func Merge(base, overrides any) error {
|
|
if overrides == nil {
|
|
return nil
|
|
}
|
|
|
|
baseBytes, err := json.Marshal(base)
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to convert current object to byte sequence")
|
|
}
|
|
|
|
overrideBytes, err := json.Marshal(overrides)
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to convert current object to byte sequence")
|
|
}
|
|
|
|
patchMeta, err := strategicpatch.NewPatchMetaFromStruct(base)
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to produce patch meta from struct")
|
|
}
|
|
|
|
patch, err := strategicpatch.CreateThreeWayMergePatch(overrideBytes, overrideBytes, baseBytes, patchMeta, true)
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to create three way merge patch")
|
|
}
|
|
|
|
merged, err := strategicpatch.StrategicMergePatchUsingLookupPatchMeta(baseBytes, patch, patchMeta)
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to apply patch")
|
|
}
|
|
|
|
valueOfBase := reflect.Indirect(reflect.ValueOf(base))
|
|
|
|
into := reflect.New(valueOfBase.Type())
|
|
if err := json.Unmarshal(merged, into.Interface()); err != nil {
|
|
return err
|
|
}
|
|
|
|
if !valueOfBase.CanSet() {
|
|
return errors.Newf(errors.TypeInternal, "unable to set unmarshalled value into base object")
|
|
}
|
|
|
|
valueOfBase.Set(reflect.Indirect(into))
|
|
|
|
return nil
|
|
}
|