fix: testifylint and revive lint issues (#884)

Author: alexandear

.golangci.yml

@@ -31,3 +31,6 @@ linters-settings:
         deny:
           - pkg: "github.com/pkg/errors"
             desc: "use stdlib instead"
+  testifylint:
+    disable:
+      - encoded-compare

files/files.go

@@ -525,15 +525,15 @@ func addTree(
 
 var ErrContentCollision = fmt.Errorf("content collision")
 
-func contentCollisionError(new *Content, present *Content) error {
+func contentCollisionError(newc *Content, present *Content) error {
 	var presentSource string
 	if present.Source != "" {
 		presentSource = " with source " + present.Source
 	}
 
 	return fmt.Errorf("adding %s at destination %s: "+
 		"%s%s is already present at this destination: %w",
-		new.Type, new.Destination, present.Type, presentSource, ErrContentCollision,
+		newc.Type, newc.Destination, present.Type, presentSource, ErrContentCollision,
 	)
 }
 

rpm/rpm_test.go

@@ -751,12 +751,12 @@ func TestRPMChangelog(t *testing.T) {
 		notes := strings.Split(allNotes[i], "\n")
 
 		require.Equal(t, entry.Date, timestamp)
-		require.True(t, strings.Contains(title, entry.Packager))
-		require.True(t, strings.Contains(title, entry.Semver))
+		require.Contains(t, title, entry.Packager)
+		require.Contains(t, title, entry.Semver)
 		require.Equal(t, len(entry.Changes), len(notes))
 
 		for j, change := range entry.Changes {
-			require.True(t, strings.Contains(notes[j], change.Note))
+			require.Contains(t, notes[j], change.Note)
 		}
 	}
 }