r/aws_s3_bucket: Migrate to AWS SDK for Go v2

.changelog/35035.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_s3_bucket: Modify resource Read to support third-party S3 API implementations. Because we cannot easily test this functionality, it is best effort and we ask for community help in testing
+```

internal/acctest/acctest.go

@@ -53,6 +53,7 @@ import (
 	tforganizations "github.com/hashicorp/terraform-provider-aws/internal/service/organizations"
 	tfsts "github.com/hashicorp/terraform-provider-aws/internal/service/sts"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
+	"github.com/hashicorp/terraform-provider-aws/names"
 	"github.com/jmespath/go-jmespath"
 	"github.com/mitchellh/mapstructure"
 )
@@ -824,7 +825,7 @@ func PartitionDNSSuffix() string {
 
 func PartitionReverseDNSPrefix() string {
 	if partition, ok := endpoints.PartitionForRegion(endpoints.DefaultPartitions(), Region()); ok {
-		return conns.ReverseDNS(partition.DNSSuffix())
+		return names.ReverseDNS(partition.DNSSuffix())
 	}
 
 	return "com.amazonaws"

internal/conns/awsclient.go

@@ -44,9 +44,9 @@ type AWSClient struct {
 	lock                      sync.Mutex
 	logger                    baselogging.Logger
 	s3ExpressClient           *s3_sdkv2.Client
-	s3UsePathStyle            bool                                      // From provider configuration.
-	s3UsEast1RegionalEndpoint endpoints_sdkv1.S3UsEast1RegionalEndpoint // From provider configuration.
-	stsRegion                 string                                    // From provider configuration.
+	s3UsePathStyle            bool   // From provider configuration.
+	s3USEast1RegionalEndpoint string // From provider configuration.
+	stsRegion                 string // From provider configuration.
 }
 
 // CredentialsProvider returns the AWS SDK for Go v2 credentials provider.
@@ -87,7 +87,7 @@ func (c *AWSClient) S3ExpressClient(ctx context.Context) *s3_sdkv2.Client {
 	if c.s3ExpressClient == nil {
 		if s3Client.Options().Region == names.GlobalRegionID {
 			c.s3ExpressClient = errs.Must(client[*s3_sdkv2.Client](ctx, c, names.S3, map[string]any{
-				"s3_us_east_1_regional_endpoint": endpoints_sdkv1.RegionalS3UsEast1Endpoint,
+				"s3_us_east_1_regional_endpoint": "regional",
 			}))
 		} else {
 			c.s3ExpressClient = s3Client
@@ -190,12 +190,10 @@ func (c *AWSClient) apiClientConfig(servicePackageName string) map[string]any {
 		m["s3_use_path_style"] = c.s3UsePathStyle
 		// AWS SDK for Go v2 does not use the AWS_S3_US_EAST_1_REGIONAL_ENDPOINT environment variable during configuration.
 		// For compatibility, read it now.
-		if c.s3UsEast1RegionalEndpoint == endpoints_sdkv1.UnsetS3UsEast1Endpoint {
-			if v, err := endpoints_sdkv1.GetS3UsEast1RegionalEndpoint(os.Getenv("AWS_S3_US_EAST_1_REGIONAL_ENDPOINT")); err == nil {
-				c.s3UsEast1RegionalEndpoint = v
-			}
+		if c.s3USEast1RegionalEndpoint == "" {
+			c.s3USEast1RegionalEndpoint = NormalizeS3USEast1RegionalEndpoint(os.Getenv("AWS_S3_US_EAST_1_REGIONAL_ENDPOINT"))
 		}
-		m["s3_us_east_1_regional_endpoint"] = c.s3UsEast1RegionalEndpoint
+		m["s3_us_east_1_regional_endpoint"] = c.s3USEast1RegionalEndpoint
 	case names.STS:
 		m["sts_region"] = c.stsRegion
 	}

internal/conns/config.go

@@ -6,6 +6,7 @@ package conns
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws"
 	imds_sdkv2 "github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
@@ -45,7 +46,7 @@ type Config struct {
 	Region                         string
 	RetryMode                      aws_sdkv2.RetryMode
 	S3UsePathStyle                 bool
-	S3UsEast1RegionalEndpoint      endpoints_sdkv1.S3UsEast1RegionalEndpoint
+	S3USEast1RegionalEndpoint      string
 	SecretKey                      string
 	SharedConfigFiles              []string
 	SharedCredentialsFiles         []string
@@ -199,7 +200,7 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
 	client.IgnoreTagsConfig = c.IgnoreTagsConfig
 	client.Partition = partition
 	client.Region = c.Region
-	client.ReverseDNSPrefix = ReverseDNS(DNSSuffix)
+	client.ReverseDNSPrefix = names.ReverseDNS(DNSSuffix)
 	client.SetHTTPClient(sess.Config.HTTPClient) // Must be called while client.Session is nil.
 	client.Session = sess
 	client.TerraformVersion = c.TerraformVersion
@@ -211,7 +212,7 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
 	client.endpoints = c.Endpoints
 	client.logger = logger
 	client.s3UsePathStyle = c.S3UsePathStyle
-	client.s3UsEast1RegionalEndpoint = c.S3UsEast1RegionalEndpoint
+	client.s3USEast1RegionalEndpoint = c.S3USEast1RegionalEndpoint
 	client.stsRegion = c.STSRegion
 
 	return client, diags
@@ -227,3 +228,12 @@ func baseSeverityToSdkSeverity(s basediag.Severity) diag.Severity {
 		return -1
 	}
 }
+
+func NormalizeS3USEast1RegionalEndpoint(v string) string {
+	switch v := strings.ToLower(v); v {
+	case "legacy", "regional":
+		return v
+	default:
+		return ""
+	}
+}

internal/enum/values.go

@@ -3,6 +3,10 @@
 
 package enum
 
+import (
+	tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices"
+)
+
 type Valueser[T ~string] interface {
 	~string
 	Values() []T
@@ -17,10 +21,7 @@ func Values[T Valueser[T]]() []string {
 }
 
 func Slice[T Valueser[T]](l ...T) []string {
-	result := make([]string, len(l))
-	for i, v := range l {
-		result[i] = string(v)
-	}
-
-	return result
+	return tfslices.ApplyToAll(l, func(v T) string {
+		return string(v)
+	})
 }

internal/flex/flex.go

@@ -76,6 +76,24 @@ func ExpandStringyValueList[E ~string](configured []any) []E {
 	return vs
 }
 
+// ExpandStringValueList takes the result of flatmap.Expand for an array of strings
+// and returns a []string
+func ExpandStringValueListEmpty(configured []interface{}) []string {
+	return ExpandStringyValueListEmpty[string](configured)
+}
+
+func ExpandStringyValueListEmpty[E ~string](configured []any) []E {
+	vs := make([]E, 0, len(configured))
+	for _, v := range configured {
+		if val, ok := v.(string); ok { // empty string in config turns into nil in []interface{} so !ok
+			vs = append(vs, E(val))
+		} else {
+			vs = append(vs, E(""))
+		}
+	}
+	return vs
+}
+
 // Takes list of pointers to strings. Expand to an array
 // of raw strings and returns a []interface{}
 // to keep compatibility w/ schema.NewSetschema.NewSet

internal/provider/provider.go

@@ -14,7 +14,6 @@ import (
 	"github.com/YakDriver/regexache"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
-	"github.com/aws/aws-sdk-go/aws/endpoints"
 	awsbase "github.com/hashicorp/aws-sdk-go-base/v2"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -500,11 +499,7 @@ func configure(ctx context.Context, provider *schema.Provider, d *schema.Resourc
 	}
 
 	if v, ok := d.Get("s3_us_east_1_regional_endpoint").(string); ok && v != "" {
-		endpoint, err := endpoints.GetS3UsEast1RegionalEndpoint(v)
-		if err != nil {
-			return nil, sdkdiag.AppendFromErr(diags, err)
-		}
-		config.S3UsEast1RegionalEndpoint = endpoint
+		config.S3USEast1RegionalEndpoint = conns.NormalizeS3USEast1RegionalEndpoint(v)
 	}
 
 	if v, ok := d.GetOk("allowed_account_ids"); ok && v.(*schema.Set).Len() > 0 {