From 2e266785800943628026de6de086782d6a0fef2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Fei?= <niccolo.fei@enterprisedb.com>
Date: Mon, 7 Oct 2024 19:55:00 +0200
Subject: [PATCH] fix: run as application user to set the proper permissions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com>
---
 tests/e2e/asserts_test.go              | 23 ++++----------------
 tests/e2e/cluster_microservice_test.go |  9 ++------
 tests/e2e/fastswitchover_test.go       | 13 +++---------
 tests/utils/psql_connection.go         | 29 +++++++++++++++++++++++++-
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/tests/e2e/asserts_test.go b/tests/e2e/asserts_test.go
index c7289a1bd5..4a3637b8c7 100644
--- a/tests/e2e/asserts_test.go
+++ b/tests/e2e/asserts_test.go
@@ -479,15 +479,8 @@ func AssertCreateTestDataLargeObject(namespace, clusterName string, oid int, dat
 		query := fmt.Sprintf("CREATE TABLE IF NOT EXISTS image (name text,raster oid); "+
 			"INSERT INTO image (name, raster) VALUES ('beautiful image', lo_from_bytea(%d, '%s'));", oid, data)
 
-		primaryPod, err := env.GetClusterPrimary(namespace, clusterName)
-		Expect(err).ToNot(HaveOccurred())
-		_, _, err = env.ExecQueryInInstancePod(
-			testsUtils.PodLocator{
-				Namespace: primaryPod.Namespace,
-				PodName:   primaryPod.Name,
-			},
-			testsUtils.AppDBName,
-			query)
+		_, err := testsUtils.RunExecOverForward(env, namespace, clusterName, testsUtils.AppDBName,
+			apiv1.ApplicationUserSecretSuffix, query)
 		Expect(err).ToNot(HaveOccurred())
 	})
 }
@@ -1238,16 +1231,8 @@ func AssertFastFailOver(
 			", PRIMARY KEY (id)" +
 			")"
 
-		primaryPod, err := env.GetClusterPrimary(namespace, clusterName)
-		Expect(err).ToNot(HaveOccurred())
-
-		_, _, err = env.ExecQueryInInstancePod(
-			testsUtils.PodLocator{
-				Namespace: primaryPod.Namespace,
-				PodName:   primaryPod.Name,
-			},
-			testsUtils.AppDBName,
-			query)
+		_, err = testsUtils.RunExecOverForward(env, namespace, clusterName, testsUtils.AppDBName,
+			apiv1.ApplicationUserSecretSuffix, query)
 		Expect(err).ToNot(HaveOccurred())
 	})
 
diff --git a/tests/e2e/cluster_microservice_test.go b/tests/e2e/cluster_microservice_test.go
index c78fd7b3c4..6019086aa3 100644
--- a/tests/e2e/cluster_microservice_test.go
+++ b/tests/e2e/cluster_microservice_test.go
@@ -303,13 +303,8 @@ func assertImportRenamesSelectedDatabase(
 	By(fmt.Sprintf("creating table '%s' and insert records on selected db %v", tableName, dbToImport), func() {
 		// create a table with two records
 		query := fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s AS VALUES (1),(2);", tableName)
-		_, _, err = env.ExecQueryInInstancePod(
-			testsUtils.PodLocator{
-				Namespace: primaryPod.Namespace,
-				PodName:   primaryPod.Name,
-			},
-			testsUtils.DatabaseName(dbToImport),
-			query)
+		_, err = testsUtils.RunExecOverForward(env, namespace, clusterName, dbToImport,
+			apiv1.ApplicationUserSecretSuffix, query)
 		Expect(err).ToNot(HaveOccurred())
 	})
 
diff --git a/tests/e2e/fastswitchover_test.go b/tests/e2e/fastswitchover_test.go
index 58657e35bf..d7a45efd47 100644
--- a/tests/e2e/fastswitchover_test.go
+++ b/tests/e2e/fastswitchover_test.go
@@ -24,6 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/retry"
 
+	apiv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
 	"github.com/cloudnative-pg/cloudnative-pg/tests"
 	"github.com/cloudnative-pg/cloudnative-pg/tests/utils"
 
@@ -134,16 +135,8 @@ func assertFastSwitchover(namespace, sampleFile, clusterName, webTestFile, webTe
 			", PRIMARY KEY (id)" +
 			")"
 
-		primaryPod, err := env.GetClusterPrimary(namespace, clusterName)
-		Expect(err).ToNot(HaveOccurred())
-
-		_, _, err = env.ExecQueryInInstancePod(
-			utils.PodLocator{
-				Namespace: primaryPod.Namespace,
-				PodName:   primaryPod.Name,
-			},
-			utils.AppDBName,
-			query)
+		_, err := utils.RunExecOverForward(env, namespace, clusterName, utils.AppDBName,
+			apiv1.ApplicationUserSecretSuffix, query)
 		Expect(err).ToNot(HaveOccurred())
 	})
 
diff --git a/tests/utils/psql_connection.go b/tests/utils/psql_connection.go
index 4289e3988d..a0d8a7a1fb 100644
--- a/tests/utils/psql_connection.go
+++ b/tests/utils/psql_connection.go
@@ -200,7 +200,7 @@ func ForwardPSQLConnectionWithCreds(
 	return forward, conn, err
 }
 
-// RunQueryRowOverForward runs QueryRow with a given query, returning the result Row
+// RunQueryRowOverForward runs QueryRow with a given query, returning the Row of the SQL command
 func RunQueryRowOverForward(
 	env *TestingEnvironment,
 	namespace,
@@ -226,3 +226,30 @@ func RunQueryRowOverForward(
 
 	return conn.QueryRow(query), nil
 }
+
+// RunExecOverForward runs Exec with a given query, returning the Result of the SQL command
+func RunExecOverForward(
+	env *TestingEnvironment,
+	namespace,
+	clusterName,
+	dbname,
+	secretSuffix,
+	query string,
+) (sql.Result, error) {
+	forward, conn, err := ForwardPSQLConnection(
+		env,
+		namespace,
+		clusterName,
+		dbname,
+		secretSuffix,
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = conn.Close()
+		forward.Close()
+	}()
+
+	return conn.Exec(query)
+}