scottk/matchbox
1
0
Fork 0
mirror of https://github.com/outbackdingo/matchbox.git synced 2026-03-22 11:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

bootcfg: Parse and convert Fuze configs to Ignition

Browse Source
This commit is contained in:
Dalton Hubble
2016-11-17 17:16:46 -08:00
parent 377ca3b1e8
commit 0e495c5720
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@@ -2,6 +2,8 @@
## Latest
* Update Fuze and Ignition to v0.11.2
## v0.4.2 (2016-12-7)
#### Improvements

24
bootcfg/http/ignition.go
View File

@@ -62,9 +62,9 @@ func (s *Server) ignitionHandler(core server.Server) ContextHandler {
// Skip rendering if raw Ignition JSON is provided
if isIgnition(profile.IgnitionId) {
_, err := ignition.Parse([]byte(contents))
_, report, err := ignition.Parse([]byte(contents))
if err != nil {
s.logger.Warningf("warning parsing Ignition JSON: %v", err)
s.logger.Warningf("warning parsing Ignition JSON: %s", report.String())
}
s.writeJSON(w, []byte(contents))
return
@@ -88,15 +88,23 @@ func (s *Server) ignitionHandler(core server.Server) ContextHandler {
return
}
// Parse fuze config into an Ignition config
config, err := fuze.ParseAsV2_0_0(buf.Bytes())
if err == nil {
s.renderJSON(w, config)
// Parse bytes into a Fuze Config
config, report := fuze.Parse(buf.Bytes())
if report.IsFatal() {
s.logger.Errorf("error parsing Fuze config: %s", report.String())
http.NotFound(w, req)
return
}
s.logger.Errorf("error parsing Ignition config: %v", err)
http.NotFound(w, req)
// Convert Fuze Config into an Ignition Config
ign, report := fuze.ConvertAs2_0_0(config)
if report.IsFatal() {
s.logger.Errorf("error converting Fuze config: %s", report.String())
http.NotFound(w, req)
return
}
s.renderJSON(w, ign)
return
}
return ContextHandlerFunc(fn)