Minor refactor to run additional targets recursively

cmd/generate.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
+	configurator "github.com/OpenCHAMI/configurator/internal"
 	"github.com/OpenCHAMI/configurator/internal/generator"
 	"github.com/OpenCHAMI/configurator/internal/util"
 	"github.com/spf13/cobra"
@@ -60,69 +61,79 @@ var generateCmd = &cobra.Command{
 			fmt.Printf("%v\n", string(b))
 		}
 
-		// generate config with each supplied target
+		RunTargets(targets...)
-		for _, target := range targets {
-			params := generator.Params{
-				Args:        args,
-				PluginPaths: pluginPaths,
-				Target:      target,
-				Verbose:     verbose,
-			}
-			outputBytes, err := generator.Generate(&config, params)
-			if err != nil {
-				fmt.Printf("failed to generate config: %v\n", err)
-				os.Exit(1)
-			}
 
-			outputMap := util.ConvertMapOutput(outputBytes)
+	},
+}
 
-			// if we have more than one target and output is set, create configs in directory
+func RunTargets(config *configurator.Config, targets ...string) {
-			var (
+	// generate config with each supplied target
-				targetCount   = len(targets)
+	for _, target := range targets {
-				templateCount = len(outputMap)
+		params := generator.Params{
-			)
+			Args:        args,
-			if outputPath == "" {
+			PluginPaths: pluginPaths,
-				// write only to stdout by default
+			Target:      target,
-				if len(outputMap) == 1 {
+			Verbose:     verbose,
-					for _, contents := range outputMap {
+		}
-						fmt.Printf("%s\n", string(contents))
+		outputBytes, err := generator.Generate(&config, params)
-					}
+		if err != nil {
-				} else {
+			fmt.Printf("failed to generate config: %v\n", err)
-					for path, contents := range outputMap {
+			os.Exit(1)
-						fmt.Printf("-- file: %s, size: %d B\n%s\n", path, len(contents), string(contents))
+		}
-					}
+
+		outputMap := util.ConvertMapOutput(outputBytes)
+
+		// if we have more than one target and output is set, create configs in directory
+		var (
+			targetCount   = len(targets)
+			templateCount = len(outputMap)
+		)
+		if outputPath == "" {
+			// write only to stdout by default
+			if len(outputMap) == 1 {
+				for _, contents := range outputMap {
+					fmt.Printf("%s\n", string(contents))
 				}
-			} else if outputPath != "" && targetCount == 1 && templateCount == 1 {
+			} else {
-				// write just a single file using provided name
+				for path, contents := range outputMap {
-				for _, contents := range outputBytes {
+					fmt.Printf("-- file: %s, size: %d B\n%s\n", path, len(contents), string(contents))
-					err := os.WriteFile(outputPath, contents, 0o644)
-					if err != nil {
-						fmt.Printf("failed to write config to file: %v", err)
-						os.Exit(1)
-					}
-					fmt.Printf("wrote file to '%s'\n", outputPath)
 				}
-			} else if outputPath != "" && targetCount > 1 || templateCount > 1 {
+			}
-				// write multiple files in directory using template name
+		} else if outputPath != "" && targetCount == 1 && templateCount == 1 {
-				err := os.MkdirAll(filepath.Clean(outputPath), 0o755)
+			// write just a single file using provided name
+			for _, contents := range outputBytes {
+				err := os.WriteFile(outputPath, contents, 0o644)
 				if err != nil {
-					fmt.Printf("failed to make output directory: %v", err)
+					fmt.Printf("failed to write config to file: %v", err)
 					os.Exit(1)
 				}
-				for path, contents := range outputBytes {
+				fmt.Printf("wrote file to '%s'\n", outputPath)
-					filename := filepath.Base(path)
+			}
-					cleanPath := fmt.Sprintf("%s/%s", filepath.Clean(outputPath), filename)
+		} else if outputPath != "" && targetCount > 1 || templateCount > 1 {
-					err := os.WriteFile(cleanPath, contents, 0o644)
+			// write multiple files in directory using template name
-					if err != nil {
+			err := os.MkdirAll(filepath.Clean(outputPath), 0o755)
-						fmt.Printf("failed to write config to file: %v", err)
+			if err != nil {
-						os.Exit(1)
+				fmt.Printf("failed to make output directory: %v", err)
-					}
+				os.Exit(1)
-					fmt.Printf("wrote file to '%s'\n", cleanPath)
+			}
+			for path, contents := range outputBytes {
+				filename := filepath.Base(path)
+				cleanPath := fmt.Sprintf("%s/%s", filepath.Clean(outputPath), filename)
+				err := os.WriteFile(cleanPath, contents, 0o644)
+				if err != nil {
+					fmt.Printf("failed to write config to file: %v", err)
+					os.Exit(1)
 				}
+				fmt.Printf("wrote file to '%s'\n", cleanPath)
 			}
 		}
 
-	},
+		// remove any targets that are the same as current to prevent infinite loop
+		nextTargets := util.CopyIf(config.Targets[targets].Targets, func(t T) bool { return t != target })
+
+		// ...then, run any other targets that the current target has
+		RunTargets(config, nextTargets...)
+	}
 }
 
 func init() {

internal/util/util.go

@@ -61,3 +61,21 @@ func GitCommit() string {
 
 	return strings.TrimRight(string(stdout), "\n")
 }
+
+// NOTE: would it be better to use slices.DeleteFunc instead
+func RemoveIndex[T comparable](s []T, index int) []T {
+	ret := make([]T, 0)
+	ret = append(ret, s[:index]...)
+	return append(ret, s[index+1:]...)
+}
+
+func CopyIf[T comparable](s []T, condition func(t T) bool) []T {
+	var f = make([]T, 0)
+	for _, e := range s {
+		if condition(e) {
+			f = append(f, e)
+		}
+	}
+
+	return f
+}