opsworks-cli 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc4c1284a99afeda1c929e55f80643e5a2aad36
-  data.tar.gz: 028437c8044bb146a5ecbfe8febbd125682cdc82
+  metadata.gz: b5ab9727e55ff6564f7d6f82d6cbeee4d55005f9
+  data.tar.gz: 02ce23e2d07cdccc433660baaf45a9ea031d741a
 SHA512:
-  metadata.gz: 16b3ff5a4ceb89c025944ec12ad119e6303bdd763d8a3634ed9d1aca51ff259382f1e61aa062eeba70f01f82c5bec6dcfd2f819a144b1f57646ef9edc032db7f
-  data.tar.gz: cb5f4440c3428f3773747386fdbed8ca4049a38816e895ac0d78816542299f2ea711441f9f3f4fd798065d72eede476ffbb9045859bf573914fad1cb4f80b387
+  metadata.gz: 97b2db684720a9bfc43df78b9ce0ea49afe4687ab40833ac23aeb0f41708807062b5de207736bdb44fe94061c2a945ff42f1d09054b40ac8b28d29650b425595
+  data.tar.gz: 1e2201866045a971e81bc2bc10db039576565ad5d94bd910fe852361542b61065fc1d453c2dea310c8821f2598f55d0b71dbe50d418b612036931420c8b24139

data/lib/opsworks/cli/agent.rb

@@ -11,6 +11,7 @@ require_relative 'subcommands/status'
 require_relative 'subcommands/allow'
 require_relative 'subcommands/lockdown'
 require_relative 'subcommands/upgrade_chef'
+require_relative 'subcommands/config'
 
 module OpsWorks
   module CLI
@@ -24,6 +25,7 @@ module OpsWorks
       include Subcommands::Allow
       include Subcommands::Lockdown
       include Subcommands::UpgradeChef
+      include Subcommands::Config
 
       desc 'version', 'Print OpsWorks CLI version'
       def version

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

@@ -0,0 +1,54 @@
+require 'aws'
+require 'opsworks/stack'
+
+module OpsWorks
+  module CLI
+    module Subcommands
+      module Config
+        # rubocop:disable MethodLength
+        # 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?
+              table = parse_stacks(options).map do |stack|
+                value = stack.custom_json_at(key)
+                [stack.name, value || '(null)']
+              end
+              table.compact!
+              table.sort! { |x, y| x.first <=> y.first }
+              print_table table
+            end
+
+            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?
+              parse_stacks(options).each do |stack|
+                say "Updating #{stack.name}..."
+                stack.set_custom_json_at(key, value)
+              end
+            end
+
+            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?
+              parse_stacks(options).map do |stack|
+                say "Updating #{stack.name}..."
+                stack.set_custom_json_at(key, nil)
+              end
+            end
+          end
+        end
+        # rubocop:enable CyclomaticComplexity
+        # rubocop:enable MethodLength
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 require 'aws'
-require 'opsworks/deployment'
+require 'opsworks/stack'
 
 module OpsWorks
   module CLI

data/lib/opsworks/cli/version.rb

@@ -1,5 +1,5 @@
 module OpsWorks
   module CLI
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/lib/opsworks/stack.rb

@@ -1,17 +1,24 @@
+require 'jsonpath'
+
 require 'opsworks/resource'
 require 'opsworks/app'
 require 'opsworks/instance'
 require 'opsworks/permission'
 
 module OpsWorks
+  # rubocop:disable ClassLength
   class Stack < Resource
-    attr_accessor :id, :name
+    attr_accessor :id, :name, :custom_json
 
     AVAILABLE_CHEF_VERSIONS = %w(0.9 11.4 11.10)
 
     def self.all
       client.describe_stacks.data[:stacks].map do |hash|
-        new(id: hash[:stack_id], name: hash[:name])
+        new(
+          id: hash[:stack_id],
+          name: hash[:name],
+          custom_json: JSON.parse(hash[:custom_json])
+        )
       end
     end
 
@@ -77,6 +84,19 @@ module OpsWorks
       instances.any?(&:online?)
     end
 
+    def custom_json_at(key)
+      JsonPath.new(key).first(custom_json)
+    end
+
+    def set_custom_json_at(key, value)
+      self.custom_json = replace_hash_at_path(custom_json, key, value)
+
+      self.class.client.update_stack(
+        stack_id: id,
+        custom_json: custom_json.to_json
+      )
+    end
+
     private
 
     def initialize_apps
@@ -85,6 +105,24 @@ module OpsWorks
       App.from_collection_response(response)
     end
 
+    # rubocop:disable Eval
+    def replace_hash_at_path(hash, key, value)
+      path = JsonPath.new(key).path
+      if value
+        # REVIEW: Is there a better way to parse the JSON Path and ensure
+        # a value at the location?
+        hash.default_proc = ->(h, k) { h[k] = Hash.new(&h.default_proc) }
+        eval("hash#{path.join('')} = #{value.inspect}")
+      elsif JsonPath.new(key).on(hash).count > 0
+        # Path value is present, but we need to unset it
+        leaf_key = eval(path[-1]).first
+        eval("hash#{path[0...-1].join('')}.delete(#{leaf_key.inspect})")
+      end
+
+      hash
+    end
+    # rubocop:enable Eval
+
     def initialize_permissions
       return [] unless id
       response = self.class.client.describe_permissions(stack_id: id)
@@ -104,4 +142,5 @@ module OpsWorks
       Deployment.from_response(response)
     end
   end
+  # rubocop:enable ClassLength
 end

data/opsworks-cli.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor'
   spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'jsonpath'
 
   spec.add_development_dependency 'aws-keychain-util'
   spec.add_development_dependency 'bundler', '~> 1.5'

data/spec/fabricators/opsworks/stack_fabricator.rb

@@ -1,4 +1,5 @@
 Fabricator(:stack, from: OpsWorks::Stack) do
   id { SecureRandom.uuid }
   name { Fabricate.sequence(:name) { |i| "test-stack#{i}" } }
+  custom_json { { 'env' => { 'FOO' => 'bar' } } }
 end

data/spec/opsworks/cli/subcommands/config_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe OpsWorks::CLI::Agent do
+  context 'config' do
+    let(:custom_json) { { 'env' => { 'FOO' => 'bar' } } }
+    let(:json_path) { 'env.FOO' }
+    let(:stack) { Fabricate(:stack, custom_json: custom_json) }
+    let(:client) { double.as_null_object }
+
+    before { allow(subject).to receive(:say) }
+    before { allow(OpsWorks::Stack).to receive(:all) { [stack] } }
+    before { allow(OpsWorks::Stack).to receive(:client) { client } }
+
+    describe 'config:get' do
+      it 'should print the variable from the stack custom JSON' do
+        expect(subject).to receive(:print_table) do |table|
+          expect(table).to eq [[stack.name, 'bar']]
+        end
+        subject.send('config:get', json_path)
+      end
+
+      it 'should print (null) if the variable is unset' do
+        stack.custom_json = {}
+        expect(subject).to receive(:print_table) do |table|
+          expect(table).to eq [[stack.name, '(null)']]
+        end
+        subject.send('config:get', json_path)
+      end
+    end
+
+    describe 'config:set' do
+      it 'should reset the variable, if it is already set' do
+        expect(client).to receive(:update_stack) do |hash|
+          json = JSON.parse(hash[:custom_json])
+          expect(json['env']['FOO']).to eq 'baz'
+        end
+        subject.send('config:set', json_path, 'baz')
+        expect(stack.custom_json['env']['FOO']).to eq 'baz'
+      end
+
+      it 'should set the variable, if it is unset' do
+        stack.custom_json = {}
+        expect(client).to receive(:update_stack) do |hash|
+          json = JSON.parse(hash[:custom_json])
+          expect(json['env']['FOO']).to eq 'baz'
+        end
+        subject.send('config:set', json_path, 'baz')
+        expect(stack.custom_json['env']['FOO']).to eq 'baz'
+      end
+
+      it 'should leave other variables alone' do
+        stack.custom_json.merge!('other' => 'something')
+        expect(client).to receive(:update_stack) do |hash|
+          json = JSON.parse(hash[:custom_json])
+          expect(json['env']['FOO']).to eq 'baz'
+          expect(json['other']).to eq 'something'
+        end
+        subject.send('config:set', json_path, 'baz')
+        expect(stack.custom_json['env']['FOO']).to eq 'baz'
+        expect(stack.custom_json['other']).to eq 'something'
+      end
+    end
+
+    describe 'config:unset' do
+      it 'should unset the variable' do
+        expect(client).to receive(:update_stack) do |hash|
+          json = JSON.parse(hash[:custom_json])
+          expect(json['env'].keys).not_to include('FOO')
+        end
+        subject.send('config:unset', json_path)
+        expect(stack.custom_json['env'].keys).not_to include('FOO')
+      end
+
+      it 'should leave other variables alone' do
+        stack.custom_json['env'].merge!('OTHER' => 'something')
+        expect(client).to receive(:update_stack) do |hash|
+          json = JSON.parse(hash[:custom_json])
+          expect(json['env'].keys).not_to include('FOO')
+        end
+        subject.send('config:unset', json_path)
+        expect(stack.custom_json['env']).to eq('OTHER' => 'something')
+      end
+
+      it 'should work even with nil values' do
+        stack.custom_json['env'] = { 'FOO' => nil }
+        expect(client).to receive(:update_stack) do |hash|
+          json = JSON.parse(hash[:custom_json])
+          expect(json['env'].keys).not_to include('FOO')
+        end
+        subject.send('config:unset', json_path)
+        expect(stack.custom_json['env'].keys).not_to include('FOO')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsworks-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jsonpath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-keychain-util
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +172,7 @@ files:
 - lib/opsworks/cli/helpers/keychain.rb
 - lib/opsworks/cli/helpers/options.rb
 - lib/opsworks/cli/subcommands/allow.rb
+- lib/opsworks/cli/subcommands/config.rb
 - lib/opsworks/cli/subcommands/deploy.rb
 - lib/opsworks/cli/subcommands/exec.rb
 - lib/opsworks/cli/subcommands/lockdown.rb
@@ -177,6 +192,7 @@ files:
 - spec/fabricators/opsworks/stack_fabricator.rb
 - spec/opsworks/cli/agent_spec.rb
 - spec/opsworks/cli/subcommands/allow_spec.rb
+- spec/opsworks/cli/subcommands/config_spec.rb
 - spec/opsworks/cli/subcommands/deploy_spec.rb
 - spec/opsworks/cli/subcommands/exec_spec.rb
 - spec/opsworks/cli/subcommands/lockdown_spec.rb
@@ -213,6 +229,7 @@ test_files:
 - spec/fabricators/opsworks/stack_fabricator.rb
 - spec/opsworks/cli/agent_spec.rb
 - spec/opsworks/cli/subcommands/allow_spec.rb
+- spec/opsworks/cli/subcommands/config_spec.rb
 - spec/opsworks/cli/subcommands/deploy_spec.rb
 - spec/opsworks/cli/subcommands/exec_spec.rb
 - spec/opsworks/cli/subcommands/lockdown_spec.rb