Merge pull request #344 from hantaowang/fix-key-to-volume-id-bug

fix a bug where keys are not properly translated to volume id

Author: k8s-ci-robot

pkg/common/utils.go

@@ -76,11 +76,11 @@ func VolumeIDToKey(id string) (*meta.Key, error) {
 func KeyToVolumeID(volKey *meta.Key, project string) (string, error) {
 	switch volKey.Type() {
 	case meta.Zonal:
-		return fmt.Sprintf(volIDZonalFmt, project, volKey.Zone, volKey.Zone), nil
+		return fmt.Sprintf(volIDZonalFmt, project, volKey.Zone, volKey.Name), nil
 	case meta.Regional:
-		return fmt.Sprintf(volIDZonalFmt, project, volKey.Region, volKey.Zone), nil
+		return fmt.Sprintf(volIDRegionalFmt, project, volKey.Region, volKey.Name), nil
 	default:
-		return "", fmt.Errorf("volume key %v neither zonal nor regional", volKey.Name)
+		return "", fmt.Errorf("volume key %v neither zonal nor regional", volKey.String())
 	}
 }
 

pkg/common/utils_test.go

@@ -247,3 +247,51 @@ func TestGetRegionFromZones(t *testing.T) {
 
 	}
 }
+
+func TestKeyToVolumeID(t *testing.T) {
+	testName := "test-name"
+	testZone := "test-zone"
+	testProject := "test-project"
+	testRegion := "test-region"
+
+	testCases := []struct {
+		name   string
+		key    *meta.Key
+		expID  string
+		expErr bool
+	}{
+		{
+			name:  "normal zonal",
+			key:   meta.ZonalKey(testName, testZone),
+			expID: fmt.Sprintf(volIDZoneFmt, testProject, testZone, testName),
+		},
+		{
+			name:  "normal regional",
+			key:   meta.RegionalKey(testName, testRegion),
+			expID: fmt.Sprintf(volIDRegionFmt, testProject, testRegion, testName),
+		},
+		{
+			name:   "malformed / unsupported global",
+			key:    meta.GlobalKey(testName),
+			expErr: true,
+		},
+	}
+	for _, tc := range testCases {
+		t.Logf("test case: %s", tc.name)
+		gotID, err := KeyToVolumeID(tc.key, testProject)
+		if err == nil && tc.expErr {
+			t.Errorf("Expected error but got none")
+		}
+		if err != nil {
+			if !tc.expErr {
+				t.Errorf("Did not expect error but got: %v", err)
+			}
+			continue
+		}
+
+		if !reflect.DeepEqual(gotID, tc.expID) {
+			t.Errorf("Got ID %v, but expected %v, from volume key %v", gotID, tc.expID, tc.key)
+		}
+	}
+
+}