opsworks-cli 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 068100324156cfac2d98f7ac4121e6839f667488
-  data.tar.gz: a2b80924cbd8a9e716fd6dbdee0424045734a009
+  metadata.gz: 61ce9cc1bf75c7a559b0adb4a905ef560706df8a
+  data.tar.gz: 3411f737526fc1212a710a0a63eba9842065c244
 SHA512:
-  metadata.gz: 1650fcd952c0313cff7b82504889ecf5356694c1af528596cb6a6ee8d8befef4abd6c0c30b7c42f758cc4e885877a86481093923fe7c22bd00cb892a80159947
-  data.tar.gz: c90d208c0729a2c9d0d8144e6f28b726de108f14ff3a10230baf5910a8e984a8fb2748083d29538158946359cd46c8d0c449ce09197ea5b68f37742ab3642193
+  metadata.gz: f7111a5b4d35f7f402b427ac916b7de4d75073667b62286de98ff1317adb6d9cd26d67165cd8a895dadacf06d6ce154a2bc5a5d82e97e4e98a96fdafc71ecae6
+  data.tar.gz: c0d2f3e0431d8bd6a2fbcba477508f3696f88c0b189bcd42d1be00e60c48120224e93cda35621d5c664f6edd65cfef86dc5a0d2156ba311b83128f020d5df008

data/README.md

@@ -19,13 +19,7 @@ The gem expects to have access to your AWS access key ID and secret access key.
     export AWS_ACCESS_KEY_ID=...
     export AWS_SECRET_ACCESS_KEY=...
 
-If you're on OS X, you may also use the [aws-keychain-util](https://github.com/zwily/aws-keychain-util) to password-protect these credentials within the OS X Keychain. To do this, follow the instructions in the gem's README:
-
-    gem install aws-keychain-util
-    aws-creds init
-    aws-creds add
-
-When you add credentials, make sure to name the account `default`.
+Second (the preferred option), you may use the [Omnivault](https://github.com/aptible/omnivault) gem to store and configure your credentials automatically, via your choice of password-protected vault (Apple Keychain or pws).
 
 ## Usage
 

data/lib/opsworks/cli/agent.rb

@@ -1,7 +1,7 @@
 require 'thor'
 require 'aws'
 
-require_relative 'helpers/keychain'
+require_relative 'helpers/credentials'
 require_relative 'helpers/options'
 
 require_relative 'subcommands/update'
@@ -16,6 +16,9 @@ module OpsWorks
     class Agent < Thor
       include Thor::Actions
 
+      include Helpers::Credentials
+      include Helpers::Options
+
       include Subcommands::Update
       include Subcommands::UpgradeChef
       include Subcommands::Recipes

data/lib/opsworks/cli/helpers/credentials.rb

@@ -0,0 +1,18 @@
+require 'omnivault'
+
+module OpsWorks
+  module CLI
+    module Helpers
+      module Credentials
+        def fetch_credentials
+          vault = Omnivault.autodetect
+          vault.configure_aws!
+        end
+
+        def env_credentials?
+          !!(ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY'])
+        end
+      end
+    end
+  end
+end

data/lib/opsworks/cli/subcommands/apps.rb

@@ -13,7 +13,7 @@ module OpsWorks
             option :stack, type: :array
             option :timeout, type: :numeric, default: 300
             define_method 'apps:deploy' do |name|
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
                 next unless (app = stack.find_app_by_name(name))
@@ -35,7 +35,7 @@ module OpsWorks
                  'Display the most recent deployment of an app'
             option :stack, type: :array
             define_method 'apps:status' do |name|
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
 
               table = parse_stacks(options).map do |stack|
                 next unless (app = stack.find_app_by_name(name))
@@ -64,7 +64,7 @@ module OpsWorks
 
               fail 'Git URL not yet supported' if options[:git_url]
 
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options)
 
               stacks.each do |stack|

data/lib/opsworks/cli/subcommands/config.rb

@@ -9,13 +9,10 @@ module OpsWorks
         # rubocop:disable CyclomaticComplexity
         def self.included(thor)
           thor.class_eval do
-            include Helpers::Keychain
-            include Helpers::Options
-
             desc 'config:get KEY [--stack STACK]', 'Get a single config value'
             option :stack, type: :array
             define_method 'config:get' do |key|
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               table = parse_stacks(options).map do |stack|
                 value = stack.custom_json_at(key)
                 [stack.name, value || '(null)']
@@ -28,7 +25,7 @@ module OpsWorks
             desc 'config:set KEY VALUE [--stack STACK]', 'Set a config value'
             option :stack, type: :array
             define_method 'config:set' do |key, value|
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               parse_stacks(options).each do |stack|
                 say "Updating #{stack.name}..."
                 stack.set_custom_json_at(key, value)
@@ -38,7 +35,7 @@ module OpsWorks
             desc 'config:unset KEY [--stack STACK]', 'Unset a config value'
             option :stack, type: :array
             define_method 'config:unset' do |key|
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               parse_stacks(options).map do |stack|
                 say "Updating #{stack.name}..."
                 stack.set_custom_json_at(key, nil)

data/lib/opsworks/cli/subcommands/iam.rb

@@ -14,7 +14,7 @@ module OpsWorks
             option :ssh, type: :boolean, default: true
             option :sudo, type: :boolean, default: true
             define_method 'iam:allow' do |user|
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               stacks.each do |stack|
                 permission = stack.find_permission_by_user(user)
@@ -27,7 +27,7 @@ module OpsWorks
             desc 'iam:lockdown [--stack STACK]', 'Remove all stack permissions'
             option :stack, type: :array
             define_method 'iam:lockdown' do
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               stacks.each do |stack|
                 say "Locking down #{stack.name}..."

data/lib/opsworks/cli/subcommands/recipes.rb

@@ -12,7 +12,7 @@ module OpsWorks
             option :stack, type: :array
             option :timeout, type: :numeric, default: 300
             define_method 'recipes:run' do |recipe|
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
                 say "Executing recipe on #{stack.name}..."
@@ -32,7 +32,7 @@ module OpsWorks
                  'Add a recipe to a given layer and lifecycle event'
             option :stack, type: :array
             define_method 'recipes:add' do |layername, event, recipe|
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options)
               stacks.each do |stack|
                 layer = stack.layers.find { |l| l.shortname == layername }

data/lib/opsworks/cli/subcommands/update.rb

@@ -9,14 +9,11 @@ module OpsWorks
         # rubocop:disable CyclomaticComplexity
         def self.included(thor)
           thor.class_eval do
-            include Helpers::Keychain
-            include Helpers::Options
-
             desc 'update [--stack STACK]', 'Update OpsWorks custom cookbooks'
             option :stack, type: :array
             option :timeout, type: :numeric, default: 300
             def update
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
                 say "Updating #{stack.name}..."

data/lib/opsworks/cli/subcommands/upgrade_chef.rb

@@ -9,15 +9,12 @@ module OpsWorks
         # rubocop:disable CyclomaticComplexity
         def self.included(thor)
           thor.class_eval do
-            include Helpers::Keychain
-            include Helpers::Options
-
             desc 'upgrade-chef [--stack STACK]', 'Upgrade Chef version'
             option :stack, type: :array
             option :version
             option :manage_berkshelf, type: :boolean, default: false
             def upgrade_chef
-              fetch_keychain_credentials unless env_credentials?
+              fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               version = OpsWorks::Stack.latest_chef_version
               stacks.each do |stack|

data/lib/opsworks/cli/version.rb

@@ -1,5 +1,5 @@
 module OpsWorks
   module CLI
-    VERSION = '0.3.4'
+    VERSION = '0.3.5'
   end
 end

data/opsworks-cli.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk', '~> 1.64'
   spec.add_dependency 'jsonpath'
   spec.add_dependency 'activesupport'
+  spec.add_dependency 'omnivault'
 
-  spec.add_development_dependency 'aws-keychain-util'
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'aptible-tasks'
   spec.add_development_dependency 'rake'

data/spec/spec_helper.rb

@@ -5,19 +5,13 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'opsworks/cli'
 
 require 'fabrication'
+require 'omnivault'
 
 RSpec.configure do |config|
   config.before do
     allow(AWS::OpsWorks::Client).to receive(:new) { double.as_null_object }
     allow(AWS).to receive(:config)
 
-    begin
-      require 'aws-keychain-util/credential_provider'
-      allow(AwsKeychainUtil::CredentialProvider).to receive(:new) do
-        double.as_null_object
-      end
-    rescue LoadError
-      nil
-    end
+    allow(Omnivault).to receive(:autodetect) { double.as_null_object }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsworks-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-keychain-util
+  name: omnivault
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -183,7 +183,7 @@ files:
 - lib/opsworks/app.rb
 - lib/opsworks/cli.rb
 - lib/opsworks/cli/agent.rb
-- lib/opsworks/cli/helpers/keychain.rb
+- lib/opsworks/cli/helpers/credentials.rb
 - lib/opsworks/cli/helpers/options.rb
 - lib/opsworks/cli/subcommands/apps.rb
 - lib/opsworks/cli/subcommands/config.rb

data/lib/opsworks/cli/helpers/keychain.rb

@@ -1,25 +0,0 @@
-module OpsWorks
-  module CLI
-    module Helpers
-      module Keychain
-        KEYCHAIN = 'aws'
-
-        def fetch_keychain_credentials(account = 'default')
-          require 'aws-keychain-util/credential_provider'
-
-          provider = AwsKeychainUtil::CredentialProvider.new(
-            account, KEYCHAIN
-          )
-          AWS.config(credential_provider: provider) if provider.set?
-        rescue LoadError
-          # Keychain utility is optional and only relevant on OS X
-          nil
-        end
-
-        def env_credentials?
-          !!(ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY'])
-        end
-      end
-    end
-  end
-end