PMM-8884 Fix for dev, rc versions.

percona · Oct 4, 2021 · ace0672 · ace0672
1 parent d93a1b1
commit ace0672
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/services/agents/agents.go b/services/agents/agents.go
@@ -31,7 +31,7 @@ const (
 	exposeSecrets
 )
 
-var pmmAgentPathsBaseSupport = version.MustParse("2.23.0")
+var pmmAgentPathsBaseSupport = version.MustParse("2.22.99")
 
 // redactWords returns words that should be redacted from given Agent logs/output.
 func redactWords(agent *models.Agent) []string {

diff --git a/services/agents/agents_test.go b/services/agents/agents_test.go
@@ -40,6 +40,9 @@ func requireNoDuplicateFlags(t *testing.T, flags []string) {
 func TestPathsBaseForDifferentVersions(t *testing.T) {
 	left := "{{"
 	right := "}}"
-	assert.Equal(t, "/usr/local/percona/pmm2", pathsBase("2.22.99", left, right))
-	assert.Equal(t, "{{ .paths_base }}", pathsBase("2.23.00", left, right))
+	assert.Equal(t, "/usr/local/percona/pmm2", pathsBase("2.22.01", left, right))
+	assert.Equal(t, "{{ .paths_base }}", pathsBase("2.23.0", left, right))
+	assert.Equal(t, "{{ .paths_base }}", pathsBase("2.23.0-3-g7aa417c", left, right))
+	assert.Equal(t, "{{ .paths_base }}", pathsBase("2.23.0-beta4", left, right))
+	assert.Equal(t, "{{ .paths_base }}", pathsBase("2.23.0-rc1", left, right))
 }