feat: some refactoring after comments

README.md

@@ -118,11 +118,12 @@ reclaimPolicy: Retain
 parameters:
   mounter: rclone
   bucket: some-existing-bucket-name
-  # 'usePrefix' must be true in order to enable the prefix feature and to avoid the removal of the bucket
+  # 'usePrefix' must be true in order to enable the prefix feature and to avoid the removal of the prefix or bucket
   usePrefix: "true"
   # 'prefix' can be empty (it will mount on the root of the bucket), an existing prefix or a new one.
   prefix: custom-prefix
 ```
+**Note:** all volumes created with this `StorageClass` will always be mounted to the same bucket and path, meaning they will be identical.
 
 ### Mounter
 

pkg/driver/controllerserver.go

@@ -51,7 +51,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	volumeID := sanitizeVolumeID(req.GetName())
 	bucketName := volumeID
 	prefix := ""
-	usePrefix := params[mounter.UsePrefix]
+	usePrefix, usePrefixError := strconv.ParseBool(params[mounter.UsePrefix])
 	defaultFsPath := defaultFsPath
 
 	// check if bucket name is overridden
@@ -62,7 +62,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	}
 
 	// check if volume prefix is overridden
-	if overridePrefix, err := strconv.ParseBool(usePrefix); err == nil && overridePrefix {
+	if overridePrefix := usePrefix; usePrefixError == nil && overridePrefix {
 		prefix = ""
 		defaultFsPath = ""
 		if prefixOverride, ok := params[mounter.VolumePrefix]; ok && prefixOverride != "" {
@@ -167,9 +167,10 @@ func (cs *controllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 	}
 
 	var deleteErr error
-	if usePrefix, err := strconv.ParseBool(client.GetFSMetaField(meta, mounter.UsePrefix)); err == nil && usePrefix {
+	if meta.UsePrefix {
 		// UsePrefix is true, we do not delete anything
 		glog.V(4).Infof("Nothing to remove for %s", bucketName)
+		return &csi.DeleteVolumeResponse{}, nil
 	} else if prefix == "" {
 		// prefix is empty, we delete the whole bucket
 		if err := client.RemoveBucket(bucketName); err != nil {

pkg/s3/client.go

@@ -5,14 +5,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
-	"net/url"
-	"path"
-	"reflect"
-
 	"github.com/golang/glog"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
+	"io"
+	"net/url"
+	"path"
 )
 
 const (
@@ -37,7 +35,7 @@ type Config struct {
 type FSMeta struct {
 	BucketName    string `json:"Name"`
 	Prefix        string `json:"Prefix"`
-	UsePrefix     string `json:"UsePrefix"`
+	UsePrefix     bool   `json:"UsePrefix"`
 	Mounter       string `json:"Mounter"`
 	FSPath        string `json:"FSPath"`
 	CapacityBytes int64  `json:"CapacityBytes"`
@@ -252,9 +250,3 @@ 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()
-}