base/0_6_exp/validate.go: Update error and dropped unneccessary code

coreos · Sep 19, 2023 · ba7d124 · ba7d124
1 parent c6358d1
commit ba7d124
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/base/v0_6_exp/validate.go b/base/v0_6_exp/validate.go
@@ -46,18 +46,14 @@ func (rs Resource) Validate(c path.ContextPath) (r report.Report) {
  }
  if field == "local" || field == "inline" {
  // check if it's an ignition config
- if len(config) > 0 && config[0] == '{' {
  _, report, err := exp.Parse([]byte(config))
  if len(report.Entries) > 0 {
  butaneReport = MapIgnitionReportToButane(report)
  r.Merge(butaneReport)
  }
  if err != nil {
- if err == common.ErrNoFilesDir {
- r.AddOnError(c.Append(field), common.ErrNoFilesDir)
- }
+ r.AddOnWarn(c.Append(field), common.ErrUnknownVersion)
  }
- }
  }
 
  return

diff --git a/config/common/errors.go b/config/common/errors.go
@@ -25,6 +25,7 @@ var (
  // common field parsing
  ErrNoVariant = errors.New("error parsing variant; must be specified")
  ErrInvalidVersion = errors.New("error parsing version; must be a valid semver")
+ ErrUnknownVersion = errors.New("config version unknown, butane validation has been skipped")
 
  // high-level errors for fatal reports
  ErrInvalidSourceConfig = errors.New("source config is invalid")