Skip to content

Add option to enable/disable unknown fields in OCI config #12052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 21, 2025
Merged

Add option to enable/disable unknown fields in OCI config #12052

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e619e18
Warn about unknown fields in OCI config
ioterw Aug 20, 2025
0662917
Made code more clear
ioterw Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions runsc/specutils/specutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"strconv"
"strings"
"time"
"bytes"

"github.com/cenkalti/backoff"
"github.com/mohae/deepcopy"
Expand Down Expand Up @@ -215,8 +216,14 @@ func ReadSpecFromFile(bundleDir string, specFile *os.File, conf *config.Config)
return nil, fmt.Errorf("error reading spec from file %q: %v", specFile.Name(), err)
}
var spec specs.Spec
if err := json.Unmarshal(specBytes, &spec); err != nil {
return nil, fmt.Errorf("error unmarshaling spec from file %q: %v\n %s", specFile.Name(), err, string(specBytes))
decoder := json.NewDecoder(bytes.NewReader(specBytes))
decoder.DisallowUnknownFields()
if errLooseDecode := decoder.Decode(&spec); errLooseDecode != nil {
if errStrictDecode := json.Unmarshal(specBytes, &spec); errStrictDecode != nil {
return nil, fmt.Errorf("error unmarshaling spec from file %q: %v\n %s", specFile.Name(), errStrictDecode, string(specBytes))
} else {
log.Warningf("OCI spec file %q contains fields unknown to `runsc`: %v. Ignoring these fields and continuing anyway.", specFile.Name(), errLooseDecode)
}
}
if err := ValidateSpec(&spec); err != nil {
return nil, err
Expand Down