Small changes

Author: dsessler7

internal/collector/postgres.go

@@ -245,9 +245,9 @@ func EnablePostgresLogging(
 		}
 
 		// pgBackRest pipeline
-		pgbackrestLogPath := util.GetPGBackRestLogPathForInstance(inCluster)
+		pgBackRestLogPath := util.GetPGBackRestLogPathForInstance(inCluster)
 		outConfig.Extensions["file_storage/pgbackrest_logs"] = map[string]any{
-			"directory":        pgbackrestLogPath + "/receiver",
+			"directory":        pgBackRestLogPath + "/receiver",
 			"create_directory": false,
 			"fsync":            true,
 		}
@@ -260,8 +260,8 @@ func EnablePostgresLogging(
 			// a log record or two to the old file while rotation is occurring.
 			// The collector knows not to create duplicate logs.
 			"include": []string{
-				pgbackrestLogPath + "/*.log",
-				pgbackrestLogPath + "/*.log.1",
+				pgBackRestLogPath + "/*.log",
+				pgBackRestLogPath + "/*.log.1",
 			},
 			"storage": "file_storage/pgbackrest_logs",
 

internal/controller/postgrescluster/pgbackrest_test.go

@@ -3125,8 +3125,7 @@ volumes:
   name: tmp
 - name: volumes-stuff
   persistentVolumeClaim:
-    claimName: additional-pvc
-				`))
+    claimName: additional-pvc`))
 
 		// No events created
 		assert.Equal(t, len(recorder.Events), 0)

internal/pgbackrest/config.go

@@ -123,6 +123,7 @@ func CreatePGBackRestConfigMapIntent(ctx context.Context, postgresCluster *v1bet
 		serverConfig(postgresCluster).String()
 
 	if RepoHostVolumeDefined(postgresCluster) && repoHostName != "" {
+		// Get pgbackrest log path for repo host pod
 		pgBackRestLogPath := generateRepoHostLogPath(postgresCluster)
 
 		cm.Data[CMRepoKey] = iniGeneratedWarning +
@@ -137,8 +138,6 @@ func CreatePGBackRestConfigMapIntent(ctx context.Context, postgresCluster *v1bet
 			).String()
 
 		if collector.OpenTelemetryLogsOrMetricsEnabled(ctx, postgresCluster) {
-			// Get pgbackrest log path for repo host pod
-
 			err = collector.AddToConfigMap(ctx, collector.NewConfigForPgBackrestRepoHostPod(
 				ctx,
 				postgresCluster.Spec.Instrumentation,
@@ -373,7 +372,7 @@ func populatePGInstanceConfigurationMap(
 	serviceName, serviceNamespace, repoHostName, pgdataDir,
 	fetchKeyCommand, postgresVersion string,
 	pgPort int32, repos []v1beta1.PGBackRestRepo,
-	globalConfig map[string]string, pgbackrestLogPath string,
+	globalConfig map[string]string, pgBackRestLogPath string,
 ) iniSectionSet {
 
 	// TODO(cbandy): pass a FQDN in already.
@@ -389,7 +388,7 @@ func populatePGInstanceConfigurationMap(
 	// pgBackRest spool-path should always be co-located with the Postgres WAL path.
 	global.Set("spool-path", "/pgdata/pgbackrest-spool")
 	// pgBackRest will log to the pgData volume for commands run on the PostgreSQL instance
-	global.Set("log-path", pgbackrestLogPath)
+	global.Set("log-path", pgBackRestLogPath)
 
 	for _, repo := range repos {
 		global.Set(repo.Name+"-path", defaultRepo1Path+repo.Name)