From 2bc44ce629d7e058b3bbe71d0824107237dbdb8a Mon Sep 17 00:00:00 2001 From: kkb0318 Date: Wed, 8 May 2024 19:19:46 +0900 Subject: [PATCH] bugfix keys.json --- internal/controller/irsasetup_controller_test.go | 4 ++-- internal/selfhosted/jwks.go | 4 ---- internal/selfhosted/oidc/id_provider_discovery_contents.go | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/controller/irsasetup_controller_test.go b/internal/controller/irsasetup_controller_test.go index 6824868..379e628 100644 --- a/internal/controller/irsasetup_controller_test.go +++ b/internal/controller/irsasetup_controller_test.go @@ -121,7 +121,7 @@ var _ = Describe("IRSASetup Controller", func() { Name: obj.Name, Namespace: obj.Namespace, } - By("Reconciling with the AwsClient error") + By("secret does not exist when reconciling with the AwsClient error") r.AwsClient = newMockAwsClient(&mockAwsIamAPI{createOidcErr: true}, &mockAwsS3API{}, &mockAwsStsAPI{}) _, err := r.Reconcile(ctx, reconcile.Request{ NamespacedName: typeNamespacedName, @@ -130,7 +130,7 @@ var _ = Describe("IRSASetup Controller", func() { for _, expect := range expected { checkNoExist(expect, newSecret) } - By("Reconciling successfully") + By("successfully Reconciling") r.AwsClient = newMockAwsClient(&mockAwsIamAPI{}, &mockAwsS3API{}, &mockAwsStsAPI{}) _, err = r.Reconcile(ctx, reconcile.Request{ NamespacedName: typeNamespacedName, diff --git a/internal/selfhosted/jwks.go b/internal/selfhosted/jwks.go index 1e702e4..50b46e4 100644 --- a/internal/selfhosted/jwks.go +++ b/internal/selfhosted/jwks.go @@ -76,7 +76,3 @@ func NewJWK(pub []byte) (*JWK, error) { }) return &JWK{Keys: keys}, nil } - -func (j *JWK) GetKeys() []jose.JSONWebKey { - return j.Keys -} diff --git a/internal/selfhosted/oidc/id_provider_discovery_contents.go b/internal/selfhosted/oidc/id_provider_discovery_contents.go index 35c0bbe..922e0a6 100644 --- a/internal/selfhosted/oidc/id_provider_discovery_contents.go +++ b/internal/selfhosted/oidc/id_provider_discovery_contents.go @@ -45,7 +45,7 @@ func (p *IdPDiscoveryContents) Discovery() ([]byte, error) { } func (p *IdPDiscoveryContents) JWK() ([]byte, error) { - jsonData, err := json.MarshalIndent(p.jwk.GetKeys(), "", " ") + jsonData, err := json.MarshalIndent(p.jwk, "", " ") if err != nil { return nil, err }