Skip to content

CORS-4055: migrate IAM API calls to AWS SDK v2 #10245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jan 28, 2026
+9 −6
Merged

CORS-4055: migrate IAM API calls to AWS SDK v2 #10245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions pkg/asset/installconfig/aws/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"sort"

ec2v2 "github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/aws/aws-sdk-go-v2/service/iam"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/iam"
"github.com/aws/aws-sdk-go/service/route53"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/util/sets"
Expand Down Expand Up @@ -946,19 +946,22 @@ func isHostedZoneAssociatedWithVPC(hostedZone *route53.GetHostedZoneOutput, vpcI
}

func validateInstanceProfile(ctx context.Context, meta *Metadata, fldPath *field.Path, pool *awstypes.MachinePool) *field.Error {
session, err := meta.Session(ctx)
client, err := NewIAMClient(ctx, EndpointOptions{
Region: meta.Region,
Endpoints: meta.Services,
})
if err != nil {
return field.InternalError(fldPath, fmt.Errorf("unable to retrieve aws session: %w", err))
return field.InternalError(fldPath, fmt.Errorf("unable to retrieve iam client: %w", err))
}
client := iam.New(session)
res, err := client.GetInstanceProfileWithContext(ctx, &iam.GetInstanceProfileInput{

res, err := client.GetInstanceProfile(ctx, &iam.GetInstanceProfileInput{
InstanceProfileName: aws.String(pool.IAMProfile),
})
if err != nil {
msg := fmt.Errorf("unable to retrieve instance profile: %w", err).Error()
return field.Invalid(fldPath, pool.IAMProfile, msg)
}
if len(res.InstanceProfile.Roles) == 0 || res.InstanceProfile.Roles[0] == nil {
if len(res.InstanceProfile.Roles) == 0 {
return field.Invalid(fldPath, pool.IAMProfile, "no role attached to instance profile")
}

Expand Down