aws-cft-tools 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c4148f5b7aa3cf1465fcc735a1b3ebd8b559d9
-  data.tar.gz: 654d8ffb95b10000a1e3d364803fc014aaf2788a
+  metadata.gz: 153baa62a12a723ecc3749c8e64e04a005f48dd0
+  data.tar.gz: ff49055bd3a98f3262fa9d3e890bf3f9f894ac61
 SHA512:
-  metadata.gz: 31d7266d177d7cc7359b35ddea6271b4c4f1d14ef8e4fdf850056e6a7823ffc4bef9ee802c85513e99944bab14110098c33e568ca1faa58883a41ae44efc6e60
-  data.tar.gz: 12d6742f6050e73e68a0a54d10138ba21d33fc3ac10be49e2b150ee248651b7be6f6337d34558e8a5ea51153e174b2a59e9487977e968897f74debb1652a5913
+  metadata.gz: d6ddab54a09a0dfe5bc2a3b5472cbf3cf89c42e1d1bd9780140784a39893ee18861287ad11307373caa6a2887e95f17ad8e5605a00694a595fe4abbec84a1253
+  data.tar.gz: 8332135791348d11749c743e7e9342dee76b56aa1fc2f4dde2e35bc3aa0b31edeb75197d2ff617c9e6c2bc08af6240a2ffd9057e383150b47f259c743b7ff0f5

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.2] - 2017-12-22
+
+### Changed
+
+* When retracting stacks, a template that hadn't been deployed yet could block removal of any templates it
+  depended on. Now, retraction only considers templates that have been deployed. (Issue #18)
+
 ## [0.1.1] - 2017-12-15
 
 ### Added

data/lib/aws_cft_tools/dependency_tree.rb

@@ -98,12 +98,25 @@ module AwsCftTools
     private
 
     def close_subset(set, &block)
-      return [] unless block_given?
-      set - items_outside_subset(set, &block)
+      find_all_available(set.to_a) { |all, acc| find_next_candidate(all, acc, &block) }
     end
 
-    def items_outside_subset(set)
-      set.select { |node| (yield(node) - set).any? }
+    def find_all_available(candidates)
+      available = []
+      while candidates.any?
+        candidate = yield(candidates, available)
+        return available unless candidate
+        available << candidate
+        candidates.delete(candidate)
+      end
+      available
+    end
+
+    def find_next_candidate(candidates, selected)
+      return unless block_given?
+      candidates.detect do |candidate|
+        (yield(candidate) - selected).empty?
+      end
     end
   end
 end

data/lib/aws_cft_tools/runbooks/retract.rb

@@ -55,7 +55,10 @@ module AwsCftTools
       # report_undefined_image - provide list of undefined imports that block stack deployment
       #
       def report_template_dependencies
-        diff = (templates - free_templates).map { |template| template.filename.to_s }
+        free = free_templates
+        deployed = client.stacks.map(&:name)
+        all = templates.select { |template| deployed.include?(template.name) }
+        diff = (all - free).map { |template| template.filename.to_s }
         error_on_dependencies(diff) if diff.any?
       end
 

data/lib/aws_cft_tools/runbooks/retract/templates.rb

@@ -28,8 +28,11 @@ module AwsCftTools
         #
         # @return [AwsCftTools::TemplateSet]
         def free_templates
-          set = AwsCftTools::TemplateSet.new(templates.in_folder_order(template_folder_order))
-          client.templates.closed_subset(set).reverse
+          deployed = client.stacks.map(&:name)
+          universe = AwsCftTools::TemplateSet.new(client.templates.select do |template|
+            deployed.include?(template.name)
+          end)
+          universe.closed_subset(templates).reverse
         end
 
         ##

data/lib/aws_cft_tools/version.rb

@@ -4,5 +4,5 @@ module AwsCftTools
   ##
   # Version of AwsCftTools.
   #
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cft-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Small Business Administration
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk