PMM-12807 fix dsn generation (#2784)

* PMM-12807 Autodiscovery limit shouldn't affect TLS options.

* PMM-12807 Fix code for other service types.

* Update agent_model_test.go

Author: BupycHuk

managed/models/agent_model.go

@@ -492,17 +492,15 @@ func (s *Agent) DSN(service *Service, dsnParams DSNParams, tdp *DelimiterPair) s
 		}
 		q.Set("sslmode", sslmode)
 
-		if s.PostgreSQLOptions != nil {
-			if files := s.Files(); len(files) != 0 {
-				for key := range files {
-					switch key {
-					case caFilePlaceholder:
-						q.Add("sslrootcert", tdp.Left+".TextFiles."+caFilePlaceholder+tdp.Right)
-					case certificateFilePlaceholder:
-						q.Add("sslcert", tdp.Left+".TextFiles."+certificateFilePlaceholder+tdp.Right)
-					case certificateKeyFilePlaceholder:
-						q.Add("sslkey", tdp.Left+".TextFiles."+certificateKeyFilePlaceholder+tdp.Right)
-					}
+		if files := s.Files(); len(files) != 0 {
+			for key := range files {
+				switch key {
+				case caFilePlaceholder:
+					q.Add("sslrootcert", tdp.Left+".TextFiles."+caFilePlaceholder+tdp.Right)
+				case certificateFilePlaceholder:
+					q.Add("sslcert", tdp.Left+".TextFiles."+certificateFilePlaceholder+tdp.Right)
+				case certificateKeyFilePlaceholder:
+					q.Add("sslkey", tdp.Left+".TextFiles."+certificateKeyFilePlaceholder+tdp.Right)
 				}
 			}
 		}
@@ -609,30 +607,47 @@ func (s Agent) Files() map[string]string {
 	switch s.AgentType {
 	case MySQLdExporterType, QANMySQLPerfSchemaAgentType, QANMySQLSlowlogAgentType:
 		if s.MySQLOptions != nil {
-			return map[string]string{
-				"tlsCa":   s.MySQLOptions.TLSCa,
-				"tlsCert": s.MySQLOptions.TLSCert,
-				"tlsKey":  s.MySQLOptions.TLSKey,
+			files := make(map[string]string)
+			if s.MySQLOptions.TLSCa != "" {
+				files["tlsCa"] = s.MySQLOptions.TLSCa
+			}
+			if s.MySQLOptions.TLSCert != "" {
+				files["tlsCert"] = s.MySQLOptions.TLSCert
+			}
+			if s.MySQLOptions.TLSKey != "" {
+				files["tlsKey"] = s.MySQLOptions.TLSKey
 			}
+			return files
 		}
 		return nil
 	case ProxySQLExporterType:
 		return nil
 	case QANMongoDBProfilerAgentType, MongoDBExporterType:
 		if s.MongoDBOptions != nil {
-			return map[string]string{
-				caFilePlaceholder:             s.MongoDBOptions.TLSCa,
-				certificateKeyFilePlaceholder: s.MongoDBOptions.TLSCertificateKey,
+			files := make(map[string]string)
+			if s.MongoDBOptions.TLSCa != "" {
+				files[caFilePlaceholder] = s.MongoDBOptions.TLSCa
 			}
+			if s.MongoDBOptions.TLSCertificateKey != "" {
+				files[certificateKeyFilePlaceholder] = s.MongoDBOptions.TLSCertificateKey
+			}
+			return files
 		}
 		return nil
 	case PostgresExporterType, QANPostgreSQLPgStatementsAgentType, QANPostgreSQLPgStatMonitorAgentType:
 		if s.PostgreSQLOptions != nil {
-			return map[string]string{
-				caFilePlaceholder:             s.PostgreSQLOptions.SSLCa,
-				certificateFilePlaceholder:    s.PostgreSQLOptions.SSLCert,
-				certificateKeyFilePlaceholder: s.PostgreSQLOptions.SSLKey,
+			files := make(map[string]string)
+
+			if s.PostgreSQLOptions.SSLCa != "" {
+				files[caFilePlaceholder] = s.PostgreSQLOptions.SSLCa
+			}
+			if s.PostgreSQLOptions.SSLCert != "" {
+				files[certificateFilePlaceholder] = s.PostgreSQLOptions.SSLCert
+			}
+			if s.PostgreSQLOptions.SSLKey != "" {
+				files[certificateKeyFilePlaceholder] = s.PostgreSQLOptions.SSLKey
 			}
+			return files
 		}
 		return nil
 	default:

managed/models/agent_model_test.go

@@ -257,6 +257,12 @@ func TestPostgresAgentTLS(t *testing.T) {
 			agent.TLSSkipVerify = testCase.tlsSkipVerify
 			assert.Equal(t, testCase.expected, agent.DSN(service, models.DSNParams{DialTimeout: time.Second, Database: "database"}, nil))
 		})
+		t.Run(fmt.Sprintf("AutodiscoveryLimit set TLS:%v/TLSSkipVerify:%v", testCase.tls, testCase.tlsSkipVerify), func(t *testing.T) {
+			agent.TLS = testCase.tls
+			agent.TLSSkipVerify = testCase.tlsSkipVerify
+			agent.PostgreSQLOptions = &models.PostgreSQLOptions{AutoDiscoveryLimit: 10}
+			assert.Equal(t, testCase.expected, agent.DSN(service, models.DSNParams{DialTimeout: time.Second, Database: "database"}, nil))
+		})
 	}
 }
 

version/parsed_test.go

@@ -40,6 +40,12 @@ func TestParsed(t *testing.T) {
 			}, {
 				s: "2.1.2",
 				p: &Parsed{Major: 2, Minor: 1, Patch: 2, Num: 20102},
+			}, {
+				s: "2.1.3-0",
+				p: &Parsed{Major: 2, Minor: 1, Patch: 3, Rest: "-0", Num: 20103},
+			}, {
+				s: "2.1.3-HEAD-abcd12",
+				p: &Parsed{Major: 2, Minor: 1, Patch: 3, Rest: "-HEAD-abcd12", Num: 20103},
 			}, {
 				s: "2.1.3",
 				p: &Parsed{Major: 2, Minor: 1, Patch: 3, Num: 20103},