Merge pull request #37024 from mattburgess/cognitoidp-awssdkv2-migration

cognitoidp: Migrate to AWS SDK v2

Author: ewbankkit

go.mod

@@ -65,6 +65,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.26.1
 	github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1
 	github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1
+	github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.40.1
 	github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1
 	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.36.0
 	github.com/aws/aws-sdk-go-v2/service/configservice v1.47.1

go.sum

@@ -150,6 +150,8 @@ github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1 h1:Y6zYm5uoyV
 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.23.1/go.mod h1:eLxEKHbDZAZ21Kd9MoiVwTHuKNBfYSNgqp9IvtqodsA=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1 h1:grnSpw0UYD7mZpV4cbIrHroG5geUkLdZG9Nw6y+2mY4=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.24.1/go.mod h1:GjlJPEWhuchMZu+5ANvFJ40v2D/Yf15GKtSQrEii9g8=
+github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.40.1 h1:5jYRvUIEI0LVOUYbI6ixev/ctOb8/0eJDFa6k39cMCk=
+github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.40.1/go.mod h1:im0buuAzIxokGb9JH/bXAhiDxp9OElYL6jSQXTLiRcA=
 github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1 h1:aaO83HGlxNkzuusYpfQKLb5p8Nh5fT9Z0AZGOMCgV0s=
 github.com/aws/aws-sdk-go-v2/service/comprehend v1.32.1/go.mod h1:sceZD+zPJMiCXh57FxceWpqgNsNWST11mkCKKOxPzus=
 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.36.0 h1:M4beLC7La5LbQmUU+NCp4dOJ+1PDeJB7sxkvMREv5L4=

internal/acctest/acctest.go

@@ -24,6 +24,7 @@ import (
 	accounttypes "github.com/aws/aws-sdk-go-v2/service/account/types"
 	"github.com/aws/aws-sdk-go-v2/service/acmpca"
 	acmpcatypes "github.com/aws/aws-sdk-go-v2/service/acmpca/types"
+	"github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 	awstypes "github.com/aws/aws-sdk-go-v2/service/iam/types"
@@ -40,6 +41,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/directoryservice"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/outposts"
+	"github.com/aws/aws-sdk-go/service/pinpoint"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -979,6 +981,26 @@ func PreCheckPartitionNot(t *testing.T, partitions ...string) {
 	}
 }
 
+func PreCheckCognitoIdentityProvider(ctx context.Context, t *testing.T) {
+	t.Helper()
+
+	conn := Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx)
+
+	input := &cognitoidentityprovider.ListUserPoolsInput{
+		MaxResults: aws.Int32(1),
+	}
+
+	_, err := conn.ListUserPools(ctx, input)
+
+	if PreCheckSkipError(err) {
+		t.Skipf("skipping acceptance testing: %s", err)
+	}
+
+	if err != nil {
+		t.Fatalf("unexpected PreCheck error: %s", err)
+	}
+}
+
 func PreCheckInspector2(ctx context.Context, t *testing.T) {
 	t.Helper()
 
@@ -1077,6 +1099,22 @@ func PreCheckOrganizationMemberAccountWithProvider(ctx context.Context, t *testi
 	}
 }
 
+func PreCheckPinpointApp(ctx context.Context, t *testing.T) {
+	conn := Provider.Meta().(*conns.AWSClient).PinpointConn(ctx)
+
+	input := &pinpoint.GetAppsInput{}
+
+	_, err := conn.GetAppsWithContext(ctx, input)
+
+	if PreCheckSkipError(err) {
+		t.Skipf("skipping acceptance testing: %s", err)
+	}
+
+	if err != nil {
+		t.Fatalf("unexpected PreCheck error: %s", err)
+	}
+}
+
 func PreCheckRegionOptIn(ctx context.Context, t *testing.T, region string) {
 	t.Helper()
 

internal/conns/awsclient_gen.go

@@ -21,6 +21,14 @@ func BoolFromFramework(ctx context.Context, v basetypes.BoolValuable) *bool {
 	return output
 }
 
+func BoolValueFromFramework(ctx context.Context, v basetypes.BoolValuable) bool {
+	var output bool
+
+	must(Expand(ctx, v, &output))
+
+	return output
+}
+
 // BoolToFramework converts a bool pointer to a Framework Bool value.
 // A nil bool pointer is converted to a null Bool.
 func BoolToFramework(ctx context.Context, v *bool) types.Bool {

internal/framework/flex/bool.go

@@ -49,6 +49,42 @@ func TestBoolFromFramework(t *testing.T) {
 	}
 }
 
+func TestBoolValueFromFramework(t *testing.T) {
+	t.Parallel()
+
+	type testCase struct {
+		input    types.Bool
+		expected bool
+	}
+	tests := map[string]testCase{
+		"valid bool": {
+			input:    types.BoolValue(true),
+			expected: true,
+		},
+		"null bool": {
+			input:    types.BoolNull(),
+			expected: false,
+		},
+		"unknown bool": {
+			input:    types.BoolUnknown(),
+			expected: false,
+		},
+	}
+
+	for name, test := range tests {
+		name, test := name, test
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
+			got := flex.BoolValueFromFramework(context.Background(), test.input)
+
+			if diff := cmp.Diff(got, test.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
+		})
+	}
+}
+
 func TestBoolToFramework(t *testing.T) {
 	t.Parallel()
 

internal/framework/flex/bool_test.go

@@ -66,6 +66,12 @@ func Int32ValueToFramework(ctx context.Context, v int32) types.Int64 {
 	return output
 }
 
+// Int32ToFrameworkLegacy converts an int32 pointer to a Framework Int64 value.
+// A nil int32 pointer is converted to a zero Int64.
+func Int32ToFrameworkLegacy(_ context.Context, v *int32) types.Int64 {
+	return types.Int64Value(int64(aws.ToInt32(v)))
+}
+
 // Int32FromFramework coverts a Framework Int64 value to an int32 pointer.
 // A null Int64 is converted to a nil int32 pointer.
 func Int32FromFramework(ctx context.Context, v types.Int64) *int32 {
@@ -76,6 +82,19 @@ func Int32FromFramework(ctx context.Context, v types.Int64) *int32 {
 	return output
 }
 
+func Int32FromFrameworkLegacy(_ context.Context, v types.Int64) *int32 {
+	if v.IsNull() || v.IsUnknown() {
+		return nil
+	}
+
+	i := v.ValueInt64()
+	if i == 0 {
+		return nil
+	}
+
+	return aws.Int32(int32(i))
+}
+
 // Int32ValueFromFramework coverts a Framework Int64 value to an int32 pointer.
 // A null Int64 is converted to a nil int32 pointer.
 func Int32ValueFromFramework(ctx context.Context, v types.Int64) int32 {

internal/framework/flex/int.go

@@ -161,6 +161,42 @@ func TestInt32ToFramework(t *testing.T) {
 	}
 }
 
+func TestInt32ToFrameworkLegacy(t *testing.T) {
+	t.Parallel()
+
+	type testCase struct {
+		input    *int32
+		expected types.Int64
+	}
+	tests := map[string]testCase{
+		"valid int64": {
+			input:    aws.Int32(42),
+			expected: types.Int64Value(42),
+		},
+		"zero int64": {
+			input:    aws.Int32(0),
+			expected: types.Int64Value(0),
+		},
+		"nil int64": {
+			input:    nil,
+			expected: types.Int64Value(0),
+		},
+	}
+
+	for name, test := range tests {
+		name, test := name, test
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
+			got := flex.Int32ToFrameworkLegacy(context.Background(), test.input)
+
+			if diff := cmp.Diff(got, test.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
+		})
+	}
+}
+
 func TestInt32FromFramework(t *testing.T) {
 	t.Parallel()
 
@@ -200,3 +236,43 @@ func TestInt32FromFramework(t *testing.T) {
 		})
 	}
 }
+
+func TestInt32FromFrameworkLegacy(t *testing.T) {
+	t.Parallel()
+
+	type testCase struct {
+		input    types.Int64
+		expected *int32
+	}
+	tests := map[string]testCase{
+		"valid int64": {
+			input:    types.Int64Value(42),
+			expected: aws.Int32(42),
+		},
+		"zero int64": {
+			input:    types.Int64Value(0),
+			expected: nil,
+		},
+		"null int64": {
+			input:    types.Int64Null(),
+			expected: nil,
+		},
+		"unknown int64": {
+			input:    types.Int64Unknown(),
+			expected: nil,
+		},
+	}
+
+	for name, test := range tests {
+		name, test := name, test
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
+			got := flex.Int32FromFrameworkLegacy(context.Background(), test.input)
+
+			if diff := cmp.Diff(got, test.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
+		})
+	}
+}

internal/framework/flex/int_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
+	tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices"
 	itypes "github.com/hashicorp/terraform-provider-aws/internal/types"
 )
 
@@ -61,6 +62,14 @@ func ExpandFrameworkStringValueSet(ctx context.Context, v basetypes.SetValuable)
 	return output
 }
 
+func ExpandFrameworkStringyValueSet[T ~string](ctx context.Context, v basetypes.SetValuable) itypes.Set[T] {
+	vs := ExpandFrameworkStringValueSet(ctx, v)
+	if vs == nil {
+		return nil
+	}
+	return tfslices.ApplyToAll(vs, func(s string) T { return T(s) })
+}
+
 // FlattenFrameworkInt64Set converts a slice of int32 pointers to a framework Set value.
 //
 // A nil slice is converted to a null Set.

internal/framework/flex/set.go

@@ -309,6 +309,59 @@ func TestExpandFrameworkStringValueSet(t *testing.T) {
 	}
 }
 
+func TestExpandFrameworkStringyValueSet(t *testing.T) {
+	t.Parallel()
+
+	type testEnum string
+	var testVal1 testEnum = "testVal1"
+	var testVal2 testEnum = "testVal2"
+
+	type testCase struct {
+		input    types.Set
+		expected itypes.Set[testEnum]
+	}
+	tests := map[string]testCase{
+		"null": {
+			input:    types.SetNull(types.StringType),
+			expected: nil,
+		},
+		"unknown": {
+			input:    types.SetUnknown(types.StringType),
+			expected: nil,
+		},
+		"two elements": {
+			input: types.SetValueMust(types.StringType, []attr.Value{
+				types.StringValue(string(testVal1)),
+				types.StringValue(string(testVal2)),
+			}),
+			expected: []testEnum{testVal1, testVal2},
+		},
+		"zero elements": {
+			input:    types.SetValueMust(types.StringType, []attr.Value{}),
+			expected: []testEnum{},
+		},
+		"invalid element type": {
+			input: types.SetValueMust(types.Int64Type, []attr.Value{
+				types.Int64Value(42),
+			}),
+			expected: nil,
+		},
+	}
+
+	for name, test := range tests {
+		name, test := name, test
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
+			got := flex.ExpandFrameworkStringyValueSet[testEnum](context.Background(), test.input)
+
+			if diff := cmp.Diff(got, test.expected); diff != "" {
+				t.Errorf("unexpected diff (+wanted, -got): %s", diff)
+			}
+		})
+	}
+}
+
 func TestFlattenFrameworkInt32Set(t *testing.T) {
 	t.Parallel()
 

internal/framework/flex/set_test.go

@@ -248,19 +248,19 @@ func resourcePoolUpdate(ctx context.Context, d *schema.ResourceData, meta interf
 func resourcePoolDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).CognitoIdentityClient(ctx)
-	log.Printf("[DEBUG] Deleting Cognito Identity Pool: %s", d.Id())
 
+	log.Printf("[DEBUG] Deleting Cognito Identity Pool: %s", d.Id())
 	_, err := conn.DeleteIdentityPool(ctx, &cognitoidentity.DeleteIdentityPoolInput{
 		IdentityPoolId: aws.String(d.Id()),
 	})
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
-		log.Printf("[DEBUG] Resource Pool already deleted: %s", d.Id())
 		return diags
 	}
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "deleting Cognito identity pool (%s): %s", d.Id(), err)
+		return sdkdiag.AppendErrorf(diags, "deleting Cognito Identity Pool (%s): %s", d.Id(), err)
 	}
+
 	return diags
 }