update: load config in index related commands

Signed-off-by: Lorenzo Susini <[email protected]>
Co-authored-by: Aldo Lacuku <[email protected]>

Author: 2 people

internal/index/add/index_add.go

@@ -29,24 +29,33 @@ import (
 	"github.com/falcosecurity/falcoctl/pkg/options"
 )
 
-type indexAddOptions struct {
+// IndexAddOptions contains the options for the index add command.
+type IndexAddOptions struct {
 	*options.CommonOptions
 }
 
-func (o *indexAddOptions) Validate(args []string) error {
+// Validate is used to make sure that required directories are existing in the filesystem.
+func (o *IndexAddOptions) Validate(args []string) error {
 	// TODO(loresuso): we should move this logic elsewhere
 	if _, err := os.Stat(config.FalcoctlPath); os.IsNotExist(err) {
 		err = os.Mkdir(config.FalcoctlPath, 0o700)
 		if err != nil {
 			return err
 		}
 	}
+
+	if _, err := os.Stat(config.IndexesDir); os.IsNotExist(err) {
+		err = os.Mkdir(config.IndexesDir, 0o700)
+		if err != nil {
+			return err
+		}
+	}
 	return nil
 }
 
 // NewIndexAddCmd returns the index add command.
 func NewIndexAddCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command {
-	o := indexAddOptions{
+	o := IndexAddOptions{
 		CommonOptions: opt,
 	}
 
@@ -67,12 +76,12 @@ func NewIndexAddCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Comm
 	return cmd
 }
 
-func (o *indexAddOptions) RunIndexAdd(ctx context.Context, args []string) error {
+// RunIndexAdd implements the index add command.
+func (o *IndexAddOptions) RunIndexAdd(ctx context.Context, args []string) error {
 	name := args[0]
 	nameYaml := fmt.Sprintf("%s%s", name, ".yaml")
 	url := args[1]
-
-	indexFile := filepath.Join(config.FalcoctlPath, nameYaml)
+	indexFile := filepath.Join(config.IndexesDir, nameYaml)
 
 	indexConfig, err := index.NewConfig(config.IndexesFile)
 	if err != nil {
@@ -110,5 +119,26 @@ func (o *indexAddOptions) RunIndexAdd(ctx context.Context, args []string) error
 		return err
 	}
 
+	currentIndexes, err := config.Indexes()
+	if err != nil {
+		return fmt.Errorf("unable to get indexes from viper: %w", err)
+	}
+
+	for _, i := range currentIndexes {
+		if i.Name == name {
+			o.Printer.Verbosef("index with name %q already exists in the config file %q", name, config.ConfigPath)
+			return nil
+		}
+	}
+
+	currentIndexes = append(currentIndexes, config.Index{
+		Name: name,
+		URL:  url,
+	})
+
+	if err := config.UpdateConfigFile(config.IndexesKey, currentIndexes, o.ConfigFile); err != nil {
+		return fmt.Errorf("unable to update indexes list in the config file %q: %w", config.ConfigPath, err)
+	}
+
 	return nil
 }

internal/index/remove/remove.go

@@ -74,21 +74,38 @@ func NewIndexRemoveCmd(ctx context.Context, opt *options.CommonOptions) *cobra.C
 }
 
 func (o *indexRemoveOptions) RunIndexRemove(ctx context.Context, args []string) error {
+	currentIndexes, err := config.Indexes()
+	if err != nil {
+		return fmt.Errorf("unable to get indexes from viper: %w", err)
+	}
+
 	for _, name := range args {
 		nameYaml := fmt.Sprintf("%s%s", name, ".yaml")
-		indexFile := filepath.Join(config.FalcoctlPath, nameYaml)
+		indexFile := filepath.Join(config.IndexesDir, nameYaml)
 		if err := o.indexConfig.Remove(name); err != nil {
 			return err
 		}
 
 		if err := os.Remove(indexFile); err != nil {
 			return err
 		}
+
+		for i, ind := range currentIndexes {
+			if ind.Name == name {
+				o.Printer.Verbosef("index with name %q exists in the config file %q, removing", name, config.ConfigPath)
+				currentIndexes = append(currentIndexes[:i], currentIndexes[i+1:]...)
+				break
+			}
+		}
 	}
 
 	if err := o.indexConfig.Write(config.IndexesFile); err != nil {
 		return err
 	}
 
+	if err := config.UpdateConfigFile(config.IndexesKey, currentIndexes, o.ConfigFile); err != nil {
+		return fmt.Errorf("unable to update indexes list in the config file %q: %w", config.ConfigPath, err)
+	}
+
 	return nil
 }

internal/index/update/update.go

@@ -78,7 +78,7 @@ func (o *indexUpdateOptions) RunIndexUpdate(ctx context.Context, args []string)
 
 	for _, name := range args {
 		nameYaml := fmt.Sprintf("%s%s", name, ".yaml")
-		indexFile := filepath.Join(config.FalcoctlPath, nameYaml)
+		indexFile := filepath.Join(config.IndexesDir, nameYaml)
 
 		indexConfigEntry, err := o.indexConfig.Get(name)
 		if err != nil {