Brokers switch and deletion logic update (#79)

tzununbekov · web-flow · commit 7ee9b75e9adf · 2022-10-18T13:33:54.000+06:00
* Brokers switch and deletion clarified
diff --git a/cmd/brokers/brokers.go b/cmd/brokers/brokers.go
@@ -29,11 +29,17 @@ import (
 const manifestFile = "manifest.yaml"
 
 func NewCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:     "brokers",
-		Aliases: []string{"list"},
-		Short:   "Show the list of brokers",
+	var broker string
+	brokersCmd := &cobra.Command{
+		Use:   "brokers [--set <broker>]",
+		Short: "Show the list of brokers",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			if broker != "" {
+				viper.Set("context", broker)
+				if err := viper.WriteConfig(); err != nil {
+					return err
+				}
+			}
 			list, err := List(path.Dir(viper.ConfigFileUsed()), viper.GetString("context"))
 			if err != nil {
 				return err
@@ -45,6 +51,8 @@ func NewCmd() *cobra.Command {
 			return nil
 		},
 	}
+	brokersCmd.Flags().StringVar(&broker, "set", "", "Change the current broker")
+	return brokersCmd
 }
 
 func List(configDir, currentContext string) ([]string, error) {
diff --git a/cmd/delete/delete.go b/cmd/delete/delete.go
@@ -53,7 +53,7 @@ func NewCmd() *cobra.Command {
 			if deleteBroker != "" {
 				return o.deleteBroker(deleteBroker)
 			}
-			return o.deleteComponents(args)
+			return o.deleteComponents(args, false)
 		},
 	}
 	deleteCmd.Flags().StringVar(&deleteBroker, "broker", "", "Delete the broker")
@@ -63,7 +63,7 @@ func NewCmd() *cobra.Command {
 func (o *DeleteOptions) deleteBroker(broker string) error {
 	oo := *o
 	oo.Context = broker
-	if err := oo.deleteComponents([]string{}); err != nil {
+	if err := oo.deleteComponents([]string{}, true); err != nil {
 		return fmt.Errorf("deleting component: %w", err)
 	}
 	if err := os.RemoveAll(path.Join(o.ConfigDir, broker)); err != nil {
@@ -75,7 +75,7 @@ func (o *DeleteOptions) deleteBroker(broker string) error {
 	return nil
 }
 
-func (o *DeleteOptions) deleteComponents(components []string) error {
+func (o *DeleteOptions) deleteComponents(components []string, force bool) error {
 	ctx := context.Background()
 	client, err := docker.NewClient()
 	if err != nil {
@@ -99,14 +99,13 @@ func (o *DeleteOptions) deleteComponents(components []string) error {
 		if skip {
 			continue
 		}
-		log.Printf("Deleting %q %s", object.Metadata.Name, strings.ToLower(object.Kind))
 		if object.Kind == "Broker" {
-			if len(components) > 0 {
-				log.Printf("skipping %q, use \"--broker <name>\" to delete the broker", object.Metadata.Name)
+			if !force {
 				continue
 			}
 			object.Metadata.Name += "-broker"
 		}
+		log.Printf("Deleting %q %s", object.Metadata.Name, strings.ToLower(object.Kind))
 		o.stopContainer(ctx, object.Metadata.Name, client)
 		o.removeObject(object.Metadata.Name, currentManifest)
 		o.cleanupTriggers(object.Metadata.Name, currentManifest)
