fixup! eblog -> log

envbuilder.go

@@ -1191,20 +1191,20 @@ func findDevcontainerJSON(options Options) (string, string, error) {
 
 // maybeDeleteFilesystem wraps util.DeleteFilesystem with a guard to hopefully stop
 // folks from unwittingly deleting their entire root directory.
-func maybeDeleteFilesystem(log log.Func, force bool) error {
+func maybeDeleteFilesystem(logger log.Func, force bool) error {
 	kanikoDir, ok := os.LookupEnv("KANIKO_DIR")
 	if !ok || strings.TrimSpace(kanikoDir) != MagicDir {
 		if force {
 			bailoutSecs := 10
-			log(log.LevelWarn, "WARNING! BYPASSING SAFETY CHECK! THIS WILL DELETE YOUR ROOT FILESYSTEM!")
-			log(log.LevelWarn, "You have %d seconds to bail out!", bailoutSecs)
+			logger(log.LevelWarn, "WARNING! BYPASSING SAFETY CHECK! THIS WILL DELETE YOUR ROOT FILESYSTEM!")
+			logger(log.LevelWarn, "You have %d seconds to bail out!", bailoutSecs)
 			for i := bailoutSecs; i > 0; i-- {
-				log(log.LevelWarn, "%d...", i)
+				logger(log.LevelWarn, "%d...", i)
 				<-time.After(time.Second)
 			}
 		} else {
-			log(log.LevelError, "KANIKO_DIR is not set to %s. Bailing!\n", MagicDir)
-			log(log.LevelError, "To bypass this check, set FORCE_SAFE=true.")
+			logger(log.LevelError, "KANIKO_DIR is not set to %s. Bailing!\n", MagicDir)
+			logger(log.LevelError, "To bypass this check, set FORCE_SAFE=true.")
 			return errors.New("safety check failed")
 		}
 	}

git.go

@@ -145,14 +145,14 @@ func ReadPrivateKey(path string) (gossh.Signer, error) {
 
 // LogHostKeyCallback is a HostKeyCallback that just logs host keys
 // and does nothing else.
-func LogHostKeyCallback(log log.Func) gossh.HostKeyCallback {
+func LogHostKeyCallback(logger log.Func) gossh.HostKeyCallback {
 	return func(hostname string, remote net.Addr, key gossh.PublicKey) error {
 		var sb strings.Builder
 		_ = knownhosts.WriteKnownHost(&sb, hostname, remote, key)
 		// skeema/knownhosts uses a fake public key to determine the host key
 		// algorithms. Ignore this one.
 		if s := sb.String(); !strings.Contains(s, "fake-public-key ZmFrZSBwdWJsaWMga2V5") {
-			log(log.LevelInfo, "#1: 🔑 Got host key: %s", strings.TrimSpace(s))
+			logger(log.LevelInfo, "#1: 🔑 Got host key: %s", strings.TrimSpace(s))
 		}
 		return nil
 	}