From 9c8ab50d6049ce6ff732d2ed87920531b18f0c5f Mon Sep 17 00:00:00 2001
From: Alex Collins <alexec@users.noreply.github.com>
Date: Thu, 8 Aug 2019 14:45:27 -0700
Subject: [PATCH] =?UTF-8?q?Redact=20secrets=20using=20"+"=20rather=20than?=
 =?UTF-8?q?=20"*"=20as=20this=20is=20base=2064=20compatiba=E2=80=A6=20(#21?=
 =?UTF-8?q?19)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/e2e/app_management_test.go | 2 +-
 util/diff/diff.go               | 5 +++--
 util/diff/diff_test.go          | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/e2e/app_management_test.go b/test/e2e/app_management_test.go
index c1eeb2a21f..80edbdfd57 100644
--- a/test/e2e/app_management_test.go
+++ b/test/e2e/app_management_test.go
@@ -284,7 +284,7 @@ func TestAppWithSecrets(t *testing.T) {
 
 			diffOutput, err := fixture.RunCli("app", "diff", app.Name)
 			assert.Error(t, err)
-			assert.Contains(t, diffOutput, "username: '*********'")
+			assert.Contains(t, diffOutput, "username: +++++++++")
 
 			// local diff should ignore secrets
 			diffOutput, err = fixture.RunCli("app", "diff", app.Name, "--local", "testdata/secrets")
diff --git a/util/diff/diff.go b/util/diff/diff.go
index 64a2ce4a3b..9cef1e1adb 100644
--- a/util/diff/diff.go
+++ b/util/diff/diff.go
@@ -387,7 +387,8 @@ func HideSecretData(target *unstructured.Unstructured, live *unstructured.Unstru
 	}
 
 	for k := range keys {
-		nextReplacement := "*********"
+		// we use "+" rather than the more common "*"
+		nextReplacement := "+++++++++"
 		valToReplacement := make(map[string]string)
 		for _, obj := range []*unstructured.Unstructured{target, live, orig} {
 			var data map[string]interface{}
@@ -409,7 +410,7 @@ func HideSecretData(target *unstructured.Unstructured, live *unstructured.Unstru
 			replacement, ok := valToReplacement[val]
 			if !ok {
 				replacement = nextReplacement
-				nextReplacement = nextReplacement + "*"
+				nextReplacement = nextReplacement + "+"
 				valToReplacement[val] = replacement
 			}
 			data[k] = replacement
diff --git a/util/diff/diff_test.go b/util/diff/diff_test.go
index 2935f64db9..b802e226c5 100644
--- a/util/diff/diff_test.go
+++ b/util/diff/diff_test.go
@@ -534,9 +534,9 @@ func secretData(obj *unstructured.Unstructured) map[string]interface{} {
 }
 
 const (
-	replacement1 = "*********"
-	replacement2 = "**********"
-	replacement3 = "***********"
+	replacement1 = "+++++++++"
+	replacement2 = "++++++++++"
+	replacement3 = "+++++++++++"
 )
 
 func TestHideSecretDataSameKeysDifferentValues(t *testing.T) {