Merge pull request #34646 from hashicorp/td-ssoadmin-awssdkv2

ssoadmin: upgrade client to aws sdk v2

Author: jar-b

go.mod

@@ -86,6 +86,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ssm v1.44.1
 	github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.20.1
 	github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.27.1
+	github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.23.1
 	github.com/aws/aws-sdk-go-v2/service/sts v1.26.1
 	github.com/aws/aws-sdk-go-v2/service/swf v1.20.1
 	github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.23.1

go.sum

@@ -212,6 +212,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.27.1 h1:1eP1sAN5FDkKwgM7B/0
 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.27.1/go.mod h1:3dHBotx1TNQmPzo0H62Kl2rJF21cBDUQHtQ3ajDK0H8=
 github.com/aws/aws-sdk-go-v2/service/sso v1.18.1 h1:V40g2daNO3l1J94JYwqfkyvQMYXi5I25fs3fNQW8iDs=
 github.com/aws/aws-sdk-go-v2/service/sso v1.18.1/go.mod h1:0ZWQJP/mBOUxkCvZKybZNz1XmdUKSBxoF0dzgfxtvDs=
+github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.23.1 h1:m5TwU4+qNT3G7LfjOyAcscY+Td0L2jVZus8hd+gU7g0=
+github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.23.1/go.mod h1:e8g8LmmUKSu5dtDpsVu1cypJzqQNkeqdgfm4n2wOnVw=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.1 h1:uQrj7SpUNC3r55vc1CDh3qV9wJC66lz546xM9dhSo5s=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.1/go.mod h1:oyaTk5xEAOuPXX1kCD7HmIeuLqdj3Bk5yGkqGXtGi14=
 github.com/aws/aws-sdk-go-v2/service/sts v1.26.1 h1:K33V7L0XDdb23FMOZySr8bon1jou5SHn1fiv7NJ1SUg=

internal/acctest/acctest.go

@@ -21,6 +21,8 @@ import (
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/aws/aws-sdk-go-v2/service/inspector2"
 	inspector2types "github.com/aws/aws-sdk-go-v2/service/inspector2/types"
+	"github.com/aws/aws-sdk-go-v2/service/ssoadmin"
+	ssoadmintypes "github.com/aws/aws-sdk-go-v2/service/ssoadmin/types"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/aws/endpoints"
@@ -29,7 +31,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/aws/aws-sdk-go/service/outposts"
-	"github.com/aws/aws-sdk-go/service/ssoadmin"
 	"github.com/aws/aws-sdk-go/service/wafv2"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
@@ -1029,31 +1030,28 @@ func PreCheckOrganizationMemberAccount(ctx context.Context, t *testing.T) {
 }
 
 func PreCheckSSOAdminInstances(ctx context.Context, t *testing.T) {
-	conn := Provider.Meta().(*conns.AWSClient).SSOAdminConn(ctx)
+	conn := Provider.Meta().(*conns.AWSClient).SSOAdminClient(ctx)
 	input := &ssoadmin.ListInstancesInput{}
-	var instances []*ssoadmin.InstanceMetadata
+	var instances []ssoadmintypes.InstanceMetadata
 
-	err := conn.ListInstancesPagesWithContext(ctx, input, func(page *ssoadmin.ListInstancesOutput, lastPage bool) bool {
-		if page == nil {
-			return !lastPage
+	paginator := ssoadmin.NewListInstancesPaginator(conn, input)
+	for paginator.HasMorePages() {
+		page, err := paginator.NextPage(ctx)
+		if PreCheckSkipError(err) {
+			t.Skipf("skipping tests: %s", err)
+		}
+		if err != nil {
+			t.Fatalf("listing SSO Instances: %s", err)
 		}
 
-		instances = append(instances, page.Instances...)
-
-		return !lastPage
-	})
-
-	if PreCheckSkipError(err) {
-		t.Skipf("skipping tests: %s", err)
+		if page != nil {
+			instances = append(instances, page.Instances...)
+		}
 	}
 
 	if len(instances) == 0 {
 		t.Skip("skipping tests; no SSO Instances found.")
 	}
-
-	if err != nil {
-		t.Fatalf("listing SSO Instances: %s", err)
-	}
 }
 
 func PreCheckHasIAMRole(ctx context.Context, t *testing.T, roleName string) {