Skip to content
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

avoid-panic-if-oidc-do-not-exists #208

Merged
merged 2 commits into from
Nov 1, 2023
Merged

avoid-panic-if-oidc-do-not-exists #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29248c7
avoid-panic-if-oidc-do-not-exists
calvix Oct 31, 2023
f7bf3e1
nancy-yay
calvix Oct 31, 2023
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
1 change: 1 addition & 0 deletions .nancy-ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CVE-2019-10743 until=2023-12-31
CVE-2022-29153 until=2023-12-31
CVE-2019-19355 until=2023-12-31
CVE-2023-3978
CVE-2023-39325

# pkg:golang/github.com/hashicorp/consul/[email protected]
CVE-2021-41803 until=2023-12-31
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Remove SecretReconciler.
- Refactor Reconcilers.
- Do not panic when OIDC setting is missing for EKS cluster.

### Added

Expand Down
5 changes: 5 additions & 0 deletions pkg/iam/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ package iam
import (
"github.com/aws/aws-sdk-go/aws/awserr"
awsiam "github.com/aws/aws-sdk-go/service/iam"
"github.com/giantswarm/microerror"
)

var invalidClusterError = &microerror.Error{
Kind: "invalidClusterError",
}

func IsNotFound(err error) bool {
if aerr, ok := err.(awserr.Error); ok {
if aerr.Code() == awsiam.ErrCodeNoSuchEntityException {
Expand Down
3 changes: 3 additions & 0 deletions pkg/iam/iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,9 @@ func (s *IAMService) GetIRSAOpenIDForEKS(clusterName string) (string, error) {
if err != nil {
return "", microerror.Mask(err)
}
if cluster == nil || cluster.Cluster == nil || cluster.Cluster.Identity == nil || cluster.Cluster.Identity.Oidc == nil || cluster.Cluster.Identity.Oidc.Issuer == nil {
return "", microerror.Maskf(invalidClusterError, "cluster %s does not have OIDC identity", clusterName)
}

id := strings.TrimPrefix(*cluster.Cluster.Identity.Oidc.Issuer, "https://")

Expand Down