Simplify --output-graph processing

app/fissile.go

@@ -74,6 +74,11 @@ func NewFissileApplication(version string, ui *termui.UI) *Fissile {
 	}
 }
 
+// Cleanup is a destructor
+func (f *Fissile) Cleanup() {
+	f.GraphEnd()
+}
+
 // CompilationDir returns the path to the compilation directory
 func (f *Fissile) CompilationDir() string {
 	return filepath.Join(f.Options.WorkDir, "compilation")
@@ -1030,6 +1035,9 @@ func (f *Fissile) generateKubeRoles(settings kube.ExportSettings) error {
 
 // GraphBegin will start logging hash information to the given file
 func (f *Fissile) GraphBegin(outputPath string) error {
+	if outputPath == "" {
+		return nil
+	}
 	file, err := os.Create(outputPath)
 	if err != nil {
 		return err

cmd/build-helm.go

@@ -21,15 +21,18 @@ var buildHelmCmd = &cobra.Command{
 	Short: "Creates Helm chart.",
 	Long:  ``,
 	RunE: func(cmd *cobra.Command, args []string) error {
-
 		flagBuildHelmOutputDir = buildHelmViper.GetString("output-dir")
 		flagBuildHelmUseMemoryLimits = buildHelmViper.GetBool("use-memory-limits")
 		flagBuildHelmUseCPULimits = buildHelmViper.GetBool("use-cpu-limits")
 		flagBuildHelmTagExtra = buildHelmViper.GetString("tag-extra")
-		flagBuildOutputGraph = buildViper.GetString("output-graph")
 		flagBuildHelmAuthType = buildHelmViper.GetString("auth-type")
 
-		err := fissile.LoadManifest()
+		err := fissile.GraphBegin(buildViper.GetString("output-graph"))
+		if err != nil {
+			return err
+		}
+
+		err = fissile.LoadManifest()
 		if err != nil {
 			return err
 		}
@@ -58,16 +61,6 @@ var buildHelmCmd = &cobra.Command{
 			AuthType:        flagBuildHelmAuthType,
 		}
 
-		if flagBuildOutputGraph != "" {
-			err = fissile.GraphBegin(flagBuildOutputGraph)
-			if err != nil {
-				return err
-			}
-			defer func() {
-				fissile.GraphEnd()
-			}()
-		}
-
 		return fissile.GenerateKube(settings)
 	},
 }

cmd/build-images.go

@@ -53,10 +53,12 @@ from other specs.  At most one is allowed.
 			opt.Labels[parts[0]] = parts[1]
 		}
 
-		// "global" fissile build option
-		flagBuildOutputGraph = buildViper.GetString("output-graph")
+		err := fissile.GraphBegin(buildViper.GetString("output-graph"))
+		if err != nil {
+			return err
+		}
 
-		err := fissile.LoadManifest()
+		err = fissile.LoadManifest()
 		if err != nil {
 			return err
 		}
@@ -66,16 +68,6 @@ from other specs.  At most one is allowed.
 			opt.Force = true
 		}
 
-		if flagBuildOutputGraph != "" {
-			err = fissile.GraphBegin(flagBuildOutputGraph)
-			if err != nil {
-				return err
-			}
-			defer func() {
-				fissile.GraphEnd()
-			}()
-		}
-
 		return fissile.GenerateRoleImages(opt)
 	},
 }

cmd/build-kube.go

@@ -20,14 +20,17 @@ var buildKubeCmd = &cobra.Command{
 	Short: "Creates Kubernetes configuration files.",
 	Long:  ``,
 	RunE: func(cmd *cobra.Command, args []string) error {
-
 		flagBuildKubeOutputDir = buildKubeViper.GetString("output-dir")
 		flagBuildKubeUseMemoryLimits = buildKubeViper.GetBool("use-memory-limits")
 		flagBuildKubeUseCPULimits = buildKubeViper.GetBool("use-cpu-limits")
 		flagBuildKubeTagExtra = buildKubeViper.GetString("tag-extra")
-		flagBuildOutputGraph = buildViper.GetString("output-graph")
 
-		err := fissile.LoadManifest()
+		err := fissile.GraphBegin(buildViper.GetString("output-graph"))
+		if err != nil {
+			return err
+		}
+
+		err = fissile.LoadManifest()
 		if err != nil {
 			return err
 		}
@@ -55,16 +58,6 @@ var buildKubeCmd = &cobra.Command{
 			TagExtra:        flagBuildKubeTagExtra,
 		}
 
-		if flagBuildOutputGraph != "" {
-			err = fissile.GraphBegin(flagBuildOutputGraph)
-			if err != nil {
-				return err
-			}
-			defer func() {
-				fissile.GraphEnd()
-			}()
-		}
-
 		return fissile.GenerateKube(settings)
 	},
 }

cmd/build-packages.go

@@ -31,29 +31,22 @@ same package (with the same version) is used by multiple releases, it will only
 compiled once.
 `,
 	RunE: func(cmd *cobra.Command, args []string) error {
-
 		flagBuildPackagesRoles := buildPackagesViper.GetString("roles")
 		flagBuildPackagesOnlyReleases := buildPackagesViper.GetString("only-releases")
 		flagBuildPackagesWithoutDocker := buildPackagesViper.GetBool("without-docker")
 		flagBuildPackagesDockerNetworkMode := buildPackagesViper.GetString("docker-network-mode")
 		flagBuildPackagesStemcell := buildPackagesViper.GetString("stemcell")
-		flagBuildOutputGraph = buildViper.GetString("output-graph")
 		flagBuildCompilationCacheConfig := buildPackagesViper.GetString("compilation-cache-config")
 		flagBuildPackagesStreamPackages := buildPackagesViper.GetBool("stream-packages")
 
-		err := fissile.LoadManifest()
+		err := fissile.GraphBegin(buildViper.GetString("output-graph"))
 		if err != nil {
 			return err
 		}
 
-		if flagBuildOutputGraph != "" {
-			err = fissile.GraphBegin(flagBuildOutputGraph)
-			if err != nil {
-				return err
-			}
-			defer func() {
-				fissile.GraphEnd()
-			}()
+		err = fissile.LoadManifest()
+		if err != nil {
+			return err
 		}
 
 		hasher := sha1.New()

cmd/build.go

@@ -5,10 +5,6 @@ import (
 	"github.com/spf13/viper"
 )
 
-var (
-	flagBuildOutputGraph string
-)
-
 // buildCmd represents the build command
 var buildCmd = &cobra.Command{
 	Use:   "build",

main.go

@@ -40,6 +40,7 @@ func main() {
 	}
 
 	f := app.NewFissileApplication(version, ui)
+	defer f.Cleanup()
 
 	if err := cmd.Execute(f, version); err != nil {
 		ui.Println(color.RedString("%v", err))