From e37f73224306c40f20def3244b4491af30f62e02 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Wed, 22 Mar 2017 19:09:53 -0600 Subject: [PATCH] fix error in edit man page --- doc/man/vaulted-edit.1 | 42 +++++++++++++++++++++++------------------- doc/vaulted-edit.1.md | 5 ++--- man.go | 24 ++++++++++++------------ 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/doc/man/vaulted-edit.1 b/doc/man/vaulted-edit.1 index 8f5e5a0..350ae67 100644 --- a/doc/man/vaulted-edit.1 +++ b/doc/man/vaulted-edit.1 @@ -22,26 +22,30 @@ m \- MFA Manages MFA (multi\-factor authentication) ARN or serial number. If enabled, user will be prompted to enter MFA code when accessing vault. MFA will remain active for the vault duration. -.RE -.PP - If you are using STS credentials, which occurs by default (see the 't' - option below for details), you must have MFA enabled to invoke any IAM calls. -* r \- Role .br - ARN of role to be assumed when accessing vault. - When assuming a role, the maximum duration allowed by AWS is 1 hour. If your - duration is greater than 1 hour when setting a role, the duration will be - adjusted to 1 hour. -* t \- Substitute with temporary credentials +If you are using STS credentials, which occurs by default (see the 't' +option below for details), you must have MFA enabled to invoke any IAM calls. +.IP \(bu 2 +r \- Role +.br +ARN of role to be assumed when accessing vault. +When assuming a role, the maximum duration allowed by AWS is 1 hour. If your +duration is greater than 1 hour when setting a role, the duration will be +adjusted to 1 hour. +.IP \(bu 2 +t \- Substitute with temporary credentials .br - Toggles whether your AWS credentials are substituted with a set of temporary - credentials. For more details on this process, see the documentation for - \fB\fCvaulted shell\fR\&. -* S \- Show/Hide Key +Toggles whether your AWS credentials are substituted with a set of temporary +credentials. For more details on this process, see the documentation for +\fB\fCvaulted shell\fR\&. +.IP \(bu 2 +S \- Show/Hide Key .br - Toggles whether Secret Access Key ID is displayed when viewing vault - details in the edit menu. This setting only affects the current editing - session and is reset to hidden each time the vault is reopened for editing. -* D \- Delete +Toggles whether Secret Access Key ID is displayed when viewing vault +details in the edit menu. This setting only affects the current editing +session and is reset to hidden each time the vault is reopened for editing. +.IP \(bu 2 +D \- Delete .br - Removes all AWS details stored in the vault. +Removes all AWS details stored in the vault. +.RE diff --git a/doc/vaulted-edit.1.md b/doc/vaulted-edit.1.md index d32c678..b026b4d 100644 --- a/doc/vaulted-edit.1.md +++ b/doc/vaulted-edit.1.md @@ -26,8 +26,7 @@ AWS KEY * m - MFA Manages MFA (multi-factor authentication) ARN or serial number. If enabled, user will be prompted to enter MFA code when accessing vault. MFA will - remain active for the vault duration. - + remain active for the vault duration. If you are using STS credentials, which occurs by default (see the 't' option below for details), you must have MFA enabled to invoke any IAM calls. * r - Role @@ -44,4 +43,4 @@ AWS KEY details in the edit menu. This setting only affects the current editing session and is reset to hidden each time the vault is reopened for editing. * D - Delete - Removes all AWS details stored in the vault. \ No newline at end of file + Removes all AWS details stored in the vault. diff --git a/man.go b/man.go index 70abd22..1f73adb 100644 --- a/man.go +++ b/man.go @@ -93,7 +93,7 @@ func vaultedAdd1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-add.1", size: 289, mode: os.FileMode(420), modTime: time.Unix(1490228259, 0)} + info := bindataFileInfo{name: "vaulted-add.1", size: 289, mode: os.FileMode(420), modTime: time.Unix(1490231360, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -113,7 +113,7 @@ func vaultedCp1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-cp.1", size: 667, mode: os.FileMode(420), modTime: time.Unix(1490228259, 0)} + info := bindataFileInfo{name: "vaulted-cp.1", size: 667, mode: os.FileMode(420), modTime: time.Unix(1490231360, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -133,12 +133,12 @@ func vaultedDump1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-dump.1", size: 224, mode: os.FileMode(420), modTime: time.Unix(1490228259, 0)} + info := bindataFileInfo{name: "vaulted-dump.1", size: 224, mode: os.FileMode(420), modTime: time.Unix(1490231360, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _vaultedEdit1 = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x84\x54\xcb\x8e\xdb\x46\x10\xbc\xf3\x2b\xea\x14\xaf\x0d\x2d\x03\xe7\x0f\x14\x6b\x17\x2b\x18\x5a\x0b\xa2\x02\xc3\x00\x2f\x23\x4e\x53\x9c\x78\x1e\xca\x3c\x44\xeb\xef\x83\x6e\x89\xb4\x16\x31\x90\x2b\x7b\xba\xba\xaa\xba\xd8\xf5\xfe\x05\x67\x55\x6c\x26\xdd\x3e\x92\x36\x19\x1f\xab\xba\x79\xc1\xeb\x72\xf3\x54\xd5\xdb\x6d\x75\x2b\x42\x6a\xed\x23\x8c\xcf\x14\x55\x97\xcd\x99\xec\x45\xbe\x26\xe4\x81\xd0\x05\x9f\xc9\x67\x84\x1e\xca\x83\x7e\x98\x94\x8d\x3f\x5e\xb1\x05\xb1\xf9\xf6\xfa\x65\xdb\xac\x1b\x41\x6d\xfb\x3f\xdb\xfe\xd3\x3d\x76\xdb\xef\xd0\xf6\x6b\xaf\x1c\xb5\xfd\x56\x3a\x56\x4f\xcd\xa7\xdd\x7a\xbb\x5f\x7f\x79\x95\xa6\xe6\xa4\x46\x9f\x18\x7e\x22\x71\x26\xb8\xa0\x09\x7d\x88\x02\xc2\x13\xff\x8f\x4c\x2d\x58\x7f\x9d\x82\xc7\x3f\xc5\x64\x2e\x2c\xa4\xc9\xd3\x38\x37\x9a\x84\xa4\xce\xa4\x91\x83\xd4\xa6\xce\xe6\x05\xcb\xaf\x0d\x3e\x3f\x7d\xab\xea\x5d\x53\xd5\xeb\x2d\xda\x87\x43\xc1\x1f\xd5\x77\x36\xe7\x33\x5d\xaa\xfa\x10\xab\x8d\xf2\xea\x48\x09\xcb\xae\xa3\x94\xf8\x33\xd6\x2b\x28\xaf\xd1\x50\x17\x29\xdf\x17\xba\x48\x9a\x7c\x36\xca\xa6\xfa\x1e\xd0\x31\xe0\xe6\x79\xf9\x06\x70\xf3\xbc\xc4\x83\x2b\x36\x9b\xf6\xb1\x57\x5d\x0e\x11\xaa\xe4\x81\xfb\x3b\x95\x4d\xf0\xef\xb1\xdc\xbd\x22\x44\x24\x8a\x46\x59\xf8\xe2\x0e\x14\x6b\xac\x7b\x90\x57\x07\x4b\x7a\x51\x95\x44\x11\xa3\xb1\x16\x07\xc2\x29\x06\x77\xca\x57\xa5\xc4\xb6\xca\x8c\x8e\x5d\x1d\x07\xf2\x50\xc2\xf4\xa7\x7b\x52\xe6\xe6\x2a\x92\x53\x86\x1f\x70\x16\x64\x05\xb3\x53\xd0\x25\x0a\x9d\xba\xaa\x77\xd7\x1c\x01\xcc\xe1\x12\x0a\x54\x24\x14\x41\x6c\xf6\xcd\xbd\xfc\x05\xc6\xc1\x74\x03\x42\xd7\x95\x98\x70\xb8\x40\x53\x2f\x70\x0f\x89\x48\xd0\xdf\xe5\x77\x8c\x14\x4e\x0c\x8e\x03\xd9\x30\xca\x64\x4d\x59\x19\x9b\xde\x2f\x64\x82\x2b\x29\x63\x50\x67\x12\xb2\x37\xdd\x2c\xd0\xf8\x73\xf8\x4e\x50\xfe\x82\xf5\x72\x83\x4e\x59\x36\xfd\x03\x22\x7b\xbd\x0b\x96\xc4\x6c\xe0\x6a\x62\x8f\x18\x2c\x71\xdf\x81\xa0\x52\x2a\x8e\xf4\xaf\x4d\xe1\x96\xaf\x52\xe0\x57\xfc\x5d\x49\xef\x35\x58\x4e\xfd\x30\xae\xb8\xd9\x14\x28\x6b\xc3\x48\x9a\x15\x72\x9a\x4c\xc2\x47\x0c\xa1\x5c\xd7\x74\x09\x45\x28\xcc\xaf\x4d\xc2\x31\x92\xe2\xd5\xe4\x41\xf9\xdb\xdb\x2b\x91\x44\x12\xe0\x37\xe3\xe6\xc6\xdb\x8a\x19\x4c\xe9\xbf\x4b\xba\x6d\xf9\x36\xab\xfa\x00\xf9\xa1\x9b\x72\x48\xd9\xe4\x92\x09\xa3\xc9\x03\x32\xb9\x53\x88\x2a\xbe\x49\xe6\xe4\xcb\x3e\x1c\x8f\x96\x12\x0f\xcf\x03\x45\x21\x2b\x1a\xee\xde\xca\x82\xd3\x8c\xaa\xaf\xb0\x8a\xb9\xb2\xa7\x33\x3e\xe3\xdd\x87\x1f\xcf\x21\xc2\x85\x48\xd3\x36\x11\x3c\xf2\x60\x12\x67\x94\xfd\x5e\x60\x8a\x81\x0e\x5d\x71\xe4\xf3\x55\x67\x1f\x84\xdb\xdb\x9b\x92\x06\xb2\xb6\xed\x77\xed\x6f\xac\xb4\x11\xa5\x43\x18\x7f\x7f\x31\x9a\xe6\xff\xf4\x17\x8a\xfe\xfb\x83\xae\x57\xbc\x02\x6d\xd2\xc9\xaa\xcb\x94\x80\xb3\xa1\xf1\xe7\x7d\xe3\x75\xdd\x38\x1b\x2f\x0c\xe5\x5c\x3a\xf2\xa5\xc6\x9e\x25\x4c\x8b\x0a\xde\x5e\xa0\xfa\x9e\xba\xe9\x6e\x96\x18\xf9\xe2\xdc\xce\x17\x43\x25\xce\x16\xc7\xc4\x6b\x9e\x1c\x89\x9d\xcb\x01\x83\xd1\x9a\x3c\x48\x75\x03\xb2\x71\x74\xf7\xbf\xc9\xb3\x70\x22\x4f\xfa\xfe\x18\xb2\xf4\x15\x4b\x5f\x91\xa5\x3c\xa7\x7b\x47\x2e\x9c\x29\x71\x0e\x65\x79\x13\xf7\x94\x43\x24\x3d\x49\xb8\x45\xfb\xdf\x00\x00\x00\xff\xff\x30\x00\xb8\x1a\x22\x06\x00\x00") +var _vaultedEdit1 = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x84\x54\x5d\x8f\xdb\x36\x10\x7c\xe7\xaf\xd8\xa7\xe6\x02\xf8\x54\xa4\xff\xc0\x8d\xef\x70\x42\xe0\x8b\x61\xb9\x08\x02\xe8\x65\x2d\xae\x2c\x36\xfc\x70\xf9\x61\xc5\xff\xbe\xd8\xb5\xe5\x93\xaf\x05\xf2\x4a\x72\x67\x67\x66\x87\x5b\xed\x5e\xe0\x84\xc5\x66\xd2\xed\x23\x69\x93\xe1\x93\xaa\x9a\x17\x78\x5d\xae\x9f\x54\xb5\xd9\xa8\xeb\x25\xc8\x5d\xfb\x08\xc6\x67\x8a\xd8\x65\x73\x22\x7b\x96\xd3\x04\x79\x20\xe8\x82\xcf\xe4\x33\x84\x1e\xd0\x03\xfd\x34\x29\x1b\x7f\xb8\x60\x0b\x62\xf3\xfd\xf5\xeb\xa6\xa9\x1b\x41\x6d\xfb\x3f\xdb\xfe\xf3\x1c\xbb\xed\xb7\xd0\xf6\xb5\x47\x47\x6d\xbf\x91\x8a\xd5\x53\xf3\x79\x5b\x6f\x76\xf5\xd7\x57\x29\x6a\x8e\x38\xfa\xc4\xf0\x13\x89\x13\x81\x0b\x9a\xa0\x0f\x51\x40\xb8\xe3\xaf\xc8\x54\x82\xf5\xd7\x31\x78\xf8\xa7\x98\xcc\x17\x0b\x29\xf2\x34\xde\x0a\x4d\x82\x84\x27\xd2\x90\x83\xdc\x4d\x95\xcd\x0b\x2c\xbf\x35\xf0\xe5\xe9\xbb\xaa\xb6\x8d\xaa\xea\x0d\xb4\x0f\xfb\x02\x7f\xa8\x1f\x6c\xce\x17\x3a\xab\x6a\x1f\xd5\x1a\x3d\x1e\x28\xc1\xb2\xeb\x28\x25\x3e\x86\x7a\x05\xe8\x35\x34\xd4\x45\xca\xf3\x8b\x2e\x92\x26\x9f\x0d\xda\x54\xcd\x01\x1d\x03\xae\x9f\x97\x77\x80\xeb\xe7\x25\x3c\xb8\x62\xb3\x69\x1f\x7b\xec\x72\x88\x80\x25\x0f\x5c\xdf\x61\x36\xc1\x7f\x84\xe5\xf6\x15\x42\x84\x44\xd1\xa0\x05\x5f\xdc\x9e\x62\x05\x75\x0f\xe4\x71\x6f\x49\x2f\x54\x49\x14\x61\x34\xd6\xc2\x9e\xe0\x18\x83\x3b\xe6\x8b\x52\x62\x5b\xa5\x47\xc7\xae\x8e\x03\x79\x40\x61\xfa\xe6\x9e\x5c\x73\xb1\x8a\xe4\xd0\xf0\x03\xce\x82\x8c\xe0\xe6\x14\xe8\x12\x85\x4e\x25\xec\xeb\x1e\xce\xa1\x00\x46\x82\x22\x50\xcd\xae\x99\xeb\x5e\xc0\x38\x98\x6e\x80\xd0\x75\x25\x26\xd8\x9f\x41\x53\x2f\x38\x0f\x89\x48\x60\x3f\xe4\x0f\x2a\x1c\x19\x12\xf6\x64\xc3\x28\xfd\x34\x65\x34\x36\x7d\x5c\x08\xbc\x2b\x29\xc3\x80\x27\x12\x8a\x57\xb5\x2c\xcb\xf8\x53\xf8\x41\x80\xfe\x0c\xf5\x72\x0d\x1d\xda\x77\x56\x47\xb6\x7a\x1b\x2c\x09\x5b\x31\xb0\x87\x18\x2c\x71\xf5\x9e\x00\x53\x2a\x8e\xf4\xff\x1b\xa2\xbe\xc9\x29\x3f\xe1\x43\x94\xc2\x4b\xa2\x1c\xfe\x34\xae\xb8\x9b\x1b\x80\xd6\x86\x91\x34\x2b\xe4\x18\x99\x04\x9f\x60\x08\xe5\x32\x9f\x73\x28\x51\xdd\x9e\x9a\x04\x87\x48\xc8\x03\xc9\x03\xfa\xeb\xc3\x0b\x85\x44\x12\xdb\xbb\x5e\xb7\xc2\xeb\x60\x15\xea\xbf\x4b\xba\x0e\xf6\xda\x65\xae\x59\x3e\x73\x53\xf6\x29\x9b\x5c\x32\xc1\x68\xf2\x00\x99\xdc\x31\x44\x8c\x77\xa9\x14\x53\x76\xe1\x70\xb0\x94\xb8\x7f\x1e\x28\x0a\x59\xd1\x30\x7b\x28\x03\x4e\x37\x48\x7d\xc1\x44\xa6\xcb\x86\xde\xc0\xd5\x3c\xf2\xf0\x1c\x22\xb8\x10\x69\x9a\x26\x04\x0f\x79\x30\x89\x93\xc9\x4e\x2f\x60\xca\x80\x0e\x5d\x71\xe4\xf3\x45\x67\x1f\xe2\xbb\x35\x92\x06\xb2\xb6\xed\xb7\xed\x6f\x77\x4a\x1b\x51\x3a\x84\xf1\xf7\x17\xa3\xe9\xf6\x47\xdf\x2b\xfa\xef\xcf\xac\x57\x3c\x05\x6d\xd2\xd1\xe2\x79\x1a\xff\xc9\xd0\xf8\xb6\xd8\x26\xce\xc6\x0b\x43\x59\x92\x8e\x7c\xa9\x60\xc7\x12\xa6\x41\x05\x6f\xcf\x80\x7d\x4f\xdd\xb4\x2d\x4b\x8c\xbc\x67\xae\x4b\x4b\x25\x8e\x14\x07\xc4\x6b\xee\x19\x89\x3d\xcb\x01\x06\xa3\x35\x79\x20\xec\x06\xc8\xc6\xd1\xec\x8b\xc9\xb3\x70\x24\x4f\x7a\xbe\xff\xee\xa4\xaf\x58\xfa\x8a\x2c\xe5\x4b\xb4\xb7\xe4\xc2\x89\x12\xe7\x50\x86\x37\xd1\x4f\x39\x44\xd2\x93\x8a\x69\xd9\x6d\x9f\xd4\xbf\x01\x00\x00\xff\xff\x41\xf4\xd7\x5c\x1f\x06\x00\x00") func vaultedEdit1Bytes() ([]byte, error) { return bindataRead( @@ -153,7 +153,7 @@ func vaultedEdit1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-edit.1", size: 1570, mode: os.FileMode(420), modTime: time.Unix(1490228260, 0)} + info := bindataFileInfo{name: "vaulted-edit.1", size: 1567, mode: os.FileMode(420), modTime: time.Unix(1490231360, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -173,7 +173,7 @@ func vaultedEnv1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-env.1", size: 733, mode: os.FileMode(420), modTime: time.Unix(1490228260, 0)} + info := bindataFileInfo{name: "vaulted-env.1", size: 733, mode: os.FileMode(420), modTime: time.Unix(1490231360, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -193,7 +193,7 @@ func vaultedLoad1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-load.1", size: 264, mode: os.FileMode(420), modTime: time.Unix(1490228260, 0)} + info := bindataFileInfo{name: "vaulted-load.1", size: 264, mode: os.FileMode(420), modTime: time.Unix(1490231361, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -213,7 +213,7 @@ func vaultedLs1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-ls.1", size: 188, mode: os.FileMode(420), modTime: time.Unix(1490228260, 0)} + info := bindataFileInfo{name: "vaulted-ls.1", size: 188, mode: os.FileMode(420), modTime: time.Unix(1490231361, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -233,7 +233,7 @@ func vaultedRm1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-rm.1", size: 337, mode: os.FileMode(420), modTime: time.Unix(1490228261, 0)} + info := bindataFileInfo{name: "vaulted-rm.1", size: 337, mode: os.FileMode(420), modTime: time.Unix(1490231361, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -253,7 +253,7 @@ func vaultedShell1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-shell.1", size: 1650, mode: os.FileMode(420), modTime: time.Unix(1490228261, 0)} + info := bindataFileInfo{name: "vaulted-shell.1", size: 1650, mode: os.FileMode(420), modTime: time.Unix(1490231361, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -273,7 +273,7 @@ func vaultedUpgrade1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted-upgrade.1", size: 366, mode: os.FileMode(420), modTime: time.Unix(1490228261, 0)} + info := bindataFileInfo{name: "vaulted-upgrade.1", size: 366, mode: os.FileMode(420), modTime: time.Unix(1490231362, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -293,7 +293,7 @@ func vaulted1() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "vaulted.1", size: 1561, mode: os.FileMode(420), modTime: time.Unix(1490228261, 0)} + info := bindataFileInfo{name: "vaulted.1", size: 1561, mode: os.FileMode(420), modTime: time.Unix(1490231362, 0)} a := &asset{bytes: bytes, info: info} return a, nil }