output empty addons objects on JSON

cmd/minikube/cmd/config/addons_list.go

@@ -137,10 +137,6 @@ var printAddonsList = func(cc *config.ClusterConfig) {
 }
 
 var printAddonsJSON = func(cc *config.ClusterConfig) {
-	if cc == nil {
-		out.String("{}")
-		return
-	}
 	addonNames := make([]string, 0, len(assets.Addons))
 	for addonName := range assets.Addons {
 		addonNames = append(addonNames, addonName)
@@ -150,6 +146,11 @@ var printAddonsJSON = func(cc *config.ClusterConfig) {
 	addonsMap := map[string]map[string]interface{}{}
 
 	for _, addonName := range addonNames {
+		if cc == nil {
+			addonsMap[addonName] = map[string]interface{}{}
+			continue
+		}
+
 		addonBundle := assets.Addons[addonName]
 		enabled := addonBundle.IsEnabled(cc)
 

cmd/minikube/cmd/config/addons_list_test.go

@@ -17,7 +17,7 @@ limitations under the License.
 package config
 
 import (
-	"log"
+	"encoding/json"
 	"os"
 	"testing"
 
@@ -39,7 +39,7 @@ func TestAddonsList(t *testing.T) {
 			t.Fatalf("failed to close pipe: %v", err)
 		}
 		if _, err := r.Read(b); err != nil {
-			log.Fatalf("failed to read bytes: %v", err)
+			t.Fatalf("failed to read bytes: %v", err)
 		}
 		got := string(b)
 		expected := `|-----------------------------|-----------------------|
@@ -51,7 +51,11 @@ func TestAddonsList(t *testing.T) {
 	})
 
 	t.Run("NonExistingClusterJSON", func(t *testing.T) {
-		b := make([]byte, 2)
+		type addons struct {
+			Ambassador *interface{} `json:"ambassador"`
+		}
+
+		b := make([]byte, 534)
 		r, w, err := os.Pipe()
 		if err != nil {
 			t.Fatalf("failed to create pipe: %v", err)
@@ -68,12 +72,14 @@ func TestAddonsList(t *testing.T) {
 			t.Fatalf("failed to close pipe: %v", err)
 		}
 		if _, err := r.Read(b); err != nil {
-			log.Fatalf("failed to read bytes: %v", err)
+			t.Fatalf("failed to read bytes: %v", err)
 		}
-		got := string(b)
-		expected := "{}"
-		if got != expected {
-			t.Errorf("Expected = %q; got = %q", expected, got)
+		got := addons{}
+		if err := json.Unmarshal(b, &got); err != nil {
+			t.Fatalf("failed to unmarshal output; output: %q; err: %v", string(b), err)
+		}
+		if got.Ambassador == nil {
+			t.Errorf("expected `ambassador` field to not be nil, but was")
 		}
 	})
 }