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

base/v0_6_exp/validate.go: Add mapper function and fix tests

Author: coreosbot

base/v0_6_exp/validate.go

@@ -17,22 +17,25 @@ package v0_6_exp
 import (
 	baseutil "github.com/coreos/butane/base/util"
 	"github.com/coreos/butane/config/common"
-
 	"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++
@@ -41,9 +44,33 @@ func (rs Resource) Validate(c path.ContextPath) (r report.Report) {
 	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 = MapIgnitionReportToButane(report)
+			r.Merge(butaneReport)
+		}
+		if err != nil {
+			r.AddOnWarn(c.Append(field), common.ErrUnknownVersion)
+		}
+	}
 	return
 }
 
+func MapIgnitionReportToButane(ignitionReport report.Report) report.Report {
+	var butaneRep report.Report
+	for _, entry := range ignitionReport.Entries {
+		butaneEntry := report.Entry{
+			Kind:    entry.Kind,
+			Message: entry.Message,
+			Context: entry.Context,
+			Marker:  entry.Marker,
+		}
+		butaneRep.Entries = append(butaneRep.Entries, butaneEntry)
+	}
+	return butaneRep
+}
+
 func (fs Filesystem) Validate(c path.ContextPath) (r report.Report) {
 	if !util.IsTrue(fs.WithMountUnit) {
 		return

base/v0_6_exp/validate_test.go

@@ -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"),
@@ -102,8 +102,8 @@ func TestValidateResource(t *testing.T) {
 		// 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/_config.yml

@@ -14,7 +14,7 @@ kramdown:
     ndash: "--"
     mdash: "---"
 
-remote_theme: just-the-docs/just-the-docs@v0.5.3
+remote_theme: just-the-docs/just-the-docs@v0.6.0
 plugins:
   - jekyll-remote-theme
 

docs/release-notes.md

@@ -21,6 +21,7 @@ key](https://getfedora.org/security/).
   openshift 4.14.0-exp)_
 - 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-exp)_
+- Validate merged/replaced ignition configs if they are local/inline _(fcos 1.6.0-exp)_
 
 ### Bug fixes