diff --git a/.golangci.yml b/.golangci.yml index e6a5a153d..eebd327ed 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -34,6 +34,7 @@ linters: - staticcheck - stylecheck - tenv + - testifylint - thelper - tparallel - unconvert @@ -74,6 +75,11 @@ linters-settings: - style gofumpt: extra-rules: true + importas: + no-unaliased: false + alias: + - pkg: "sigs.k8s.io/cluster-api/api/v1beta1" + alias: clusterv1 lll: line-length: 120 stylecheck: @@ -81,11 +87,8 @@ linters-settings: dot-import-whitelist: - github.com/onsi/ginkgo/v2 - github.com/onsi/gomega - importas: - no-unaliased: false - alias: - - pkg: "sigs.k8s.io/cluster-api/api/v1beta1" - alias: clusterv1 + testifylint: + enable-all: true issues: exclude-dirs: diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/template_test.go b/pkg/handlers/generic/lifecycle/clusterautoscaler/template_test.go index 1e95e45ec..38bfb7876 100644 --- a/pkg/handlers/generic/lifecycle/clusterautoscaler/template_test.go +++ b/pkg/handlers/generic/lifecycle/clusterautoscaler/template_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" ) @@ -90,7 +91,7 @@ func Test_templateValues(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { got, err := templateValues(tt.cluster, tt.text) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, tt.want, got) }) } diff --git a/pkg/handlers/generic/lifecycle/cni/cluster_test.go b/pkg/handlers/generic/lifecycle/cni/cluster_test.go index ea22b7c23..ee26f60be 100644 --- a/pkg/handlers/generic/lifecycle/cni/cluster_test.go +++ b/pkg/handlers/generic/lifecycle/cni/cluster_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "sigs.k8s.io/cluster-api/api/v1beta1" ) @@ -69,7 +70,7 @@ func Test_PodCIDR(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() cidr, err := PodCIDR(tt.cluster) - assert.ErrorIs(t, err, tt.wantErr) + require.ErrorIs(t, err, tt.wantErr) assert.Equal(t, tt.wantCIDR, cidr) }) } diff --git a/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go b/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go index d7b16c5b5..908472b3e 100644 --- a/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go +++ b/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go @@ -103,7 +103,7 @@ func Test_shouldDeleteServicesWithLoadBalancer(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() shouldDelete, err := shouldDeleteServicesWithLoadBalancer(tt.cluster) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, tt.shouldDelete, shouldDelete) }) } diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files_test.go b/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files_test.go index 296b4941a..ae314901a 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files_test.go +++ b/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" cabpkv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" ) @@ -80,7 +81,7 @@ providers: t.Run(tt.name, func(t *testing.T) { t.Parallel() file, err := templateKubeletCredentialProviderConfig() - assert.ErrorIs(t, err, tt.wantErr) + require.ErrorIs(t, err, tt.wantErr) assert.Equal(t, tt.want, file) }) } @@ -344,7 +345,7 @@ credentialProviders: t.Run(tt.name, func(t *testing.T) { t.Parallel() file, err := templateDynamicCredentialProviderConfig(tt.credentials) - assert.ErrorIs(t, err, tt.wantErr) + require.ErrorIs(t, err, tt.wantErr) assert.Equal(t, tt.want, file) }) } diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go b/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go index 6cbdaf85e..2cc3d1571 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go +++ b/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go @@ -9,6 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -117,7 +118,7 @@ func Test_needImageRegistryCredentialsConfiguration(t *testing.T) { t.Parallel() need, err := needImageRegistryCredentialsConfiguration(tt.configs) - assert.ErrorIs(t, err, tt.wantErr) + require.ErrorIs(t, err, tt.wantErr) assert.Equal(t, tt.need, need) }) } diff --git a/pkg/handlers/generic/mutation/mirrors/mirror_test.go b/pkg/handlers/generic/mutation/mirrors/mirror_test.go index 94e08255a..574bda27b 100644 --- a/pkg/handlers/generic/mutation/mirrors/mirror_test.go +++ b/pkg/handlers/generic/mutation/mirrors/mirror_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" cabpkv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" @@ -92,7 +93,7 @@ func Test_generateDefaultRegistryMirrorFile(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() file, err := generateGlobalRegistryMirrorFile(tt.config) - assert.ErrorIs(t, err, tt.wantErr) + require.ErrorIs(t, err, tt.wantErr) assert.Equal(t, tt.want, file) }) }