feat: expand resource names using globs

oreillymedia · Dec 26, 2024 · b190ddf · b190ddf
1 parent d98053b
commit b190ddf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/pkg/commands/list/list.go b/pkg/commands/list/list.go
@@ -1,7 +1,6 @@
 package list
 
 import (
-	"sort"
 	"strings"
 
 	"github.com/fatih/color"
@@ -15,9 +14,12 @@ import (
 )
 
 func execute(c *cli.Context) error {
-	ls := registry.GetNames()
-
-	sort.Strings(ls)
+	var ls []string
+	if c.Args().Len() > 0 {
+		ls = registry.ExpandNames(c.Args().Slice())
+	} else {
+		ls = registry.GetNames()
+	}
 
 	for _, name := range ls {
 		if strings.HasPrefix(name, "AWS::") {

diff --git a/pkg/commands/nuke/nuke.go b/pkg/commands/nuke/nuke.go
@@ -141,17 +141,17 @@ func execute(c *cli.Context) error { //nolint:funlen,gocyclo
 	resourceTypes := types.ResolveResourceTypes(
 		registry.GetNames(),
 		[]types.Collection{
-			n.Parameters.Includes,
+			registry.ExpandNames(n.Parameters.Includes),
 			parsedConfig.ResourceTypes.GetIncludes(),
 			accountConfig.ResourceTypes.GetIncludes(),
 		},
 		[]types.Collection{
-			n.Parameters.Excludes,
+			registry.ExpandNames(n.Parameters.Excludes),
 			parsedConfig.ResourceTypes.Excludes,
 			accountConfig.ResourceTypes.Excludes,
 		},
 		[]types.Collection{
-			n.Parameters.Alternatives,
+			registry.ExpandNames(n.Parameters.Alternatives),
 			parsedConfig.ResourceTypes.GetAlternatives(),
 			accountConfig.ResourceTypes.GetAlternatives(),
 		},