Fix tests

nginx · Jan 16, 2025 · 2d24fff · 2d24fff
1 parent 5424b1e
commit 2d24fff
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/api/grpc/mpi/v1/command.pb.go b/api/grpc/mpi/v1/command.pb.go
diff --git a/api/grpc/mpi/v1/common.pb.go b/api/grpc/mpi/v1/common.pb.go
diff --git a/api/grpc/mpi/v1/files.pb.go b/api/grpc/mpi/v1/files.pb.go
diff --git a/internal/command/command_plugin.go b/internal/command/command_plugin.go
@@ -58,8 +58,6 @@ func (cp *CommandPlugin) Init(ctx context.Context, messagePipe bus.MessagePipeIn
 	cp.messagePipe = messagePipe
 	cp.commandService = NewCommandService(ctx, cp.conn.CommandServiceClient(), cp.config, cp.subscribeChannel)
 
-	go cp.monitorSubscribeChannel(ctx)
-
 	return nil
 }
 
@@ -113,6 +111,8 @@ func (cp *CommandPlugin) createConnection(ctx context.Context, resource *mpi.Res
 			Data:  createConnectionResponse,
 		})
 	}
+
+	go cp.monitorSubscribeChannel(ctx)
 }
 
 func (cp *CommandPlugin) processDataPlaneHealth(ctx context.Context, msg *bus.Message) {

diff --git a/internal/command/command_service_test.go b/internal/command/command_service_test.go
@@ -56,7 +56,8 @@ func (*FakeConfigApplySubscribeClient) Send(*mpi.DataPlaneResponse) error {
 
 // nolint: nilnil
 func (*FakeConfigApplySubscribeClient) Recv() (*mpi.ManagementPlaneRequest, error) {
-	protos.CreateManagementPlaneRequest()
+	nginxInstance := protos.GetNginxOssInstance([]string{})
+
 	return &mpi.ManagementPlaneRequest{
 		MessageMeta: &mpi.MessageMeta{
 			MessageId:     "1",
@@ -67,7 +68,7 @@ func (*FakeConfigApplySubscribeClient) Recv() (*mpi.ManagementPlaneRequest, erro
 			ConfigApplyRequest: &mpi.ConfigApplyRequest{
 				Overview: &mpi.FileOverview{
 					ConfigVersion: &mpi.ConfigVersion{
-						InstanceId: "12314",
+						InstanceId: nginxInstance.GetInstanceMeta().GetInstanceId(),
 						Version:    "4215432",
 					},
 				},
@@ -113,6 +114,9 @@ func TestCommandService_receiveCallback_configApplyRequest(t *testing.T) {
 		subscribeChannel,
 	)
 
+	nginxInstance := protos.GetNginxOssInstance([]string{})
+	commandService.instances = append(commandService.instances, nginxInstance)
+
 	defer commandService.CancelSubscription(ctx)
 
 	var wg sync.WaitGroup