autostacker24 1.0.57 → 1.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9061f0245437aac8fb55ed942950963c637d01
-  data.tar.gz: 2dd618bddd219ffd00c0f66e807816ce9ed6afc8
+  metadata.gz: 72ed7bed03a37715c22a125d72d1e487e65cb6d9
+  data.tar.gz: d47a4631f4686097ec39bf4e0c637729e713d401
 SHA512:
-  metadata.gz: 37a4b4685dd4736ca2ce1ec30e784f4b827996714381e33294d64ff70b44f318ebf0228fb0ff301b031c0f2cb83d328354182195a32e0a9658338c838f7636c0
-  data.tar.gz: dd10f37cddeebb519fb9c1ca8110e7eb5f020367661775173a38e74550e91149710f1307f2132617c16b145ff1b8958866a7cf7a0fc236019c9f180993fc363d
+  metadata.gz: 485b4cfe5ae6c4795279f45f81bb63a044c3a38832458728f7f7c2af2741bcc2462130fc11337e7ab79c687b9b3bb276f584d8f933bb5ce72b9654ac51cc1a20
+  data.tar.gz: ba631ef91ddd8dd8db70879686c9a46dbb423352ead6628f3a8e873e34f266d6cf7429ed964db560b426a54cf79b49ce22d3f888a4e3ab4464719a060050a592

data/bin/autostacker24

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'autostacker24'
+
+def parse_options(argv)
+  params = {}
+  parser = OptionParser.new
+  parser.on("--template VALUE", "template location") do |value|
+    params[:template] = value 
+  end
+  parser.parse(argv)
+  return params
+end
+
+command = ARGV[0]
+params = parse_options(ARGV)
+
+if command == "validate"
+  Stacker.validate_template(params[:template])
+elsif command == "preprocess"
+  puts Stacker.template_body(params[:template])
+else
+  raise ArgumentError, "unknown command"
+end

data/lib/autostacker24/template_preprocessor.rb

@@ -1,5 +1,6 @@
 
 require 'json'
+require 'set'
 
 module AutoStacker24
 
@@ -14,53 +15,26 @@ module AutoStacker24
       template
     end
 
-    def self.preprocess_tags(template, tags = nil)
+    SUPPORTED_TYPES = Set[%w(AWS::AutoScaling::AutoScalingGroup AWS::CloudTrail::Trail AWS::EC2::CustomerGateway AWS::EC2::DHCPOptions AWS::EC2::Instance AWS::EC2::InternetGateway AWS::EC2::NetworkAcl AWS::EC2::NetworkInterface AWS::EC2::RouteTable AWS::EC2::SecurityGroup AWS::EC2::Subnet AWS::EC2::Volume AWS::EC2::VPC AWS::EC2::VPCPeeringConnection AWS::EC2::VPNConnection AWS::EC2::VPNGateway AWS::ElasticBeanstalk::Environment AWS::ElasticLoadBalancing::LoadBalancer AWS::RDS::DBCluster AWS::RDS::DBClusterParameterGroup AWS::RDS::DBInstance AWS::RDS::DBParameterGroup AWS::RDS::DBSecurityGroup AWS::RDS::DBSubnetGroup AWS::RDS::OptionGroup AWS::S3::Bucket)]
 
-      supportedTypes = [
-        'AWS::AutoScaling::AutoScalingGroup',
-        'AWS::CloudTrail::Trail',
-        'AWS::EC2::CustomerGateway',
-        'AWS::EC2::DHCPOptions',
-        'AWS::EC2::Instance',
-        'AWS::EC2::InternetGateway',
-        'AWS::EC2::NetworkAcl',
-        'AWS::EC2::NetworkInterface',
-        'AWS::EC2::RouteTable',
-        'AWS::EC2::SecurityGroup',
-        'AWS::EC2::Subnet',
-        'AWS::EC2::Volume',
-        'AWS::EC2::VPC',
-        'AWS::EC2::VPCPeeringConnection',
-        'AWS::EC2::VPNConnection',
-        'AWS::EC2::VPNGateway',
-        'AWS::ElasticBeanstalk::Environment',
-        'AWS::ElasticLoadBalancing::LoadBalancer',
-        'AWS::RDS::DBCluster',
-        'AWS::RDS::DBClusterParameterGroup',
-        'AWS::RDS::DBInstance',
-        'AWS::RDS::DBParameterGroup',
-        'AWS::RDS::DBSecurityGroup',
-        'AWS::RDS::DBSubnetGroup',
-        'AWS::RDS::OptionGroup',
-        'AWS::S3::Bucket'
-      ]
+    def self.preprocess_tags(template, tags = nil)
 
       unless tags.nil?
 
         tags_for_asg = adjust_tags_for_asg(tags)
 
-        template["Resources"].each {|(key, value)|
+        template['Resources'].each {|(key, value)|
 
           tags_to_apply = tags
-          if value["Type"] == 'AWS::AutoScaling::AutoScalingGroup'
+          if value['Type'] == 'AWS::AutoScaling::AutoScalingGroup'
             tags_to_apply = tags_for_asg
           end
 
-          if supportedTypes.include? value["Type"]
-            if value["Properties"]["Tags"].nil?
-              value["Properties"]["Tags"] = tags_to_apply
+          if SUPPORTED_TYPES.include? value['Type']
+            if value['Properties']['Tags'].nil?
+              value['Properties']['Tags'] = tags_to_apply
             else
-              value["Properties"]["Tags"] = (tags_to_apply + value["Properties"]["Tags"]).uniq { |s| s.first }
+              value['Properties']['Tags'] = (tags_to_apply + value['Properties']['Tags']).uniq { |s| s.first }
             end
           end
         }
@@ -70,18 +44,18 @@ module AutoStacker24
     end
 
     def self.adjust_tags_for_asg(tags)
-      asg_tags = tags.inject([]) { |t,element| t << element.dup }
-
-      asg_tags.each {|(tag)|
-        tag["PropagateAtLaunch"] = "true"
-      }
-
-      asg_tags
+      tags.map {|element| element.merge('PropagateAtLaunch' => 'true') }
     end
 
     def self.preprocess_json(json)
       if json.is_a?(Hash)
-        json.inject({}){|m, (k, v)| m.merge(k => preprocess_json(v))}
+        json.inject({}) do |m, (k, v)|
+          if k == 'UserData' && v.is_a?(String)
+            m.merge(k => preprocess_user_data(v))
+          else
+            m.merge(k => preprocess_json(v))
+          end
+        end
       elsif json.is_a?(Array)
         json.map{|v| preprocess_json(v)}
       elsif json.is_a?(String)
@@ -91,6 +65,12 @@ module AutoStacker24
       end
     end
 
+    def self.preprocess_user_data(s)
+      m = /^@file:\/\/(.*)/.match(s)
+      s = File.read(m[1]) if m
+      {'Fn::Base64' => s}
+    end
+
     def self.preprocess_string(s)
       parts = tokenize(s).map do |token|
         case token

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 1.0.57
+  version: 1.0.58
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -43,10 +43,12 @@ description: n/a
 email:
 - jmueller@autoscout24.com
 - crodemeyer@autoscout24.com
-executables: []
+executables:
+- autostacker24
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/autostacker24
 - lib/autostacker24.rb
 - lib/autostacker24/stacker.rb
 - lib/autostacker24/template_preprocessor.rb