fix: global region and missing string methods (#857)

* fix(resources): add string method to missing resources

* fix(awsutil): support pseudo global region for specific services

Author: ekristen

pkg/awsutil/config.go

@@ -19,6 +19,23 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+// GlobalServices is the set of AWS services that operate globally
+// and should only be processed in the "global" pseudo-region.
+// The keys are the service IDs as returned by middleware.GetServiceID(ctx).
+var GlobalServices = map[string]struct{}{
+	"CloudFront":               {},
+	"IAM":                      {},
+	"Route 53":                 {},
+	"WAF":                      {}, // WAF Classic (global)
+	"CloudFront KeyValueStore": {},
+}
+
+// IsGlobalService returns true if the service should only run in global region
+func IsGlobalService(service string) bool {
+	_, ok := GlobalServices[service]
+	return ok
+}
+
 func (c *Credentials) NewConfig(ctx context.Context, region, serviceType string) (*aws.Config, error) {
 	log.Debugf("creating new config in %s for %s", region, serviceType)
 
@@ -73,6 +90,10 @@ func (c *Credentials) NewConfig(ctx context.Context, region, serviceType string)
 			cfgCopy.APIOptions = append(cfgCopy.APIOptions, func(stack *middleware.Stack) error {
 				return stack.Initialize.Add(SkipGlobal{}, middleware.After)
 			})
+		} else {
+			cfgCopy.APIOptions = append(cfgCopy.APIOptions, func(stack *middleware.Stack) error {
+				return stack.Initialize.Add(SkipRegionalForGlobalService{}, middleware.After)
+			})
 		}
 		cfg = &cfgCopy
 	}
@@ -153,29 +174,9 @@ func (c *Credentials) rootConfig(ctx context.Context) (*aws.Config, error) {
 	return c.cfg, nil
 }
 
-// SkipGlobal returns ErrSkipRequest when operating in the global
-// pseudo-region.
-//
-// FUTURE: define mechanism for allowing specific resources, such as those in
-// IAM, to override this skip.
-//
-// The simplest way to do this would be to remove this middleware through
-// functional options on relevant operations. e.g.:
-//
-//	 func isGlobalResource(o *iam.Options) {
-//		o.APIOptions = append(o.APIOptions, func(stack *middleware.Stack) error {
-//			stack.Initialize.Remove(config.SkipGlobal{}.ID())
-//		})
-//	 }
-//
-//	 // per-operation
-//	 out, err := svc.ListRoles(context.Background(), nil, isGlobalResource)
-//	 // on a client, if you know you're only operating in the context of global resources
-//	 svc := iam.NewFromConfig(cfg, isGlobalResource)
-//
-// You could also define some kind of "is global resource" Context flag, which
-// SkipGlobal could react to. That may be preferrable to having SkipGlobal be
-// exported from this package.
+// SkipGlobal skips requests for non-global services when operating in the
+// global pseudo-region. Global services (CloudFront, IAM, Route 53, etc.)
+// are allowed through, while regional services are skipped.
 type SkipGlobal struct{}
 
 func (SkipGlobal) ID() string {
@@ -187,7 +188,41 @@ func (SkipGlobal) HandleInitialize(
 ) (
 	out middleware.InitializeOutput, md middleware.Metadata, err error,
 ) {
-	return out, md, liberrors.ErrSkipRequest(fmt.Sprintf("skip global: '%s'", middleware.GetServiceID(ctx)))
+	service := middleware.GetServiceID(ctx)
+
+	if IsGlobalService(service) {
+		// Global service in global region - allow
+		return next.HandleInitialize(ctx, in)
+	}
+
+	// Non-global service in global region - skip
+	return out, md, liberrors.ErrSkipRequest(
+		fmt.Sprintf("service '%s' is not global, but the session is", service))
+}
+
+// SkipRegionalForGlobalService skips requests for global-only services
+// when operating in a non-global region context. This ensures global
+// services like CloudFront and IAM are only processed once in the
+// "global" pseudo-region rather than in every regional scan.
+type SkipRegionalForGlobalService struct{}
+
+func (SkipRegionalForGlobalService) ID() string {
+	return "aws-nuke::skipRegionalForGlobalService"
+}
+
+func (SkipRegionalForGlobalService) HandleInitialize(
+	ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler,
+) (
+	out middleware.InitializeOutput, md middleware.Metadata, err error,
+) {
+	service := middleware.GetServiceID(ctx)
+
+	if IsGlobalService(service) {
+		return out, md, liberrors.ErrSkipRequest(
+			fmt.Sprintf("service '%s' is global, but the session is not", service))
+	}
+
+	return next.HandleInitialize(ctx, in)
 }
 
 type traceRequest struct{}

resources/amp-scraper.go

@@ -69,3 +69,7 @@ func (f *AMPScraper) Remove(ctx context.Context) error {
 func (f *AMPScraper) Properties() types.Properties {
 	return types.NewPropertiesFromStruct(f)
 }
+
+func (f *AMPScraper) String() string {
+	return *f.ScraperID
+}

resources/amp-workspace.go

@@ -71,3 +71,7 @@ func (f *AMPWorkspace) Remove(ctx context.Context) error {
 func (f *AMPWorkspace) Properties() types.Properties {
 	return types.NewPropertiesFromStruct(f)
 }
+
+func (f *AMPWorkspace) String() string {
+	return *f.WorkspaceId
+}

resources/appconfig-applications.go

@@ -72,3 +72,7 @@ func (f *AppConfigApplication) Properties() types.Properties {
 		Set("ID", f.id).
 		Set("Name", f.name)
 }
+
+func (f *AppConfigApplication) String() string {
+	return *f.name
+}

resources/appconfig-configurationprofiles.go

@@ -92,3 +92,7 @@ func (f *AppConfigConfigurationProfile) Properties() types.Properties {
 		Set("ID", f.id).
 		Set("Name", f.name)
 }
+
+func (f *AppConfigConfigurationProfile) String() string {
+	return *f.name
+}

resources/appconfig-deploymentstrategies.go

@@ -77,3 +77,7 @@ func (f *AppConfigDeploymentStrategy) Properties() types.Properties {
 		Set("ID", f.id).
 		Set("Name", f.name)
 }
+
+func (f *AppConfigDeploymentStrategy) String() string {
+	return *f.name
+}

resources/appconfig-environments.go

@@ -88,3 +88,7 @@ func (f *AppConfigEnvironment) Properties() types.Properties {
 		Set("ID", f.id).
 		Set("Name", f.name)
 }
+
+func (f *AppConfigEnvironment) String() string {
+	return *f.name
+}

resources/appconfig-hostedconfigurationversions.go

@@ -2,6 +2,7 @@ package resources
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/sirupsen/logrus"
 
@@ -90,3 +91,7 @@ func (f *AppConfigHostedConfigurationVersion) Properties() types.Properties {
 		Set("ConfigurationProfileID", f.configurationProfileID).
 		Set("VersionNumber", f.versionNumber)
 }
+
+func (f *AppConfigHostedConfigurationVersion) String() string {
+	return fmt.Sprintf("%d", *f.versionNumber)
+}

resources/appmesh-gatewayroute.go

@@ -119,3 +119,7 @@ func (f *AppMeshGatewayRoute) Properties() types.Properties {
 
 	return properties
 }
+
+func (f *AppMeshGatewayRoute) String() string {
+	return *f.routeName
+}

resources/appmesh-mesh.go

@@ -78,3 +78,7 @@ func (f *AppMeshMesh) Properties() types.Properties {
 
 	return properties
 }
+
+func (f *AppMeshMesh) String() string {
+	return *f.meshName
+}