diff --git a/pkg/build/tls_test.go b/pkg/build/tls_test.go index d6dd27c1..df889d6d 100644 --- a/pkg/build/tls_test.go +++ b/pkg/build/tls_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/cnoe-io/idpbuilder/globals" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" @@ -34,14 +34,14 @@ func (f *fakeKubeClient) Create(ctx context.Context, obj client.Object, opts ... func TestCreateSelfSignedCertificate(t *testing.T) { sans := []string{"cnoe.io", "*.cnoe.io"} c, k, err := createSelfSignedCertificate(sans) - assert.NilError(t, err) + assert.NoError(t, err) _, err = tls.X509KeyPair(c, k) - assert.NilError(t, err) + assert.NoError(t, err) block, _ := pem.Decode(c) assert.Equal(t, "CERTIFICATE", block.Type) cert, err := x509.ParseCertificate(block.Bytes) - assert.NilError(t, err) + assert.NoError(t, err) assert.Equal(t, 2, len(cert.DNSNames)) expected := map[string]struct{}{ @@ -73,7 +73,7 @@ func TestGetOrCreateIngressCertificateAndKey(t *testing.T) { }).Return(nil) _, _, err := getOrCreateIngressCertificateAndKey(ctx, fClient, globals.SelfSignedCertSecretName, globals.NginxNamespace, []string{globals.DefaultHostName, globals.DefaultSANWildcard}) - assert.NilError(t, err) + assert.NoError(t, err) fClient.AssertExpectations(t) fClient = new(fakeKubeClient) @@ -82,7 +82,7 @@ func TestGetOrCreateIngressCertificateAndKey(t *testing.T) { fClient.On("Create", ctx, mock.Anything, mock.Anything).Return(nil) c, k, err := getOrCreateIngressCertificateAndKey(ctx, fClient, globals.SelfSignedCertSecretName, globals.NginxNamespace, []string{globals.DefaultHostName, globals.DefaultSANWildcard}) - assert.NilError(t, err) + assert.NoError(t, err) _, err = tls.X509KeyPair(c, k) - assert.NilError(t, err) + assert.NoError(t, err) } diff --git a/pkg/controllers/localbuild/argo_test.go b/pkg/controllers/localbuild/argo_test.go index 9651191f..99f787eb 100644 --- a/pkg/controllers/localbuild/argo_test.go +++ b/pkg/controllers/localbuild/argo_test.go @@ -8,8 +8,8 @@ import ( "github.com/cnoe-io/idpbuilder/api/v1alpha1" "github.com/cnoe-io/idpbuilder/pkg/k8s" "github.com/cnoe-io/idpbuilder/pkg/util" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "gotest.tools/v3/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -152,7 +152,7 @@ func TestArgoCDAppAnnotation(t *testing.T) { } err := rec.requestArgoCDAppRefresh(ctx) fClient.AssertExpectations(t) - assert.NilError(t, err) + assert.NoError(t, err) } }