Skip to content

Commit b190ddf

Browse files
committed
feat: expand resource names using globs
1 parent d98053b commit b190ddf

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

pkg/commands/list/list.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package list
22

33
import (
4-
"sort"
54
"strings"
65

76
"github.com/fatih/color"
@@ -15,9 +14,12 @@ import (
1514
)
1615

1716
func execute(c *cli.Context) error {
18-
ls := registry.GetNames()
19-
20-
sort.Strings(ls)
17+
var ls []string
18+
if c.Args().Len() > 0 {
19+
ls = registry.ExpandNames(c.Args().Slice())
20+
} else {
21+
ls = registry.GetNames()
22+
}
2123

2224
for _, name := range ls {
2325
if strings.HasPrefix(name, "AWS::") {

pkg/commands/nuke/nuke.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,17 @@ func execute(c *cli.Context) error { //nolint:funlen,gocyclo
141141
resourceTypes := types.ResolveResourceTypes(
142142
registry.GetNames(),
143143
[]types.Collection{
144-
n.Parameters.Includes,
144+
registry.ExpandNames(n.Parameters.Includes),
145145
parsedConfig.ResourceTypes.GetIncludes(),
146146
accountConfig.ResourceTypes.GetIncludes(),
147147
},
148148
[]types.Collection{
149-
n.Parameters.Excludes,
149+
registry.ExpandNames(n.Parameters.Excludes),
150150
parsedConfig.ResourceTypes.Excludes,
151151
accountConfig.ResourceTypes.Excludes,
152152
},
153153
[]types.Collection{
154-
n.Parameters.Alternatives,
154+
registry.ExpandNames(n.Parameters.Alternatives),
155155
parsedConfig.ResourceTypes.GetAlternatives(),
156156
accountConfig.ResourceTypes.GetAlternatives(),
157157
},

0 commit comments

Comments
 (0)