fix: switch FileToCopy to Content and make the file package not internal

.golangci.yml

@@ -11,6 +11,8 @@ linters:
     - gci
     - exhaustivestruct
     - wrapcheck
+    - paralleltest
+    - godot
 linters-settings:
   maligned:
     # print struct with more effective memory layout or not, false by default
@@ -39,6 +41,8 @@ linters-settings:
       - style
       - performance
 issues:
+  exclude:
+    - composites
   exclude-rules:
     - text: "G104" # gosec G104 is caught by errcheck
       linters:

Makefile

@@ -10,7 +10,7 @@ export GOPROXY := https://proxy.golang.org,https://gocenter.io,direct
 # Install all the build and lint dependencies
 setup:
 	go mod download
-	go generate -v ./...
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s
 	git config core.hooksPath .githooks
 .PHONY: setup
 

apk/apk.go

@@ -48,11 +48,12 @@ import (
 	"time"
 
 	"github.com/goreleaser/nfpm"
-	"github.com/goreleaser/nfpm/internal/files"
+	"github.com/goreleaser/nfpm/files"
 	"github.com/goreleaser/nfpm/internal/sign"
 )
 
 const packagerName = "apk"
+
 // nolint: gochecknoinits
 func init() {
 	nfpm.Register(packagerName, Default)
@@ -103,6 +104,9 @@ func (a *Apk) ConventionalFileName(info *nfpm.Info) string {
 
 // Package writes a new apk package to the given writer using the given info.
 func (*Apk) Package(info *nfpm.Info, apk io.Writer) (err error) {
+	if err = nfpm.Validate(info); err != nil {
+		return err
+	}
 	arch, ok := archToAlpine[info.Arch]
 	if ok {
 		info.Arch = arch
@@ -392,14 +396,9 @@ func createBuilderData(info *nfpm.Info, sizep *int64) func(tw *tar.Writer) error
 	}
 }
 
-func createFilesInsideTarGz(info *nfpm.Info, tw *tar.Writer, created map[string]bool, sizep *int64) error {
-	filesToCopy, err := files.ExpandFiles(info.Files, info.DisableGlobbing)
-	if err != nil {
-		return err
-	}
-
-	for _, file := range filesToCopy {
-		if file.Packager != "" || file.Packager != packagerName {
+func createFilesInsideTarGz(info *nfpm.Info, tw *tar.Writer, created map[string]bool, sizep *int64) (err error) {
+	for _, file := range info.Files {
+		if file.Packager != "" && file.Packager != packagerName {
 			continue
 		}
 
@@ -425,14 +424,14 @@ func createFilesInsideTarGz(info *nfpm.Info, tw *tar.Writer, created map[string]
 	return nil
 }
 
-func createSymlinkInsideTarGz(file *files.FileToCopy, out *tar.Writer) error {
+func createSymlinkInsideTarGz(file *files.Content, out *tar.Writer) error {
 	return newItemInsideTarGz(out, []byte{}, &tar.Header{
-			Name:     strings.TrimLeft(file.Source, "/"),
-			Linkname: file.Destination,
-			Typeflag: tar.TypeSymlink,
-			ModTime:  time.Now(),
-			Format:   tar.FormatGNU,
-		})
+		Name:     strings.TrimLeft(file.Source, "/"),
+		Linkname: file.Destination,
+		Typeflag: tar.TypeSymlink,
+		ModTime:  time.Now(),
+		Format:   tar.FormatGNU,
+	})
 }
 
 func copyToTarAndDigest(src, dst string, tw *tar.Writer, sizep *int64, created map[string]bool) error {

apk/apk_test.go

@@ -9,11 +9,12 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/goreleaser/nfpm/internal/files"
 	"io"
 	"io/ioutil"
 	"testing"
 
+	"github.com/goreleaser/nfpm/files"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/goreleaser/nfpm"
@@ -25,6 +26,7 @@ import (
 // nolint: gochecknoglobals
 var update = flag.Bool("update", false, "update apk .golden files")
 
+// nolint:funlen
 func exampleInfo() *nfpm.Info {
 	return nfpm.WithDefaults(&nfpm.Info{
 		Name:        "foo",
@@ -62,23 +64,27 @@ func exampleInfo() *nfpm.Info {
 				"zsh",
 				"foobarsh",
 			},
-			Files: []*files.FileToCopy{
+			// nolint:govet
+			Files: files.Contents{
 				{
 					"../testdata/fake",
-				"/usr/local/bin/fake",
-				"",
-				0,
+					"/usr/local/bin/fake",
+					"",
+					"apk",
+					0,
 				},
 				{
 					"../testdata/whatever.conf",
 					"/usr/share/doc/fake/fake.txt",
 					"",
+					"apk",
 					0,
 				},
 				{
 					"../testdata/whatever.conf",
 					"/etc/fake/fake.conf",
 					"config",
+					"apk",
 					0,
 				},
 			},
@@ -91,7 +97,7 @@ func exampleInfo() *nfpm.Info {
 }
 
 func TestArchToAlpine(t *testing.T) {
-	verifyArch(t, "", "")
+	verifyArch(t, "", "x86_64")
 	verifyArch(t, "abc", "abc")
 	verifyArch(t, "386", "x86")
 	verifyArch(t, "amd64", "x86_64")
@@ -104,13 +110,20 @@ func TestArchToAlpine(t *testing.T) {
 func verifyArch(t *testing.T, nfpmArch, expectedArch string) {
 	info := exampleInfo()
 	info.Arch = nfpmArch
+	info = nfpm.WithDefaults(info)
+	if err := nfpm.Validate(info); err != nil {
+		t.Fatal(err)
+	}
 
 	assert.NoError(t, Default.Package(info, ioutil.Discard))
 	assert.Equal(t, expectedArch, info.Arch)
 }
 
 func TestCreateBuilderData(t *testing.T) {
 	info := exampleInfo()
+	if err := nfpm.Validate(info); err != nil {
+		t.Fatal(err)
+	}
 	size := int64(0)
 	builderData := createBuilderData(info, &size)
 
@@ -152,8 +165,12 @@ func TestPathsToCreate(t *testing.T) {
 func TestDefaultWithArch(t *testing.T) {
 	for _, arch := range []string{"386", "amd64"} {
 		arch := arch
+		info := exampleInfo()
+		if err := nfpm.Validate(info); err != nil {
+			t.Fatal(err)
+		}
 		t.Run(arch, func(t *testing.T) {
-			info := exampleInfo()
+			info := info
 			info.Arch = arch
 			var err = Default.Package(info, ioutil.Discard)
 			assert.NoError(t, err)
@@ -182,17 +199,21 @@ func TestFileDoesNotExist(t *testing.T) {
 				Depends: []string{
 					"bash",
 				},
-				Files: []*files.FileToCopy{
+				// nolint:govet
+				// ignore composites: `*github.com/goreleaser/nfpm/files.Content` composite literal uses unkeyed fields
+				Files: files.Contents{
 					{
 						"../testdata/fake",
 						"/usr/local/bin/fake",
 						"",
+						"apk",
 						0,
 					},
 					{
 						"../testdata/whatever.confzzz",
 						"/etc/fake/fake.conf",
 						"config",
+						"apk",
 						0,
 					},
 				},
@@ -228,6 +249,9 @@ func TestNoFiles(t *testing.T) {
 
 func TestCreateBuilderControl(t *testing.T) {
 	info := exampleInfo()
+	if err := nfpm.Validate(info); err != nil {
+		t.Fatal(err)
+	}
 	size := int64(12345)
 	builderControl := createBuilderControl(info, size, sha256.New().Sum(nil))
 
@@ -253,6 +277,9 @@ func TestCreateBuilderControlScripts(t *testing.T) {
 		PreRemove:   "../testdata/scripts/preremove.sh",
 		PostRemove:  "../testdata/scripts/postremove.sh",
 	}
+	if err := nfpm.Validate(info); err != nil {
+		t.Fatal(err)
+	}
 
 	size := int64(12345)
 	builderControl := createBuilderControl(info, size, sha256.New().Sum(nil))
@@ -273,8 +300,12 @@ func TestCreateBuilderControlScripts(t *testing.T) {
 
 func TestControl(t *testing.T) {
 	var w bytes.Buffer
+	info := exampleInfo()
+	if err := nfpm.Validate(info); err != nil {
+		t.Fatal(err)
+	}
 	assert.NoError(t, writeControl(&w, controlData{
-		Info:          exampleInfo(),
+		Info:          info,
 		InstalledSize: 10,
 	}))
 	var golden = "testdata/TestControl.golden"
@@ -291,6 +322,9 @@ func TestSignature(t *testing.T) {
 	info.APK.Signature.KeyFile = "../internal/sign/testdata/rsa.priv"
 	info.APK.Signature.KeyName = "testkey.rsa.pub"
 	info.APK.Signature.KeyPassphrase = "hunter2"
+	if err := nfpm.Validate(info); err != nil {
+		t.Fatal(err)
+	}
 
 	digest := sha1.New().Sum(nil) // nolint:gosec
 
@@ -311,6 +345,9 @@ func TestSignatureError(t *testing.T) {
 	info.APK.Signature.KeyFile = "../internal/sign/testdata/rsa.priv"
 	info.APK.Signature.KeyName = "testkey.rsa.pub"
 	info.APK.Signature.KeyPassphrase = "hunter2"
+	if err := nfpm.Validate(info); err != nil {
+		t.Fatal(err)
+	}
 
 	// wrong hash format
 	digest := sha256.New().Sum(nil)
@@ -327,8 +364,12 @@ func TestSignatureError(t *testing.T) {
 func TestDisableGlobbing(t *testing.T) {
 	info := exampleInfo()
 	info.DisableGlobbing = true
-	info.Files = []*files.FileToCopy{
-		{"../testdata/{file}[", "/test/{file}[", "", 0},
+	// nolint:govet
+	info.Files = files.Contents{
+		{"../testdata/{file}[", "/test/{file}[", "", "apk", 0},
+	}
+	if err := nfpm.Validate(info); err != nil {
+		t.Fatal(err)
 	}
 
 	size := int64(0)

deb/deb.go

@@ -20,11 +20,12 @@ import (
 	"github.com/goreleaser/chglog"
 
 	"github.com/goreleaser/nfpm"
-	"github.com/goreleaser/nfpm/internal/files"
+	"github.com/goreleaser/nfpm/files"
 	"github.com/goreleaser/nfpm/internal/sign"
 )
 
 const packagerName = "deb"
+
 // nolint: gochecknoinits
 func init() {
 	nfpm.Register("packagerName", Default)
@@ -80,6 +81,9 @@ var ErrInvalidSignatureType = errors.New("invalid signature type")
 
 // Package writes a new deb package to the given writer using the given info.
 func (*Deb) Package(info *nfpm.Info, deb io.Writer) (err error) { // nolint: funlen
+	if err = nfpm.Validate(info); err != nil {
+		return err
+	}
 	arch, ok := archToDebian[info.Arch]
 	if ok {
 		info.Arch = arch
@@ -190,27 +194,19 @@ func createDataTarGz(info *nfpm.Info) (dataTarGz, md5sums []byte, instSize int64
 	return buf.Bytes(), md5buf.Bytes(), instSize, nil
 }
 
-func createSymlinkInsideTarGz(file *files.FileToCopy, out *tar.Writer) error {
-		return newItemInsideTarGz(out, []byte{}, &tar.Header{
-			Name:     normalizePath(file.Source),
-			Linkname: file.Destination,
-			Typeflag: tar.TypeSymlink,
-			ModTime:  time.Now(),
-			Format:   tar.FormatGNU,
-		})
+func createSymlinkInsideTarGz(file *files.Content, out *tar.Writer) error {
+	return newItemInsideTarGz(out, []byte{}, &tar.Header{
+		Name:     normalizePath(file.Source),
+		Linkname: file.Destination,
+		Typeflag: tar.TypeSymlink,
+		ModTime:  time.Now(),
+		Format:   tar.FormatGNU,
+	})
 }
 
-func createFilesInsideTarGz(info *nfpm.Info, out *tar.Writer, created map[string]bool) (bytes.Buffer, int64, error) {
-	var md5buf bytes.Buffer
-	var instSize int64
-
-	filesToCopy, err := files.ExpandFiles(info.Files, info.DisableGlobbing)
-	if err != nil {
-		return md5buf, 0, err
-	}
-
-	for _, file := range filesToCopy {
-		if file.Packager != "" || file.Packager != packagerName {
+func createFilesInsideTarGz(info *nfpm.Info, out *tar.Writer, created map[string]bool) (md5buf bytes.Buffer, instSize int64, err error) {
+	for _, file := range info.Files {
+		if file.Packager != "" && file.Packager != packagerName {
 			continue
 		}
 		if err = createTree(out, file.Destination, created); err != nil {
@@ -224,11 +220,11 @@ func createFilesInsideTarGz(info *nfpm.Info, out *tar.Writer, created map[string
 		default:
 			var size int64 // declare early to avoid shadowing err
 			size, err = copyToTarAndDigest(out, &md5buf, file.Source, file.Destination)
-			if err != nil {
-				return md5buf, 0, err
-			}
 			instSize += size
 		}
+		if err != nil {
+			return md5buf, 0, err
+		}
 	}
 
 	if info.Changelog != "" {
@@ -540,7 +536,7 @@ func conffiles(info *nfpm.Info) []byte {
 	// nolint: prealloc
 	var confs []string
 	for _, file := range info.Files {
-		if file.Packager != "" || file.Packager != packagerName {
+		if file.Packager != "" && file.Packager != packagerName {
 			continue
 		}
 		switch file.Type {