openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

pkg/destroy/aws/elbhelpers.go

Browse Source 
** Remove all SDK v1 imports from elb helpers.
This commit is contained in:
barbacbd
2025-05-22 07:56:27 -04:00
parent 7b466d9275
commit b08089f6a8
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/destroy/aws/aws.go
View File

@@ -18,7 +18,6 @@ import (
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/efs"
"github.com/aws/aws-sdk-go/service/iam"
"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi"
"github.com/aws/aws-sdk-go/service/route53"
"github.com/aws/aws-sdk-go/service/s3"
@@ -213,7 +212,6 @@ func (o *ClusterUninstaller) RunWithContext(ctx context.Context) ([]string, erro
}
}
iamClient := iam.New(awsSession)
iamRoleSearch := &IamRoleSearch{
Client: o.IAMClient,
Filters: o.Filters,
@@ -228,7 +226,7 @@ func (o *ClusterUninstaller) RunWithContext(ctx context.Context) ([]string, erro
// Get the initial resources to delete, so that they can be returned if the context is canceled while terminating
// instances.
deleted := sets.New[string]()
resourcesToDelete, tagClientsWithResources, err := o.findResourcesToDelete(ctx, tagClients, iamClient, iamRoleSearch, iamUserSearch, deleted)
resourcesToDelete, tagClientsWithResources, err := o.findResourcesToDelete(ctx, tagClients, iamRoleSearch, iamUserSearch, deleted)
if err != nil {
o.Logger.WithError(err).Info("error while finding resources to delete")
if err := ctx.Err(); err != nil {
@@ -262,7 +260,7 @@ func (o *ClusterUninstaller) RunWithContext(ctx context.Context) ([]string, erro
}
// Store resources to delete in a temporary variable so that, in case the context is cancelled, the current
// resources to delete are not lost.
nextResourcesToDelete, nextTagClients, err := o.findResourcesToDelete(ctx, tagClientsWithResources, iamClient, iamRoleSearch, iamUserSearch, deleted)
nextResourcesToDelete, nextTagClients, err := o.findResourcesToDelete(ctx, tagClientsWithResources, iamRoleSearch, iamUserSearch, deleted)
if err != nil {
o.Logger.WithError(err).Info("error while finding resources to delete")
if err := ctx.Err(); err != nil {
@@ -292,15 +290,14 @@ func (o *ClusterUninstaller) RunWithContext(ctx context.Context) ([]string, erro
// a shared tag will be ignored.
//
// deleted - the resources that have already been deleted. Any resources specified in this set will be ignored.
func (o *ClusterUninstaller) findUntaggableResources(ctx context.Context, iamClient *iam.IAM, deleted sets.Set[string]) (sets.Set[string], error) {
func (o *ClusterUninstaller) findUntaggableResources(ctx context.Context, deleted sets.Set[string]) (sets.Set[string], error) {
resources := sets.New[string]()
o.Logger.Debug("search for IAM instance profiles")
for _, profileType := range []string{"master", "worker", "bootstrap"} {
profile := fmt.Sprintf("%s-%s-profile", o.ClusterID, profileType)
response, err := iamClient.GetInstanceProfileWithContext(ctx, &iam.GetInstanceProfileInput{InstanceProfileName: &profile})
response, err := o.IAMClient.GetInstanceProfile(ctx, &iamv2.GetInstanceProfileInput{InstanceProfileName: &profile})
if err != nil {
var awsErr awserr.Error
if errors.As(err, &awsErr) && awsErr.Code() == iam.ErrCodeNoSuchEntityException {
if strings.Contains(HandleErrorCode(err), "NoSuchEntity") {
continue
}
return resources, fmt.Errorf("failed to get IAM instance profile: %w", err)
@@ -320,7 +317,6 @@ func (o *ClusterUninstaller) findUntaggableResources(ctx context.Context, iamCli
func (o *ClusterUninstaller) findResourcesToDelete(
ctx context.Context,
tagClients []*resourcegroupstaggingapi.ResourceGroupsTaggingAPI,
iamClient *iam.IAM,
iamRoleSearch *IamRoleSearch,
iamUserSearch *IamUserSearch,
deleted sets.Set[string],
@@ -332,7 +328,7 @@ func (o *ClusterUninstaller) findResourcesToDelete(
}
// Find untaggable resources
untaggableResources, err := o.findUntaggableResources(ctx, iamClient, deleted)
untaggableResources, err := o.findUntaggableResources(ctx, deleted)
if err != nil {
errs = append(errs, err)
}
@@ -579,7 +575,7 @@ func (o *ClusterUninstaller) deleteARN(ctx context.Context, session *session.Ses
case "ec2":
return o.deleteEC2(ctx, arn, logger)
case "elasticloadbalancing":
return o.deleteElasticLoadBalancing(ctx, session, arn, logger)
return o.deleteElasticLoadBalancing(ctx, arn, logger)
case "iam":
return o.deleteIAM(ctx, o.IAMClient, arn, logger)
case "route53":

30
pkg/destroy/aws/elbhelpers.go
View File

@@ -5,18 +5,15 @@ import (
"fmt"
"strings"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/arn"
elbapi "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing"
elbapiv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/elbv2"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
func (o *ClusterUninstaller) deleteElasticLoadBalancing(ctx context.Context, session *session.Session, arn arn.ARN, logger logrus.FieldLogger) error {
func (o *ClusterUninstaller) deleteElasticLoadBalancing(ctx context.Context, arn arn.ARN, logger logrus.FieldLogger) error {
resourceType, id, err := splitSlash("resource", arn.Resource)
if err != nil {
return err
@@ -40,9 +37,9 @@ func (o *ClusterUninstaller) deleteElasticLoadBalancing(ctx context.Context, ses
return errors.Errorf("unrecognized elastic load balancing resource subtype %s", subtype)
}
case "targetgroup":
return deleteElasticLoadBalancerTargetGroup(ctx, elbv2.New(session), arn, logger)
return deleteElasticLoadBalancerTargetGroup(ctx, o.ELBV2Client, arn, logger)
case "listener":
return deleteElasticLoadBalancerListener(ctx, elbv2.New(session), arn, logger)
return deleteElasticLoadBalancerListener(ctx, o.ELBV2Client, arn, logger)
default:
return errors.Errorf("unrecognized elastic load balancing resource type %s", resourceType)
}
@@ -97,8 +94,8 @@ func deleteElasticLoadBalancerClassicByVPC(ctx context.Context, client *elbapi.C
return lastError
}
func deleteElasticLoadBalancerTargetGroup(ctx context.Context, client *elbv2.ELBV2, arn arn.ARN, logger logrus.FieldLogger) error {
_, err := client.DeleteTargetGroupWithContext(ctx, &elbv2.DeleteTargetGroupInput{
func deleteElasticLoadBalancerTargetGroup(ctx context.Context, client *elbapiv2.Client, arn arn.ARN, logger logrus.FieldLogger) error {
_, err := client.DeleteTargetGroup(ctx, &elbapiv2.DeleteTargetGroupInput{
TargetGroupArn: aws.String(arn.String()),
})
if err != nil {
@@ -109,21 +106,12 @@ func deleteElasticLoadBalancerTargetGroup(ctx context.Context, client *elbv2.ELB
return nil
}
func isListenerNotFound(err interface{}) bool {
if aerr, ok := err.(awserr.Error); ok {
if aerr.Code() == elbv2.ErrCodeListenerNotFoundException {
return true
}
}
return false
}
func deleteElasticLoadBalancerListener(ctx context.Context, client *elbv2.ELBV2, arn arn.ARN, logger logrus.FieldLogger) error {
_, err := client.DeleteListenerWithContext(ctx, &elbv2.DeleteListenerInput{
func deleteElasticLoadBalancerListener(ctx context.Context, client *elbapiv2.Client, arn arn.ARN, logger logrus.FieldLogger) error {
_, err := client.DeleteListener(ctx, &elbapiv2.DeleteListenerInput{
ListenerArn: aws.String(arn.String()),
})
if err != nil {
if isListenerNotFound(err) {
if strings.Contains(HandleErrorCode(err), "ListenerNotFound") {
logger.Info("Not found or already deleted")
return nil
}