autostacker24 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a61bb187cfbe5a926cfc075c658d3910a16a038
-  data.tar.gz: 9cf46ec2538671b7f5ff1f87507192bcac78d0a2
+  metadata.gz: 69bc0d89a868d3567ee930a91d259a89ded9ee12
+  data.tar.gz: 940cd3e57bb08dd03b3efe3c1142f5867bc811ac
 SHA512:
-  metadata.gz: 88a04ef3bcdf0f549658d95b47d165bf441c16fa0be3b97c7eb6c87f7bc1f192de23cf95d971e0cb5dbf0185fba535d9fb720c0e08369fcdd92f17e56989b4c0
-  data.tar.gz: 05d01520d75d393492a4058acec9afd83a6f8854bd19607ca344314243e3b4a7c29f559dd2ae4a3d82679732ea3b68142242e7cd494c7ed23b5c80aaf2abed08
+  metadata.gz: 6a3f32022329081da86915e95960a5fd836861764c99cd7b542d297a39332e7b5862d945095bb3b0e550debe91eacaaa674d697bca2b9119e656d8ef557326c0
+  data.tar.gz: 54b854f345d1a1068876de8ea07f2b6a2fce675b3e6c2874975b7ff1bba2a7919a2060a463e81ef4c746ba17d7a721cb87c31b2b991c4575aafa81f2985981fb

data/lib/autostacker24/stacker.rb

@@ -3,29 +3,40 @@ require 'json'
 
 module Stacker
 
-  def create_or_update_stack(stack_name, template_body, parameters, parent_stack_name = nil)
+  def credentials
+    @credentials
+  end
+
+  def credentials=(credentials)
+    unless credentials == @credentials
+      @lazy_cloud_formation = nil
+      @credentials = credentials
+    end
+  end
+
+  def create_or_update_stack(stack_name, template, parameters, parent_stack_name = nil)
     if find_stack(stack_name).nil?
-      create_stack(stack_name, template_body, parameters, parent_stack_name)
+      create_stack(stack_name, template, parameters, parent_stack_name)
     else
-      update_stack(stack_name, template_body, parameters, parent_stack_name)
+      update_stack(stack_name, template, parameters, parent_stack_name)
     end
   end
 
-  def create_stack(stack_name, template_body, parameters, parent_stack_name = nil)
-    merge_output_parameters(parent_stack_name, template_body, parameters) if parent_stack_name
+  def create_stack(stack_name, template, parameters, parent_stack_name = nil)
+    merge_output_parameters(parent_stack_name, template, parameters) if parent_stack_name
     cloud_formation.create_stack(stack_name:    stack_name,
-                                 template_body: template_body,
+                                 template_body: template_body(template),
                                  on_failure:    'DELETE',
                                  parameters:    transform_parameters(parameters),
                                  capabilities:  ['CAPABILITY_IAM'])
     wait_for_stack(stack_name, :create)
   end
 
-  def update_stack(stack_name, template_body, parameters, parent_stack_name = nil)
-    merge_output_parameters(parent_stack_name, template_body, parameters) if parent_stack_name
+  def update_stack(stack_name, template, parameters, parent_stack_name = nil)
+    merge_output_parameters(parent_stack_name, template, parameters) if parent_stack_name
     begin
       cloud_formation.update_stack(stack_name:    stack_name,
-                                   template_body: template_body,
+                                   template_body: template_body(template),
                                    parameters:    transform_parameters(parameters),
                                    capabilities:  ['CAPABILITY_IAM'])
     rescue Aws::CloudFormation::Errors::ValidationError => error
@@ -36,8 +47,8 @@ module Stacker
     end
   end
 
-  def merge_output_parameters(stack_name, template_body, parameters)
-    expected_parameters = JSON(template_body)['Parameters']
+  def merge_output_parameters(stack_name, template, parameters)
+    expected_parameters = JSON(template_body(template))['Parameters']
     get_stack_outputs(stack_name).each do |k, v|
       parameters[k.to_sym] = v if expected_parameters.has_key?(k.to_s)
     end
@@ -83,8 +94,8 @@ module Stacker
     cloud_formation.describe_stacks.stacks
   end
 
-  def estimate_template_cost(template_body, parameters)
-    cloud_formation.estimate_template_cost(:template_body => template_body, :parameters => transform_parameters(parameters))
+  def estimate_template_cost(template, parameters)
+    cloud_formation.estimate_template_cost(:template_body => template_body(template), :parameters => transform_parameters(parameters))
   end
 
   def get_stack_outputs(stack_name)
@@ -110,15 +121,9 @@ module Stacker
     @lazy_cloud_formation ||= Aws::CloudFormation::Client.new(region: ENV['AWS_DEFAULT_REGION'] || 'eu-west-1', credentials: @credentials)
   end
 
-  def credentials
-    @credentials
-  end
-
-  def credentials=(credentials)
-    unless credentials == @credentials
-      @lazy_cloud_formation = nil
-      @credentials = credentials
-    end
+  def template_body(template)
+    template = File.read(template) if File.exists?(template)
+    template.gsub(/(\s*\/\/.*$)|(".*")/) {|m| m[0] == '"' ? m : ''}
   end
 
   extend self
@@ -126,5 +131,13 @@ module Stacker
 end
 
 if $0 ==__FILE__ # placeholder for interactive testing
+  template = <<-EOL
+    bla bla //comment
+    bla "//no comment"
+    bla // still a "comment"
+    bla "some string" // comment
+  EOL
+
+  puts Stacker.template_body(template)
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Johannes Mueller