jackal-cfn 0.2.14 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1ead03a002146de19a393af5ee2841b7db8bcb7
-  data.tar.gz: 6731c62c19638361c3fc25ebdf01a355a47fbe53
+  metadata.gz: c074ac269a3949f7b1e9554a1d3d301d7656195a
+  data.tar.gz: 75fd37b327ca6ee8c562ed0f2bfc4be4fb1e97a6
 SHA512:
-  metadata.gz: 9d733f6e773a969bf2c24303c5a496e113a557d7fc335838d8e5f5fac4410f0305cd5a5c21966892c3397681650c42fc216bca23d603defa9ae1c8bc875d8bb8
-  data.tar.gz: badd616f99027ca1d8ed975fbcf491fb42f7b536b3dfb36a5755c5d1f3ee8123a7c71f6dc4677d47bbad1bcbd9545d4d3e40023d0d73f173bbf0b46a189575d6
+  metadata.gz: 4f8d1552c3b1fc950357808137c461f0f21b06db494a9660d9cd9fbc67e69820dc503b8491e9a6d6b6ce3812d6a0274c88453ded523680672a282146764119b2
+  data.tar.gz: e6441d30aaaaa8fba8f69b40c157e38499d5c3530ac5f730d2f932d15784c9e33fee47b08534f79f61851d087785987f10f3555ea431fcda332313b6d5f3a950

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.16
+* [feature] Allow image re-registration when options provided
+* [enhancement] Add resource scrubber helper
+
 # v0.2.14
 * [fix] Update variable name used in stack resource name construction
 

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

@@ -15,7 +15,10 @@ module Jackal
     #         "NoReboot": Boolean,
     #         "BlockDeviceMappings": Array,
     #         "HaltInstance": Boolean,
-    #         "Region": String
+    #         "Region": String,
+    #         "Register" : {
+    #           REGISTER_OPTIONS
+    #         }
     #       }
     #     }
     #   }
@@ -58,12 +61,12 @@ module Jackal
           poll_for_available = false
           case cfn_resource[:request_type].to_sym
           when :create
-            generate_ami(cfn_response, parameters)
+            generate_ami(message, cfn_response, parameters)
             poll_for_available = true
           when :update
             destroy_ami(cfn_response, cfn_resource, parameters)
             unless(cfn_response['Status'] == 'FAILED')
-              generate_ami(cfn_response, parameters)
+              generate_ami(message, cfn_response, parameters)
               poll_for_available = true
             end
           when :delete
@@ -99,6 +102,7 @@ module Jackal
       def poll_ami_available(message, region, ami_id)
         available = false
         pause_interval = config.fetch(:ami_register_interval, 5).to_i
+
         if(ami_id)
           until(available)
             debug "Pausing for AMI to become available: #{ami_id} (wait time: #{pause_interval})"
@@ -137,10 +141,11 @@ module Jackal
 
       # Create new AMI using provided EC2 instance
       #
+      # @param message [Carnivore::Message]
       # @param response [Hash] cfn response
       # @param parameters [Hash] resource parameters
       # @return [Hash] updated response hash
-      def generate_ami(response, parameters)
+      def generate_ami(message, response, parameters)
         begin
           result = compute_api(parameters[:region]).create_image(
             parameters[:instance_id],
@@ -149,7 +154,33 @@ module Jackal
             parameters[:no_reboot],
             :block_device_mappings => parameters.fetch(:block_device_mappings, [])
           )
-          info "New AMI registered: #{result.body['imageId']}"
+          info "New AMI created: #{result.body['imageId']}"
+          if(parameters[:register])
+            poll_ami_available(message, parameters[:region], result.body['imageId'])
+            register_parameters = Hash[
+              parameters[:register].map do |k,v|
+                [Bogo::Utility.camel(k), v]
+              end
+            ]
+            image_info = compute_api(parameters[:region]).describe_images('ImageId' => result.body['imageId']).body['imagesSet'].first
+            register_result = compute_api(parameters[:region]).register_image(
+              "#{image_info['name']}-reregister",
+              "Re-register of AMI #{result.body['imageId']} for #{image_info['name']}",
+              image_info['rootDeviceName'],
+              image_info['blockDeviceMapping'].map{|i|
+                Hash[i.map{|k,v|[Bogo::Utility.camel(k), v]}]
+              },
+              {
+                'Architecture' => image_info['architecture'],
+                'VirtualizationType' => image_info['virtualizationType'],
+              }.merge(register_parameters)
+            )
+            unless(result.body['imageId'] == register_result.body['imageId'])
+              info "New AMI registered: #{register_result.body['imageId']} - Destroying created image: #{result.body['imageId']}"
+              compute_api(parameters[:region]).deregister_image(result.body['imageId'])
+            end
+            result = register_result
+          end
           response['Data']['AmiId'] = result.body['imageId']
           response['PhysicalResourceId'] = [
             physical_resource_id,

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

@@ -28,12 +28,16 @@ module Jackal
           key = parameters[:key].split('.')
           value = parameters[:value]
           unless(value.is_a?(String))
-            raise TypeError.new("Expecting `String` value but received `#{value.class}`")
-          end
-          value = MultiJson.load(value).to_smash
-          return_value = value.get(*key)
-          if(return_value.is_a?(Enumerable))
-            return_value = MultiJson.dump(return_value)
+            unless(cfn_resource[:request_type].to_sym == :delete)
+              raise TypeError.new("Expecting `String` value but received `#{value.class}`")
+            end
+            return_value = nil
+          else
+            value = MultiJson.load(value).to_smash
+            return_value = value.get(*key)
+            if(return_value.is_a?(Enumerable))
+              return_value = MultiJson.dump(return_value)
+            end
           end
           cfn_response['Data']['Payload'] = return_value
           respond_to_stack(cfn_response, cfn_resource[:response_url])

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

@@ -0,0 +1,28 @@
+require 'jackal-cfn'
+
+module Jackal
+  module Cfn
+    class Scrubber < Jackal::Cfn::Resource
+
+      def valid?(message)
+        payload = unpack(message)
+        payload.get(:data, :cfn_resource)
+      end
+
+      # Scrub resource
+      #
+      # @param message [Carnivore::Message]
+      def execute(message)
+        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])
+          cfn_response = build_response(cfn_resource)
+          respond_to_stack(cfn_response, cfn_resource[:response_url])
+          job_completed(:jackal_cfn, payload, message)
+        end
+      end
+
+    end
+  end
+end

data/lib/jackal-cfn/resource.rb

@@ -160,6 +160,7 @@ module Jackal
           :cfn_resource => data_payload
         )
         if(config[:reprocess])
+          debug "Reprocessing received message! #{payload}"
           Carnivore::Supervisor.supervisor[destination(:input, payload)].transmit(payload)
           message.confirm!
         else

data/lib/jackal-cfn/version.rb

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

data/lib/jackal-cfn.rb

@@ -13,5 +13,6 @@ module Jackal
     autoload :AmiManager, 'jackal-cfn/resource/ami_manager'
     autoload :AmiRegister, 'jackal-cfn/resource/ami_register'
     autoload :JackalStack, 'jackal-cfn/resource/jackal_stack'
+    autoload :Scrubber, 'jackal-cfn/resource/scrubber'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-cfn
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.16
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal
@@ -71,6 +71,7 @@ files:
 - lib/jackal-cfn/resource/ami_register.rb
 - lib/jackal-cfn/resource/hash_extractor.rb
 - lib/jackal-cfn/resource/jackal_stack.rb
+- lib/jackal-cfn/resource/scrubber.rb
 - lib/jackal-cfn/utils.rb
 - lib/jackal-cfn/utils/fog.rb
 - lib/jackal-cfn/utils/http.rb
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Message processing helper