*: Replace github.com/alecthomas/assert with github.com/stretchr/testify/require (#2570)

Author: dveeden

go.mod

@@ -10,7 +10,6 @@ require (
 	github.com/AstroProfundis/sysinfo v0.0.0-20240112160158-ed54df16e9ce
 	github.com/BurntSushi/toml v1.5.0
 	github.com/ScaleFT/sshkeys v1.2.0
-	github.com/alecthomas/assert v1.0.0
 	github.com/appleboy/easyssh-proxy v1.3.10-0.20211209134747-6671f69d85f5
 	github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
 	github.com/cavaliergopher/grab/v3 v3.0.1
@@ -74,8 +73,6 @@ require (
 	cloud.google.com/go/spanner v1.73.0 // indirect
 	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/alecthomas/chroma v0.9.4 // indirect
-	github.com/alecthomas/colour v0.1.0 // indirect
-	github.com/alecthomas/repr v0.2.0 // indirect
 	github.com/apache/thrift v0.17.0 // indirect
 	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/chavacava/garif v0.1.0 // indirect

go.sum

@@ -56,14 +56,8 @@ github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1o
 github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
 github.com/VoltDB/voltdb-client-go v1.0.8 h1:Xhf4LREQumXaRSUixMt1eWea6+0dz/Yo9mkqyEULbj8=
 github.com/VoltDB/voltdb-client-go v1.0.8/go.mod h1:mMhb5zwkT46Ef3NvkFqt+kX0j+ltQ2Sdqj9+ICq+Yto=
-github.com/alecthomas/assert v1.0.0 h1:3XmGh/PSuLzDbK3W2gUbRXwgW5lqPkuqvRgeQ30FI5o=
-github.com/alecthomas/assert v1.0.0/go.mod h1:va/d2JC+M7F6s+80kl/R3G7FUiW6JzUO+hPhLyJ36ZY=
 github.com/alecthomas/chroma v0.9.4 h1:YL7sOAE3p8HS96T9km7RgvmsZIctqbK1qJ0b7hzed44=
 github.com/alecthomas/chroma v0.9.4/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
-github.com/alecthomas/colour v0.1.0 h1:nOE9rJm6dsZ66RGWYSFrXw461ZIt9A6+nHgL7FRrDUk=
-github.com/alecthomas/colour v0.1.0/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
-github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
-github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alexbrainman/odbc v0.0.0-20210605012845-39f8520b0d5f h1:qJp6jWdG+PBNCDtIwRpspahMaZ3hlfde/25ExBORKso=
 github.com/alexbrainman/odbc v0.0.0-20210605012845-39f8520b0d5f/go.mod h1:c5eyz5amZqTKvY3ipqerFO/74a/8CYmXOahSr40c+Ww=
 github.com/amsokol/ignite-go-client v0.12.2 h1:q4Mr+UUiKVnR7ykjR1YARVS5jp+ZU6ekCIs0V4WgFDo=

pkg/repository/v1manifest/keys_test.go

@@ -17,7 +17,7 @@ package v1manifest
 import (
 	"testing"
 
-	"github.com/alecthomas/assert"
+	"github.com/stretchr/testify/require"
 )
 
 var (
@@ -51,56 +51,56 @@ var cryptoCases = [][]byte{
 
 func TestKeyInfoIdentity(t *testing.T) {
 	priv := NewKeyInfo(privateTestKey)
-	assert.True(t, priv.IsPrivate())
+	require.True(t, priv.IsPrivate())
 
 	pub1, err := priv.Public()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 	pub2, err := priv.Public()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 	pub3, err := pub2.Public()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
-	assert.Equal(t, pub1.Value["public"], pub2.Value["public"])
-	assert.Equal(t, pub1.Value["public"], pub3.Value["public"])
-	assert.Equal(t, pub1.Value["public"], string(publicTestKey))
+	require.Equal(t, pub1.Value["public"], pub2.Value["public"])
+	require.Equal(t, pub1.Value["public"], pub3.Value["public"])
+	require.Equal(t, pub1.Value["public"], string(publicTestKey))
 
 	id1, err := pub1.ID()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 	id2, err := pub2.ID()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 	id3, err := pub3.ID()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
-	assert.Equal(t, id1, id2)
-	assert.Equal(t, id1, id3)
+	require.Equal(t, id1, id2)
+	require.Equal(t, id1, id3)
 }
 
 func TestKeyInfoID(t *testing.T) {
 	priv := NewKeyInfo(privateTestKey)
-	assert.True(t, priv.IsPrivate())
+	require.True(t, priv.IsPrivate())
 
 	pub, err := priv.Public()
-	assert.Nil(t, err)
-	assert.True(t, !pub.IsPrivate())
+	require.Nil(t, err)
+	require.True(t, !pub.IsPrivate())
 
 	pubid, err := pub.ID()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 	privid, err := pub.ID()
-	assert.Nil(t, err)
-	assert.NotEmpty(t, pubid)
-	assert.Equal(t, pubid, privid)
+	require.Nil(t, err)
+	require.NotEmpty(t, pubid)
+	require.Equal(t, pubid, privid)
 }
 
 func TestKeyInfoSigAndVerify(t *testing.T) {
 	pri := NewKeyInfo(privateTestKey)
-	assert.True(t, pri.IsPrivate())
+	require.True(t, pri.IsPrivate())
 
 	pub, err := pri.Public()
-	assert.Nil(t, err)
+	require.Nil(t, err)
 
 	for _, cas := range cryptoCases {
 		sig, err := pri.Signature(cas)
-		assert.Nil(t, err)
-		assert.Nil(t, pub.Verify(cas, sig))
+		require.Nil(t, err)
+		require.Nil(t, pub.Verify(cas, sig))
 	}
 }

pkg/repository/v1manifest/types_test.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/alecthomas/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestComponentList(t *testing.T) {
@@ -30,16 +30,16 @@ func TestComponentList(t *testing.T) {
 	}
 
 	list := manifest.ComponentList()
-	assert.Equal(t, len(list), 1)
+	require.Equal(t, len(list), 1)
 	_, ok := list["comp1"]
-	assert.True(t, ok)
+	require.True(t, ok)
 
 	list = manifest.ComponentListWithYanked()
-	assert.Equal(t, len(list), 2)
+	require.Equal(t, len(list), 2)
 	_, ok = list["comp1"]
-	assert.True(t, ok)
+	require.True(t, ok)
 	_, ok = list["comp2"]
-	assert.True(t, ok)
+	require.True(t, ok)
 }
 
 func TestVersionList(t *testing.T) {
@@ -57,21 +57,21 @@ func TestVersionList(t *testing.T) {
 	}
 
 	versions := manifest.VersionList("linux/amd64")
-	assert.Equal(t, len(versions), 1)
+	require.Equal(t, len(versions), 1)
 	_, ok := versions["v1.0.0"]
-	assert.True(t, ok)
+	require.True(t, ok)
 
 	versions = manifest.VersionListWithYanked("linux/amd64")
-	assert.Equal(t, len(versions), 2)
+	require.Equal(t, len(versions), 2)
 	_, ok = versions["v1.0.0"]
-	assert.True(t, ok)
+	require.True(t, ok)
 	_, ok = versions["v1.1.1"]
-	assert.True(t, ok)
+	require.True(t, ok)
 
 	versions = manifest.VersionList("windows/amd64")
-	assert.Equal(t, len(versions), 1)
+	require.Equal(t, len(versions), 1)
 	_, ok = versions["v1.0.0"]
-	assert.True(t, ok)
+	require.True(t, ok)
 
 	manifest = &Component{
 		Platforms: map[string]map[string]VersionItem{
@@ -83,7 +83,7 @@ func TestVersionList(t *testing.T) {
 	}
 
 	versions = manifest.VersionList("windows/amd64")
-	assert.Equal(t, len(versions), 0)
+	require.Equal(t, len(versions), 0)
 }
 
 func TestLoadManifestError(t *testing.T) {
@@ -92,30 +92,30 @@ func TestLoadManifestError(t *testing.T) {
 		err:      fmt.Errorf("dummy error"),
 	}
 	// identical errors are equal
-	assert.True(t, errors.Is(err0, err0))
-	assert.True(t, errors.Is(ErrLoadManifest, ErrLoadManifest))
-	assert.True(t, errors.Is(ErrLoadManifest, &LoadManifestError{}))
-	assert.True(t, errors.Is(&LoadManifestError{}, ErrLoadManifest))
+	require.True(t, errors.Is(err0, err0))
+	require.True(t, errors.Is(ErrLoadManifest, ErrLoadManifest))
+	require.True(t, errors.Is(ErrLoadManifest, &LoadManifestError{}))
+	require.True(t, errors.Is(&LoadManifestError{}, ErrLoadManifest))
 	// not equal for different error types
-	assert.False(t, errors.Is(err0, errors.New("")))
+	require.False(t, errors.Is(err0, errors.New("")))
 	// default Value matches any error
-	assert.True(t, errors.Is(err0, ErrLoadManifest))
+	require.True(t, errors.Is(err0, ErrLoadManifest))
 	// error with values are not matching default ones
-	assert.False(t, errors.Is(ErrLoadManifest, err0))
+	require.False(t, errors.Is(ErrLoadManifest, err0))
 
 	err1 := &LoadManifestError{
 		manifest: "root.json",
 		err:      fmt.Errorf("dummy error 2"),
 	}
-	assert.True(t, errors.Is(err1, ErrLoadManifest))
+	require.True(t, errors.Is(err1, ErrLoadManifest))
 	// errors with different errors are different
-	assert.False(t, errors.Is(err0, err1))
-	assert.False(t, errors.Is(err1, err0))
+	require.False(t, errors.Is(err0, err1))
+	require.False(t, errors.Is(err1, err0))
 
 	err2 := &LoadManifestError{
 		manifest: "root.json",
 	}
 	// nil errors can be match with any error, but not vise vera
-	assert.True(t, errors.Is(err1, err2))
-	assert.False(t, errors.Is(err2, err1))
+	require.True(t, errors.Is(err1, err2))
+	require.False(t, errors.Is(err2, err1))
 }