Adds customInherentRegionResourceImporter for SDKv2

Author: gdavison

internal/provider/sdkv2/identity_interceptor.go

@@ -251,6 +251,19 @@ func singletonIdentityResourceImporter(identity inttypes.Identity) *schema.Resou
 	}
 }
 
+func customInherentRegionResourceImporter(identity inttypes.Identity) *schema.ResourceImporter {
+	// Not supported for Global resources. This is validated in validateResourceSchemas().
+	return &schema.ResourceImporter{
+		StateContext: func(ctx context.Context, rd *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
+			if err := importer.RegionalInherentRegion(ctx, rd, identity); err != nil {
+				return nil, err
+			}
+
+			return []*schema.ResourceData{rd}, nil
+		},
+	}
+}
+
 func customResourceImporter(r *schema.Resource, identity *inttypes.Identity, importSpec *inttypes.SDKv2Import) {
 	importF := r.Importer.StateContext
 

internal/provider/sdkv2/provider.go

@@ -733,6 +733,8 @@ func (p *sdkProvider) initialize(ctx context.Context) (map[string]conns.ServiceP
 					r.Importer = arnIdentityResourceImporter(resource.Identity)
 				} else if resource.Identity.IsSingleton {
 					r.Importer = singletonIdentityResourceImporter(resource.Identity)
+				} else if resource.Identity.IsCustomInherentRegion {
+					r.Importer = customInherentRegionResourceImporter(resource.Identity)
 				} else {
 					r.Importer = newParameterizedIdentityImporter(resource.Identity, &resource.Import)
 				}
@@ -834,6 +836,13 @@ func (p *sdkProvider) validateResourceSchemas(ctx context.Context) error {
 					continue
 				}
 			}
+
+			if resource.Identity.IsCustomInherentRegion {
+				if resource.Identity.IsGlobalResource {
+					errs = append(errs, fmt.Errorf("`IsCustomInherentRegion` is not supported for Global resources: %s resource", typeName))
+					continue
+				}
+			}
 		}
 	}
 

internal/types/service_package.go

@@ -130,19 +130,20 @@ type ServicePackageSDKListResource struct {
 }
 
 type Identity struct {
-	IsGlobalResource       bool   // All
-	IsSingleton            bool   // Singleton
-	IsARN                  bool   // ARN
-	IsGlobalARNFormat      bool   // ARN
-	IdentityAttribute      string // ARN
-	IDAttrShadowsAttr      string
-	Attributes             []IdentityAttribute
-	IdentityDuplicateAttrs []string
-	IsSingleParameter      bool
-	IsMutable              bool
-	IsSetOnUpdate          bool
-	customInherentRegion   bool
-	version                int64
+	IsGlobalResource           bool   // All
+	IsSingleton                bool   // Singleton
+	IsARN                      bool   // ARN
+	IsGlobalARNFormat          bool   // ARN
+	IdentityAttribute          string // ARN
+	IDAttrShadowsAttr          string
+	Attributes                 []IdentityAttribute
+	IdentityDuplicateAttrs     []string
+	IsSingleParameter          bool
+	IsMutable                  bool
+	IsSetOnUpdate              bool
+	IsCustomInherentRegion     bool
+	customInherentRegionParser RegionalCustomInherentRegionIdentityFunc
+	version                    int64
 }
 
 func (i Identity) HasInherentRegion() bool {
@@ -155,7 +156,7 @@ func (i Identity) HasInherentRegion() bool {
 	if i.IsARN && !i.IsGlobalARNFormat {
 		return true
 	}
-	if i.customInherentRegion {
+	if i.IsCustomInherentRegion {
 		return true
 	}
 	return false
@@ -165,6 +166,10 @@ func (i Identity) Version() int64 {
 	return i.version
 }
 
+func (i Identity) CustomInherentRegionParser() RegionalCustomInherentRegionIdentityFunc {
+	return i.customInherentRegionParser
+}
+
 func RegionalParameterizedIdentity(attributes []IdentityAttribute, opts ...IdentityOptsFunc) Identity {
 	baseAttributes := []IdentityAttribute{
 		StringIdentityAttribute("account_id", false),
@@ -255,14 +260,15 @@ func arnIdentity(isGlobalResource bool, name string, opts []IdentityOptsFunc) Id
 	return identity
 }
 
-func RegionalCustomInherentRegionIdentity(name string, opts ...IdentityOptsFunc) Identity {
+func RegionalCustomInherentRegionIdentity(name string, parser RegionalCustomInherentRegionIdentityFunc, opts ...IdentityOptsFunc) Identity {
 	identity := Identity{
 		IsGlobalResource:  false,
 		IdentityAttribute: name,
 		Attributes: []IdentityAttribute{
 			StringIdentityAttribute(name, true),
 		},
-		customInherentRegion: true,
+		IsCustomInherentRegion:     true,
+		customInherentRegionParser: parser,
 	}
 
 	for _, opt := range opts {
@@ -272,6 +278,13 @@ func RegionalCustomInherentRegionIdentity(name string, opts ...IdentityOptsFunc)
 	return identity
 }
 
+type BaseIdentity struct {
+	AccountID string
+	Region    string
+}
+
+type RegionalCustomInherentRegionIdentityFunc func(value string) (BaseIdentity, error)
+
 func RegionalResourceWithGlobalARNFormat(opts ...IdentityOptsFunc) Identity {
 	return RegionalResourceWithGlobalARNFormatNamed(names.AttrARN, opts...)
 }