jackal-cfn 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a04e966cfce6d4c347d5ff5d227a53fe7a71245
-  data.tar.gz: bf1d3a7f3b402780bd0d4fbe1ff0a86b7f2f35d0
+  metadata.gz: 82ce644625dd07609c7f577d4aac80ad289ce94b
+  data.tar.gz: 3052efa5fbc0b06279e2adb15a5e829cf36c41df
 SHA512:
-  metadata.gz: 820460a2f614387d2237923f7bbafa28854ef7e325f461a5ff167de3a70a048c91733d859571ecb9865f462d535570cefdb048798668db935d74f3aa2e47679d
-  data.tar.gz: 1ead2a327e6c07abf88038b234721ab5f4eaba20bd07531fd7891ec2c4443bf14bec4319616c925ec684ba01e87126029a853bb92cf9b1fcbdfc28693a6d95e9
+  metadata.gz: bb1df43542af6ed17f680cbc28482fd4270f00b27a9487e20097f714131b61a009db69a94d1e65aa2c6bb096db5e32564919e30b9c247da9dec51f91c68a169c
+  data.tar.gz: 77b196a91a89cafb1c1ee1d1a7f2e7ca700d4d0ee813b87b5c4a195b66cf8a718e99cac5aa01d524f2f4d6124a2a683d576068e137962ac94730252a4c5f347c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.2
+* Fix credentials location in configuration
+* Fix namespacing when access fog constants
+
 # v0.2.0
 * Move builtin resources under single namespace
 * Add custom failure wrap to resource to provide auto failure notification

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

@@ -33,6 +33,11 @@ module Jackal
 
       PHYSICAL_ID_JOINER = '__-__'
 
+      # Ensure fog library is loaded
+      def setup(*_)
+        require 'fog'
+      end
+
       # Process message, send value back to CFN
       #
       # @param message [Carnivore::Message]
@@ -42,7 +47,7 @@ module Jackal
           properties = rekey_hash(cfn_resource[:resource_properties])
           parameters = rekey_hash(properties[:parameters])
           cfn_response = build_response(cfn_resource)
-          case cfn_resource[:request_type]
+          case cfn_resource[:request_type].to_sym
           when :create
             ami_response_update(cfn_response, parameters)
           when :delete
@@ -50,8 +55,8 @@ module Jackal
           when :update
           else
             error "Unknown request type received: #{cfn_resource[:request_type].inspect}"
-            response['Status'] = 'FAILED'
-            response['Reason'] = 'Unknown request type received'
+            cfn_response['Status'] = 'FAILED'
+            cfn_response['Reason'] = 'Unknown request type received'
           end
           respond_to_stack(cfn_response, cfn_resource[:response_url])
           job_completed(:jackal_cfn, payload, message)
@@ -81,11 +86,11 @@ module Jackal
         ami_id = payload[:physical_resource_id].split(PHYSICAL_ID_JOINER).last
         begin
           compute_api(parameters[:region]).deregister_image(ami_id)
-        rescue Fog::Compute::AWS::Error => e
-          warn "Non-fatal error encountered on AMI removal: #{e.class}: #{e}"
-          response['Reason'] = e.message
+        rescue ::Fog::Compute::AWS::Error => e
+          warn "Failed to remove AMI: #{e.class}: #{e}"
+          response['Reason'] = "Failed to remove AMI resource: #{e}. Ignoring."
         rescue => e
-          error "Failed to remove AMI: #{e.class}: #{e}"
+          error "Unexpected error removing AMI: #{e.class}: #{e}"
           response['Status'] = 'FAILED'
           response['Reason'] = e.message
         end
@@ -97,9 +102,9 @@ module Jackal
       # @param region [String] AWS region ami exists
       # @return [Fog::Compute]
       def compute_api(region)
-        Fog::Compute.new(
+        ::Fog::Compute.new(
           {:provider => :aws}.merge(
-            config.fetch(:ami, :credentials, :compute).merge(
+            config.get(:ami, :credentials, :compute).merge(
               :region => region
             )
           )

data/lib/jackal-cfn/utils/fog.rb

@@ -14,7 +14,7 @@ module Jackal
         # @return [Fog::Service]
         # @note extracts credentials from confg at :api -> [type | :default]
         def api_for(type)
-          klass = Fog.constants.detect do |const|
+          klass = ::Fog.constants.detect do |const|
             snakecase(const).to_s == type.to_s
           end
           if(klass)
@@ -27,7 +27,7 @@ module Jackal
               key = credentials.to_a.flatten.push(klass).sort.hash
               Thread.current[:cfn_apis] ||= Smash.new
               unless(Thread.current[:cfn_apis][key])
-                Thread.current[:cfn_apis][key] = Fog.const_get(klass).new(credentials)
+                Thread.current[:cfn_apis][key] = ::Fog.const_get(klass).new(credentials)
               end
               Thread.current[:cfn_apis][key]
             else
@@ -52,7 +52,7 @@ module Jackal
             [var, api.instance_variable_get(var)]
           end.flatten.compact.map(&:to_s).push(api.service_name).sort.hash
           if(Thread.current[:cfn_assume_apis].get(key, :expires).to_i < Time.now.to_i + 5)
-            sts = Fog::AWS::STS.new(
+            sts = ::Fog::AWS::STS.new(
               config.fetch(
                 :api, :sts, config.get(
                   :api, :default

data/lib/jackal-cfn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-cfn
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal