Remove globals.Buildarch from codebase (#31)
All checks were successful
check / check (push) Successful in 1m0s
All checks were successful
check / check (push) Successful in 1m0s
Remove the `Buildarch` field from the globals package and all references throughout the codebase. **Changes:** - Removed `Buildarch` package-level var and struct field from `internal/globals/globals.go` - Removed `Buildarch` from the `New()` constructor - Removed `globals.Buildarch = runtime.GOARCH` and unused `runtime` import from `cmd/webhooker/main.go` - Removed `buildarch` from logger startup output in `internal/logger/logger.go` - Removed all `Buildarch` test setup and assertions from globals, logger, database, and webhook_db_manager tests All tests pass, `make check` passes, `docker build .` succeeds. closes [issue #30](#30) <!-- session: agent:sdlc-manager:subagent:5cae6803-6bdf-467d-9a56-43f135521e5f --> Co-authored-by: clawbot <clawbot@noreply.git.eeqj.de> Reviewed-on: #31 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
This commit was merged in pull request #31.
This commit is contained in:
@@ -1,8 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"runtime"
|
|
||||||
|
|
||||||
"go.uber.org/fx"
|
"go.uber.org/fx"
|
||||||
"sneak.berlin/go/webhooker/internal/config"
|
"sneak.berlin/go/webhooker/internal/config"
|
||||||
"sneak.berlin/go/webhooker/internal/database"
|
"sneak.berlin/go/webhooker/internal/database"
|
||||||
@@ -25,7 +23,6 @@ var (
|
|||||||
func main() {
|
func main() {
|
||||||
globals.Appname = appname
|
globals.Appname = appname
|
||||||
globals.Version = version
|
globals.Version = version
|
||||||
globals.Buildarch = runtime.GOARCH
|
|
||||||
|
|
||||||
fx.New(
|
fx.New(
|
||||||
fx.Provide(
|
fx.Provide(
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ func TestDatabaseConnection(t *testing.T) {
|
|||||||
// Create globals
|
// Create globals
|
||||||
globals.Appname = "webhooker-test"
|
globals.Appname = "webhooker-test"
|
||||||
globals.Version = "test"
|
globals.Version = "test"
|
||||||
globals.Buildarch = "test"
|
|
||||||
|
|
||||||
g, err := globals.New(lc)
|
g, err := globals.New(lc)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ func setupTestWebhookDBManager(t *testing.T) (*WebhookDBManager, *fxtest.Lifecyc
|
|||||||
|
|
||||||
globals.Appname = "webhooker-test"
|
globals.Appname = "webhooker-test"
|
||||||
globals.Version = "test"
|
globals.Version = "test"
|
||||||
globals.Buildarch = "test"
|
|
||||||
|
|
||||||
g, err := globals.New(lc)
|
g, err := globals.New(lc)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|||||||
@@ -8,20 +8,17 @@ import (
|
|||||||
var (
|
var (
|
||||||
Appname string
|
Appname string
|
||||||
Version string
|
Version string
|
||||||
Buildarch string
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type Globals struct {
|
type Globals struct {
|
||||||
Appname string
|
Appname string
|
||||||
Version string
|
Version string
|
||||||
Buildarch string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// nolint:revive // lc parameter is required by fx even if unused
|
// nolint:revive // lc parameter is required by fx even if unused
|
||||||
func New(lc fx.Lifecycle) (*Globals, error) {
|
func New(lc fx.Lifecycle) (*Globals, error) {
|
||||||
n := &Globals{
|
n := &Globals{
|
||||||
Appname: Appname,
|
Appname: Appname,
|
||||||
Buildarch: Buildarch,
|
|
||||||
Version: Version,
|
Version: Version,
|
||||||
}
|
}
|
||||||
return n, nil
|
return n, nil
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ func TestNew(t *testing.T) {
|
|||||||
// Set test values
|
// Set test values
|
||||||
Appname = "test-app"
|
Appname = "test-app"
|
||||||
Version = "1.0.0"
|
Version = "1.0.0"
|
||||||
Buildarch = "test-arch"
|
|
||||||
|
|
||||||
lc := fxtest.NewLifecycle(t)
|
lc := fxtest.NewLifecycle(t)
|
||||||
globals, err := New(lc)
|
globals, err := New(lc)
|
||||||
@@ -24,7 +23,4 @@ func TestNew(t *testing.T) {
|
|||||||
if globals.Version != "1.0.0" {
|
if globals.Version != "1.0.0" {
|
||||||
t.Errorf("Version = %v, want %v", 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")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,7 +82,6 @@ func (l *Logger) Identify() {
|
|||||||
l.logger.Info("starting",
|
l.logger.Info("starting",
|
||||||
"appname", l.params.Globals.Appname,
|
"appname", l.params.Globals.Appname,
|
||||||
"version", l.params.Globals.Version,
|
"version", l.params.Globals.Version,
|
||||||
"buildarch", l.params.Globals.Buildarch,
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ func TestNew(t *testing.T) {
|
|||||||
// Set up globals
|
// Set up globals
|
||||||
globals.Appname = "test-app"
|
globals.Appname = "test-app"
|
||||||
globals.Version = "1.0.0"
|
globals.Version = "1.0.0"
|
||||||
globals.Buildarch = "test-arch"
|
|
||||||
|
|
||||||
lc := fxtest.NewLifecycle(t)
|
lc := fxtest.NewLifecycle(t)
|
||||||
g, err := globals.New(lc)
|
g, err := globals.New(lc)
|
||||||
@@ -40,7 +39,6 @@ func TestEnableDebugLogging(t *testing.T) {
|
|||||||
// Set up globals
|
// Set up globals
|
||||||
globals.Appname = "test-app"
|
globals.Appname = "test-app"
|
||||||
globals.Version = "1.0.0"
|
globals.Version = "1.0.0"
|
||||||
globals.Buildarch = "test-arch"
|
|
||||||
|
|
||||||
lc := fxtest.NewLifecycle(t)
|
lc := fxtest.NewLifecycle(t)
|
||||||
g, err := globals.New(lc)
|
g, err := globals.New(lc)
|
||||||
|
|||||||
Reference in New Issue
Block a user