fix lint

Signed-off-by: Jintao Zhang <[email protected]>

Author: tao12345666333

test/conformance/suite_test.go

@@ -22,7 +22,7 @@ import (
 	"github.com/kong/kong-operator/modules/manager/scheme"
 	testutils "github.com/kong/kong-operator/pkg/utils/test"
 	"github.com/kong/kong-operator/test"
-	"github.com/kong/kong-operator/test/helpers"
+	inthelpers "github.com/kong/kong-operator/test/integration/helpers"
 )
 
 // -----------------------------------------------------------------------------
@@ -104,11 +104,11 @@ func TestMain(m *testing.M) {
 		exitOnErr(testutils.DeployCRDs(ctx, path.Join(configPath, "/crd"), clients.OperatorClient, env.Cluster()))
 	}
 
-	cleanupTelepresence, err := helpers.SetupTelepresence(ctx)
+	cleanupTelepresence, err := inthelpers.SetupTelepresence(ctx)
 	exitOnErr(err)
 	defer cleanupTelepresence()
 
-	cleanupIntercept, err := helpers.SetupNetworkIntercepts(ctx, clients)
+	cleanupIntercept, err := inthelpers.SetupNetworkIntercepts(ctx, clients)
 	exitOnErr(err)
 	defer cleanupIntercept()
 

test/helpers/network_intercept.go renamed to test/integration/helpers/network_intercept.go

@@ -298,8 +298,8 @@ func applyTelepresenceEnvFile(path string) error {
 		if line == "" || strings.HasPrefix(line, "#") {
 			continue
 		}
-		if strings.HasPrefix(line, "export ") {
-			line = strings.TrimSpace(strings.TrimPrefix(line, "export "))
+		if after, ok := strings.CutPrefix(line, "export "); ok {
+			line = strings.TrimSpace(after)
 		}
 		key, value, found := strings.Cut(line, "=")
 		if !found || key == "" {
@@ -344,7 +344,7 @@ func writePodLabelsOverride(labels map[string]string) (string, error) {
 		lines = append(lines, fmt.Sprintf("%s=%q", key, labels[key]))
 	}
 
-	if err := os.WriteFile(file.Name(), []byte(strings.Join(lines, "\n")), 0o644); err != nil {
+	if err := os.WriteFile(file.Name(), []byte(strings.Join(lines, "\n")), 0o600); err != nil {
 		return "", fmt.Errorf("failed to write pod labels temp file: %w", err)
 	}
 	return file.Name(), nil

test/helpers/telepresence.go renamed to test/integration/helpers/telepresence.go

@@ -23,6 +23,7 @@ import (
 	testutils "github.com/kong/kong-operator/pkg/utils/test"
 	"github.com/kong/kong-operator/test"
 	"github.com/kong/kong-operator/test/helpers"
+	inthelpers "github.com/kong/kong-operator/test/integration/helpers"
 )
 
 // -----------------------------------------------------------------------------
@@ -129,11 +130,11 @@ func TestMain(m *testing.M) {
 		exitOnErr(testutils.DeployCRDs(GetCtx(), path.Join(configPath, "/crd"), GetClients().OperatorClient, GetEnv().Cluster()))
 	}
 
-	cleanupTelepresence, err := helpers.SetupTelepresence(ctx)
+	cleanupTelepresence, err := inthelpers.SetupTelepresence(ctx)
 	exitOnErr(err)
 	defer cleanupTelepresence()
 
-	cleanupIntercept, err := helpers.SetupNetworkIntercepts(ctx, GetClients())
+	cleanupIntercept, err := inthelpers.SetupNetworkIntercepts(ctx, GetClients())
 	exitOnErr(err)
 	defer cleanupIntercept()