From b190ddf5c63a581a2579eb0597396ded71c58db4 Mon Sep 17 00:00:00 2001 From: Erik Kristensen Date: Thu, 26 Dec 2024 14:00:33 -0700 Subject: [PATCH] feat: expand resource names using globs --- pkg/commands/list/list.go | 10 ++++++---- pkg/commands/nuke/nuke.go | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkg/commands/list/list.go b/pkg/commands/list/list.go index 7f4a580b..7bfa0633 100644 --- 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 index 69ec1b90..63d21954 100644 --- 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(), },