Add strict field for strict validation mode

* Defaults to false

Author: dghubble

CHANGES.md

@@ -4,10 +4,10 @@ Notable changes between releases.
 
 ## Latest
 
-* Allow Fedora CoreOS Config `content`
+* Support Fedora CoreOS Config `content` ([#52](https://github.com/poseidon/terraform-provider-ct/pull/52))
   * Render Container Linux Config `content` in Ignition v2.2 format
-  * Render Fedora CoreOS `content` in Ignition v3.x format (determined by content)
-* Fedora CoreOS Configs specify their [own version](https://github.com/coreos/fcct/blob/master/docs/configuration-v1_0.md)
+  * Render Fedora CoreOS `content` in Ignition v3.x format (determined by their own [version](https://github.com/coreos/fcct/blob/master/docs/configuration-v1_0.md))
+* Add `strict` field for strict validation (defaults to false) ([#53](https://github.com/poseidon/terraform-provider-ct/pull/53))
 
 ## v0.3.2
 

ct/datasource_ct_config.go

@@ -43,6 +43,11 @@ func dataSourceCTConfig() *schema.Resource {
 				Optional: true,
 				Default:  false,
 			},
+			"strict": &schema.Schema{
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
 			"rendered": &schema.Schema{
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -70,37 +75,39 @@ func renderConfig(d *schema.ResourceData) (string, error) {
 	platform := d.Get("platform").(string)
 	snippetsIface := d.Get("snippets").([]interface{})
 	pretty := d.Get("pretty_print").(bool)
+	strict := d.Get("strict").(bool)
 
 	snippets := make([]string, len(snippetsIface))
 	for i := range snippetsIface {
 		snippets[i] = snippetsIface[i].(string)
 	}
 
 	// Fedora CoreOS Config
-	ign, err := fccToIgnition([]byte(content), pretty)
+	ign, err := fccToIgnition([]byte(content), pretty, strict)
 	if err == fcct.ErrNoVariant {
 		// consider as Container Linux Config
-		ign, err = renderCLC([]byte(content), platform, pretty, snippets)
+		ign, err = renderCLC([]byte(content), platform, pretty, strict, snippets)
 	}
 	return string(ign), err
 }
 
 // Translate Fedora CoreOS config to Ignition v3.X.Y
-func fccToIgnition(data []byte, pretty bool) ([]byte, error) {
+func fccToIgnition(data []byte, pretty, strict bool) ([]byte, error) {
 	return fcct.Translate(data, common.TranslateOptions{
 		Pretty: pretty,
+		Strict: strict,
 	})
 }
 
 // Translate Container Linux Config as Ignition JSON.
-func renderCLC(data []byte, platform string, pretty bool, snippets []string) ([]byte, error) {
-	ign, err := clcToIgnition(data, platform)
+func renderCLC(data []byte, platform string, pretty, strict bool, snippets []string) ([]byte, error) {
+	ign, err := clcToIgnition(data, platform, strict)
 	if err != nil {
 		return nil, err
 	}
 
 	for _, snippet := range snippets {
-		ignext, err := clcToIgnition([]byte(snippet), platform)
+		ignext, err := clcToIgnition([]byte(snippet), platform, strict)
 		if err != nil {
 			return nil, err
 		}
@@ -114,9 +121,14 @@ func renderCLC(data []byte, platform string, pretty bool, snippets []string) ([]
 }
 
 // Parse Container Linux config and convert to Ignition v2.2.0 format.
-func clcToIgnition(data []byte, platform string) (ignitionTypesV2_2.Config, error) {
+func clcToIgnition(data []byte, platform string, strict bool) (ignitionTypesV2_2.Config, error) {
 	// parse bytes into a Container Linux Config
 	clc, ast, report := clct.Parse([]byte(data))
+
+	if strict && len(report.Entries) > 0 {
+		return ignitionTypesV2_2.Config{}, fmt.Errorf("error strict parsing Container Linux Config: %v", report.String())
+	}
+
 	if report.IsFatal() {
 		return ignitionTypesV2_2.Config{}, fmt.Errorf("error parsing Container Linux Config: %v", report.String())
 	}

ct/datasource_ct_config_test.go

@@ -1,6 +1,7 @@
 package ct
 
 import (
+	"regexp"
 	"testing"
 
 	r "github.com/hashicorp/terraform/helper/resource"
@@ -234,6 +235,14 @@ const fedoraCoreOSExpected = `{
   "systemd": {}
 }`
 
+const invalidResource = `
+data "ct_config" "container-linux-strict" {
+  content = "foo"
+  strict = true
+  some_invalid_field = "strict-mode-will-reject"
+}
+`
+
 func TestRender(t *testing.T) {
 	r.UnitTest(t, r.TestCase{
 		Providers: testProviders,
@@ -265,3 +274,15 @@ func TestRender(t *testing.T) {
 		},
 	})
 }
+
+func TestRenderErrors(t *testing.T) {
+	r.UnitTest(t, r.TestCase{
+		Providers: testProviders,
+		Steps: []r.TestStep{
+			r.TestStep{
+				Config:      invalidResource,
+				ExpectError: regexp.MustCompile("^.*An argument named \"some_invalid_field\" is not expected here"),
+			},
+		},
+	})
+}