Merge pull request #7680 from r4f4/aws-destroy-sets-deprec

NO-JIRA: destroy/aws: replaced deprecated sets syntax

Author: openshift-merge-bot[bot]

pkg/destroy/aws/aws.go

@@ -171,7 +171,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.NewString()
+	deleted := sets.New[string]()
 	resourcesToDelete, tagClientsWithResources, err := o.findResourcesToDelete(ctx, tagClients, iamClient, iamRoleSearch, iamUserSearch, deleted)
 	if err != nil {
 		o.Logger.WithError(err).Info("error while finding resources to delete")
@@ -269,8 +269,8 @@ 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.String) (sets.String, error) { //nolint:staticcheck
-	resources := sets.NewString()
+func (o *ClusterUninstaller) findUntaggableResources(ctx context.Context, iamClient *iam.IAM, 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)
@@ -300,9 +300,9 @@ func (o *ClusterUninstaller) findResourcesToDelete(
 	iamClient *iam.IAM,
 	iamRoleSearch *iamRoleSearch,
 	iamUserSearch *iamUserSearch,
-	deleted sets.String,
-) (sets.String, []*resourcegroupstaggingapi.ResourceGroupsTaggingAPI, error) {
-	resources := sets.NewString()
+	deleted sets.Set[string],
+) (sets.Set[string], []*resourcegroupstaggingapi.ResourceGroupsTaggingAPI, error) {
+	resources := sets.New[string]()
 	var tagClientsWithResources []*resourcegroupstaggingapi.ResourceGroupsTaggingAPI
 	var errs []error
 
@@ -353,9 +353,9 @@ func (o *ClusterUninstaller) findResourcesToDelete(
 func (o *ClusterUninstaller) findResourcesByTag(
 	ctx context.Context,
 	tagClient *resourcegroupstaggingapi.ResourceGroupsTaggingAPI,
-	deleted sets.String,
-) (sets.String, error) {
-	resources := sets.NewString()
+	deleted sets.Set[string],
+) (sets.Set[string], error) {
+	resources := sets.New[string]()
 	for _, filter := range o.Filters {
 		o.Logger.Debugf("search for matching resources by tag in %s matching %#+v", *tagClient.Config.Region, filter)
 		tagFilters := make([]*resourcegroupstaggingapi.TagFilter, 0, len(filter))
@@ -392,8 +392,8 @@ func (o *ClusterUninstaller) findResourcesByTag(
 //	resources - the resources to be deleted.
 //
 // The first return is the ARNs of the resources that were successfully deleted
-func (o *ClusterUninstaller) deleteResources(ctx context.Context, awsSession *session.Session, resources []string, tracker *errorTracker) (sets.String, error) {
-	deleted := sets.NewString()
+func (o *ClusterUninstaller) deleteResources(ctx context.Context, awsSession *session.Session, resources []string, tracker *errorTracker) (sets.Set[string], error) {
+	deleted := sets.New[string]()
 	for _, arnString := range resources {
 		logger := o.Logger.WithField("arn", arnString)
 		parsedARN, err := arn.Parse(arnString)

pkg/destroy/aws/ec2helpers.go

@@ -23,7 +23,7 @@ import (
 // stage and the second list is the list of resources that are not terminated.
 //
 //	deleted - the resources that have already been deleted. Any resources specified in this set will be ignored.
-func findEC2Instances(ctx context.Context, ec2Client *ec2.EC2, deleted sets.String, filters []Filter, logger logrus.FieldLogger) ([]string, []string, error) {
+func findEC2Instances(ctx context.Context, ec2Client *ec2.EC2, deleted sets.Set[string], filters []Filter, logger logrus.FieldLogger) ([]string, []string, error) {
 	if ec2Client.Config.Region == nil {
 		return nil, nil, errors.New("EC2 client does not have region configured")
 	}

pkg/destroy/aws/iamhelpers.go

@@ -158,27 +158,27 @@ func (search *iamUserSearch) arns(ctx context.Context) ([]string, error) {
 // findIAMRoles returns the IAM roles for the cluster.
 //
 //	deleted - the resources that have already been deleted. Any resources specified in this set will be ignored.
-func findIAMRoles(ctx context.Context, search *iamRoleSearch, deleted sets.String, logger logrus.FieldLogger) (sets.String, error) {
+func findIAMRoles(ctx context.Context, search *iamRoleSearch, deleted sets.Set[string], logger logrus.FieldLogger) (sets.Set[string], error) {
 	logger.Debug("search for IAM roles")
 	resources, _, err := search.find(ctx)
 	if err != nil {
 		logger.Info(err)
 		return nil, err
 	}
-	return sets.NewString(resources...).Difference(deleted), nil
+	return sets.New[string](resources...).Difference(deleted), nil
 }
 
 // findIAMUsers returns the IAM users for the cluster.
 //
 //	deleted - the resources that have already been deleted. Any resources specified in this set will be ignored.
-func findIAMUsers(ctx context.Context, search *iamUserSearch, deleted sets.String, logger logrus.FieldLogger) (sets.String, error) {
+func findIAMUsers(ctx context.Context, search *iamUserSearch, deleted sets.Set[string], logger logrus.FieldLogger) (sets.Set[string], error) {
 	logger.Debug("search for IAM users")
 	resources, err := search.arns(ctx)
 	if err != nil {
 		logger.Info(err)
 		return nil, err
 	}
-	return sets.NewString(resources...).Difference(deleted), nil
+	return sets.New[string](resources...).Difference(deleted), nil
 }
 
 func deleteIAM(ctx context.Context, session *session.Session, arn arn.ARN, logger logrus.FieldLogger) error {