add e2e test case for labels

Author: ernestas2k

pkg/common/utils.go

@@ -161,15 +161,15 @@ func ConvertLabelsStringToMap(labels string) (map[string]string, error) {
 		return labelsMap, nil
 	}
 
-	regexKey, _ := regexp.Compile("^[a-z][-_a-z0-9]{0,62}$")
+	regexKey, _ := regexp.Compile("^\\p{Ll}[\\p{Ll}0-9_-]{0,62}$")
 	checkLabelKeyFn := func(key string) error {
 		if !regexKey.MatchString(key) {
 			return fmt.Errorf("label key %q is invalid (lowercase, digit, _ and - chars are allowed / 1-63 characters", key)
 		}
 		return nil
 	}
 
-	regexValue, _ := regexp.Compile("^[-_a-z0-9]{0,63}$")
+	regexValue, _ := regexp.Compile("^[\\p{Ll}0-9_-]{0,63}$")
 	checkLabelValueFn := func(value string) error {
 		if !regexValue.MatchString(value) {
 			return fmt.Errorf("label value %q is invalid (should start with lowercase char / lowercase, digit, _ and - chars are allowed / 0-63 characters", value)

test/e2e/tests/single_zone_e2e_test.go

@@ -292,6 +292,41 @@ var _ = Describe("GCE PD CSI Driver", func() {
 		}()
 	})
 
+	It("Should create and delete disk with labels", func() {
+		Expect(testContexts).ToNot(BeEmpty())
+		testContext := getRandomTestContext()
+
+		p, z, _ := testContext.Instance.GetIdentity()
+		client := testContext.Client
+
+		// Create Disk
+		volName := testNamePrefix + string(uuid.NewUUID())
+		params := map[string]string{
+			common.ParameterKeyLabels: "key1=value1,key2=value2",
+		}
+		volID, err := client.CreateVolume(volName, params, defaultSizeGb, nil)
+		Expect(err).To(BeNil(), "CreateVolume failed with error: %v", err)
+
+		// Validate Disk Created
+		cloudDisk, err := computeService.Disks.Get(p, z, volName).Do()
+		Expect(err).To(BeNil(), "Could not get disk from cloud directly")
+		Expect(cloudDisk.Type).To(ContainSubstring(standardDiskType))
+		Expect(cloudDisk.Status).To(Equal(readyState))
+		Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
+		Expect(cloudDisk.Labels).To(Equal(map[string]string{"key1": "value1", "key2": "value2"}))
+		Expect(cloudDisk.Name).To(Equal(volName))
+
+		defer func() {
+			// Delete Disk
+			client.DeleteVolume(volID)
+			Expect(err).To(BeNil(), "DeleteVolume failed")
+
+			// Validate Disk Deleted
+			_, err = computeService.Disks.Get(p, z, volName).Do()
+			Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected disk to not be found")
+		}()
+	})
+
 	// Test volume already exists idempotency
 
 	// Test volume with op pending

test/k8s-integration/config/sc-standard.yaml

@@ -5,4 +5,5 @@ metadata:
 provisioner: pd.csi.storage.gke.io
 parameters:
   type: pd-standard
+  labels: key1=value1,key2=value2
 volumeBindingMode: WaitForFirstConsumer