feat: add --logs-collector-enabled flag to kubernetes create Fixes #485

cmd/apikey/apikey_remove.go

@@ -58,7 +58,7 @@ var apikeyRemoveCmd = &cobra.Command{
 				os.Exit(1)
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 
 	},

cmd/apikey/apikey_save.go

@@ -60,6 +60,11 @@ var apikeySaveCmd = &cobra.Command{
 		}
 
 		if len(args) == 0 && !loadAPIKeyFromEnv {
+			if common.Quiet {
+				utility.Error("name and API key are required when --quiet is set (interactive prompts are disabled); run 'civo apikey save NAME APIKEY' or use --load-from-env")
+				os.Exit(1)
+			}
+
 			reader := bufio.NewReader(os.Stdin)
 			fmt.Printf("Enter a nice name for this account/API Key: ")
 
@@ -140,7 +145,9 @@ var apikeySaveCmd = &cobra.Command{
 		case "custom":
 			ow.WriteCustomOutput(common.OutputFields)
 		default:
-			fmt.Printf("Saved the API Key %s\n", utility.Green(name))
+			if !common.Quiet {
+				fmt.Printf("Saved the API Key %s\n", utility.Green(name))
+			}
 		}
 
 	},

cmd/database/database_backup_delete.go

@@ -113,7 +113,7 @@ var dbBackupDeleteCmd = &cobra.Command{
 					pluralize.Has(len(backupList)))
 			}
 		} else {
-			fmt.Println("Operation aborted")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/database/database_create.go

@@ -176,8 +176,7 @@ var dbCreateCmd = &cobra.Command{
 			startTime := utility.StartTime()
 
 			stillCreating := true
-			s := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
-			s.Writer = os.Stderr
+			s := utility.NewSpinner(spinner.CharSets[9], 100*time.Millisecond)
 			s.Prefix = fmt.Sprintf("Create a database called %s ", db.Name)
 			s.Start()
 
@@ -205,10 +204,12 @@ var dbCreateCmd = &cobra.Command{
 		case "custom":
 			ow.WriteCustomOutput(common.OutputFields)
 		default:
-			if executionTime != "" {
-				fmt.Printf("Database (%s) type %s version %s with ID %s and size %s has been created in %s\nTo get fetch the database credentials use the command:\n\ncivo database credentials %s\n", utility.Green(db.Name), strings.ToLower(db.Software), db.SoftwareVersion, db.ID, db.Size, executionTime, db.Name)
-			} else {
-				fmt.Printf("Database (%s) type %s version %s with ID %s and size %s has been created\nTo get fetch the database credentials use the command:\n\ncivo database credentials %s\n", utility.Green(db.Name), strings.ToLower(db.Software), db.SoftwareVersion, db.ID, db.Size, db.Name)
+			if !common.Quiet {
+				if executionTime != "" {
+					fmt.Printf("Database (%s) type %s version %s with ID %s and size %s has been created in %s\nTo get fetch the database credentials use the command:\n\ncivo database credentials %s\n", utility.Green(db.Name), strings.ToLower(db.Software), db.SoftwareVersion, db.ID, db.Size, executionTime, db.Name)
+				} else {
+					fmt.Printf("Database (%s) type %s version %s with ID %s and size %s has been created\nTo get fetch the database credentials use the command:\n\ncivo database credentials %s\n", utility.Green(db.Name), strings.ToLower(db.Software), db.SoftwareVersion, db.ID, db.Size, db.Name)
+				}
 			}
 		}
 	},

cmd/database/database_credential.go

@@ -46,10 +46,11 @@ var dbCredentialCmd = &cobra.Command{
 
 		// Add check for database status
 		if db.Status == "Pending" {
-			fmt.Printf("The DB %s is currently being provisioned, please wait...\n", utility.Green(db.Name))
+			if !common.Quiet {
+				fmt.Printf("The DB %s is currently being provisioned, please wait...\n", utility.Green(db.Name))
+			}
 
-			s := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
-			s.Writer = os.Stderr
+			s := utility.NewSpinner(spinner.CharSets[9], 100*time.Millisecond)
 			s.Prefix = fmt.Sprintf("Waiting for database (%s)... ", db.Name)
 			s.Start()
 

cmd/database/database_delete.go

@@ -102,7 +102,7 @@ var dbDeleteCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/domain/domain_record_remove.go

@@ -105,7 +105,7 @@ var domainRecordRemoveCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 
 	},

cmd/domain/domain_remove.go

@@ -93,7 +93,7 @@ var domainRemoveCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/firewall/firewall_remove.go

@@ -97,7 +97,7 @@ var firewallRemoveCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/firewall/firewall_rule_remove.go

@@ -109,7 +109,7 @@ var firewallRuleRemoveCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 
 	},

cmd/instance/instance_create.go

@@ -300,8 +300,7 @@ If you wish to use a custom format, the available fields are:
 
 		if wait {
 			stillCreating := true
-			s := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
-			s.Writer = os.Stderr
+			s := utility.NewSpinner(spinner.CharSets[9], 100*time.Millisecond)
 			s.Prefix = fmt.Sprintf("Creating instance (%s)... ", resp.Hostname)
 			s.Start()
 
@@ -331,10 +330,12 @@ If you wish to use a custom format, the available fields are:
 		}
 
 		if common.OutputFormat == common.OutputFormatHuman {
-			if executionTime != "" {
-				fmt.Printf("The instance %s %s has been created in %s\n", utility.Green(instance.Hostname), publicIP, executionTime)
-			} else {
-				fmt.Printf("The instance %s has been created\n", utility.Green(instance.Hostname))
+			if !common.Quiet {
+				if executionTime != "" {
+					fmt.Printf("The instance %s %s has been created in %s\n", utility.Green(instance.Hostname), publicIP, executionTime)
+				} else {
+					fmt.Printf("The instance %s has been created\n", utility.Green(instance.Hostname))
+				}
 			}
 		} else {
 			ow := utility.NewOutputWriter()

cmd/instance/instance_remove.go

@@ -104,7 +104,7 @@ If you wish to use a custom format, the available fields are:
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/instance/instance_stop.go

@@ -50,8 +50,7 @@ If you wish to use a custom format, the available fields are:
 
 		if waitStop {
 			stillStopping := true
-			s := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
-			s.Writer = os.Stderr
+			s := utility.NewSpinner(spinner.CharSets[9], 100*time.Millisecond)
 			s.Prefix = "Stopping instance... "
 			s.Start()
 
@@ -71,7 +70,9 @@ If you wish to use a custom format, the available fields are:
 		}
 
 		if common.OutputFormat == common.OutputFormatHuman {
-			fmt.Printf("The instance %s (%s) is being stopped\n", utility.Green(instance.Hostname), instance.ID)
+			if !common.Quiet {
+				fmt.Printf("The instance %s (%s) is being stopped\n", utility.Green(instance.Hostname), instance.ID)
+			}
 		} else {
 			ow := utility.NewOutputWriter()
 			ow.StartLine()

cmd/ip/ip_delete.go

@@ -66,7 +66,7 @@ Please make sure to delete your domains aren't pointed to it before deleting it.
 				fmt.Printf("IP called %s with ID %s was deleted\n", utility.Green(ip.Name), utility.Green(ip.ID))
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/kubernetes/kubernetes.go

@@ -104,6 +104,7 @@ func init() {
 	kubernetesCreateCmd.Flags().StringVarP(&cniPlugin, "cni-plugin", "p", "flannel", "optional, possible options: flannel,cilium.")
 	kubernetesCreateCmd.Flags().StringVarP(&clusterType, "cluster-type", "", "k3s", "optional, possible options: k3s,talos.")
 	kubernetesCreateCmd.Flags().StringVar(&volumeType, "volume-type", "", "optional, volume-type name as returned by 'civo volumetypes ls'")
+	kubernetesCreateCmd.Flags().BoolVar(&logsCollectorEnabled, "logs-collector-enabled", true, "optional, disabling this will prevent you from seeing logs in the Civo platform dashboard, but it will save node resources. Disabled by default on small and xsmall standard nodes")
 
 	kubernetesRenameCmd.Flags().StringVarP(&kubernetesNewName, "name", "n", "", "the new name for the cluster.")
 

cmd/kubernetes/kubernetes_config.go

@@ -93,7 +93,7 @@ If you wish to use a custom format, the available fields are:
 						os.Exit(1)
 					}
 				} else {
-					fmt.Println("Operation aborted.")
+					utility.Error("Operation aborted.")
 					os.Exit(1)
 				}
 			} else {

cmd/kubernetes/kubernetes_create.go

@@ -212,7 +212,7 @@ var kubernetesCreateCmd = &cobra.Command{
 					os.Exit(1)
 				}
 			} else {
-				fmt.Println("Operation aborted.")
+				utility.Error("Operation aborted.")
 				os.Exit(1)
 			}
 		} else {
@@ -233,8 +233,7 @@ var kubernetesCreateCmd = &cobra.Command{
 			startTime := utility.StartTime()
 
 			stillCreating := true
-			s := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
-			s.Writer = os.Stderr
+			s := utility.NewSpinner(spinner.CharSets[9], 100*time.Millisecond)
 			s.Prefix = fmt.Sprintf("Creating a %d node %s cluster of %s instances called %s... ", kubernetesCluster.NumTargetNode, clusterType, kubernetesCluster.TargetNodeSize, kubernetesCluster.Name)
 			s.Start()
 
@@ -278,10 +277,12 @@ var kubernetesCreateCmd = &cobra.Command{
 		case "custom":
 			ow.WriteCustomOutput(common.OutputFields)
 		default:
-			if executionTime != "" {
-				fmt.Printf("The cluster %s (%s) has been created in %s\n", utility.Green(kubernetesCluster.Name), kubernetesCluster.ID, executionTime)
-			} else {
-				fmt.Printf("The cluster %s (%s) has been created\n", utility.Green(kubernetesCluster.Name), kubernetesCluster.ID)
+			if !common.Quiet {
+				if executionTime != "" {
+					fmt.Printf("The cluster %s (%s) has been created in %s\n", utility.Green(kubernetesCluster.Name), kubernetesCluster.ID, executionTime)
+				} else {
+					fmt.Printf("The cluster %s (%s) has been created\n", utility.Green(kubernetesCluster.Name), kubernetesCluster.ID)
+				}
 			}
 
 		}

cmd/kubernetes/kubernetes_nodepool_delete.go

@@ -108,7 +108,7 @@ var kubernetesNodePoolDeleteCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/kubernetes/kubernetes_nodepool_instance_delete.go

@@ -78,7 +78,7 @@ var kubernetesNodePoolInstanceDeleteCmd = &cobra.Command{
 				fmt.Printf("Instance %s has been deleted from node pool %s in cluster %s\n", instanceID, nodePoolID, kubernetesFindCluster.Name)
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/kubernetes/kubernetes_remove.go

@@ -128,7 +128,7 @@ var kubernetesRemoveCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/network/network_remove.go

@@ -113,7 +113,7 @@ var networkRemoveCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted.")
+			utility.Error("Operation aborted.")
 		}
 
 	},

cmd/objectstore/objectstore_create.go

@@ -64,13 +64,22 @@ var objectStoreCreateCmd = &cobra.Command{
 			utility.Error("The minimum size to create an object store is 500 GB. Please provide a valid size.")
 			os.Exit(1)
 		} else if bucketSize%500 != 0 {
-			utility.YellowConfirm("The size to create an object store must be a multiple of 500. Would you like to create an %s of %d GB instead? (y/n) ? ", utility.Green("object store"), bucketSize+(500-bucketSize%500))
-			_, err := utility.UserAccepts(os.Stdin)
-			if err != nil {
-				utility.Error("Unable to parse the input: %s", err)
-				os.Exit(1)
+			roundedSize := bucketSize + (500 - bucketSize%500)
+			if common.Quiet {
+				if !common.DefaultYes {
+					utility.Error("The size to create an object store must be a multiple of 500 GB; re-run with --size %d, or combine --quiet with --yes to round up automatically", roundedSize)
+					os.Exit(1)
+				}
+				bucketSize = roundedSize
+			} else {
+				utility.YellowConfirm("The size to create an object store must be a multiple of 500. Would you like to create an %s of %d GB instead? (y/n) ? ", utility.Green("object store"), roundedSize)
+				_, err := utility.UserAccepts(os.Stdin)
+				if err != nil {
+					utility.Error("Unable to parse the input: %s", err)
+					os.Exit(1)
+				}
+				bucketSize = roundedSize
 			}
-			bucketSize = bucketSize + (500 - bucketSize%500)
 		}
 
 		var credential *civogo.ObjectStoreCredential
@@ -107,8 +116,7 @@ var objectStoreCreateCmd = &cobra.Command{
 		if waitOS {
 			startTime := utility.StartTime()
 			stillCreating := true
-			s := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
-			s.Writer = os.Stderr
+			s := utility.NewSpinner(spinner.CharSets[9], 100*time.Millisecond)
 			s.Prefix = fmt.Sprintf("Creating an Object Store with maxSize %d, called %s... ", store.MaxSize, store.Name)
 			s.Start()
 
@@ -143,13 +151,15 @@ var objectStoreCreateCmd = &cobra.Command{
 		case "custom":
 			ow.WriteCustomOutput(common.OutputFields)
 		default:
-			if waitOS {
-				fmt.Printf("Created Object Store %s in %s in %s\n", utility.Green(objectStore.Name), utility.Green(client.Region), executionTime)
-				fmt.Printf("Created default admin credentials, access key is %s, this will be deleted if the Object Store is deleted. ", utility.Green(objectStore.OwnerInfo.AccessKeyID))
-				fmt.Printf("To access the secret key run: civo objectstore credential secret --access-key=%s\n", utility.Green(objectStore.OwnerInfo.AccessKeyID))
-			} else {
-				fmt.Printf("Creating Object Store %s in %s\n", utility.Green(objectStore.Name), utility.Green(client.Region))
-				fmt.Printf("To check the status of the Object Store run: civo objectstore show %s\n", utility.Green(objectStore.Name))
+			if !common.Quiet {
+				if waitOS {
+					fmt.Printf("Created Object Store %s in %s in %s\n", utility.Green(objectStore.Name), utility.Green(client.Region), executionTime)
+					fmt.Printf("Created default admin credentials, access key is %s, this will be deleted if the Object Store is deleted. ", utility.Green(objectStore.OwnerInfo.AccessKeyID))
+					fmt.Printf("To access the secret key run: civo objectstore credential secret --access-key=%s\n", utility.Green(objectStore.OwnerInfo.AccessKeyID))
+				} else {
+					fmt.Printf("Creating Object Store %s in %s\n", utility.Green(objectStore.Name), utility.Green(client.Region))
+					fmt.Printf("To check the status of the Object Store run: civo objectstore show %s\n", utility.Green(objectStore.Name))
+				}
 			}
 		}
 	},

cmd/objectstore/objectstore_credential_create.go

@@ -57,8 +57,7 @@ var objectStoreCredentialCreateCmd = &cobra.Command{
 		if waitOS {
 			startTime := utility.StartTime()
 			stillCreating := true
-			s := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
-			s.Writer = os.Stderr
+			s := utility.NewSpinner(spinner.CharSets[9], 100*time.Millisecond)
 			s.Prefix = fmt.Sprintf("Creating an Object Store Credential with maxSize %d, called %s... ", credential.MaxSizeGB, credential.Name)
 			s.Start()
 
@@ -92,10 +91,12 @@ var objectStoreCredentialCreateCmd = &cobra.Command{
 		case "custom":
 			ow.WriteCustomOutput(common.OutputFields)
 		default:
-			if waitOS {
-				fmt.Printf("Created Object Store Credential %s in %s in %s\n", utility.Green(objectStoreCred.Name), utility.Green(client.Region), executionTime)
-			} else {
-				fmt.Printf("Creating Object Store Credential %s in %s\n", utility.Green(objectStoreCred.Name), utility.Green(client.Region))
+			if !common.Quiet {
+				if waitOS {
+					fmt.Printf("Created Object Store Credential %s in %s in %s\n", utility.Green(objectStoreCred.Name), utility.Green(client.Region), executionTime)
+				} else {
+					fmt.Printf("Creating Object Store Credential %s in %s\n", utility.Green(objectStoreCred.Name), utility.Green(client.Region))
+				}
 			}
 		}
 	},

cmd/objectstore/objectstore_credential_delete.go

@@ -102,7 +102,7 @@ var objectStoreCredentialDeleteCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/objectstore/objectstore_delete.go

@@ -103,7 +103,7 @@ var objectStoreDeleteCmd = &cobra.Command{
 				)
 			}
 		} else {
-			fmt.Println("Operation aborted")
+			utility.Error("Operation aborted.")
 		}
 	},
 }

cmd/root.go

@@ -142,6 +142,7 @@ func init() {
 	rootCmd.PersistentFlags().BoolVarP(&common.DefaultYes, "yes", "y", false, "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run non-interactively")
 	rootCmd.PersistentFlags().StringVarP(&common.RegionSet, "region", "", "", "Choose the region to connect to, if you use this option it will use it over the default region")
 	rootCmd.PersistentFlags().BoolVarP(&common.PrettySet, "pretty", "", false, "Print pretty the json output")
+	rootCmd.PersistentFlags().BoolVarP(&common.Quiet, "quiet", "q", false, "Suppress interactive prompts, progress indicators and non-error output; useful for scripting. Prompts that would otherwise require confirmation will fail the command instead - combine with --yes to auto-confirm them")
 	rootCmd.Flags().BoolVarP(&version, "version", "v", false, "Print the version of the CLI")
 
 	rootCmd.AddCommand(apikey.APIKeyCmd)