Merge pull request #567 from liangchenye/cli-complete

nil config support in lifecycle validate

Author: Zhou Hao

validation/poststart.go

@@ -20,14 +20,12 @@ func main() {
 	t := tap.New()
 	t.Header(0)
 
-	g := util.GetDefaultGenerator()
-
 	var output string
 	config := util.LifecycleConfig{
 		Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
 		PreCreate: func(r *util.Runtime) error {
 			r.SetID(uuid.NewV4().String())
-
+			g := util.GetDefaultGenerator()
 			output = filepath.Join(r.BundleDir, g.Spec().Root.Path, "output")
 			poststart := rspec.Hook{
 				Path: fmt.Sprintf("%s/%s/bin/sh", r.BundleDir, g.Spec().Root.Path),
@@ -75,7 +73,7 @@ func main() {
 		},
 	}
 
-	err := util.RuntimeLifecycleValidate(g, config)
+	err := util.RuntimeLifecycleValidate(nil, config)
 	if err != nil {
 		diagnostic := map[string]string{
 			"error": err.Error(),

validation/poststop.go

@@ -21,14 +21,12 @@ func main() {
 	t := tap.New()
 	t.Header(0)
 
-	g := util.GetDefaultGenerator()
-
 	var output string
 	config := util.LifecycleConfig{
 		Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
 		PreCreate: func(r *util.Runtime) error {
 			r.SetID(uuid.NewV4().String())
-
+			g := util.GetDefaultGenerator()
 			output = filepath.Join(r.BundleDir, g.Spec().Root.Path, "output")
 			poststop := rspec.Hook{
 				Path: fmt.Sprintf("%s/%s/bin/sh", r.BundleDir, g.Spec().Root.Path),
@@ -92,7 +90,7 @@ func main() {
 		},
 	}
 
-	err := util.RuntimeLifecycleValidate(g, config)
+	err := util.RuntimeLifecycleValidate(nil, config)
 	if err != nil {
 		diagnostic := map[string]string{
 			"error": err.Error(),

validation/prestart.go

@@ -19,14 +19,12 @@ func main() {
 	t := tap.New()
 	t.Header(0)
 
-	g := util.GetDefaultGenerator()
-
 	var output string
 	config := util.LifecycleConfig{
 		Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
 		PreCreate: func(r *util.Runtime) error {
 			r.SetID(uuid.NewV4().String())
-
+			g := util.GetDefaultGenerator()
 			output = filepath.Join(r.BundleDir, g.Spec().Root.Path, "output")
 			prestart := rspec.Hook{
 				Path: fmt.Sprintf("%s/%s/bin/sh", r.BundleDir, g.Spec().Root.Path),
@@ -74,7 +72,7 @@ func main() {
 		},
 	}
 
-	err := util.RuntimeLifecycleValidate(g, config)
+	err := util.RuntimeLifecycleValidate(nil, config)
 	if err != nil {
 		diagnostic := map[string]string{
 			"error": err.Error(),

validation/util/container.go

@@ -2,6 +2,7 @@ package util
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -49,6 +50,9 @@ func (r *Runtime) bundleDir() (bundleDir string) {
 
 // SetConfig creates a 'config.json' by the generator
 func (r *Runtime) SetConfig(g *generate.Generator) error {
+	if g == nil {
+		return errors.New("cannot set a nil config")
+	}
 	return g.SaveToFile(filepath.Join(r.bundleDir(), "config.json"), generate.ExportOptions{})
 }
 

validation/util/test.go

@@ -268,9 +268,11 @@ func RuntimeLifecycleValidate(g *generate.Generator, config LifecycleConfig) err
 	if err != nil {
 		return err
 	}
-	err = r.SetConfig(g)
-	if err != nil {
-		return err
+
+	if g != nil {
+		if err := r.SetConfig(g); err != nil {
+			return err
+		}
 	}
 
 	if config.PreCreate != nil {