mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
* feat(api): hard-fork CRD API group argoproj.io -> deploy.hanzo.ai
Hanzo CD hard-fork, phase 1.1. Single source of truth is
pkg/apis/application/register.go's Group constant (Application/AppProject/
ApplicationSet all derive their FullName from it); every other Go call-site
that hardcoded the literal group string is updated to match: the 3 generated
informer GVRs, the app-of-apps nested-Application detector in types.go, the
resource-tree Application-kind cache populator, the 3 NotFound error
constructors in server/application, and the applicationset-controller's
leader-election Lease name/ID (kept in lockstep across Go source + RBAC
resourceNames, or leader election would get RBAC-denied on startup).
CRD YAMLs (application/appproject/applicationset) and every RBAC apiGroups
rule that actually governs our 3 CRDs are repointed to deploy.hanzo.ai, across
both manifests/base/* (namespaced Roles) and manifests/cluster-rbac/* (cluster
scope). Two adjacent things that share the "argoproj.io" string but are NOT
ours are deliberately left untouched: gitops-engine's health-check dispatch
for Argo Workflows' `Workflow` kind, and argocd-server-clusterrole's second
apiGroups block granting read on Argo Workflows' `workflows` resource — both
belong to a separate, unrelated Argoproj-family project we are not forking.
Also untouched, per explicit scope: annotation/label keys (argocd.argoproj.io/*)
and finalizers (*.argoproj.io) that track already-applied live resources, and
argocd-cm.yaml's resource.customizations.ignoreResourceUpdates keys (a narrow
app-of-apps diffing nicety, not build- or RBAC-relevant).
CGO_ENABLED=0 go build ./... verified green.
* ci: wire canonical hanzo.yml + cicd.yml (Hanzo CD image build)
Phase 1.3. Follows the same one-way pattern every hanzo/lux/zoo repo uses:
hanzo.yml declares the image (root Dockerfile -> ghcr.io/hanzoai/deploy) and a
fast go-build sanity test (the multi-stage Dockerfile build is the slow, real
gate); cicd.yml is the ~10-line trigger shim importing hanzoai/ci's reusable
build workflow on the arc pool, secrets from KMS only.
No `deploy:` block yet, matching the hanzoai/cms build-only-first-cutover
pattern: this repo's own live hanzo-cd namespace runs the whole Hanzo fleet's
GitOps, so the prod image/CRD swap is a deliberate separate action (see the
[HELD] universe PR), never an automatic rollout on merge. Every PR/push still
builds and pushes an immutable ghcr.io/hanzoai/deploy:sha-<7>-amd64 image.
* feat(ui): rebrand Argo CD -> Hanzo CD (title, favicon, logo, sidebar)
Phase 1.2. User-facing "Argo CD"/"ArgoCD" text replaced with "Hanzo CD"
across the login page, help modal, settings screens, version-info panel,
sync-options warning, fullscreen-logs title, app.tsx page titles, and
index.html's <title>/noscript text (dropped the now-wrong upstream CLI
doc link rather than invent a hanzo.ai URL that doesn't exist).
Logo/favicon assets replaced with the canonical Hanzo mark (never
hand-drawn, copied from ~/work/hanzo/logo/dist): the two real usages of
Argo's logo collapse onto one Hanzo glyph (mono + white variants) at the
same 5 call sites (login icon + footer, login.scss $logoPath/
$logoNegativePath, sidebar text-logo), preserving the existing CSS
invert() filters so both the light login panel and dark sidebar still
render correctly. Old argologo.svg/argo_o.svg/argo.png deleted (no
longer referenced). favicon-{16x16,32x32}.png added at
ui/src/assets/favicon/ (index.html's links to that path were previously
dead - the directory didn't exist in this checkout). package.json name
argo-cd-ui -> hanzo-cd-ui.
Left alone, deliberately: the two Kubernetes resource-kind icon sets
under ui/src/assets/images/resources/ (unrelated to branding), and
upstream doc/project links (argoproj.io, argo-cd.readthedocs.io) since
we have no equivalent hanzo.ai docs to point to yet - except the login
footer logo's outbound link, which now points to hanzo.ai instead of
argoproj.io (a Hanzo-branded mark linking to the upstream project it
was forked from read as an obvious leftover).
* feat(module): rename Go module github.com/argoproj/argo-cd/v3 -> github.com/hanzoai/deploy
Phase 2. No version suffix on the new path (org policy: never publish our
own Go modules above v1.x.x / with a v2+ suffix) — this fork starts a fresh
v0/v1 module identity rather than carrying the v3 the upstream fork point
had reached.
Mechanical, symmetric rewrite: 704 .go files (import statements only; two
disjoint substitutions applied specific-first so the nested gitops-engine
module path never double-matches), plus go.mod (module line, the
gitops-engine require+replace pair, version reset to v0.0.0-... since a
suffix-less path can't carry a v3 semver), gitops-engine/go.mod, Makefile
(ldflags PACKAGE + 2 TEST_MODULE filters), .golangci.yaml, .goreleaser.yaml,
.mockery.yaml (+ gitops-engine's), Procfile, the codegen/proto generation
scripts (hack/generate-proto.sh, update-codegen.sh, update-openapi.sh), and
20 .proto files' go_package options. Also one OpenTelemetry tracer name
string in gitops-engine/pkg/sync/sync_context.go (a cosmestic label, not an
import, but worth keeping consistent).
CGO_ENABLED=0 go build ./... verified green for both the root module and
the nested gitops-engine module; go vet clean on both; go mod tidy run
(network available) to reconcile go.sum, dependency set unchanged.
Left alone, deliberately: doc-only mentions (docs/snyk/*.html scan reports,
gitops-engine/README.md), a comment-only reference in
.github/workflows/release.yaml, and one Renovate bot config line — none are
build- or codegen-load-bearing. Also left alone: comments citing upstream
GitHub issue URLs (github.com/argoproj/argo-cd/issues/NNNNN) and a handful
of test fixtures using "https://github.com/argoproj/argo-cd.git" as a
representative example repo URL — both are accurate historical/test-data
references, not stale self-references.
---------
Co-authored-by: Hanzo Dev <[email protected]>
289 lines
8.0 KiB
Go
289 lines
8.0 KiB
Go
package exec
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strconv"
|
|
"strings"
|
|
"syscall"
|
|
"time"
|
|
"unicode"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/utils/tracing"
|
|
"github.com/sirupsen/logrus"
|
|
|
|
"github.com/hanzoai/deploy/util/log"
|
|
"github.com/hanzoai/deploy/util/rand"
|
|
)
|
|
|
|
var (
|
|
timeout time.Duration
|
|
fatalTimeout time.Duration
|
|
Unredacted = Redact(nil)
|
|
)
|
|
|
|
type ExecRunOpts struct {
|
|
// Redactor redacts tokens from the output
|
|
Redactor func(text string) string
|
|
// TimeoutBehavior configures what to do in case of timeout
|
|
TimeoutBehavior TimeoutBehavior
|
|
// SkipErrorLogging determines whether to skip logging of execution errors (rc > 0)
|
|
SkipErrorLogging bool
|
|
// CaptureStderr determines whether to capture stderr in addition to stdout
|
|
CaptureStderr bool
|
|
}
|
|
|
|
func init() {
|
|
initTimeout()
|
|
}
|
|
|
|
func initTimeout() {
|
|
var err error
|
|
timeout, err = time.ParseDuration(os.Getenv("ARGOCD_EXEC_TIMEOUT"))
|
|
if err != nil {
|
|
timeout = 90 * time.Second
|
|
}
|
|
fatalTimeout, err = time.ParseDuration(os.Getenv("ARGOCD_EXEC_FATAL_TIMEOUT"))
|
|
if err != nil {
|
|
fatalTimeout = 10 * time.Second
|
|
}
|
|
}
|
|
|
|
func Run(cmd *exec.Cmd) (string, error) {
|
|
return RunWithRedactor(cmd, nil)
|
|
}
|
|
|
|
func RunWithRedactor(cmd *exec.Cmd, redactor func(text string) string) (string, error) {
|
|
opts := ExecRunOpts{Redactor: redactor}
|
|
return RunWithExecRunOpts(cmd, opts)
|
|
}
|
|
|
|
func RunWithExecRunOpts(cmd *exec.Cmd, opts ExecRunOpts) (string, error) {
|
|
cmdOpts := CmdOpts{Timeout: timeout, FatalTimeout: fatalTimeout, Redactor: opts.Redactor, TimeoutBehavior: opts.TimeoutBehavior, SkipErrorLogging: opts.SkipErrorLogging, CaptureStderr: opts.CaptureStderr}
|
|
span := tracing.NewLoggingTracer(log.NewLogrusLogger(log.NewWithCurrentConfig())).StartSpan(fmt.Sprintf("exec %v", cmd.Args[0]))
|
|
span.SetBaggageItem("dir", cmd.Dir)
|
|
if cmdOpts.Redactor != nil {
|
|
span.SetBaggageItem("args", opts.Redactor(fmt.Sprintf("%v", cmd.Args)))
|
|
} else {
|
|
span.SetBaggageItem("args", fmt.Sprintf("%v", cmd.Args))
|
|
}
|
|
defer span.Finish()
|
|
return RunCommandExt(cmd, cmdOpts)
|
|
}
|
|
|
|
// GetCommandArgsToLog represents the given command in a way that we can copy-and-paste into a terminal
|
|
func GetCommandArgsToLog(cmd *exec.Cmd) string {
|
|
var argsToLog []string
|
|
for _, arg := range cmd.Args {
|
|
if arg == "" {
|
|
argsToLog = append(argsToLog, `""`)
|
|
continue
|
|
}
|
|
|
|
containsSpace := false
|
|
for _, r := range arg {
|
|
if unicode.IsSpace(r) {
|
|
containsSpace = true
|
|
break
|
|
}
|
|
}
|
|
if containsSpace {
|
|
// add quotes and escape any internal quotes
|
|
argsToLog = append(argsToLog, strconv.Quote(arg))
|
|
} else {
|
|
argsToLog = append(argsToLog, arg)
|
|
}
|
|
}
|
|
args := strings.Join(argsToLog, " ")
|
|
return args
|
|
}
|
|
|
|
type CmdError struct {
|
|
Args string
|
|
Stderr string
|
|
Cause error
|
|
}
|
|
|
|
func (ce *CmdError) Error() string {
|
|
res := fmt.Sprintf("`%v` failed %v", ce.Args, ce.Cause)
|
|
if ce.Stderr != "" {
|
|
res = fmt.Sprintf("%s: %s", res, ce.Stderr)
|
|
}
|
|
return res
|
|
}
|
|
|
|
func (ce *CmdError) String() string {
|
|
return ce.Error()
|
|
}
|
|
|
|
func newCmdError(args string, cause error, stderr string) *CmdError {
|
|
return &CmdError{Args: args, Stderr: stderr, Cause: cause}
|
|
}
|
|
|
|
// TimeoutBehavior defines behavior for when the command takes longer than the passed in timeout to exit
|
|
// By default, SIGKILL is sent to the process and it is not waited upon
|
|
type TimeoutBehavior struct {
|
|
// Signal determines the signal to send to the process
|
|
Signal syscall.Signal
|
|
// ShouldWait determines whether to wait for the command to exit once timeout is reached
|
|
ShouldWait bool
|
|
}
|
|
|
|
type CmdOpts struct {
|
|
// Timeout determines how long to wait for the command to exit
|
|
Timeout time.Duration
|
|
// FatalTimeout is the amount of additional time to wait after Timeout before fatal SIGKILL
|
|
FatalTimeout time.Duration
|
|
// Redactor redacts tokens from the output
|
|
Redactor func(text string) string
|
|
// TimeoutBehavior configures what to do in case of timeout
|
|
TimeoutBehavior TimeoutBehavior
|
|
// SkipErrorLogging defines whether to skip logging of execution errors (rc > 0)
|
|
SkipErrorLogging bool
|
|
// CaptureStderr defines whether to capture stderr in addition to stdout
|
|
CaptureStderr bool
|
|
}
|
|
|
|
var DefaultCmdOpts = CmdOpts{
|
|
Timeout: time.Duration(0),
|
|
FatalTimeout: time.Duration(0),
|
|
Redactor: Unredacted,
|
|
TimeoutBehavior: TimeoutBehavior{syscall.SIGKILL, false},
|
|
SkipErrorLogging: false,
|
|
CaptureStderr: false,
|
|
}
|
|
|
|
func Redact(items []string) func(text string) string {
|
|
return func(text string) string {
|
|
for _, item := range items {
|
|
text = strings.ReplaceAll(text, item, "******")
|
|
}
|
|
return text
|
|
}
|
|
}
|
|
|
|
// RunCommandExt is a convenience function to run/log a command and return/log stderr in an error upon
|
|
// failure.
|
|
func RunCommandExt(cmd *exec.Cmd, opts CmdOpts) (string, error) {
|
|
execId, err := rand.RandHex(5)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
logCtx := logrus.WithFields(logrus.Fields{"execID": execId})
|
|
|
|
redactor := DefaultCmdOpts.Redactor
|
|
if opts.Redactor != nil {
|
|
redactor = opts.Redactor
|
|
}
|
|
|
|
// log in a way we can copy-and-paste into a terminal
|
|
args := strings.Join(cmd.Args, " ")
|
|
logCtx.WithFields(logrus.Fields{"dir": cmd.Dir}).Info(redactor(args))
|
|
|
|
var stdout bytes.Buffer
|
|
var stderr bytes.Buffer
|
|
cmd.Stdout = &stdout
|
|
cmd.Stderr = &stderr
|
|
|
|
start := time.Now()
|
|
err = cmd.Start()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
done := make(chan error)
|
|
go func() { done <- cmd.Wait() }()
|
|
|
|
// Start timers for timeout
|
|
timeout := DefaultCmdOpts.Timeout
|
|
fatalTimeout := DefaultCmdOpts.FatalTimeout
|
|
|
|
if opts.Timeout != time.Duration(0) {
|
|
timeout = opts.Timeout
|
|
}
|
|
|
|
if opts.FatalTimeout != time.Duration(0) {
|
|
fatalTimeout = opts.FatalTimeout
|
|
}
|
|
|
|
var timoutCh <-chan time.Time
|
|
if timeout != 0 {
|
|
timoutCh = time.NewTimer(timeout).C
|
|
}
|
|
|
|
var fatalTimeoutCh <-chan time.Time
|
|
if fatalTimeout != 0 {
|
|
fatalTimeoutCh = time.NewTimer(timeout + fatalTimeout).C
|
|
}
|
|
|
|
timeoutBehavior := DefaultCmdOpts.TimeoutBehavior
|
|
fatalTimeoutBehaviour := syscall.SIGKILL
|
|
if opts.TimeoutBehavior.Signal != syscall.Signal(0) {
|
|
timeoutBehavior = opts.TimeoutBehavior
|
|
}
|
|
|
|
select {
|
|
// noinspection ALL
|
|
case <-timoutCh:
|
|
// send timeout signal
|
|
_ = cmd.Process.Signal(timeoutBehavior.Signal)
|
|
// wait on timeout signal and fallback to fatal timeout signal
|
|
if timeoutBehavior.ShouldWait {
|
|
select {
|
|
case <-done:
|
|
case <-fatalTimeoutCh:
|
|
// upgrades to SIGKILL if cmd does not respect SIGTERM
|
|
_ = cmd.Process.Signal(fatalTimeoutBehaviour)
|
|
// now original cmd should exit immediately after SIGKILL
|
|
<-done
|
|
// return error with a marker indicating that cmd exited only after fatal SIGKILL
|
|
output := stdout.String()
|
|
if opts.CaptureStderr {
|
|
output += stderr.String()
|
|
}
|
|
logCtx.WithFields(logrus.Fields{"duration": time.Since(start)}).Debug(redactor(output))
|
|
err = newCmdError(redactor(args), fmt.Errorf("fatal timeout after %v", timeout+fatalTimeout), "")
|
|
logCtx.Error(err.Error())
|
|
return strings.TrimSuffix(output, "\n"), err
|
|
}
|
|
}
|
|
// either did not wait for timeout or cmd did respect SIGTERM
|
|
output := stdout.String()
|
|
if opts.CaptureStderr {
|
|
output += stderr.String()
|
|
}
|
|
logCtx.WithFields(logrus.Fields{"duration": time.Since(start)}).Debug(redactor(output))
|
|
err = newCmdError(redactor(args), fmt.Errorf("timeout after %v", timeout), "")
|
|
logCtx.Error(err.Error())
|
|
return strings.TrimSuffix(output, "\n"), err
|
|
case err := <-done:
|
|
if err != nil {
|
|
output := stdout.String()
|
|
if opts.CaptureStderr {
|
|
output += stderr.String()
|
|
}
|
|
logCtx.WithFields(logrus.Fields{"duration": time.Since(start)}).Debug(redactor(output))
|
|
err := newCmdError(redactor(args), errors.New(redactor(err.Error())), strings.TrimSpace(redactor(stderr.String())))
|
|
if !opts.SkipErrorLogging {
|
|
logCtx.Error(err.Error())
|
|
}
|
|
return strings.TrimSuffix(output, "\n"), err
|
|
}
|
|
}
|
|
output := stdout.String()
|
|
if opts.CaptureStderr {
|
|
output += stderr.String()
|
|
}
|
|
logCtx.WithFields(logrus.Fields{"duration": time.Since(start)}).Debug(redactor(output))
|
|
|
|
return strings.TrimSuffix(output, "\n"), nil
|
|
}
|
|
|
|
func RunCommand(name string, opts CmdOpts, arg ...string) (string, error) {
|
|
return RunCommandExt(exec.CommandContext(context.Background(), name, arg...), opts)
|
|
}
|