From 691052c3f40ff610012094f214a7dbae70aa5fa7 Mon Sep 17 00:00:00 2001 From: vishalnayak Date: Thu, 14 Apr 2016 15:34:01 +0000 Subject: [PATCH 1/2] Clarify token-revoke operation --- command/token_revoke.go | 2 +- website/source/intro/getting-started/authentication.html.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/command/token_revoke.go b/command/token_revoke.go index 38eca3560e..7833b3a9e0 100644 --- a/command/token_revoke.go +++ b/command/token_revoke.go @@ -65,7 +65,7 @@ func (c *TokenRevokeCommand) Run(args []string) int { return 2 } - c.Ui.Output("Revocation successful.") + c.Ui.Output("Token revoked if it existed") return 0 } diff --git a/website/source/intro/getting-started/authentication.html.md b/website/source/intro/getting-started/authentication.html.md index 33dce1b4f4..f01fb2e830 100644 --- a/website/source/intro/getting-started/authentication.html.md +++ b/website/source/intro/getting-started/authentication.html.md @@ -58,7 +58,7 @@ After a token is created, you can revoke it with `vault token-revoke`: ``` $ vault token-revoke c2c2fbd5-2893-b385-6fa5-30050439f698 -Revocation successful. +Token revoked if it existed ``` In a previous section, we use the `vault revoke` command. This command From e53b9dbadba8d3817aa4df42c29c9c63b9755126 Mon Sep 17 00:00:00 2001 From: vishalnayak Date: Thu, 14 Apr 2016 15:46:45 +0000 Subject: [PATCH 2/2] Provide clarity for output statements of idempotent calls. --- command/delete.go | 2 +- command/revoke.go | 2 +- command/token_revoke.go | 2 +- website/source/intro/getting-started/authentication.html.md | 2 +- website/source/intro/getting-started/dynamic-secrets.html.md | 2 +- website/source/intro/getting-started/first-secret.html.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/command/delete.go b/command/delete.go index 50e9640e9c..d9a8ee8a66 100644 --- a/command/delete.go +++ b/command/delete.go @@ -41,7 +41,7 @@ func (c *DeleteCommand) Run(args []string) int { return 1 } - c.Ui.Output(fmt.Sprintf("Success! Deleted '%s' if it existed", path)) + c.Ui.Output(fmt.Sprintf("Success! Deleted '%s' if it existed.", path)) return 0 } diff --git a/command/revoke.go b/command/revoke.go index 4367d6faff..f5730d6b46 100644 --- a/command/revoke.go +++ b/command/revoke.go @@ -56,7 +56,7 @@ func (c *RevokeCommand) Run(args []string) int { return 1 } - c.Ui.Output(fmt.Sprintf("Key revoked with ID '%s'.", leaseId)) + c.Ui.Output(fmt.Sprintf("Success! Revoked the secret with ID '%s', if it existed.", leaseId)) return 0 } diff --git a/command/token_revoke.go b/command/token_revoke.go index 7833b3a9e0..de3252ce41 100644 --- a/command/token_revoke.go +++ b/command/token_revoke.go @@ -65,7 +65,7 @@ func (c *TokenRevokeCommand) Run(args []string) int { return 2 } - c.Ui.Output("Token revoked if it existed") + c.Ui.Output("Success! Token revoked if it existed.") return 0 } diff --git a/website/source/intro/getting-started/authentication.html.md b/website/source/intro/getting-started/authentication.html.md index f01fb2e830..f47a5f7a5e 100644 --- a/website/source/intro/getting-started/authentication.html.md +++ b/website/source/intro/getting-started/authentication.html.md @@ -58,7 +58,7 @@ After a token is created, you can revoke it with `vault token-revoke`: ``` $ vault token-revoke c2c2fbd5-2893-b385-6fa5-30050439f698 -Token revoked if it existed +Success! Token revoked if it existed. ``` In a previous section, we use the `vault revoke` command. This command diff --git a/website/source/intro/getting-started/dynamic-secrets.html.md b/website/source/intro/getting-started/dynamic-secrets.html.md index e6ca706480..3a46f95dc4 100644 --- a/website/source/intro/getting-started/dynamic-secrets.html.md +++ b/website/source/intro/getting-started/dynamic-secrets.html.md @@ -148,7 +148,7 @@ outputted from `vault read` when you ran it: ``` $ vault revoke aws/creds/deploy/0d042c53-aa8a-7ce7-9dfd-310351c465e5 -Key revoked with ID 'aws/creds/deploy/0d042c53-aa8a-7ce7-9dfd-310351c465e5'. +Success! Revoked the secret with ID 'aws/creds/deploy/0d042c53-aa8a-7ce7-9dfd-310351c465e5', if it existed. ``` Done! If you look at your AWS account, you'll notice that no IAM users diff --git a/website/source/intro/getting-started/first-secret.html.md b/website/source/intro/getting-started/first-secret.html.md index 0b85abb702..6f0b52d3c3 100644 --- a/website/source/intro/getting-started/first-secret.html.md +++ b/website/source/intro/getting-started/first-secret.html.md @@ -110,7 +110,7 @@ and delete it. We can do this with `vault delete`: ``` $ vault delete secret/hello -Success! Deleted 'secret/hello' if it existed +Success! Deleted 'secret/hello' if it existed. ``` ## Next