feat: Mount existing bucket and access the data already in the bucket #…

…55
ctrox · Dec 7, 2021 · 8d8b4a3 · 8d8b4a3
1 parent 0433ead
commit 8d8b4a3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/pkg/driver/controllerserver.go b/pkg/driver/controllerserver.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"path"
+	"strconv"
 	"strings"
 
 	"github.com/ctrox/csi-s3/pkg/mounter"
@@ -50,6 +51,8 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	volumeID := sanitizeVolumeID(req.GetName())
 	bucketName := volumeID
 	prefix := ""
+	usePrefix := params[mounter.UsePrefix]
+	defaultFsPath := defaultFsPath
 
 	// check if bucket name is overridden
 	if nameOverride, ok := params[mounter.BucketKey]; ok {
@@ -58,6 +61,16 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 		volumeID = path.Join(bucketName, prefix)
 	}
 
+	// check if volume prefix is overridden
+	if overridePrefix, err := strconv.ParseBool(usePrefix); err == nil && overridePrefix {
+		prefix = ""
+		defaultFsPath = ""
+		if prefixOverride, ok := params[mounter.VolumePrefix]; ok && prefixOverride != "" {
+			prefix = prefixOverride
+		}
+		volumeID = path.Join(bucketName, prefix)
+	}
+
 	if err := cs.Driver.ValidateControllerServiceRequest(csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME); err != nil {
 		glog.V(3).Infof("invalid create volume req: %v", req)
 		return nil, err
@@ -75,6 +88,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 
 	meta := &s3.FSMeta{
 		BucketName:    bucketName,
+		UsePrefix:     usePrefix,
 		Prefix:        prefix,
 		Mounter:       mounterType,
 		CapacityBytes: capacityBytes,
@@ -108,7 +122,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 		}
 	}
 
-	if err = client.CreatePrefix(bucketName, path.Join(prefix, defaultFsPath)); err != nil {
+	if err = client.CreatePrefix(bucketName, path.Join(prefix, defaultFsPath)); err != nil && prefix != "" {
 		return nil, fmt.Errorf("failed to create prefix %s: %v", path.Join(prefix, defaultFsPath), err)
 	}
 
@@ -153,7 +167,10 @@ func (cs *controllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 	}
 
 	var deleteErr error
-	if prefix == "" {
+	if usePrefix, err := strconv.ParseBool(client.GetFSMetaField(meta, mounter.UsePrefix)); err == nil && usePrefix {
+		// UsePrefix is true, we do not delete anything
+		glog.V(4).Infof("Nothing to remove for %s", bucketName)
+	} else if prefix == "" {
 		// prefix is empty, we delete the whole bucket
 		if err := client.RemoveBucket(bucketName); err != nil {
 			deleteErr = err

diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go
@@ -33,7 +33,7 @@ type driver struct {
 }
 
 var (
-	vendorVersion = "v1.2.0-rc.1"
+	vendorVersion = "v1.2.0-rc.2"
 	driverName    = "ch.ctrox.csi.s3-driver"
 )
 

diff --git a/pkg/mounter/mounter.go b/pkg/mounter/mounter.go
@@ -31,6 +31,8 @@ const (
 	rcloneMounterType   = "rclone"
 	TypeKey             = "mounter"
 	BucketKey           = "bucket"
+	VolumePrefix        = "prefix"
+	UsePrefix           = "usePrefix"
 )
 
 // New returns a new mounter depending on the mounterType parameter

diff --git a/pkg/s3/client.go b/pkg/s3/client.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"net/url"
 	"path"
+	"reflect"
 
 	"github.com/golang/glog"
 	"github.com/minio/minio-go/v7"
@@ -36,6 +37,7 @@ type Config struct {
 type FSMeta struct {
 	BucketName    string `json:"Name"`
 	Prefix        string `json:"Prefix"`
+	UsePrefix     string `json:"UsePrefix"`
 	Mounter       string `json:"Mounter"`
 	FSPath        string `json:"FSPath"`
 	CapacityBytes int64  `json:"CapacityBytes"`
@@ -250,3 +252,9 @@ func (client *s3Client) GetFSMeta(bucketName, prefix string) (*FSMeta, error) {
 	err = json.Unmarshal(b, &meta)
 	return &meta, err
 }
+
+func (client *s3Client) GetFSMetaField(meta *FSMeta, field string) string {
+	r := reflect.ValueOf(meta)
+	f := reflect.Indirect(r).FieldByName(field)
+	return f.String()
+}