Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate aws-keychain.keychain from login.keychain #15

Merged
merged 3 commits into from
Sep 22, 2015
Merged

Conversation

pda
Copy link
Owner

@pda pda commented Aug 21, 2015

Expands upon and closes #14 by @lox;

Uses (and auto-creates) a separate aws-keychain.keychain which can be overridden by AWS_KEYCHAIN_FILE. This keeps credentials out of the always-unlocked login.keychain, and allows fine-tuning of auto-lock parameters. Newly created keychains seem to default to auto-lock after 5 minutes and when sleeping.

Provides aws-keychain migrate to move items from the old keychain to the new one. Both source and destination can be specified in the environment (so e.g. reverse migration is possible), but the defaults are sensible and respect custom AWS_KEYCHAIN_FILE.

Compared to #14, AWS_KEYCHAIN_FILE defaults to aws-keychain.keychain rather than Amazon AWS.keychain so that the name matches the tool and contains no spaces.

lox and others added 3 commits August 21, 2015 13:48
By default the login keychain is used, which tends to be always
unlocked. This sets the default to a keychain called 'Amazon AWS', which
is created if it's missing in add.
@lox
Copy link
Contributor

lox commented Aug 21, 2015

I dunno, I'd probably just put that in a separate script for migrating from v1. Shame to bulk up the main script so much.

@pda
Copy link
Owner Author

pda commented Aug 21, 2015

I considered that, then I thought about helping N people upgrade from v2 to v3, and figured it's best to bundle it. It's basically a self-contained function that can be trivially removed in a future version. It also re-invokes aws-keychain so it's nice for it to be tied to the version that it's referencing.

Edited: s/v2/v3/ s/v1/v2/

@lox
Copy link
Contributor

lox commented Aug 21, 2015

👍

@pda pda merged commit 60072bb into master Sep 22, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants