feat: remove deprecated options (#267)

* feat: remove deprecated options Signed-off-by: Carlos Alexandro Becker <[email protected]> * test: fixing Signed-off-by: Carlos Alexandro Becker <[email protected]> * fix: configs Signed-off-by: Carlos Alexandro Becker <[email protected]> * fix: tempdir Signed-off-by: Carlos Alexandro Becker <[email protected]> * fix: fmt Signed-off-by: Carlos Alexandro Becker <[email protected]> * feat: go 1.15 Signed-off-by: Carlos Alexandro Becker <[email protected]> * test: fix Signed-off-by: Carlos Alexandro Becker <[email protected]> * test: fix Signed-off-by: Carlos Alexandro Becker <[email protected]> * test: fix Signed-off-by: Carlos Alexandro Becker <[email protected]> * fix: tests Signed-off-by: Carlos Alexandro Becker <[email protected]> * refactor: test Signed-off-by: Carlos Alexandro Becker <[email protected]> * fix: lint Signed-off-by: Carlos Alexandro Becker <[email protected]> * fix: import Signed-off-by: Carlos Alexandro Becker <[email protected]> * fix: test Signed-off-by: Carlos Alexandro Becker <[email protected]> * fix: symlink Signed-off-by: Carlos Alexandro Becker <[email protected]>
goreleaser · Dec 23, 2020 · 1981723 · 1981723 · vercel · Dec 23, 2020
1 parent df152db
commit 1981723
Show file tree

Hide file tree

Showing 34 changed files with 426 additions and 360 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.15
       -
         name: Cache Go modules
         uses: actions/cache@v1

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ conduct](/CODE_OF_CONDUCT.md).
 Prerequisites:
 
 * `make`
-* [Go 1.14+](https://golang.org/doc/install)
+* [Go 1.15+](https://golang.org/doc/install)
 
 Clone `nfpm` from source:
 

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ setup:
 
 
 pull_test_imgs:
-	grep FROM ./acceptance/testdata/*.dockerfile | cut -f2 -d' ' | sort | uniq | while read -r img; do docker pull "$$img"; done
+	grep FROM ./testdata/acceptance/*.dockerfile | cut -f2 -d' ' | sort | uniq | while read -r img; do docker pull "$$img"; done
 .PHONY: pull_test_imgs
 
 acceptance: pull_test_imgs

diff --git a/acceptance_test.go b/acceptance_test.go
@@ -100,7 +100,7 @@ func TestConfigNoReplace(t *testing.T) {
 	info.Target = target
 	require.NoError(t, pkg.Package(nfpm.WithDefaults(info), f))
 
-	t.Run("noreplace-rpm", func(t *testing.T) {
+	t.Run("rpm", func(t *testing.T) {
 		accept(t, acceptParms{
 			Name:       "noreplace_rpm",
 			Conf:       "config-noreplace.yaml",

diff --git a/apk/apk_test.go b/apk/apk_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/goreleaser/nfpm"
+	"github.com/goreleaser/nfpm/files"
 	"github.com/goreleaser/nfpm/internal/sign"
 )
 
@@ -60,12 +61,20 @@ func exampleInfo() *nfpm.Info {
 				"zsh",
 				"foobarsh",
 			},
-			Files: map[string]string{
-				"../testdata/fake":          "/usr/local/bin/fake",
-				"../testdata/whatever.conf": "/usr/share/doc/fake/fake.txt",
-			},
-			ConfigFiles: map[string]string{
-				"../testdata/whatever.conf": "/etc/fake/fake.conf",
+			Contents: []*files.Content{
+				{
+					Source:      "../testdata/fake",
+					Destination: "/usr/local/bin/fake",
+				},
+				{
+					Source:      "../testdata/whatever.conf",
+					Destination: "/usr/share/doc/fake/fake.txt",
+				},
+				{
+					Source:      "../testdata/whatever.conf",
+					Destination: "/etc/fake/fake.conf",
+					Type:        "config",
+				},
 			},
 			EmptyFolders: []string{
 				"/var/log/whatever",
@@ -169,11 +178,16 @@ func TestFileDoesNotExist(t *testing.T) {
 				Depends: []string{
 					"bash",
 				},
-				Files: map[string]string{
-					"../testdata/fake": "/usr/local/bin/fake",
-				},
-				ConfigFiles: map[string]string{
-					"../testdata/whatever.confzzz": "/etc/fake/fake.conf",
+				Contents: []*files.Content{
+					{
+						Source:      "../testdata/fake",
+						Destination: "/usr/local/bin/fake",
+					},
+					{
+						Source:      "../testdata/whatever.confzzz",
+						Destination: "/etc/fake/fake.conf",
+						Type:        "config",
+					},
 				},
 			},
 		}),
@@ -320,8 +334,11 @@ func TestSignatureError(t *testing.T) {
 func TestDisableGlobbing(t *testing.T) {
 	info := exampleInfo()
 	info.DisableGlobbing = true
-	info.Files = map[string]string{
-		"../testdata/{file}[": "/test/{file}[",
+	info.Contents = []*files.Content{
+		{
+			Source:      "../testdata/{file}[",
+			Destination: "/test/{file}[",
+		},
 	}
 	err := info.Validate()
 	require.NoError(t, err)
@@ -404,9 +421,12 @@ func TestAPKConventionalFileName(t *testing.T) {
 
 func TestPackageSymlinks(t *testing.T) {
 	info := exampleInfo()
-	info.Files = map[string]string{}
-	info.Symlinks = map[string]string{
-		"../testdata/fake": "fake",
+	info.Contents = []*files.Content{
+		{
+			Source:      "../testdata/fake",
+			Destination: "fake",
+			Type:        "symlink",
+		},
 	}
 	assert.NoError(t, Default.Package(info, ioutil.Discard))
 }
diff --git a/cmd/nfpm/main.go b/cmd/nfpm/main.go
@@ -162,13 +162,17 @@ vendor: "FooBarCorp"
 homepage: "http://example.com"
 license: "MIT"
 changelog: "changelog.yaml"
-files:
-  ./foo: "/usr/local/bin/foo"
-  ./bar: "/usr/local/bin/bar"
-config_files:
-  ./foobar.conf: "/etc/foobar.conf"
-symlinks:
-  /sbin/foo: "/usr/local/bin/foo"
+contents:
+- src: ./foo
+  dst: /usr/local/bin/foo
+- src: ./bar
+  dst: /usr/local/bin/bar
+- src: ./foobar.conf
+  dst: /etc/foobar.conf
+  type: config
+- src: /usr/local/bin/foo
+  dst: /sbin/foo
+  type: symlink
 overrides:
   rpm:
     scripts:

diff --git a/deb/deb_test.go b/deb/deb_test.go
@@ -61,12 +61,20 @@ func exampleInfo() *nfpm.Info {
 			Conflicts: []string{
 				"zsh",
 			},
-			Files: map[string]string{
-				"../testdata/fake":          "/usr/local/bin/fake",
-				"../testdata/whatever.conf": "/usr/share/doc/fake/fake.txt",
-			},
-			ConfigFiles: map[string]string{
-				"../testdata/whatever.conf": "/etc/fake/fake.conf",
+			Contents: []*files.Content{
+				{
+					Source:      "../testdata/fake",
+					Destination: "/usr/local/bin/fake",
+				},
+				{
+					Source:      "../testdata/whatever.conf",
+					Destination: "/usr/share/doc/fake/fake.txt",
+				},
+				{
+					Source:      "../testdata/whatever.conf",
+					Destination: "/etc/fake/fake.conf",
+					Type:        "config",
+				},
 			},
 			EmptyFolders: []string{
 				"/var/log/whatever",
@@ -230,14 +238,13 @@ func TestNoJoinsControl(t *testing.T) {
 			Homepage:    "http://carlosbecker.com",
 			Vendor:      "nope",
 			Overridables: nfpm.Overridables{
-				Depends:     []string{},
-				Recommends:  []string{},
-				Suggests:    []string{},
-				Replaces:    []string{},
-				Provides:    []string{},
-				Conflicts:   []string{},
-				Files:       map[string]string{},
-				ConfigFiles: map[string]string{},
+				Depends:    []string{},
+				Recommends: []string{},
+				Suggests:   []string{},
+				Replaces:   []string{},
+				Provides:   []string{},
+				Conflicts:  []string{},
+				Contents:   []*files.Content{},
 			},
 		}),
 		InstalledSize: 10,
@@ -267,11 +274,16 @@ func TestDebFileDoesNotExist(t *testing.T) {
 				Depends: []string{
 					"bash",
 				},
-				Files: map[string]string{
-					"../testdata/fake": "/usr/local/bin/fake",
-				},
-				ConfigFiles: map[string]string{
-					"../testdata/whatever.confzzz": "/etc/fake/fake.conf",
+				Contents: []*files.Content{
+					{
+						Source:      "../testdata/fake",
+						Destination: "/usr/local/bin/fake",
+					},
+					{
+						Source:      "../testdata/whatever.confzzz",
+						Destination: "/etc/fake/fake.conf",
+						Type:        "config",
+					},
 				},
 			},
 		}),
@@ -317,8 +329,12 @@ func TestConffiles(t *testing.T) {
 		Version:     "1.0.0",
 		Section:     "default",
 		Overridables: nfpm.Overridables{
-			ConfigFiles: map[string]string{
-				"../testdata/fake": "/etc/fake",
+			Contents: []*files.Content{
+				{
+					Source:      "../testdata/fake",
+					Destination: "/etc/fake",
+					Type:        "config",
+				},
 			},
 		},
 	})
@@ -636,8 +652,11 @@ func TestSymlinkInFiles(t *testing.T) {
 		Description: "This package's config references a file via symlink.",
 		Version:     "1.0.0",
 		Overridables: nfpm.Overridables{
-			Files: map[string]string{
-				symlinkTo(t, symlinkTarget): packagedTarget,
+			Contents: []*files.Content{
+				{
+					Source:      symlinkTo(t, symlinkTarget),
+					Destination: packagedTarget,
+				},
 			},
 		},
 	}
@@ -669,11 +688,16 @@ func TestSymlink(t *testing.T) {
 		Description: "This package's config references a file via symlink.",
 		Version:     "1.0.0",
 		Overridables: nfpm.Overridables{
-			Files: map[string]string{
-				"../testdata/whatever.conf": configFilePath,
-			},
-			Symlinks: map[string]string{
-				symlink: symlinkTarget,
+			Contents: []*files.Content{
+				{
+					Source:      "../testdata/whatever.conf",
+					Destination: configFilePath,
+				},
+				{
+					Source:      symlinkTarget,
+					Destination: symlink,
+					Type:        "symlink",
+				},
 			},
 		},
 	}
@@ -693,8 +717,12 @@ func TestSymlink(t *testing.T) {
 
 func TestEnsureRelativePrefixInTarGzFiles(t *testing.T) {
 	info := exampleInfo()
-	info.Symlinks = map[string]string{
-		"/symlink/to/fake.txt": "/usr/share/doc/fake/fake.txt",
+	info.Contents = []*files.Content{
+		{
+			Source:      "/symlink/to/fake.txt",
+			Destination: "/usr/share/doc/fake/fake.txt",
+			Type:        "symlink",
+		},
 	}
 	info.Changelog = "../testdata/changelog.yaml"
 	err := info.Validate()
@@ -809,11 +837,13 @@ func TestDebsigsSignatureError(t *testing.T) {
 func TestDisableGlobbing(t *testing.T) {
 	info := exampleInfo()
 	info.DisableGlobbing = true
-	info.Files = map[string]string{
-		"../testdata/{file}[": "/test/{file}[",
+	info.Contents = []*files.Content{
+		{
+			Source:      "../testdata/{file}[",
+			Destination: "/test/{file}[",
+		},
 	}
-	err := info.Validate()
-	require.NoError(t, err)
+	require.NoError(t, info.Validate())
 
 	dataTarGz, _, _, err := createDataTarGz(info)
 	require.NoError(t, err)
@@ -928,18 +958,10 @@ func symlinkTo(tb testing.TB, fileName string) string {
 	target, err := filepath.Abs(fileName)
 	assert.NoError(tb, err)
 
-	tempDir, err := ioutil.TempDir("", "nfpm_deb_test")
-	assert.NoError(tb, err)
-
-	symlinkName := filepath.Join(tempDir, "symlink")
+	symlinkName := filepath.Join(tb.TempDir(), "symlink")
 	err = os.Symlink(target, symlinkName)
 	assert.NoError(tb, err)
 
-	tb.Cleanup(func() {
-		err = os.RemoveAll(tempDir)
-		assert.NoError(tb, err)
-	})
-
 	return files.ToNixPath(symlinkName)
 }
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/goreleaser/nfpm
 
-go 1.14
+go 1.15
 
 require (
 	github.com/Djarvur/go-err113 v0.1.0 // indirect
@@ -28,6 +28,7 @@ require (
 	github.com/quasilyte/go-ruleguard v0.2.1 // indirect
 	github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c // indirect
 	github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b
+	github.com/smartystreets/assertions v1.0.0 // indirect
 	github.com/spf13/afero v1.5.1 // indirect
 	github.com/stretchr/objx v0.3.0 // indirect
 	github.com/stretchr/testify v1.6.1

diff --git a/go.sum b/go.sum
@@ -452,6 +452,8 @@ github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8=
+github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=