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(

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 {

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)

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
 }

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")
-	}
 }

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,
 	)
 }
 

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)