pkg/util: Add endpoints to redirector

- Add UpdateEphemeralMounts and RemoveStaleVirtiofsShareMounts to redirector, proxy_test and shim_test to stay compatible with kata-agent protos Signed-off-by: stevenhorsman <[email protected]>
confidential-containers · Jun 8, 2023 · f4e4767 · f4e4767
1 parent 478f9b5
commit f4e4767
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/pkg/adaptor/proxy/proxy_test.go b/pkg/adaptor/proxy/proxy_test.go
@@ -283,6 +283,9 @@ func (m *agentMock) WaitProcess(ctx context.Context, req *pb.WaitProcessRequest)
 func (m *agentMock) UpdateContainer(ctx context.Context, req *pb.UpdateContainerRequest) (*types.Empty, error) {
 	return &types.Empty{}, nil
 }
+func (m *agentMock) UpdateEphemeralMounts(ctx context.Context, req *pb.UpdateEphemeralMountsRequest) (*types.Empty, error) {
+	return &types.Empty{}, nil
+}
 func (m *agentMock) StatsContainer(ctx context.Context, req *pb.StatsContainerRequest) (*pb.StatsContainerResponse, error) {
 	return &pb.StatsContainerResponse{}, nil
 }
@@ -367,6 +370,9 @@ func (m *agentMock) GetVolumeStats(ctx context.Context, req *pb.VolumeStatsReque
 func (m *agentMock) ResizeVolume(ctx context.Context, req *pb.ResizeVolumeRequest) (*types.Empty, error) {
 	return &types.Empty{}, nil
 }
+func (p *agentMock) RemoveStaleVirtiofsShareMounts(ctx context.Context, req *pb.RemoveStaleVirtiofsShareMountsRequest) (*types.Empty, error) {
+	return &types.Empty{}, nil
+}
 func (m *agentMock) PullImage(ctx context.Context, req *pb.PullImageRequest) (*pb.PullImageResponse, error) {
 	return &pb.PullImageResponse{}, nil
 }

diff --git a/pkg/adaptor/shim_test.go b/pkg/adaptor/shim_test.go
@@ -364,6 +364,10 @@ func (s *agentService) UpdateContainer(ctx context.Context, req *agent.UpdateCon
 	log.Printf("agent call: %T %#v", req, req)
 	return &types.Empty{}, nil
 }
+func (s *agentService) UpdateEphemeralMounts(ctx context.Context, req *agent.UpdateEphemeralMountsRequest) (*types.Empty, error) {
+	log.Printf("agent call: %T %#v", req, req)
+	return &types.Empty{}, nil
+}
 func (s *agentService) StatsContainer(ctx context.Context, req *agent.StatsContainerRequest) (*agent.StatsContainerResponse, error) {
 	log.Printf("agent call: %T %#v", req, req)
 	return &agent.StatsContainerResponse{}, nil
@@ -507,6 +511,10 @@ func (s *agentService) ResizeVolume(ctx context.Context, req *agent.ResizeVolume
 	log.Printf("agent call: %T %#v", req, req)
 	return &types.Empty{}, nil
 }
+func (s *agentService) RemoveStaleVirtiofsShareMounts(ctx context.Context, req *agent.RemoveStaleVirtiofsShareMountsRequest) (*types.Empty, error) {
+	log.Printf("agent call: %T %#v", req, req)
+	return &types.Empty{}, nil
+}
 func (s *agentService) PullImage(ctx context.Context, req *agent.PullImageRequest) (*types.Empty, error) {
 	log.Printf("agent call: PullImage %#v", req)
 	return &types.Empty{}, nil

diff --git a/pkg/util/agentproto/redirector.go b/pkg/util/agentproto/redirector.go
@@ -144,6 +144,14 @@ func (s *redirector) UpdateContainer(ctx context.Context, req *pb.UpdateContaine
 	return s.agentClient.UpdateContainer(ctx, req)
 }
 
+func (s *redirector) UpdateEphemeralMounts(ctx context.Context, req *pb.UpdateEphemeralMountsRequest) (res *types.Empty, err error) {
+
+	if err := s.Connect(ctx); err != nil {
+		return nil, err
+	}
+	return s.agentClient.UpdateEphemeralMounts(ctx, req)
+}
+
 func (s *redirector) StatsContainer(ctx context.Context, req *pb.StatsContainerRequest) (res *pb.StatsContainerResponse, err error) {
 
 	if err := s.Connect(ctx); err != nil {
@@ -168,6 +176,13 @@ func (s *redirector) ResumeContainer(ctx context.Context, req *pb.ResumeContaine
 	return s.agentClient.ResumeContainer(ctx, req)
 }
 
+func (s *redirector) RemoveStaleVirtiofsShareMounts(ctx context.Context, req *pb.RemoveStaleVirtiofsShareMountsRequest) (res *types.Empty, err error) {
+	if err := s.Connect(ctx); err != nil {
+		return nil, err
+	}
+	return s.agentClient.RemoveStaleVirtiofsShareMounts(ctx, req)
+}
+
 func (s *redirector) WriteStdin(ctx context.Context, req *pb.WriteStreamRequest) (res *pb.WriteStreamResponse, err error) {
 
 	if err := s.Connect(ctx); err != nil {