autostacker24 1.0.58 → 1.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ed7bed03a37715c22a125d72d1e487e65cb6d9
-  data.tar.gz: d47a4631f4686097ec39bf4e0c637729e713d401
+  metadata.gz: fef9bfd12c06f7fc2243f9c69c18940fce0ea53b
+  data.tar.gz: 4657a28a0e48b0ca306a09e0c66104c713f5650c
 SHA512:
-  metadata.gz: 485b4cfe5ae6c4795279f45f81bb63a044c3a38832458728f7f7c2af2741bcc2462130fc11337e7ab79c687b9b3bb276f584d8f933bb5ce72b9654ac51cc1a20
-  data.tar.gz: ba631ef91ddd8dd8db70879686c9a46dbb423352ead6628f3a8e873e34f266d6cf7429ed964db560b426a54cf79b49ce22d3f888a4e3ab4464719a060050a592
+  metadata.gz: 5efa1234f70673fada1e010cda85cc570828f8b6a66afe3e0b62f8d7db1d55d46555f35f8edef29e52ffe9ce709740b838f6012024e9f37987a83e4613146fc2
+  data.tar.gz: fe384b24f6c7e585acda35520e08cae612c580b73ad14a63a958ba9554855f9a5b12f79646d4be62b82c3855a635060250482c4b7327cd8a7385f7160c10fe72

data/lib/autostacker24/template_preprocessor.rb

@@ -8,14 +8,22 @@ module AutoStacker24
 
     def self.preprocess(template, tags = nil)
       if template =~ /^\s*\/{2}\s*/i
-        template = template.gsub(/(\s*\/\/.*$)|(".*")/) {|m| m[0] == '"' ? m : ''} # replace comments
-        template = preprocess_json(JSON(template))
-        template = preprocess_tags(template, tags).to_json
+        processed = preprocess_json(parse_json(template))
+        template = preprocess_tags(processed, tags).to_json
       end
       template
     end
 
     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)]
+
+    def self.parse_json(template)
+      template = template.gsub(/(\s*\/\/.*$)|(".*")/) {|m| m[0] == '"' ? m : ''} # replace comments
+      JSON(template)
+    rescue JSON::ParserError => e
+      require 'json/pure' # pure ruby parser has better error diagnostics
+      JSON(template)
+      raise e
+    end
 
     def self.preprocess_tags(template, tags = nil)
 

metadata

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