Merge pull request #2000 from ferdnyc/go-124-compat

Update logging calls for upcoming Go 1.24
coreos · Jan 22, 2025 · 26ab8e3 · 26ab8e3
2 parents 7252ddb + beaeeb4
commit 26ab8e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/internal/exec/engine.go b/internal/exec/engine.go
@@ -121,7 +121,7 @@ func (e Engine) Run(stageName string) error {
 		return err
 	}
 
-	e.Logger.PushPrefix(stageName) //nolint:govet
+	e.Logger.PushPrefix("%s", stageName)
 	defer e.Logger.PopPrefix()
 
 	fullConfig := latest.Merge(baseConfig, latest.Merge(systemBaseConfig, cfg))

diff --git a/internal/main.go b/internal/main.go
@@ -89,7 +89,7 @@ func ignitionMain() {
 	logger := log.New(flags.logToStdout)
 	defer logger.Close()
 
-	logger.Info(version.String) //nolint:govet
+	logger.Info("%s", version.String)
 	logger.Info("Stage: %v", flags.stage)
 
 	platformConfig := platform.MustGet(flags.platform.String())
@@ -157,7 +157,7 @@ func ignitionApplyMain() {
 	logger := log.New(true)
 	defer logger.Close()
 
-	logger.Info(version.String) //nolint:govet
+	logger.Info("%s", version.String)
 
 	var blob []byte
 	var err error
@@ -219,7 +219,7 @@ func ignitionRmCfgMain() {
 	logger := log.New(flags.logToStdout)
 	defer logger.Close()
 
-	logger.Info(version.String) //nolint:govet
+	logger.Info("%s", version.String)
 
 	platformConfig := platform.MustGet(flags.platform)
 	fetcher, err := platformConfig.NewFetcher(&logger)