diff --git a/migrations/openbao/migrations/07_setup_api-keys.sh b/migrations/openbao/migrations/07_setup_api-keys.sh index 52baa33c9..7dbf9954b 100644 --- a/migrations/openbao/migrations/07_setup_api-keys.sh +++ b/migrations/openbao/migrations/07_setup_api-keys.sh @@ -35,7 +35,7 @@ SERVICE_ACCOUNT_NAME="api-keys-api" # and the NVCT_SERVICE_ID env var consumed by NAK and NVCT. NVCT_SERVICE_ID="nvidia-cloud-tasks-ncp-service-id-nvcttasks" -EVENT_LEDGER_SERVICE_ID="nvidia-cloud-events-ncp-service-id-ckozoh6f" +EVENT_LEDGER_SERVICE_ID="nvidia-event-ledger-ncp-service-id-ckozoh6f" #------------------------------------------- # Set defaults for secret paths and policies diff --git a/src/control-plane-services/api-keys/src/main/resources/application-ncp.yaml b/src/control-plane-services/api-keys/src/main/resources/application-ncp.yaml index ade8d2bea..f87dbc5c4 100644 --- a/src/control-plane-services/api-keys/src/main/resources/application-ncp.yaml +++ b/src/control-plane-services/api-keys/src/main/resources/application-ncp.yaml @@ -39,5 +39,6 @@ apikeys: service-id-map: nvcf: ${NVCF_SERVICE_ID:nvidia-cloud-functions-ncp-service-id-aketm} nvct: ${NVCT_SERVICE_ID:nvidia-cloud-tasks-ncp-service-id-nvcttasks} + event-ledger: ${EVENT_LEDGER_SERVICE_ID:nvidia-event-ledger-ncp-service-id-ckozoh6f} key-prefix: nvapi-nvcf-stg- keep-after-expired-duration: P2D diff --git a/src/control-plane-services/api-keys/src/main/resources/application.yaml b/src/control-plane-services/api-keys/src/main/resources/application.yaml index e678cb6d9..8063d2f8c 100644 --- a/src/control-plane-services/api-keys/src/main/resources/application.yaml +++ b/src/control-plane-services/api-keys/src/main/resources/application.yaml @@ -175,6 +175,7 @@ apikeys: service-id-map: nvcf: nvidia-cloud-functions-ncp-service-id-aketm nvct: nvidia-cloud-tasks-ncp-service-id-nvcttasks + event-ledger: nvidia-event-ledger-ncp-service-id-ckozoh6f key-prefix: nvcfapi- data-domain-key: ${kv.data-domain-key.value} keep-after-expired-duration: P2D diff --git a/src/control-plane-services/api-keys/src/test/java/com/nvidia/apikeys/config/ConfigTest.java b/src/control-plane-services/api-keys/src/test/java/com/nvidia/apikeys/config/ConfigTest.java index 493f83fd3..c69ac56c9 100644 --- a/src/control-plane-services/api-keys/src/test/java/com/nvidia/apikeys/config/ConfigTest.java +++ b/src/control-plane-services/api-keys/src/test/java/com/nvidia/apikeys/config/ConfigTest.java @@ -58,6 +58,16 @@ void vaultPropertiesShouldBeSet() { assertThat(environment.getProperty("kv.private-key-jwks.keys")).isNotEmpty(); } + @Test + void serviceIdMapShouldContainRegisteredServices() { + assertThat(environment.getProperty("apikeys.service-id-map.nvcf")) + .isEqualTo("nvidia-cloud-functions-ncp-service-id-aketm"); + assertThat(environment.getProperty("apikeys.service-id-map.nvct")) + .isEqualTo("nvidia-cloud-tasks-ncp-service-id-nvcttasks"); + assertThat(environment.getProperty("apikeys.service-id-map.event-ledger")) + .isEqualTo("nvidia-event-ledger-ncp-service-id-ckozoh6f"); + } + @Test void shouldBeAbleToEncryptAndDecrypt() { String encryptedText = jwtService.encryptWithKeyId("92f5fb39-0b6b-4472-9b88-0575870294c0",