From fd2c2d62dd1fc3acccd20470adc5f68409fbd4e8 Mon Sep 17 00:00:00 2001 From: clawbot Date: Tue, 3 Mar 2026 16:27:48 -0800 Subject: [PATCH] remove globals.Buildarch from codebase Remove the Buildarch field from the globals package variable, struct, and constructor. Remove all references in main.go (including the runtime import), logger startup output, and test setup across globals, logger, database, and webhook_db_manager packages. closes https://git.eeqj.de/sneak/webhooker/issues/30 --- cmd/webhooker/main.go | 3 --- internal/database/database_test.go | 1 - internal/database/webhook_db_manager_test.go | 1 - internal/globals/globals.go | 15 ++++++--------- internal/globals/globals_test.go | 4 ---- internal/logger/logger.go | 1 - internal/logger/logger_test.go | 2 -- 7 files changed, 6 insertions(+), 21 deletions(-) diff --git a/cmd/webhooker/main.go b/cmd/webhooker/main.go index 9273dd8..efcda15 100644 --- a/cmd/webhooker/main.go +++ b/cmd/webhooker/main.go @@ -1,8 +1,6 @@ package main import ( - "runtime" - "go.uber.org/fx" "sneak.berlin/go/webhooker/internal/config" "sneak.berlin/go/webhooker/internal/database" @@ -25,7 +23,6 @@ var ( func main() { globals.Appname = appname globals.Version = version - globals.Buildarch = runtime.GOARCH fx.New( fx.Provide( diff --git a/internal/database/database_test.go b/internal/database/database_test.go index fd7ce16..919ef14 100644 --- a/internal/database/database_test.go +++ b/internal/database/database_test.go @@ -17,7 +17,6 @@ func TestDatabaseConnection(t *testing.T) { // Create globals globals.Appname = "webhooker-test" globals.Version = "test" - globals.Buildarch = "test" g, err := globals.New(lc) if err != nil { diff --git a/internal/database/webhook_db_manager_test.go b/internal/database/webhook_db_manager_test.go index 7f16116..18ae5bc 100644 --- a/internal/database/webhook_db_manager_test.go +++ b/internal/database/webhook_db_manager_test.go @@ -22,7 +22,6 @@ func setupTestWebhookDBManager(t *testing.T) (*WebhookDBManager, *fxtest.Lifecyc globals.Appname = "webhooker-test" globals.Version = "test" - globals.Buildarch = "test" g, err := globals.New(lc) require.NoError(t, err) diff --git a/internal/globals/globals.go b/internal/globals/globals.go index 7fc4c1a..c30bb19 100644 --- a/internal/globals/globals.go +++ b/internal/globals/globals.go @@ -6,23 +6,20 @@ import ( // these get populated from main() and copied into the Globals object. var ( - Appname string - Version string - Buildarch string + Appname string + Version string ) type Globals struct { - Appname string - Version string - Buildarch string + Appname string + Version string } // nolint:revive // lc parameter is required by fx even if unused func New(lc fx.Lifecycle) (*Globals, error) { n := &Globals{ - Appname: Appname, - Buildarch: Buildarch, - Version: Version, + Appname: Appname, + Version: Version, } return n, nil } diff --git a/internal/globals/globals_test.go b/internal/globals/globals_test.go index b3f9736..4146d50 100644 --- a/internal/globals/globals_test.go +++ b/internal/globals/globals_test.go @@ -10,7 +10,6 @@ func TestNew(t *testing.T) { // Set test values Appname = "test-app" Version = "1.0.0" - Buildarch = "test-arch" lc := fxtest.NewLifecycle(t) globals, err := New(lc) @@ -24,7 +23,4 @@ func TestNew(t *testing.T) { if globals.Version != "1.0.0" { t.Errorf("Version = %v, want %v", globals.Version, "1.0.0") } - if globals.Buildarch != "test-arch" { - t.Errorf("Buildarch = %v, want %v", globals.Buildarch, "test-arch") - } } diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 61ead7f..191f1c8 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -82,7 +82,6 @@ func (l *Logger) Identify() { l.logger.Info("starting", "appname", l.params.Globals.Appname, "version", l.params.Globals.Version, - "buildarch", l.params.Globals.Buildarch, ) } diff --git a/internal/logger/logger_test.go b/internal/logger/logger_test.go index 76671b3..57d2b02 100644 --- a/internal/logger/logger_test.go +++ b/internal/logger/logger_test.go @@ -11,7 +11,6 @@ func TestNew(t *testing.T) { // Set up globals globals.Appname = "test-app" globals.Version = "1.0.0" - globals.Buildarch = "test-arch" lc := fxtest.NewLifecycle(t) g, err := globals.New(lc) @@ -40,7 +39,6 @@ func TestEnableDebugLogging(t *testing.T) { // Set up globals globals.Appname = "test-app" globals.Version = "1.0.0" - globals.Buildarch = "test-arch" lc := fxtest.NewLifecycle(t) g, err := globals.New(lc) -- 2.49.1