Merge pull request #36 from apptio/unprune

Unprune cluster parameters
apptio · May 8, 2020 · a393dcc · a393dcc
2 parents 05c33f2 + efb607c
commit a393dcc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/cmd/cluster.go b/cmd/cluster.go
@@ -84,7 +84,7 @@ var paramsCmd = &cobra.Command{
 			log.Fatal("Please specify a --cluster name and/or --clusterparams")
 		}
 
-		j := renderClusterParams(cmd, clusterName, componentName, clusterParams)
+		j := renderClusterParams(cmd, clusterName, componentName, clusterParams, true)
 
 		if paramPath != "" {
 			value := gjson.Get(j, paramPath)

diff --git a/cmd/directories.go b/cmd/directories.go
@@ -126,7 +126,7 @@ func getClusterParams(basePath string, targetPath string) []string {
 
 }
 
-func renderClusterParams(cmd *cobra.Command, clusterName string, componentName string, clusterParams string) string {
+func renderClusterParams(cmd *cobra.Command, clusterName string, componentName string, clusterParams string, prune bool) string {
 	if clusterName == "" && clusterParams == "" {
 		log.Fatal("Please specify a --cluster name and/or --clusterparams")
 	}
@@ -163,7 +163,7 @@ func renderClusterParams(cmd *cobra.Command, clusterName string, componentName s
 	}
 	componentDefaultsMerged = componentDefaultsMerged + "}"
 
-	compParams = renderJsonnet(cmd, params, "", false, componentDefaultsMerged)
+	compParams = renderJsonnet(cmd, params, "", prune, componentDefaultsMerged)
 
 	return compParams
 }
diff --git a/cmd/get.go b/cmd/get.go
@@ -114,7 +114,7 @@ var getparamsCmd = &cobra.Command{
 
 		fmt.Println(componentName)
 
-		j := renderClusterParams(cmd, clusterName, componentName, clusterParams)
+		j := renderClusterParams(cmd, clusterName, componentName, clusterParams, true)
 
 		if paramPath != "" {
 			value := gjson.Get(j, paramPath)

diff --git a/cmd/jsonnet.go b/cmd/jsonnet.go
@@ -262,20 +262,19 @@ var jsonnetrenderCmd = &cobra.Command{
 			log.Fatal("Please specify a --cluster name and/or --clusterparams")
 		}
 
-		config := renderClusterParams(cmd, clusterName, componentName, clusterParams)
+		config := renderClusterParams(cmd, clusterName, componentName, clusterParams, false)
 
 		// VM
 		vm, _ := JsonnetVM(cmd)
 
 		var input string
 		// pass component, _cluster and _components as extvars
+
 		vm.ExtCode("kr8_cluster", "std.prune("+config+"._cluster)")
 		vm.ExtCode("kr8_components", "std.prune("+config+"._components)")
 		vm.ExtCode("kr8", "std.prune("+config+"."+componentName+")")
 		vm.ExtCode("kr8_unpruned", config+"."+componentName)
 
-		log.Debug("Unpruned")
-
 		if pruneFlag {
 			input = "std.prune(import '" + args[0] + "')"
 		} else {

diff --git a/cmd/render.go b/cmd/render.go
@@ -36,7 +36,7 @@ var renderjsonnetCmd = &cobra.Command{
 			log.Fatal("Please specify a --cluster name and/or --clusterparams")
 		}
 
-		config := renderClusterParams(cmd, clusterName, componentName, clusterParams)
+		config := renderClusterParams(cmd, clusterName, componentName, clusterParams, false)
 
 		// VM
 		vm, _ := JsonnetVM(cmd)