Skip to content

Commit 5956c87

Browse files
committed
fix: handle NoSuchEntity err on delete
This was blocking cluster deletion, because the OIDC provider no longer existed and was returning an error.
1 parent b97c3fa commit 5956c87

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

pkg/cloud/services/iam/oidc.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"crypto/tls"
88
stderr "errors"
99
"fmt"
10+
"github.com/aws/aws-sdk-go/aws/awserr"
1011
"path"
1112
"strings"
1213

@@ -287,7 +288,20 @@ func deleteOIDCProvider(arn string, iamClient iamiface.IAMAPI) error {
287288

288289
_, err := iamClient.DeleteOpenIDConnectProvider(&input)
289290
if err != nil {
290-
return errors.Wrap(err, "error deleting provider")
291+
292+
var aerr awserr.Error
293+
ok := errors.As(err, &aerr)
294+
if !ok {
295+
return errors.Wrap(err, "deleting OIDC provider")
296+
}
297+
298+
switch aerr.Code() {
299+
case iam.ErrCodeNoSuchEntityException:
300+
return nil
301+
default:
302+
return errors.Wrap(err, "deleting OIDC provider")
303+
}
304+
291305
}
292306
return nil
293307
}

0 commit comments

Comments
 (0)