particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Many: factor out logger implementation from upload/koji

Browse source 
The upload/koji package functions were creating a logger and then were
using it. This is not ideal for a library implementation.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-07-07 14:22:55 +02:00 • committed by Tomáš Hozza
parent 60014b1218
commit ca1e1dce36
7 changed files with 60 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/osbuild-koji-tests/main_test.go
View file

@ -53,7 +53,7 @@ func TestKojiRefund(t *testing.T) {
Principal: "osbuild-krb@LOCAL",
KeyTab: shareDir + "/client.keytab",
}
k, err := koji.NewFromGSSAPI(server, credentials, transport)
k, err := koji.NewFromGSSAPI(server, credentials, transport, nil)
require.NoError(t, err)
defer func() {
@ -114,7 +114,7 @@ func TestKojiImport(t *testing.T) {
Principal: "osbuild-krb@LOCAL",
KeyTab: shareDir + "/client.keytab",
}
k, err := koji.NewFromGSSAPI(server, credentials, transport)
k, err := koji.NewFromGSSAPI(server, credentials, transport, nil)
require.NoError(t, err)
defer func() {

4
cmd/osbuild-koji/main.go
View file

@ -42,8 +42,8 @@ func main() {
}
defer file.Close()
transport := koji.CreateRetryableTransport()
k, err := koji.NewFromPlain(server, "osbuild", "osbuildpass", transport)
transport := koji.CreateRetryableTransport(nil)
k, err := koji.NewFromPlain(server, "osbuild", "osbuildpass", transport, nil)
if err != nil {
println(err.Error())
return

8
cmd/osbuild-worker/jobimpl-koji-finalize.go
View file

@ -37,8 +37,8 @@ func (impl *KojiFinalizeJobImpl) kojiImport(
return fmt.Errorf("Koji server has not been configured: %s", serverURL.Hostname())
}
transport := koji.CreateKojiTransport(kojiServer.relaxTimeoutFactor)
k, err := koji.NewFromGSSAPI(server, &kojiServer.creds, transport)
transport := koji.CreateKojiTransport(kojiServer.relaxTimeoutFactor, NewRHLeveledLogger(nil))
k, err := koji.NewFromGSSAPI(server, &kojiServer.creds, transport, NewRHLeveledLogger(nil))
if err != nil {
return err
}
@ -69,8 +69,8 @@ func (impl *KojiFinalizeJobImpl) kojiFail(server string, buildID int, token stri
return fmt.Errorf("Koji server has not been configured: %s", serverURL.Hostname())
}
transport := koji.CreateKojiTransport(kojiServer.relaxTimeoutFactor)
k, err := koji.NewFromGSSAPI(server, &kojiServer.creds, transport)
transport := koji.CreateKojiTransport(kojiServer.relaxTimeoutFactor, NewRHLeveledLogger(nil))
k, err := koji.NewFromGSSAPI(server, &kojiServer.creds, transport, NewRHLeveledLogger(nil))
if err != nil {
return err
}

4
cmd/osbuild-worker/jobimpl-koji-init.go
View file

@ -27,8 +27,8 @@ func (impl *KojiInitJobImpl) kojiInit(server, name, version, release string) (st
return "", 0, fmt.Errorf("Koji server has not been configured: %s", serverURL.Hostname())
}
transport := koji.CreateKojiTransport(kojiServer.relaxTimeoutFactor)
k, err := koji.NewFromGSSAPI(server, &kojiServer.creds, transport)
transport := koji.CreateKojiTransport(kojiServer.relaxTimeoutFactor, NewRHLeveledLogger(nil))
k, err := koji.NewFromGSSAPI(server, &kojiServer.creds, transport, NewRHLeveledLogger(nil))
if err != nil {
return "", 0, err
}

4
cmd/osbuild-worker/jobimpl-osbuild.go
View file

@ -1012,9 +1012,9 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
break
}
kojiTransport := koji.CreateKojiTransport(kojiServer.relaxTimeoutFactor)
kojiTransport := koji.CreateKojiTransport(kojiServer.relaxTimeoutFactor, NewRHLeveledLogger(nil))
kojiAPI, err := koji.NewFromGSSAPI(targetOptions.Server, &kojiServer.creds, kojiTransport)
kojiAPI, err := koji.NewFromGSSAPI(targetOptions.Server, &kojiServer.creds, kojiTransport, NewRHLeveledLogger(nil))
if err != nil {
logWithId.Warnf("[Koji] 🔑 login failed: %v", err) // DON'T EDIT: Used for Splunk dashboard
targetResult.TargetError = clienterrors.New(clienterrors.ErrorInvalidTargetConfig, fmt.Sprintf("failed to authenticate with Koji server %q: %v", kojiServerURL.Hostname(), err), nil)

50
cmd/osbuild-worker/rh-logrus-adapter.go Normal file
View file

@ -0,0 +1,50 @@
package main
import (
"strings"
rh "github.com/hashicorp/go-retryablehttp"
"github.com/sirupsen/logrus"
)
type LeveledLogrus struct {
*logrus.Logger
}
func NewRHLeveledLogger(logger *logrus.Logger) rh.LeveledLogger {
if logger == nil {
logger = logrus.StandardLogger()
}
return rh.LeveledLogger(&LeveledLogrus{logger})
}
const monitoringKeyword = "retrying"
func fields(keysAndValues ...interface{}) map[string]interface{} {
fields := make(map[string]interface{})
for i := 0; i < len(keysAndValues)-1; i += 2 {
fields[keysAndValues[i].(string)] = keysAndValues[i+1]
}
return fields
}
func (l *LeveledLogrus) Error(msg string, keysAndValues ...interface{}) {
l.WithFields(fields(keysAndValues...)).Error(msg)
}
func (l *LeveledLogrus) Info(msg string, keysAndValues ...interface{}) {
l.WithFields(fields(keysAndValues...)).Info(msg)
}
func (l *LeveledLogrus) Debug(msg string, keysAndValues ...interface{}) {
if strings.Contains(msg, monitoringKeyword) {
l.WithFields(fields(keysAndValues...)).Info(msg)
} else {
l.WithFields(fields(keysAndValues...)).Debug(msg)
}
}
func (l *LeveledLogrus) Warn(msg string, keysAndValues ...interface{}) {
l.WithFields(fields(keysAndValues...)).Warn(msg)
}