ci(lint): enable thelper linter

weaveworks · Jan 19, 2025 · 6b12886 · 6b12886
1 parent da5cc51
commit 6b12886
Show file tree

Hide file tree

Showing 18 changed files with 99 additions and 82 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -29,7 +29,7 @@ linters:
     - staticcheck
     - stylecheck
     - tenv
-    #- thelper
+    - thelper
     #- tparallel
     - typecheck
     - unconvert

diff --git a/core/clustersmngr/factory_caches_test.go b/core/clustersmngr/factory_caches_test.go
@@ -129,6 +129,7 @@ func TestClusterSet_Set(t *testing.T) {
 }
 
 func newTestCluster(t *testing.T, name, server string) cluster.Cluster {
+	t.Helper()
 	c, err := cluster.NewSingleCluster(name, &rest.Config{Host: server}, nil, kube.UserPrefixes{})
 	if err != nil {
 		t.Error("Expected error to be nil, got", err)

diff --git a/core/clustersmngr/suite_test.go b/core/clustersmngr/suite_test.go
@@ -31,6 +31,7 @@ func TestMain(m *testing.M) {
 }
 
 func makeLeafCluster(t *testing.T, name string) cluster.Cluster {
+	t.Helper()
 	cluster, err := cluster.NewSingleCluster(name, k8sEnv.Rest, nil, kube.UserPrefixes{})
 	if err != nil {
 		t.Error("Expected err to be nil, got", err)
@@ -40,6 +41,7 @@ func makeLeafCluster(t *testing.T, name string) cluster.Cluster {
 }
 
 func makeUnreachableLeafCluster(t *testing.T, name string) cluster.Cluster {
+	t.Helper()
 	c := rest.CopyConfig(k8sEnv.Rest)
 
 	// hopefully no k8s server is listening here

diff --git a/core/logger/logger_test.go b/core/logger/logger_test.go
@@ -163,8 +163,8 @@ var (
 )
 
 func redirectStdout(t *testing.T) (*os.File, *os.File) {
-	g := NewGomegaWithT(t)
 	t.Helper()
+	g := NewGomegaWithT(t)
 
 	oldStdout := os.Stdout
 	r, w, err := os.Pipe()
@@ -180,8 +180,8 @@ func redirectStdout(t *testing.T) (*os.File, *os.File) {
 }
 
 func getLogs(t *testing.T, r, w *os.File) []byte {
-	g := NewGomegaWithT(t)
 	t.Helper()
+	g := NewGomegaWithT(t)
 
 	w.Close()
 

diff --git a/core/nsaccess/nsaccess_test.go b/core/nsaccess/nsaccess_test.go
@@ -419,6 +419,7 @@ func makeRole(ns *corev1.Namespace) types.NamespacedName {
 }
 
 func createRole(t *testing.T, cl client.Client, key types.NamespacedName, rules []rbacv1.PolicyRule) {
+	t.Helper()
 	role := &rbacv1.Role{
 		ObjectMeta: metav1.ObjectMeta{Name: "test-role", Namespace: key.Namespace},
 		Rules:      rules,

diff --git a/core/server/crd_test.go b/core/server/crd_test.go
@@ -19,7 +19,7 @@ func TestIsAvailable(t *testing.T) {
 
 	ctx := context.Background()
 
-	c := makeGRPCServer(ctx, k8sEnv.Rest, t)
+	c := makeGRPCServer(ctx, t, k8sEnv.Rest)
 
 	scheme, err := kube.CreateScheme()
 	g.Expect(err).NotTo(HaveOccurred())

diff --git a/core/server/events_test.go b/core/server/events_test.go
@@ -23,7 +23,7 @@ func TestListEvents(t *testing.T) {
 
 	ctx := context.Background()
 
-	c := makeGRPCServer(ctx, k8sEnv.Rest, t)
+	c := makeGRPCServer(ctx, t, k8sEnv.Rest)
 
 	scheme, err := kube.CreateScheme()
 	g.Expect(err).To(BeNil())

diff --git a/core/server/fluxruntime_test.go b/core/server/fluxruntime_test.go
@@ -32,7 +32,7 @@ func TestGetReconciledObjects(t *testing.T) {
 
 	ctx := context.Background()
 
-	c := makeGRPCServer(ctx, k8sEnv.Rest, t)
+	c := makeGRPCServer(ctx, t, k8sEnv.Rest)
 
 	scheme, err := kube.CreateScheme()
 	g.Expect(err).To(BeNil())
@@ -198,7 +198,7 @@ func TestGetReconciledObjectsWithSecret(t *testing.T) {
 
 	ctx := context.Background()
 
-	c := makeGRPCServer(ctx, k8sEnv.Rest, t)
+	c := makeGRPCServer(ctx, t, k8sEnv.Rest)
 
 	scheme, err := kube.CreateScheme()
 	g.Expect(err).To(BeNil())
@@ -308,8 +308,8 @@ func TestGetChildObjects(t *testing.T) {
 	g.Expect(err).To(BeNil())
 
 	client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(&ns, deployment, rs).Build()
-	cfg := makeServerConfig(client, t, "")
-	c := makeServer(ctx, cfg, t)
+	cfg := makeServerConfig(t, client, "")
+	c := makeServer(ctx, t, cfg)
 
 	res, err := c.GetChildObjects(ctx, &pb.GetChildObjectsRequest{
 		ParentUid: string(deployment.UID),
@@ -384,8 +384,8 @@ func TestListFluxRuntimeObjects(t *testing.T) {
 			scheme, err := kube.CreateScheme()
 			g.Expect(err).To(BeNil())
 			client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(tt.objects...).Build()
-			cfg := makeServerConfig(client, t, "")
-			c := makeServer(ctx, cfg, t)
+			cfg := makeServerConfig(t, client, "")
+			c := makeServer(ctx, t, cfg)
 			res, err := c.ListFluxRuntimeObjects(ctx, &pb.ListFluxRuntimeObjectsRequest{})
 			g.Expect(err).NotTo(HaveOccurred())
 
@@ -453,8 +453,8 @@ func TestListRuntimeObjects(t *testing.T) {
 			scheme, err := kube.CreateScheme()
 			g.Expect(err).To(BeNil())
 			client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(tt.objects...).Build()
-			cfg := makeServerConfig(client, t, "")
-			c := makeServer(ctx, cfg, t)
+			cfg := makeServerConfig(t, client, "")
+			c := makeServer(ctx, t, cfg)
 
 			res, err := c.ListRuntimeObjects(ctx, &pb.ListRuntimeObjectsRequest{})
 
@@ -520,8 +520,8 @@ func TestListFluxCrds(t *testing.T) {
 	g.Expect(err).To(BeNil())
 
 	client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(crd1, crd2).Build()
-	cfg := makeServerConfig(client, t, "")
-	c := makeServer(ctx, cfg, t)
+	cfg := makeServerConfig(t, client, "")
+	c := makeServer(ctx, t, cfg)
 
 	res, err := c.ListFluxCrds(ctx, &pb.ListFluxCrdsRequest{})
 
@@ -578,8 +578,8 @@ func TestListRuntimeCrds(t *testing.T) {
 			scheme, err := kube.CreateScheme()
 			g.Expect(err).To(BeNil())
 			client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(tt.objects...).Build()
-			cfg := makeServerConfig(client, t, "")
-			c := makeServer(ctx, cfg, t)
+			cfg := makeServerConfig(t, client, "")
+			c := makeServer(ctx, t, cfg)
 
 			res, err := c.ListRuntimeCrds(ctx, &pb.ListRuntimeCrdsRequest{})
 			g.Expect(err).NotTo(HaveOccurred())

diff --git a/core/server/inventory_test.go b/core/server/inventory_test.go
@@ -124,8 +124,8 @@ func TestGetInventoryKustomization(t *testing.T) {
 	g.Expect(err).To(BeNil())
 
 	client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(&ns, &anotherNs, kust, deployment, rs).Build()
-	cfg := makeServerConfig(client, t, "")
-	c := makeServer(ctx, cfg, t)
+	cfg := makeServerConfig(t, client, "")
+	c := makeServer(ctx, t, cfg)
 
 	res, err := c.GetInventory(ctx, &pb.GetInventoryRequest{
 		Namespace:    ns.Name,
@@ -195,8 +195,8 @@ func TestGetBlankInventoryKustomization(t *testing.T) {
 	g.Expect(err).To(BeNil())
 
 	client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(kust, deployment).Build()
-	cfg := makeServerConfig(client, t, "")
-	c := makeServer(ctx, cfg, t)
+	cfg := makeServerConfig(t, client, "")
+	c := makeServer(ctx, t, cfg)
 
 	res, err := c.GetInventory(ctx, &pb.GetInventoryRequest{
 		Namespace:    ns,
@@ -274,8 +274,8 @@ func TestGetInventoryHelmRelease(t *testing.T) {
 	}
 
 	client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(ns, helm1, secret, cm).Build()
-	cfg := makeServerConfig(client, t, "")
-	c := makeServer(ctx, cfg, t)
+	cfg := makeServerConfig(t, client, "")
+	c := makeServer(ctx, t, cfg)
 
 	res, err := c.GetInventory(ctx, &pb.GetInventoryRequest{
 		Namespace:    ns.Name,
@@ -363,8 +363,8 @@ func TestGetInventoryHelmReleaseNoNSResources(t *testing.T) {
 	client := fake.NewClientBuilder().WithScheme(scheme).
 		WithRESTMapper(testrestmapper.TestOnlyStaticRESTMapper(scheme)).
 		WithRuntimeObjects(ns, helm1, secret, cm).Build()
-	cfg := makeServerConfig(client, t, "")
-	c := makeServer(ctx, cfg, t)
+	cfg := makeServerConfig(t, client, "")
+	c := makeServer(ctx, t, cfg)
 
 	res, err := c.GetInventory(ctx, &pb.GetInventoryRequest{
 		Namespace:    ns.Name,
@@ -413,8 +413,8 @@ func TestGetInventoryHelmReleaseWithKubeconfig(t *testing.T) {
 	}
 
 	client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(ns, helm1).Build()
-	cfg := makeServerConfig(client, t, "")
-	c := makeServer(ctx, cfg, t)
+	cfg := makeServerConfig(t, client, "")
+	c := makeServer(ctx, t, cfg)
 
 	res, err := c.GetInventory(ctx, &pb.GetInventoryRequest{
 		Namespace:    ns.Name,