feat: get cluster config (#143)

* feat: get cluster config

* fix: add context specific options

Author: Richard87

cmd/create.go

@@ -15,16 +15,10 @@
 package cmd
 
 import (
-	"encoding/json"
 	"errors"
-	"fmt"
-	"log"
 
 	"github.com/equinor/radix-cli/pkg/flagnames"
-	"github.com/equinor/radix-cli/pkg/flagvalues"
-	"github.com/equinor/radix-cli/pkg/utils/completion"
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/yaml"
 )
 
 var outputFormat = "text"
@@ -40,25 +34,9 @@ var createCmd = &cobra.Command{
 }
 
 func init() {
-	createCmd.PersistentFlags().StringVarP(&outputFormat, flagnames.Output, "o", "text", "(Optional) Output format. json or not set (plain text)")
-	_ = createCmd.RegisterFlagCompletionFunc(flagnames.Application, completion.Output)
+	createCmd.PersistentFlags().StringVarP(&outputFormat, flagnames.Output, "o", "text", "(Deprecated) Output format. json")
+	_ = createCmd.PersistentFlags().MarkDeprecated(flagnames.Output, "Everything created is printed in JSON format by default.")
+	_ = createCmd.PersistentFlags().MarkHidden(flagnames.Output)
 
 	rootCmd.AddCommand(createCmd)
 }
-
-func printPayload(payload any) {
-	if outputFormat == flagvalues.OutputFormatJson {
-		jsonData, err := json.MarshalIndent(payload, "", "  ")
-		if err != nil {
-			log.Fatalf("failed to print payload as json: %v", err)
-		}
-		fmt.Println(string(jsonData))
-		return
-	}
-
-	yamlData, err := yaml.Marshal(payload)
-	if err != nil {
-		log.Fatalf("failed to print payload as yaml: %v", err)
-	}
-	fmt.Println(string(yamlData))
-}

cmd/getApplication.go

@@ -15,18 +15,19 @@
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/equinor/radix-cli/generated/radixapi/client/application"
 	"github.com/equinor/radix-cli/generated/radixapi/client/platform"
 	"github.com/equinor/radix-cli/pkg/client"
 	"github.com/equinor/radix-cli/pkg/config"
 	"github.com/equinor/radix-cli/pkg/flagnames"
 	"github.com/equinor/radix-cli/pkg/utils/completion"
-	"github.com/equinor/radix-cli/pkg/utils/json"
 	"github.com/spf13/cobra"
 )
 
+type GetApplicationResponse struct {
+	Applications []string `json:"applications,omitempty"`
+}
+
 // getApplicationCmd represents the getApplicationCmd command
 var getApplicationCmd = &cobra.Command{
 	Use:   "application",
@@ -49,32 +50,27 @@ var getApplicationCmd = &cobra.Command{
 			// List applications
 			showApplicationParams := platform.NewShowApplicationsParams()
 			resp, err := apiClient.Platform.ShowApplications(showApplicationParams, nil)
+			if err != nil {
+				return err
+			}
 
 			var appNames []string
-
-			if err == nil {
-				for _, application := range resp.Payload {
-					fmt.Println(*application.Name)
-					appNames = append(appNames, *application.Name)
-				}
-				completion.UpdateAppNamesCache(appNames)
-
-				return nil
+			for _, application := range resp.Payload {
+				appNames = append(appNames, *application.Name)
 			}
+			completion.UpdateAppNamesCache(appNames)
+			printPayload(GetApplicationResponse{Applications: appNames})
 
-			return err
+			return nil
 		}
+
 		getApplicationParams := application.NewGetApplicationParams()
 		getApplicationParams.SetAppName(appName)
 		resp, err := apiClient.Application.GetApplication(getApplicationParams, nil)
 		if err != nil {
 			return err
 		}
-		prettyJSON, err := json.Pretty(resp.Payload)
-		if err != nil {
-			return err
-		}
-		fmt.Println(*prettyJSON)
+		printPayload(resp.Payload)
 		return nil
 	},
 }

cmd/getClusterConfig.go

@@ -0,0 +1,48 @@
+// Copyright © 2023
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+	"github.com/equinor/radix-cli/generated/radixapi/client/configuration"
+	"github.com/equinor/radix-cli/pkg/client"
+	"github.com/spf13/cobra"
+)
+
+// getClusterConfigCmd represents the get-cluster-config command
+var getClusterConfigCmd = &cobra.Command{
+	Use:   "cluster-config",
+	Short: "Gets setting from Radix cluster config",
+	Long:  `Helper functionality to get data from radix cluster config.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+
+		apiClient, err := client.GetRadixApiForCommand(cmd)
+		if err != nil {
+			return err
+		}
+
+		payload, err := apiClient.Configuration.GetConfiguration(configuration.NewGetConfigurationParams(), nil)
+		if err != nil {
+			return err
+		}
+
+		printPayload(payload.Payload)
+		return nil
+	},
+}
+
+func init() {
+	getCmd.AddCommand(getClusterConfigCmd)
+	setContextSpecificPersistentFlags(getClusterConfigCmd)
+}

cmd/root.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"runtime/debug"
@@ -12,8 +13,10 @@ import (
 	"github.com/equinor/radix-cli/pkg/flagnames"
 	"github.com/equinor/radix-cli/pkg/settings"
 	"github.com/equinor/radix-cli/pkg/utils/completion"
+	"github.com/mattn/go-isatty"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"github.com/tidwall/pretty"
 )
 
 var Version = "dev"
@@ -88,3 +91,16 @@ func awaitReconciliation(checkFunc checkFn) bool {
 		}
 	}
 }
+
+func printPayload(payload any) {
+	jsonData, err := json.MarshalIndent(payload, "", "  ")
+	if err != nil {
+		log.Fatalf("failed to print payload as json: %v", err)
+	}
+
+	if isatty.IsTerminal(os.Stdout.Fd()) || isatty.IsCygwinTerminal(os.Stdout.Fd()) {
+		jsonData = pretty.Color(jsonData, nil)
+	}
+
+	fmt.Println(string(jsonData))
+}