cloudformation-tool 1.5.12 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a319ecaf3ad4f3b1e1e38db7f634ade7dfa0956a260355a57037a0e483d21f0
-  data.tar.gz: 68a70165c686f2ed56ffc78d3230640130576be98d44bd02b23248cedfd49ecf
+  metadata.gz: a9db3672b97a22828e57d6c906a78831153a620bca1632f9f9748f72e27c9db7
+  data.tar.gz: ad0eca7cc6ae46eaf3b0a55c57fd8e85695a27b8c97f71e55492e0a95bd208d2
 SHA512:
-  metadata.gz: 988632fc9975609c94f587cb31858d4086f95d0205bf43f06259424fddad2d5fff7dd6ee6c991d96936397f506690c2d3dcf6f38c2658f72ff744d97a179ddee
-  data.tar.gz: 8e02c56f4f99cdd8f9bccd85963b7e60665de292dc8d91d20f51bfecc5aee0660834f1d791bee19d9688325ffa1634c27bb8f023ac1539c779bebe5027ccc687
+  metadata.gz: 0452d98f9e5426f6924cc8caf53430b8936fc9ac38187abda7ff9d780cf921330f0f85b592cab7be9b26918e3f54585892e61548e747721dfc46973ec64e04aa
+  data.tar.gz: 6d50f5dd121f968799fd5754a6f54726cd0c64925ce9bd79a27f4360ee710c65a914fc36f3d740536664c4ffc1c1a03b5f055c21848deb2e976900c3f2060dc1

data/lib/cloud_formation_tool/cloud_formation/stack.rb

@@ -41,7 +41,7 @@ module CloudFormationTool
           resp = awscf.update_stack({
             stack_name: @name,
             template_url: url,
-            capabilities: %w(CAPABILITY_IAM CAPABILITY_NAMED_IAM),
+            capabilities: %w(CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND),
             parameters: params.collect do |k,v|
               {
                 parameter_key: k.to_s,
@@ -63,7 +63,7 @@ module CloudFormationTool
           resp = awscf.create_stack({
             stack_name: @name,
             template_url: url,
-            capabilities: %w(CAPABILITY_IAM CAPABILITY_NAMED_IAM),
+            capabilities: %w(CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND),
             on_failure: "DO_NOTHING", ##"ROLLBACK",
             parameters: params.collect do |k,v|
               {
@@ -301,4 +301,4 @@ module CloudFormationTool
     end
 
   end
-end
+end

data/lib/cloud_formation_tool/cloud_formation.rb

@@ -121,17 +121,34 @@ module CloudFormationTool
               end
             end
           else
-            # warn against duplicate entities, resources or outputs
-            (@data[category] ||= {}).keys.each do |key|
-              if catdata.has_key? key
-                raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - duplicate '#{category}' item: #{key}"
-              end 
+            case catdata
+            when Hash
+              # warn against duplicate entities, resources or outputs
+              (@data[category] ||= {}).keys.each do |key|
+                if catdata.has_key? key
+                  raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - duplicate '#{category}' item: #{key}"
+                end 
+              end
+              catdata = fixrefs(catdata, rewrites)
+              # add included properties
+              @data[category].merge! catdata
+            when Array
+              if @data[category].nil?
+                @data[category] = catdata
+              elsif @data[category].is_a? Array
+                @data[category] += catdata
+              else
+                raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - conflicting types for '#{category}'"
+              end
+            else
+              if @data[category].nil?
+                @data[category] = catdata
+              else
+                raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - I do not know how to merge non-list non-dictionary '#{category}'!"
+              end
             end
-            catdata = fixrefs(catdata, rewrites)
           end
           
-          # add included properties
-          @data[category].merge! catdata
         end
       end
     end

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '1.5.12'
+  VERSION = '1.5.14'
 end

data/lib/cloud_formation_tool.rb

@@ -135,8 +135,16 @@ module CloudFormationTool
   def s3_bucket_name(region)
     name = nil
     # see if we already have a cf-templates bucket for this region
-    bucket = awss3.list_buckets.buckets.select do |b|
-        b.name =~ /cf-templates-(\w+)-#{region}/
+    bucket = awss3(region).list_buckets.buckets.select do |b|
+      b.name =~ /cf-templates-(\w+)-#{region}/
+    end.select do |b|
+      # S3 started showing us buckets that were deleted, and can't actually be accessible, so filter those
+      begin
+        Aws::S3::Bucket.new(b.name, client: awss3(region)).objects.first
+        true
+      rescue Aws::S3::Errors::NoSuchBucket => e
+        false
+      end
     end.first
     
     # otherwise try to create one

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.14
 platform: ruby
 authors:
 - Oded Arbel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-20 00:00:00.000000000 Z
+date: 2023-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake