Use cmd instead of fmt in signer commands

pappz · pappz · commit 6a526940ae5d · 2025-11-10T16:03:49.000+01:00
diff --git a/client/cmd/signer/artifactkey.go b/client/cmd/signer/artifactkey.go
@@ -32,7 +32,7 @@ The artifact key will be used to sign software artifacts/updates.`,
 			return fmt.Errorf("--expiration must be a positive duration (e.g., 720h, 365d, 8760h)")
 		}
 
-		if err := handleCreateArtifactKey(createArtifactKeyRootPrivKeyFile, createArtifactKeyPrivKeyFile, createArtifactKeyPubKeyFile, createArtifactKeyExpiration); err != nil {
+		if err := handleCreateArtifactKey(cmd, createArtifactKeyRootPrivKeyFile, createArtifactKeyPrivKeyFile, createArtifactKeyPubKeyFile, createArtifactKeyExpiration); err != nil {
 			return fmt.Errorf("failed to create artifact key: %w", err)
 		}
 		return nil
@@ -49,7 +49,7 @@ This command is typically used to distribute or authorize a set of valid artifac
 			return fmt.Errorf("at least one --artifact-pub-key-file must be provided")
 		}
 
-		if err := handleBundlePubKeys(bundlePubKeysRootPrivKeyFile, bundlePubKeysPubKeyFiles, bundlePubKeysFile); err != nil {
+		if err := handleBundlePubKeys(cmd, bundlePubKeysRootPrivKeyFile, bundlePubKeysPubKeyFiles, bundlePubKeysFile); err != nil {
 			return fmt.Errorf("failed to bundle public keys: %w", err)
 		}
 		return nil
@@ -94,8 +94,8 @@ func init() {
 	}
 }
 
-func handleCreateArtifactKey(rootPrivKeyFile, artifactPrivKeyFile, artifactPubKeyFile string, expiration time.Duration) error {
-	fmt.Println("🔑 Creating new artifact signing key...")
+func handleCreateArtifactKey(cmd *cobra.Command, rootPrivKeyFile, artifactPrivKeyFile, artifactPubKeyFile string, expiration time.Duration) error {
+	cmd.Println("🔑 Creating new artifact signing key...")
 
 	privKeyPEM, err := os.ReadFile(rootPrivKeyFile)
 	if err != nil {
@@ -125,13 +125,13 @@ func handleCreateArtifactKey(rootPrivKeyFile, artifactPrivKeyFile, artifactPubKe
 		return fmt.Errorf("write signature file (%s): %w", signatureFile, err)
 	}
 
-	fmt.Printf("✅ Artifact key created successfully.\n")
-	fmt.Printf("%s\n", artifactKey.String())
+	cmd.Printf("✅ Artifact key created successfully.\n")
+	cmd.Printf("%s\n", artifactKey.String())
 	return nil
 }
 
-func handleBundlePubKeys(rootPrivKeyFile string, artifactPubKeyFiles []string, bundlePubKeysFile string) error {
-	fmt.Println("📦 Bundling public keys into signed package...")
+func handleBundlePubKeys(cmd *cobra.Command, rootPrivKeyFile string, artifactPubKeyFiles []string, bundlePubKeysFile string) error {
+	cmd.Println("📦 Bundling public keys into signed package...")
 
 	privKeyPEM, err := os.ReadFile(rootPrivKeyFile)
 	if err != nil {
@@ -171,6 +171,6 @@ func handleBundlePubKeys(rootPrivKeyFile string, artifactPubKeyFiles []string, b
 		return fmt.Errorf("write signature file (%s): %w", signatureFile, err)
 	}
 
-	fmt.Printf("✅ Bundle created with %d public keys.\n", len(artifactPubKeyFiles))
+	cmd.Printf("✅ Bundle created with %d public keys.\n", len(artifactPubKeyFiles))
 	return nil
 }
diff --git a/client/cmd/signer/artifactsign.go b/client/cmd/signer/artifactsign.go
@@ -25,7 +25,7 @@ var signArtifactCmd = &cobra.Command{
 This command produces a detached signature that can be verified using the corresponding artifact public key.`,
 	SilenceUsage: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		if err := handleSignArtifact(signArtifactRootPrivKeyFile, signArtifactArtifactFile); err != nil {
+		if err := handleSignArtifact(cmd, signArtifactRootPrivKeyFile, signArtifactArtifactFile); err != nil {
 			return fmt.Errorf("failed to sign artifact: %w", err)
 		}
 		return nil
@@ -38,7 +38,7 @@ var verifyArtifactCmd = &cobra.Command{
 	Long:         `Verify a software artifact signature using the artifact's public key.`,
 	SilenceUsage: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		if err := handleVerifyArtifact(verifyArtifactPubKeyFile, verifyArtifactFile, verifyArtifactSignatureFile); err != nil {
+		if err := handleVerifyArtifact(cmd, verifyArtifactPubKeyFile, verifyArtifactFile, verifyArtifactSignatureFile); err != nil {
 			return fmt.Errorf("failed to verify artifact: %w", err)
 		}
 		return nil
@@ -75,8 +75,8 @@ func init() {
 	}
 }
 
-func handleSignArtifact(privKeyFile, artifactFile string) error {
-	fmt.Println("🖋️  Signing artifact...")
+func handleSignArtifact(cmd *cobra.Command, privKeyFile, artifactFile string) error {
+	cmd.Println("🖋️  Signing artifact...")
 
 	privKeyPEM, err := os.ReadFile(privKeyFile)
 	if err != nil {
@@ -103,13 +103,13 @@ func handleSignArtifact(privKeyFile, artifactFile string) error {
 		return fmt.Errorf("write signature file (%s): %w", sigFile, err)
 	}
 
-	fmt.Printf("✅ Artifact signed successfully.\n")
-	fmt.Printf("Signature file: %s\n", sigFile)
+	cmd.Printf("✅ Artifact signed successfully.\n")
+	cmd.Printf("Signature file: %s\n", sigFile)
 	return nil
 }
 
-func handleVerifyArtifact(pubKeyFile, artifactFile, signatureFile string) error {
-	fmt.Println("🔍 Verifying artifact...")
+func handleVerifyArtifact(cmd *cobra.Command, pubKeyFile, artifactFile, signatureFile string) error {
+	cmd.Println("🔍 Verifying artifact...")
 
 	// Read artifact public key
 	pubKeyPEM, err := os.ReadFile(pubKeyFile)
@@ -144,9 +144,9 @@ func handleVerifyArtifact(pubKeyFile, artifactFile, signatureFile string) error
 		return fmt.Errorf("artifact verification failed: %w", err)
 	}
 
-	fmt.Println("✅ Artifact signature is valid")
-	fmt.Printf("Artifact: %s\n", artifactFile)
-	fmt.Printf("Signed by key: %s\n", signature.KeyID)
-	fmt.Printf("Signature timestamp: %s\n", signature.Timestamp.Format("2006-01-02 15:04:05 MST"))
+	cmd.Println("✅ Artifact signature is valid")
+	cmd.Printf("Artifact: %s\n", artifactFile)
+	cmd.Printf("Signed by key: %s\n", signature.KeyID)
+	cmd.Printf("Signature timestamp: %s\n", signature.Timestamp.Format("2006-01-02 15:04:05 MST"))
 	return nil
 }
diff --git a/client/cmd/signer/main.go b/client/cmd/signer/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -16,7 +15,7 @@ root keys, artifact keys, and revocation lists securely.`,
 
 func main() {
 	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
+		rootCmd.Println(err)
 		os.Exit(1)
 	}
 }
diff --git a/client/cmd/signer/revocation.go b/client/cmd/signer/revocation.go
@@ -28,7 +28,7 @@ var createRevocationListCmd = &cobra.Command{
 	Short:        "Create a new revocation list signed by the private root key",
 	SilenceUsage: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return handleCreateRevocationList(revocationListFile, privateRootKeyFile)
+		return handleCreateRevocationList(cmd, revocationListFile, privateRootKeyFile)
 	},
 }
 
@@ -37,7 +37,7 @@ var extendRevocationListCmd = &cobra.Command{
 	Short:        "Extend an existing revocation list with a given key ID",
 	SilenceUsage: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return handleExtendRevocationList(keyID, revocationListFile, privateRootKeyFile)
+		return handleExtendRevocationList(cmd, keyID, revocationListFile, privateRootKeyFile)
 	},
 }
 
@@ -46,7 +46,7 @@ var verifyRevocationListCmd = &cobra.Command{
 	Short:        "Verify a revocation list signature using the public root key",
 	SilenceUsage: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return handleVerifyRevocationList(revocationListFile, signatureFile, publicRootKeyFile)
+		return handleVerifyRevocationList(cmd, revocationListFile, signatureFile, publicRootKeyFile)
 	},
 }
 
@@ -93,7 +93,7 @@ func init() {
 	}
 }
 
-func handleCreateRevocationList(revocationListFile string, privateRootKeyFile string) error {
+func handleCreateRevocationList(cmd *cobra.Command, revocationListFile string, privateRootKeyFile string) error {
 	privKeyPEM, err := os.ReadFile(privateRootKeyFile)
 	if err != nil {
 		return fmt.Errorf("failed to read private root key file: %w", err)
@@ -113,11 +113,11 @@ func handleCreateRevocationList(revocationListFile string, privateRootKeyFile st
 		return fmt.Errorf("failed to write output files: %w", err)
 	}
 
-	fmt.Println("✅ Revocation list created successfully")
+	cmd.Println("✅ Revocation list created successfully")
 	return nil
 }
 
-func handleExtendRevocationList(keyID, revocationListFile, privateRootKeyFile string) error {
+func handleExtendRevocationList(cmd *cobra.Command, keyID, revocationListFile, privateRootKeyFile string) error {
 	privKeyPEM, err := os.ReadFile(privateRootKeyFile)
 	if err != nil {
 		return fmt.Errorf("failed to read private root key file: %w", err)
@@ -152,11 +152,11 @@ func handleExtendRevocationList(keyID, revocationListFile, privateRootKeyFile st
 		return fmt.Errorf("failed to write output files: %w", err)
 	}
 
-	fmt.Println("✅ Revocation list extended successfully")
+	cmd.Println("✅ Revocation list extended successfully")
 	return nil
 }
 
-func handleVerifyRevocationList(revocationListFile, signatureFile, publicRootKeyFile string) error {
+func handleVerifyRevocationList(cmd *cobra.Command, revocationListFile, signatureFile, publicRootKeyFile string) error {
 	// Read revocation list file
 	rlBytes, err := os.ReadFile(revocationListFile)
 	if err != nil {
@@ -194,15 +194,15 @@ func handleVerifyRevocationList(revocationListFile, signatureFile, publicRootKey
 	}
 
 	// Display results
-	fmt.Println("✅ Revocation list signature is valid")
-	fmt.Printf("Last Updated: %s\n", rl.LastUpdated.Format(time.RFC3339))
-	fmt.Printf("Expires At: %s\n", rl.ExpiresAt.Format(time.RFC3339))
-	fmt.Printf("Number of revoked keys: %d\n", len(rl.Revoked))
+	cmd.Println("✅ Revocation list signature is valid")
+	cmd.Printf("Last Updated: %s\n", rl.LastUpdated.Format(time.RFC3339))
+	cmd.Printf("Expires At: %s\n", rl.ExpiresAt.Format(time.RFC3339))
+	cmd.Printf("Number of revoked keys: %d\n", len(rl.Revoked))
 
 	if len(rl.Revoked) > 0 {
-		fmt.Println("\nRevoked Keys:")
+		cmd.Println("\nRevoked Keys:")
 		for keyID, revokedTime := range rl.Revoked {
-			fmt.Printf("  - %s (revoked at: %s)\n", keyID, revokedTime.Format(time.RFC3339))
+			cmd.Printf("  - %s (revoked at: %s)\n", keyID, revokedTime.Format(time.RFC3339))
 		}
 	}
 
diff --git a/client/cmd/signer/rootkey.go b/client/cmd/signer/rootkey.go
@@ -28,7 +28,7 @@ var createRootKeyCmd = &cobra.Command{
 		}
 
 		// Run main logic
-		if err := handleGenerateRootKey(privKeyFile, pubKeyFile, rootExpiration); err != nil {
+		if err := handleGenerateRootKey(cmd, privKeyFile, pubKeyFile, rootExpiration); err != nil {
 			return fmt.Errorf("failed to generate root key: %w", err)
 		}
 		return nil
@@ -52,7 +52,7 @@ func init() {
 	}
 }
 
-func handleGenerateRootKey(privKeyFile, pubKeyFile string, expiration time.Duration) error {
+func handleGenerateRootKey(cmd *cobra.Command, privKeyFile, pubKeyFile string, expiration time.Duration) error {
 	rk, privPEM, pubPEM, err := reposign.GenerateRootKey(expiration)
 	if err != nil {
 		return fmt.Errorf("generate root key: %w", err)
@@ -68,7 +68,7 @@ func handleGenerateRootKey(privKeyFile, pubKeyFile string, expiration time.Durat
 		return fmt.Errorf("write public key file (%s): %w", pubKeyFile, err)
 	}
 
-	fmt.Printf("%s\n\n", rk.String())
-	fmt.Printf("✅ Root key pair generated successfully.\n")
+	cmd.Printf("%s\n\n", rk.String())
+	cmd.Printf("✅ Root key pair generated successfully.\n")
 	return nil
 }

Original file line number	Diff line number	Diff line change
@@ -32,7 +32,7 @@ The artifact key will be used to sign software artifacts/updates.`,
`32`	`32`	`return fmt.Errorf("--expiration must be a positive duration (e.g., 720h, 365d, 8760h)")`
`33`	`33`	`}`
`34`	`34`
`35`		`- if err := handleCreateArtifactKey(createArtifactKeyRootPrivKeyFile, createArtifactKeyPrivKeyFile, createArtifactKeyPubKeyFile, createArtifactKeyExpiration); err != nil {`
	`35`	`+ if err := handleCreateArtifactKey(cmd, createArtifactKeyRootPrivKeyFile, createArtifactKeyPrivKeyFile, createArtifactKeyPubKeyFile, createArtifactKeyExpiration); err != nil {`
`36`	`36`	`return fmt.Errorf("failed to create artifact key: %w", err)`
`37`	`37`	`}`
`38`	`38`	`return nil`
`@@ -49,7 +49,7 @@ This command is typically used to distribute or authorize a set of valid artifac`
`49`	`49`	`return fmt.Errorf("at least one --artifact-pub-key-file must be provided")`
`50`	`50`	`}`
`51`	`51`
`52`		`- if err := handleBundlePubKeys(bundlePubKeysRootPrivKeyFile, bundlePubKeysPubKeyFiles, bundlePubKeysFile); err != nil {`
	`52`	`+ if err := handleBundlePubKeys(cmd, bundlePubKeysRootPrivKeyFile, bundlePubKeysPubKeyFiles, bundlePubKeysFile); err != nil {`
`53`	`53`	`return fmt.Errorf("failed to bundle public keys: %w", err)`
`54`	`54`	`}`
`55`	`55`	`return nil`
`@@ -94,8 +94,8 @@ func init() {`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`-func handleCreateArtifactKey(rootPrivKeyFile, artifactPrivKeyFile, artifactPubKeyFile string, expiration time.Duration) error {`
`98`		`- fmt.Println("🔑 Creating new artifact signing key...")`
	`97`	`+func handleCreateArtifactKey(cmd *cobra.Command, rootPrivKeyFile, artifactPrivKeyFile, artifactPubKeyFile string, expiration time.Duration) error {`
	`98`	`+ cmd.Println("🔑 Creating new artifact signing key...")`
`99`	`99`
`100`	`100`	`privKeyPEM, err := os.ReadFile(rootPrivKeyFile)`
`101`	`101`	`if err != nil {`
`@@ -125,13 +125,13 @@ func handleCreateArtifactKey(rootPrivKeyFile, artifactPrivKeyFile, artifactPubKe`
`125`	`125`	`return fmt.Errorf("write signature file (%s): %w", signatureFile, err)`
`126`	`126`	`}`
`127`	`127`
`128`		`- fmt.Printf("✅ Artifact key created successfully.\n")`
`129`		`- fmt.Printf("%s\n", artifactKey.String())`
	`128`	`+ cmd.Printf("✅ Artifact key created successfully.\n")`
	`129`	`+ cmd.Printf("%s\n", artifactKey.String())`
`130`	`130`	`return nil`
`131`	`131`	`}`
`132`	`132`
`133`		`-func handleBundlePubKeys(rootPrivKeyFile string, artifactPubKeyFiles []string, bundlePubKeysFile string) error {`
`134`		`- fmt.Println("📦 Bundling public keys into signed package...")`
	`133`	`+func handleBundlePubKeys(cmd *cobra.Command, rootPrivKeyFile string, artifactPubKeyFiles []string, bundlePubKeysFile string) error {`
	`134`	`+ cmd.Println("📦 Bundling public keys into signed package...")`
`135`	`135`
`136`	`136`	`privKeyPEM, err := os.ReadFile(rootPrivKeyFile)`
`137`	`137`	`if err != nil {`
`@@ -171,6 +171,6 @@ func handleBundlePubKeys(rootPrivKeyFile string, artifactPubKeyFiles []string, b`
`171`	`171`	`return fmt.Errorf("write signature file (%s): %w", signatureFile, err)`
`172`	`172`	`}`
`173`	`173`
`174`		`- fmt.Printf("✅ Bundle created with %d public keys.\n", len(artifactPubKeyFiles))`
	`174`	`+ cmd.Printf("✅ Bundle created with %d public keys.\n", len(artifactPubKeyFiles))`
`175`	`175`	`return nil`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "fmt"`
`5`	`4`	`"os"`
`6`	`5`
`7`	`6`	`"github.com/spf13/cobra"`
@@ -16,7 +15,7 @@ root keys, artifact keys, and revocation lists securely.`,
`16`	`15`
`17`	`16`	`func main() {`
`18`	`17`	`if err := rootCmd.Execute(); err != nil {`
`19`		`- fmt.Println(err)`
	`18`	`+ rootCmd.Println(err)`
`20`	`19`	`os.Exit(1)`
`21`	`20`	`}`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ var createRootKeyCmd = &cobra.Command{`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`// Run main logic`
`31`		`- if err := handleGenerateRootKey(privKeyFile, pubKeyFile, rootExpiration); err != nil {`
	`31`	`+ if err := handleGenerateRootKey(cmd, privKeyFile, pubKeyFile, rootExpiration); err != nil {`
`32`	`32`	`return fmt.Errorf("failed to generate root key: %w", err)`
`33`	`33`	`}`
`34`	`34`	`return nil`
`@@ -52,7 +52,7 @@ func init() {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`-func handleGenerateRootKey(privKeyFile, pubKeyFile string, expiration time.Duration) error {`
	`55`	`+func handleGenerateRootKey(cmd *cobra.Command, privKeyFile, pubKeyFile string, expiration time.Duration) error {`
`56`	`56`	`rk, privPEM, pubPEM, err := reposign.GenerateRootKey(expiration)`
`57`	`57`	`if err != nil {`
`58`	`58`	`return fmt.Errorf("generate root key: %w", err)`
`@@ -68,7 +68,7 @@ func handleGenerateRootKey(privKeyFile, pubKeyFile string, expiration time.Durat`
`68`	`68`	`return fmt.Errorf("write public key file (%s): %w", pubKeyFile, err)`
`69`	`69`	`}`
`70`	`70`
`71`		`- fmt.Printf("%s\n\n", rk.String())`
`72`		`- fmt.Printf("✅ Root key pair generated successfully.\n")`
	`71`	`+ cmd.Printf("%s\n\n", rk.String())`
	`72`	`+ cmd.Printf("✅ Root key pair generated successfully.\n")`
`73`	`73`	`return nil`
`74`	`74`	`}`