Merge branch 'main' into PMM-12660-do-not-leak-certs-when-listing-agents

.github/workflows/dependabot.yml

@@ -21,4 +21,4 @@ jobs:
         run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -38,3 +38,6 @@ compose.yml
 
 cli-tests/node_modules/
 cli-tests/playwright-report/
+
+api-tests/pmm-api-tests-output.txt
+api-tests/pmm-api-tests-junit-report.xml

admin/commands/management/register.go

@@ -28,12 +28,16 @@ var registerResultT = commands.ParseTemplate(`
 pmm-agent registered.
 pmm-agent ID: {{ .PMMAgent.AgentID }}
 Node ID     : {{ .PMMAgent.RunsOnNodeID }}
+{{ if .Warning }}
+Warning: {{ .Warning }}
+{{- end -}}
 `)
 
 type registerResult struct {
 	GenericNode   *node.RegisterNodeOKBodyGenericNode   `json:"generic_node"`
 	ContainerNode *node.RegisterNodeOKBodyContainerNode `json:"container_node"`
 	PMMAgent      *node.RegisterNodeOKBodyPMMAgent      `json:"pmm_agent"`
+	Warning       string                                `json:"warning"`
 }
 
 func (res *registerResult) Result() {}
@@ -96,5 +100,6 @@ func (cmd *RegisterCommand) RunCmd() (commands.Result, error) {
 		GenericNode:   resp.Payload.GenericNode,
 		ContainerNode: resp.Payload.ContainerNode,
 		PMMAgent:      resp.Payload.PMMAgent,
+		Warning:       resp.Payload.Warning,
 	}, nil
 }

admin/commands/management/register_test.go

@@ -0,0 +1,67 @@
+// Copyright (C) 2023 Percona LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package management
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/percona/pmm/api/managementpb/json/client/node"
+)
+
+func TestRegisterResult(t *testing.T) {
+	tests := []struct {
+		name   string
+		result registerResult
+		want   string
+	}{
+		{
+			name: "Success",
+			result: registerResult{
+				PMMAgent: &node.RegisterNodeOKBodyPMMAgent{
+					AgentID:      "/agent_id/new_id",
+					RunsOnNodeID: "/node_id/second_id",
+				},
+				Warning: "",
+			},
+			want: `pmm-agent registered.
+pmm-agent ID: /agent_id/new_id
+Node ID     : /node_id/second_id
+`,
+		},
+		{
+			name: "With warning",
+			result: registerResult{
+				PMMAgent: &node.RegisterNodeOKBodyPMMAgent{
+					AgentID:      "/agent_id/warning",
+					RunsOnNodeID: "/node_id/warning_node",
+				},
+				Warning: "Couldn't create Admin API Key",
+			},
+			want: `pmm-agent registered.
+pmm-agent ID: /agent_id/warning
+Node ID     : /node_id/warning_node
+
+Warning: Couldn't create Admin API Key
+`,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equalf(t, tt.want, tt.result.String(), "String()")
+		})
+	}
+}

agent/agents/postgres/pgstatstatements/pgstatstatements.go

@@ -236,10 +236,9 @@ func (m *PGStatStatementsQAN) getStatStatementsExtended(
 	databases := queryDatabases(q)
 	usernames := queryUsernames(q)
 
-	rows, e := rowsByVersion(q, "WHERE queryid IS NOT NULL AND query IS NOT NULL")
-	if e != nil {
-		err = e
-		return nil, nil, err
+	rows, err := rowsByVersion(q, "WHERE queryid IS NOT NULL AND query IS NOT NULL")
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "couldn't get rows from pg_stat_statements")
 	}
 	defer rows.Close() //nolint:errcheck
 

api/managementpb/json/managementpb.json

@@ -3899,6 +3899,11 @@
                   "description": "Token represents token for vmagent auth config.",
                   "type": "string",
                   "x-order": 3
+                },
+                "warning": {
+                  "description": "Warning message.",
+                  "type": "string",
+                  "x-order": 4
                 }
               }
             }

api/managementpb/node.proto

@@ -52,6 +52,8 @@ message RegisterNodeResponse {
   inventory.PMMAgent pmm_agent = 3;
   // Token represents token for vmagent auth config.
   string token = 4;
+  // Warning message.
+  string warning = 5;
 }
 
 // Node service provides public Management API methods for Nodes.

api/swagger/swagger-dev.json

@@ -27467,6 +27467,11 @@
                   "description": "Token represents token for vmagent auth config.",
                   "type": "string",
                   "x-order": 3
+                },
+                "warning": {
+                  "description": "Warning message.",
+                  "type": "string",
+                  "x-order": 4
                 }
               }
             }

api/swagger/swagger.json

@@ -18661,6 +18661,11 @@
                   "description": "Token represents token for vmagent auth config.",
                   "type": "string",
                   "x-order": 3
+                },
+                "warning": {
+                  "description": "Warning message.",
+                  "type": "string",
+                  "x-order": 4
                 }
               }
             }

docker-compose.yml

@@ -5,6 +5,7 @@ services:
     profiles:
       - pmm
     image: ${PMM_CONTAINER:-perconalab/pmm-server:dev-container}
+    platform: linux/amd64
     # build:
     #   context: .
     #   args:

go.mod

@@ -51,7 +51,7 @@ require (
 	github.com/jhunters/bigqueue v1.2.7
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/jotaen/kong-completion v0.0.5
-	github.com/lib/pq v1.10.6
+	github.com/lib/pq v1.10.9
 	github.com/minio/minio-go/v7 v7.0.55
 	github.com/operator-framework/api v0.17.6
 	github.com/operator-framework/operator-lifecycle-manager v0.24.0

go.sum

@@ -522,8 +522,8 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
-github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

managed/models/agent_model.go

@@ -297,8 +297,15 @@ func (s *Agent) DBConfig(service *Service) *DBConfig {
 	}
 }
 
+type DSNParams struct {
+	DialTimeout time.Duration
+	Database    string
+
+	PostgreSQLSupportsSSLSNI bool
+}
+
 // DSN returns DSN string for accessing given Service with this Agent (and implicit driver).
-func (s *Agent) DSN(service *Service, dialTimeout time.Duration, database string, tdp *DelimiterPair) string { //nolint:cyclop,maintidx
+func (s *Agent) DSN(service *Service, dsnParams DSNParams, tdp *DelimiterPair) string { //nolint:cyclop,maintidx
 	host := pointer.GetString(service.Address)
 	port := pointer.GetUint16(service.Port)
 	socket := pointer.GetString(service.Socket)
@@ -320,8 +327,8 @@ func (s *Agent) DSN(service *Service, dialTimeout time.Duration, database string
 			cfg.Net = tcp
 			cfg.Addr = net.JoinHostPort(host, strconv.Itoa(int(port)))
 		}
-		cfg.Timeout = dialTimeout
-		cfg.DBName = database
+		cfg.Timeout = dsnParams.DialTimeout
+		cfg.DBName = dsnParams.Database
 		cfg.Params = make(map[string]string)
 		if s.TLS {
 			switch {
@@ -349,8 +356,8 @@ func (s *Agent) DSN(service *Service, dialTimeout time.Duration, database string
 			cfg.Net = tcp
 			cfg.Addr = net.JoinHostPort(host, strconv.Itoa(int(port)))
 		}
-		cfg.Timeout = dialTimeout
-		cfg.DBName = database
+		cfg.Timeout = dsnParams.DialTimeout
+		cfg.DBName = dsnParams.Database
 		cfg.Params = make(map[string]string)
 		if s.TLS {
 			switch {
@@ -382,8 +389,8 @@ func (s *Agent) DSN(service *Service, dialTimeout time.Duration, database string
 			cfg.Net = tcp
 			cfg.Addr = net.JoinHostPort(host, strconv.Itoa(int(port)))
 		}
-		cfg.Timeout = dialTimeout
-		cfg.DBName = database
+		cfg.Timeout = dsnParams.DialTimeout
+		cfg.DBName = dsnParams.Database
 		cfg.Params = make(map[string]string)
 		if s.TLS {
 			if s.TLSSkipVerify {
@@ -400,16 +407,16 @@ func (s *Agent) DSN(service *Service, dialTimeout time.Duration, database string
 
 	case QANMongoDBProfilerAgentType, MongoDBExporterType:
 		q := make(url.Values)
-		if dialTimeout != 0 {
-			q.Set("connectTimeoutMS", strconv.Itoa(int(dialTimeout/time.Millisecond)))
-			q.Set("serverSelectionTimeoutMS", strconv.Itoa(int(dialTimeout/time.Millisecond)))
+		if dsnParams.DialTimeout != 0 {
+			q.Set("connectTimeoutMS", strconv.Itoa(int(dsnParams.DialTimeout/time.Millisecond)))
+			q.Set("serverSelectionTimeoutMS", strconv.Itoa(int(dsnParams.DialTimeout/time.Millisecond)))
 		}
 
 		// https://docs.mongodb.com/manual/reference/connection-string/
 		// > If the connection string does not specify a database/ you must specify a slash (/)
 		// between the last host and the question mark (?) that begins the string of options.
-		path := database
-		if database == "" {
+		path := dsnParams.Database
+		if path == "" {
 			path = "/"
 		}
 
@@ -475,6 +482,9 @@ func (s *Agent) DSN(service *Service, dialTimeout time.Duration, database string
 			} else {
 				sslmode = VerifyCaSSLMode
 			}
+			if dsnParams.PostgreSQLSupportsSSLSNI {
+				q.Set("sslsni", "0")
+			}
 		}
 		q.Set("sslmode", sslmode)
 
@@ -493,11 +503,12 @@ func (s *Agent) DSN(service *Service, dialTimeout time.Duration, database string
 			}
 		}
 
-		if dialTimeout != 0 {
-			q.Set("connect_timeout", strconv.Itoa(int(dialTimeout.Seconds())))
+		if dsnParams.DialTimeout != 0 {
+			q.Set("connect_timeout", strconv.Itoa(int(dsnParams.DialTimeout.Seconds())))
 		}
 
 		address := ""
+		database := dsnParams.Database
 		if socket == "" {
 			address = net.JoinHostPort(host, strconv.Itoa(int(port)))
 		} else {