SecretClient doesn't seem to be retrieving managed secrets (#830)

- Fixes the list key and list secret endpoints to contain managed entities as well
- Fixes the list deleted key and list deleted secret endpoints to return managed entities
- Updates converter logic to include managed flag in case managed entities are listed
- Updates Codecov links in Readmes
- Updates tests
- Adds new steps to verify managed flags in end-to-end tests

Resolves #827
{minor}

Signed-off-by: Esta Nagy <nagyesta@gmail.com>

lowkey-vault-app/README.md

@@ -5,7 +5,7 @@
 [![latest-release](https://img.shields.io/github/v/tag/nagyesta/lowkey-vault?color=blue&logo=git&label=releases&sort=semver)](https://github.com/nagyesta/lowkey-vault/releases)
 [![Docker Hub](https://img.shields.io/docker/v/nagyesta/lowkey-vault?label=docker%20hub&logo=docker&sort=semver)](https://hub.docker.com/r/nagyesta/lowkey-vault)
 [![JavaCI](https://img.shields.io/github/actions/workflow/status/nagyesta/lowkey-vault/gradle.yml?logo=github&branch=main)](https://github.com/nagyesta/lowkey-vault/actions/workflows/gradle.yml)
-[![codecov](https://img.shields.io/codecov/c/github/nagyesta/lowkey-vault?label=Coverage&flag=app&token=3ZZ9Q4S5WW)](https://img.shields.io/codecov/c/github/nagyesta/lowkey-vault?label=Coverage&flag=app&token=3ZZ9Q4S5WW)
+[![codecov](https://img.shields.io/codecov/c/github/nagyesta/lowkey-vault?label=Coverage&flag=app&token=3ZZ9Q4S5WW)](https://app.codecov.io/gh/nagyesta/lowkey-vault?flags%5B0%5D=app)
 [![badge-abort-mission-armed-green](https://raw.githubusercontent.com/nagyesta/abort-mission/wiki_assets/.github/assets/badge-abort-mission-armed-green.svg)](https://github.com/nagyesta/abort-mission)
 
 # Lowkey Vault - App

lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/controller/common/GenericEntityController.java

@@ -142,7 +142,7 @@ protected KeyVaultItemListModel<I> getPageOfItemVersions(
     @SuppressWarnings("SameParameterValue")
     protected KeyVaultItemListModel<I> getPageOfItems(final URI baseUri, final PaginationContext pagination) {
         final S entityVaultFake = getVaultByUri(baseUri);
-        final List<E> allItems = entityVaultFake.getEntities().listLatestNonManagedEntities();
+        final List<E> allItems = entityVaultFake.getEntities().listLatestEntities();
         final List<I> items = filterList(pagination.getLimit(), pagination.getOffset(), allItems,
                 source -> registry.itemConverter(apiVersion()).convert(source, baseUri));
         final URI nextUri = PaginationContext.builder()
@@ -161,7 +161,7 @@ protected KeyVaultItemListModel<I> getPageOfItems(final URI baseUri, final Pagin
     @SuppressWarnings("SameParameterValue")
     protected KeyVaultItemListModel<DI> getPageOfDeletedItems(final URI baseUri, final PaginationContext pagination) {
         final S entityVaultFake = getVaultByUri(baseUri);
-        final List<E> allItems = entityVaultFake.getDeletedEntities().listLatestNonManagedEntities();
+        final List<E> allItems = entityVaultFake.getDeletedEntities().listLatestEntities();
         final List<DI> items = filterList(pagination.getLimit(), pagination.getOffset(), allItems,
                 source -> registry.itemConverter(apiVersion()).convertDeleted(source, baseUri));
         final URI nextUri = PaginationContext.builder()

lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/management/VaultImportExportExecutor.java

@@ -100,19 +100,17 @@ private VaultBackupModel backupVault(final VaultService vaultService, final Vaul
 
     private Map<String, KeyBackupList> mapKeys(final VaultFake vaultFake) {
         return vaultFake.keyVaultFake().getEntities()
-                .listLatestEntities().stream()
                 //exclude managed entities as certificates will take care of those
-                .filter(r -> !r.isManaged())
+                .listLatestNonManagedEntities().stream()
                 .map(ReadOnlyKeyVaultKeyEntity::getId)
                 .map(VersionedKeyEntityId::id)
                 .collect(Collectors.toMap(Function.identity(), name -> backupKey(vaultFake.baseUri(), name)));
     }
 
     private Map<String, SecretBackupList> mapSecrets(final VaultFake vaultFake) {
         return vaultFake.secretVaultFake().getEntities()
-                .listLatestEntities().stream()
                 //exclude managed entities as certificates will take care of those
-                .filter(r -> !r.isManaged())
+                .listLatestNonManagedEntities().stream()
                 .map(ReadOnlyKeyVaultSecretEntity::getId)
                 .map(VersionedSecretEntityId::id)
                 .collect(Collectors.toMap(Function.identity(), name -> backupSecret(vaultFake.baseUri(), name)));

lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/mapper/v7_2/key/KeyEntityToV72KeyItemModelConverter.java

@@ -41,6 +41,9 @@ protected <M extends KeyVaultKeyItemModel> M mapActiveFields(
         model.setKeyId(convertKeyId(source, vaultUri));
         model.setAttributes(registry.propertiesConverter(supportedVersions().last()).convert(source, vaultUri));
         model.setTags(source.getTags());
+        if (source.isManaged()) {
+            model.setManaged(true);
+        }
         return model;
     }
 

lowkey-vault-app/src/main/java/com/github/nagyesta/lowkeyvault/mapper/v7_2/secret/SecretEntityToV72SecretItemModelConverter.java

@@ -40,6 +40,9 @@ protected <M extends KeyVaultSecretItemModel> M mapActiveFields(
         model.setId(convertSecretId(source, vaultUri));
         model.setAttributes(registry.propertiesConverter(supportedVersions().last()).convert(source, vaultUri));
         model.setTags(source.getTags());
+        if (source.isManaged()) {
+            model.setManaged(true);
+        }
         return model;
     }
 

lowkey-vault-app/src/test/java/com/github/nagyesta/lowkeyvault/controller/v7_2/KeyControllerTest.java

@@ -571,7 +571,7 @@ void testGetKeysShouldReturnEntryWhenKeyIsFound(
                 .thenReturn(recoverableDays);
         final CreateKeyRequest request = createRequest(operations, expiry, notBefore);
         final ReadOnlyKeyVaultKeyEntity entity = createEntity(VERSIONED_KEY_ENTITY_ID_1_VERSION_1, request);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity));
         final KeyVaultKeyItemModel keyItemModel = keyVaultKeyItemModel(baseUri.asUri(HTTPS_LOCALHOST_8443), Map.of());
         when(keyEntityToV72KeyItemModelConverter.convert(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -594,7 +594,7 @@ void testGetKeysShouldReturnEntryWhenKeyIsFound(
         verify(vaultFake).getRecoverableDays();
         verify(keyVaultFake, atLeastOnce()).getEntities();
         verify(keyVaultFake, never()).getDeletedEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(keyEntityToV72KeyItemModelConverter).convert(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 
@@ -614,7 +614,7 @@ void testGetKeysShouldReturnNextLinkWhenNotOnLastPage(
                 .thenReturn(recoverableDays);
         final CreateKeyRequest request = createRequest(operations, expiry, notBefore);
         final ReadOnlyKeyVaultKeyEntity entity = createEntity(VERSIONED_KEY_ENTITY_ID_1_VERSION_1, request);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity, entity, entity));
         final KeyVaultKeyItemModel keyItemModel = keyVaultKeyItemModel(baseUri.asUri(HTTPS_LOCALHOST_8443), Map.of());
         when(keyEntityToV72KeyItemModelConverter.convert(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -639,7 +639,7 @@ void testGetKeysShouldReturnNextLinkWhenNotOnLastPage(
         verify(vaultFake).getRecoverableDays();
         verify(keyVaultFake, atLeastOnce()).getEntities();
         verify(keyVaultFake, never()).getDeletedEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(keyEntityToV72KeyItemModelConverter).convert(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 
@@ -661,7 +661,7 @@ void testGetDeletedKeysShouldReturnEntryWhenKeyIsFound(
         final ReadOnlyKeyVaultKeyEntity entity = createEntity(VERSIONED_KEY_ENTITY_ID_1_VERSION_1, request);
         entity.setDeletedDate(TIME_10_MINUTES_AGO);
         entity.setScheduledPurgeDate(TIME_IN_10_MINUTES);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity));
         final DeletedKeyVaultKeyItemModel keyItemModel = deletedKeyVaultKeyItemModel(baseUri, Map.of());
         when(keyEntityToV72KeyItemModelConverter.convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -684,7 +684,7 @@ void testGetDeletedKeysShouldReturnEntryWhenKeyIsFound(
         verify(vaultFake).getRecoverableDays();
         verify(keyVaultFake, atLeastOnce()).getDeletedEntities();
         verify(keyVaultFake, never()).getEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(keyEntityToV72KeyItemModelConverter).convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 
@@ -749,7 +749,7 @@ void testGetDeletedKeysShouldReturnNextLinkWhenNotOnLastPage(
         final ReadOnlyKeyVaultKeyEntity entity = createEntity(VERSIONED_KEY_ENTITY_ID_1_VERSION_1, request);
         entity.setDeletedDate(TIME_10_MINUTES_AGO);
         entity.setScheduledPurgeDate(TIME_IN_10_MINUTES);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity, entity, entity));
         final DeletedKeyVaultKeyItemModel keyItemModel = deletedKeyVaultKeyItemModel(baseUri, Map.of());
         when(keyEntityToV72KeyItemModelConverter.convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -774,7 +774,7 @@ void testGetDeletedKeysShouldReturnNextLinkWhenNotOnLastPage(
         verify(vaultFake).getRecoverableDays();
         verify(keyVaultFake, atLeastOnce()).getDeletedEntities();
         verify(keyVaultFake, never()).getEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(keyEntityToV72KeyItemModelConverter).convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 

lowkey-vault-app/src/test/java/com/github/nagyesta/lowkeyvault/controller/v7_2/SecretControllerTest.java

@@ -538,7 +538,7 @@ void testGetSecretsShouldReturnEntryWhenSecretIsFound(
                 .thenReturn(recoverableDays);
         final CreateSecretRequest request = createRequest(expiry, notBefore);
         final ReadOnlyKeyVaultSecretEntity entity = createEntity(VERSIONED_SECRET_ENTITY_ID_1_VERSION_1, request);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity));
         final KeyVaultSecretItemModel secretItemModel = keyVaultSecretItemModel(baseUri.asUri(HTTPS_LOCALHOST_8443), Map.of());
         when(secretEntityToV72SecretItemModelConverter.convert(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -561,7 +561,7 @@ void testGetSecretsShouldReturnEntryWhenSecretIsFound(
         verify(vaultFake).getRecoverableDays();
         verify(secretVaultFake, atLeastOnce()).getEntities();
         verify(secretVaultFake, never()).getDeletedEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(secretEntityToV72SecretItemModelConverter).convert(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 
@@ -581,7 +581,7 @@ void testGetSecretsShouldReturnNextLinkWhenNotOnLastPage(
                 .thenReturn(recoverableDays);
         final CreateSecretRequest request = createRequest(expiry, notBefore);
         final ReadOnlyKeyVaultSecretEntity entity = createEntity(VERSIONED_SECRET_ENTITY_ID_1_VERSION_1, request);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity, entity, entity));
         final KeyVaultSecretItemModel secretItemModel = keyVaultSecretItemModel(baseUri.asUri(HTTPS_LOCALHOST_8443), Map.of());
         when(secretEntityToV72SecretItemModelConverter.convert(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -606,7 +606,7 @@ void testGetSecretsShouldReturnNextLinkWhenNotOnLastPage(
         verify(vaultFake).getRecoverableDays();
         verify(secretVaultFake, atLeastOnce()).getEntities();
         verify(secretVaultFake, never()).getDeletedEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(secretEntityToV72SecretItemModelConverter).convert(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 
@@ -629,7 +629,7 @@ void testGetDeletedSecretsShouldReturnEntryWhenSecretIsFound(
         final ReadOnlyKeyVaultSecretEntity entity = createEntity(VERSIONED_SECRET_ENTITY_ID_1_VERSION_1, request);
         entity.setDeletedDate(TIME_10_MINUTES_AGO);
         entity.setScheduledPurgeDate(TIME_IN_10_MINUTES);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity));
         final DeletedKeyVaultSecretItemModel secretItemModel = deletedKeyVaultSecretItemModel(baseUri, Map.of());
         when(secretEntityToV72SecretItemModelConverter.convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -652,7 +652,7 @@ void testGetDeletedSecretsShouldReturnEntryWhenSecretIsFound(
         verify(vaultFake).getRecoverableDays();
         verify(secretVaultFake, atLeastOnce()).getDeletedEntities();
         verify(secretVaultFake, never()).getEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(secretEntityToV72SecretItemModelConverter).convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 
@@ -674,7 +674,7 @@ void testGetDeletedSecretsShouldReturnNextLinkWhenNotOnLastPage(
         final ReadOnlyKeyVaultSecretEntity entity = createEntity(VERSIONED_SECRET_ENTITY_ID_1_VERSION_1, request);
         entity.setDeletedDate(TIME_10_MINUTES_AGO);
         entity.setScheduledPurgeDate(TIME_IN_10_MINUTES);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity, entity, entity));
         final DeletedKeyVaultSecretItemModel secretItemModel = deletedKeyVaultSecretItemModel(baseUri, Map.of());
         when(secretEntityToV72SecretItemModelConverter.convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -699,7 +699,7 @@ void testGetDeletedSecretsShouldReturnNextLinkWhenNotOnLastPage(
         verify(vaultFake).getRecoverableDays();
         verify(secretVaultFake, atLeastOnce()).getDeletedEntities();
         verify(secretVaultFake, never()).getEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(secretEntityToV72SecretItemModelConverter).convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 

lowkey-vault-app/src/test/java/com/github/nagyesta/lowkeyvault/controller/v7_3/KeyControllerTest.java

@@ -582,7 +582,7 @@ void testGetKeysShouldReturnEntryWhenKeyIsFound(
                 .thenReturn(recoverableDays);
         final CreateKeyRequest request = createRequest(operations, expiry, notBefore);
         final ReadOnlyKeyVaultKeyEntity entity = createEntity(VERSIONED_KEY_ENTITY_ID_1_VERSION_1, request);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity));
         final KeyVaultKeyItemModel keyItemModel = keyVaultKeyItemModel(baseUri.asUri(HTTPS_LOCALHOST_8443), Map.of());
         when(keyEntityToV72KeyItemModelConverter.convert(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -605,7 +605,7 @@ void testGetKeysShouldReturnEntryWhenKeyIsFound(
         verify(vaultFake).getRecoverableDays();
         verify(keyVaultFake, atLeastOnce()).getEntities();
         verify(keyVaultFake, never()).getDeletedEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(keyEntityToV72KeyItemModelConverter).convert(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 
@@ -625,7 +625,7 @@ void testGetKeysShouldReturnNextLinkWhenNotOnLastPage(
                 .thenReturn(recoverableDays);
         final CreateKeyRequest request = createRequest(operations, expiry, notBefore);
         final ReadOnlyKeyVaultKeyEntity entity = createEntity(VERSIONED_KEY_ENTITY_ID_1_VERSION_1, request);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity, entity, entity));
         final KeyVaultKeyItemModel keyItemModel = keyVaultKeyItemModel(baseUri.asUri(HTTPS_LOCALHOST_8443), Map.of());
         when(keyEntityToV72KeyItemModelConverter.convert(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -650,7 +650,7 @@ void testGetKeysShouldReturnNextLinkWhenNotOnLastPage(
         verify(vaultFake).getRecoverableDays();
         verify(keyVaultFake, atLeastOnce()).getEntities();
         verify(keyVaultFake, never()).getDeletedEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(keyEntityToV72KeyItemModelConverter).convert(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 
@@ -672,7 +672,7 @@ void testGetDeletedKeysShouldReturnEntryWhenKeyIsFound(
         final ReadOnlyKeyVaultKeyEntity entity = createEntity(VERSIONED_KEY_ENTITY_ID_1_VERSION_1, request);
         entity.setDeletedDate(TIME_10_MINUTES_AGO);
         entity.setScheduledPurgeDate(TIME_IN_10_MINUTES);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity));
         final DeletedKeyVaultKeyItemModel keyItemModel = deletedKeyVaultKeyItemModel(baseUri, Map.of());
         when(keyEntityToV72KeyItemModelConverter.convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -695,7 +695,7 @@ void testGetDeletedKeysShouldReturnEntryWhenKeyIsFound(
         verify(vaultFake).getRecoverableDays();
         verify(keyVaultFake, atLeastOnce()).getDeletedEntities();
         verify(keyVaultFake, never()).getEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(keyEntityToV72KeyItemModelConverter).convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443));
     }
 
@@ -760,7 +760,7 @@ void testGetDeletedKeysShouldReturnNextLinkWhenNotOnLastPage(
         final ReadOnlyKeyVaultKeyEntity entity = createEntity(VERSIONED_KEY_ENTITY_ID_1_VERSION_1, request);
         entity.setDeletedDate(TIME_10_MINUTES_AGO);
         entity.setScheduledPurgeDate(TIME_IN_10_MINUTES);
-        when(entities.listLatestNonManagedEntities())
+        when(entities.listLatestEntities())
                 .thenReturn(List.of(entity, entity, entity));
         final DeletedKeyVaultKeyItemModel keyItemModel = deletedKeyVaultKeyItemModel(baseUri, Map.of());
         when(keyEntityToV72KeyItemModelConverter.convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443)))
@@ -785,7 +785,7 @@ void testGetDeletedKeysShouldReturnNextLinkWhenNotOnLastPage(
         verify(vaultFake).getRecoverableDays();
         verify(keyVaultFake, atLeastOnce()).getDeletedEntities();
         verify(keyVaultFake, never()).getEntities();
-        verify(entities).listLatestNonManagedEntities();
+        verify(entities).listLatestEntities();
         verify(keyEntityToV72KeyItemModelConverter).convertDeleted(same(entity), eq(HTTPS_LOCALHOST_8443));
     }