Merge pull request #3123 from olljanat/verify-nodeid

CSI: Manager PublishVolume verify CSI node ID is not empty

manager/csi/plugin.go

@@ -6,11 +6,14 @@ import (
 	"fmt"
 
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/internal/csi/capability"
+	"github.com/moby/swarmkit/v2/log"
 )
 
 // Plugin is the interface for a CSI controller plugin.
@@ -204,6 +207,11 @@ func (p *plugin) PublishVolume(ctx context.Context, v *api.Volume, nodeID string
 	if !p.publisher {
 		return nil, nil
 	}
+	csiNodeID := p.swarmToCSI[nodeID]
+	if csiNodeID == "" {
+		log.L.Errorf("CSI node ID not found for given Swarm node ID. Plugin: %s , Swarm node ID: %s", p.name, nodeID)
+		return nil, status.Error(codes.FailedPrecondition, "CSI node ID not found for given Swarm node ID")
+	}
 
 	req := p.makeControllerPublishVolumeRequest(v, nodeID)
 	c, err := p.Client(ctx)

manager/csi/plugin_test.go

@@ -310,15 +310,15 @@ var _ = Describe("Plugin manager", func() {
 				PublishStatus: []*api.VolumePublishStatus{
 					{
 						State:  api.VolumePublishStatus_PENDING_PUBLISH,
-						NodeID: "node1",
+						NodeID: "swarmNode1",
 					},
 				},
 			}
 			plugin.AddNode("swarmNode1", "pluginNode1")
 		})
 
 		JustBeforeEach(func() {
-			publishContext, publishError = plugin.PublishVolume(context.Background(), v, "node1")
+			publishContext, publishError = plugin.PublishVolume(context.Background(), v, "swarmNode1")
 		})
 
 		It("should call the ControllerPublishVolume RPC", func() {