Merge pull request #44971 from hashicorp/td-use-ri-in-tagging-tests

tag test generation: Sets import ID attribute from ARN Identity

Author: gdavison

internal/generate/tagstests/main.go

@@ -402,6 +402,8 @@ type ResourceDatum struct {
 	overrideIdentifierAttribute      string
 	OverrideResourceType             string
 	tests.CommonArgs
+	isARNIdentity     bool
+	identityAttribute string
 }
 
 func (d ResourceDatum) ProviderPackage() string {
@@ -578,6 +580,17 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) {
 			case "NoImport":
 				d.NoImport = true
 
+			case "ArnIdentity":
+				d.isARNIdentity = true
+				args := common.ParseArgs(m[3])
+				if len(args.Positional) == 0 {
+					d.identityAttribute = "arn"
+				} else {
+					d.identityAttribute = args.Positional[0]
+				}
+
+				populateInherentRegionIdentity(&d, args)
+
 			case "Testing":
 				args := common.ParseArgs(m[3])
 
@@ -762,3 +775,19 @@ func count[T any](s iter.Seq[T], f func(T) bool) (c int) {
 	}
 	return c
 }
+
+func populateInherentRegionIdentity(d *ResourceDatum, args common.Args) {
+	var attrs []string
+	if attr, ok := args.Keyword["identityDuplicateAttributes"]; ok {
+		attrs = strings.Split(attr, ";")
+	}
+	if d.Implementation == tests.ImplementationSDK {
+		attrs = append(attrs, "id")
+	} else {
+		if !slices.Contains(attrs, "id") {
+			d.SetImportStateIDAttribute(d.identityAttribute)
+		}
+	}
+	slices.Sort(attrs)
+	attrs = slices.Compact(attrs)
+}

internal/service/redshift/integration.go

@@ -33,7 +33,6 @@ import (
 // @ArnIdentity
 // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/redshift/types;awstypes;awstypes.Integration")
 // @Testing(preIdentityVersion="6.19.0")
-// @Testing(importStateIdAttribute="arn")
 func newIntegrationResource(context.Context) (resource.ResourceWithConfigure, error) {
 	r := &integrationResource{}