SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Bootstrap context marker class from classpath

Browse Source 
See gh-483
This commit is contained in:
Mark Paluch
2020-09-17 16:21:57 +02:00
parent e28eb19797
commit 9d15c5db0a
35 changed files with 92 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -190,14 +190,14 @@
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>

5
spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java
View File

@@ -39,8 +39,9 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = CustomBootstrapConfiguration.class, properties = {
"VaultConfigAwsBootstrapConfigurationTests.custom.config=true", "spring.cloud.vault.aws.role=foo" })
@SpringBootTest(classes = CustomBootstrapConfiguration.class,
properties = { "VaultConfigAwsBootstrapConfigurationTests.custom.config=true",
"spring.cloud.vault.aws.role=foo", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigAwsBootstrapConfigurationTests extends IntegrationTestSupport {
@Autowired

3
spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java
View File

@@ -52,7 +52,8 @@ import static org.junit.Assume.assumeTrue;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigAwsTests.TestApplication.class,
properties = { "spring.cloud.vault.aws.enabled=true", "spring.cloud.vault.aws.role=readonly",
"cloud.aws.region.auto=false", "cloud.aws.region.static=eu-west-1" })
"cloud.aws.region.auto=false", "cloud.aws.region.static=eu-west-1",
"spring.cloud.bootstrap.enabled=true" })
public class VaultConfigAwsTests {
private static final String AWS_REGION = "eu-west-1";

18
spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java
View File

@@ -25,6 +25,7 @@ import org.springframework.cloud.vault.config.SecretBackendMetadata;
import org.springframework.cloud.vault.config.SecretBackendMetadataFactory;
import org.springframework.cloud.vault.config.VaultSecretBackendDescriptor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.Assert;
@@ -52,14 +53,19 @@ public class VaultConfigConsulBootstrapConfiguration {
public static class ConsulSecretBackendMetadataFactory
implements SecretBackendMetadataFactory<VaultConsulProperties> {
private final ApplicationContext context;
private final ApplicationEventPublisher publisher;
public ConsulSecretBackendMetadataFactory(ApplicationContext context) {
this.context = context;
public ConsulSecretBackendMetadataFactory() {
this.publisher = event -> {
}; // NO-OP;
}
public ApplicationContext getContext() {
return this.context;
public ConsulSecretBackendMetadataFactory(ApplicationContext publisher) {
this.publisher = publisher;
}
public ApplicationEventPublisher getPublisher() {
return this.publisher;
}
/**
@@ -90,7 +96,7 @@ public class VaultConfigConsulBootstrapConfiguration {
return transformed;
};
return new ConsulBackendMetadata(properties, transformer, context);
return new ConsulBackendMetadata(properties, transformer, this.publisher);
}
@Override

2
spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java
View File

@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(classes = CustomBootstrapConfiguration.class,
properties = { "VaultConfigConsulBootstrapConfigurationTests.custom.config=true",
"spring.cloud.vault.consul.role=foo", "spring.cloud.vault.consul.enabled=true",
"spring.cloud.consul.config.enabled=false" })
"spring.cloud.consul.config.enabled=false", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigConsulBootstrapConfigurationTests extends IntegrationTestSupport {
@Autowired

3
spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java
View File

@@ -62,7 +62,8 @@ import static org.junit.Assume.assumeTrue;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigConsulTests.TestApplication.class,
properties = { "spring.cloud.vault.consul.enabled=true", "spring.cloud.vault.consul.role=readonly",
"spring.cloud.consul.discovery.catalog-services-watch.enabled=false" })
"spring.cloud.consul.discovery.catalog-services-watch.enabled=false",
"spring.cloud.bootstrap.enabled=true" })
public class VaultConfigConsulTests {
private static final String CONSUL_HOST = "localhost";

2
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java
View File

@@ -49,7 +49,7 @@ import static org.junit.Assume.assumeTrue;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigCassandraTests.TestApplication.class,
properties = { "spring.cloud.vault.cassandra.enabled=true", "spring.cloud.vault.cassandra.role=readonly",
"spring.data.cassandra.jmx-enabled=false" })
"spring.data.cassandra.jmx-enabled=false", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigCassandraTests {
private static final String CASSANDRA_HOST = "localhost";

3
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java
View File

@@ -41,7 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = CustomBootstrapConfiguration.class,
properties = { "VaultConfigDatabaseBootstrapConfigurationTests.custom.config=true",
"spring.cloud.vault.mysql.role=foo", "spring.cloud.vault.mysql.enabled=true" })
"spring.cloud.vault.mysql.role=foo", "spring.cloud.vault.mysql.enabled=true",
"spring.cloud.bootstrap.enabled=true" })
public class VaultConfigDatabaseBootstrapConfigurationTests extends IntegrationTestSupport {
@Autowired

3
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java
View File

@@ -54,7 +54,8 @@ import static org.junit.Assume.assumeTrue;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigMongoTests.TestApplication.class,
properties = { "spring.cloud.vault.mongodb.enabled=true", "spring.cloud.vault.mongodb.role=readonly",
"spring.data.mongodb.url=mongodb://localhost", "spring.data.mongodb.database=admin" })
"spring.data.mongodb.url=mongodb://localhost", "spring.data.mongodb.database=admin",
"spring.cloud.bootstrap.enabled=true" })
public class VaultConfigMongoTests {
private static final int MONGODB_PORT = 27017;

2
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java
View File

@@ -53,7 +53,7 @@ import static org.junit.Assume.assumeTrue;
@SpringBootTest(classes = VaultConfigMySqlDatabaseTests.TestApplication.class,
properties = { "spring.cloud.vault.database.enabled=true", "spring.cloud.vault.database.role=readonly",
"spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC",
"spring.main.allow-bean-definition-overriding=true" })
"spring.main.allow-bean-definition-overriding=true", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigMySqlDatabaseTests {
private static final int MYSQL_PORT = 3306;

2
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java
View File

@@ -51,7 +51,7 @@ import static org.junit.Assume.assumeTrue;
@SpringBootTest(classes = VaultConfigMySqlTests.TestApplication.class,
properties = { "spring.cloud.vault.mysql.enabled=true", "spring.cloud.vault.mysql.role=readonly",
"spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC",
"spring.main.allow-bean-definition-overriding=true" })
"spring.main.allow-bean-definition-overriding=true", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigMySqlTests {
private static final int MYSQL_PORT = 3306;

2
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java
View File

@@ -53,7 +53,7 @@ import static org.junit.Assume.assumeTrue;
@SpringBootTest(classes = VaultConfigPostgreSqlTests.TestApplication.class,
properties = { "spring.cloud.vault.postgresql.enabled=true", "spring.cloud.vault.postgresql.role=readonly",
"spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?ssl=false",
"spring.main.allow-bean-definition-overriding=true" })
"spring.main.allow-bean-definition-overriding=true", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigPostgreSqlTests {
private static final String POSTGRES_HOST = "localhost";

5
spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java
View File

@@ -39,8 +39,9 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = CustomBootstrapConfiguration.class, properties = {
"VaultConfigRabbitMqBootstrapConfigurationTests.custom.config=true", "spring.cloud.vault.rabbitmq.role=foo" })
@SpringBootTest(classes = CustomBootstrapConfiguration.class,
properties = { "VaultConfigRabbitMqBootstrapConfigurationTests.custom.config=true",
"spring.cloud.vault.rabbitmq.role=foo", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigRabbitMqBootstrapConfigurationTests extends IntegrationTestSupport {
@Autowired

2
spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java
View File

@@ -51,7 +51,7 @@ import static org.junit.Assume.assumeTrue;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigRabbitMqTests.TestApplication.class,
properties = { "spring.cloud.vault.rabbitmq.enabled=true", "spring.cloud.vault.rabbitmq.role=readonly",
"spring.rabbitmq.address=localhost" })
"spring.rabbitmq.address=localhost", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigRabbitMqTests {
private static final int RABBITMQ_HTTP_MANAGEMENT_PORT = 15672;

5
spring-cloud-vault-config/pom.xml
View File

@@ -27,11 +27,6 @@
<artifactId>spring-cloud-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.vault</groupId>
<artifactId>spring-vault-core</artifactId>

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java
View File

@@ -38,8 +38,8 @@ public class ApplicationFailFastTests {
public void contextLoadsWithFailFastUsingLeasing() {
try {
new SpringApplicationBuilder().sources(ApplicationFailFastTests.class).run("--server.port=0",
"--spring.cloud.vault.failFast=true", "--spring.cloud.vault.config.lifecycle.enabled=true",
"--spring.cloud.vault.port=9999");
"--spring.cloud.bootstrap.enabled=true", "--spring.cloud.vault.failFast=true",
"--spring.cloud.vault.config.lifecycle.enabled=true", "--spring.cloud.vault.port=9999");
fail("failFast option did not produce an exception");
}
catch (Exception e) {
@@ -51,7 +51,8 @@ public class ApplicationFailFastTests {
public void contextLoadsWithFailFastWithoutLeasing() {
try {
new SpringApplicationBuilder().sources(ApplicationFailFastTests.class).run("--server.port=0",
"--spring.cloud.vault.failFast=true", "--spring.cloud.vault.config.lifecycle.enabled=false",
"--spring.cloud.bootstrap.enabled=true", "--spring.cloud.vault.failFast=true",
"--spring.cloud.vault.config.lifecycle.enabled=false",
"--spring.cloud.vault.session.lifecycle.enabled=false", "--spring.cloud.vault.port=9999");
fail("failFast option did not produce an exception");
}
@@ -64,7 +65,8 @@ public class ApplicationFailFastTests {
@Ignore("Fails because of method errors in Discovery health check")
public void contextLoadsWithoutFailFast() {
new SpringApplicationBuilder().sources(ApplicationFailFastTests.class).run("--server.port=0",
"--spring.cloud.vault.failFast=false", "--spring.cloud.vault.port=9999");
"--spring.cloud.bootstrap.enabled=true", "--spring.cloud.vault.failFast=false",
"--spring.cloud.vault.port=9999");
}
}

14
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java
View File

@@ -50,8 +50,9 @@ public class DiscoveryClientVaultBootstrapConfigurationTests {
@Test
public void shouldRegisterDefaultBeans() {
this.contextRunner.withUserConfiguration(DiscoveryConfiguration.class)
.withPropertyValues("spring.cloud.vault.token=foo", "spring.cloud.vault.discovery.enabled=true")
this.contextRunner
.withUserConfiguration(DiscoveryConfiguration.class).withPropertyValues("spring.cloud.vault.token=foo",
"spring.cloud.vault.discovery.enabled=true", "spring.cloud.bootstrap.enabled=true")
.run(context -> {
assertThat(context.getBean(VaultServiceInstanceProvider.class))
@@ -66,8 +67,9 @@ public class DiscoveryClientVaultBootstrapConfigurationTests {
@Test
public void shouldNotRegisterBeansIfDiscoveryDisabled() {
this.contextRunner.withUserConfiguration(DiscoveryConfiguration.class)
.withPropertyValues("spring.cloud.vault.token=foo", "spring.cloud.vault.discovery.enabled=false")
this.contextRunner
.withUserConfiguration(DiscoveryConfiguration.class).withPropertyValues("spring.cloud.vault.token=foo",
"spring.cloud.vault.discovery.enabled=false", "spring.cloud.bootstrap.enabled=true")
.run(context -> {
assertThat(context.getBeanNamesForType(VaultServiceInstanceProvider.class)).isEmpty();
@@ -78,7 +80,9 @@ public class DiscoveryClientVaultBootstrapConfigurationTests {
public void shouldNotRegisterBeansIfVaultDisabled() {
this.contextRunner.withUserConfiguration(DiscoveryConfiguration.class)
.withPropertyValues("spring.cloud.vault.token=foo", "spring.cloud.vault.enabled=false").run(context -> {
.withPropertyValues("spring.cloud.vault.token=foo", "spring.cloud.vault.enabled=false",
"spring.cloud.bootstrap.enabled=true")
.run(context -> {
assertThat(context.getBeanNamesForType(VaultServiceInstanceProvider.class)).isEmpty();
});

5
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java
View File

@@ -41,9 +41,8 @@ public class ReactiveVaultBootstrapConfigurationTests {
@Test
public void shouldConfigureWithoutAuthentication() {
this.contextRunner
.withPropertyValues("spring.cloud.vault.kv.enabled=false", "spring.cloud.vault.authentication=NONE")
.run(context -> {
this.contextRunner.withPropertyValues("spring.cloud.vault.kv.enabled=false",
"spring.cloud.vault.authentication=NONE", "spring.cloud.bootstrap.enabled=true").run(context -> {
assertThat(context).doesNotHaveBean(SessionManager.class);
assertThat(context).doesNotHaveBean(ClientAuthentication.class);

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java
View File

@@ -47,7 +47,8 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ReactiveVaultOperationsTests.TestApplication.class,
properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.uri=https://localhost:8200" })
properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.uri=https://localhost:8200",
"spring.cloud.bootstrap.enabled=true" })
public class ReactiveVaultOperationsTests {
@Autowired

14
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java
View File

@@ -44,9 +44,8 @@ public class VaultBootstrapConfigurationTests {
@Test
public void shouldConfigureWithoutAuthentication() {
this.contextRunner
.withPropertyValues("spring.cloud.vault.kv.enabled=false", "spring.cloud.vault.authentication=NONE")
.run(context -> {
this.contextRunner.withPropertyValues("spring.cloud.vault.kv.enabled=false",
"spring.cloud.vault.authentication=NONE", "spring.cloud.bootstrap.enabled=true").run(context -> {
assertThat(context).doesNotHaveBean(SessionManager.class);
assertThat(context).doesNotHaveBean(ClientAuthentication.class);
@@ -58,8 +57,10 @@ public class VaultBootstrapConfigurationTests {
@Test
public void shouldDisableSessionManagement() {
this.contextRunner.withPropertyValues("spring.cloud.vault.kv.enabled=false", "spring.cloud.vault.token=foo",
"spring.cloud.vault.session.lifecycle.enabled=false").run(context -> {
this.contextRunner
.withPropertyValues("spring.cloud.vault.kv.enabled=false", "spring.cloud.vault.token=foo",
"spring.cloud.vault.session.lifecycle.enabled=false", "spring.cloud.bootstrap.enabled=true")
.run(context -> {
SessionManager bean = context.getBean(SessionManager.class);
assertThat(bean).isExactlyInstanceOf(SimpleSessionManager.class);
@@ -71,7 +72,8 @@ public class VaultBootstrapConfigurationTests {
this.contextRunner.withPropertyValues("spring.cloud.vault.kv.enabled=false", "spring.cloud.vault.token=foo",
"spring.cloud.vault.session.lifecycle.refresh-before-expiry=11s",
"spring.cloud.vault.session.lifecycle.expiry-threshold=12s").run(context -> {
"spring.cloud.vault.session.lifecycle.expiry-threshold=12s", "spring.cloud.bootstrap.enabled=true")
.run(context -> {
SessionManager bean = context.getBean(SessionManager.class);

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java
View File

@@ -51,7 +51,8 @@ public class VaultBootstrapPropertySourceConfigurationTests {
.withPropertyValues("spring.cloud.vault.kv.enabled=false",
"spring.cloud.vault.config.lifecycle.expiry-threshold=5m",
"spring.cloud.vault.config.lifecycle.min-renewal=6m",
"spring.cloud.vault.config.lifecycle.lease-endpoints=SysLeases")
"spring.cloud.vault.config.lifecycle.lease-endpoints=SysLeases",
"spring.cloud.bootstrap.enabled=true")
.run(context -> {
SecretLeaseContainer container = context.getBean(SecretLeaseContainer.class);

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java
View File

@@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThat;
properties = { "spring.cloud.vault.authentication=appid",
"VaultConfigAppIdCustomMechanismTests.custom.config=true",
"spring.cloud.vault.applicationName=VaultConfigAppIdCustomMechanismTests",
"spring.main.allow-bean-definition-overriding=true" })
"spring.main.allow-bean-definition-overriding=true", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigAppIdCustomMechanismTests {
@Value("${vault.value}")

4
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java
View File

@@ -49,9 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigAppIdTests.TestApplication.class,
properties = { "spring.cloud.vault.authentication=appid", "spring.cloud.vault.app-id.user-id=IP_ADDRESS",
"spring.cloud.vault.application-name=VaultConfigAppIdTests" })
// see
// https://github.com/spring-cloud/spring-cloud-commons/issues/214
"spring.cloud.vault.application-name=VaultConfigAppIdTests", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigAppIdTests {
@Value("${vault.value}")

5
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java
View File

@@ -48,8 +48,9 @@ import static org.junit.Assume.assumeTrue;
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigAppRoleTests.TestApplication.class, properties = {
"spring.cloud.vault.authentication=approle", "spring.cloud.vault.application-name=VaultConfigAppRoleTests" })
@SpringBootTest(classes = VaultConfigAppRoleTests.TestApplication.class,
properties = { "spring.cloud.vault.authentication=approle",
"spring.cloud.vault.application-name=VaultConfigAppRoleTests", "spring.cloud.bootstrap.enabled=true" })
// see
// https://github.com/spring-cloud/spring-cloud-commons/issues/214
public class VaultConfigAppRoleTests {

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java
View File

@@ -51,7 +51,8 @@ import static org.junit.Assume.assumeTrue;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigCubbyholeAuthenticationTests.TestApplication.class,
properties = { "spring.cloud.vault.authentication=cubbyhole",
"spring.cloud.vault.kv.applicationName=VaultConfigCubbyholeAuthenticationTests" })
"spring.cloud.vault.kv.applicationName=VaultConfigCubbyholeAuthenticationTests",
"spring.cloud.bootstrap.enabled=true" })
public class VaultConfigCubbyholeAuthenticationTests {
@Value("${vault.value}")

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java
View File

@@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigDisabledTests.TestApplication.class,
properties = "spring.cloud.vault.enabled=false")
properties = { "spring.cloud.vault.enabled=false", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigDisabledTests {
@Autowired

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java
View File

@@ -53,7 +53,8 @@ import static org.springframework.cloud.vault.util.Settings.findWorkDir;
@SpringBootTest(classes = VaultConfigKubernetesTests.TestApplication.class,
properties = { "spring.cloud.vault.authentication=kubernetes", "spring.cloud.vault.kubernetes.role=my-role",
"spring.cloud.vault.kubernetes.service-account-token-file=../work/minikube/hello-minikube-token",
"spring.cloud.vault.application-name=VaultConfigKubernetesTests" })
"spring.cloud.vault.application-name=VaultConfigKubernetesTests",
"spring.cloud.bootstrap.enabled=true" })
public class VaultConfigKubernetesTests {
@Value("${vault.value}")

5
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java
View File

@@ -52,9 +52,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigTests.TestApplication.class,
properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80",
"spring.cloud.vault.uri=https://localhost:8200", "spring.cloud.vault.application-name=testVaultApp" })
// see
// https://github.com/spring-cloud/spring-cloud-commons/issues/214
"spring.cloud.vault.uri=https://localhost:8200", "spring.cloud.vault.application-name=testVaultApp",
"spring.cloud.bootstrap.enabled=true" })
public class VaultConfigTests {
@Value("${vault.value}")

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java
View File

@@ -53,7 +53,7 @@ import static org.springframework.cloud.vault.util.Settings.findWorkDir;
"spring.cloud.vault.ssl.key-store=file:../work/client-cert.jks",
"spring.cloud.vault.ssl.key-store-password=changeit",
"spring.cloud.vault.application-name=VaultConfigTlsCertAuthenticationTests",
"spring.cloud.vault.reactive.enabled=false" })
"spring.cloud.vault.reactive.enabled=false", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigTlsCertAuthenticationTests {
@Value("${vault.value}")

4
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java
View File

@@ -45,9 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigWithContextTests.TestApplication.class,
properties = "spring.cloud.vault.application-name=testVaultApp")
// see
// https://github.com/spring-cloud/spring-cloud-commons/issues/214
properties = { "spring.cloud.vault.application-name=testVaultApp", "spring.cloud.bootstrap.enabled=true" })
@ActiveProfiles("my-profile")
public class VaultConfigWithContextTests {

4
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java
View File

@@ -45,8 +45,8 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigWithVaultConfigurerTests.TestApplication.class,
properties = "VaultConfigWithVaultConfigurerTests.custom.config=true")
@SpringBootTest(classes = VaultConfigWithVaultConfigurerTests.TestApplication.class, properties = {
"VaultConfigWithVaultConfigurerTests.custom.config=true", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigWithVaultConfigurerTests {
@Value("${vault.value}")

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java
View File

@@ -42,7 +42,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultPropertySourceLocatorIntegrationTests.TestApplication.class,
properties = { "spring.application.name=wintermute", "spring.cloud.vault.application-name=neuromancer",
"spring.cloud.vault.kv.application-name=neuromancer,icebreaker" })
"spring.cloud.vault.kv.application-name=neuromancer,icebreaker",
"spring.cloud.bootstrap.enabled=true" })
@ActiveProfiles({ "integrationtest" })
public class VaultPropertySourceLocatorIntegrationTests extends IntegrationTestSupport {

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java
View File

@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultPropertySourceLocatorProfilesIntegrationTests.TestApplication.class,
properties = { "spring.application.name=my-profiles-app", "spring.cloud.vault.kv.profiles=hello, world",
"spring.cloud.vault.kv.default-context=" })
"spring.cloud.vault.kv.default-context=", "spring.cloud.bootstrap.enabled=true" })
@ActiveProfiles({ "other" })
public class VaultPropertySourceLocatorProfilesIntegrationTests extends IntegrationTestSupport {

8
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
View File

@@ -59,7 +59,9 @@ public class VaultReactiveBootstrapConfigurationTests {
public void shouldConfigureTemplate() {
this.contextRunner.withUserConfiguration(AuthenticationFactoryConfiguration.class)
.withPropertyValues("spring.cloud.vault.session.lifecycle.enabled=false").run(context -> {
.withPropertyValues("spring.cloud.vault.session.lifecycle.enabled=false",
"spring.cloud.bootstrap.enabled=true")
.run(context -> {
assertThat(context.getBean(ReactiveVaultOperations.class)).isNotNull();
assertThat(context.getBean(AuthenticationStepsFactory.class)).isNotNull();
@@ -85,7 +87,9 @@ public class VaultReactiveBootstrapConfigurationTests {
public void shouldConfigureTemplateWithTokenSupplier() {
this.contextRunner.withUserConfiguration(TokenSupplierConfiguration.class)
.withPropertyValues("spring.cloud.vault.session.lifecycle.enabled=false").run(context -> {
.withPropertyValues("spring.cloud.vault.session.lifecycle.enabled=false",
"spring.cloud.bootstrap.enabled=true")
.run(context -> {
assertThat(context.getBean(ReactiveVaultOperations.class)).isNotNull();
assertThat(context.getBean(SessionManager.class)).isNotNull()

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java
View File

@@ -55,7 +55,8 @@ import static org.junit.Assume.assumeTrue;
@SpringBootTest(classes = VaultVersionedKvBackendConfigTests.TestApplication.class,
properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80",
"spring.cloud.vault.uri=https://localhost:8200", "spring.cloud.vault.kv.enabled=true",
"spring.cloud.vault.kv.backend=versioned", "spring.cloud.vault.application-name=testVaultApp" })
"spring.cloud.vault.kv.backend=versioned", "spring.cloud.vault.application-name=testVaultApp",
"spring.cloud.bootstrap.enabled=true" })
public class VaultVersionedKvBackendConfigTests {
@Value("${vault.value}")