mirror of
https://github.com/containers/skopeo.git
synced 2025-10-22 03:24:25 +00:00
eea384cdf7
In order to make sure that we don't create invalid OCI images that are consistently invalid, add additional checks to ensure that both of the generated OCI images in the round-trip test are valid according to the upstream validator. This commit vendors the following packages (deep breath): * oci/image-tools@7575a09363, which requires * oci/image-spec@v1.0.0-rc4 [revendor, but is technically an update because I couldn't figure out what version was vendored last time] * oci/runtime-spec@v1.0.0-rc4 * xeipuuv/gojsonschema@6b67b3fab7 * xeipuuv/gojsonreference@e02fc20de9 * xeipuuv/gojsonpointer@e0fe6f6830 * camlistore/go4@7ce08ca145 Signed-off-by: Aleksa Sarai <asarai@suse.de>
45 lines
1.4 KiB
Go
45 lines
1.4 KiB
Go
// Copyright 2016 The Linux Foundation
|
|
//
|
|
// 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 schema
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
|
|
"go4.org/errorutil"
|
|
)
|
|
|
|
// A SyntaxError is a description of a JSON syntax error
|
|
// including line, column and offset in the JSON file.
|
|
type SyntaxError struct {
|
|
msg string
|
|
Line, Col int
|
|
Offset int64
|
|
}
|
|
|
|
func (e *SyntaxError) Error() string { return e.msg }
|
|
|
|
// WrapSyntaxError checks whether the given error is a *json.SyntaxError
|
|
// and converts it into a *schema.SyntaxError containing line/col information using the given reader.
|
|
// If the given error is not a *json.SyntaxError it is returned unchanged.
|
|
func WrapSyntaxError(r io.Reader, err error) error {
|
|
if serr, ok := err.(*json.SyntaxError); ok {
|
|
line, col, _ := errorutil.HighlightBytePosition(r, serr.Offset)
|
|
return &SyntaxError{serr.Error(), line, col, serr.Offset}
|
|
}
|
|
|
|
return err
|
|
}
|