cmd/aws-k8s-tester: print out node group bodies

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
aws · Jun 26, 2020 · 7810477 · 7810477
1 parent 59234d0
commit 7810477
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 9 deletions.
diff --git a/CHANGELOG/CHANGELOG-1.4.md b/CHANGELOG/CHANGELOG-1.4.md
@@ -19,6 +19,7 @@ See [code changes](https://github.com/aws/aws-k8s-tester/compare/v1.3.9...v1.4.0
 
 - [`aws-k8s-tester --auto-path` now automatically uses the generated cluster name for local file paths, instead of random string](https://github.com/aws/aws-k8s-tester/commit/53b51d38b1aa4e6ea1454cc631c9511dcbe4267a).
 - Remove [`--block` flags](https://github.com/aws/aws-k8s-tester/commit/cdf83863700a4fb52a38484b56fedeb7c6b1eb78).
+- Print [JSON body for (managed) node groups](https://github.com/aws/aws-k8s-tester/commit/).
 
 ### `ec2`
 

diff --git a/cmd/aws-k8s-tester/eks/create-cluster.go b/cmd/aws-k8s-tester/eks/create-cluster.go
@@ -1,6 +1,7 @@
 package eks
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -70,9 +71,21 @@ func createClusterFunc(cmd *cobra.Command, args []string) {
 		fmt.Fprintf(os.Stderr, "failed to read configuration %q (%v)\n", path, err)
 		os.Exit(1)
 	}
-	println()
-	fmt.Println(string(txt))
-	println()
+	fmt.Printf("\n\n%q:\n\n%s\n\n\n", path, string(txt))
+	if cfg.IsEnabledAddOnNodeGroups() {
+		body, err := json.MarshalIndent(cfg.AddOnNodeGroups, "", "    ")
+		if err != nil {
+			panic(err)
+		}
+		fmt.Printf("AddOnNodeGroups:\n\n%s\n\n\n", string(body))
+	}
+	if cfg.IsEnabledAddOnManagedNodeGroups() {
+		body, err := json.MarshalIndent(cfg.AddOnManagedNodeGroups, "", "    ")
+		if err != nil {
+			panic(err)
+		}
+		fmt.Printf("AddOnManagedNodeGroups:\n\n%s\n\n\n", string(body))
+	}
 
 	if enablePrompt {
 		prompt := promptui.Select{

diff --git a/cmd/aws-k8s-tester/eks/create-config.go b/cmd/aws-k8s-tester/eks/create-config.go
@@ -1,6 +1,7 @@
 package eks
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -51,9 +52,21 @@ func createConfigFunc(cmd *cobra.Command, args []string) {
 		fmt.Fprintf(os.Stderr, "failed to read configuration %q (%v)\n", path, err)
 		os.Exit(1)
 	}
-	println()
-	fmt.Println(string(txt))
-	println()
+	fmt.Printf("\n\n%q:\n\n%s\n\n\n", path, string(txt))
+	if cfg.IsEnabledAddOnNodeGroups() {
+		body, err := json.MarshalIndent(cfg.AddOnNodeGroups, "", "    ")
+		if err != nil {
+			panic(err)
+		}
+		fmt.Printf("AddOnNodeGroups:\n\n%s\n\n\n", string(body))
+	}
+	if cfg.IsEnabledAddOnManagedNodeGroups() {
+		body, err := json.MarshalIndent(cfg.AddOnManagedNodeGroups, "", "    ")
+		if err != nil {
+			panic(err)
+		}
+		fmt.Printf("AddOnManagedNodeGroups:\n\n%s\n\n\n", string(body))
+	}
 
 	fmt.Printf("\n*********************************\n")
 	fmt.Printf("'aws-k8s-tester eks create config --path %q' success\n", path)

diff --git a/cmd/aws-k8s-tester/eks/delete.go b/cmd/aws-k8s-tester/eks/delete.go
@@ -1,6 +1,7 @@
 package eks
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -47,9 +48,21 @@ func deleteClusterFunc(cmd *cobra.Command, args []string) {
 		fmt.Fprintf(os.Stderr, "failed to read configuration %q (%v)\n", path, err)
 		os.Exit(1)
 	}
-	println()
-	fmt.Println(string(txt))
-	println()
+	fmt.Printf("\n\n%q:\n\n%s\n\n\n", path, string(txt))
+	if cfg.IsEnabledAddOnNodeGroups() {
+		body, err := json.MarshalIndent(cfg.AddOnNodeGroups, "", "    ")
+		if err != nil {
+			panic(err)
+		}
+		fmt.Printf("AddOnNodeGroups:\n\n%s\n\n\n", string(body))
+	}
+	if cfg.IsEnabledAddOnManagedNodeGroups() {
+		body, err := json.MarshalIndent(cfg.AddOnManagedNodeGroups, "", "    ")
+		if err != nil {
+			panic(err)
+		}
+		fmt.Printf("AddOnManagedNodeGroups:\n\n%s\n\n\n", string(body))
+	}
 
 	if enablePrompt {
 		prompt := promptui.Select{