fix comments and linter errors

Author: flecno

arch/arch.go

@@ -136,8 +136,10 @@ func (ArchLinux) Package(info *nfpm.Info, w io.Writer) error {
 	if err != nil {
 		return err
 	}
+	defer zw.Close()
 
 	tw := tar.NewWriter(zw)
+	defer tw.Close()
 
 	entries, totalSize, err := createFilesInTar(info, tw)
 	if err != nil {
@@ -157,14 +159,17 @@ func (ArchLinux) Package(info *nfpm.Info, w io.Writer) error {
 		return fmt.Errorf("create mtree: %w", err)
 	}
 
-	err = createScripts(info, tw)
-	if err != nil {
+	if err = createScripts(info, tw); err != nil {
 		return fmt.Errorf("create scripts: %w", err)
 	}
 
 	// finalize the tar/zstd writer before creating the signature
-	tw.Close()
-	zw.Close()
+	if err = tw.Close(); err != nil {
+		return fmt.Errorf("closing data tarball: %w", err)
+	}
+	if err = zw.Close(); err != nil {
+		return fmt.Errorf("closing zstd writer: %w", err)
+	}
 
 	if info.ArchLinux.Signature.KeyFile != "" || info.ArchLinux.Signature.SignFn != nil {
 		sig, err := createSignature(info)
@@ -439,6 +444,9 @@ func createSignature(info *nfpm.Info) ([]byte, error) {
 	var sig []byte
 	if signFn := info.ArchLinux.Signature.SignFn; signFn != nil {
 		sig, err = signFn(data)
+		if err != nil {
+			return nil, fmt.Errorf("create signature: %w", err)
+		}
 	} else {
 		sig, err = sign.PGPDetachedSignWithKeyID(data, info.ArchLinux.Signature.KeyFile, info.ArchLinux.Signature.KeyPassphrase, info.ArchLinux.Signature.KeyID)
 		if err != nil {

arch/arch_test.go

@@ -223,7 +223,8 @@ func TestArchSignature(t *testing.T) {
 	signature, err := os.ReadFile(info.Target + ".sig")
 	require.NoError(t, err)
 
-	f.Seek(0, io.SeekStart)
+	_, err = f.Seek(0, io.SeekStart)
+	require.NoError(t, err)
 	err = sign.PGPVerify(f, signature, "../internal/sign/testdata/pubkey.asc")
 	require.NoError(t, err)
 }
@@ -255,10 +256,12 @@ func TestArchSignatureCallback(t *testing.T) {
 	signature, err := os.ReadFile(info.Target + ".sig")
 	require.NoError(t, err)
 
-	f.Seek(0, io.SeekStart)
+	_, err = f.Seek(0, io.SeekStart)
+	require.NoError(t, err)
 	err = sign.PGPVerify(f, signature, "../internal/sign/testdata/pubkey.asc")
 	require.NoError(t, err)
 }
+
 func makeTestPkginfo(t *testing.T, info *nfpm.Info) ([]byte, error) {
 	t.Helper()
 

internal/sign/pgp.go

@@ -13,22 +13,21 @@ import (
 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
 	"github.com/ProtonMail/go-crypto/openpgp/packet"
-	"github.com/goreleaser/nfpm/v2"
 )
 
 // PGPSignerWithKeyID returns a PGP signer that creates a detached non-ASCII-armored
 // signature and is compatible with rpmpack's signature API.
 func PGPSignerWithKeyID(keyFile, passphrase string, hexKeyID *string) func([]byte) ([]byte, error) {
 	return func(data []byte) ([]byte, error) {
-		sig, err := PGPArmoredDetachSignWithKeyID(bytes.NewReader(data), keyFile, passphrase, hexKeyID)
+		sig, err := PGPDetachedSignWithKeyID(bytes.NewReader(data), keyFile, passphrase, hexKeyID)
 		if err != nil {
-			return nil, &nfpm.ErrSigningFailure{Err: err}
+			return nil, fmt.Errorf("detach sign: %w", err)
 		}
 		return sig, nil
 	}
 }
 
-// PGPDetachedSignWithKeyID creates a detached signature.
+// PGPDetachedSignWithKeyID creates a detached non-ASCII-armored signature.
 func PGPDetachedSignWithKeyID(message io.Reader, keyFile, passphrase string, hexKeyID *string) ([]byte, error) {
 	keyID, err := parseKeyID(hexKeyID)
 	if err != nil {

internal/sign/pgp_test.go

@@ -83,8 +83,7 @@ func TestDetachSignAndVerify(t *testing.T) {
 			err = PGPVerify(bytes.NewReader(data), sig, gpgPublicKey)
 			require.NoError(t, err)
 			if testCase.keyID != nil {
-				var pgpSignature *crypto.PGPSignature
-				pgpSignature = crypto.NewPGPSignature(sig)
+				pgpSignature := crypto.NewPGPSignature(sig)
 
 				sigID, _ := pgpSignature.GetSignatureKeyIDs()
 				require.Len(t, sigID, 1)