add client config validations

Author: Jeff McCormick

client/cmd/cluster.go

@@ -62,7 +62,7 @@ func showCluster(args []string) {
 	//each arg represents a cluster name or the special 'all' value
 	for _, arg := range args {
 		for _, cluster := range clusterList.Items {
-			fmt.Println("")
+			//fmt.Println("")
 			if arg == "all" || cluster.Spec.Name == arg {
 				itemFound = true
 				if PostgresVersion == "" || (PostgresVersion != "" && cluster.Spec.POSTGRES_FULL_VERSION == PostgresVersion) {
@@ -81,6 +81,7 @@ func showCluster(args []string) {
 					}
 				}
 			}
+			fmt.Println("")
 		}
 		if !itemFound {
 			fmt.Println(arg + " was not found")

client/cmd/root.go

@@ -17,10 +17,15 @@ package cmd
 import (
 	log "github.com/Sirupsen/logrus"
 	"os"
+	"strconv"
 
+	"github.com/crunchydata/postgres-operator/tpr"
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"k8s.io/client-go/pkg/api"
+	"k8s.io/client-go/pkg/api/resource"
 )
 
 var RED, GREEN func(a ...interface{}) string
@@ -119,11 +124,8 @@ func initConfig() {
 	}
 
 	log.Debug("namespace is " + viper.GetString("NAMESPACE"))
-	if viper.GetString("MASTER_STORAGE.STORAGE_TYPE") == "dynamic" ||
-		viper.GetString("REPLICA_STORAGE.STORAGE_TYPE") == "dynamic" {
-		log.Error("STORAGE_TYPE dynamic is not supported yet")
-		os.Exit(2)
-	}
+
+	validateConfig()
 
 	ConnectToKube()
 
@@ -137,3 +139,79 @@ func initConfig() {
 	*/
 
 }
+
+func validateConfig() {
+	switch viper.GetString("MASTER_STORAGE.PVC_ACCESS_MODE") {
+	case string(api.ReadWriteOnce), string(api.ReadWriteMany), string(api.ReadOnlyMany):
+	default:
+		log.Error("invalid MASTER_STORAGE.PVC_ACCESS_MODE specified")
+		os.Exit(2)
+	}
+	switch viper.GetString("REPLICA_STORAGE.PVC_ACCESS_MODE") {
+	case string(api.ReadWriteOnce), string(api.ReadWriteMany), string(api.ReadOnlyMany):
+	default:
+		log.Error("invalid REPLICA_STORAGE.PVC_ACCESS_MODE specified")
+		os.Exit(2)
+	}
+	switch viper.GetString("MASTER_STORAGE.STORAGE_TYPE") {
+	case tpr.STORAGE_EXISTING, tpr.STORAGE_CREATE, tpr.STORAGE_EMPTYDIR, tpr.STORAGE_DYNAMIC:
+	default:
+		log.Error("invalid MASTER_STORAGE.STORAGE_TYPE specified")
+		os.Exit(2)
+	}
+	switch viper.GetString("REPLICA_STORAGE.STORAGE_TYPE") {
+	case tpr.STORAGE_EXISTING, tpr.STORAGE_CREATE, tpr.STORAGE_EMPTYDIR, tpr.STORAGE_DYNAMIC:
+	default:
+		log.Error("invalid REPLICA_STORAGE.STORAGE_TYPE specified")
+		os.Exit(2)
+	}
+
+	if viper.GetString("MASTER_STORAGE.STORAGE_TYPE") == "dynamic" ||
+		viper.GetString("REPLICA_STORAGE.STORAGE_TYPE") == "dynamic" {
+		log.Error("STORAGE_TYPE dynamic is not supported yet")
+		os.Exit(2)
+	}
+
+	rep := viper.GetString("CLUSTER.REPLICAS")
+	if rep != "" {
+		_, err := strconv.Atoi(rep)
+		if err != nil {
+			log.Error("CLUSTER.REPLICAS not a valid integer")
+			os.Exit(2)
+		}
+	}
+	port := viper.GetString("CLUSTER.PORT")
+	if port != "" {
+		_, err := strconv.Atoi(port)
+		if err != nil {
+			log.Error("CLUSTER.PORT not a valid integer")
+			os.Exit(2)
+		}
+	}
+	strategy := viper.GetString("CLUSTER.STRATEGY")
+	if strategy != "" {
+		_, err := strconv.Atoi(strategy)
+		if err != nil {
+			log.Error("CLUSTER.STRATEGY not a valid integer")
+			os.Exit(2)
+		}
+	}
+
+	pvcsize := viper.GetString("MASTER_STORAGE.PVC_SIZE")
+	if pvcsize != "" {
+		_, err := resource.ParseQuantity(pvcsize)
+		if err != nil {
+			log.Error("MASTER_STORAGE.PVC_SIZE not a valid quantity")
+			os.Exit(2)
+		}
+	}
+	pvcsize = viper.GetString("REPLICA_STORAGE.PVC_SIZE")
+	if pvcsize != "" {
+		_, err := resource.ParseQuantity(pvcsize)
+		if err != nil {
+			log.Error("REPLICA_STORAGE.PVC_SIZE not a valid quantity")
+			os.Exit(2)
+		}
+	}
+
+}

tpr/common.go

@@ -24,6 +24,11 @@ const PGROOT_SECRET_SUFFIX = "-pgroot-secret"
 const PGUSER_SECRET_SUFFIX = "-pguser-secret"
 const PGMASTER_SECRET_SUFFIX = "-pgmaster-secret"
 
+const STORAGE_EXISTING = "existing"
+const STORAGE_CREATE = "create"
+const STORAGE_EMPTYDIR = "emptydir"
+const STORAGE_DYNAMIC = "dynamic"
+
 type PgStorageSpec struct {
 	PvcName       string `json:"pvcname"`
 	StorageClass  string `json:"storageclass"`