diff --git a/common/obs_utils.go b/common/obs_utils.go index e0764bd..7707979 100644 --- a/common/obs_utils.go +++ b/common/obs_utils.go @@ -600,15 +600,16 @@ func PackageBuildStatusComp(A, B *PackageBuildStatus) int { } type BuildResult struct { + XMLName xml.Name `xml:"result"` Project string `xml:"project,attr"` Repository string `xml:"repository,attr"` Arch string `xml:"arch,attr"` Code string `xml:"code,attr"` - Dirty bool `xml:"dirty,attr"` - ScmSync string `xml:"scmsync"` - ScmInfo string `xml:"scminfo"` + Dirty bool `xml:"dirty,attr,omitempty"` + ScmSync string `xml:"scmsync,omitempty"` + ScmInfo string `xml:"scminfo,omitempty"` Status []*PackageBuildStatus `xml:"status"` - Binaries []BinaryList `xml:"binarylist"` + Binaries []BinaryList `xml:"binarylist,omitempty"` LastUpdate time.Time } @@ -635,8 +636,8 @@ type BinaryList struct { } type BuildResultList struct { - XMLName xml.Name `xml:"resultlist"` - State string `xml:"state,attr"` + XMLName xml.Name `xml:"resultlist"` + State string `xml:"state,attr"` Result []*BuildResult `xml:"result"` isLastBuild bool diff --git a/obs-status-service/main.go b/obs-status-service/main.go index 983d924..03de31f 100644 --- a/obs-status-service/main.go +++ b/obs-status-service/main.go @@ -211,7 +211,9 @@ func WriteXml(data any, res http.ResponseWriter) { res.WriteHeader(500) } else { res.Header().Add("size", fmt.Sprint(len(xmlData))) + res.Write([]byte("")) res.Write(xmlData) + res.Write([]byte("")) } }