Use session v2 API

Author: PanSpagetka

exp/controllers/rosaroleconfig_controller.go

@@ -24,7 +24,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/aws/aws-sdk-go/service/iam"
+	iamv2 "github.com/aws/aws-sdk-go-v2/service/iam"
 	"github.com/go-logr/logr"
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	accountroles "github.com/openshift/rosa/cmd/create/accountroles"
@@ -309,7 +309,7 @@ func (r *ROSARoleConfigReconciler) reconcileOIDCConfig(roleConfig *expinfrav1.RO
 	}
 	// Try to get OIDC UUID from some operator role policy document.
 	roleName := fmt.Sprintf("%s-openshift-ingress-operator-cloud-credentials", roleConfig.Spec.OperatorRoleConfig.Prefix)
-	roleDetails, err := scope.IAMClient().GetRole(&iam.GetRoleInput{
+	roleDetails, err := scope.IAMClient().GetRole(context.TODO(), &iamv2.GetRoleInput{
 		RoleName: &roleName,
 	})
 	if err != nil {
@@ -627,7 +627,7 @@ func (r ROSARoleConfigReconciler) operatorRolesReady(operatorRolesRef *v1beta2.A
 }
 
 // GetOIDCIDFromOperatorRole extracts the OIDC UUID from the operator role policy document.
-func (r *ROSARoleConfigReconciler) GetOIDCIDFromOperatorRole(scope *scope.RosaRoleConfigScope, roleDetails *iam.GetRoleOutput) (string, error) {
+func (r *ROSARoleConfigReconciler) GetOIDCIDFromOperatorRole(scope *scope.RosaRoleConfigScope, roleDetails *iamv2.GetRoleOutput) (string, error) {
 	decodedString, err := url.QueryUnescape(*roleDetails.Role.AssumeRolePolicyDocument)
 	if err != nil {
 		return "", err

pkg/cloud/scope/rosaroleconfig.go

@@ -19,8 +19,8 @@ package scope
 import (
 	"context"
 
-	awsclient "github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/service/iam"
+	awsv2 "github.com/aws/aws-sdk-go-v2/aws"
+	iamv2 "github.com/aws/aws-sdk-go-v2/service/iam"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -52,8 +52,8 @@ type RosaRoleConfigScope struct {
 	patchHelper     *patch.Helper
 	RosaRoleConfig  *expinfrav1.ROSARoleConfig
 	serviceLimiters throttle.ServiceLimiters
-	session         awsclient.ConfigProvider
-	iamClient       *iam.IAM
+	session         awsv2.Config
+	iamClient       *iamv2.Client
 }
 
 // NewRosaRoleConfigScope creates a new RosaRoleConfigScope from the supplied parameters.
@@ -71,21 +71,21 @@ func NewRosaRoleConfigScope(params RosaRoleConfigScopeParams) (*RosaRoleConfigSc
 		RosaRoleConfig: params.RosaRoleConfig,
 	}
 
-	session, serviceLimiters, err := sessionForClusterWithRegion(params.Client, RosaRoleConfigScope, "", params.Endpoints, params.Logger)
+	sessionv2, serviceLimitersv2, err := sessionForClusterWithRegionV2(params.Client, RosaRoleConfigScope, "", params.Endpoints, params.Logger)
 	if err != nil {
-		return nil, errors.Errorf("failed to create aws session: %v", err)
+		return nil, errors.Errorf("failed to create aws V2 session: %v", err)
 	}
 
-	iamClient := iam.New(session)
+	iamClient := iamv2.NewFromConfig(*sessionv2)
 
 	patchHelper, err := patch.NewHelper(params.RosaRoleConfig, params.Client)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to init patch helper")
 	}
 
 	RosaRoleConfigScope.patchHelper = patchHelper
-	RosaRoleConfigScope.session = session
-	RosaRoleConfigScope.serviceLimiters = serviceLimiters
+	RosaRoleConfigScope.session = *sessionv2
+	RosaRoleConfigScope.serviceLimiters = serviceLimitersv2
 	RosaRoleConfigScope.iamClient = iamClient
 
 	return RosaRoleConfigScope, nil
@@ -96,8 +96,8 @@ func (s *RosaRoleConfigScope) IdentityRef() *infrav1.AWSIdentityReference {
 	return s.RosaRoleConfig.Spec.IdentityRef
 }
 
-// Session returns the AWS SDK session (used for creating clients).
-func (s *RosaRoleConfigScope) Session() awsclient.ConfigProvider {
+// Session returns the AWS SDK V2 session. Used for creating clients.
+func (s *RosaRoleConfigScope) Session() awsv2.Config {
 	return s.session
 }
 
@@ -165,6 +165,6 @@ func (s *RosaRoleConfigScope) CredentialsSecret() *corev1.Secret {
 }
 
 // IAMClient returns the IAM client.
-func (s *RosaRoleConfigScope) IAMClient() *iam.IAM {
+func (s *RosaRoleConfigScope) IAMClient() *iamv2.Client {
 	return s.iamClient
 }