Merge pull request #28 from cloudfoundry-incubator/add-volume-name-helper

Add the volume name sanitizer

Author: viovanov

pkg/names/names.go

@@ -162,6 +162,18 @@ func JobName(eJobName string) (string, error) {
 	return fmt.Sprintf("%s-%s", name, hashID), nil
 }
 
+// VolumeName generate volume name based on secret name
+func VolumeName(secretName string) string {
+	nameSlices := strings.Split(secretName, ".")
+	volName := ""
+	if len(nameSlices) > 1 {
+		volName = nameSlices[1]
+	} else {
+		volName = nameSlices[0]
+	}
+	return Sanitize(volName)
+}
+
 var podOrdinalRegex = regexp.MustCompile(`(.*)-([0-9]+)$`)
 
 // OrdinalFromPodName returns ordinal from pod name

pkg/names/names_test.go

@@ -61,6 +61,22 @@ var _ = Describe("Names", func() {
 		})
 	})
 
+	Context("VolumeName", func() {
+		tests := []test{
+			{arg1: "secret", result: "secret"},
+			{arg1: "secret.name", result: "name"},
+			{arg1: long63, result: long63},
+			{arg1: long63 + ".foo", result: "foo"},
+			{arg1: "foo." + long63, result: "a123456789012345678901234567890b123456789012345678901234567890c"},
+		}
+
+		It("produces valid k8s names", func() {
+			for _, t := range tests {
+				Expect(names.VolumeName(t.arg1)).To(Equal(t.result), fmt.Sprintf("%#v", t))
+			}
+		})
+	})
+
 	Context("SecretName", func() {
 		type test struct {
 			arg1   names.DeploymentSecretType

pkg/versionedsecretstore/versioned_secret.go

@@ -25,6 +25,7 @@ func IsVersionedSecret(secret corev1.Secret) bool {
 
 var nameRegex = regexp.MustCompile(`^\S+-v(\d+)$`)
 
+// IsVersionedSecretName returns true if name matches the name of a versioned secret
 func IsVersionedSecretName(name string) bool {
 	return len(nameRegex.FindStringSubmatch(name)) > 0
 }