Merge pull request #45064 from hashicorp/f-aws_ec2_serial_console_access-add-region

r/aws_ec2_serial_console_access: Add `region` argument

Author: ewbankkit

.changelog/45064.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_ec2_serial_console_access: Add `region` argument
+```

internal/generate/servicepackage/service_package_gen.go.gtpl

@@ -32,12 +32,8 @@ inttypes.StringIdentityAttribute(
 {{- if .IdentityVersion }}
     inttypes.WithVersion({{ .IdentityVersion }}),
 {{ end -}}
-{{- if gt (len .SDKv2IdentityUpgraders) 0 }}
-	inttypes.WithSDKv2IdentityUpgraders(
-	{{- range .SDKv2IdentityUpgraders -}}
-	{{.}},
-	{{- end -}}
-	),
+{{- if gt (len .SDKv2IdentityUpgraders) 0 -}}
+	inttypes.WithSDKv2IdentityUpgraders({{- range .SDKv2IdentityUpgraders -}}{{.}},{{- end -}}),
 {{ end -}}
 {{- end }}
 

internal/service/ec2/ec2_image_block_public_access.go

@@ -30,6 +30,8 @@ import (
 // @Testing(hasExistsFunction=false)
 // @Testing(generator=false)
 // @Testing(identityTest=false)
+// @Testing(identityVersion="0;v6.0.0")
+// @Testing(identityVersion="1;v6.21.0")
 func resourceImageBlockPublicAccess() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourceImageBlockPublicAccessPut,

internal/service/ec2/ec2_serial_console_access.go

@@ -5,21 +5,26 @@ package ec2
 
 import (
 	"context"
+	"log"
 
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
 // @SDKResource("aws_ec2_serial_console_access", name="Serial Console Access")
-// @Region(global=true)
 // @SingletonIdentity
+// @IdentityVersion(1, sdkV2IdentityUpgraders="serialConsoleAccessIdentityUpgradeV0")
 // @V60SDKv2Fix
 // @Testing(hasExistsFunction=false)
 // @Testing(generator=false)
+// @Testing(identityTest=false)
+// @Testing(identityVersion="0;v6.0.0")
+// @Testing(identityVersion="1;v6.21.0")
 func resourceSerialConsoleAccess() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourceSerialConsoleAccessCreate,
@@ -39,26 +44,29 @@ func resourceSerialConsoleAccess() *schema.Resource {
 
 func resourceSerialConsoleAccessCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var diags diag.Diagnostics
-
 	conn := meta.(*conns.AWSClient).EC2Client(ctx)
 
 	enabled := d.Get(names.AttrEnabled).(bool)
 	if err := setSerialConsoleAccess(ctx, conn, enabled); err != nil {
 		return sdkdiag.AppendErrorf(diags, "setting EC2 Serial Console Access (%t): %s", enabled, err)
 	}
 
-	d.SetId(meta.(*conns.AWSClient).AccountID(ctx))
+	d.SetId(meta.(*conns.AWSClient).Region(ctx))
 
 	return append(diags, resourceSerialConsoleAccessRead(ctx, d, meta)...)
 }
 
 func resourceSerialConsoleAccessRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var diags diag.Diagnostics
-
 	conn := meta.(*conns.AWSClient).EC2Client(ctx)
 
-	input := ec2.GetSerialConsoleAccessStatusInput{}
-	output, err := conn.GetSerialConsoleAccessStatus(ctx, &input)
+	output, err := findSerialConsoleAccessStatus(ctx, conn)
+
+	if !d.IsNewResource() && tfresource.NotFound(err) {
+		log.Printf("[WARN] EC2 Serial Console Access %s not found, removing from state", d.Id())
+		d.SetId("")
+		return diags
+	}
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "reading EC2 Serial Console Access: %s", err)
@@ -71,7 +79,6 @@ func resourceSerialConsoleAccessRead(ctx context.Context, d *schema.ResourceData
 
 func resourceSerialConsoleAccessUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var diags diag.Diagnostics
-
 	conn := meta.(*conns.AWSClient).EC2Client(ctx)
 
 	enabled := d.Get(names.AttrEnabled).(bool)
@@ -84,7 +91,6 @@ func resourceSerialConsoleAccessUpdate(ctx context.Context, d *schema.ResourceDa
 
 func resourceSerialConsoleAccessDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var diags diag.Diagnostics
-
 	conn := meta.(*conns.AWSClient).EC2Client(ctx)
 
 	// Removing the resource disables serial console access.
@@ -99,12 +105,20 @@ func setSerialConsoleAccess(ctx context.Context, conn *ec2.Client, enabled bool)
 	var err error
 
 	if enabled {
-		input := ec2.EnableSerialConsoleAccessInput{}
+		var input ec2.EnableSerialConsoleAccessInput
 		_, err = conn.EnableSerialConsoleAccess(ctx, &input)
 	} else {
-		input := ec2.DisableSerialConsoleAccessInput{}
+		var input ec2.DisableSerialConsoleAccessInput
 		_, err = conn.DisableSerialConsoleAccess(ctx, &input)
 	}
 
 	return err
 }
+
+var serialConsoleAccessIdentityUpgradeV0 = schema.IdentityUpgrader{
+	Version: 0,
+	Upgrade: func(ctx context.Context, rawState map[string]any, meta any) (map[string]any, error) {
+		rawState[names.AttrRegion] = meta.(*conns.AWSClient).Region(ctx)
+		return rawState, nil
+	},
+}

internal/service/ec2/ec2_serial_console_access_data_source.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
@@ -34,11 +33,9 @@ func dataSourceSerialConsoleAccess() *schema.Resource {
 }
 func dataSourceSerialConsoleAccessRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var diags diag.Diagnostics
-
 	conn := meta.(*conns.AWSClient).EC2Client(ctx)
 
-	input := ec2.GetSerialConsoleAccessStatusInput{}
-	output, err := conn.GetSerialConsoleAccessStatus(ctx, &input)
+	output, err := findSerialConsoleAccessStatus(ctx, conn)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "reading EC2 Serial Console Access: %s", err)