awskeyring 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7e03d81e3086c6acea16f7eb514d1d52066bb5
-  data.tar.gz: 7af0c1e501fd4f11e331f6abec07329c997e0a47
+  metadata.gz: c334764f64951c2cdc1956a0289601b6c088bd5c
+  data.tar.gz: 2dd4c1112a6ee8eb15821d93e9ff352ce2267fac
 SHA512:
-  metadata.gz: d067652302c5c5e43e4975c392f880d373f61ca989c644a7c2fd473bd42c0723cbfc2cd041cc12c73a3add31752155ed8dd8bf15f71beb429e1b10f84edd81a4
-  data.tar.gz: 8f3434517adcbdf5185c315b1f33ae250d08dd56cb74e18c7d28397a3dd828fb6ce4209c28d9d6104f0085f34bb29c4f80c47e70d358e9e4cf54857f67bfb80a
+  metadata.gz: a4faa576d8f631d0b3ffb687760de1a813e0f4fd2e92ea2dbf463e5c63bd0b25b6eb61381d0a96d2943bf0d779e15de2c234571d8a7a0e11d52a146b6127959b
+  data.tar.gz: b2cc0d573f5acda892c2d84f7d6e51254122498da548ef2d89567f820f93b55bd82fc986354fd4eee45e9512238d46896e6f010498be21c7f01643c9eae00620

data/.rubocop.yml

@@ -4,11 +4,14 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 16
 
+Metrics/BlockLength:
+  Exclude:
+    - spec/*
+
 Naming/FileName:
   Exclude:
     - Gemfile
     - Rakefile
-    - aws-keychain-util.gemspec
 
 AllCops:
   Exclude:

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 os: osx
 rvm:
-  - 2.3.3
+- 2.3.3
 before_install: gem install bundler
+notifications:
+  slack:
+    secure: okKLlQ93ogj8ut18MZazQD63XTIzCpTfneYQMlKPaLU5HnooAkUFmEpSN8igTJD0GuEQ7Jf8+BkFlhECWl1FwtzIW6z/yMadiiLwY6qA/O1ZVVYZmkS4kpcKtCMrvO0Hf3iPLXpJX0sQGfGsMsho6NZuNs0dzlrr4+HX/cEGmDXBocDDxdv2d25HzHtqt4l+4axeJ+PJdHDmYlDzhtMAXhkGoPfzws7MPvkVcqY0eZRW2WqccO52zlQrBNcphp7BI8mLTW/BwkEY9YndJf2xoBaoEOuaIJbGgHbmskGMRui3vZnd08/fiWkNsCI/EhB5BDJ41bwobsHEtuqu+Qx92kI+hzjtU4D16k1v/6HDm61T6gh6BTp0QEXJeOkiecjVGyzrMlBf5BEyIB7JfLvGPa7RUbvvvUxFGcEtnSbUZ49cXAG7cKiiSgcNOocCrMNIRAe864Tm606Mud1RbOv8tEiS9BJ96ktOpOfvrYPyYMRFTte2gRLwNDwcpXIWTI39CXD2EBxSfRK/OqmggLYMG5AKhxyS/Vl7E2p9gii6syB0LnpFBIZ6t+OSve7fZtCU/wruC5IrI/vHtWfApvADYKsXG6FEYJoJ1LsCDjIRlrkwV1dEVsp/HSSO6zRh9KhJ3b7yzL97Dyi6dCi+nM7aKGrox/8kvcn9alrdRt8sz3c=

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+# Change Log
+
+## [0.0.3](https://github.com/vibrato/awskeyring/tree/0.0.3) (2018-01-29)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.0.2...0.0.3)
+
+**Implemented enhancements:**
+
+- Remove Token feature [\#5](https://github.com/vibrato/awskeyring/issues/5)
+- Implement exec command [\#2](https://github.com/vibrato/awskeyring/issues/2)
+- Add Remove token feature [\#6](https://github.com/vibrato/awskeyring/pull/6) ([tristanmorgan](https://github.com/tristanmorgan))
+- Implement exec feature. [\#3](https://github.com/vibrato/awskeyring/pull/3) ([tristanmorgan](https://github.com/tristanmorgan))
+
+## [v0.0.2](https://github.com/vibrato/awskeyring/tree/v0.0.2) (2018-01-18)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.0.1...v0.0.2)
+
+**Merged pull requests:**
+
+- Sledgehammer disable of rubocop metrics. [\#1](https://github.com/vibrato/awskeyring/pull/1) ([tristanmorgan](https://github.com/tristanmorgan))
+
+## [v0.0.1](https://github.com/vibrato/awskeyring/tree/v0.0.1) (2017-12-25)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -27,18 +27,20 @@ Install it with:
 The CLI is using [Thor](http://whatisthor.com) with help provided interactively.
 
     Commands:
-    awskeyring --version, -v               # Prints the version
-    awskeyring add ACCOUNT                 # Adds an ACCOUNT to the keyring
-    awskeyring add-role ROLE               # Adds a ROLE to the keyring
-    awskeyring console ACCOUNT             # Open the AWS Console for the ACCOUNT
-    awskeyring env ACCOUNT                 # Outputs bourne shell environment exports for an ACCOUNT
-    awskeyring help [COMMAND]              # Describe available commands or one specific command
-    awskeyring initialise                  # Initialises a new KEYCHAIN
-    awskeyring list                        # Prints a list of accounts in the keyring
-    awskeyring list-role                   # Prints a list of roles in the keyring
-    awskeyring remove ACCOUNT              # Removes an ACCOUNT from the keyring
-    awskeyring remove-role ROLE            # Removes a ROLE from the keyring
-    awskeyring token ACCOUNT [ROLE] [MFA]  # Create an STS Token from a ROLE or an MFA code
+      awskeyring --version, -v               # Prints the version
+      awskeyring add ACCOUNT                 # Adds an ACCOUNT to the keyring
+      awskeyring add-role ROLE               # Adds a ROLE to the keyring
+      awskeyring console ACCOUNT             # Open the AWS Console for the ACCOUNT
+      awskeyring env ACCOUNT                 # Outputs bourne shell environment exports for an ACCOUNT
+      awskeyring exec ACCOUNT command...     # Execute a COMMAND with the environment set for an ACCOUNT
+      awskeyring help [COMMAND]              # Describe available commands or one specific command
+      awskeyring initialise                  # Initialises a new KEYCHAIN
+      awskeyring list                        # Prints a list of accounts in the keyring
+      awskeyring list-role                   # Prints a list of roles in the keyring
+      awskeyring remove ACCOUNT              # Removes an ACCOUNT from the keyring
+      awskeyring remove-role ROLE            # Removes a ROLE from the keyring
+      awskeyring remove-token ACCOUNT        # Removes a token for ACCOUNT from the keyring
+      awskeyring token ACCOUNT [ROLE] [MFA]  # Create an STS Token from a ROLE or an MFA code
 
 and autocomplete that can be installed with:
 

data/Rakefile

@@ -1,6 +1,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
+require 'github_changelog_generator/task'
+
+GitHubChangelogGenerator::RakeTask.new :changelog
 
 RuboCop::RakeTask.new do |rubocop|
   rubocop.options = ['-D']

data/awskeyring.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency('thor')
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'github_changelog_generator'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'

data/lib/awskeyring/version.rb

@@ -1,3 +1,3 @@
 module Awskeyring
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

data/lib/awskeyring_command.rb

@@ -11,10 +11,12 @@ require 'awskeyring/version'
 # AWS Key-ring command line interface.
 class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   map %w[--version -v] => :__version
+  map ['init'] => :initialise
   map ['ls'] => :list
   map ['lsr'] => :list_role
   map ['rm'] => :remove
   map ['rmr'] => :remove_role
+  map ['rmt'] => :remove_token
 
   desc '--version, -v', 'Prints the version'
   def __version
@@ -66,6 +68,20 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     )
   end
 
+  desc 'exec ACCOUNT command...', 'Execute a COMMAND with the environment set for an ACCOUNT'
+  def exec(account, *command)
+    cred, temp_cred = get_valid_item_pair(account: account)
+    token = temp_cred.password unless temp_cred.nil?
+    env_vars = env_vars(
+      account: cred.attributes[:label],
+      key: cred.attributes[:account],
+      secret: cred.password,
+      token: token
+    )
+    pid = spawn(env_vars, command.join(' '))
+    Process.wait pid
+  end
+
   desc 'add ACCOUNT', 'Adds an ACCOUNT to the keyring'
   method_option :key, type: :string, aliases: '-k', desc: 'AWS account key id.'
   method_option :secret, type: :string, aliases: '-s', desc: 'AWS account secret.'
@@ -106,6 +122,14 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     Awskeyring.delete_pair(cred, temp_cred, "# Removing account #{account}")
   end
 
+  desc 'remove-token ACCOUNT', 'Removes a token for ACCOUNT from the keyring'
+  def remove_token(account = nil)
+    account = ask_missing(existing: account, message: 'account name')
+    session_key, session_token = Awskeyring.get_pair(account)
+    session_key, session_token = Awskeyring.delete_expired(session_key, session_token) if session_key
+    Awskeyring.delete_pair(session_key, session_token, "# Removing token for account #{account}") if session_key
+  end
+
   map 'remove-role' => :remove_role
   desc 'remove-role ROLE', 'Removes a ROLE from the keyring'
   def remove_role(role = nil)
@@ -236,7 +260,8 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   def awskeyring(curr, prev)
     comp_line = ENV['COMP_LINE']
     unless comp_line
-      warn "enable autocomplete with 'complete -C /path-to-command/awskeyring awskeyring'"
+      exec_name = File.basename($PROGRAM_NAME)
+      warn "enable autocomplete with 'complete -C /path-to-command/#{exec_name} #{exec_name}'"
       exit 1
     end
     comp_len = comp_line.split.length
@@ -283,19 +308,27 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     [item, nil]
   end
 
-  def put_env_string(account:, key:, secret:, token:)
-    puts "export AWS_ACCOUNT_NAME=\"#{account}\""
-    puts "export AWS_ACCESS_KEY_ID=\"#{key}\""
-    puts "export AWS_ACCESS_KEY=\"#{key}\""
-    puts "export AWS_SECRET_ACCESS_KEY=\"#{secret}\""
-    puts "export AWS_SECRET_KEY=\"#{secret}\""
+  def env_vars(account:, key:, secret:, token:)
+    env_var = {}
+    env_var['AWS_DEFAULT_REGION'] = 'us-east-1' unless ENV['AWS_DEFAULT_REGION']
+    env_var['AWS_ACCOUNT_NAME'] = account
+    env_var['AWS_ACCESS_KEY_ID'] = key
+    env_var['AWS_ACCESS_KEY'] = key
+    env_var['AWS_SECRET_ACCESS_KEY'] = secret
+    env_var['AWS_SECRET_KEY'] = secret
     if token
-      puts "export AWS_SECURITY_TOKEN=\"#{token}\""
-      puts "export AWS_SESSION_TOKEN=\"#{token}\""
-    else
-      puts 'unset AWS_SECURITY_TOKEN'
-      puts 'unset AWS_SESSION_TOKEN'
+      env_var['AWS_SECURITY_TOKEN'] = token
+      env_var['AWS_SESSION_TOKEN'] = token
     end
+    env_var
+  end
+
+  def put_env_string(account:, key:, secret:, token:)
+    env_var = env_vars(account: account, key: key, secret: secret, token: token)
+    env_var.each { |var, value| puts "export #{var}=\"#{value}\"" }
+
+    puts 'unset AWS_SECURITY_TOKEN' unless token
+    puts 'unset AWS_SESSION_TOKEN' unless token
   end
 
   def ask_missing(existing:, message:, secure: false, optional: false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +148,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt