From 9ff0943d56bea9500b1981ed114a5c1df5ef350a Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Wed, 16 Nov 2022 17:55:29 +0000
Subject: [PATCH] Address nits from self-review

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 pkg/rootless/portdriver.go | 14 +++++++++++++-
 pkg/rootless/rootless.go   | 14 ++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkg/rootless/portdriver.go b/pkg/rootless/portdriver.go
index e79fce0320..9736ad878c 100644
--- a/pkg/rootless/portdriver.go
+++ b/pkg/rootless/portdriver.go
@@ -6,6 +6,7 @@ package rootless
 import (
 	"io"
 	"path"
+	"strings"
 
 	"github.com/rootless-containers/rootlesskit/pkg/port"
 	portbuiltin "github.com/rootless-containers/rootlesskit/pkg/port/builtin"
@@ -13,6 +14,15 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+type logrusDebugWriter struct {
+}
+
+func (w *logrusDebugWriter) Write(p []byte) (int, error) {
+	s := strings.TrimSuffix(string(p), "\n")
+	logrus.Debug(s)
+	return len(p), nil
+}
+
 type portDriver interface {
 	NewParentDriver() (port.ParentDriver, error)
 	NewChildDriver() port.ChildDriver
@@ -74,7 +84,9 @@ func (s *slirp4netnsDriver) APISocketPath() string {
 	return ""
 }
 
-func getDriver(driverName string, logWriter io.Writer) portDriver {
+func getDriver(driverName string) portDriver {
+	logWriter := &logrusDebugWriter{}
+
 	if driverName == "slirp4netns" {
 		return &slirp4netnsDriver{logWriter: logWriter}
 	}
diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go
index 1611d90f81..97266d7eaf 100644
--- a/pkg/rootless/rootless.go
+++ b/pkg/rootless/rootless.go
@@ -42,9 +42,8 @@ func Rootless(stateDir string, enableIPv6 bool) error {
 
 	hasFD := os.Getenv(pipeFD) != ""
 	hasChildEnv := os.Getenv(childEnv) != ""
-	driverName := strings.ToLower(os.Getenv(portDriverEnv))
 	rootlessDir := filepath.Join(stateDir, "rootless")
-	driver := getDriver(driverName, &logrusDebugWriter{})
+	driver := getDriver(strings.ToLower(os.Getenv(portDriverEnv)))
 
 	if hasFD {
 		logrus.Debug("Running rootless child")
@@ -166,7 +165,7 @@ func createParentOpt(driver portDriver, stateDir string, enableIPv6 bool) (*pare
 	mtu := 0
 	if val := os.Getenv(mtuEnv); val != "" {
 		if v, err := strconv.ParseInt(val, 10, 0); err != nil {
-			logrus.Warn("Failed to parse rootless mtu; using default")
+			logrus.Warn("Failed to parse rootless mtu value; using default")
 		} else {
 			mtu = int(v)
 		}
@@ -217,15 +216,6 @@ func createParentOpt(driver portDriver, stateDir string, enableIPv6 bool) (*pare
 	return opt, nil
 }
 
-type logrusDebugWriter struct {
-}
-
-func (w *logrusDebugWriter) Write(p []byte) (int, error) {
-	s := strings.TrimSuffix(string(p), "\n")
-	logrus.Debug(s)
-	return len(p), nil
-}
-
 func createChildOpt(driver portDriver) (*child.Opt, error) {
 	opt := &child.Opt{}
 	opt.TargetCmd = os.Args