mirror of
https://github.com/containers/skopeo.git
synced 2025-09-21 18:09:08 +00:00
Bump github.com/containers/storage from 1.14.0 to 1.15.1
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.14.0 to 1.15.1. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.14.0...v1.15.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
This commit is contained in:
committed by
Daniel J Walsh
parent
73248bd639
commit
04bc64f593
108
vendor/github.com/containers/storage/images_ffjson.go
generated
vendored
108
vendor/github.com/containers/storage/images_ffjson.go
generated
vendored
@@ -59,6 +59,22 @@ func (j *Image) MarshalJSONBuf(buf fflib.EncodingBuffer) error {
|
||||
}
|
||||
buf.WriteByte(',')
|
||||
}
|
||||
if len(j.NamesHistory) != 0 {
|
||||
buf.WriteString(`"names-history":`)
|
||||
if j.NamesHistory != nil {
|
||||
buf.WriteString(`[`)
|
||||
for i, v := range j.NamesHistory {
|
||||
if i != 0 {
|
||||
buf.WriteString(`,`)
|
||||
}
|
||||
fflib.WriteJsonString(buf, string(v))
|
||||
}
|
||||
buf.WriteString(`]`)
|
||||
} else {
|
||||
buf.WriteString(`null`)
|
||||
}
|
||||
buf.WriteByte(',')
|
||||
}
|
||||
if len(j.TopLayer) != 0 {
|
||||
buf.WriteString(`"layer":`)
|
||||
fflib.WriteJsonString(buf, string(j.TopLayer))
|
||||
@@ -171,6 +187,8 @@ const (
|
||||
|
||||
ffjtImageNames
|
||||
|
||||
ffjtImageNamesHistory
|
||||
|
||||
ffjtImageTopLayer
|
||||
|
||||
ffjtImageMappedTopLayers
|
||||
@@ -194,6 +212,8 @@ var ffjKeyImageDigest = []byte("digest")
|
||||
|
||||
var ffjKeyImageNames = []byte("names")
|
||||
|
||||
var ffjKeyImageNamesHistory = []byte("names-history")
|
||||
|
||||
var ffjKeyImageTopLayer = []byte("layer")
|
||||
|
||||
var ffjKeyImageMappedTopLayers = []byte("mapped-layers")
|
||||
@@ -348,6 +368,11 @@ mainparse:
|
||||
currentKey = ffjtImageNames
|
||||
state = fflib.FFParse_want_colon
|
||||
goto mainparse
|
||||
|
||||
} else if bytes.Equal(ffjKeyImageNamesHistory, kn) {
|
||||
currentKey = ffjtImageNamesHistory
|
||||
state = fflib.FFParse_want_colon
|
||||
goto mainparse
|
||||
}
|
||||
|
||||
}
|
||||
@@ -400,6 +425,12 @@ mainparse:
|
||||
goto mainparse
|
||||
}
|
||||
|
||||
if fflib.EqualFoldRight(ffjKeyImageNamesHistory, kn) {
|
||||
currentKey = ffjtImageNamesHistory
|
||||
state = fflib.FFParse_want_colon
|
||||
goto mainparse
|
||||
}
|
||||
|
||||
if fflib.EqualFoldRight(ffjKeyImageNames, kn) {
|
||||
currentKey = ffjtImageNames
|
||||
state = fflib.FFParse_want_colon
|
||||
@@ -444,6 +475,9 @@ mainparse:
|
||||
case ffjtImageNames:
|
||||
goto handle_Names
|
||||
|
||||
case ffjtImageNamesHistory:
|
||||
goto handle_NamesHistory
|
||||
|
||||
case ffjtImageTopLayer:
|
||||
goto handle_TopLayer
|
||||
|
||||
@@ -608,6 +642,80 @@ handle_Names:
|
||||
state = fflib.FFParse_after_value
|
||||
goto mainparse
|
||||
|
||||
handle_NamesHistory:
|
||||
|
||||
/* handler: j.NamesHistory type=[]string kind=slice quoted=false*/
|
||||
|
||||
{
|
||||
|
||||
{
|
||||
if tok != fflib.FFTok_left_brace && tok != fflib.FFTok_null {
|
||||
return fs.WrapErr(fmt.Errorf("cannot unmarshal %s into Go value for ", tok))
|
||||
}
|
||||
}
|
||||
|
||||
if tok == fflib.FFTok_null {
|
||||
j.NamesHistory = nil
|
||||
} else {
|
||||
|
||||
j.NamesHistory = []string{}
|
||||
|
||||
wantVal := true
|
||||
|
||||
for {
|
||||
|
||||
var tmpJNamesHistory string
|
||||
|
||||
tok = fs.Scan()
|
||||
if tok == fflib.FFTok_error {
|
||||
goto tokerror
|
||||
}
|
||||
if tok == fflib.FFTok_right_brace {
|
||||
break
|
||||
}
|
||||
|
||||
if tok == fflib.FFTok_comma {
|
||||
if wantVal == true {
|
||||
// TODO(pquerna): this isn't an ideal error message, this handles
|
||||
// things like [,,,] as an array value.
|
||||
return fs.WrapErr(fmt.Errorf("wanted value token, but got token: %v", tok))
|
||||
}
|
||||
continue
|
||||
} else {
|
||||
wantVal = true
|
||||
}
|
||||
|
||||
/* handler: tmpJNamesHistory type=string kind=string quoted=false*/
|
||||
|
||||
{
|
||||
|
||||
{
|
||||
if tok != fflib.FFTok_string && tok != fflib.FFTok_null {
|
||||
return fs.WrapErr(fmt.Errorf("cannot unmarshal %s into Go value for string", tok))
|
||||
}
|
||||
}
|
||||
|
||||
if tok == fflib.FFTok_null {
|
||||
|
||||
} else {
|
||||
|
||||
outBuf := fs.Output.Bytes()
|
||||
|
||||
tmpJNamesHistory = string(string(outBuf))
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
j.NamesHistory = append(j.NamesHistory, tmpJNamesHistory)
|
||||
|
||||
wantVal = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
state = fflib.FFParse_after_value
|
||||
goto mainparse
|
||||
|
||||
handle_TopLayer:
|
||||
|
||||
/* handler: j.TopLayer type=string kind=string quoted=false*/
|
||||
|
Reference in New Issue
Block a user