lxd: Update logic for project config patch

Signed-off-by: Mark Bolton <[email protected]>
canonical · Jul 19, 2024 · fa5eb8a · fa5eb8a
1 parent 6fcc631
commit fa5eb8a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lxd/api_project.go b/lxd/api_project.go
@@ -599,14 +599,14 @@ func projectPatch(d *Daemon, r *http.Request) response.Response {
 		req.Description = project.Description
 	}
 
-	config, err := reqRaw.GetMap("config")
-	if err != nil {
-		req.Config = project.Config
-	} else {
-		for k, v := range project.Config {
-			_, ok := config[k]
-			if !ok {
-				config[k] = v
+	// Perform config patch
+	req.Config = util.CopyConfig(project.Config)
+	patches, err := reqRaw.GetMap("config")
+	if err == nil {
+		for k, v := range patches {
+			strVal, ok := v.(string)
+			if ok {
+				req.Config[k] = strVal
 			}
 		}
 	}