PMM-12913 fix tests

percona · Mar 22, 2024 · 19e9759 · 19e9759
1 parent b7a6094
commit 19e9759
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/managed/models/agent_helpers.go b/managed/models/agent_helpers.go
@@ -165,7 +165,7 @@ func AzureOptionsFromRequest(params AzureOptionsParams) *AzureOptions {
 }
 
 // Add a prefix since gRPC does not allow to pass an URL path segment that begins with a slash.
-// TODO: Remove these Normalize... functions once we drop prefixes in agent/service/node IDs.
+// TODO: remove these Normalize functions once we drop prefixes in agent/service/node IDs.
 
 // NormalizeAgentID adds a prefix to the agent ID if it does not already contain it.
 func NormalizeAgentID(agentID string) string {

diff --git a/managed/services/inventory/agents_test.go b/managed/services/inventory/agents_test.go
@@ -321,7 +321,7 @@ func TestAgents(t *testing.T) {
 			err := as.Remove(ctx, "/agent_id/00000000-0000-4000-8000-000000000005", true)
 			require.NoError(t, err)
 			actualAgent, err := as.Get(ctx, "/agent_id/00000000-0000-4000-8000-000000000005")
-			tests.AssertGRPCError(t, status.New(codes.NotFound, `Agent with ID "/agent_id/00000000-0000-4000-8000-000000000005" not found.`), err)
+			tests.AssertGRPCError(t, status.New(codes.NotFound, `Agent with ID /agent_id/00000000-0000-4000-8000-000000000005 not found.`), err)
 			assert.Nil(t, actualAgent)
 
 			actualAgents, err = as.List(ctx, models.AgentFilters{})
@@ -375,7 +375,7 @@ func TestAgents(t *testing.T) {
 		_, err := as.AddNodeExporter(ctx, &inventoryv1.AddNodeExporterParams{
 			PmmAgentId: "no-such-id",
 		})
-		tests.AssertGRPCError(t, status.New(codes.NotFound, `Agent with ID "no-such-id" not found.`), err)
+		tests.AssertGRPCError(t, status.New(codes.NotFound, `Agent with ID no-such-id not found.`), err)
 	})
 
 	t.Run("AddRDSExporter", func(t *testing.T) {
@@ -474,15 +474,15 @@ func TestAgents(t *testing.T) {
 			PmmAgentId: pmmAgent.GetPmmAgent().AgentId,
 			ServiceId:  "no-such-id",
 		})
-		tests.AssertGRPCError(t, status.New(codes.NotFound, `Service with ID "no-such-id" not found.`), err)
+		tests.AssertGRPCError(t, status.New(codes.NotFound, `Service with ID no-such-id not found.`), err)
 	})
 
 	t.Run("RemoveNotFound", func(t *testing.T) {
 		_, as, _, teardown, ctx, _ := setup(t)
 		t.Cleanup(func() { teardown(t) })
 
 		err := as.Remove(ctx, "no-such-id", false)
-		tests.AssertGRPCError(t, status.New(codes.NotFound, `Agent with ID "no-such-id" not found.`), err)
+		tests.AssertGRPCError(t, status.New(codes.NotFound, `Agent with ID no-such-id not found.`), err)
 	})
 
 	t.Run("PushMetricsMongodbExporter", func(t *testing.T) {

diff --git a/managed/services/inventory/services_test.go b/managed/services/inventory/services_test.go
@@ -183,13 +183,13 @@ func TestServices(t *testing.T) {
 		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Service with ID "%s" not found.`, mySQLService.ServiceId)), err)
 
 		_, err = as.Get(ctx, rdsAgent.GetRdsExporter().AgentId)
-		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID "%s" not found.`, rdsAgent.GetRdsExporter().AgentId)), err)
+		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID %s not found.`, rdsAgent.GetRdsExporter().AgentId)), err)
 
 		_, err = as.Get(ctx, mySQLAgent.GetMysqldExporter().AgentId)
-		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID "%s" not found.`, mySQLAgent.GetMysqldExporter().AgentId)), err)
+		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID %s not found.`, mySQLAgent.GetMysqldExporter().AgentId)), err)
 
 		_, err = ns.Get(ctx, &inventoryv1.GetNodeRequest{NodeId: node.NodeId})
-		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Node with ID "%s" not found.`, node.NodeId)), err)
+		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Node with ID %s not found.`, node.NodeId)), err)
 	})
 
 	t.Run("AzureServiceRemoving", func(t *testing.T) {
@@ -244,10 +244,10 @@ func TestServices(t *testing.T) {
 		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Service with ID "%s" not found.`, mySQLService.ServiceId)), err)
 
 		_, err = as.Get(ctx, azureAgent.GetAzureDatabaseExporter().AgentId)
-		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID "%s" not found.`, azureAgent.GetAzureDatabaseExporter().AgentId)), err)
+		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID %s not found.`, azureAgent.GetAzureDatabaseExporter().AgentId)), err)
 
 		_, err = as.Get(ctx, mySQLAgent.GetMysqldExporter().AgentId)
-		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID "%s" not found.`, mySQLAgent.GetMysqldExporter().AgentId)), err)
+		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID %s not found.`, mySQLAgent.GetMysqldExporter().AgentId)), err)
 
 		_, err = ns.Get(ctx, &inventoryv1.GetNodeRequest{NodeId: node.NodeId})
 		tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Node with ID "%s" not found.`, node.NodeId)), err)

diff --git a/managed/services/management/service_test.go b/managed/services/management/service_test.go
@@ -162,7 +162,7 @@ func TestServiceService(t *testing.T) {
 
 			agent, err := models.FindAgentByID(s.db.Querier, mysqldExporter.AgentID)
 			assert.Nil(t, agent)
-			tests.AssertGRPCError(t, status.New(codes.NotFound, `Agent with ID "/agent_id/00000000-0000-4000-8000-000000000007" not found.`), err)
+			tests.AssertGRPCError(t, status.New(codes.NotFound, `Agent with ID /agent_id/00000000-0000-4000-8000-000000000007 not found.`), err)
 
 			service, err = models.FindServiceByID(s.db.Querier, service.ServiceID)
 			assert.Nil(t, service)
@@ -214,10 +214,10 @@ func TestServiceService(t *testing.T) {
 			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Service with ID "%s" not found.`, service.ServiceID)), err)
 
 			_, err = models.FindAgentByID(s.db.Querier, mysqldExporter.AgentID)
-			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID "%s" not found.`, mysqldExporter.AgentID)), err)
+			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID %s not found.`, mysqldExporter.AgentID)), err)
 
 			_, err = models.FindAgentByID(s.db.Querier, rdsExporter.AgentID)
-			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID "%s" not found.`, rdsExporter.AgentID)), err)
+			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID %s not found.`, rdsExporter.AgentID)), err)
 
 			_, err = models.FindNodeByID(s.db.Querier, node.NodeID)
 			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Node with ID "%s" not found.`, node.NodeID)), err)
@@ -268,10 +268,10 @@ func TestServiceService(t *testing.T) {
 			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Service with ID "%s" not found.`, service.ServiceID)), err)
 
 			_, err = models.FindAgentByID(s.db.Querier, mysqldExporter.AgentID)
-			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID "%s" not found.`, mysqldExporter.AgentID)), err)
+			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID %s not found.`, mysqldExporter.AgentID)), err)
 
 			_, err = models.FindAgentByID(s.db.Querier, azureExporter.AgentID)
-			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID "%s" not found.`, azureExporter.AgentID)), err)
+			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Agent with ID %s not found.`, azureExporter.AgentID)), err)
 
 			_, err = models.FindNodeByID(s.db.Querier, node.NodeID)
 			tests.AssertGRPCError(t, status.New(codes.NotFound, fmt.Sprintf(`Node with ID "%s" not found.`, node.NodeID)), err)