base/v0_6_exp/validate.go: Add Validation when merging local/inline s…

…ources

base/v0_6_exp/validate.go

@@ -17,33 +17,75 @@ package v0_6_exp
 import (
  baseutil "github.com/coreos/butane/base/util"
  "github.com/coreos/butane/config/common"
-
+ "github.com/coreos/ignition/v2/config/shared/errors"
  "github.com/coreos/ignition/v2/config/util"
+ exp "github.com/coreos/ignition/v2/config/v3_5_experimental"
  "github.com/coreos/vcontext/path"
  "github.com/coreos/vcontext/report"
 )
 
 func (rs Resource) Validate(c path.ContextPath) (r report.Report) {
  var field string
  sources := 0
+ var config string
+ var butaneReport report.Report
  if rs.Local != nil {
  sources++
  field = "local"
+ config = *rs.Local
  }
  if rs.Inline != nil {
  sources++
  field = "inline"
+ config = *rs.Inline
  }
  if rs.Source != nil {
  sources++
  field = "source"
+ config = *rs.Source
  }
  if sources > 1 {
  r.AddOnError(c.Append(field), common.ErrTooManyResourceSources)
  }
+ if field == "local" || field == "inline" {
+ _, report, err := exp.Parse([]byte(config))
+ if len(report.Entries) > 0 {
+ butaneReport = ConvertToButaneReport(report, field)
+ r.Merge(butaneReport)
+ }
+ if err != nil {
+ r.AddOnError(c.Append(field), errors.ErrUnknownVersion)
+ }
+ }
  return
 }
 
+func ConvertToButaneReport(ignitionReport report.Report, field string) report.Report {
+ var butaneRep report.Report
+ for _, entry := range ignitionReport.Entries {
+
+ adjustedPath := []interface{}{field}
+ adjustedPath = append(adjustedPath, entry.Context.Path...)
+
+
+ butaneEntry := report.Entry{
+ Kind: entry.Kind,
+ Message: entry.Message,
+ Context: path.ContextPath{
+ Path: adjustedPath, // convert ignition path to butane path
+ Tag: entry.Context.Tag,
+ },
+ Marker: entry.Marker,
+ }
+ butaneRep.Entries = append(butaneRep.Entries, butaneEntry)
+ }
+ return butaneRep
+}
+
+// func TranslatePath() {
+// path translating logic // TODO
+// }
+
 func (fs Filesystem) Validate(c path.ContextPath) (r report.Report) {
  if !util.IsTrue(fs.WithMountUnit) {
  return

base/v0_6_exp/validate_test.go

@@ -52,7 +52,7 @@ func TestValidateResource(t *testing.T) {
  // inline specified
  {
  Resource{
- Inline: util.StrToPtr("hello"),
+ Inline: util.StrToPtr("{\"ignition\": {\"version\": \"3.5.0\"}}"),
  Compression: util.StrToPtr("gzip"),
  Verification: Verification{
  Hash: util.StrToPtr("this isn't validated"),
@@ -64,7 +64,7 @@ func TestValidateResource(t *testing.T) {
  // local specified
  {
  Resource{
- Local: util.StrToPtr("hello"),
+ Local: util.StrToPtr("{\"ignition\": {\"version\": \"3.5.0\"}}"),
  Compression: util.StrToPtr("gzip"),
  Verification: Verification{
  Hash: util.StrToPtr("this isn't validated"),
@@ -77,7 +77,7 @@ func TestValidateResource(t *testing.T) {
  {
  Resource{
  Source: util.StrToPtr("data:,hello"),
- Inline: util.StrToPtr("hello"),
+ Inline: util.StrToPtr("{\"ignition\": {\"version\": \"3.5.0\"}}"),
  Compression: util.StrToPtr("gzip"),
  Verification: Verification{
  Hash: util.StrToPtr("this isn't validated"),
@@ -90,7 +90,7 @@ func TestValidateResource(t *testing.T) {
  {
  Resource{
  Source: util.StrToPtr("data:,hello"),
- Local: util.StrToPtr("hello"),
+ Local: util.StrToPtr("{\"ignition\": {\"version\": \"3.5.0\"}}"),
  Compression: util.StrToPtr("gzip"),
  Verification: Verification{
  Hash: util.StrToPtr("this isn't validated"),
@@ -99,11 +99,11 @@ func TestValidateResource(t *testing.T) {
  common.ErrTooManyResourceSources,
  path.New("yaml", "source"),
  },
- // inline + local, invalid
+ // // inline + local, invalid
  {
  Resource{
- Inline: util.StrToPtr("hello"),
- Local: util.StrToPtr("hello"),
+ Inline: util.StrToPtr("{\"ignition\": {\"version\": \"3.5.0\"}}"),
+ Local: util.StrToPtr("{\"ignition\": {\"version\": \"3.5.0\"}}"),
  Compression: util.StrToPtr("gzip"),
  Verification: Verification{
  Hash: util.StrToPtr("this isn't validated"),
@@ -116,8 +116,8 @@ func TestValidateResource(t *testing.T) {
  {
  Resource{
  Source: util.StrToPtr("data:,hello"),
- Inline: util.StrToPtr("hello"),
- Local: util.StrToPtr("hello"),
+ Inline: util.StrToPtr("{\"ignition\": {\"version\": \"3.5.0\"}}"),
+ Local: util.StrToPtr("{\"ignition\": {\"version\": \"3.5.0\"}}"),
  Compression: util.StrToPtr("gzip"),
  Verification: Verification{
  Hash: util.StrToPtr("this isn't validated"),

docs/release-notes.md

@@ -75,11 +75,8 @@ key](https://getfedora.org/security/).
 - Warn if config attempts to reuse partition by label _(fcos 1.6.0-exp,
  openshift 4.14.0)_
 - Require `storage.filesystems.path` to start with `/etc` or `/var` if
- `with_mount_unit` is true _(fcos 1.6.0-exp, openshift 4.14.0)_
-- Stabilize OpenShift spec 4.14.0, targeting Ignition spec 3.4.0
-- Add OpenShift spec 4.15.0-experimental, targeting Ignition spec
- 3.5.0-experimental
-- Add new variant `fiot` for fedora-iot
+ `with_mount_unit` is true _(fcos 1.6.0-exp, openshift 4.14.0-exp)_
+- Validate merged/replaced ignition configs if they are local/inline _(fcos 1.6.0-exp)_
 
 ### Bug fixes