lockbox

commit f6736cd7122936cbd1de482bed613646b3dbd70b
parent 3a6e397c3ffc5a927007f442370c1784e6142e79
Author: Sean Enck <sean@ttypty.com>
Date:   Sat, 29 Jul 2023 08:34:37 -0400

error message fixup for rekey command

Diffstat:
M
internal/config/vars.go
 | 
4
++--
M
internal/config/vars_test.go
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/internal/config/vars.go b/internal/config/vars.go
@@ -111,10 +111,10 @@ func GetReKey(args []string) ([]string, error) {
 	for _, k := range []keyer{inStore, inKey, inKeyFile, inKeyMode} {
 		out = append(out, k.env.KeyValue(k.in))
 	}
-	sort.Strings(out)
 	if !inStore.has || (!inKey.has && !inKeyFile.has) {
-		return nil, fmt.Errorf("missing required arguments for rekey: %s", strings.Join(out, " "))
+		return nil, fmt.Errorf("missing required arguments for rekey:\n  -help for information on the flags or the lockbox help documentation for detailed usage")
 	}
+	sort.Strings(out)
 	return out, nil
 }
 
diff --git a/internal/config/vars_test.go b/internal/config/vars_test.go
@@ -119,11 +119,11 @@ func TestListVariables(t *testing.T) {
 
 func TestReKey(t *testing.T) {
 	_, err := config.GetReKey([]string{})
-	if err == nil || err.Error() != "missing required arguments for rekey: LOCKBOX_KEY= LOCKBOX_KEYFILE= LOCKBOX_KEYMODE= LOCKBOX_STORE=" {
+	if err == nil || !strings.HasPrefix(err.Error(), "missing required arguments for rekey") {
 		t.Errorf("failed: %v", err)
 	}
 	_, err = config.GetReKey([]string{"-store", "abc"})
-	if err == nil || err.Error() != "missing required arguments for rekey: LOCKBOX_KEY= LOCKBOX_KEYFILE= LOCKBOX_KEYMODE= LOCKBOX_STORE=abc" {
+	if err == nil || !strings.HasPrefix(err.Error(), "missing required arguments for rekey") {
 		t.Errorf("failed: %v", err)
 	}
 	out, err := config.GetReKey([]string{"-store", "abc", "-key", "aaa"})