diff --git a/pom.xml b/pom.xml index 5780670d..332a7003 100644 --- a/pom.xml +++ b/pom.xml @@ -190,14 +190,14 @@ flatten-maven-plugin 1.1.0 - - org.apache.maven.plugins - maven-checkstyle-plugin - io.spring.javaformat spring-javaformat-maven-plugin + + org.apache.maven.plugins + maven-checkstyle-plugin + diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java index 2b1ddf8e..41defd4b 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java @@ -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 diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java index 15f47c26..c4aa97b7 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java @@ -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"; diff --git a/spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java b/spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java index 2d48661d..78645117 100644 --- a/spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java +++ b/spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java @@ -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 { - 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 diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java index 4f2e2080..e8341644 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java @@ -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 diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java index b044db4a..421789db 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java @@ -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"; diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java index 8bc0d47e..cc7930a8 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java @@ -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"; diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java index 6797d5bf..b37c0313 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java @@ -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 diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java index 68e796d4..3a30858f 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java @@ -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; diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java index 3dc2d7d4..e8425383 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java @@ -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; diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java index b9ff6cd3..556ebadc 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java @@ -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; diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java index 4cff0dce..b862f400 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java @@ -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"; diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java index 28f06f3e..a564a37c 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java @@ -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 diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java index a023b118..71a1effb 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java @@ -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; diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 07de6620..6609a1a5 100644 --- a/spring-cloud-vault-config/pom.xml +++ b/spring-cloud-vault-config/pom.xml @@ -27,11 +27,6 @@ spring-cloud-starter - - org.springframework.cloud - spring-cloud-starter-bootstrap - - org.springframework.vault spring-vault-core diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java index 3b08560c..ea8ada9c 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java @@ -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"); } } diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java index ed981c1b..93a67c4b 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java @@ -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(); }); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java index 7bd053e4..e1d1af61 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java @@ -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); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java index 5d287a51..b8d8b11f 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java @@ -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 diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java index 47788833..6275f7b1 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java @@ -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); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java index 9e0434e4..63b90332 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java @@ -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); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java index 80bda01e..8b398bc9 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java @@ -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}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java index 477d7370..8fd2cb9d 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java @@ -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}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java index 2a1f6fe9..d354a3be 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java @@ -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 { diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java index c8e6f29d..65838e95 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java @@ -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}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java index 23292b34..2d9e0940 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java @@ -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 diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java index f795eac7..ed592639 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java @@ -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}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java index 22c11be1..39b30bee 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java @@ -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}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java index 5e2388fd..e773a084 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java @@ -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}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java index da781a14..bbe6c603 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java @@ -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 { diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java index 1c311ddd..d36f89ac 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java @@ -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}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java index 89634b9f..3e90fd06 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java @@ -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 { diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java index 9f068ecf..c5339bd3 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java @@ -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 { diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java index 1fccb729..8f2f4aaa 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java @@ -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() diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java index 31522ed1..ae5494cd 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java @@ -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}")