dominik/seaweedfs-csi-driver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Match variable names to Context instead of Parameters

Browse Source
This commit is contained in:
Daniel Santos 2021-01-27 21:12:13 -07:00
parent 7844509790
commit ca767fdce1
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/driver/mounter.go
View File

@ -20,8 +20,8 @@ type Mounter interface {
Mount(target string) error Mount(target string) error
} }
func newMounter(bucketName string, driver *SeaweedFsDriver, volParameters map[string]string) (Mounter, error) { func newMounter(bucketName string, driver *SeaweedFsDriver, volContext map[string]string) (Mounter, error) {
return newSeaweedFsMounter(bucketName, driver, volParameters) return newSeaweedFsMounter(bucketName, driver, volContext)
} }
func fuseMount(path string, command string, args []string) error { func fuseMount(path string, command string, args []string) error {

16
pkg/driver/mounter_seaweedfs.go
View File

@ -8,20 +8,20 @@ import (
// Implements Mounter // Implements Mounter
type seaweedFsMounter struct { type seaweedFsMounter struct {
bucketName string bucketName string
driver *SeaweedFsDriver driver *SeaweedFsDriver
volParameters map[string]string volContext map[string]string
} }
const ( const (
seaweedFsCmd = "weed" seaweedFsCmd = "weed"
) )
func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver, volParameters map[string]string) (Mounter, error) { func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver, volContext map[string]string) (Mounter, error) {
return &seaweedFsMounter{ return &seaweedFsMounter{
bucketName: bucketName, bucketName: bucketName,
driver: driver, driver: driver,
volParameters: volParameters, volContext: volContext,
}, nil }, nil
} }
@ -38,7 +38,7 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) error {
fmt.Sprintf("-filer.path=/buckets/%s", seaweedFs.bucketName), fmt.Sprintf("-filer.path=/buckets/%s", seaweedFs.bucketName),
} }
for arg, value := range seaweedFs.volParameters { for arg, value := range seaweedFs.volContext {
switch arg { switch arg {
case "map.uid": case "map.uid":
args = append(args, fmt.Sprintf("-map.uid=%s", value)) args = append(args, fmt.Sprintf("-map.uid=%s", value))

4
pkg/driver/nodeserver.go
View File

@ -55,9 +55,9 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
mo = append(mo, "ro") mo = append(mo, "ro")
} }
volParameters := req.GetVolumeContext() volContext := req.GetVolumeContext()
mounter, err := newMounter(volumeID, ns.Driver, volParameters) mounter, err := newMounter(volumeID, ns.Driver, volContext)
if err != nil { if err != nil {
return nil, err return nil, err
} }