Skip to content

Commit daed573

Browse files
committed
fix: prefix issue in getSmbVolFromID
1 parent 66748bd commit daed573

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

pkg/smb/controllerserver.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,12 @@ func (d *Driver) smbVolToCSI(vol *smbVolume, parameters map[string]string) *csi.
359359
func getSmbVolFromID(id string) (*smbVolume, error) {
360360
segments := strings.Split(id, separator)
361361
if len(segments) < 2 {
362-
return nil, fmt.Errorf("Could not split %q into server and subDir", id)
362+
return nil, fmt.Errorf("could not split %q into server and subDir", id)
363+
}
364+
source := segments[0]
365+
if !strings.HasPrefix(segments[0], "//") {
366+
source = "//" + source
363367
}
364-
source := "//" + segments[0]
365368
vol := &smbVolume{
366369
id: id,
367370
sourceField: source,

pkg/smb/controllerserver_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,13 @@ func TestGetSmbVolFromID(t *testing.T) {
457457
subDir: "pvc-4729891a-f57e-4982-9c60-e9884af1be2f",
458458
expectErr: false,
459459
},
460+
{
461+
desc: "correct volume id with //",
462+
volumeID: "//smb-server.default.svc.cluster.local/share#pvc-4729891a-f57e-4982-9c60-e9884af1be2f",
463+
source: "//smb-server.default.svc.cluster.local/share",
464+
subDir: "pvc-4729891a-f57e-4982-9c60-e9884af1be2f",
465+
expectErr: false,
466+
},
460467
{
461468
desc: "correct volume id with empty uuid",
462469
volumeID: "smb-server.default.svc.cluster.local/share#pvc-4729891a-f57e-4982-9c60-e9884af1be2f#",

0 commit comments

Comments
 (0)