Skip to content

Commit 255ec39

Browse files
Only list ACTIVE vault secrets (#154)
Signed-off-by: Anders Swanson <anders.swanson@oracle.com>
1 parent e550d13 commit 255ec39

File tree

2 files changed

+10
-3
lines changed
  • spring-cloud-oci
    • spring-cloud-oci-samples/spring-cloud-oci-vault-sample/src/test/java/com/oracle/cloud/spring/sample/vault/springcloudocivaultsample
    • spring-cloud-oci-vault/src/main/java/com/oracle/cloud/spring/vault

2 files changed

+10
-3
lines changed

spring-cloud-oci/spring-cloud-oci-samples/spring-cloud-oci-vault-sample/src/test/java/com/oracle/cloud/spring/sample/vault/springcloudocivaultsample/VaultTemplateIT.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
import org.junit.jupiter.api.Test;
1616
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
1717
import org.springframework.beans.factory.annotation.Autowired;
18+
import org.springframework.beans.factory.annotation.Value;
1819
import org.springframework.boot.test.context.SpringBootTest;
1920

2021
import static org.assertj.core.api.Assertions.assertThat;
2122

2223
/**
2324
* Requires an existing vault, identified by the OCI_VAULT_ID environment variable.
24-
* The vault must have a secret named "mysecret" present.
25+
* The vault must have at least one secret named "mysecret" present.
26+
* This secret must be in the "ACTIVE" lifecycle state.
2527
*/
2628
@SpringBootTest
2729
@EnabledIfEnvironmentVariable(named = "OCI_COMPARTMENT_ID", matches = ".+")
@@ -33,7 +35,11 @@ public class VaultTemplateIT {
3335
@Autowired
3436
VaultController vaultController;
3537

36-
private final String secretName = "mysecret";
38+
@Value("${secretName:mysecret}")
39+
private String secretName;
40+
41+
@Value("${numSecrets:1}")
42+
private int numSecrets;
3743

3844
@Test
3945
void getSecret() {
@@ -59,7 +65,7 @@ void updateSecret() {
5965
@Test
6066
void listSecret() {
6167
List<SecretSummary> summaries = vaultTemplate.listSecrets();
62-
assertThat(summaries).hasSize(1);
68+
assertThat(summaries).hasSizeGreaterThanOrEqualTo(numSecrets);
6369
}
6470

6571
@Test

spring-cloud-oci/spring-cloud-oci-vault/src/main/java/com/oracle/cloud/spring/vault/VaultTemplateImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ public List<SecretSummary> listSecrets() {
152152
do {
153153
ListSecretsRequest request = ListSecretsRequest.builder()
154154
.vaultId(vaultId)
155+
.lifecycleState(SecretSummary.LifecycleState.Active)
155156
.compartmentId(compartmentId)
156157
.page(page)
157158
.build();

0 commit comments

Comments
 (0)