From 8db620448c34660469b13aa51fff074dcc0a0452 Mon Sep 17 00:00:00 2001 From: Jiri Ctvrtka Date: Wed, 28 Jul 2021 13:43:16 +0200 Subject: [PATCH 1/5] PMM-8459 Changes. --- go.mod | 2 +- go.sum | 2 ++ server/settings_test.go | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 54b1e12a..797eb602 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-openapi/runtime v0.19.20 github.com/go-openapi/spec v0.19.9 // indirect github.com/percona-platform/saas v0.0.0-20210122115803-1b32ca1828e1 - github.com/percona/pmm v0.0.0-20210707115905-36eb37dae44c + github.com/percona/pmm v0.0.0-20210728065534-7a7bfe95ccd9 github.com/prometheus/client_golang v1.9.0 github.com/sirupsen/logrus v1.6.0 github.com/stretchr/testify v1.6.1 diff --git a/go.sum b/go.sum index 02eb9dca..b406457d 100644 --- a/go.sum +++ b/go.sum @@ -372,6 +372,8 @@ github.com/percona-platform/saas v0.0.0-20210122115803-1b32ca1828e1 h1:VyKdL2wWY github.com/percona-platform/saas v0.0.0-20210122115803-1b32ca1828e1/go.mod h1:jJRyGMxxDJaSiU7AaHNS+8j1TFQQhX6lcYp8s0t8Knc= github.com/percona/pmm v0.0.0-20210707115905-36eb37dae44c h1:6UtqOTbcZ02ekP8kIkbY2VEFR8h/j8ddby2z47dlfzw= github.com/percona/pmm v0.0.0-20210707115905-36eb37dae44c/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= diff --git a/server/settings_test.go b/server/settings_test.go index e1ee2340..08c9d27f 100644 --- a/server/settings_test.go +++ b/server/settings_test.go @@ -43,6 +43,7 @@ func TestSettings(t *testing.T) { assert.Equal(t, expectedSTTCheckIntervals, res.Payload.Settings.SttCheckIntervals) assert.Equal(t, "2592000s", res.Payload.Settings.DataRetention) assert.Equal(t, []string{"aws"}, res.Payload.Settings.AWSPartitions) + assert.False(t, res.Payload.Settings.UpdatesDisabled) assert.True(t, res.Payload.Settings.AlertingEnabled) assert.Empty(t, res.Payload.Settings.EmailAlertingSettings) assert.Empty(t, res.Payload.Settings.SlackAlertingSettings) @@ -51,6 +52,40 @@ func TestSettings(t *testing.T) { defer restoreSettingsDefaults(t) + t.Run("Updates", func(t *testing.T) { + t.Run("ValidUpdatesSettingsUpdate", func(t *testing.T) { + defer restoreSettingsDefaults(t) + res, err := serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{ + Body: server.ChangeSettingsBody{ + DisableUpdates: true, + }, + Context: pmmapitests.Context, + }) + require.NoError(t, err) + assert.True(t, res.Payload.Settings.UpdatesDisabled) + assert.Empty(t, err) + + resg, err := serverClient.Default.Server.GetSettings(nil) + require.NoError(t, err) + assert.True(t, resg.Payload.Settings.UpdatesDisabled) + assert.True(t, resg.Payload.Settings.SttEnabled) + }) + + // t.Run("InvalidBothEnableAndDisableUpdates", func(t *testing.T) { + // defer restoreSettingsDefaults(t) + + // res, err := serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{ + // Body: server.ChangeSettingsBody{ + // EnableUpdates: true, + // DisableUpdates: true, + // }, + // Context: pmmapitests.Context, + // }) + // pmmapitests.AssertAPIErrorf(t, err, 400, codes.InvalidArgument, `Both enable_stt and disable_stt are present.`) + // assert.Empty(t, res) + // }) + }) + t.Run("ValidAlertingSettingsUpdate", func(t *testing.T) { defer restoreSettingsDefaults(t) From 61367ea75253e7f6a022de4477f0d3ab5ee5db31 Mon Sep 17 00:00:00 2001 From: Jiri Ctvrtka Date: Wed, 28 Jul 2021 14:59:37 +0200 Subject: [PATCH 2/5] PMM-8459 Uncomment. --- server/settings_test.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/settings_test.go b/server/settings_test.go index 08c9d27f..1958119a 100644 --- a/server/settings_test.go +++ b/server/settings_test.go @@ -71,19 +71,19 @@ func TestSettings(t *testing.T) { assert.True(t, resg.Payload.Settings.SttEnabled) }) - // t.Run("InvalidBothEnableAndDisableUpdates", func(t *testing.T) { - // defer restoreSettingsDefaults(t) - - // res, err := serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{ - // Body: server.ChangeSettingsBody{ - // EnableUpdates: true, - // DisableUpdates: true, - // }, - // Context: pmmapitests.Context, - // }) - // pmmapitests.AssertAPIErrorf(t, err, 400, codes.InvalidArgument, `Both enable_stt and disable_stt are present.`) - // assert.Empty(t, res) - // }) + t.Run("InvalidBothEnableAndDisableUpdates", func(t *testing.T) { + defer restoreSettingsDefaults(t) + + res, err := serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{ + Body: server.ChangeSettingsBody{ + EnableUpdates: true, + DisableUpdates: true, + }, + Context: pmmapitests.Context, + }) + pmmapitests.AssertAPIErrorf(t, err, 400, codes.InvalidArgument, `Both enable_stt and disable_stt are present.`) + assert.Empty(t, res) + }) }) t.Run("ValidAlertingSettingsUpdate", func(t *testing.T) { From a6ab687eb998a737044fe0f257a96e54fdd11172 Mon Sep 17 00:00:00 2001 From: Jiri Ctvrtka Date: Thu, 29 Jul 2021 09:55:31 +0200 Subject: [PATCH 3/5] PMM-8459 Enable, disable, both. --- server/settings_test.go | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/server/settings_test.go b/server/settings_test.go index 1958119a..d2e652af 100644 --- a/server/settings_test.go +++ b/server/settings_test.go @@ -53,22 +53,35 @@ func TestSettings(t *testing.T) { defer restoreSettingsDefaults(t) t.Run("Updates", func(t *testing.T) { - t.Run("ValidUpdatesSettingsUpdate", func(t *testing.T) { + t.Run("DisableAndEnableUpdatesSettingsUpdate", func(t *testing.T) { defer restoreSettingsDefaults(t) res, err := serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{ Body: server.ChangeSettingsBody{ - DisableUpdates: true, + EnableUpdates: true, }, Context: pmmapitests.Context, }) require.NoError(t, err) - assert.True(t, res.Payload.Settings.UpdatesDisabled) + assert.False(t, res.Payload.Settings.UpdatesDisabled) assert.Empty(t, err) resg, err := serverClient.Default.Server.GetSettings(nil) require.NoError(t, err) - assert.True(t, resg.Payload.Settings.UpdatesDisabled) - assert.True(t, resg.Payload.Settings.SttEnabled) + assert.False(t, resg.Payload.Settings.UpdatesDisabled) + + res, err = serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{ + Body: server.ChangeSettingsBody{ + DisableUpdates: false, + }, + Context: pmmapitests.Context, + }) + require.NoError(t, err) + assert.False(t, res.Payload.Settings.UpdatesDisabled) + assert.Empty(t, err) + + resg, err = serverClient.Default.Server.GetSettings(nil) + require.NoError(t, err) + assert.False(t, resg.Payload.Settings.UpdatesDisabled) }) t.Run("InvalidBothEnableAndDisableUpdates", func(t *testing.T) { @@ -81,7 +94,7 @@ func TestSettings(t *testing.T) { }, Context: pmmapitests.Context, }) - pmmapitests.AssertAPIErrorf(t, err, 400, codes.InvalidArgument, `Both enable_stt and disable_stt are present.`) + pmmapitests.AssertAPIErrorf(t, err, 400, codes.InvalidArgument, `Both enable_updates and disable_updates are present.`) assert.Empty(t, res) }) }) From cb23b92dfc96318d92cd9a9a31f8f7938653d0dc Mon Sep 17 00:00:00 2001 From: Jiri Ctvrtka Date: Tue, 3 Aug 2021 10:59:04 +0200 Subject: [PATCH 4/5] PMM-8459 Mod. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 797eb602..75e77533 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-openapi/runtime v0.19.20 github.com/go-openapi/spec v0.19.9 // indirect github.com/percona-platform/saas v0.0.0-20210122115803-1b32ca1828e1 - github.com/percona/pmm v0.0.0-20210728065534-7a7bfe95ccd9 + github.com/percona/pmm v0.0.0-20210803085537-535d3c161596 github.com/prometheus/client_golang v1.9.0 github.com/sirupsen/logrus v1.6.0 github.com/stretchr/testify v1.6.1 diff --git a/go.sum b/go.sum index b406457d..a723c94b 100644 --- a/go.sum +++ b/go.sum @@ -374,6 +374,8 @@ github.com/percona/pmm v0.0.0-20210707115905-36eb37dae44c h1:6UtqOTbcZ02ekP8kIkb github.com/percona/pmm v0.0.0-20210707115905-36eb37dae44c/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/pmm v0.0.0-20210803085537-535d3c161596 h1:rDBLX1MT60vJMsOC7okzhCNYzs/5fxDvPrPWbV8JCPw= +github.com/percona/pmm v0.0.0-20210803085537-535d3c161596/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= From 88fd1db50c83cf94e50f5c2d53c6cc3210afa17c Mon Sep 17 00:00:00 2001 From: Jiri Ctvrtka Date: Thu, 5 Aug 2021 08:58:26 +0200 Subject: [PATCH 5/5] PMM-8459 Required changes. --- server/settings_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/settings_test.go b/server/settings_test.go index d2e652af..ae337255 100644 --- a/server/settings_test.go +++ b/server/settings_test.go @@ -57,7 +57,7 @@ func TestSettings(t *testing.T) { defer restoreSettingsDefaults(t) res, err := serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{ Body: server.ChangeSettingsBody{ - EnableUpdates: true, + DisableUpdates: true, }, Context: pmmapitests.Context, }) @@ -71,7 +71,7 @@ func TestSettings(t *testing.T) { res, err = serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{ Body: server.ChangeSettingsBody{ - DisableUpdates: false, + EnableUpdates: true, }, Context: pmmapitests.Context, })