You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/09/15 14:48:46 UTC
[brooklyn-server] 06/11: fix tests for revised md5 sanitizer
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit fa13b259671401e0f070bf2a2d7906f3ef02b052
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Sep 14 23:24:27 2021 +0100
fix tests for revised md5 sanitizer
---
.../apache/brooklyn/rest/resources/EntityConfigResourceTest.java | 4 ++--
.../entity/software/base/VanillaSoftwareProcessStreamsTest.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java
index 16dc385..d11b283 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EntityConfigResourceTest.java
@@ -150,7 +150,7 @@ public class EntityConfigResourceTest extends BrooklynRestResourceTest {
.get(String.class);
assertEquals(getSecretWithQueryParams.apply(""), JavaStringEscapes.wrapJavaString("hello-world"));
- assertEquals(getSecretWithQueryParams.apply("suppressSecrets=true"), JavaStringEscapes.wrapJavaString("<suppressed> (MD5 hash: 2095312189753DE6AD47DFE20CBE97EC)"));
+ assertEquals(getSecretWithQueryParams.apply("suppressSecrets=true"), JavaStringEscapes.wrapJavaString("<suppressed> (MD5 hash: 20953121)"));
assertEquals(getSecretWithQueryParams.apply("skipResolution=true"), JavaStringEscapes.wrapJavaString(HELLO_WORLD_DSL));
assertEquals(getSecretWithQueryParams.apply("suppressSecrets=true&skipResolution=true"), JavaStringEscapes.wrapJavaString(HELLO_WORLD_DSL));
}
@@ -165,7 +165,7 @@ public class EntityConfigResourceTest extends BrooklynRestResourceTest {
.get(String.class);
assertEquals(getSecretWithQueryParams.apply(""), "hello-world");
- assertEquals(getSecretWithQueryParams.apply("suppressSecrets=true"), "<suppressed> (MD5 hash: 2095312189753DE6AD47DFE20CBE97EC)");
+ assertEquals(getSecretWithQueryParams.apply("suppressSecrets=true"), "<suppressed> (MD5 hash: 20953121)");
assertEquals(getSecretWithQueryParams.apply("skipResolution=true"), HELLO_WORLD_DSL);
assertEquals(getSecretWithQueryParams.apply("suppressSecrets=true&skipResolution=true"), HELLO_WORLD_DSL);
}
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsTest.java
index ff375e6..4b9dfe0 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessStreamsTest.java
@@ -71,7 +71,7 @@ public class VanillaSoftwareProcessStreamsTest extends AbstractSoftwareProcessSt
// Prepare expected environment variables, secret names are keys with values that should be masked in env stream
Map<String, String> expectedEnv = new ImmutableMap.Builder<String, String>()
.put("KEY1", "VAL1")
- .putAll(Sanitizer.SECRET_NAMES.stream().collect(Collectors.toMap(item -> item, item -> item)))
+ .putAll(Sanitizer.DEFAULT_SENSITIVE_FIELDS_TOKENS.stream().collect(Collectors.toMap(item -> item, item -> item)))
.build();
// Create configuration
@@ -115,9 +115,9 @@ public class VanillaSoftwareProcessStreamsTest extends AbstractSoftwareProcessSt
// Calculate MD5 hash for all keys that are expected to be masked and verify them displayed masked in env stream
Map<String, String> expectedMaskedEnv = new ImmutableMap.Builder<String, String>()
.put("KEY1", "VAL1") // this key must appear unmasked, it is not in the list of SECRET NAMES to mask
- .putAll(Sanitizer.SECRET_NAMES.stream().collect(Collectors.toMap(
+ .putAll(Sanitizer.DEFAULT_SENSITIVE_FIELDS_TOKENS.stream().collect(Collectors.toMap(
item -> item, // key and expected masked (suppressed) value for a SECRET NAME with MD5 hash
- item -> "<suppressed> (MD5 hash: " + Streams.getMd5Checksum(new ByteArrayInputStream(item.getBytes())) + ")")))
+ Sanitizer::suppress)))
.build();
assertEnvStream(entity, expectedMaskedEnv);
}