Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[IMROVEMENT] "
title: "[IMPROVEMENT] "
labels: enhancement
assignees: ''

Expand Down
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Gradle:

```
dependencies {
implementation 'io.github.jopenlibs:vault-java-driver:5.2.0'
implementation 'io.github.jopenlibs:vault-java-driver:5.3.0'
}
```

Expand All @@ -58,7 +58,7 @@ Maven:
<dependency>
<groupId>io.github.jopenlibs</groupId>
<artifactId>vault-java-driver</artifactId>
<version>5.2.0</version>
<version>5.3.0</version>
</dependency>
```

Expand Down Expand Up @@ -310,7 +310,12 @@ and may require modifications in your code to migrate. Changes to the minor vers
number) should represent non-breaking changes. The third number represents any very minor bugfix
patches.

* **5.2.0**: This release contains the following updates:
* **5.3.0**: This release contains the following updates:
* Created sys namespace [PR #21](https://github.com/jopenlibs/vault-java-driver/pull/25)
* Add custom Vault Authentication Path when using k8s login method [(PR #27)](https://github.com/jopenlibs/vault-java-driver/pull/27)
* Parametrized integration tests [(PR #21)](https://github.com/jopenlibs/vault-java-driver/pull/21)
* Fix Leases section [(PR #18)](https://github.com/jopenlibs/vault-java-driver/pull/18)
* **5.2.0**: This release contains the following updates:
* Move code packages and maven groupdId from `com.bettercloud`
to `io.github.jopenlibs`. [(PR #2)](https://github.com/jopenlibs/vault-java-driver/pull/2)
* Fix and refactoring data wrapping, add integration tests with the last Vault version (vault
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply plugin: 'checkstyle'

group 'io.github.jopenlibs'
archivesBaseName = 'vault-java-driver'
version '5.3.0-SNAPSHOT'
version '5.3.0'

// This project is actually limited to Java 8 compatibility. See below.
sourceCompatibility = 9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import io.github.jopenlibs.vault.VaultConfig;
import io.github.jopenlibs.vault.VaultException;
import java.nio.file.Path;
import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.BindMode;
Expand All @@ -20,6 +21,8 @@
public class VaultAgentContainer extends GenericContainer<VaultAgentContainer> implements
TestConstants, TestLifecycleAware {

public static final String VAULT_DEFAULT_IMAGE = "vault";
public static final String VAULT_DEFAULT_TAG = "latest";
private static final Logger LOGGER = LoggerFactory.getLogger(VaultAgentContainer.class);

/**
Expand All @@ -28,7 +31,8 @@ public class VaultAgentContainer extends GenericContainer<VaultAgentContainer> i
public VaultAgentContainer(
Path roleId,
Path secretId) {
super("vault:1.11.4");
super(VAULT_DEFAULT_IMAGE + ":" + Optional.ofNullable(
System.getenv("VAULT_VERSION")).orElse(VAULT_DEFAULT_TAG));
this.withNetwork(CONTAINER_NETWORK)
.withNetworkAliases("agent")
.withClasspathResourceMapping("/agent.hcl", AGENT_CONFIG_FILE, BindMode.READ_ONLY)
Expand Down
4 changes: 2 additions & 2 deletions src/test-integration/resources/libressl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ certificate = /vault/config/ssl/root-cert.pem
database = /vault/config/ssl/certindex
private_key = /vault/config/ssl/root-privkey.pem
serial = /vault/config/ssl/serialfile
default_days = 365
default_md = sha1
default_days = 3650
default_md = sha256
policy = myca_policy
x509_extensions = myca_extensions
copy_extensions = copy
Expand Down
14 changes: 12 additions & 2 deletions src/test-integration/resources/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,20 @@ rm -Rf *
cp ../libressl.conf .

# Create a CA root certificate and key
openssl req -newkey rsa:2048 -days 3650 -x509 -nodes -out root-cert.pem -keyout root-privkey.pem -subj '/C=US/ST=GA/L=Atlanta/O=BetterCloud/CN=localhost'
openssl req -newkey rsa:4096 \
-days 3650 \
-x509 \
-nodes \
-out root-cert.pem \
-keyout root-privkey.pem \
-subj '/C=US/ST=GA/L=Atlanta/O=BetterCloud/CN=localhost'

# Create a private key, and a certificate-signing request
openssl req -newkey rsa:1024 -nodes -out vault-csr.pem -keyout vault-privkey.pem -subj '/C=US/ST=GA/L=Atlanta/O=BetterCloud/CN=localhost'
openssl req -newkey rsa:4096 \
-nodes \
-out vault-csr.pem \
-keyout vault-privkey.pem \
-subj '/C=US/ST=GA/L=Atlanta/O=BetterCloud/CN=localhost'

# Create an X509 certificate for the Vault server
echo 000a > serialfile
Expand Down