jackal-cfn 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fddaa1ca5447da20d6c856d2ccdf3ba4d3c89d9
-  data.tar.gz: acddccbce932860d09c048ba04627df5744cd4b3
+  metadata.gz: 779e84f842e3df3adf70f9d2c9a2c55bbb062484
+  data.tar.gz: fb6805a786d7de928113fa0de6ce78a68cc33f89
 SHA512:
-  metadata.gz: 6d5f2187fab6e8d42da3ab3351b53720b1cd351a95df76ffe40390e50786a4f457fef306f6b00b93de1dabba807bcdb1f87e1c0c5b08b67d3f9dd8985d6c5b86
-  data.tar.gz: 9b5b9c770c12c9158bdc2ad3bf03041b7200b3aacdaf35f2bbec8c561673646d0b1a2ec63d1acea196e8b246b29468397497291f6b7fb006e6ac96359e2447f6
+  metadata.gz: 67a24a6d9a127847b38c53ddbf944acd089d784989ee728f9671ef6864b8b7bc7dc2aa81cd02382ee95a8795a98f794fc1f4bebbf7304187d90677644e926d76
+  data.tar.gz: 95e1c39a4764e165983b3034769c0274345bfe5854e75098ef93c7de196128146b938fedf0fd7fb1bebeb5454854be72762385b487c7d2bdf597b20a83469c82

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.12
+* Update joiner used for physical resource ID in JackalStack
+* Support stack delete when create is incomplete
+
 # v0.2.10
 * Properly handle no parameters in properties
 * Add new JackalStack resource

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

@@ -34,6 +34,8 @@ module Jackal
     #   }
     class JackalStack < Jackal::Cfn::Resource
 
+      LOCATION_JOINER = '__~__'
+
       # Load miasma for stack building
       def setup(*_)
         require 'miasma'
@@ -114,6 +116,18 @@ module Jackal
         )
       end
 
+      # Generate the remote stack name via the resource information
+      #
+      # @param resource [Hash]
+      # @return [String]
+      def generate_stack_name(resource)
+        [
+          'JackalStack',
+          resource[:logical_resource_id],
+          resource[:stack_id].split('/').last
+        ].join('-')
+      end
+
       # Create a new stack and update the response values
       #
       # @param response [Hash] response data of action
@@ -124,11 +138,7 @@ module Jackal
       # @return [TrueClass, FalseClass]
       def create_stack(response, resource, properties, parameters, message)
         stack = remote_api(properties[:location]).stacks.build(
-          :name => [
-            'JackalStack',
-            resource[:logical_resource_id],
-            resource[:stack_id].split('/').last
-          ].join('-'),
+          :name => generate_stack_name(resource),
           :template => properties.fetch(:stack, fetch_template(properties[:template_url])),
           :parameters => Hash[parameters.map{|k,v| [Bogo::Utility.camel(k), v] }]
         )
@@ -143,7 +153,10 @@ module Jackal
           stack.outputs.each do |output|
             response['Data']["Outputs.#{output.key}"] = output.value
           end
-          response['PhysicalResourceId'] = "#{properties[:location]}-#{stack.id}"
+          response['PhysicalResourceId'] = [
+            properties[:location],
+            stack.id
+          ].join(LOCATION_JOINER)
           true
         else
           response['Status'] = 'FAILED'
@@ -207,6 +220,15 @@ module Jackal
       # @param message [Carnivore::Message] original message
       def destroy_stack(response, resource, message)
         stack = request_destroy(resource[:physical_resource_id])
+        unless(stack)
+          properties = rekey_hash(cfn_resource[:resource_properties])
+          stack = request_destroy(
+            [
+              properties[:location],
+              generate_stack_name(resource)
+            ].join(LOCATION_JOINER)
+          )
+        end
         if(stack)
           until(stack.state.nil? || stack.state.to_s.end_with?('complete') || stack.state.to_s.end_with?('failed'))
             info "Waiting for stack destruction (#{stack.name})..."
@@ -226,7 +248,7 @@ module Jackal
       # @param stack_resource_id [String] physical resource ID
       # @return [Miasma::Models::Orchestration::Stack, FalseClass]
       def request_destroy(stack_resource_id)
-        location, stack_id = stack_resource_id.split('-', 2)
+        location, stack_id = stack_resource_id.split(LOCATION_JOINER, 2)
         if(stack_id)
           begin
             info "Sending stack destruction request to: #{stack_id} in: #{location}"

data/lib/jackal-cfn/resource.rb

@@ -69,7 +69,7 @@ module Jackal
       # @note this should be overridden in subclasses when actual
       #   resources are being created
       def physical_resource_id
-        "#{self.class.name.split('::').last}-#{Celluloid.uuid}"
+        "#{self.class.name.split('::').last}-#{Carnivore.uuid}"
       end
 
       # Generate response hash

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

@@ -59,7 +59,7 @@ module Jackal
                 )
               )
             )
-            result = sts.assume_role("jackal-cfn-#{Celluloid.uuid}", role).body
+            result = sts.assume_role("jackal-cfn-#{Carnivore.uuid}", role).body
             Thread.current[:cfn_assume_apis][key] = Smash.new(
               :expires => Time.parse(result['Expiration']).to_i,
               :api => api.class.new(

data/lib/jackal-cfn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-cfn
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal
@@ -95,9 +95,8 @@ 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
 test_files: []
-has_rdoc: