awskeyring 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ebe6ee9bb5814b1566494d8be14c6b789b86721
-  data.tar.gz: 59be7211203c6a51d309b92c66ea83d83ee6b046
+  metadata.gz: 26f6f9112f7dd321eb160034017bdcfde89c3ea9
+  data.tar.gz: 4d0c3eda8ef3301077925a69d1da7b6536c12229
 SHA512:
-  metadata.gz: e2d948135aac4bc9b5e1b13899060934ed8333fe991587de39a50d0becb16f45c3fa53c0674e844ad6212e404f91354e0cb43dd7dbc3d3d7f3c81c2e025e436c
-  data.tar.gz: 83844924a2145ef993f60afba15130b7f1526611419b9854ddd9e30a3295f837471ec1d4a942e361d4482347fa0b0054cb60db9baa818cc5b8e44c4ad357433c
+  metadata.gz: f7e7822873229041ec91de08fc4c073cafc8aee5d1e98bb4cad0424954196985f4679f23d041f035fe228359b411b9e6a80dcc2ba7c2d89c97591106b3f960bd
+  data.tar.gz: de9945806b4a310e6ba60e486b00aeb40b1857a6649ff0e424cec36eb8710607a7e3abb77d01fbf486608b59e6c98a2c485c5d395bb60e5a0177feaf7d061e5d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v0.7.2](https://github.com/vibrato/awskeyring/tree/v0.7.2) (2018-12-17)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.7.1...v0.7.2)
+
+**Fixed bugs:**
+
+- Validate that account doesn't already exists. [\#40](https://github.com/vibrato/awskeyring/pull/40) ([tristanmorgan](https://github.com/tristanmorgan))
+- Check for COMMAND param to exec. [\#38](https://github.com/vibrato/awskeyring/pull/38) ([tristanmorgan](https://github.com/tristanmorgan))
+
 ## [v0.7.1](https://github.com/vibrato/awskeyring/tree/v0.7.1) (2018-12-03)
 [Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.7.0...v0.7.1)
 

data/i18n/en.yml

@@ -68,6 +68,7 @@ en:
     delrole: '# Removing role %{role}'
     deltoken: '# Removing token for account %{account}'
     delexpired: '# Removing expired session credentials'
+    exec: '# COMMAND not provided'
     missing: '# Config missing, run `%{bin} initialise` to recreate.'
     rotate: '# You have two access keys for account %{account}'
     temporary: '# Using temporary session credentials.'

data/lib/awskeyring.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'keychain'
+require 'awskeyring/validate'
 
 # Awskeyring Module,
 # gives you an interface to access keychains and items.
@@ -284,8 +285,19 @@ module Awskeyring # rubocop:disable Metrics/ModuleLength
   #
   # @param [String] account_name the associated account name.
   def self.account_exists(account_name)
+    Awskeyring::Validate.account_name(account_name)
     raise 'Account does not exist' unless list_account_names.include?(account_name)
 
     account_name
   end
+
+  # Validate account does not exists
+  #
+  # @param [String] account_name the associated account name.
+  def self.account_not_exists(account_name)
+    Awskeyring::Validate.account_name(account_name)
+    raise 'Account already exists' if list_account_names.include?(account_name)
+
+    account_name
+  end
 end

data/lib/awskeyring/version.rb

@@ -1,4 +1,4 @@
 module Awskeyring
   # The Gems version number
-  VERSION = '0.7.1'.freeze
+  VERSION = '0.7.2'.freeze
 end

data/lib/awskeyring_command.rb

@@ -70,12 +70,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     cred = age_check_and_get(account: account, no_token: options['no-token'])
-    put_env_string(
-      account: cred[:account],
-      key: cred[:key],
-      secret: cred[:secret],
-      token: cred[:token]
-    )
+    put_env_string(cred)
   end
 
   desc 'json ACCOUNT', I18n.t('json.desc')
@@ -99,15 +94,20 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   method_option 'no-token', type: :boolean, aliases: '-n', desc: I18n.t('method_option.notoken'), default: false
   # execute an external command with env set
   def exec(account, *command)
+    if command.empty?
+      warn I18n.t('message.exec')
+      exit 1
+    end
     cred = age_check_and_get(account: account, no_token: options['no-token'])
-    env_vars = env_vars(
-      account: cred[:account],
-      key: cred[:key],
-      secret: cred[:secret],
-      token: cred[:token]
-    )
-    pid = Process.spawn(env_vars, command.join(' '))
-    Process.wait pid
+    env_vars = env_vars(cred)
+    begin
+      pid = Process.spawn(env_vars, command.join(' '))
+      Process.wait pid
+      $CHILD_STATUS
+    rescue Errno::ENOENT => err
+      warn err.to_s
+      exit 1
+    end
   end
 
   desc 'add ACCOUNT', I18n.t('add.desc')
@@ -118,7 +118,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # Add an Account
   def add(account = nil) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_not_exists)
     )
     key = ask_check(
       existing: options[:key], message: I18n.t('message.key'), validator: Awskeyring::Validate.method(:access_key)
@@ -418,27 +418,27 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       self.class.all_commands[command].options.values.map(&:switch_name)
   end
 
-  def env_vars(account:, key:, secret:, token:)
+  def env_vars(cred)
     env_var = {}
     env_var['AWS_DEFAULT_REGION'] = 'us-east-1' unless Awskeyring::Awsapi.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
-      env_var['AWS_SECURITY_TOKEN'] = token
-      env_var['AWS_SESSION_TOKEN'] = token
+    env_var['AWS_ACCOUNT_NAME'] = cred[:account]
+    env_var['AWS_ACCESS_KEY_ID'] = cred[:key]
+    env_var['AWS_ACCESS_KEY'] = cred[:key]
+    env_var['AWS_SECRET_ACCESS_KEY'] = cred[:secret]
+    env_var['AWS_SECRET_KEY'] = cred[:secret]
+    if cred[:token]
+      env_var['AWS_SECURITY_TOKEN'] = cred[:token]
+      env_var['AWS_SESSION_TOKEN'] = cred[: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)
+  def put_env_string(cred)
+    env_var = env_vars(cred)
     env_var.each { |var, value| puts "export #{var}=\"#{value}\"" }
 
-    puts 'unset AWS_SECURITY_TOKEN' unless token
-    puts 'unset AWS_SESSION_TOKEN' unless token
+    puts 'unset AWS_SECURITY_TOKEN' unless cred[:token]
+    puts 'unset AWS_SESSION_TOKEN' unless cred[:token]
   end
 
   def ask_check(existing:, message:, secure: false, optional: false, validator: nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam