chore: fix GenerateVolumeName

fix gofmt

fix go

Author: andyzhangx

go.mod

@@ -196,6 +196,7 @@ replace (
 	k8s.io/component-helpers => k8s.io/component-helpers v0.31.12
 	k8s.io/controller-manager => k8s.io/controller-manager v0.31.12
 	k8s.io/cri-api => k8s.io/cri-api v0.31.12
+	k8s.io/cri-client => k8s.io/cri-client v0.31.12
 	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.12
 	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.12
 	k8s.io/endpointslice => k8s.io/endpointslice v0.31.12

pkg/azurefile/azurefile.go

@@ -46,7 +46,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/klog/v2"
-	"k8s.io/kubernetes/pkg/volume/util"
 	mount "k8s.io/mount-utils"
 
 	csicommon "sigs.k8s.io/azurefile-csi-driver/pkg/csi-common"
@@ -657,7 +656,7 @@ func getValidFileShareName(volumeName string) string {
 		fileShareName = fileShareName[0:fileShareNameMaxLength]
 	}
 	if !checkShareNameBeginAndEnd(fileShareName) || len(fileShareName) < fileShareNameMinLength {
-		fileShareName = util.GenerateVolumeName("pvc-file", uuid.NewString(), fileShareNameMaxLength)
+		fileShareName = fileutil.GenerateVolumeName("pvc-file", uuid.NewString(), fileShareNameMaxLength)
 		klog.Warningf("the requested volume name (%q) is invalid, so it is regenerated as (%q)", volumeName, fileShareName)
 	}
 	fileShareName = strings.Replace(fileShareName, "--", "-", -1)

pkg/util/util.go

@@ -234,3 +234,19 @@ func WaitUntilTimeout(timeout time.Duration, execFunc ExecFunc, timeoutFunc Time
 		return timeoutFunc()
 	}
 }
+
+// GenerateVolumeName returns a PV name with clusterName prefix. The function
+// should be used to generate a name of GCE PD or Cinder volume. It basically
+// adds "<clusterName>-dynamic-" before the PV name, making sure the resulting
+// string fits given length and cuts "dynamic" if not.
+func GenerateVolumeName(clusterName, pvName string, maxLength int) string {
+	prefix := clusterName + "-dynamic"
+	pvLen := len(pvName)
+
+	// cut the "<clusterName>-dynamic" to fit full pvName into maxLength
+	// +1 for the '-' dash
+	if pvLen+1+len(prefix) > maxLength {
+		prefix = prefix[:maxLength-pvLen-1]
+	}
+	return prefix + "-" + pvName
+}

pkg/util/util_test.go

@@ -19,6 +19,7 @@ package util
 import (
 	"fmt"
 	"reflect"
+	"strings"
 	"testing"
 	"time"
 
@@ -404,3 +405,24 @@ func TestWaitUntilTimeout(t *testing.T) {
 		}
 	}
 }
+
+func TestGenerateVolumeName(t *testing.T) {
+	// Normal operation, no truncate
+	v1 := GenerateVolumeName("kubernetes", "pv-cinder-abcde", 255)
+	if v1 != "kubernetes-dynamic-pv-cinder-abcde" {
+		t.Errorf("Expected kubernetes-dynamic-pv-cinder-abcde, got %s", v1)
+	}
+	// Truncate trailing "6789-dynamic"
+	prefix := strings.Repeat("0123456789", 9) // 90 characters prefix + 8 chars. of "-dynamic"
+	v2 := GenerateVolumeName(prefix, "pv-cinder-abcde", 100)
+	expect := prefix[:84] + "-pv-cinder-abcde"
+	if v2 != expect {
+		t.Errorf("Expected %s, got %s", expect, v2)
+	}
+	// Truncate really long cluster name
+	prefix = strings.Repeat("0123456789", 1000) // 10000 characters prefix
+	v3 := GenerateVolumeName(prefix, "pv-cinder-abcde", 100)
+	if v3 != expect {
+		t.Errorf("Expected %s, got %s", expect, v3)
+	}
+}

vendor/modules.txt

@@ -1867,6 +1867,7 @@ sigs.k8s.io/yaml/goyaml.v2
 # k8s.io/component-helpers => k8s.io/component-helpers v0.31.12
 # k8s.io/controller-manager => k8s.io/controller-manager v0.31.12
 # k8s.io/cri-api => k8s.io/cri-api v0.31.12
+# k8s.io/cri-client => k8s.io/cri-client v0.31.12
 # k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.12
 # k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.12
 # k8s.io/endpointslice => k8s.io/endpointslice v0.31.12