Tech debt: Migrateevents resources to AWS SDK for Go v2

go.mod

@@ -82,6 +82,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.30.5
 	github.com/aws/aws-sdk-go-v2/service/emr v1.39.5
 	github.com/aws/aws-sdk-go-v2/service/emrserverless v1.17.5
+	github.com/aws/aws-sdk-go-v2/service/eventbridge v1.30.4
 	github.com/aws/aws-sdk-go-v2/service/evidently v1.19.4
 	github.com/aws/aws-sdk-go-v2/service/finspace v1.24.1
 	github.com/aws/aws-sdk-go-v2/service/firehose v1.28.5

go.sum

@@ -184,6 +184,8 @@ github.com/aws/aws-sdk-go-v2/service/emr v1.39.5 h1:ni+E9GfbQ8CzjYSlJ+WbNYX7SAsL
 github.com/aws/aws-sdk-go-v2/service/emr v1.39.5/go.mod h1:7WusX+O5pwTnx2yobUO/P1C5HlBibmrQb5gKEPFjTYM=
 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.17.5 h1:w7hZ1/CRiKvzAtkzlv7tcP/wqxh9kdm5nWj4fq6/+RE=
 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.17.5/go.mod h1:TZrahLcSXIN/kO96kvxUzfLNLH8E6t3xodv8Zv5DHGs=
+github.com/aws/aws-sdk-go-v2/service/eventbridge v1.30.4 h1:Vz4ilZcVXCR9yatX5yfMrkBldYggtkih3h7woHvzu5Q=
+github.com/aws/aws-sdk-go-v2/service/eventbridge v1.30.4/go.mod h1:aIINXlt2xXhMeRsyCsLDUDohI8AdDm92gY9nIB6pv0M=
 github.com/aws/aws-sdk-go-v2/service/evidently v1.19.4 h1:DcRQTdvIQs+v+rQJ598v7WmgLSsla9C90mY4J+rccrU=
 github.com/aws/aws-sdk-go-v2/service/evidently v1.19.4/go.mod h1:ajhW/0n1t1jQKd2Kn46/99wcMj41TSPBJ3vSWocTvdE=
 github.com/aws/aws-sdk-go-v2/service/finspace v1.24.1 h1:1syXGgya/121hPyOlzi4RvV1lrtIGEHLlrYUiRsZbXo=

internal/errs/api.go

@@ -0,0 +1,16 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package errs
+
+import (
+	smithy "github.com/aws/smithy-go"
+)
+
+// APIError returns a new error suitable for checking via aws-sdk-go-base/tfawserr.
+func APIError(code, message string) smithy.APIError {
+	return &smithy.GenericAPIError{
+		Code:    code,
+		Message: message,
+	}
+}

internal/generate/servicesemgrep/service.tmpl

@@ -7,6 +7,8 @@
     paths:
       include:
         - internal/service/{{ .ProviderPackage }}
+      exclude:
+        - internal/service/{{ .ProviderPackage }}/list_pages_gen.go
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:

internal/service/appconfig/service_package.go

@@ -5,7 +5,6 @@ package appconfig
 
 import (
 	"context"
-	"errors"
 
 	aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws"
 	retry_sdkv2 "github.com/aws/aws-sdk-go-v2/aws/retry"
@@ -28,13 +27,11 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 		// if ongoing deployments are in-progress, thus we handle them
 		// here for the service client.
 		o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry_sdkv2.IsErrorRetryableFunc(func(err error) aws_sdkv2.Ternary {
-			if err != nil {
-				var oe *smithy.OperationError
-				if errors.As(err, &oe) {
-					if oe.OperationName == "StartDeployment" {
-						if errs.IsA[*awstypes.ConflictException](err) {
-							return aws_sdkv2.TrueTernary
-						}
+			if v, ok := errs.As[*smithy.OperationError](err); ok {
+				switch v.OperationName {
+				case "StartDeployment":
+					if errs.IsA[*awstypes.ConflictException](err) {
+						return aws_sdkv2.TrueTernary
 					}
 				}
 			}

internal/service/ec2/ebs_fast_snapshot_restore.go

@@ -93,7 +93,7 @@ func (r *ebsFastSnapshotRestoreResource) Create(ctx context.Context, request res
 	output, err := conn.EnableFastSnapshotRestores(ctx, input)
 
 	if err == nil && output != nil {
-		err = EnableFastSnapshotRestoreItemsError(output.Unsuccessful)
+		err = enableFastSnapshotRestoreItemsError(output.Unsuccessful)
 	}
 
 	if err != nil {

internal/service/ec2/errors.go

@@ -12,6 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 )
 
 const (
@@ -193,31 +194,31 @@ func UnsuccessfulItemsError(apiObjects []*ec2.UnsuccessfulItem) error {
 	return errors.Join(errs...)
 }
 
-func EnableFastSnapshotRestoreStateItemError(apiObject *awstypes.EnableFastSnapshotRestoreStateError) error {
+func enableFastSnapshotRestoreStateItemError(apiObject *awstypes.EnableFastSnapshotRestoreStateError) error {
 	if apiObject == nil {
 		return nil
 	}
 
-	return awserr.New(aws_sdkv2.ToString(apiObject.Code), aws_sdkv2.ToString(apiObject.Message), nil)
+	return errs.APIError(aws_sdkv2.ToString(apiObject.Code), aws_sdkv2.ToString(apiObject.Message))
 }
 
-func EnableFastSnapshotRestoreStateItemsError(apiObjects []awstypes.EnableFastSnapshotRestoreStateErrorItem) error {
+func enableFastSnapshotRestoreStateItemsError(apiObjects []awstypes.EnableFastSnapshotRestoreStateErrorItem) error {
 	var errs []error
 
 	for _, apiObject := range apiObjects {
-		if err := EnableFastSnapshotRestoreStateItemError(apiObject.Error); err != nil {
+		if err := enableFastSnapshotRestoreStateItemError(apiObject.Error); err != nil {
 			errs = append(errs, fmt.Errorf("%s: %w", aws_sdkv2.ToString(apiObject.AvailabilityZone), err))
 		}
 	}
 
 	return errors.Join(errs...)
 }
 
-func EnableFastSnapshotRestoreItemsError(apiObjects []awstypes.EnableFastSnapshotRestoreErrorItem) error {
+func enableFastSnapshotRestoreItemsError(apiObjects []awstypes.EnableFastSnapshotRestoreErrorItem) error {
 	var errs []error
 
 	for _, apiObject := range apiObjects {
-		if err := EnableFastSnapshotRestoreStateItemsError(apiObject.FastSnapshotRestoreStateErrors); err != nil {
+		if err := enableFastSnapshotRestoreStateItemsError(apiObject.FastSnapshotRestoreStateErrors); err != nil {
 			errs = append(errs, fmt.Errorf("%s: %w", aws_sdkv2.ToString(apiObject.SnapshotId), err))
 		}
 	}