[*] deprecate IsSuperuser source option (#706)

* [*] deprecate `IsSuperuser` source option
This will be determined during runtime

* fix 'getValues' is assigned a value but never used

Author: pashagolub

internal/reaper/database.go

@@ -173,14 +173,15 @@ func GetMonitoredDatabaseSettings(ctx context.Context, md *sources.SourceConn, n
 	version(), 
 	pg_is_in_recovery(), 
 	current_database()::TEXT,
-	system_identifier
+	system_identifier,
+	current_setting('is_superuser')::bool
 FROM
 	pg_control_system()`
 
 		err := md.Conn.QueryRow(ctx, sql).
 			Scan(&dbNewSettings.Version, &dbNewSettings.VersionStr,
 				&dbNewSettings.IsInRecovery, &dbNewSettings.RealDbname,
-				&dbNewSettings.SystemIdentifier)
+				&dbNewSettings.SystemIdentifier, &dbNewSettings.IsSuperuser)
 		if err != nil {
 			if noCache {
 				return dbSettings, err
@@ -205,13 +206,6 @@ FROM
 			}
 		}
 
-		l.Debugf("[%s] determining if monitoring user is a superuser...", md.Name)
-		sqlSu := `select /* pgwatch_generated */ rolsuper from pg_roles r where rolname = session_user`
-
-		if err = md.Conn.QueryRow(ctx, sqlSu).Scan(&dbNewSettings.IsSuperuser); err != nil {
-			l.Errorf("[%s] failed to determine if monitoring user is a superuser: %v", md.Name, err)
-		}
-
 		l.Debugf("[%s] determining installed extensions info...", md.Name)
 		data, err := QueryMeasurements(ctx, md.Name, sqlExtensions)
 		if err != nil {

internal/sources/postgres.go

@@ -59,14 +59,13 @@ func (r *dbSourcesReaderWriter) updateDatabase(conn db.PgxIface, md Source) (err
 	config_standby, 
 	preset_config, 
 	preset_config_standby, 
-	is_superuser, 
 	include_pattern, 
 	exclude_pattern, 
 	custom_tags, 
 	host_config, 
 	only_if_master) 
 values 
-	($1, $2, $3, $4, $5, $6, NULLIF($7, ''), NULLIF($8, ''), $9, $10, $11, $12, $13, $14) 
+	($1, $2, $3, $4, $5, $6, NULLIF($7, ''), NULLIF($8, ''), $9, $10, $11, $12, $13) 
 on conflict (name) do update set
 	"group" = $2, 
 	dbtype = $3, 
@@ -75,16 +74,15 @@ on conflict (name) do update set
 	config_standby = $6, 
 	preset_config = NULLIF($7, ''),
 	preset_config_standby = NULLIF($8, ''), 
-	is_superuser = $9, 
-	include_pattern = $10, 
-	exclude_pattern = $11, 
-	custom_tags = $12,
-	host_config = $13, 
-	only_if_master = $14`
+	include_pattern = $9, 
+	exclude_pattern = $10, 
+	custom_tags = $11, 
+	host_config = $12,
+	only_if_master = $13`
 	_, err = conn.Exec(context.Background(), sql,
 		md.Name, md.Group, md.Kind,
 		md.ConnStr, m(md.Metrics), m(md.MetricsStandby), md.PresetMetrics, md.PresetMetricsStandby,
-		md.IsSuperuser, md.IncludePattern, md.ExcludePattern, m(md.CustomTags),
+		md.IncludePattern, md.ExcludePattern, m(md.CustomTags),
 		m(md.HostConfig), md.OnlyIfMaster)
 	return err
 }
@@ -108,7 +106,6 @@ func (r *dbSourcesReaderWriter) GetSources() (dbs Sources, err error) {
 	coalesce(config_standby, '{}'::jsonb) as config_standby,
 	coalesce(preset_config, '') as preset_config,
 	coalesce(preset_config_standby, '') as preset_config_standby,
-	is_superuser,
 	coalesce(include_pattern, '') as include_pattern, 
 	coalesce(exclude_pattern, '') as exclude_pattern,
 	coalesce(custom_tags, '{}'::jsonb) as custom_tags, 

internal/sources/postgres_test.go

@@ -43,12 +43,12 @@ func TestGetMonitoredDatabases(t *testing.T) {
 	conn.ExpectPing()
 	conn.ExpectQuery(`select \/\* pgwatch_generated \*\/`).WillReturnRows(pgxmock.NewRows([]string{
 		"name", "group", "dbtype", "connstr", "config", "config_standby", "preset_config",
-		"preset_config_standby", "is_superuser", "include_pattern", "exclude_pattern",
+		"preset_config_standby", "include_pattern", "exclude_pattern",
 		"custom_tags", "host_config", "only_if_master", "is_enabled",
 	}).AddRow(
 		"db1", "group1", sources.Kind("postgres"), "postgres://user:pass@localhost:5432/db1",
 		map[string]float64{"metric": 60}, map[string]float64{"standby_metric": 60}, "exhaustive", "exhaustive",
-		true, ".*", `\_.+`, map[string]string{"tag": "value"}, nil, true, true,
+		".*", `\_.+`, map[string]string{"tag": "value"}, nil, true, true,
 	))
 	pgrw, err := sources.NewPostgresSourcesReaderWriterConn(ctx, conn)
 	a.NoError(err)
@@ -73,12 +73,12 @@ func TestSyncFromReader(t *testing.T) {
 	conn.ExpectPing()
 	conn.ExpectQuery(`select \/\* pgwatch_generated \*\/`).WillReturnRows(pgxmock.NewRows([]string{
 		"name", "group", "dbtype", "connstr", "config", "config_standby", "preset_config",
-		"preset_config_standby", "is_superuser", "include_pattern", "exclude_pattern",
+		"preset_config_standby", "include_pattern", "exclude_pattern",
 		"custom_tags", "host_config", "only_if_master", "is_enabled",
 	}).AddRow(
 		"db1", "group1", sources.Kind("postgres"), "postgres://user:pass@localhost:5432/db1",
 		map[string]float64{"metric": 60}, map[string]float64{"standby_metric": 60}, "exhaustive", "exhaustive",
-		true, ".*", `\_.+`, map[string]string{"tag": "value"}, nil, true, true,
+		".*", `\_.+`, map[string]string{"tag": "value"}, nil, true, true,
 	))
 	pgrw, err := sources.NewPostgresSourcesReaderWriterConn(ctx, conn)
 	a.NoError(err)
@@ -118,7 +118,6 @@ func TestUpdateDatabase(t *testing.T) {
 		ConnStr:        "postgres://user:pass@localhost:5432/db1",
 		Metrics:        map[string]float64{"metric": 60},
 		MetricsStandby: map[string]float64{"standby_metric": 60},
-		IsSuperuser:    true,
 		IncludePattern: ".*",
 		ExcludePattern: `\_.+`,
 		CustomTags:     map[string]string{"tag": "value"},
@@ -128,7 +127,7 @@ func TestUpdateDatabase(t *testing.T) {
 		md.Name, md.Group, md.Kind,
 		md.ConnStr, `{"metric":60}`, `{"standby_metric":60}`,
 		md.PresetMetrics, md.PresetMetricsStandby,
-		md.IsSuperuser, md.IncludePattern, md.ExcludePattern, `{"tag":"value"}`,
+		md.IncludePattern, md.ExcludePattern, `{"tag":"value"}`,
 		nil, md.OnlyIfMaster,
 	).WillReturnResult(pgxmock.NewResult("UPDATE", 1))
 
@@ -154,7 +153,6 @@ func TestWriteMonitoredDatabases(t *testing.T) {
 		ConnStr:        "postgres://user:pass@localhost:5432/db1",
 		Metrics:        map[string]float64{"metric": 60},
 		MetricsStandby: map[string]float64{"standby_metric": 60},
-		IsSuperuser:    true,
 		IncludePattern: ".*",
 		ExcludePattern: `\_.+`,
 		CustomTags:     map[string]string{"tag": "value"},
@@ -168,7 +166,7 @@ func TestWriteMonitoredDatabases(t *testing.T) {
 		conn.ExpectExec(`insert into pgwatch\.source`).WithArgs(
 			md.Name, md.Group, md.Kind,
 			md.ConnStr, `{"metric":60}`, `{"standby_metric":60}`, md.PresetMetrics, md.PresetMetricsStandby,
-			md.IsSuperuser, md.IncludePattern, md.ExcludePattern, `{"tag":"value"}`,
+			md.IncludePattern, md.ExcludePattern, `{"tag":"value"}`,
 			nil, md.OnlyIfMaster,
 		).WillReturnResult(pgxmock.NewResult("INSERT", 1))
 		conn.ExpectCommit()
@@ -204,7 +202,7 @@ func TestWriteMonitoredDatabases(t *testing.T) {
 		conn.ExpectExec(`insert into pgwatch\.source`).WithArgs(
 			md.Name, md.Group, md.Kind,
 			md.ConnStr, `{"metric":60}`, `{"standby_metric":60}`, md.PresetMetrics, md.PresetMetricsStandby,
-			md.IsSuperuser, md.IncludePattern, md.ExcludePattern, `{"tag":"value"}`,
+			md.IncludePattern, md.ExcludePattern, `{"tag":"value"}`,
 			nil, md.OnlyIfMaster,
 		).WillReturnError(errors.New("failed insert"))
 		conn.ExpectRollback()

internal/sources/types.go

@@ -52,7 +52,6 @@ type (
 		ExcludePattern       string             `yaml:"exclude_pattern" db:"exclude_pattern"`
 		PresetMetrics        string             `yaml:"preset_metrics" db:"preset_config"`
 		PresetMetricsStandby string             `yaml:"preset_metrics_standby" db:"preset_config_standby"`
-		IsSuperuser          bool               `yaml:"is_superuser" db:"is_superuser"`
 		IsEnabled            bool               `yaml:"is_enabled" db:"is_enabled"`
 		CustomTags           map[string]string  `yaml:"custom_tags" db:"custom_tags"`
 		HostConfig           HostConfigAttrs    `yaml:"host_config" db:"host_config"`

internal/webui/embed_test.go

@@ -0,0 +1,15 @@
+package webui
+
+import (
+	"io/fs"
+	"testing"
+)
+
+func TestWebUIInit(t *testing.T) {
+	if WebUIFs == nil {
+		t.Error("WebUIFs is nil")
+	}
+	if _, err := fs.Stat(WebUIFs, "index.html"); err != nil {
+		t.Errorf("WebUIFs does not contain index.html: %v", err)
+	}
+}

internal/webui/src/containers/SourceFormDialog/SourceFormDialog.consts.ts

@@ -9,7 +9,6 @@ export const getSourceInitialValues = (data?: Source): SourceFormValues => ({
   ConnStr: data?.ConnStr ?? "",
   Kind: data?.Kind ?? "postgres",
   IsEnabled: data?.IsEnabled ?? true,
-  IsSuperuser: data?.IsSuperuser ?? false,
   Metrics: toArrayFromRecord(data?.Metrics),
   MetricsStandby: toArrayFromRecord(data?.MetricsStandby),
   PresetMetrics: data?.PresetMetrics ?? "basic",
@@ -26,7 +25,6 @@ export const createSourceRequest = (values: SourceFormValues): Source => ({
   ConnStr: values.ConnStr,
   Kind: values.Kind,
   IsEnabled: values.IsEnabled,
-  IsSuperuser: values.IsSuperuser,
   Metrics: toRecordFromArray(values.Metrics),
   MetricsStandby: toRecordFromArray(values.MetricsStandby),
   PresetMetrics: values.PresetMetrics ?? "",

internal/webui/src/containers/SourceFormDialog/components/SourceForm/SourceForm.consts.ts

@@ -31,7 +31,6 @@ export const sourceFormValuesValidationSchema = Yup.object({
   IncludePattern: Yup.string().optional().nullable(),
   ExcludePattern: Yup.string().optional().nullable(),
   IsEnabled: Yup.boolean().required(),
-  IsSuperuser: Yup.boolean().required(),
   Metrics: Yup.array().of(metricsValidationSchema).test((arr, context) => {
     if (!arr) {
       return;

internal/webui/src/containers/SourceFormDialog/components/SourceForm/SourceForm.types.ts

@@ -10,7 +10,6 @@ type SourceFormGeneral = {
   IncludePattern?: string | null;
   ExcludePattern?: string | null;
   IsEnabled: boolean;
-  IsSuperuser: boolean;
 };
 
 type SourceFormMetrics = {

internal/webui/src/containers/SourceFormDialog/components/SourceForm/components/SourceFormStepGeneral.tsx

@@ -8,7 +8,7 @@ import { SourceFormValues } from "../SourceForm.types";
 import { TestConnection } from "./TestConnection/TestConnection";
 
 export const SourceFormStepGeneral = () => {
-  const { register, formState: { errors }, control, getValues, watch } = useFormContext<SourceFormValues>();
+  const { register, formState: { errors }, control, watch } = useFormContext<SourceFormValues>();
   const { classes, cx } = useFormStyles();
 
   const kindValue = watch("Kind");
@@ -130,19 +130,6 @@ export const SourceFormStepGeneral = () => {
           />
         }
       />
-      <FormControlLabel
-        className={classes.formControlCheckbox}
-        label="Is superuser"
-        labelPlacement="start"
-        disabled
-        control={
-          <Checkbox
-            disabled
-            size="medium"
-            checked={getValues("IsSuperuser")}
-          />
-        }
-      />
     </div>
   );
 };

internal/webui/src/pages/SourcesPage/components/SourcesGrid/SourcesGrid.consts.tsx

@@ -89,14 +89,6 @@ export const useSourcesGridColumns = (): GridColDef<Source>[] => ([
     headerAlign: "center",
     hide: true,
   },
-  {
-    field: "IsSuperuser",
-    headerName: "Superuser",
-    width: 120,
-    align: "center",
-    headerAlign: "center",
-    renderCell: ({ row }) => getIcon(row.IsSuperuser),
-  },
   {
     field: "IsEnabled",
     headerName: "Enabled",