sort deps and fixup engine dump

kamilsk · Sep 10, 2020 · 6d87578 · 6d87578
1 parent aae8921
commit 6d87578
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/sdk/paas/app.go b/sdk/paas/app.go
@@ -1,5 +1,7 @@
 package paas
 
+import "sort"
+
 // An Application contains configuration for a service.
 type Application struct {
 	Specification `toml:",omitempty,squash"`
@@ -14,6 +16,7 @@ func (app *Application) Merge(apps ...Application) {
 
 	for _, src := range apps {
 		app.Specification.Merge(&(src.Specification))
+		sort.Sort(app.Specification.Dependencies)
 
 		if app.Envs == nil && len(src.Envs) > 0 {
 			app.Envs = make(map[string]*Specification)
@@ -23,6 +26,7 @@ func (app *Application) Merge(apps ...Application) {
 				app.Envs[env] = new(Specification)
 			}
 			app.Envs[env].Merge(spec)
+			sort.Sort(app.Envs[env].Dependencies)
 		}
 	}
 }
diff --git a/sdk/paas/engine.go b/sdk/paas/engine.go
@@ -2,9 +2,9 @@ package paas
 
 // A Engine contains configuration for a service engine.
 type Engine struct {
-	Name      string     `toml:"name"`
-	Version   string     `toml:"version"`
-	Size      string     `toml:"size"`
+	Name      string     `toml:"name,omitempty"`
+	Version   string     `toml:"version,omitempty"`
+	Size      string     `toml:"size,omitempty"`
 	Resources *Resources `toml:"resources,omitempty"`
 }