From cf825a7260c075038c279aed4f6e2994acbd9581 Mon Sep 17 00:00:00 2001 From: user Date: Tue, 17 Mar 2026 01:53:21 -0700 Subject: [PATCH] consolidate appname to internal/globals as a constant The appname was redundantly defined in both cmd/pixad/main.go and internal/globals/globals.go. Since it is always "pixad" and is not actually set via ldflags (only Version is), define it once as an unexported constant in globals.go and remove it from main.go. --- cmd/pixad/main.go | 6 +----- internal/globals/globals.go | 11 +++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/cmd/pixad/main.go b/cmd/pixad/main.go index 5dcaf0b..7dc11cd 100644 --- a/cmd/pixad/main.go +++ b/cmd/pixad/main.go @@ -17,10 +17,7 @@ import ( "sneak.berlin/go/pixa/internal/server" ) -var ( - Appname = "pixad" //nolint:gochecknoglobals // set by ldflags - Version string //nolint:gochecknoglobals // set by ldflags -) +var Version string //nolint:gochecknoglobals // set by ldflags var configPath string //nolint:gochecknoglobals // cobra flag @@ -40,7 +37,6 @@ func main() { } func run(_ *cobra.Command, _ []string) { - globals.Appname = Appname globals.Version = Version // Set config path in environment if specified via flag diff --git a/internal/globals/globals.go b/internal/globals/globals.go index 5b86205..ac00731 100644 --- a/internal/globals/globals.go +++ b/internal/globals/globals.go @@ -5,11 +5,10 @@ import ( "go.uber.org/fx" ) -// Build-time variables populated from main() via ldflags. -var ( - Appname string //nolint:gochecknoglobals // set from main - Version string //nolint:gochecknoglobals // set from main -) +const appname = "pixad" + +// Version is populated from main() via ldflags. +var Version string //nolint:gochecknoglobals // set from main // Globals holds application-wide constants. type Globals struct { @@ -20,7 +19,7 @@ type Globals struct { // New creates a new Globals instance from build-time variables. func New(_ fx.Lifecycle) (*Globals, error) { return &Globals{ - Appname: Appname, + Appname: appname, Version: Version, }, nil } -- 2.49.1