awskeyring 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9871d5b6d30539c178819acbd9142004c85443b7
-  data.tar.gz: fb497258e4204746dae39bdd4d5af529de0d354b
+  metadata.gz: d9ba390ba84576e3ec79b6e60fc5da80363faa36
+  data.tar.gz: 4a6352ace35cad42d6a11fd0624646d958211e1c
 SHA512:
-  metadata.gz: b04ba2c7c9f369aba46e44f8621f447e79235ff4a42a5e225e80e2353d3cc22a8d32b11017639a415e7bc1824b082c09917e994cca9798ac93b4688c945e3112
-  data.tar.gz: a0fcdbfbce47d4e6e876f0e26766b3dd2f8f1a6d79fc913ceb11f8b63ae2099de82a070ecb7bcb373a715830e6f3fc9daaa20a8831b0493dd01d9d95ee80e819
+  metadata.gz: ec365e5dbe6349195131b07fb65ef7665d3c310894e5a0a08f1f58bf3fbcba0586ec385d46b1c1b1c7c095cb76c792bb1855c44ed01c590825532453f5f459d0
+  data.tar.gz: 67adf2badf660187fafad8ee55f8a743d312abc4fab491f1181fb54736b8530c2886275e37990971073970f45d0c2606a866eca8806949b862c3f1cb73d1437e

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.10.0](https://github.com/vibrato/awskeyring/tree/v0.10.0) (2019-04-24)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.9.0...v0.10.0)
+
+**Implemented enhancements:**
+
+- Add --unset flag to env command [\#44](https://github.com/vibrato/awskeyring/pull/44) ([tristanmorgan](https://github.com/tristanmorgan))
+
 ## [v0.9.0](https://github.com/vibrato/awskeyring/tree/v0.9.0) (2019-04-09)
 [Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.8.1...v0.9.0)
 

data/i18n/en.yml

@@ -47,6 +47,7 @@ en:
     path: 'The service PATH to open.'
     role: 'The ROLE to assume.'
     secret: 'AWS account secret.'
+    unset: 'Unset environment variables.'
   message:
     keychain: 'Name for new keychain (default: awskeyring)'
     account: 'account name'

data/lib/awskeyring/awsapi.rb

@@ -20,6 +20,16 @@ module Awskeyring
     # AWS Signin url
     AWS_SIGNIN_URL = 'https://signin.aws.amazon.com/federation'.freeze
 
+    # AWS Env vars
+    AWS_ENV_VARS = %w[
+      AWS_ACCESS_KEY_ID
+      AWS_ACCESS_KEY
+      AWS_SECRET_ACCESS_KEY
+      AWS_SECRET_KEY
+      AWS_SECURITY_TOKEN
+      AWS_SESSION_TOKEN
+    ].freeze
+
     # Twelve hours in seconds
     TWELVE_HOUR = (60 * 60 * 12)
     # One hour in seconds
@@ -101,6 +111,35 @@ module Awskeyring
       )
     end
 
+    # Generates Environment Variables for the AWS CLI
+    #
+    # @param [Hash] params including
+    #    [String] account The aws_access_key_id
+    #    [String] secret The aws_secret_access_key
+    #    [String] token The aws_session_token
+    # @return [Hash] env_var hash
+    def self.get_env_array(params = {})
+      env_var = {}
+      env_var['AWS_DEFAULT_REGION'] = 'us-east-1' unless region
+      env_var['AWS_ACCOUNT_NAME'] = params[:account] if params[:account]
+
+      if params[:key]
+        env_var['AWS_ACCESS_KEY_ID'] = params[:key]
+        env_var['AWS_ACCESS_KEY'] = params[:key]
+      end
+
+      if params[:secret]
+        env_var['AWS_SECRET_ACCESS_KEY'] = params[:secret]
+        env_var['AWS_SECRET_KEY'] = params[:secret]
+      end
+
+      if params[:token]
+        env_var['AWS_SECURITY_TOKEN'] = params[:token]
+        env_var['AWS_SESSION_TOKEN'] = params[:token]
+      end
+      env_var
+    end
+
     # Verify Credentials are active and valid
     #
     # @param [String] key The aws_access_key_id

data/lib/awskeyring/version.rb

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

data/lib/awskeyring_command.rb

@@ -65,13 +65,19 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
 
   desc 'env ACCOUNT', I18n.t('env.desc')
   method_option 'no-token', type: :boolean, aliases: '-n', desc: I18n.t('method_option.notoken'), default: false
+  method_option 'unset', type: :boolean, aliases: '-u', desc: I18n.t('method_option.unset'), default: false
   # Print Env vars
   def env(account = nil)
-    account = ask_check(
-      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(cred)
+    if options['unset']
+      put_env_string(account: nil, key: nil, secret: nil, token: nil)
+    else
+      account = ask_check(
+        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(cred)
+    end
   end
 
   desc 'json ACCOUNT', I18n.t('json.desc')
@@ -100,7 +106,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       exit 1
     end
     cred = age_check_and_get(account: account, no_token: options['no-token'])
-    env_vars = env_vars(cred)
+    env_vars = Awskeyring::Awsapi.get_env_array(cred)
     begin
       pid = Process.spawn(env_vars, command.join(' '))
       Process.wait pid
@@ -419,27 +425,10 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       self.class.all_commands[command].options.values.map(&:switch_name)
   end
 
-  def env_vars(cred)
-    env_var = {}
-    env_var['AWS_DEFAULT_REGION'] = 'us-east-1' unless Awskeyring::Awsapi.region
-    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(cred)
-    env_var = env_vars(cred)
+    env_var = Awskeyring::Awsapi.get_env_array(cred)
     env_var.each { |var, value| puts "export #{var}=\"#{value}\"" }
-
-    puts 'unset AWS_SECURITY_TOKEN' unless cred[:token]
-    puts 'unset AWS_SESSION_TOKEN' unless cred[:token]
+    Awskeyring::Awsapi::AWS_ENV_VARS.each { |key| puts "unset #{key}" unless env_var.key?(key) }
   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.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam