fix(pkg/config): remove go-homedir v1.1.0 from dependencies (#1191)

gyuho · web-flow · commit 5a484ed166b2 · 2026-01-08T21:53:56.000+08:00
Signed-off-by: Gyuho Lee &lt;gyuhol@nvidia.com&gt;
diff --git a/THIRD-PARTY.txt b/THIRD-PARTY.txt
@@ -506,7 +506,6 @@ License Text: https://opensource.org/licenses/MIT
 // THE SOFTWARE.
 
 Packages:
-- github.com/mitchellh/go-homedir v1.1.0
 - github.com/mitchellh/go-ps v1.0.0
 
 
diff --git a/cmd/gpud/compact/command.go b/cmd/gpud/compact/command.go
@@ -33,7 +33,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting compact command")
 
diff --git a/cmd/gpud/custom-plugins/command.go b/cmd/gpud/custom-plugins/command.go
@@ -27,7 +27,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting custom-plugins command")
 
diff --git a/cmd/gpud/down/command.go b/cmd/gpud/down/command.go
@@ -24,7 +24,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting down command")
 
diff --git a/cmd/gpud/inject-fault/command.go b/cmd/gpud/inject-fault/command.go
@@ -14,7 +14,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting inject-fault command")
 
diff --git a/cmd/gpud/list-plugins/command.go b/cmd/gpud/list-plugins/command.go
@@ -19,7 +19,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting list-plugins command")
 
diff --git a/cmd/gpud/machine-info/command.go b/cmd/gpud/machine-info/command.go
@@ -24,7 +24,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting machine-info command")
 
diff --git a/cmd/gpud/metadata/command.go b/cmd/gpud/metadata/command.go
@@ -29,7 +29,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting metadata command")
 
diff --git a/cmd/gpud/notify/command.go b/cmd/gpud/notify/command.go
@@ -26,7 +26,7 @@ func CommandStartup(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting notify startup command")
 
@@ -87,7 +87,7 @@ func CommandShutdown(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting notify shutdown command")
 
diff --git a/cmd/gpud/release/command_gen_key.go b/cmd/gpud/release/command_gen_key.go
@@ -21,7 +21,7 @@ func CommandGenKey(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting gen-key command")
 
diff --git a/cmd/gpud/release/command_sign_key.go b/cmd/gpud/release/command_sign_key.go
@@ -20,7 +20,7 @@ func CommandSignKey(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting sign-key command")
 
diff --git a/cmd/gpud/release/command_sign_package.go b/cmd/gpud/release/command_sign_package.go
@@ -20,7 +20,7 @@ func CommandSignPackage(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting sign-package command")
 
diff --git a/cmd/gpud/release/command_verify_key_signature.go b/cmd/gpud/release/command_verify_key_signature.go
@@ -21,7 +21,7 @@ func CommandVerifyKeySignature(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting verify-key-signature command")
 
diff --git a/cmd/gpud/release/command_verify_package_signature.go b/cmd/gpud/release/command_verify_package_signature.go
@@ -23,7 +23,7 @@ func CommandVerifyPackageSignature(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting verify-package-signature command")
 
diff --git a/cmd/gpud/run-plugin-group/command.go b/cmd/gpud/run-plugin-group/command.go
@@ -20,7 +20,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, logFile)
+	log.SetLogger(log.CreateLogger(zapLvl, logFile))
 
 	log.Logger.Debugw("starting run-plugin-group command")
 
diff --git a/cmd/gpud/run/command.go b/cmd/gpud/run/command.go
@@ -43,7 +43,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, logFile)
+	log.SetLogger(log.CreateLogger(zapLvl, logFile))
 
 	log.Logger.Debugw("starting run command")
 
diff --git a/cmd/gpud/scan/command.go b/cmd/gpud/scan/command.go
@@ -68,7 +68,7 @@ func cmdScan(
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting scan command")
 
diff --git a/cmd/gpud/set-healthy/command.go b/cmd/gpud/set-healthy/command.go
@@ -22,7 +22,7 @@ func CreateCommand() func(*cli.Context) error {
 		if err != nil {
 			return err
 		}
-		log.Logger = log.CreateLogger(zapLvl, logFile)
+		log.SetLogger(log.CreateLogger(zapLvl, logFile))
 
 		log.Logger.Debugw("starting set-healthy command")
 
diff --git a/cmd/gpud/status/command.go b/cmd/gpud/status/command.go
@@ -28,7 +28,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, "")
+	log.SetLogger(log.CreateLogger(zapLvl, ""))
 
 	log.Logger.Debugw("starting status command")
 
diff --git a/cmd/gpud/up/command.go b/cmd/gpud/up/command.go
@@ -29,7 +29,7 @@ func Command(cliContext *cli.Context) (retErr error) {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, logFile)
+	log.SetLogger(log.CreateLogger(zapLvl, logFile))
 
 	log.Logger.Debugw("starting up command")
 
diff --git a/cmd/gpud/update/command.go b/cmd/gpud/update/command.go
@@ -21,7 +21,7 @@ func Command(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, logFile)
+	log.SetLogger(log.CreateLogger(zapLvl, logFile))
 
 	log.Logger.Debugw("starting update command")
 
@@ -55,7 +55,7 @@ func CommandCheck(cliContext *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	log.Logger = log.CreateLogger(zapLvl, logFile)
+	log.SetLogger(log.CreateLogger(zapLvl, logFile))
 
 	log.Logger.Debugw("starting update check command")
 
diff --git a/go.mod b/go.mod
@@ -18,7 +18,6 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/hdevalence/ed25519consensus v0.2.0
 	github.com/mattn/go-sqlite3 v1.14.32
-	github.com/mitchellh/go-homedir v1.1.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/onsi/ginkgo/v2 v2.23.4
 	github.com/onsi/gomega v1.37.0
diff --git a/go.sum b/go.sum
@@ -188,8 +188,6 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
 github.com/mdlayher/socket v0.5.0 h1:ilICZmJcQz70vrWVes1MFera4jGiWNocSkykwwoy3XI=
 github.com/mdlayher/socket v0.5.0/go.mod h1:WkcBFfvyG8QENs5+hfQPl1X6Jpd2yeLIYgrGFmJiJxI=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
 github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
diff --git a/pkg/config/default.go b/pkg/config/default.go
@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/mitchellh/go-homedir"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	nvidiacommon "github.com/leptonai/gpud/pkg/config/common"
@@ -92,7 +91,7 @@ func setupDefaultDir() (string, error) {
 	d := DefaultDataDir
 	_, err := stdos.Stat(filepath.Dir(d))
 	if !asRoot || stdos.IsNotExist(err) {
-		homeDir, err := homedir.Dir()
+		homeDir, err := stdos.UserHomeDir()
 		if err != nil {
 			return "", err
 		}
diff --git a/pkg/log/log.go b/pkg/log/log.go
@@ -4,13 +4,15 @@ package log
 import (
 	"context"
 	"strings"
+	"sync/atomic"
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
 var Logger *gpudLogger
+var nopLogger = zap.NewNop().Sugar()
 
 func init() {
 	Logger = CreateLoggerWithConfig(DefaultLoggerConfig())
@@ -40,8 +42,7 @@ func CreateLoggerWithLumberjack(logFile string, maxSize int, logLevel zapcore.Le
 		logLevel,
 	)
 	logger := zap.New(core)
-
-	return &gpudLogger{logger.Sugar()}
+	return newGpudLogger(logger.Sugar())
 }
 
 func ParseLogLevel(logLevel string) (zap.AtomicLevel, error) {
@@ -76,13 +77,43 @@ func CreateLoggerWithConfig(config *zap.Config) *gpudLogger {
 		panic(err)
 	}
 
-	return &gpudLogger{
-		l.Sugar(),
-	}
+	return newGpudLogger(l.Sugar())
 }
 
 type gpudLogger struct {
-	*zap.SugaredLogger
+	logger atomic.Pointer[zap.SugaredLogger]
+}
+
+func newGpudLogger(logger *zap.SugaredLogger) *gpudLogger {
+	l := &gpudLogger{}
+	l.set(logger)
+	return l
+}
+
+func (l *gpudLogger) get() *zap.SugaredLogger {
+	if l == nil {
+		return nopLogger
+	}
+	logger := l.logger.Load()
+	if logger == nil {
+		return nopLogger
+	}
+	return logger
+}
+
+func (l *gpudLogger) set(logger *zap.SugaredLogger) {
+	if logger == nil {
+		logger = nopLogger
+	}
+	l.logger.Store(logger)
+}
+
+func SetLogger(logger *gpudLogger) {
+	if logger == nil {
+		Logger.set(nil)
+		return
+	}
+	Logger.set(logger.get())
 }
 
 // Override the default logger's Errorw func to down level context canceled error
@@ -100,10 +131,66 @@ func (l *gpudLogger) Errorw(msg string, keysAndValues ...interface{}) {
 	}
 
 	// Use underlying logger to avoid recursion into this wrapper.
-	l.SugaredLogger.Errorw(msg, keysAndValues...) // nolint:staticcheck
+	l.get().Errorw(msg, keysAndValues...) // nolint:staticcheck
 }
 
 // Implements "tailscale.com/types/logger".Logf.
 func (l *gpudLogger) Printf(format string, v ...any) {
 	l.Infof(format, v...)
 }
+
+func (l *gpudLogger) Debug(args ...interface{}) {
+	l.get().Debug(args...)
+}
+
+func (l *gpudLogger) Debugf(template string, args ...interface{}) {
+	l.get().Debugf(template, args...)
+}
+
+func (l *gpudLogger) Debugw(msg string, keysAndValues ...interface{}) {
+	l.get().Debugw(msg, keysAndValues...)
+}
+
+func (l *gpudLogger) Info(args ...interface{}) {
+	l.get().Info(args...)
+}
+
+func (l *gpudLogger) Infof(template string, args ...interface{}) {
+	l.get().Infof(template, args...)
+}
+
+func (l *gpudLogger) Infow(msg string, keysAndValues ...interface{}) {
+	l.get().Infow(msg, keysAndValues...)
+}
+
+func (l *gpudLogger) Warn(args ...interface{}) {
+	l.get().Warn(args...)
+}
+
+func (l *gpudLogger) Warnf(template string, args ...interface{}) {
+	l.get().Warnf(template, args...)
+}
+
+func (l *gpudLogger) Warnw(msg string, keysAndValues ...interface{}) {
+	l.get().Warnw(msg, keysAndValues...)
+}
+
+func (l *gpudLogger) Error(args ...interface{}) {
+	l.get().Error(args...)
+}
+
+func (l *gpudLogger) Errorf(template string, args ...interface{}) {
+	l.get().Errorf(template, args...)
+}
+
+func (l *gpudLogger) Fatal(args ...interface{}) {
+	l.get().Fatal(args...)
+}
+
+func (l *gpudLogger) With(args ...interface{}) *zap.SugaredLogger {
+	return l.get().With(args...)
+}
+
+func (l *gpudLogger) Desugar() *zap.Logger {
+	return l.get().Desugar()
+}
diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go
@@ -284,7 +284,7 @@ func TestCreateLogger(t *testing.T) {
 
 		// Build a custom logger
 		customLogger := zap.New(core).Sugar()
-		testLogger := &gpudLogger{customLogger}
+		testLogger := newGpudLogger(customLogger)
 
 		// Debug messages should not be logged at error level
 		buffer.Reset()

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func Command(cliContext *cli.Context) error {`
`33`	`33`	`if err != nil {`
`34`	`34`	`return err`
`35`	`35`	`}`
`36`		`- log.Logger = log.CreateLogger(zapLvl, "")`
	`36`	`+ log.SetLogger(log.CreateLogger(zapLvl, ""))`
`37`	`37`
`38`	`38`	`log.Logger.Debugw("starting compact command")`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func Command(cliContext *cli.Context) error {`
`27`	`27`	`if err != nil {`
`28`	`28`	`return err`
`29`	`29`	`}`
`30`		`- log.Logger = log.CreateLogger(zapLvl, "")`
	`30`	`+ log.SetLogger(log.CreateLogger(zapLvl, ""))`
`31`	`31`
`32`	`32`	`log.Logger.Debugw("starting custom-plugins command")`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func Command(cliContext *cli.Context) error {`
`24`	`24`	`if err != nil {`
`25`	`25`	`return err`
`26`	`26`	`}`
`27`		`- log.Logger = log.CreateLogger(zapLvl, "")`
	`27`	`+ log.SetLogger(log.CreateLogger(zapLvl, ""))`
`28`	`28`
`29`	`29`	`log.Logger.Debugw("starting down command")`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ func Command(cliContext *cli.Context) error {`
`14`	`14`	`if err != nil {`
`15`	`15`	`return err`
`16`	`16`	`}`
`17`		`- log.Logger = log.CreateLogger(zapLvl, "")`
	`17`	`+ log.SetLogger(log.CreateLogger(zapLvl, ""))`
`18`	`18`
`19`	`19`	`log.Logger.Debugw("starting inject-fault command")`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ func Command(cliContext *cli.Context) error {`
`19`	`19`	`if err != nil {`
`20`	`20`	`return err`
`21`	`21`	`}`
`22`		`- log.Logger = log.CreateLogger(zapLvl, "")`
	`22`	`+ log.SetLogger(log.CreateLogger(zapLvl, ""))`
`23`	`23`
`24`	`24`	`log.Logger.Debugw("starting list-plugins command")`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func Command(cliContext *cli.Context) error {`
`29`	`29`	`if err != nil {`
`30`	`30`	`return err`
`31`	`31`	`}`
`32`		`- log.Logger = log.CreateLogger(zapLvl, "")`
	`32`	`+ log.SetLogger(log.CreateLogger(zapLvl, ""))`
`33`	`33`
`34`	`34`	`log.Logger.Debugw("starting metadata command")`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func CommandStartup(cliContext *cli.Context) error {`
`26`	`26`	`if err != nil {`
`27`	`27`	`return err`
`28`	`28`	`}`
`29`		`- log.Logger = log.CreateLogger(zapLvl, "")`
	`29`	`+ log.SetLogger(log.CreateLogger(zapLvl, ""))`
`30`	`30`
`31`	`31`	`log.Logger.Debugw("starting notify startup command")`
`32`	`32`
`@@ -87,7 +87,7 @@ func CommandShutdown(cliContext *cli.Context) error {`
`87`	`87`	`if err != nil {`
`88`	`88`	`return err`
`89`	`89`	`}`
`90`		`- log.Logger = log.CreateLogger(zapLvl, "")`
	`90`	`+ log.SetLogger(log.CreateLogger(zapLvl, ""))`
`91`	`91`
`92`	`92`	`log.Logger.Debugw("starting notify shutdown command")`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func CommandGenKey(cliContext *cli.Context) error {`
`21`	`21`	`if err != nil {`
`22`	`22`	`return err`
`23`	`23`	`}`
`24`		`- log.Logger = log.CreateLogger(zapLvl, "")`
	`24`	`+ log.SetLogger(log.CreateLogger(zapLvl, ""))`
`25`	`25`
`26`	`26`	`log.Logger.Debugw("starting gen-key command")`
`27`	`27`