kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

client_csi: Validate Access/Attachment modes

Browse Source
This commit is contained in:
Danielle Lancashire
2019-12-17 12:38:07 +01:00
committed by Tim Gross
parent 19d06d5bb2
commit a7f7114590
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/client_csi_endpoint.go
View File

@@ -3,6 +3,7 @@ package client
import (
"context"
"errors"
"fmt"
"time"
metrics "github.com/armon/go-metrics"
@@ -38,11 +39,16 @@ var (
// In the future this may be expanded to request dynamic secrets for attachement.
func (c *ClientCSI) CSIControllerAttachVolume(req *structs.ClientCSIControllerAttachVolumeRequest, resp *structs.ClientCSIControllerAttachVolumeResponse) error {
defer metrics.MeasureSince([]string{"client", "csi_controller", "publish_volume"}, time.Now())
client, err := c.findControllerPlugin(req.PluginName)
plugin, err := c.findControllerPlugin(req.PluginName)
if err != nil {
return err
}
defer client.Close()
defer plugin.Close()
// The following block of validation checks should not be reached on a
// real Nomad cluster as all of this data should be validated when registering
// volumes with the cluster. They serve as a defensive check before forwarding
// requests to plugins, and to aid with development.
if req.VolumeID == "" {
return errors.New("VolumeID is required")
@@ -52,9 +58,18 @@ func (c *ClientCSI) CSIControllerAttachVolume(req *structs.ClientCSIControllerAt
return errors.New("NodeID is required")
}
if !structs.ValidCSIVolumeAccessMode(req.AccessMode) {
return fmt.Errorf("Unknown access mode: %v", req.AccessMode)
}
if !structs.ValidCSIVolumeAttachmentMode(req.AttachmentMode) {
return fmt.Errorf("Unknown attachment mode: %v", req.AttachmentMode)
}
// Submit the request for a volume to the CSI Plugin.
ctx, cancelFn := c.requestContext()
defer cancelFn()
cresp, err := client.ControllerPublishVolume(ctx, req.ToCSIRequest())
cresp, err := plugin.ControllerPublishVolume(ctx, req.ToCSIRequest())
if err != nil {
return err
}

16
client/client_csi_endpoint_test.go
View File

@@ -90,9 +90,11 @@ func TestClientCSI_CSIControllerAttachVolume(t *testing.T) {
fc.NextControllerPublishVolumeResponse = &csi.ControllerPublishVolumeResponse{}
},
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
AccessMode: structs.CSIVolumeAccessModeSingleNodeWriter,
AttachmentMode: structs.CSIVolumeAttachmentModeFilesystem,
},
ExpectedResponse: &structs.ClientCSIControllerAttachVolumeResponse{},
},
@@ -104,9 +106,11 @@ func TestClientCSI_CSIControllerAttachVolume(t *testing.T) {
}
},
Request: &structs.ClientCSIControllerAttachVolumeRequest{
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
PluginName: fakePlugin.Name,
VolumeID: "1234-4321-1234-4321",
NodeID: "abcde",
AccessMode: structs.CSIVolumeAccessModeSingleNodeWriter,
AttachmentMode: structs.CSIVolumeAttachmentModeFilesystem,
},
ExpectedResponse: &structs.ClientCSIControllerAttachVolumeResponse{
PublishContext: map[string]string{"foo": "bar"},