PMM-8459 Ability to disable updates.

go.mod

@@ -35,7 +35,7 @@ require (
 	github.com/minio/minio-go/v7 v7.0.10
 	github.com/percona-platform/dbaas-api v0.0.0-20210726192627-670b3725d0ac
 	github.com/percona-platform/saas v0.0.0-20210628125953-5bf84e6eefa0
-	github.com/percona/pmm v0.0.0-20210727064651-c6dbbddd9850
+	github.com/percona/pmm v0.0.0-20210728065534-7a7bfe95ccd9
 	github.com/percona/promconfig v0.2.1
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0

go.sum

@@ -440,6 +440,12 @@ github.com/percona/pmm v0.0.0-20210721092629-8d0bba52fe8a h1:YpPgxdSwBeBmz35DiOL
 github.com/percona/pmm v0.0.0-20210721092629-8d0bba52fe8a/go.mod h1:Cm2JKvJMlMimtAhmF/1BUvz3qVJZ2O2zxQXRvtQh93Q=
 github.com/percona/pmm v0.0.0-20210727064651-c6dbbddd9850 h1:sV3uHzOKjZ1OgAi/6Eiq5Il9lJGNCAO4QTacPDG2h68=
 github.com/percona/pmm v0.0.0-20210727064651-c6dbbddd9850/go.mod h1:Cm2JKvJMlMimtAhmF/1BUvz3qVJZ2O2zxQXRvtQh93Q=
+github.com/percona/pmm v0.0.0-20210728063029-294734c0726e h1:p/DeRRPr1xFYZikY5c1yIc8ul0UcJjx9L2BRtxQ/vag=
+github.com/percona/pmm v0.0.0-20210728063029-294734c0726e/go.mod h1:Cm2JKvJMlMimtAhmF/1BUvz3qVJZ2O2zxQXRvtQh93Q=
+github.com/percona/pmm v0.0.0-20210728064606-5e0a50d0b1a2 h1:k0XDHyfjYQ9rfUN7tSHil3tnFg3dssy7x2El+9XkO18=
+github.com/percona/pmm v0.0.0-20210728064606-5e0a50d0b1a2/go.mod h1:Cm2JKvJMlMimtAhmF/1BUvz3qVJZ2O2zxQXRvtQh93Q=
+github.com/percona/pmm v0.0.0-20210728065534-7a7bfe95ccd9 h1:4wErKnKvoyh63li/nLld6oQ4qTqXGDg/O9Zm/Byn1NU=
+github.com/percona/pmm v0.0.0-20210728065534-7a7bfe95ccd9/go.mod h1:Cm2JKvJMlMimtAhmF/1BUvz3qVJZ2O2zxQXRvtQh93Q=
 github.com/percona/promconfig v0.2.1 h1:LBbCDSQRfy0aTHFJMgrVQIE2WvmPkMTkIoznTfBAvj8=
 github.com/percona/promconfig v0.2.1/go.mod h1:Y2uXi5QNk71+ceJHuI9poank+0S1kjxd3K105fXKVkg=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=

models/settings.go

@@ -54,6 +54,10 @@ type IntegratedAlerting struct {
 type Settings struct {
 	PMMPublicAddress string `json:"pmm_public_address"`
 
+	Updates struct {
+		Disabled bool `json:"disabled"`
+	} `json:"updates"`
+
 	Telemetry struct {
 		Disabled bool   `json:"disabled"`
 		UUID     string `json:"uuid"`

models/settings_helpers.go

@@ -48,8 +48,8 @@ func GetSettings(q reform.DBTX) (*Settings, error) {
 
 // ChangeSettingsParams contains values to change data in settings table.
 type ChangeSettingsParams struct {
-	// We don't save it to db
 	DisableUpdates bool
+	EnableUpdates  bool
 
 	DisableTelemetry bool
 	EnableTelemetry  bool
@@ -140,6 +140,12 @@ func UpdateSettings(q reform.DBTX, params *ChangeSettingsParams) (*Settings, err
 		return nil, err
 	}
 
+	if params.DisableUpdates {
+		settings.Updates.Disabled = true
+	}
+	if params.EnableUpdates {
+		settings.Updates.Disabled = false
+	}
 	if params.DisableTelemetry {
 		settings.Telemetry.Disabled = true
 		settings.Telemetry.UUID = ""
@@ -293,6 +299,9 @@ func UpdateSettings(q reform.DBTX, params *ChangeSettingsParams) (*Settings, err
 
 // ValidateSettings validates settings changes.
 func ValidateSettings(params *ChangeSettingsParams) error {
+	if params.EnableUpdates && params.DisableUpdates {
+		return fmt.Errorf("Both enable_updates and disable_updates are present.") //nolint:golint,stylecheck
+	}
 	if params.EnableTelemetry && params.DisableTelemetry {
 		return fmt.Errorf("Both enable_telemetry and disable_telemetry are present.") //nolint:golint,stylecheck
 	}
@@ -422,9 +431,8 @@ func validateSettingsConflicts(params *ChangeSettingsParams, settings *Settings)
 	if params.DisableTelemetry && !params.DisableSTT && settings.SaaS.STTEnabled {
 		return fmt.Errorf("Cannot disable telemetry while STT is enabled.") //nolint:golint,stylecheck
 	}
-
 	if params.LogOut && (params.Email != "" || params.SessionID != "") {
-		return fmt.Errorf("Cannot loguot while updating Percona Platform user data.") //nolint:golint,stylecheck
+		return fmt.Errorf("Cannot logout while updating Percona Platform user data.") //nolint:golint,stylecheck
 	}
 
 	return nil

models/settings_helpers_test.go

@@ -169,6 +169,26 @@ func TestSettings(t *testing.T) {
 			assert.EqualError(t, err, `data_retention: minimal resolution is 24h`)
 		})
 
+		t.Run("Updates validation", func(t *testing.T) {
+			ns, err := models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{
+				DisableUpdates: false,
+			})
+			assert.NoError(t, err)
+			assert.False(t, ns.Updates.Disabled)
+
+			_, err = models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{
+				EnableUpdates:  true,
+				DisableUpdates: true,
+			})
+			assert.EqualError(t, err, `Both enable_updates and disable_updates are present.`)
+
+			ns, err = models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{
+				DisableUpdates: true,
+			})
+			assert.NoError(t, err)
+			assert.True(t, ns.Updates.Disabled)
+		})
+
 		t.Run("Telemetry and STT validation", func(t *testing.T) {
 			// ensure initial default state
 			ns, err := models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{

services/server/server.go

@@ -429,7 +429,7 @@ func (s *Server) readUpdateAuthToken() (string, error) {
 // convertSettings merges database settings and settings from environment variables into API response.
 func (s *Server) convertSettings(settings *models.Settings) *serverpb.Settings {
 	res := &serverpb.Settings{
-		UpdatesDisabled:  s.envSettings.DisableUpdates,
+		UpdatesDisabled:  settings.Updates.Disabled,
 		TelemetryEnabled: !settings.Telemetry.Disabled,
 		MetricsResolutions: &serverpb.MetricsResolutions{
 			Hr: durationpb.New(settings.MetricsResolutions.HR),
@@ -522,6 +522,10 @@ func (s *Server) validateChangeSettingsRequest(ctx context.Context, req *serverp
 
 	// check request parameters compatibility with environment variables
 
+	if req.EnableUpdates && s.envSettings.DisableUpdates {
+		return status.Error(codes.FailedPrecondition, "Updates are disabled via DISABLE_UPDATES environment variable.")
+	}
+
 	// ignore req.DisableTelemetry and req.DisableStt even if they are present since that will not change anything
 	if req.EnableTelemetry && s.envSettings.DisableTelemetry {
 		return status.Error(codes.FailedPrecondition, "Telemetry is disabled via DISABLE_TELEMETRY environment variable.")
@@ -582,6 +586,8 @@ func (s *Server) ChangeSettings(ctx context.Context, req *serverpb.ChangeSetting
 		metricsRes := req.MetricsResolutions
 		sttCheckIntervals := req.SttCheckIntervals
 		settingsParams := &models.ChangeSettingsParams{
+			DisableUpdates:   req.DisableUpdates,
+			EnableUpdates:    req.EnableUpdates,
 			DisableTelemetry: req.DisableTelemetry,
 			EnableTelemetry:  req.EnableTelemetry,
 			STTCheckIntervals: models.STTCheckIntervals{

services/server/server_test.go

@@ -188,8 +188,16 @@ func TestServer(t *testing.T) {
 			RemoveAlertManagerRules: true,
 		}))
 
-		s.envSettings.DisableTelemetry = true
+		s.envSettings.DisableUpdates = true
+		expected = status.New(codes.FailedPrecondition, "Updates are disabled via DISABLE_UPDATES environment variable.")
+		tests.AssertGRPCError(t, expected, s.validateChangeSettingsRequest(ctx, &serverpb.ChangeSettingsRequest{
+			EnableUpdates: true,
+		}))
+		assert.NoError(t, s.validateChangeSettingsRequest(ctx, &serverpb.ChangeSettingsRequest{
+			DisableUpdates: true,
+		}))
 
+		s.envSettings.DisableTelemetry = true
 		expected = status.New(codes.FailedPrecondition, "Telemetry is disabled via DISABLE_TELEMETRY environment variable.")
 		tests.AssertGRPCError(t, expected, s.validateChangeSettingsRequest(ctx, &serverpb.ChangeSettingsRequest{
 			EnableTelemetry: true,