@@ -108,14 +108,16 @@ func renderConfig(d *schema.ResourceData) (string, error) {
108108
109109// Translate Fedora CoreOS config to Ignition v3.X.Y
110110func fccToIgnition (data []byte , pretty , strict bool , snippets []string ) ([]byte , error ) {
111- ignBytes , _ , err := butane .TranslateBytes (data , common.TranslateBytesOptions {
111+ ignBytes , report , err := butane .TranslateBytes (data , common.TranslateBytesOptions {
112112 Pretty : pretty ,
113- Strict : strict ,
114113 })
115114 // ErrNoVariant indicates data is a CLC, not an FCC
116115 if err != nil {
117116 return nil , err
118117 }
118+ if strict && len (report .Entries ) > 0 {
119+ return nil , fmt .Errorf ("strict parsing error: %v" , report .String ())
120+ }
119121
120122 if len (snippets ) == 0 {
121123 return ignBytes , nil
@@ -178,9 +180,8 @@ func mergeFCCSnippets(ignBytes []byte, pretty, strict bool, snippets []string) (
178180// merge FCC v1.4.0 snippets
179181func mergeFCC14 (ign ignition33Types.Config , snippets []string , pretty , strict bool ) (ignition33Types.Config , error ) {
180182 for _ , snippet := range snippets {
181- ignextBytes , _ , err := butane .TranslateBytes ([]byte (snippet ), common.TranslateBytesOptions {
183+ ignextBytes , report , err := butane .TranslateBytes ([]byte (snippet ), common.TranslateBytesOptions {
182184 Pretty : pretty ,
183- Strict : strict ,
184185 })
185186 if err != nil {
186187 // For FCC, require snippets be FCCs (don't fall-through to CLC)
@@ -189,6 +190,10 @@ func mergeFCC14(ign ignition33Types.Config, snippets []string, pretty, strict bo
189190 }
190191 return ign , fmt .Errorf ("snippet v1.4.0 translate error: %v" , err )
191192 }
193+ if strict && len (report .Entries ) > 0 {
194+ return ign , fmt .Errorf ("strict parsing error: %v" , report .String ())
195+ }
196+
192197 ignext , _ , err := ignition33 .Parse (ignextBytes )
193198 if err != nil {
194199 return ign , fmt .Errorf ("snippet parse error: %v, expect v1.4.0" , err )
@@ -201,9 +206,8 @@ func mergeFCC14(ign ignition33Types.Config, snippets []string, pretty, strict bo
201206// merge FCC v1.2.0 snippets
202207func mergeFCC12 (ign ignition32Types.Config , snippets []string , pretty , strict bool ) (ignition32Types.Config , error ) {
203208 for _ , snippet := range snippets {
204- ignextBytes , _ , err := butane .TranslateBytes ([]byte (snippet ), common.TranslateBytesOptions {
209+ ignextBytes , report , err := butane .TranslateBytes ([]byte (snippet ), common.TranslateBytesOptions {
205210 Pretty : pretty ,
206- Strict : strict ,
207211 })
208212 if err != nil {
209213 // For FCC, require snippets be FCCs (don't fall-through to CLC)
@@ -212,6 +216,10 @@ func mergeFCC12(ign ignition32Types.Config, snippets []string, pretty, strict bo
212216 }
213217 return ign , fmt .Errorf ("snippet v1.2.0 translate error: %v" , err )
214218 }
219+ if strict && len (report .Entries ) > 0 {
220+ return ign , fmt .Errorf ("strict parsing error: %v" , report .String ())
221+ }
222+
215223 ignext , _ , err := ignition32 .Parse (ignextBytes )
216224 if err != nil {
217225 return ign , fmt .Errorf ("snippet parse error: %v, expect v1.2.0" , err )
@@ -224,9 +232,8 @@ func mergeFCC12(ign ignition32Types.Config, snippets []string, pretty, strict bo
224232// merge FCC v1.1.0 snippets
225233func mergeFCC11 (ign ignition31Types.Config , snippets []string , pretty , strict bool ) (ignition31Types.Config , error ) {
226234 for _ , snippet := range snippets {
227- ignextBytes , _ , err := butane .TranslateBytes ([]byte (snippet ), common.TranslateBytesOptions {
235+ ignextBytes , report , err := butane .TranslateBytes ([]byte (snippet ), common.TranslateBytesOptions {
228236 Pretty : pretty ,
229- Strict : strict ,
230237 })
231238 if err != nil {
232239 // For FCC, require snippets be FCCs (don't fall-through to CLC)
@@ -235,6 +242,10 @@ func mergeFCC11(ign ignition31Types.Config, snippets []string, pretty, strict bo
235242 }
236243 return ign , fmt .Errorf ("snippet v1.1.0 translate error: %v" , err )
237244 }
245+ if strict && len (report .Entries ) > 0 {
246+ return ign , fmt .Errorf ("strict parsing error: %v" , report .String ())
247+ }
248+
238249 ignext , _ , err := ignition31 .Parse (ignextBytes )
239250 if err != nil {
240251 return ign , fmt .Errorf ("snippet parse error: %v, expect v1.1.0" , err )
@@ -247,9 +258,8 @@ func mergeFCC11(ign ignition31Types.Config, snippets []string, pretty, strict bo
247258// merge FCC v1.0.0 snippets
248259func mergeFCCV10 (ign ignition30Types.Config , snippets []string , pretty , strict bool ) (ignition30Types.Config , error ) {
249260 for _ , snippet := range snippets {
250- ignextBytes , _ , err := butane .TranslateBytes ([]byte (snippet ), common.TranslateBytesOptions {
261+ ignextBytes , report , err := butane .TranslateBytes ([]byte (snippet ), common.TranslateBytesOptions {
251262 Pretty : pretty ,
252- Strict : strict ,
253263 })
254264 if err != nil {
255265 // For FCC, require snippets be FCCs (don't fall-through to CLC)
@@ -258,6 +268,10 @@ func mergeFCCV10(ign ignition30Types.Config, snippets []string, pretty, strict b
258268 }
259269 return ign , fmt .Errorf ("snippet v1.0.0 translate error: %v" , err )
260270 }
271+ if strict && len (report .Entries ) > 0 {
272+ return ign , fmt .Errorf ("strict parsing error: %v" , report .String ())
273+ }
274+
261275 ignext , _ , err := ignition30 .Parse (ignextBytes )
262276 if err != nil {
263277 return ign , fmt .Errorf ("snippet parse error: %v, expect v1.0.0" , err )
0 commit comments