Adding support for metadata keys deletion

e2e/volume_ops_test.go

@@ -413,10 +413,21 @@ func testDisperse(t *testing.T) {
 }
 
 func validateVolumeEdit(volinfo api.VolumeGetResp, editMetadataReq api.VolEditReq, resp api.VolumeEditResp) error {
-	for key, value := range editMetadataReq.Metadata {
-		if volinfo.Metadata[key] != value || resp.Metadata[key] != value {
-			err := errors.New("invalid response")
-			return err
+	if editMetadataReq.MetadataDel {
+		for key := range editMetadataReq.Metadata {
+			_, existinVolinfo := volinfo.Metadata[key]
+			_, existinResp := resp.Metadata[key]
+			if existinVolinfo || existinResp {
+				err := errors.New("invalid response")
+				return err
+			}
+		}
+	} else {
+		for key, value := range editMetadataReq.Metadata {
+			if volinfo.Metadata[key] != value || resp.Metadata[key] != value {
+				err := errors.New("invalid response")
+				return err
+			}
 		}
 	}
 	return nil
@@ -428,6 +439,7 @@ func testEditVolume(t *testing.T) {
 		Metadata: map[string]string{
 			"owner": "gd2tests",
 		},
+		MetadataDel: false,
 	}
 	resp, err := client.EditVolume(volname, editMetadataReq)
 	r.Nil(err)
@@ -440,11 +452,26 @@ func testEditVolume(t *testing.T) {
 			"owner": "gd2functests",
 			"year":  "2018",
 		},
+		MetadataDel: false,
+	}
+	resp, err = client.EditVolume(volname, editMetadataReq)
+	r.Nil(err)
+	volinfo, err = client.Volumes(volname)
+	r.Nil(err)
+	err = validateVolumeEdit(volinfo[0], editMetadataReq, resp)
+	r.Nil(err)
+	editMetadataReq = api.VolEditReq{
+		Metadata: map[string]string{
+			"owner": "gd2functests",
+			"year":  "",
+		},
+		MetadataDel: true,
 	}
 	resp, err = client.EditVolume(volname, editMetadataReq)
 	r.Nil(err)
 	volinfo, err = client.Volumes(volname)
 	r.Nil(err)
 	err = validateVolumeEdit(volinfo[0], editMetadataReq, resp)
 	r.Nil(err)
+
 }

glusterd2/commands/volumes/volume-edit.go

@@ -57,7 +57,11 @@ func volumeEditHandler(w http.ResponseWriter, r *http.Request) {
 			restutils.SendHTTPError(ctx, w, http.StatusBadRequest, "Key names starting with '_' are restricted in metadata field")
 			return
 		}
-		volinfo.Metadata[key] = value
+		if req.MetadataDel {
+			delete(volinfo.Metadata, key)
+		} else {
+			volinfo.Metadata[key] = value
+		}
 	}
 	if err := volume.AddOrUpdateVolumeFunc(volinfo); err != nil {
 		logger.WithError(err).WithField(

pkg/api/volume_req.go

@@ -85,5 +85,6 @@ type VolStatedumpReq struct {
 
 // VolEditReq represents a volume metadata edit request
 type VolEditReq struct {
-	Metadata map[string]string `json:"metadata"`
+	Metadata    map[string]string `json:"metadata"`
+	MetadataDel bool              `json:"metadatadel"`
 }