Rename fn to DisableMonitoringUserInPostgres

tony-landreth · tony-landreth · commit a01b5e775a01 · 2025-02-21T17:38:51.000-05:00
diff --git a/internal/controller/postgrescluster/pgmonitor.go b/internal/controller/postgrescluster/pgmonitor.go
@@ -101,7 +101,7 @@ func (r *Reconciler) reconcilePGMonitorExporter(ctx context.Context,
 
 	if !pgmonitor.ExporterEnabled(ctx, cluster) && !feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
 		action = func(ctx context.Context, exec postgres.Executor) error {
-			return pgmonitor.DisableExporterInPostgreSQL(ctx, exec)
+			return pgmonitor.DisableMonitoringUserInPostgres(ctx, exec)
 		}
 	}
 
diff --git a/internal/pgmonitor/postgres.go b/internal/pgmonitor/postgres.go
@@ -46,11 +46,11 @@ func PostgreSQLParameters(ctx context.Context, inCluster *v1beta1.PostgresCluste
 	}
 }
 
-// DisableExporterInPostgreSQL disables the exporter configuration in PostgreSQL.
+// DisableMonitoringUserInPostgres disables the exporter configuration in PostgreSQL.
 // Currently the exporter is disabled by removing login permissions for the
 // monitoring user.
 // TODO: evaluate other uninstall/removal options
-func DisableExporterInPostgreSQL(ctx context.Context, exec postgres.Executor) error {
+func DisableMonitoringUserInPostgres(ctx context.Context, exec postgres.Executor) error {
 	log := logging.FromContext(ctx)
 
 	stdout, stderr, err := exec.Exec(ctx, strings.NewReader(`

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (r *Reconciler) reconcilePGMonitorExporter(ctx context.Context,`
`101`	`101`
`102`	`102`	`if !pgmonitor.ExporterEnabled(ctx, cluster) && !feature.Enabled(ctx, feature.OpenTelemetryMetrics) {`
`103`	`103`	`action = func(ctx context.Context, exec postgres.Executor) error {`
`104`		`- return pgmonitor.DisableExporterInPostgreSQL(ctx, exec)`
	`104`	`+ return pgmonitor.DisableMonitoringUserInPostgres(ctx, exec)`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,11 @@ func PostgreSQLParameters(ctx context.Context, inCluster *v1beta1.PostgresCluste`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-// DisableExporterInPostgreSQL disables the exporter configuration in PostgreSQL.`
	`49`	`+// DisableMonitoringUserInPostgres disables the exporter configuration in PostgreSQL.`
`50`	`50`	`// Currently the exporter is disabled by removing login permissions for the`
`51`	`51`	`// monitoring user.`
`52`	`52`	`// TODO: evaluate other uninstall/removal options`
`53`		`-func DisableExporterInPostgreSQL(ctx context.Context, exec postgres.Executor) error {`
	`53`	`+func DisableMonitoringUserInPostgres(ctx context.Context, exec postgres.Executor) error {`
`54`	`54`	`log := logging.FromContext(ctx)`
`55`	`55`
`56`	`56`	stdout, stderr, err := exec.Exec(ctx, strings.NewReader(`