Merge pull request #43704 from hashicorp/f-ri-ivs

Add ARN-based resource identity to `ivs`

Author: jar-b

.changelog/43704.txt

@@ -0,0 +1,9 @@
+```release-note:enhancement
+resource/aws_ivs_channel: Add resource identity support
+```
+```release-note:enhancement
+resource/aws_ivs_playback_key_pair: Add resource identity support
+```
+```release-note:enhancement
+resource/aws_ivs_recording_configuration: Add resource identity support
+```

docs/resource-tagging.md

@@ -504,6 +504,10 @@ To override the common name, set the annotation `@Testing(tlsKeyDomain=<referenc
 For example, the API Gateway v2 Domain Name sets the variable `rName` to `acctest.RandomSubdomain()`
 and sets the annotation `@Testing(tlsKeyDomain=rName)` to reference it.
 
+Some acceptance tests require a TLS ECDSA public key PEM.
+This can be included by setting the annotation `@Testing(tlsEcdsaPublicKeyPem=true)`.
+The Terraform variable name will be `rTlsEcdsaPublicKeyPem`.
+
 Some acceptance tests related to networking require a random BGP ASN value.
 This can be included by setting the annotation `@Testing(randomBsgAsn="<low end>;<high end>)`,
 where `<low end>` and `<high end>` are the upper and lower bounds for the randomly-generated ASN value.

internal/generate/tests/annotations.go

@@ -460,6 +460,22 @@ if err != nil {
 		}
 	}
 
+	if attr, ok := args.Keyword["tlsEcdsaPublicKeyPem"]; ok {
+		if _, err := ParseBoolAttr("tlsEcdsaPublicKeyPem", attr); err != nil {
+			return err
+		} else {
+			varName := "rTlsEcdsaPublicKeyPem"
+			stuff.InitCodeBlocks = append(stuff.InitCodeBlocks, CodeBlock{
+				Code: fmt.Sprintf(`privateKey := acctest.TLSECDSAPrivateKeyPEM(t, "P-384")
+%s, _ := acctest.TLSECDSAPublicKeyPEM(t, privateKey)`, varName),
+			})
+			stuff.AdditionalTfVars_[varName] = TFVar{
+				GoVarName: varName,
+				Type:      TFVarTypeString,
+			}
+		}
+	}
+
 	return nil
 }
 

internal/service/ivs/channel.go

@@ -28,17 +28,17 @@ import (
 
 // @SDKResource("aws_ivs_channel", name="Channel")
 // @Tags(identifierAttribute="id")
+// @ArnIdentity
+// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ivs/types;awstypes.Channel")
+// @Testing(preIdentityVersion="v6.7.0")
+// @Testing(generator=false)
 func ResourceChannel() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourceChannelCreate,
 		ReadWithoutTimeout:   resourceChannelRead,
 		UpdateWithoutTimeout: resourceChannelUpdate,
 		DeleteWithoutTimeout: resourceChannelDelete,
 
-		Importer: &schema.ResourceImporter{
-			StateContext: schema.ImportStatePassthroughContext,
-		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(5 * time.Minute),
 			Update: schema.DefaultTimeout(5 * time.Minute),

internal/service/ivs/channel_identity_gen_test.go

@@ -3,6 +3,7 @@
 
 //go:generate go run ../../generate/tags/main.go -KVTValues -ListTags -ServiceTagsMap -UpdateTags
 //go:generate go run ../../generate/servicepackage/main.go
+//go:generate go run ../../generate/identitytests/main.go
 // ONLY generate directives and package declaration! Do not add anything else to this file.
 
 package ivs

internal/service/ivs/generate.go

@@ -18,6 +18,7 @@ func TestAccIVS_serial(t *testing.T) {
 			"update":             testAccPlaybackKeyPair_update,
 			"tags":               testAccPlaybackKeyPair_tags,
 			acctest.CtDisappears: testAccPlaybackKeyPair_disappears,
+			"identity":           testAccIVSPlaybackKeyPair_IdentitySerial,
 		},
 	}
 

internal/service/ivs/ivs_test.go

@@ -24,16 +24,20 @@ import (
 
 // @SDKResource("aws_ivs_playback_key_pair", name="Playback Key Pair")
 // @Tags(identifierAttribute="id")
+// @ArnIdentity
+// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ivs/types;awstypes.PlaybackKeyPair")
+// @Testing(preIdentityVersion="v6.7.0")
+// @Testing(serialize=true)
+// @Testing(generator=false)
+// @Testing(tlsEcdsaPublicKeyPem=true)
+// @Testing(importIgnore="public_key")
+// @Testing(plannableImportAction=Replace)
 func ResourcePlaybackKeyPair() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourcePlaybackKeyPairCreate,
 		ReadWithoutTimeout:   resourcePlaybackKeyPairRead,
 		DeleteWithoutTimeout: resourcePlaybackKeyPairDelete,
 
-		Importer: &schema.ResourceImporter{
-			StateContext: schema.ImportStatePassthroughContext,
-		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(5 * time.Minute),
 			Delete: schema.DefaultTimeout(5 * time.Minute),