storytold/irsa-manager
2
0
Fork 0
mirror of https://github.com/storytold/irsa-manager.git synced 2026-10-09 00:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

ignore error when deleting non-existing resources

Browse Source
This commit is contained in:
kkb0318
2024-04-24 23:15:26 +09:00
parent 4f197a57dc
commit e0cd191793
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/client/aws.go
+14 -5
View File
@@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"log"
"slices"
"strings"
"github.com/aws/aws-sdk-go-v2/aws"
@@ -157,11 +158,9 @@ func (a *AwsS3Client) DeleteBucket(ctx context.Context) error {
})
if err != nil {
var ae smithy.APIError
var nfe *s3types.NoSuchBucket
if errors.As(err, &ae) && ae.ErrorCode() == "BucketNotEmpty" {
log.Println("skipped error", err)
}
if errors.As(err, &nfe) {
errorCodes := []string{"BucketNotEmpty", "NoSuchBucket"}
if errors.As(err, &ae) && slices.Contains(errorCodes, ae.ErrorCode()) {
log.Println("Deletion skipped: ", err)
return nil
}
return err
@@ -180,6 +179,11 @@ func (a *AwsS3Client) DeleteObjects(ctx context.Context, objectKeys []string) er
Delete: &s3types.Delete{Objects: objectIds},
})
if err != nil {
var ae smithy.APIError
if errors.As(err, &ae) && ae.ErrorCode() == "NoSuchBucket" {
log.Println("Deletion skipped: the bucket does not exist.", err)
return nil
}
return err
}
return err
@@ -219,6 +223,11 @@ func (a *AwsIamClient) DeleteOIDCProvider(ctx context.Context, accountId, issuer
OpenIDConnectProviderArn: aws.String(fmt.Sprintf("arn:aws:iam::%s:oidc-provider/%s", accountId, issuerHostPath)),
})
if err != nil {
var ae smithy.APIError
if errors.As(err, &ae) && ae.ErrorCode() == "NoSuchEntity" {
log.Println("Deletion skipped: ", err)
return nil
}
return err
}
return nil