From 3541954df8d6e742616566fa941b40da1f36ca96 Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Fri, 22 Mar 2024 02:01:30 -0400
Subject: [PATCH] lib, pgp: Remove direct logger usage

This cleans things up a little bit more.
---
 lib/main.go | 7 +++++++
 pgp/pgp.go  | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/main.go b/lib/main.go
index eeac9db2..b8e6bea5 100644
--- a/lib/main.go
+++ b/lib/main.go
@@ -388,6 +388,9 @@ func (obj *Main) Run() error {
 	}
 
 	if !obj.NoPgp {
+		pgpLogf := func(format string, v ...interface{}) {
+			obj.Logf("pgp: "+format, v...)
+		}
 		pgpPrefix := fmt.Sprintf("%s/", path.Join(prefix, "pgp"))
 		if err := os.MkdirAll(pgpPrefix, 0770); err != nil {
 			return errwrap.Wrapf(err, "can't create pgp prefix")
@@ -403,6 +406,9 @@ func (obj *Main) Run() error {
 		if obj.pgpKeys, err = pgp.Import(pgpKeyringPath); err != nil && !os.IsNotExist(err) {
 			return errwrap.Wrapf(err, "can't import pgp key")
 		}
+		if obj.pgpKeys != nil { // it might have not been created!
+			pgpLogf("imported key: %s", obj.pgpKeys.Entity.PrivateKey.KeyIdShortString())
+		}
 
 		if obj.pgpKeys == nil {
 			identity := fmt.Sprintf("%s <%s> %s", obj.Program, "root@"+hostname, "generated by "+obj.Program)
@@ -420,6 +426,7 @@ func (obj *Main) Run() error {
 			if obj.pgpKeys, err = pgp.Generate(name, comment, email, nil); err != nil {
 				return errwrap.Wrapf(err, "can't create pgp key")
 			}
+			pgpLogf("created key: %s", obj.pgpKeys.Entity.PrivateKey.KeyIdShortString())
 
 			if err := obj.pgpKeys.SaveKey(pgpKeyringPath); err != nil {
 				return errwrap.Wrapf(err, "can't save pgp key")
diff --git a/pgp/pgp.go b/pgp/pgp.go
index 226ef81b..cb373091 100644
--- a/pgp/pgp.go
+++ b/pgp/pgp.go
@@ -37,7 +37,6 @@ import (
 	"crypto"
 	"encoding/base64"
 	"io"
-	"log"
 	"os"
 	"strings"
 
@@ -81,7 +80,6 @@ func Import(privKeyPath string) (*PGP, error) {
 		Entity: entity,
 	}
 
-	log.Printf("PGP: Imported key: %s", obj.Entity.PrivateKey.KeyIdShortString())
 	return obj, nil
 }
 
@@ -101,7 +99,6 @@ func Generate(name, comment, email string, hash *crypto.Hash) (*PGP, error) {
 		Entity: entity,
 	}
 
-	log.Printf("PGP: Created key: %s", obj.Entity.PrivateKey.KeyIdShortString())
 	return obj, nil
 }