dh-proteus 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0df2a13c32149cac9e759f0d17e84acfd12c09f33fa30c521b84487e46b22ce
-  data.tar.gz: 8c1a6bf727e68788e81f0ba3fb55935f2b49f1d8a02fcc860068275e98196ae4
+  metadata.gz: b0f118c08e97393ebe12d2864e0619d473e3bcc11acafadc69c4d4af472cc5bb
+  data.tar.gz: 7d3b468f8b7f6a66e5d423381f907ef052af46db873bc556b8e866ddd9dc8c95
 SHA512:
-  metadata.gz: 99fb7ce15648251209d767ce88fc4f90e50bdecffaecbb30db7579de98ddf691f33d99bf55ae81dc81570ef125682a52b82de68f06bb73340e311eb926d878e6
-  data.tar.gz: 40d8bebd6e339106cec99c85d03f00c4f41ad83e40500a6d101001a182670f563d871b5a6b09de205af54f90b4e57b3ed48cdd47267b4f95d67e29ee567cf95c
+  metadata.gz: 9940ad762af1654002ebee65755f2d4780a9733b7cb620c23b7dfb56af9474a1846629170232821c4472e9e4f01dd2d9cc4e80f78bf38aa1569d71b9510c6b2e
+  data.tar.gz: feee98574ec54314a3e078862ae95bf7a8ae3598fb7a04c3fcad191fd5a617dd1f19c54afc98df029f85afc6f4fde8af35cf77d0c8bbf58ae96c6f4aefc37d59

data/lib/proteus/modules/manager.rb

@@ -1,6 +1,8 @@
 require 'proteus/helpers/path_helpers'
 require 'proteus/modules/terraform_module'
 require 'proteus/backend/backend'
+require 'proteus/modules/defaults_parser'
+require 'json'
 
 module Proteus
   module Modules
@@ -33,7 +35,7 @@ module Proteus
         if tfvars_content.empty?
           terraform_variables = []
         else
-          terraform_variables = HCL::Checker.parse(tfvars_content).with_indifferent_access
+          terraform_variables = JSON.parse(parse_tfvars(tfvars: tfvars_content))
         end
 
         @modules = []
@@ -48,6 +50,35 @@ module Proteus
         end
       end
 
+      def parse_tfvars(tfvars:)
+        lines = tfvars.split("\n")
+        lines.reject! {|l| l.empty? || l.match(/#/) }
+        substituted_lines = []
+
+        lines.each_with_index do |line, index|
+          next_line = lines[index + 1] || ""
+
+          # insert comma after closing bracket and curly brace
+          if line =~ /\]$|\}$/ && index != lines.size-1
+            substituted_lines << "#{line},"
+          else
+            if index == lines.size-1 || line =~ /\[|\{/ || next_line =~ /\]|\}/
+              substituted_lines << line.gsub(/([a-z0-9_]+)( *=)(.*)/,  "\"\\1\": \\3")
+              if substituted_lines.last =~ /,$/ && next_line =~ /\]|\}/
+                substituted_lines.last.gsub!(/,$/, "")
+              end
+            else
+              if line =~ /=/
+                substituted_lines << line.gsub!(/([a-z0-9_]+)( *=)(.*)/,  "\"\\1\": \\3,")
+              else
+                substituted_lines << line
+              end
+            end
+          end
+        end
+
+        "{\n#{substituted_lines.join("\n")}\n}"
+      end
     end
   end
 end

data/lib/proteus/templates/partial.rb

@@ -1,5 +1,3 @@
-require 'hcl/checker'
-
 module Proteus
   module Templates
     class Partial < TemplateBinding
@@ -24,10 +22,10 @@ module Proteus
 
         if data.dig('partials', @name)
           @partial_data_present = true
-
           @data['partials'][@name].delete('render')
-
           set(@name, @data['partials'][@name])
+        else
+          set(@name, ActiveSupport::HashWithIndifferentAccess.new)
         end
 
       end
@@ -45,7 +43,6 @@ module Proteus
             partial_file = sub_directory_partial_path
           end
 
-
           if File.file?(partial_file)
             partial_template = File.read(partial_file)
 

data/lib/proteus/version.rb

@@ -1,5 +1,5 @@
 module Proteus
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end
 
 if $0 == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Simon Albrecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler