You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2019/09/05 00:11:51 UTC
[knox] branch master updated (36cdb97 -> ebda495)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git.
from 36cdb97 KNOX-1788 - New XSS Provider is added to Web Application Security Provider List (#141)
new de014d3 KNOX-1971 - Upgrade Hashicorp Vault test to vault:1.2.1
new ebda495 KNOX-2007 - TestHashicorpVaultAliasService fails if a process is already bound to port 8200
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../hashicorp/vault/TestHashicorpVaultAliasService.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
[knox] 01/02: KNOX-1971 - Upgrade Hashicorp Vault test to
vault:1.2.1
Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit de014d3b47eef8c2576402b4a511fba4dc18426a
Author: Sandor Molnar <sm...@apache.org>
AuthorDate: Tue Sep 3 17:09:49 2019 +0200
KNOX-1971 - Upgrade Hashicorp Vault test to vault:1.2.1
---
.../gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java b/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
index ea61f2c..d746602 100644
--- a/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
+++ b/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
@@ -57,7 +57,7 @@ public class TestHashicorpVaultAliasService {
private static final Logger LOG = LoggerFactory.getLogger(TestHashicorpVaultAliasService.class);
private static final Random RANDOM = new Random();
- private static final String vaultVersion = "1.0.3";
+ private static final String vaultVersion = "1.2.1";
private static final String vaultImage = "vault:" + vaultVersion;
private static final Integer vaultPort = 8200;
private static final String vaultToken = "myroot";
[knox] 02/02: KNOX-2007 - TestHashicorpVaultAliasService fails if a
process is already bound to port 8200
Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit ebda495ce8bd52d63086f911f626f362be284c71
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Wed Sep 4 20:10:52 2019 -0400
KNOX-2007 - TestHashicorpVaultAliasService fails if a process is already bound to port 8200
Signed-off-by: Kevin Risden <kr...@apache.org>
---
.../backend/hashicorp/vault/TestHashicorpVaultAliasService.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java b/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
index d746602..85430a9 100644
--- a/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
+++ b/gateway-service-hashicorp-vault/src/test/java/org/apache/knox/gateway/backend/hashicorp/vault/TestHashicorpVaultAliasService.java
@@ -70,7 +70,6 @@ public class TestHashicorpVaultAliasService {
public static void setUpClass() {
try {
vaultContainer = new VaultContainer(vaultImage)
- .withVaultPort(vaultPort)
.withVaultToken(vaultToken)
.waitingFor(Wait.forHttp("/"));
} catch (IllegalStateException e) {
@@ -96,7 +95,7 @@ public class TestHashicorpVaultAliasService {
private void setupVaultSecretsEngine() throws Exception {
vaultContainer.execInContainer("vault", "secrets", "enable", "-path=" + vaultSecretsEngine,
"-version=2", "kv");
- LOG.debug("created KV secrets engine %s", vaultSecretsEngine);
+ LOG.debug("created KV secrets engine {}", vaultSecretsEngine);
}
@After
@@ -109,7 +108,7 @@ public class TestHashicorpVaultAliasService {
private void cleanupVaultSecretsEngine() throws Exception {
vaultContainer.execInContainer("vault", "secrets", "disable", vaultSecretsEngine);
- LOG.debug("deleted KV secrets engine %s", vaultSecretsEngine);
+ LOG.debug("deleted KV secrets engine {}", vaultSecretsEngine);
}
@AfterClass
@@ -270,14 +269,14 @@ public class TestHashicorpVaultAliasService {
vaultContainer.copyFileToContainer(Transferable.of(policy.getBytes(StandardCharsets.UTF_8)),
policyFilePath);
vaultContainer.execInContainer("vault", "policy", "write", getVaultPolicy(), policyFilePath);
- LOG.debug("created policy %s", getVaultPolicy());
+ LOG.debug("created policy {}", getVaultPolicy());
vaultContainer.execInContainer("rm", "-f", policyFilePath);
}
private void cleanupVaultPolicy() {
try {
vaultContainer.execInContainer("vault", "policy", "delete", getVaultPolicy());
- LOG.debug("deleted policy %s", getVaultPolicy());
+ LOG.debug("deleted policy {}", getVaultPolicy());
} catch (Exception ignore) {
// ignore
}