From a4068b328d7b10289f3bb5ef7b0ab9ca0c201d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Sch=C3=BCller?= <florian.schueller@redhat.com>
Date: Wed, 14 Aug 2024 13:01:02 +0200
Subject: [PATCH] splunk_logger: move environment hook to splunk_logger pt2

for reusability also in image-builder
---
 cmd/osbuild-composer/main.go                  |  2 +-
 go.mod                                        |  2 +-
 go.sum                                        |  4 +--
 internal/common/environment_hook_test.go      | 30 -------------------
 .../pkg/splunk_logger}/environment_hook.go    |  2 +-
 vendor/modules.txt                            |  4 +--
 6 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 internal/common/environment_hook_test.go
 rename {internal/common => vendor/github.com/osbuild/osbuild-composer/pkg/splunk_logger}/environment_hook.go (96%)

diff --git a/cmd/osbuild-composer/main.go b/cmd/osbuild-composer/main.go
index f9e16172f..eeb724c9e 100644
--- a/cmd/osbuild-composer/main.go
+++ b/cmd/osbuild-composer/main.go
@@ -85,7 +85,7 @@ func main() {
 	}
 
 	if config.DeploymentChannel != "" {
-		logrus.AddHook(&common.EnvironmentHook{Channel: config.DeploymentChannel})
+		logrus.AddHook(&slogger.EnvironmentHook{Channel: config.DeploymentChannel})
 	}
 
 	if config.SplunkHost != "" {
diff --git a/go.mod b/go.mod
index f7f817052..ff30fc556 100644
--- a/go.mod
+++ b/go.mod
@@ -47,7 +47,7 @@ require (
 	github.com/openshift-online/ocm-sdk-go v0.1.432
 	github.com/oracle/oci-go-sdk/v54 v54.0.0
 	github.com/osbuild/images v0.79.0
-	github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1
+	github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
 	github.com/osbuild/pulp-client v0.1.0
 	github.com/prometheus/client_golang v1.19.1
 	github.com/segmentio/ksuid v1.0.4
diff --git a/go.sum b/go.sum
index da7bd60f0..52160a2dc 100644
--- a/go.sum
+++ b/go.sum
@@ -510,8 +510,8 @@ github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXch
 github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc=
 github.com/osbuild/images v0.79.0 h1:6kBRo0WzmyQTZ4ojX1oU9nIxBazZOO4I3FLsZaz8268=
 github.com/osbuild/images v0.79.0/go.mod h1:Rzud9PFt0L9qFFlisL9I6OsZ2h0M6viMBdPhPtpwfwg=
-github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1 h1:UFEJIcPa46W8gtWgOYzriRKYyy1t6SWL0BI7fPTuVvc=
-github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1/go.mod h1:z+WA+dX6qMwc7fqY5jCzESDIlg4WR2sBQezxsoXv9Ik=
+github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ=
+github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U=
 github.com/osbuild/pulp-client v0.1.0 h1:L0C4ezBJGTamN3BKdv+rKLuq/WxXJbsFwz/Hj7aEmJ8=
 github.com/osbuild/pulp-client v0.1.0/go.mod h1:rd/MLdfwwO2cQI1s056h8z32zAi3Bo90XhlAAryIvWc=
 github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f h1:/UDgs8FGMqwnHagNDPGOlts35QkhAZ8by3DR7nMih7M=
diff --git a/internal/common/environment_hook_test.go b/internal/common/environment_hook_test.go
deleted file mode 100644
index 7de77d607..000000000
--- a/internal/common/environment_hook_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package common
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/require"
-)
-
-func makeLogrus(buf *bytes.Buffer) *logrus.Logger {
-	return &logrus.Logger{
-		Out: buf,
-		Formatter: &logrus.TextFormatter{
-			DisableTimestamp: true,
-			DisableColors:    true,
-		},
-		Hooks: make(logrus.LevelHooks),
-		Level: logrus.DebugLevel,
-	}
-
-}
-
-func TestInfoWithEnvironment(t *testing.T) {
-	buf := &bytes.Buffer{}
-	l := makeLogrus(buf)
-	l.AddHook(&EnvironmentHook{Channel: "test_framework"})
-	l.Info("test message")
-	require.Equal(t, "level=info msg=\"test message\" channel=test_framework\n", buf.String())
-}
diff --git a/internal/common/environment_hook.go b/vendor/github.com/osbuild/osbuild-composer/pkg/splunk_logger/environment_hook.go
similarity index 96%
rename from internal/common/environment_hook.go
rename to vendor/github.com/osbuild/osbuild-composer/pkg/splunk_logger/environment_hook.go
index 2d0052eba..152b97197 100644
--- a/internal/common/environment_hook.go
+++ b/vendor/github.com/osbuild/osbuild-composer/pkg/splunk_logger/environment_hook.go
@@ -1,4 +1,4 @@
-package common
+package logger
 
 import (
 	"github.com/sirupsen/logrus"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 50d38e4ff..800c015dd 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -989,8 +989,8 @@ github.com/osbuild/images/pkg/rhsm
 github.com/osbuild/images/pkg/rhsm/facts
 github.com/osbuild/images/pkg/rpmmd
 github.com/osbuild/images/pkg/runner
-# github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1
-## explicit; go 1.19
+# github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
+## explicit; go 1.21
 github.com/osbuild/osbuild-composer/pkg/splunk_logger
 # github.com/osbuild/pulp-client v0.1.0
 ## explicit; go 1.19