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

Upgrade to Spring Boot 1.4 SR1.

Browse Source 
Upgrade to 1.4.1.RELEASE. Migrate to SpringBootTest annotation usage.

Fixes gh-38.
This commit is contained in:
Mark Paluch
2016-09-21 21:29:23 +02:00
parent ff1540e71c
commit b95e8d90eb
16 changed files with 45 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -40,7 +40,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>1.4.0.RELEASE</spring-boot.version>
<spring-boot.version>1.4.1.RELEASE</spring-boot.version>
</properties>
<dependencyManagement>

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

@@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.StringUtils;
@@ -42,16 +42,15 @@ import org.springframework.vault.core.VaultOperations;
* referenced with {@code ../work/keystore.jks}.
* <p>
* This test requires AWS credentials and a region, see {@link #AWS_ACCESS_KEY},
* {@link #AWS_SECRET_KEY} and the {@link IntegrationTest} properties to be provided
* {@link #AWS_SECRET_KEY} and the {@link SpringBootTest} properties to be provided
* externally.
*
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigAwsTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.aws.enabled=true",
"spring.cloud.vault.aws.role=readonly", "cloud.aws.region.auto=false",
"cloud.aws.region.static=eu-west-1" })
@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" })
public class VaultConfigAwsTests {
private final static String AWS_REGION = "eu-west-1";

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

@@ -40,6 +40,7 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.util.Base64Utils;
import org.springframework.vault.core.VaultOperations;
import org.springframework.web.client.RestTemplate;
/**
* Integration tests for {@link VaultConfigTemplate} using the consul secret backend. This
@@ -64,8 +65,7 @@ public class ConsulSecretIntegrationTests extends IntegrationTestSupport {
private VaultProperties vaultProperties = Settings.createVaultProperties();
private VaultConfigOperations configOperations;
private VaultConsulProperties consul = new VaultConsulProperties();
private TestRestTemplate restTemplate = new TestRestTemplate();
private RestTemplate restTemplate = new RestTemplate();
/**
* Initialize the postgresql secret backend.

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

@@ -31,8 +31,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.core.ParameterizedTypeReference;
@@ -54,8 +53,8 @@ import org.springframework.web.client.RestTemplate;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigConsulTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.consul.enabled=true",
@SpringBootTest(classes = VaultConfigConsulTests.TestApplication.class, properties = {
"spring.cloud.vault.consul.enabled=true",
"spring.cloud.vault.consul.role=readonly" })
public class VaultConfigConsulTests {

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

@@ -31,8 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -51,8 +50,8 @@ import com.datastax.driver.core.Session;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigCassandraTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.cassandra.enabled=true",
@SpringBootTest(classes = VaultConfigCassandraTests.TestApplication.class, properties = {
"spring.cloud.vault.cassandra.enabled=true",
"spring.cloud.vault.cassandra.role=readonly" })
public class VaultConfigCassandraTests {

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

@@ -31,8 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -47,9 +46,8 @@ import org.springframework.vault.core.VaultOperations;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigMySqlTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.mysql.enabled=true",
"spring.cloud.vault.mysql.role=readonly",
@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" })
public class VaultConfigMySqlTests {

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

@@ -34,8 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -50,8 +49,8 @@ import org.springframework.vault.core.VaultOperations;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigPostgreSqlTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.postgresql.enabled=true",
@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" })
public class VaultConfigPostgreSqlTests {

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

@@ -30,8 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -50,8 +49,8 @@ import com.rabbitmq.client.ConnectionFactory;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigRabbitMqTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.rabbitmq.enabled=true",
@SpringBootTest(classes = VaultConfigRabbitMqTests.TestApplication.class, properties = {
"spring.cloud.vault.rabbitmq.enabled=true",
"spring.cloud.vault.rabbitmq.role=readonly",
"spring.rabbitmq.address=localhost" })
public class VaultConfigRabbitMqTests {

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

@@ -29,8 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.config.VaultConfigAppIdCustomMechanismTests.BootstrapConfiguration;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.VaultRule;
@@ -48,10 +47,10 @@ import org.springframework.vault.core.VaultOperations;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = { BootstrapConfiguration.class,
VaultConfigAppIdCustomMechanismTests.TestApplication.class })
@IntegrationTest({ "spring.cloud.vault.authentication=appid", "use.custom.config=true",
"spring.application.name=VaultConfigAppIdCustomMechanismTests" })
@SpringBootTest(classes = { BootstrapConfiguration.class,
VaultConfigAppIdCustomMechanismTests.TestApplication.class }, properties = {
"spring.cloud.vault.authentication=appid", "use.custom.config=true",
"spring.application.name=VaultConfigAppIdCustomMechanismTests" })
public class VaultConfigAppIdCustomMechanismTests {
@BeforeClass
@@ -115,8 +114,7 @@ public class VaultConfigAppIdCustomMechanismTests {
@Bean
ClientAuthentication clientAuthentication(VaultClient vaultClient) {
return new AppIdAuthentication(
AppIdAuthenticationOptions
.builder()
AppIdAuthenticationOptions.builder()
.appId("VaultConfigAppIdCustomMechanismTests")
.userIdMechanism(new StaticUserIdMechanism()).build(),
vaultClient);

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

@@ -27,8 +27,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -44,8 +43,8 @@ import org.springframework.vault.core.VaultOperations;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigAppIdTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.authentication=appid",
@SpringBootTest(classes = VaultConfigAppIdTests.TestApplication.class, properties = {
"spring.cloud.vault.authentication=appid",
"spring.cloud.vault.app-id.user-id=IP_ADDRESS",
"spring.application.name=VaultConfigAppIdTests" })
public class VaultConfigAppIdTests {
@@ -68,8 +67,7 @@ public class VaultConfigAppIdTests {
String appId = VaultConfigAppIdTests.class.getSimpleName();
vaultOperations.write(
"secret/" + VaultConfigAppIdTests.class.getSimpleName(),
vaultOperations.write("secret/" + VaultConfigAppIdTests.class.getSimpleName(),
Collections.singletonMap("vault.value", "foo"));
Map<String, String> appIdData = new HashMap<String, String>();

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

@@ -25,8 +25,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
@@ -42,8 +41,7 @@ import org.springframework.vault.client.VaultClient;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigDisabledTests.TestApplication.class)
@IntegrationTest("spring.cloud.vault.enabled=false")
@SpringBootTest(classes = VaultConfigDisabledTests.TestApplication.class, properties = "spring.cloud.vault.enabled=false")
public class VaultConfigDisabledTests {
@BeforeClass

6
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java
View File

@@ -25,8 +25,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -40,8 +39,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigGenericBackendDisabledTests.TestApplication.class)
@IntegrationTest("spring.cloud.vault.generic.enabled=false")
@SpringBootTest(classes = VaultConfigGenericBackendDisabledTests.TestApplication.class, properties = "spring.cloud.vault.generic.enabled=false")
public class VaultConfigGenericBackendDisabledTests {
@BeforeClass

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

@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
@@ -44,7 +44,7 @@ import org.springframework.web.client.RestTemplate;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigTests.TestApplication.class)
@SpringBootTest(classes = VaultConfigTests.TestApplication.class)
public class VaultConfigTests {
@BeforeClass

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

@@ -31,8 +31,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -47,8 +46,8 @@ import org.springframework.vault.core.VaultOperations;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigTlsCertAuthenticationTests.TestApplication.class)
@IntegrationTest({ "spring.cloud.vault.authentication=cert",
@SpringBootTest(classes = VaultConfigTlsCertAuthenticationTests.TestApplication.class, properties = {
"spring.cloud.vault.authentication=cert",
"spring.cloud.vault.ssl.key-store=file:../work/client-cert.jks",
"spring.cloud.vault.ssl.key-store-password=changeit",
"spring.application.name=VaultConfigTlsCertAuthenticationTests" })

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

@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -40,7 +40,7 @@ import org.springframework.vault.core.VaultOperations;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = VaultConfigWithContextTests.TestApplication.class)
@SpringBootTest(classes = VaultConfigWithContextTests.TestApplication.class)
@ActiveProfiles("my-profile")
public class VaultConfigWithContextTests {

2
spring-cloud-vault-dependencies/pom.xml
View File

@@ -21,7 +21,7 @@
<properties>
<spring-cloud-context.version>1.1.2.BUILD-SNAPSHOT</spring-cloud-context.version>
<spring-boot.version>1.4.0.RELEASE</spring-boot.version>
<spring-boot.version>1.4.1.RELEASE</spring-boot.version>
<spring-vault.version>1.0.0.BUILD-SNAPSHOT</spring-vault.version>
<httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.4</httpcore.version>