Skip to content

Commit 9aa0e89

Browse files
feat: update filters add & remove to be more consistent
Signed-off-by: Matthis Holleville <[email protected]>
1 parent 0a12448 commit 9aa0e89

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ k8sgpt filters add [filter(s)]
109109
### Examples :
110110

111111
- Simple filter : `k8sgpt filters add Service`
112-
- Multiple filters : `k8sgpt filters add Ingress Pod`
112+
- Multiple filters : `k8sgpt filters add Ingress,Pod`
113113

114114
_Add default filters_
115115

@@ -120,7 +120,7 @@ k8sgpt filters remove [filter(s)]
120120
### Examples :
121121

122122
- Simple filter : `k8sgpt filters remove Service`
123-
- Multiple filters : `k8sgpt filters remove Ingress Pod`
123+
- Multiple filters : `k8sgpt filters remove Ingress,Pod`
124124

125125
_Run a scan with the default analyzers_
126126

cmd/filters/add.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ var addCmd = &cobra.Command{
1515
Use: "add [filter(s)]",
1616
Short: "Adds one or more new filters.",
1717
Long: `The add command adds one or more new filters to the default set of filters used by the analyze.`,
18-
Args: cobra.MinimumNArgs(1),
18+
Args: cobra.ExactArgs(1),
1919
Run: func(cmd *cobra.Command, args []string) {
20+
filters := strings.Split(args[0], ",")
2021

2122
// Verify filter exist
2223
invalidFilters := []string{}
23-
for _, f := range args {
24+
for _, f := range filters {
2425
foundFilter := false
2526
for _, filter := range analyzer.ListFilters() {
2627
if filter == f {
@@ -44,7 +45,7 @@ var addCmd = &cobra.Command{
4445
defaultFilters = []string{}
4546
}
4647

47-
mergedFilters := append(defaultFilters, args...)
48+
mergedFilters := append(defaultFilters, filters...)
4849

4950
uniqueFilters, dupplicatedFilters := util.RemoveDuplicates(mergedFilters)
5051

@@ -60,6 +61,6 @@ var addCmd = &cobra.Command{
6061
color.Red("Error writing config file: %s", err.Error())
6162
os.Exit(1)
6263
}
63-
color.Green("Filter %s added", strings.Join(args, ", "))
64+
color.Green("Filter %s added", strings.Join(filters, ", "))
6465
},
6566
}

cmd/filters/remove.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ var removeCmd = &cobra.Command{
1414
Use: "remove [filter(s)]",
1515
Short: "Remove one or more filters.",
1616
Long: `The add command remove one or more filters to the default set of filters used by the analyze.`,
17-
Args: cobra.MinimumNArgs(1),
17+
Args: cobra.ExactArgs(1),
1818
Run: func(cmd *cobra.Command, args []string) {
19+
filters := strings.Split(args[0], ",")
1920

2021
// Get defined default_filters
2122
defaultFilters := viper.GetStringSlice("default_filters")
@@ -24,7 +25,7 @@ var removeCmd = &cobra.Command{
2425
}
2526

2627
// verify dupplicate filters example: k8sgpt filters remove Pod Pod
27-
uniqueFilters, dupplicatedFilters := util.RemoveDuplicates(args)
28+
uniqueFilters, dupplicatedFilters := util.RemoveDuplicates(filters)
2829
if len(dupplicatedFilters) != 0 {
2930
color.Red("Duplicate filters found: %s", strings.Join(dupplicatedFilters, ", "))
3031
os.Exit(1)
@@ -57,6 +58,6 @@ var removeCmd = &cobra.Command{
5758
color.Red("Error writing config file: %s", err.Error())
5859
os.Exit(1)
5960
}
60-
color.Green("Filter(s) %s removed", strings.Join(args, ", "))
61+
color.Green("Filter(s) %s removed", strings.Join(filters, ", "))
6162
},
6263
}

0 commit comments

Comments
 (0)