PMM-12673 Fix tests

percona · Nov 17, 2023 · 93d0648 · 93d0648
1 parent 84ab6d3
commit 93d0648
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/admin/commands/status_test.go b/admin/commands/status_test.go
@@ -35,16 +35,16 @@ func TestStatus(t *testing.T) {
 		AgentVersion:  "2.5.1",
 		Agents: []agentlocal.AgentStatus{{
 			AgentID:   "/agent_id/1afe233f-b319-4645-be6c-a1e05d4a545b",
-			AgentType: "NODE_EXPORTER",
+			AgentType: "AGENT_TYPE_NODE_EXPORTER",
 			Status:    "RUNNING",
 			Port:      3310,
 		}, {
 			AgentID:   "/agent_id/2c7c0e04-6eef-411d-bcce-51e138e771cc",
-			AgentType: "QAN_POSTGRESQL_PGSTATEMENTS_AGENT",
+			AgentType: "AGENT_TYPE_QAN_POSTGRESQL_PGSTATEMENTS_AGENT",
 			Status:    "RUNNING",
 		}, {
 			AgentID:   "/agent_id/4824ac2b-3f1f-4e9b-90d1-3f56b891bb8b",
-			AgentType: "POSTGRES_EXPORTER",
+			AgentType: "AGENT_TYPE_POSTGRES_EXPORTER",
 			Status:    "RUNNING",
 			Port:      5432,
 		}},

diff --git a/agent/agents/supervisor/supervisor_test.go b/agent/agents/supervisor/supervisor_test.go
@@ -343,12 +343,12 @@ func TestSupervisorProcessParams(t *testing.T) {
 			Path: "/path/to/mysql_exporter",
 			Args: []string{
 				"-web.listen-address=:12345",
-				"-web.ssl-cert-file=" + filepath.Join(s.cfg.Get().Paths.TempDir, "mysqld_exporter", "ID", "Cert"),
+				"-web.ssl-cert-file=" + filepath.Join(s.cfg.Get().Paths.TempDir, "agent_type_mysqld_exporter", "ID", "Cert"),
 			},
 			Env: []string{
 				"MONGODB_URI=mongodb://username:s3cur3%20p%[email protected]:12345/?connectTimeoutMS=1000&ssl=true&" +
-					"sslCaFile=" + filepath.Join(s.cfg.Get().Paths.TempDir, "mysqld_exporter", "ID", "caFilePlaceholder") +
-					"&sslCertificateKeyFile=" + filepath.Join(s.cfg.Get().Paths.TempDir, "mysqld_exporter", "ID", "certificateKeyFilePlaceholder"),
+					"sslCaFile=" + filepath.Join(s.cfg.Get().Paths.TempDir, "agent_type_mysqld_exporter", "ID", "caFilePlaceholder") +
+					"&sslCertificateKeyFile=" + filepath.Join(s.cfg.Get().Paths.TempDir, "agent_type_mysqld_exporter", "ID", "certificateKeyFilePlaceholder"),
 				"HTTP_AUTH=pmm:secret",
 				"TEST=:12345",
 			},

diff --git a/api/inventorypb/types/agent_types.go b/api/inventorypb/types/agent_types.go
@@ -20,21 +20,21 @@ import "fmt"
 
 // this list should be in sync with inventorypb/agents.pb.go.
 const (
-	AgentTypePMMAgent                        = "PMM_AGENT"
-	AgentTypeVMAgent                         = "VM_AGENT"
-	AgentTypeNodeExporter                    = "NODE_EXPORTER"
-	AgentTypeMySQLdExporter                  = "MYSQLD_EXPORTER"
-	AgentTypeMongoDBExporter                 = "MONGODB_EXPORTER"
-	AgentTypePostgresExporter                = "POSTGRES_EXPORTER"
-	AgentTypeProxySQLExporter                = "PROXYSQL_EXPORTER"
-	AgentTypeQANMySQLPerfSchemaAgent         = "QAN_MYSQL_PERFSCHEMA_AGENT"
-	AgentTypeQANMySQLSlowlogAgent            = "QAN_MYSQL_SLOWLOG_AGENT"
-	AgentTypeQANMongoDBProfilerAgent         = "QAN_MONGODB_PROFILER_AGENT"
-	AgentTypeQANPostgreSQLPgStatementsAgent  = "QAN_POSTGRESQL_PGSTATEMENTS_AGENT"
-	AgentTypeQANPostgreSQLPgStatMonitorAgent = "QAN_POSTGRESQL_PGSTATMONITOR_AGENT"
-	AgentTypeRDSExporter                     = "RDS_EXPORTER"
-	AgentTypeExternalExporter                = "EXTERNAL_EXPORTER"
-	AgentTypeAzureDatabaseExporter           = "AZURE_DATABASE_EXPORTER"
+	AgentTypePMMAgent                        = "AGENT_TYPE_PMM_AGENT"
+	AgentTypeVMAgent                         = "AGENT_TYPE_VM_AGENT"
+	AgentTypeNodeExporter                    = "AGENT_TYPE_NODE_EXPORTER"
+	AgentTypeMySQLdExporter                  = "AGENT_TYPE_MYSQLD_EXPORTER"
+	AgentTypeMongoDBExporter                 = "AGENT_TYPE_MONGODB_EXPORTER"
+	AgentTypePostgresExporter                = "AGENT_TYPE_POSTGRES_EXPORTER"
+	AgentTypeProxySQLExporter                = "AGENT_TYPE_PROXYSQL_EXPORTER"
+	AgentTypeQANMySQLPerfSchemaAgent         = "AGENT_TYPE_QAN_MYSQL_PERFSCHEMA_AGENT"
+	AgentTypeQANMySQLSlowlogAgent            = "AGENT_TYPE_QAN_MYSQL_SLOWLOG_AGENT"
+	AgentTypeQANMongoDBProfilerAgent         = "AGENT_TYPE_QAN_MONGODB_PROFILER_AGENT"
+	AgentTypeQANPostgreSQLPgStatementsAgent  = "AGENT_TYPE_QAN_POSTGRESQL_PGSTATEMENTS_AGENT"
+	AgentTypeQANPostgreSQLPgStatMonitorAgent = "AGENT_TYPE_QAN_POSTGRESQL_PGSTATMONITOR_AGENT"
+	AgentTypeRDSExporter                     = "AGENT_TYPE_RDS_EXPORTER"
+	AgentTypeExternalExporter                = "AGENT_TYPE_EXTERNAL_EXPORTER"
+	AgentTypeAzureDatabaseExporter           = "AGENT_TYPE_AZURE_DATABASE_EXPORTER"
 )
 
 var agentTypeNames = map[string]string{