Skip to content

Commit cfd5862

Browse files
authored
Merge pull request #5 from linuxfoundation/jme/LFXV2-436
New NATS subject & helm chart fixes
2 parents b2b621a + 53cb096 commit cfd5862

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

charts/lfx-v2-access-check/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ apiVersion: v2
55
name: lfx-v2-access-check
66
description: LFX Platform V2 Access Check Service chart
77
type: application
8-
version: 0.2.1
8+
version: 0.2.2
99
appVersion: "0.1.0"

charts/lfx-v2-access-check/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
- name: NATS_URL
3838
value: "{{ .Values.nats.url }}"
3939
- name: JWKS_URL
40-
value: "{{ .Values.heimdall.url }}"
40+
value: "{{ .Values.heimdall.jwks_url }}"
4141
livenessProbe:
4242
httpGet:
4343
path: /livez

charts/lfx-v2-access-check/templates/ruleset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
routes:
1717
- path: /access-check
1818
execute:
19-
- authenticator: anonymous_authenticator
19+
- authenticator: oidc
2020
- authorizer: allow_all
2121
- finalizer: create_jwt
2222
config:

charts/lfx-v2-access-check/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ nats:
4040
heimdall:
4141
enabled: true
4242
url: http://lfx-platform-heimdall.lfx.svc.cluster.local:4456
43+
jwks_url: http://lfx-platform-heimdall:4457/.well-known/jwks

internal/service/access_service_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ func TestCheckAccess_Success(t *testing.T) {
143143
authRepo := &mockAuthRepository{}
144144
messagingRepo := &mockMessagingRepository{
145145
requestFunc: func(_ context.Context, subject string, _ []byte, _ time.Duration) ([]byte, error) {
146-
if subject != "dev.lfx.access_check.request" {
147-
t.Errorf("Expected subject 'dev.lfx.access_check.request', got '%s'", subject)
146+
if subject != "lfx.access_check.request" {
147+
t.Errorf("Expected subject 'lfx.access_check.request', got '%s'", subject)
148148
}
149149
return []byte("allow"), nil
150150
},

pkg/constants/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const (
1717
ServiceRequestIDKey ContextKey = RequestIDHeader
1818

1919
// NATS subjects for messaging
20-
AccessCheckSubject = "dev.lfx.access_check.request"
20+
AccessCheckSubject = "lfx.access_check.request"
2121

2222
// API version constants
2323
SupportedAPIVersion = "1"

0 commit comments

Comments
 (0)