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
83 lines
3.3 KiB
Go
83 lines
3.3 KiB
Go
package ecsterraformcasting
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/signoz/foundry/api/v1alpha1"
|
|
"github.com/signoz/foundry/api/v1alpha1/installation"
|
|
"github.com/signoz/foundry/internal/domain"
|
|
"github.com/signoz/foundry/internal/errors"
|
|
"github.com/signoz/foundry/internal/molding"
|
|
)
|
|
|
|
const (
|
|
telemetryStorePort = 9000
|
|
telemetryKeeperClientPort = 9181
|
|
telemetryKeeperRaftPort = 9234
|
|
metaStorePort = 5432
|
|
signozAPIPort = 8080
|
|
signozOpampPort = 4320
|
|
)
|
|
|
|
var _ molding.MoldingEnricher = (*ecsMoldingEnricher)(nil)
|
|
|
|
type ecsMoldingEnricher struct {
|
|
materials []domain.StructuredMaterial
|
|
}
|
|
|
|
func newEcsMoldingEnricher(config *installation.Casting) (*ecsMoldingEnricher, error) {
|
|
materials, err := getMaterials(config)
|
|
if err != nil {
|
|
return nil, errors.Wrapf(err, errors.TypeInternal, "failed to get materials")
|
|
}
|
|
|
|
return &ecsMoldingEnricher{materials: materials}, nil
|
|
}
|
|
|
|
func (enricher *ecsMoldingEnricher) EnrichStatus(ctx context.Context, kind v1alpha1.MoldingKind, config *installation.Casting) error {
|
|
namespaceBytes, err := enricher.materials[0].GetBytes("resource.aws_service_discovery_private_dns_namespace.main.name")
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to get namespace")
|
|
}
|
|
namespace := string(namespaceBytes)
|
|
|
|
switch kind {
|
|
case v1alpha1.MoldingKindTelemetryStore:
|
|
sdName, err := enricher.materials[1].GetBytes("resource.aws_service_discovery_service.telemetrystore.name")
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to get telemetrystore service discovery name")
|
|
}
|
|
fqdn := fmt.Sprintf("%s.%s", string(sdName), namespace)
|
|
config.Spec.TelemetryStore.Status.Addresses.TCP = []string{domain.MustNewAddress("tcp", fqdn, telemetryStorePort).String()}
|
|
|
|
case v1alpha1.MoldingKindTelemetryKeeper:
|
|
sdName, err := enricher.materials[2].GetBytes("resource.aws_service_discovery_service.telemetrykeeper.name")
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to get telemetrykeeper service discovery name")
|
|
}
|
|
fqdn := fmt.Sprintf("%s.%s", string(sdName), namespace)
|
|
config.Spec.TelemetryKeeper.Status.Addresses.Client = []string{domain.MustNewAddress("tcp", fqdn, telemetryKeeperClientPort).String()}
|
|
config.Spec.TelemetryKeeper.Status.Addresses.Raft = []string{domain.MustNewAddress("tcp", fqdn, telemetryKeeperRaftPort).String()}
|
|
|
|
case v1alpha1.MoldingKindMetaStore:
|
|
sdName, err := enricher.materials[3].GetBytes("resource.aws_service_discovery_service.metastore.name")
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to get metastore service discovery name")
|
|
}
|
|
fqdn := fmt.Sprintf("%s.%s", string(sdName), namespace)
|
|
config.Spec.MetaStore.Status.Addresses.DSN = []string{domain.MustNewAddress("tcp", fqdn, metaStorePort).String()}
|
|
|
|
case v1alpha1.MoldingKindSignoz:
|
|
sdName, err := enricher.materials[4].GetBytes("resource.aws_service_discovery_service.signoz.name")
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, "failed to get signoz service discovery name")
|
|
}
|
|
fqdn := fmt.Sprintf("%s.%s", string(sdName), namespace)
|
|
config.Spec.Signoz.Status.Addresses.APIServer = []string{domain.MustNewAddress("tcp", fqdn, signozAPIPort).String()}
|
|
config.Spec.Signoz.Status.Addresses.Opamp = []string{domain.MustNewAddress("ws", fqdn, signozOpampPort).String()}
|
|
}
|
|
|
|
return nil
|
|
}
|