nginx · aphralG · Jul 7, 2025 · Jun 11, 2025 · Jun 12, 2025 · Jun 12, 2025
@@ -10,6 +10,8 @@ import (
 	"log/slog"
 	"sync"
 
+	"github.com/nginx/agent/v3/internal/model"
+
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	mpi "github.com/nginx/agent/v3/api/grpc/mpi/v1"
@@ -25,17 +27,6 @@ var _ bus.Plugin = (*CommandPlugin)(nil)
 
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6@v6.8.1 -generate
 //counterfeiter:generate . commandService
-type ServerType int
-
-const (
-	Command ServerType = iota
-	Auxiliary
-)
-
-var serverType = map[ServerType]string{
-	Command:   "command",
-	Auxiliary: "auxiliary",
-}
 
 type (
 	commandService interface {
@@ -55,13 +46,13 @@ type (
 		conn              grpc.GrpcConnectionInterface
 		commandService    commandService
 		subscribeChannel  chan *mpi.ManagementPlaneRequest
-		commandServerType ServerType
+		commandServerType model.ServerType
 		subscribeMutex    sync.Mutex
 	}
 )
 
 func NewCommandPlugin(agentConfig *config.Config, grpcConnection grpc.GrpcConnectionInterface,
-	commandServerType ServerType,
+	commandServerType model.ServerType,
 ) *CommandPlugin {
 	return &CommandPlugin{
 		config:            agentConfig,
@@ -256,7 +247,7 @@ func (cp *CommandPlugin) monitorSubscribeChannel(ctx context.Context) {
 				slog.InfoContext(ctx, "Received management plane config upload request")
 				cp.handleConfigUploadRequest(newCtx, message)
 			case *mpi.ManagementPlaneRequest_ConfigApplyRequest:
-				if cp.commandServerType != Command {
+				if cp.commandServerType != model.Command {
 					slog.WarnContext(newCtx, "Auxiliary command server can not perform config apply",
 						"command_server_type", cp.commandServerType.String())
 					cp.handleInvalidRequest(newCtx, message)
@@ -269,7 +260,7 @@ func (cp *CommandPlugin) monitorSubscribeChannel(ctx context.Context) {
 				slog.InfoContext(ctx, "Received management plane health request")
 				cp.handleHealthRequest(newCtx)
 			case *mpi.ManagementPlaneRequest_ActionRequest:
-				if cp.commandServerType != Command {
+				if cp.commandServerType != model.Command {
 					slog.WarnContext(newCtx, "Auxiliary command server can not perform api action",
 						"command_server_type", cp.commandServerType.String())
 					cp.handleInvalidRequest(newCtx, message)
@@ -395,7 +386,3 @@ func (cp *CommandPlugin) createDataPlaneResponse(correlationID string, status mp
 		},
 	}
 }
-
-func (s ServerType) String() string {
-	return serverType[s]
-}
diff --git a/internal/command/command_plugin_test.go b/internal/command/command_plugin_test.go
@@ -11,6 +11,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/nginx/agent/v3/internal/model"
+
 	pkg "github.com/nginx/agent/v3/pkg/config"
 	"github.com/nginx/agent/v3/pkg/id"
 
@@ -32,14 +34,14 @@ import (
 )
 
 func TestCommandPlugin_Info(t *testing.T) {
-	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, Command)
+	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, model.Command)
 	info := commandPlugin.Info()
 
 	assert.Equal(t, "command", info.Name)
 }
 
 func TestCommandPlugin_Subscriptions(t *testing.T) {
-	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, Command)
+	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, model.Command)
 	subscriptions := commandPlugin.Subscriptions()
 
 	assert.Equal(
@@ -60,7 +62,7 @@ func TestCommandPlugin_Init(t *testing.T) {
 	messagePipe := busfakes.NewFakeMessagePipe()
 	fakeCommandService := &commandfakes.FakeCommandService{}
 
-	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, Command)
+	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, model.Command)
 	err := commandPlugin.Init(ctx, messagePipe)
 	require.NoError(t, err)
 
@@ -79,7 +81,7 @@ func TestCommandPlugin_createConnection(t *testing.T) {
 	commandService.CreateConnectionReturns(&mpi.CreateConnectionResponse{}, nil)
 	messagePipe := busfakes.NewFakeMessagePipe()
 
-	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, Command)
+	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, model.Command)
 	err := commandPlugin.Init(ctx, messagePipe)
 	commandPlugin.commandService = commandService
 	require.NoError(t, err)
@@ -111,7 +113,7 @@ func TestCommandPlugin_Process(t *testing.T) {
 	messagePipe := busfakes.NewFakeMessagePipe()
 	fakeCommandService := &commandfakes.FakeCommandService{}
 
-	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, Command)
+	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, model.Command)
 	err := commandPlugin.Init(ctx, messagePipe)
 	require.NoError(t, err)
 	defer commandPlugin.Close(ctx)
@@ -219,7 +221,7 @@ func TestCommandPlugin_monitorSubscribeChannel(t *testing.T) {
 
 			agentConfig := types.AgentConfig()
 			agentConfig.Features = test.configFeatures
-			commandPlugin := NewCommandPlugin(agentConfig, &grpcfakes.FakeGrpcConnectionInterface{}, Command)
+			commandPlugin := NewCommandPlugin(agentConfig, &grpcfakes.FakeGrpcConnectionInterface{}, model.Command)
 			err := commandPlugin.Init(ctx, messagePipe)
 			require.NoError(tt, err)
 			defer commandPlugin.Close(ctx)
@@ -319,7 +321,7 @@ func TestCommandPlugin_FeatureDisabled(t *testing.T) {
 
 			agentConfig.Features = test.configFeatures
 
-			commandPlugin := NewCommandPlugin(agentConfig, &grpcfakes.FakeGrpcConnectionInterface{}, Command)
+			commandPlugin := NewCommandPlugin(agentConfig, &grpcfakes.FakeGrpcConnectionInterface{}, model.Command)
 			err := commandPlugin.Init(ctx, messagePipe)
 			commandPlugin.commandService = fakeCommandService
 			require.NoError(tt, err)
@@ -344,7 +346,7 @@ func TestMonitorSubscribeChannel(t *testing.T) {
 	logBuf := &bytes.Buffer{}
 	stub.StubLoggerWith(logBuf)
 
-	cp := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, Command)
+	cp := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, model.Command)
 	cp.subscribeCancel = cncl
 
 	message := protos.CreateManagementPlaneRequest()
@@ -383,7 +385,7 @@ func Test_createDataPlaneResponse(t *testing.T) {
 			Error:   "",
 		},
 	}
-	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, Command)
+	commandPlugin := NewCommandPlugin(types.AgentConfig(), &grpcfakes.FakeGrpcConnectionInterface{}, model.Command)
 	result := commandPlugin.createDataPlaneResponse(expected.GetMessageMeta().GetCorrelationId(),
 		expected.GetCommandResponse().GetStatus(),
 		expected.GetCommandResponse().GetMessage(), expected.GetCommandResponse().GetError())

@@ -9,8 +9,6 @@ import (
 	"context"
 	"log/slog"
 
-	"github.com/nginx/agent/v3/internal/command"
-
 	"github.com/nginx/agent/v3/pkg/files"
 	"github.com/nginx/agent/v3/pkg/id"
 
@@ -64,7 +62,7 @@ func (fp *FilePlugin) Info() *bus.Info {
 
 // nolint: cyclop, revive
 func (fp *FilePlugin) Process(ctx context.Context, msg *bus.Message) {
-	if logger.ServerType(ctx) == command.Command.String() || logger.ServerType(ctx) == "" {
+	if logger.ServerType(ctx) == model.Command.String() || logger.ServerType(ctx) == "" {
 		switch msg.Topic {
 		case bus.ConnectionResetTopic:
 			fp.handleConnectionReset(ctx, msg)

diff --git a/internal/file/read_only_plugin.go b/internal/file/read_only_plugin.go
@@ -9,8 +9,6 @@ import (
 	"context"
 	"log/slog"
 
-	"github.com/nginx/agent/v3/internal/command"
-
 	"github.com/nginx/agent/v3/pkg/id"
 
 	mpi "github.com/nginx/agent/v3/api/grpc/mpi/v1"
@@ -62,7 +60,7 @@ func (rp *ReadFilePlugin) Info() *bus.Info {
 }
 
 func (rp *ReadFilePlugin) Process(ctx context.Context, msg *bus.Message) {
-	if logger.ServerType(ctx) == command.Auxiliary.String() || logger.ServerType(ctx) == "" {
+	if logger.ServerType(ctx) == model.Auxiliary.String() || logger.ServerType(ctx) == "" {
 		switch msg.Topic {
 		case bus.ConnectionResetTopic:
 			rp.handleConnectionReset(ctx, msg)

diff --git a/internal/model/server.go b/internal/model/server.go
@@ -0,0 +1,22 @@
+// Copyright (c) F5, Inc.
+//
+// This source code is licensed under the Apache License, Version 2.0 license found in the
+// LICENSE file in the root directory of this source tree.
+
+package model
+
+type ServerType int
+
+const (
+	Command ServerType = iota
+	Auxiliary
+)
+
+var serverType = map[ServerType]string{
+	Command:   "command",
+	Auxiliary: "auxiliary",
+}
+
+func (s ServerType) String() string {
+	return serverType[s]
+}
@@ -9,6 +9,8 @@ import (
 	"context"
 	"log/slog"
 
+	"github.com/nginx/agent/v3/internal/model"
+
 	pkg "github.com/nginx/agent/v3/pkg/config"
 
 	"github.com/nginx/agent/v3/internal/collector"
@@ -47,7 +49,7 @@ func addCommandAndFilePlugins(ctx context.Context, plugins []bus.Plugin, agentCo
 		if err != nil {
 			slog.WarnContext(ctx, "Failed to create gRPC connection for command server", "error", err)
 		} else {
-			commandPlugin := command.NewCommandPlugin(agentConfig, grpcConnection, command.Command)
+			commandPlugin := command.NewCommandPlugin(agentConfig, grpcConnection, model.Command)
 			plugins = append(plugins, commandPlugin)
 			filePlugin := file.NewFilePlugin(agentConfig, grpcConnection)
 			plugins = append(plugins, filePlugin)
@@ -68,7 +70,7 @@ func addAuxiliaryCommandAndFilePlugins(ctx context.Context, plugins []bus.Plugin
 		if err != nil {
 			slog.WarnContext(ctx, "Failed to create gRPC connection for auxiliary command server", "error", err)
 		} else {
-			auxCommandPlugin := command.NewCommandPlugin(agentConfig, auxGRPCConnection, command.Auxiliary)
+			auxCommandPlugin := command.NewCommandPlugin(agentConfig, auxGRPCConnection, model.Auxiliary)
 			plugins = append(plugins, auxCommandPlugin)
 			readFilePlugin := file.NewReadFilePlugin(agentConfig, auxGRPCConnection)
 			plugins = append(plugins, readFilePlugin)