refactor: add type-safe WrapGcpInitClient and fix missing Scope.Region

aws/resources/apigateway.go

@@ -22,6 +22,7 @@ func NewApiGateway() AwsResource {
 		ResourceTypeName: "apigateway",
 		BatchSize:        10,
 		InitClient: WrapAwsInitClient(func(r *resource.Resource[ApiGatewayAPI], cfg aws.Config) {
+			r.Scope.Region = cfg.Region
 			r.Client = apigateway.NewFromConfig(cfg)
 		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {

aws/resources/apigatewayv2.go

@@ -22,6 +22,7 @@ func NewApiGatewayV2() AwsResource {
 		ResourceTypeName: "apigatewayv2",
 		BatchSize:        10,
 		InitClient: WrapAwsInitClient(func(r *resource.Resource[ApiGatewayV2API], cfg aws.Config) {
+			r.Scope.Region = cfg.Region
 			r.Client = apigatewayv2.NewFromConfig(cfg)
 		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {

aws/resources/dynamodb.go

@@ -26,6 +26,7 @@ func NewDynamoDB() AwsResource {
 		ResourceTypeName: "dynamodb",
 		BatchSize:        DefaultBatchSize, // Tentative batch size to ensure AWS doesn't throttle
 		InitClient: WrapAwsInitClient(func(r *resource.Resource[DynamoDBAPI], cfg aws.Config) {
+			r.Scope.Region = cfg.Region
 			r.Client = dynamodb.NewFromConfig(cfg)
 		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {

aws/resources/ebs.go

@@ -25,6 +25,7 @@ func NewEBSVolumes() AwsResource {
 		ResourceTypeName: "ebs",
 		BatchSize:        DefaultBatchSize,
 		InitClient: WrapAwsInitClient(func(r *resource.Resource[EBSVolumesAPI], cfg aws.Config) {
+			r.Scope.Region = cfg.Region
 			r.Client = ec2.NewFromConfig(cfg)
 		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {

aws/resources/ec2_egress_only_igw.go

@@ -22,6 +22,7 @@ func NewEgressOnlyInternetGateway() AwsResource {
 		ResourceTypeName: "egress-only-internet-gateway",
 		BatchSize:        DefaultBatchSize,
 		InitClient: WrapAwsInitClient(func(r *resource.Resource[EgressOnlyIGAPI], cfg aws.Config) {
+			r.Scope.Region = cfg.Region
 			r.Client = ec2.NewFromConfig(cfg)
 		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {

aws/resources/network_firewall_resource_policy.go

@@ -29,6 +29,7 @@ func NewNetworkFirewallResourcePolicy() AwsResource {
 		ResourceTypeName: "network-firewall-resource-policy",
 		BatchSize:        10,
 		InitClient: WrapAwsInitClient(func(r *resource.Resource[NetworkFirewallResourcePolicyAPI], cfg aws.Config) {
+			r.Scope.Region = cfg.Region
 			r.Client = networkfirewall.NewFromConfig(cfg)
 		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {

aws/resources/rds.go

@@ -26,6 +26,7 @@ func NewDBInstances() AwsResource {
 		ResourceTypeName: "rds",
 		BatchSize:        DefaultBatchSize,
 		InitClient: WrapAwsInitClient(func(r *resource.Resource[DBInstancesAPI], cfg aws.Config) {
+			r.Scope.Region = cfg.Region
 			r.Client = rds.NewFromConfig(cfg)
 		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {

aws/resources/rds_parameter_group.go

@@ -24,6 +24,7 @@ func NewRdsParameterGroup() AwsResource {
 		ResourceTypeName: "rds-parameter-group",
 		BatchSize:        DefaultBatchSize,
 		InitClient: WrapAwsInitClient(func(r *resource.Resource[RdsParameterGroupAPI], cfg aws.Config) {
+			r.Scope.Region = cfg.Region
 			r.Client = rds.NewFromConfig(cfg)
 		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {

aws/resources/rds_subnet_group.go

@@ -24,6 +24,7 @@ func NewDBSubnetGroups() AwsResource {
 		ResourceTypeName: "rds-subnet-group",
 		BatchSize:        DefaultBatchSize,
 		InitClient: WrapAwsInitClient(func(r *resource.Resource[DBSubnetGroupsAPI], cfg aws.Config) {
+			r.Scope.Region = cfg.Region
 			r.Client = rds.NewFromConfig(cfg)
 		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {

gcp/resources/adapter.go

@@ -2,12 +2,33 @@ package resources
 
 import (
 	"context"
+	"fmt"
+	"time"
 
 	"github.com/gruntwork-io/cloud-nuke/resource"
 )
 
+const (
+	DefaultWaitTimeout = 5 * time.Minute
+	DefaultBatchSize   = 50
+)
+
+// GcpInitClientFunc is the type-safe client initialization function signature.
+type GcpInitClientFunc[C any] func(r *resource.Resource[C], projectID string)
+
+// WrapGcpInitClient converts a GcpInitClientFunc to the generic InitClient signature.
+// Panics on type assertion failure since that indicates a programming error.
+func WrapGcpInitClient[C any](fn GcpInitClientFunc[C]) func(r *resource.Resource[C], cfg any) {
+	return func(r *resource.Resource[C], cfg any) {
+		projectID, ok := cfg.(string)
+		if !ok {
+			panic(fmt.Sprintf("WrapGcpInitClient: expected string projectID, got %T", cfg))
+		}
+		fn(r, projectID)
+	}
+}
+
 // GcpResourceAdapter wraps a generic Resource to satisfy the GcpResource interface.
-// It provides type-safe Init(string) for GCP's project ID initialization.
 type GcpResourceAdapter[C any] struct {
 	*resource.Resource[C]
 }
@@ -27,5 +48,4 @@ func (g *GcpResourceAdapter[C]) Nuke(ctx context.Context, identifiers []string)
 	return g.Resource.Nuke(ctx, identifiers)
 }
 
-// Compile-time interface satisfaction check
 var _ GcpResource = (*GcpResourceAdapter[any])(nil)

gcp/resources/gcs_bucket.go

@@ -18,21 +18,15 @@ import (
 func NewGCSBuckets() GcpResource {
 	return NewGcpResource(&resource.Resource[*storage.Client]{
 		ResourceTypeName: "gcs-bucket",
-		BatchSize:        50,
-		InitClient: func(r *resource.Resource[*storage.Client], cfg any) {
-			projectID, ok := cfg.(string)
-			if !ok {
-				logging.Debugf("Invalid config type for GCS client: expected string")
-				return
-			}
+		BatchSize:        DefaultBatchSize,
+		InitClient: WrapGcpInitClient(func(r *resource.Resource[*storage.Client], projectID string) {
 			r.Scope.ProjectID = projectID
 			client, err := storage.NewClient(context.Background())
 			if err != nil {
-				logging.Debugf("Failed to create GCS client: %v", err)
-				return
+				panic(fmt.Sprintf("failed to create GCS client: %v", err))
 			}
 			r.Client = client
-		},
+		}),
 		ConfigGetter: func(c config.Config) config.ResourceType {
 			return c.GCSBucket
 		},