diff --git a/clicommand/agent_start.go b/clicommand/agent_start.go index 6ff12c1e7e..c0ee30ea80 100644 --- a/clicommand/agent_start.go +++ b/clicommand/agent_start.go @@ -658,7 +658,7 @@ var AgentStartCommand = cli.Command{ }, cli.StringFlag{ Name: "signing-jwks-file", - Usage: "Path to a file containing a signing key. Passing this flag enables pipeline signing for all pipelines uploaded by this agent. For hmac-sha256, the raw file content is used as the shared key", + Usage: `Path to a file containing a signing key. Passing this flag enables pipeline signing for all pipelines uploaded by this agent. For hmac-sha256, the raw file content is used as the shared key. When using Docker containers to upload pipeline steps dynamically, use environment variable propagation (for example, "docker run -e BUILDKITE_AGENT_JWKS_FILE") to allow all steps within the pipeline to be signed.`, EnvVar: "BUILDKITE_AGENT_SIGNING_JWKS_FILE", }, cli.StringFlag{ diff --git a/clicommand/redactor_add.go b/clicommand/redactor_add.go index 750315f407..a1935f7e76 100644 --- a/clicommand/redactor_add.go +++ b/clicommand/redactor_add.go @@ -52,9 +52,40 @@ type RedactorAddConfig struct { } var RedactorAddCommand = cli.Command{ - Name: "add", - Usage: "Add values to redact from a job's log output", - Description: "This may be used to parse a file for values to redact from a running job's log output. If you dynamically fetch secrets during a job, it is recommended that you use this command to ensure they will be redacted from subsequent logs. Secrets fetched with the builtin ′secret get′ command do not require the use of this command, they will be redacted automatically.", + Name: "add", + Usage: "Add values to redact from a job's log output", + Description: `Usage: + + buildkite-agent redactor add [options...] [file-with-content-to-redact] + +Description: + +This command may be used to parse a file for values to redact from a +running job's log output. If you dynamically fetch secrets during a job, +it is recommended that you use this command to ensure they will be +redacted from subsequent logs. Secrets fetched with the builtin +′secret get′ command do not require the use of this command, they will +be redacted automatically. + +Example: + +To redact the verbatim contents of the file 'id_ed25519' from future logs: + + $ buildkite-agent redactor add id_ed25519 + +To redact the string 'llamasecret' from future logs: + + $ echo llamasecret | buildkite-agent redactor add + +To redact multiple secrets from future logs in one command, create a flat +JSON object file (for example, 'my-secrets.json'), with multiple "key" values, +one for each secret: + + $ echo '{"key":"secret1","key":"secret2"}' | buildkite-agent redactor add --format=json + +Or + + $ buildkite-agent redactor add --format=json my-secrets.json`, Flags: []cli.Flag{ cli.StringFlag{ Name: "format", diff --git a/clicommand/secret_get.go b/clicommand/secret_get.go index 1e53d725a1..16b8fa6060 100644 --- a/clicommand/secret_get.go +++ b/clicommand/secret_get.go @@ -47,7 +47,7 @@ Examples: The following examples reference the same Buildkite secret ′key′: $ buildkite-agent secret get deploy_key - $ buildkite-agent secret get DEPLOY_KEY`, + $ buildkite-agent secret get DEPLOY_KEY`, Flags: []cli.Flag{ cli.StringFlag{ Name: "job",