mirror of
https://github.com/containers/podman.git
synced 2025-12-15 03:18:45 +08:00
Bump github.com/containers/storage from 1.24.5 to 1.25.0
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.24.5 to 1.25.0. - [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.24.5...v1.25.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
committed by
Daniel J Walsh
parent
d1e0afdd47
commit
ebc42f5086
111
vendor/github.com/containers/storage/layers_ffjson.go
generated
vendored
111
vendor/github.com/containers/storage/layers_ffjson.go
generated
vendored
@@ -396,6 +396,22 @@ func (j *Layer) MarshalJSONBuf(buf fflib.EncodingBuffer) error {
|
||||
}
|
||||
buf.WriteByte(',')
|
||||
}
|
||||
if len(j.BigDataNames) != 0 {
|
||||
buf.WriteString(`"big-data-names":`)
|
||||
if j.BigDataNames != nil {
|
||||
buf.WriteString(`[`)
|
||||
for i, v := range j.BigDataNames {
|
||||
if i != 0 {
|
||||
buf.WriteString(`,`)
|
||||
}
|
||||
fflib.WriteJsonString(buf, string(v))
|
||||
}
|
||||
buf.WriteString(`]`)
|
||||
} else {
|
||||
buf.WriteString(`null`)
|
||||
}
|
||||
buf.WriteByte(',')
|
||||
}
|
||||
buf.Rewind(1)
|
||||
buf.WriteByte('}')
|
||||
return nil
|
||||
@@ -436,6 +452,8 @@ const (
|
||||
ffjtLayerUIDMap
|
||||
|
||||
ffjtLayerGIDMap
|
||||
|
||||
ffjtLayerBigDataNames
|
||||
)
|
||||
|
||||
var ffjKeyLayerID = []byte("id")
|
||||
@@ -470,6 +488,8 @@ var ffjKeyLayerUIDMap = []byte("uidmap")
|
||||
|
||||
var ffjKeyLayerGIDMap = []byte("gidmap")
|
||||
|
||||
var ffjKeyLayerBigDataNames = []byte("big-data-names")
|
||||
|
||||
// UnmarshalJSON umarshall json - template of ffjson
|
||||
func (j *Layer) UnmarshalJSON(input []byte) error {
|
||||
fs := fflib.NewFFLexer(input)
|
||||
@@ -531,6 +551,14 @@ mainparse:
|
||||
} else {
|
||||
switch kn[0] {
|
||||
|
||||
case 'b':
|
||||
|
||||
if bytes.Equal(ffjKeyLayerBigDataNames, kn) {
|
||||
currentKey = ffjtLayerBigDataNames
|
||||
state = fflib.FFParse_want_colon
|
||||
goto mainparse
|
||||
}
|
||||
|
||||
case 'c':
|
||||
|
||||
if bytes.Equal(ffjKeyLayerCreated, kn) {
|
||||
@@ -640,6 +668,12 @@ mainparse:
|
||||
|
||||
}
|
||||
|
||||
if fflib.EqualFoldRight(ffjKeyLayerBigDataNames, kn) {
|
||||
currentKey = ffjtLayerBigDataNames
|
||||
state = fflib.FFParse_want_colon
|
||||
goto mainparse
|
||||
}
|
||||
|
||||
if fflib.SimpleLetterEqualFold(ffjKeyLayerGIDMap, kn) {
|
||||
currentKey = ffjtLayerGIDMap
|
||||
state = fflib.FFParse_want_colon
|
||||
@@ -801,6 +835,9 @@ mainparse:
|
||||
case ffjtLayerGIDMap:
|
||||
goto handle_GIDMap
|
||||
|
||||
case ffjtLayerBigDataNames:
|
||||
goto handle_BigDataNames
|
||||
|
||||
case ffjtLayernosuchkey:
|
||||
err = fs.SkipField(tok)
|
||||
if err != nil {
|
||||
@@ -1551,6 +1588,80 @@ handle_GIDMap:
|
||||
state = fflib.FFParse_after_value
|
||||
goto mainparse
|
||||
|
||||
handle_BigDataNames:
|
||||
|
||||
/* handler: j.BigDataNames 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.BigDataNames = nil
|
||||
} else {
|
||||
|
||||
j.BigDataNames = []string{}
|
||||
|
||||
wantVal := true
|
||||
|
||||
for {
|
||||
|
||||
var tmpJBigDataNames 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: tmpJBigDataNames 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()
|
||||
|
||||
tmpJBigDataNames = string(string(outBuf))
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
j.BigDataNames = append(j.BigDataNames, tmpJBigDataNames)
|
||||
|
||||
wantVal = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
state = fflib.FFParse_after_value
|
||||
goto mainparse
|
||||
|
||||
wantedvalue:
|
||||
return fs.WrapErr(fmt.Errorf("wanted value token, but got token: %v", tok))
|
||||
wrongtokenerror:
|
||||
|
||||
Reference in New Issue
Block a user