tag v0.155.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.155.0 ---------------- * Fedora 43: add shadow-utils when LockRoot is enabled, update cloud-init service name (osbuild/images#1618) * Author: Achilleas Koutsou, Reviewers: Gianluca Zuccarelli, Michael Vogt * Update osbuild dependency commit ID to latest (osbuild/images#1609) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * Update snapshots to 20250626 (osbuild/images#1623) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel9: xz compress azure-cvm image type [HMS-8587] (osbuild/images#1620) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: introduce new image type: Azure SAP Apps [HMS-8738] (osbuild/images#1612) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: move ansible-core to sap_extras_pkgset (osbuild/images#1624) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Tomáš Hozza * github/create-tag: allow passing the version when run manually (osbuild/images#1621) * Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza * rhel9: move image-config into pure YAML (HMS-8593) (osbuild/images#1616) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * test: split manifest checksums into separate files (osbuild/images#1625) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-06-30 --- tag v0.156.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.156.0 ---------------- * Many: delete repositories for EOL distributions (HMS-7044) (osbuild/images#1607) * Author: Tomáš Hozza, Reviewers: Michael Vogt, Simon de Vlieger * RHSM/facts: add 'image-builder CLI' API type (osbuild/images#1640) * Author: Tomáš Hozza, Reviewers: Brian C. Lane, Simon de Vlieger * Update dependencies 2025-06-29 (osbuild/images#1628) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * Update osbuild dependency commit ID to latest (osbuild/images#1627) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * [RFC] image: drop `InstallWeakDeps` from image.DiskImage (osbuild/images#1642) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger, Tomáš Hozza * build(deps): bump the go-deps group across 1 directory with 3 updates (osbuild/images#1632) * Author: dependabot[bot], Reviewers: SchutzBot, Tomáš Hozza * distro/rhel10: xz compress azure-cvm image type (osbuild/images#1638) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Simon de Vlieger * distro: cleanup/refactor distro/{defs,generic} (HMS-8744) (osbuild/images#1570) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: remove some hardcoded values from generic/images.go (osbuild/images#1636) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: small tweaks for the YAML based imagetypes (osbuild/images#1622) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger * fedora/wsl: packages and locale (osbuild/images#1635) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * image/many: make compression more generic (osbuild/images#1634) * Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt * manifest: handle content template name with spaces (osbuild/images#1641) * Author: Bryttanie, Reviewers: Brian C. Lane, Michael Vogt, Tomáš Hozza * many: implement gzip (osbuild/images#1633) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * rhel/azure: set GRUB_TERMINAL based on architecture [RHEL-91383] (osbuild/images#1626) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-07-07 ---
192 lines
4.9 KiB
Go
192 lines
4.9 KiB
Go
// Copyright 2015 go-swagger maintainers
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package errors
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"reflect"
|
|
"strings"
|
|
)
|
|
|
|
// DefaultHTTPCode is used when the error Code cannot be used as an HTTP code.
|
|
var DefaultHTTPCode = http.StatusUnprocessableEntity
|
|
|
|
// Error represents a error interface all swagger framework errors implement
|
|
type Error interface {
|
|
error
|
|
Code() int32
|
|
}
|
|
|
|
type apiError struct {
|
|
code int32
|
|
message string
|
|
}
|
|
|
|
func (a *apiError) Error() string {
|
|
return a.message
|
|
}
|
|
|
|
func (a *apiError) Code() int32 {
|
|
return a.code
|
|
}
|
|
|
|
// MarshalJSON implements the JSON encoding interface
|
|
func (a apiError) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(map[string]interface{}{
|
|
"code": a.code,
|
|
"message": a.message,
|
|
})
|
|
}
|
|
|
|
// New creates a new API error with a code and a message
|
|
func New(code int32, message string, args ...interface{}) Error {
|
|
if len(args) > 0 {
|
|
return &apiError{
|
|
code: code,
|
|
message: fmt.Sprintf(message, args...),
|
|
}
|
|
}
|
|
return &apiError{
|
|
code: code,
|
|
message: message,
|
|
}
|
|
}
|
|
|
|
// NotFound creates a new not found error
|
|
func NotFound(message string, args ...interface{}) Error {
|
|
if message == "" {
|
|
message = "Not found"
|
|
}
|
|
return New(http.StatusNotFound, fmt.Sprintf(message, args...))
|
|
}
|
|
|
|
// NotImplemented creates a new not implemented error
|
|
func NotImplemented(message string) Error {
|
|
return New(http.StatusNotImplemented, message)
|
|
}
|
|
|
|
// MethodNotAllowedError represents an error for when the path matches but the method doesn't
|
|
type MethodNotAllowedError struct {
|
|
code int32
|
|
Allowed []string
|
|
message string
|
|
}
|
|
|
|
func (m *MethodNotAllowedError) Error() string {
|
|
return m.message
|
|
}
|
|
|
|
// Code the error code
|
|
func (m *MethodNotAllowedError) Code() int32 {
|
|
return m.code
|
|
}
|
|
|
|
// MarshalJSON implements the JSON encoding interface
|
|
func (m MethodNotAllowedError) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(map[string]interface{}{
|
|
"code": m.code,
|
|
"message": m.message,
|
|
"allowed": m.Allowed,
|
|
})
|
|
}
|
|
|
|
func errorAsJSON(err Error) []byte {
|
|
//nolint:errchkjson
|
|
b, _ := json.Marshal(struct {
|
|
Code int32 `json:"code"`
|
|
Message string `json:"message"`
|
|
}{err.Code(), err.Error()})
|
|
return b
|
|
}
|
|
|
|
func flattenComposite(errs *CompositeError) *CompositeError {
|
|
var res []error
|
|
for _, er := range errs.Errors {
|
|
switch e := er.(type) {
|
|
case *CompositeError:
|
|
if e != nil && len(e.Errors) > 0 {
|
|
flat := flattenComposite(e)
|
|
if len(flat.Errors) > 0 {
|
|
res = append(res, flat.Errors...)
|
|
}
|
|
}
|
|
default:
|
|
if e != nil {
|
|
res = append(res, e)
|
|
}
|
|
}
|
|
}
|
|
return CompositeValidationError(res...)
|
|
}
|
|
|
|
// MethodNotAllowed creates a new method not allowed error
|
|
func MethodNotAllowed(requested string, allow []string) Error {
|
|
msg := fmt.Sprintf("method %s is not allowed, but [%s] are", requested, strings.Join(allow, ","))
|
|
return &MethodNotAllowedError{
|
|
code: http.StatusMethodNotAllowed,
|
|
Allowed: allow,
|
|
message: msg,
|
|
}
|
|
}
|
|
|
|
// ServeError implements the http error handler interface
|
|
func ServeError(rw http.ResponseWriter, r *http.Request, err error) {
|
|
rw.Header().Set("Content-Type", "application/json")
|
|
switch e := err.(type) {
|
|
case *CompositeError:
|
|
er := flattenComposite(e)
|
|
// strips composite errors to first element only
|
|
if len(er.Errors) > 0 {
|
|
ServeError(rw, r, er.Errors[0])
|
|
} else {
|
|
// guard against empty CompositeError (invalid construct)
|
|
ServeError(rw, r, nil)
|
|
}
|
|
case *MethodNotAllowedError:
|
|
rw.Header().Add("Allow", strings.Join(e.Allowed, ","))
|
|
rw.WriteHeader(asHTTPCode(int(e.Code())))
|
|
if r == nil || r.Method != http.MethodHead {
|
|
_, _ = rw.Write(errorAsJSON(e))
|
|
}
|
|
case Error:
|
|
value := reflect.ValueOf(e)
|
|
if value.Kind() == reflect.Ptr && value.IsNil() {
|
|
rw.WriteHeader(http.StatusInternalServerError)
|
|
_, _ = rw.Write(errorAsJSON(New(http.StatusInternalServerError, "Unknown error")))
|
|
return
|
|
}
|
|
rw.WriteHeader(asHTTPCode(int(e.Code())))
|
|
if r == nil || r.Method != http.MethodHead {
|
|
_, _ = rw.Write(errorAsJSON(e))
|
|
}
|
|
case nil:
|
|
rw.WriteHeader(http.StatusInternalServerError)
|
|
_, _ = rw.Write(errorAsJSON(New(http.StatusInternalServerError, "Unknown error")))
|
|
default:
|
|
rw.WriteHeader(http.StatusInternalServerError)
|
|
if r == nil || r.Method != http.MethodHead {
|
|
_, _ = rw.Write(errorAsJSON(New(http.StatusInternalServerError, err.Error())))
|
|
}
|
|
}
|
|
}
|
|
|
|
func asHTTPCode(input int) int {
|
|
if input >= maximumValidHTTPCode {
|
|
return DefaultHTTPCode
|
|
}
|
|
return input
|
|
}
|