Merge pull request #702 from gocardless/benwh/no-init-empty-file

Prevent stolonctl init with empty file
sorintlab · Oct 8, 2019 · 182e091 · 182e091
2 parents cd21db4 + 5bd0ef2
commit 182e091
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/cmd/stolonctl/cmd/init.go b/cmd/stolonctl/cmd/init.go
@@ -51,12 +51,15 @@ func initCluster(cmd *cobra.Command, args []string) {
 		die("too many arguments")
 	}
 
+	dataSupplied := false
 	data := []byte{}
 	switch len(args) {
 	case 1:
+		dataSupplied = true
 		data = []byte(args[0])
 	case 0:
 		if initOpts.file != "" {
+			dataSupplied = true
 			var err error
 			if initOpts.file == "-" {
 				data, err = ioutil.ReadAll(os.Stdin)
@@ -104,14 +107,14 @@ func initCluster(cmd *cobra.Command, args []string) {
 	}
 
 	var cs *cluster.ClusterSpec
-	if len(data) == 0 {
-		// Define a new cluster spec with initMode "new"
-		cs = &cluster.ClusterSpec{}
-		cs.InitMode = cluster.ClusterInitModeP(cluster.ClusterInitModeNew)
-	} else {
+	if dataSupplied {
 		if err := json.Unmarshal(data, &cs); err != nil {
 			die("failed to unmarshal cluster spec: %v", err)
 		}
+	} else {
+		// Define a new cluster spec with initMode "new"
+		cs = &cluster.ClusterSpec{}
+		cs.InitMode = cluster.ClusterInitModeP(cluster.ClusterInitModeNew)
 	}
 
 	if err := cs.Validate(); err != nil {