jackal-cfn 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4082d5d4a5132d52521ed5904e2f94aa18602848
-  data.tar.gz: d04357c2f76bf711546f6013dac469f2961842f9
+  metadata.gz: 2a04e966cfce6d4c347d5ff5d227a53fe7a71245
+  data.tar.gz: bf1d3a7f3b402780bd0d4fbe1ff0a86b7f2f35d0
 SHA512:
-  metadata.gz: 9b2206efcf53158bc40e26ab9ddb86152d815c2981f6a3fbed99a4b0ed5df2b965879652d0f069dec0b2b1c7dfa1f2b1fa6acf08e552a673599981957f952bb8
-  data.tar.gz: c209041a994159fa81d27be044178fa6ee90b2dc52de92d808652bf1670fcebb8cdb1a258dd2a38769793c04bf2c8819940c722bebdf41e97d74b6f570731e31
+  metadata.gz: 820460a2f614387d2237923f7bbafa28854ef7e325f461a5ff167de3a70a048c91733d859571ecb9865f462d535570cefdb048798668db935d74f3aa2e47679d
+  data.tar.gz: 1ead2a327e6c07abf88038b234721ab5f4eaba20bd07531fd7891ec2c4443bf14bec4319616c925ec684ba01e87126029a853bb92cf9b1fcbdfc28693a6d95e9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.2.0
+* Move builtin resources under single namespace
+* Add custom failure wrap to resource to provide auto failure notification
+* Fix endpoint url response in extractor resource
+
 # v0.1.6
 * Isolate event and resource to simple handle format and forward
 * Move builtin custom resources within new module `CfnTools`

data/lib/jackal-cfn/event.rb

@@ -109,12 +109,11 @@ module Jackal
           :cfn_event => data_payload
         )
         if(config[:reprocess])
-          my_input = "#{source_prefix}_input"
-          debug "Reprocessing payload through current source (#{my_input})"
-          Carnivore::Supervisor.supervisor[my_input].transmit(payload)
+          debug "Reprocessing payload through current source (#{destination(:input)})"
+          Carnivore::Supervisor.supervisor[destination(:input)].transmit(payload)
           message.confirm!
         else
-          completed(payload, message)
+          job_completed(:jackal_cfn, payload, message)
         end
       end
 

data/lib/jackal-cfn/formatter/chef_cleanup.rb

@@ -0,0 +1,48 @@
+require 'jackal'
+
+module Jackal
+  module Cfn
+    module Formatter
+
+      # Add cleanup information for chef instances
+      class ChefCleanup < Jackal::Formatter
+
+        # Source service
+        SOURCE = :cfn
+        # Destination service
+        DESTINATION = :commander
+
+        # Format payload to enable knife scrubbing via
+        # commander
+        #
+        # @param payload [Smash]
+        def format(payload)
+          event = payload.get(:data, :cfn_event)
+          if(valid_event?(event))
+            stack_id = payload.get(:data, :cfn_event, :stack_id)
+            if(stack_id)
+              debug "Found stack ID information. Setting commander scrub commands. (Stack ID: #{stack_id})"
+              actions = payload.fetch(:data, :commander, :actions, [])
+              actions << Smash.new(
+                :name => app_config.fetch(:cfn, :formatter, :chef_cleanup_command, :chef_cleanup),
+                :arguments => stack_id
+              )
+              payload.set(:data, :commander, :actions, actions)
+            end
+          end
+        end
+
+        # Determine validity of event
+        #
+        # @param event [Smash]
+        # @return [Truthy, Falsey]
+        def valid_event?(event)
+          event[:resource_status] == 'DELETE_COMPLETE' &&
+            event[:resource_type] == app_config.fetch(:cfn, :formatter, :stack_resource_type, 'AWS::CloudFormation::Stack')
+        end
+
+      end
+
+    end
+  end
+end

data/lib/jackal-cfn/resource/ami_manager.rb

@@ -1,7 +1,7 @@
 require 'jackal-cfn'
 
 module Jackal
-  module CfnTools
+  module Cfn
     # Manage AMI Resources
     #
     # Expected resource:
@@ -37,7 +37,7 @@ module Jackal
       #
       # @param message [Carnivore::Message]
       def execute(message)
-        failure_wrap do |payload|
+        failure_wrap(message) do |payload|
           cfn_resource = rekey_hash(payload.get(:data, :cfn_resource))
           properties = rekey_hash(cfn_resource[:resource_properties])
           parameters = rekey_hash(properties[:parameters])
@@ -54,7 +54,7 @@ module Jackal
             response['Reason'] = 'Unknown request type received'
           end
           respond_to_stack(cfn_response, cfn_resource[:response_url])
-          completed(payload, message)
+          job_completed(:jackal_cfn, payload, message)
         end
       end
 

data/lib/jackal-cfn/resource/hash_extractor.rb

@@ -1,7 +1,7 @@
 require 'jackal-cfn'
 
 module Jackal
-  module CfnTools
+  module Cfn
     # Extract value from hash
     #
     # Expected resource:
@@ -20,7 +20,7 @@ module Jackal
       #
       # @param message [Carnivore::Message]
       def execute(message)
-        failure_wrap do |payload|
+        failure_wrap(message) do |payload|
           cfn_resource = rekey_hash(payload.get(:data, :cfn_resource))
           properties = rekey_hash(cfn_resource[:resource_properties])
           parameters = rekey_hash(properties[:parameters])
@@ -36,8 +36,8 @@ module Jackal
             return_value = MultiJson.dump(return_value)
           end
           cfn_response['Data']['Payload'] = return_value
-          respond_to_stack(cfn_response, payload[:response_url])
-          completed(payload, message)
+          respond_to_stack(cfn_response, cfn_resource[:response_url])
+          job_completed(:jackal_cfn, payload, message)
         end
       end
 

data/lib/jackal-cfn/resource.rb

@@ -87,9 +87,7 @@ module Jackal
           'StackId' => cfn_resource[:stack_id],
           'RequestId' => cfn_resource[:request_id],
           'Status' => 'SUCCESS',
-          'Data' => Smash.new(
-            'Reason' => 'None'
-          )
+          'Data' => Smash.new
         )
       end
 
@@ -133,12 +131,8 @@ module Jackal
         payload = super
         if(self.class == Jackal::Cfn::Resource)
           begin
-            if(payload['Body'])
-              payload = Smash.new(
-                MultiJson.load(
-                  payload.fetch('Body', 'Message', payload)
-                )
-              )
+            if(payload['Body'] && payload['Body']['Message'])
+              payload = MultiJson.load(payload.get('Body', 'Message')).to_smash
               payload = transform_parameters(payload)
               payload[:origin_type] = message[:message].get('Body', 'Type')
               payload[:origin_subject] = message[:message].get('Body', 'Subject')
@@ -160,18 +154,36 @@ module Jackal
       def execute(message)
         data_payload = unpack(message)
         payload = new_payload(
-          config[:name],
+          config.fetch(:name, :jackal_cfn),
           :cfn_resource => data_payload
         )
         if(config[:reprocess])
-          my_input = "#{source_prefix}_input"
-          Carnivore::Supervisor.supervisor[my_input].transmit(payload)
+          Carnivore::Supervisor.supervisor[destination(:input)].transmit(payload)
           message.confirm!
         else
           completed(payload, message)
         end
       end
 
+      # Custom wrap to send resource failure
+      #
+      # @param message [Carnivore::Message]
+      def failure_wrap(message)
+        begin
+          payload = unpack(message)
+          yield payload
+        rescue => e
+          error "Unexpected error encountered processing custom resource - #{e.class}: #{e}"
+          debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+          cfn_resource = payload.get(:data, :cfn_resource)
+          cfn_response = build_response(cfn_resource)
+          cfn_response['Status'] = 'FAILED'
+          cfn_response['Reason'] = "Unexpected error encountered [#{e}]"
+          respond_to_stack(cfn_response, cfn_resource[:response_url])
+          message.confirm!
+        end
+      end
+
     end
   end
 end

data/lib/jackal-cfn/utils.rb

@@ -25,7 +25,7 @@ module Jackal
       # @param v [String]
       # @return [Symbol]
       def snakecase(v)
-        v.to_s.gsub(/(?<![A-Z])([A-Z])/, '_\1').sub(/^_/, '').downcase.to_sym
+        Bogo::Utility.snake(v)
       end
 
     end

data/lib/jackal-cfn/version.rb

@@ -1,6 +1,6 @@
 module Jackal
   module Cfn
     # Current version
-    VERSION = Gem::Version.new('0.1.6')
+    VERSION = Gem::Version.new('0.2.0')
   end
 end

data/lib/jackal-cfn.rb

@@ -7,10 +7,8 @@ module Jackal
     autoload :Event, 'jackal-cfn/event'
     autoload :Resource, 'jackal-cfn/resource'
     autoload :Utils, 'jackal-cfn/utils'
-  end
 
-  # Tools
-  module CfnTools
+    # Provided custom resources
     autoload :HashExtractor, 'jackal-cfn/resource/hash_extractor'
     autoload :AmiManager, 'jackal-cfn/resource/ami_manager'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-cfn
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal
@@ -51,6 +51,7 @@ files:
 - jackal-cfn.gemspec
 - lib/jackal-cfn.rb
 - lib/jackal-cfn/event.rb
+- lib/jackal-cfn/formatter/chef_cleanup.rb
 - lib/jackal-cfn/resource.rb
 - lib/jackal-cfn/resource/ami_manager.rb
 - lib/jackal-cfn/resource/hash_extractor.rb
@@ -83,4 +84,3 @@ signing_key:
 specification_version: 4
 summary: Message processing helper
 test_files: []
-has_rdoc: