chore(builder): use testify replace assert

Author: duanhongyi

go.mod

@@ -1,18 +1,18 @@
 module github.com/drycc/builder
 
-go 1.17
+go 1.18
 
 require (
-	github.com/arschles/assert v1.0.1-0.20191213221312-71f210f9375a
-	github.com/aws/aws-sdk-go v1.43.44
-	github.com/distribution/distribution/v3 v3.0.0-20220422123413-27b556324553
-	github.com/drycc/controller-sdk-go v0.0.0-20220414163543-b9fc87956088
-	github.com/drycc/pkg v0.0.0-20220414163413-88896c2e0ef0
+	github.com/aws/aws-sdk-go v1.44.66
+	github.com/distribution/distribution/v3 v3.0.0-20220729163034-26163d82560f
+	github.com/drycc/controller-sdk-go v0.0.0-20220801120356-de65d8cb5598
+	github.com/drycc/pkg v0.0.0-20220801143647-f56f4c2f5ad1
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/pborman/uuid v1.2.1
+	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli/v2 v2.4.4
 	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.23.6
 	k8s.io/apimachinery v0.23.6
 	k8s.io/client-go v0.23.6
@@ -22,6 +22,7 @@ require (
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
@@ -39,15 +40,16 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/prometheus/client_golang v1.1.0 // indirect
-	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
-	github.com/prometheus/common v0.6.0 // indirect
-	github.com/prometheus/procfs v0.0.3 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
-	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect

go.sum

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/arschles/assert"
-	"k8s.io/api/core/v1"
+	"github.com/stretchr/testify/assert"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -28,14 +28,14 @@ func TestDirHasGitSuffix(t *testing.T) {
 
 func TestLocalDirs(t *testing.T) {
 	wd, err := os.Getwd()
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	pkgDir, err := filepath.Abs(wd + "/..")
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	lDirs, err := localDirs(pkgDir, func(dir string) bool {
 		// no directories with any dots in them
 		return len(strings.Split(dir, ".")) == 1
 	})
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 
 	expectedPackages := map[string]int{
 		"cleaner":    1,

pkg/cleaner/cleaner_test.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/arschles/assert"
 	"github.com/drycc/builder/pkg/sys"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetStorageParams(t *testing.T) {
@@ -51,7 +51,7 @@ func TestGetControllerClient(t *testing.T) {
 	}
 
 	key, err := GetBuilderKey()
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	assert.Equal(t, key, string(data), "data")
 }
 

pkg/conf/config_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	builderconf "github.com/drycc/builder/pkg/conf"
+	"github.com/stretchr/testify/assert"
 
-	"github.com/arschles/assert"
 	drycc "github.com/drycc/controller-sdk-go"
 )
 
@@ -35,7 +35,7 @@ func TestNew(t *testing.T) {
 	host := "127.0.0.1"
 	port := "80"
 	cli, err := New(host, port)
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	assert.Equal(t, cli.ControllerURL.String(), fmt.Sprintf("http://%s:%s/", host, port), "data")
 	assert.Equal(t, cli.HooksToken, string(data), "data")
 	assert.Equal(t, cli.UserAgent, "drycc-builder", "user-agent")

pkg/controller/utils_test.go

@@ -8,16 +8,16 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/arschles/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCreatePreReceiveHook(t *testing.T) {
 	const gitHome = "TestGitHome"
 	gopath := os.Getenv("GOPATH")
 	repoPath := filepath.Join(gopath, "src", "github.com", "drycc", "builder", "testdata")
-	assert.NoErr(t, createPreReceiveHook(gitHome, repoPath))
+	assert.Equal(t, createPreReceiveHook(gitHome, repoPath), nil)
 	hookBytes, err := ioutil.ReadFile(filepath.Join(repoPath, "hooks", "pre-receive"))
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	hookStr := string(hookBytes)
 	gitHomeIdx := strings.Index(hookStr, fmt.Sprintf("GIT_HOME=%s", gitHome))
 	assert.False(t, gitHomeIdx == -1, "GIT_HOME was not found")

pkg/git/git_test.go

@@ -9,15 +9,14 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/arschles/assert"
-
 	//"github.com/distribution/distribution/v3/context"
 	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
 	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 	builderconf "github.com/drycc/builder/pkg/conf"
 	"github.com/drycc/builder/pkg/sys"
 	"github.com/drycc/controller-sdk-go/api"
 	"github.com/drycc/pkg/log"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 )
 
@@ -120,7 +119,7 @@ func TestGetProcfileFromRepoSuccess(t *testing.T) {
 	procType, err := getProcfile(tmpDir, getStack(tmpDir, config))
 	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	assert.Equal(t, procType, actualData, "data")
 }
 
@@ -158,7 +157,7 @@ func TestGetProcfileFromServerSuccess(t *testing.T) {
 	_, err := getProcfile("", getStack(tmpDir, config))
 	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
-	assert.Err(t, err, fmt.Errorf("no Procfile can be matched in (%s)", ""))
+	assert.Error(t, err, fmt.Errorf("no Procfile can be matched in (%s)", ""))
 }
 
 func TestGetProcfileFromServerFailure(t *testing.T) {
@@ -168,7 +167,7 @@ func TestGetProcfileFromServerFailure(t *testing.T) {
 		"DRYCC_STACK": "buildpack",
 	}
 	_, err := getProcfile("", getStack(tmpDir, config))
-	assert.Err(t, err, fmt.Errorf("no Procfile can be matched in (%s)", ""))
+	assert.Error(t, err, fmt.Errorf("no Procfile can be matched in (%s)", ""))
 	assert.True(t, err != nil, "no error received when there should have been")
 }
 
@@ -244,5 +243,5 @@ func TestBuildBuilderPodNodeSelector(t *testing.T) {
 	}
 
 	_, err := buildBuilderPodNodeSelector("invalidformat")
-	assert.ExistsErr(t, err, "invalid format")
+	assert.NotEqual(t, err, nil, "invalid format")
 }

pkg/gitreceive/build_test.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/arschles/assert"
 	"github.com/drycc/builder/pkg/sys"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetImagebuilderEnvOffclusterErr(t *testing.T) {
@@ -21,10 +21,10 @@ func TestGetImagebuilderEnvOffclusterErr(t *testing.T) {
 		"DRYCC_REGISTRY_LOCATION": "off-cluster",
 	}
 	_, err := getImagebuilderEnv(&image, config, env)
-	assert.Err(t, err, errors.New("the environment variable DRYCC_REGISTRY_HOST is required"))
+	assert.Error(t, err, errors.New("the environment variable DRYCC_REGISTRY_HOST is required"))
 	env.Envs["DRYCC_REGISTRY_HOST"] = "drycc-registry.drycc.svc.cluster.local"
 	_, err = getImagebuilderEnv(&image, config, env)
-	assert.Err(t, err, errors.New("the environment variable DRYCC_REGISTRY_ORGANIZATION is required"))
+	assert.Error(t, err, errors.New("the environment variable DRYCC_REGISTRY_ORGANIZATION is required"))
 }
 
 func TestGetImagebuilderEnvOffclusterSuccess(t *testing.T) {
@@ -52,7 +52,7 @@ func TestGetImagebuilderEnvOffclusterSuccess(t *testing.T) {
 
 	image := "test-image"
 	imagebuilderEnv, err := getImagebuilderEnv(&image, config, env)
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	assert.Equal(t, expectedData, imagebuilderEnv, "registry details")
 
 	assert.Equal(t, expectedImage, image, "image")
@@ -84,7 +84,7 @@ func TestGetImagebuilderEnvOnclusterSuccess(t *testing.T) {
 
 	image := "python-getting-started-web:v1.2.1"
 	imagebuilderEnv, err := getImagebuilderEnv(&image, config, env)
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	assert.Equal(t, expectedData, imagebuilderEnv, "registry details")
 
 	assert.Equal(t, expectedImage, image, "image")

pkg/gitreceive/imagebuilder_test.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/arschles/assert"
 	"github.com/drycc/builder/pkg/k8s"
+	"github.com/stretchr/testify/assert"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -150,7 +150,7 @@ func TestCreateAppEnvConfigSecretErr(t *testing.T) {
 		},
 	}
 	err := createAppEnvConfigSecret(secretsClient, "test", nil)
-	assert.Err(t, err, expectedErr)
+	assert.Error(t, err, expectedErr)
 }
 
 func TestCreateAppEnvConfigSecretSuccess(t *testing.T) {
@@ -160,7 +160,7 @@ func TestCreateAppEnvConfigSecretSuccess(t *testing.T) {
 		},
 	}
 	err := createAppEnvConfigSecret(secretsClient, "test", nil)
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 }
 
 func TestCreateAppEnvConfigSecretAlreadyExists(t *testing.T) {
@@ -174,5 +174,5 @@ func TestCreateAppEnvConfigSecretAlreadyExists(t *testing.T) {
 		},
 	}
 	err := createAppEnvConfigSecret(secretsClient, "test", nil)
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 }

pkg/gitreceive/k8s_util_test.go

@@ -13,9 +13,9 @@ import (
 
 	//"github.com/distribution/distribution/v3/context"
 
-	"github.com/arschles/assert"
 	"github.com/drycc/builder/pkg/sshd"
 	drycc "github.com/drycc/controller-sdk-go"
+	"github.com/stretchr/testify/assert"
 )
 
 var (
@@ -90,7 +90,7 @@ func TestHealthZCircuitOpen(t *testing.T) {
 	h := healthZHandler(bLister, c)
 	w := httptest.NewRecorder()
 	r, err := http.NewRequest("GET", "/healthz", bytes.NewBuffer(nil))
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	h.ServeHTTP(w, r)
 	assert.Equal(t, w.Code, http.StatusServiceUnavailable, "response code")
 	assert.Equal(t, w.Body.Len(), 0, "response body length")
@@ -105,7 +105,7 @@ func TestHealthZBucketListErr(t *testing.T) {
 
 	w := httptest.NewRecorder()
 	r, err := http.NewRequest("GET", "/healthz", bytes.NewBuffer(nil))
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	h.ServeHTTP(w, r)
 	assert.Equal(t, w.Code, http.StatusServiceUnavailable, "response code")
 	assert.Equal(t, w.Body.Len(), 0, "response body length")
@@ -125,7 +125,7 @@ func TestReadinessNamespaceListErr(t *testing.T) {
 	h := readinessHandler(client, nsLister)
 	w := httptest.NewRecorder()
 	r, err := http.NewRequest("GET", "/readiness", bytes.NewBuffer(nil))
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	h.ServeHTTP(w, r)
 	assert.Equal(t, w.Code, http.StatusServiceUnavailable, "response code")
 	assert.Equal(t, w.Body.Len(), 0, "response body length")
@@ -145,7 +145,7 @@ func TestReadinessControllerErr(t *testing.T) {
 	h := readinessHandler(client, nsLister)
 	w := httptest.NewRecorder()
 	r, err := http.NewRequest("GET", "/readiness", bytes.NewBuffer(nil))
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	h.ServeHTTP(w, r)
 	assert.Equal(t, w.Code, http.StatusServiceUnavailable, "response code")
 }
@@ -158,7 +158,7 @@ func TestHealthZSuccess(t *testing.T) {
 	h := healthZHandler(bLister, c)
 	w := httptest.NewRecorder()
 	r, err := http.NewRequest("GET", "/healthz", bytes.NewBuffer(nil))
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	h.ServeHTTP(w, r)
 	assert.Equal(t, w.Code, http.StatusOK, "response code")
 	assert.Equal(t, w.Body.Len(), 0, "response body length")
@@ -178,7 +178,7 @@ func TestReadinessSuccess(t *testing.T) {
 	h := readinessHandler(client, nsLister)
 	w := httptest.NewRecorder()
 	r, err := http.NewRequest("GET", "/readiness", bytes.NewBuffer(nil))
-	assert.NoErr(t, err)
+	assert.Equal(t, err, nil)
 	h.ServeHTTP(w, r)
 	assert.Equal(t, w.Code, http.StatusOK, "response code")
 	assert.Equal(t, w.Body.Len(), 0, "response body length")