BD-1730: Legge til krypteringsnøkkelversjon ved henting av eksisteren…

…de blob (#558)
navikt · Oct 4, 2023 · 2e93ddc · 2e93ddc
1 parent a2bb6b8
commit 2e93ddc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/...i/src/main/java/no/nav/farskapsportal/backend/apps/api/service/FarskapsportalService.java b/...i/src/main/java/no/nav/farskapsportal/backend/apps/api/service/FarskapsportalService.java
@@ -286,14 +286,10 @@ public FarskapserklaeringDto oppdatereStatusSigneringsjobb(
           idFarskapserklaering, statusQueryToken, fnrPaaloggetPerson);
     }
 
-    var forelderrolle = personopplysningService.bestemmeForelderrolle(fnrPaaloggetPerson);
-    var forelder = persistenceService.henteForelderForIdent(fnrPaaloggetPerson);
-
-    log.error(
-        "Fant ikke farskapserklæring med id {} i databasen for person med forelderrolle {} og forelderid {}.",
+    SIKKER_LOGG.error(
+        "Fant ikke farskapserklæring med id {} i databasen for person med personident {}.",
         idFarskapserklaering,
-        forelderrolle,
-        forelder.isPresent() ? forelder.get().getId() : "ukjent");
+        fnrPaaloggetPerson);
 
     throw new RessursIkkeFunnetException(Feilkode.FANT_IKKE_FARSKAPSERKLAERING);
   }

diff --git a/...c/main/java/no/nav/farskapsportal/backend/libs/felles/consumer/bucket/BucketConsumer.java b/...c/main/java/no/nav/farskapsportal/backend/libs/felles/consumer/bucket/BucketConsumer.java
@@ -26,6 +26,7 @@ public Optional<BlobIdGcp> getExistingBlobIdGcp(String bucket, String documentNa
         : Optional.of(
             BlobIdGcp.builder()
                 .bucket(blobId.get().getBucket())
+                .encryptionKeyVersion(gcpStorageManager.getEncryptionKeyVersion())
                 .name(blobId.get().getName())
                 .generation(blobId.get().getGeneration())
                 .build());

diff --git a/...ain/java/no/nav/farskapsportal/backend/libs/felles/consumer/bucket/GcpStorageManager.java b/...ain/java/no/nav/farskapsportal/backend/libs/felles/consumer/bucket/GcpStorageManager.java
@@ -83,6 +83,10 @@ public boolean deleteContentFromBucket(String bucketName, String documentName) {
     return storage.delete(BlobId.of(bucketName, documentName));
   }
 
+  public int getEncryptionKeyVersion() {
+    return encryptionProvider.getKeyVersion();
+  }
+
   private byte[] decryptFile(byte[] file, BlobInfo blobInfo) throws GeneralSecurityException {
 
     // Based on example from https://cloud.google.com/kms/docs/client-side-encryption