Merge pull request #64 from OpenCHAMI/synackd/fix-group-output

alexlovelltroy · web-flow · commit 67bd6f5e8b88 · 2025-03-15T00:02:24.000+02:00
fix(groups): return JSON when requesting specific group
diff --git a/cmd/cloud-init-server/group_handlers.go b/cmd/cloud-init-server/group_handlers.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/OpenCHAMI/cloud-init/pkg/cistore"
 	"github.com/go-chi/chi/v5"
-	yaml "gopkg.in/yaml.v2"
 )
 
 // GetGroups godoc
@@ -107,7 +106,7 @@ func (h CiHandler) GetGroupHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	bytes, err = yaml.Marshal(data)
+	bytes, err = json.Marshal(data)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/OpenCHAMI/cloud-init/pkg/cistore"`
`8`	`8`	`"github.com/go-chi/chi/v5"`
`9`		`- yaml "gopkg.in/yaml.v2"`
`10`	`9`	`)`
`11`	`10`
`12`	`11`	`// GetGroups godoc`
`@@ -107,7 +106,7 @@ func (h CiHandler) GetGroupHandler(w http.ResponseWriter, r *http.Request) {`
`107`	`106`	`return`
`108`	`107`	`}`
`109`	`108`
`110`		`- bytes, err = yaml.Marshal(data)`
	`109`	`+ bytes, err = json.Marshal(data)`
`111`	`110`	`if err != nil {`
`112`	`111`	`http.Error(w, err.Error(), http.StatusInternalServerError)`
`113`	`112`	`return`