From 6a7efaf1152de6e7240581dad676ce6dab34302c Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Wed, 18 Sep 2024 12:53:02 +0000 Subject: [PATCH] PMM-7 fix supervisor_test after merging --- agent/agents/supervisor/supervisor_test.go | 5 ++--- api/buf.yaml | 8 ++++---- managed/services/agents/mongodb_test.go | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/agent/agents/supervisor/supervisor_test.go b/agent/agents/supervisor/supervisor_test.go index 9e85b92585..7d35888db6 100644 --- a/agent/agents/supervisor/supervisor_test.go +++ b/agent/agents/supervisor/supervisor_test.go @@ -77,7 +77,7 @@ func TestSupervisor(t *testing.T) { &agentv1.StateChangedRequest{AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"}) expectedList = []*agentlocal.AgentInfo{ {AgentType: type_TEST_NOOP, AgentId: "noop3", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING}, - {AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING, ListenPort: 65000, ProcessExecPath: "sleep"}, + {AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"}, } assert.Equal(t, expectedList, s.AgentsList()) @@ -116,8 +116,7 @@ func TestSupervisor(t *testing.T) { &agentv1.StateChangedRequest{AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING, ListenPort: 65000, ProcessExecPath: "sleep"}, &agentv1.StateChangedRequest{AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"}, &agentv1.StateChangedRequest{AgentId: "sleep2", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING, ListenPort: 65001, ProcessExecPath: "sleep"}, - &agentv1.StateChangedRequest{AgentId: "sleep2", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65001, ProcessExecPath: "sleep"}, - ) + &agentv1.StateChangedRequest{AgentId: "sleep2", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65001, ProcessExecPath: "sleep"}) expectedList = []*agentlocal.AgentInfo{ {AgentType: type_TEST_NOOP, AgentId: "noop3", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING}, {AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"}, diff --git a/api/buf.yaml b/api/buf.yaml index b130c4ee02..7bca40f52a 100644 --- a/api/buf.yaml +++ b/api/buf.yaml @@ -13,12 +13,12 @@ lint: - PACKAGE_NO_IMPORT_CYCLE ignore_only: PACKAGE_VERSION_SUFFIX: - - api/common/common.proto - - api/common/metrics_resolutions.proto + - common/common.proto + - common/metrics_resolutions.proto RPC_REQUEST_STANDARD_NAME: - - api/agent/v1/agent.proto + - agent/v1/agent.proto RPC_RESPONSE_STANDARD_NAME: - - api/agent/v1/agent.proto + - agent/v1/agent.proto disallow_comment_ignores: true breaking: use: diff --git a/managed/services/agents/mongodb_test.go b/managed/services/agents/mongodb_test.go index 4e1bbc1fe2..c0357e7464 100644 --- a/managed/services/agents/mongodb_test.go +++ b/managed/services/agents/mongodb_test.go @@ -433,8 +433,8 @@ func TestMongodbExporterConfig2430(t *testing.T) { AgentPassword: pointer.ToString("agent-password"), } actual, err := mongodbExporterConfig(node, mongodb, exporter, redactSecrets, pmmAgentVersion) - expected := &agentpb.SetStateRequest_AgentProcess{ - Type: inventorypb.AgentType_MONGODB_EXPORTER, + expected := &agentv1.SetStateRequest_AgentProcess{ + Type: inventoryv1.AgentType_AGENT_TYPE_MONGODB_EXPORTER, TemplateLeftDelim: "{{", TemplateRightDelim: "}}", Args: []string{