dh-proteus 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 930202b74f9134b4fb637892037c7f2f4449571c3d0ca48bd4b19f05bd5567dc
-  data.tar.gz: e05fc63704777527d50a7e693268b00f0caea3d5c8ba58e62b6f2328b1425d5b
+  metadata.gz: d58675d1b1f45f3ca5711e42b3b52ab646b19e94c387d60184495a72e962a443
+  data.tar.gz: 39db3dcd0b1d7945ff90226ebbe42ccbb0d95020501af66a1f46ba467ed949b9
 SHA512:
-  metadata.gz: 5151d852874d76fdd54aee52ed5946f8f8a900e2a29fb5ae85ed76e5fb990cb20014c3adf2a2c5a840fb10f5d06aec8ed0a418f3e39f1e875a76d234c43fae63
-  data.tar.gz: 35315dffe3c11aba65d0e4fff11a3b548615ea76b8605825b9fc6e19cf5562aac1f11a29fbec7fd471181f4baf19738e5c51bcfd538d263de9b5c3640583cf09
+  metadata.gz: f08aa1849fffa7c13f4ea7399d6ae4522dac58cea95926dffe36428a946c08c9bc48cc661802c783a060072ec6bf5293c3396f5af2794e6b076e0c039b0e4a2d
+  data.tar.gz: 366e2801c64b8c9967744e716b441882bf31c18eca254926ecbd3f6e990553f53d7b202ac11b014c769db5a4fb2f7c9dabea017a15a8310739a19b9084e9d063

data/Gemfile.lock

@@ -1,27 +1,28 @@
 PATH
   remote: .
   specs:
-    proteus (0.1.3)
+    dh-proteus (0.1.4)
       activesupport (~> 5.1.1)
       aws-sdk-elasticsearchservice (~> 1.4.0)
       aws-sdk-rds (~> 1.11.0)
       aws-sdk-route53 (~> 1.7.0)
       erubis (~> 2.7.0)
-      hcl-checker (~> 1.0.5)
       thor (~> 0.20.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.1)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    aws-partitions (1.60.0)
-    aws-sdk-core (3.15.0)
+    aws-eventstream (1.0.3)
+    aws-partitions (1.189.0)
+    aws-sdk-core (3.59.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-elasticsearchservice (1.4.0)
       aws-sdk-core (~> 3)
@@ -32,16 +33,17 @@ GEM
     aws-sdk-route53 (1.7.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
     coderay (1.1.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     erubis (2.7.0)
-    hcl-checker (1.0.5)
-    i18n (0.8.1)
-    jmespath (1.3.1)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.4.0)
     method_source (0.8.2)
-    minitest (5.10.3)
+    minitest (5.11.3)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -61,9 +63,9 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     slop (3.6.0)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -71,7 +73,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  proteus!
+  dh-proteus!
   pry
   rake (~> 10.0)
   rspec (~> 3.0)

data/dh-proteus.gemspec

@@ -43,7 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 5.1.1'
   spec.add_runtime_dependency 'thor', '~> 0.20.0'
   spec.add_runtime_dependency 'erubis', '~> 2.7.0'
-  spec.add_runtime_dependency 'hcl-checker', '~> 1.0.5'
   spec.add_runtime_dependency 'aws-sdk-rds', '~> 1.11.0'
   spec.add_runtime_dependency 'aws-sdk-route53', '~> 1.7.0'
   spec.add_runtime_dependency 'aws-sdk-elasticsearchservice', '~> 1.4.0'

data/lib/proteus/commands/plan.rb

@@ -39,7 +39,6 @@ module Proteus
               #{"-destroy" if options[:destroy]} \
               -input=false \
               -refresh=true \
-              -module-depth=-1 \
               -var-file=#{var_file(context, environment)} \
               -out=#{plan_file(context, environment)} \
               #{aws_profile} #{limit(options[:limit])} \

data/lib/proteus/modules/defaults_parser.rb

@@ -0,0 +1,75 @@
+module Proteus
+  module Modules
+    class DefaultsParser
+      attr_reader :variables
+
+      def initialize(input)
+        @hcl = input
+        @variables = {}
+      end
+
+      def parse_variables
+        lines = @hcl.split("\n")
+        lines.reject! { |l| l.start_with?("#") }
+
+        lines.each_with_index do |line, index|
+          if line =~ /^variable/
+            # ignore mandatory variables
+            if line =~ /{/ && line =~ /}/
+              next
+            end
+
+            variable_lines = find_variable_range(lines, index)
+
+            if variable_lines && variable_lines.any?
+              variable = evaluate_variable(variable_lines)
+
+              @variables.merge!({variable[:name] => variable[:value]}) unless variable.nil?
+            end
+          end
+        end
+      end
+
+      protected
+
+      # finds range of lines relevant to a single variable.
+      # returns nil if the default value is non scalar
+      def find_variable_range(lines, start_index)
+        closing_brace_index = 0
+
+        lines[start_index..-1].each_with_index do |line, idx|
+
+          # ignore maps and lists
+          if line =~ /default/ && (line =~ /\[/ || line =~ /\{/)
+            return nil
+          end
+
+          if line =~ /^\}$/
+            closing_brace_index = idx
+            break
+          end
+        end
+
+        lines[start_index..start_index + closing_brace_index]
+      end
+
+      def evaluate_variable(lines)
+        variable = {}
+
+        variable[:name] = lines[0].match(/variable "(.+)"/)[1]
+        lines.each do  |line|
+          next if line =~ /type/ || line =~ /description/
+
+          if match_data = line.match(/=(.+)/)
+            variable[:value] =  match_data[1].gsub('"','').lstrip.rstrip
+            break
+          end
+        end
+
+        return variable if variable.key?(:value)
+
+        nil
+      end
+    end
+  end
+end

data/lib/proteus/modules/terraform_module.rb

@@ -1,7 +1,8 @@
 require 'proteus/helpers/path_helpers'
 require 'proteus/helpers/string_helpers'
-require 'hcl/checker'
+require 'proteus/modules/defaults_parser'
 require 'yaml'
+require 'fileutils'
 
 module Proteus
   module Modules
@@ -147,15 +148,12 @@ module Proteus
       end
 
       def parse_defaults
-        defaults = []
+        return [] unless File.file?(File.join(module_path(@context, @name), 'io.tf'))
 
-        return defaults unless File.file?(File.join(module_path(@context, @name), 'io.tf'))
-        HCL::Checker.parse(File.read(File.join(module_path(@context, @name), 'io.tf')))['variable'].each do |variable, values|
-          if values
-            defaults.push(variable) if values.has_key?('default')
-          end
-        end
-        return defaults
+        defaults_parser = DefaultsParser.new(File.read(File.join(module_path(@context, @name), 'io.tf')))
+        defaults_parser.parse_variables
+
+        return defaults_parser.variables
       end
 
       def global_resources

data/lib/proteus/templates/partial.rb

@@ -97,21 +97,28 @@ module Proteus
       def scope_resources(manifest:, scope:)
         scoped = []
         manifest.each_line do |line|
-          if matches = line.match(/resource( +)"(?<resource_type>[a-z0-9_]+)"( +)"(?<resource_name>[a-zA-Z0-9_\-]+)"( +)(\{)/)
-            say "MATCHED RESOURCE: #{line}", :green
+          if line.include?('proteus:noscope')
+            say "NOT SCOPING: #{line}", :green
+            scoped << line.gsub(/( *)#( *)proteus:noscope/, '')
+            next
+          end
+
+          if matches = line.match(/(?<rd>resource|data)( +)"(?<resource_type>[a-z0-9_]+)"( +)"(?<resource_name>[a-zA-Z0-9_\-]+)"( *)(\{)/)
             matches = matches.named_captures.with_indifferent_access
-            scoped << "resource \"#{matches[:resource_type]}\" \"#{scope}_#{matches[:resource_name]}\" {"
+            say "MATCHED RESOURCE: #{matches[:rd].upcase}", :green
+            scoped << "#{matches[:rd]} \"#{matches[:resource_type]}\" \"#{scope}_#{matches[:resource_name]}\" {"
             say "CHANGED TO:       #{scoped.last}", :green
-          elsif matches = line.match(/(?<pre>.*(\{|\())(?<data>data\.)?(?<resource_type>(?<provider>aws|kubernetes|helm|tls_private_key|null_resource)[a-z_0-9]*)\.(?<resource_name>[a-z0-9_]+)(?<attribute>(?<wildcard>.\*)?\.[a-z_]+)?(?<post>.*)?/)
-            matches = matches.named_captures.with_indifferent_access
+          elsif matches = line.match(/^(?<pre>\s+)?(?<left>[a-z_]+)(?<eq>[= ]+)(?<lbracket>\[)?(?<lparen>"\${)?(?<funcbeg>([a-z]+\()*)?(?<data>data\.)?(?<resource_type>[a-z_0-9]+)\.(?<resource_name>[a-z_0-9-]+)\.(?<wildcard>\*.)?(?<resource_attribute>[a-z_]+)(?<rparen>}")?(?<post>.*)?/)
 
-            if !matches[:data]
+            matches = matches.named_captures.with_indifferent_access
+            #if !matches[:data]
               say "MATCHED REFERENCE: #{line}", :green
-              scoped << "#{matches[:pre]}#{matches[:resource_type]}.#{scope}_#{matches[:resource_name]}#{matches[:attribute]}#{matches[:post]}"
-              say "CHANGED TO:        #{scoped.last}", :green
-            else
-              scoped << line
-            end
+              scoped << "#{matches[:pre]}#{matches[:left]}#{matches[:eq]}#{matches[:lbracket]}#{matches[:lparen]}#{matches[:funcbeg]}#{matches[:data]}#{matches[:resource_type]}.#{scope}_#{matches[:resource_name]}.#{matches[:wildcard]}#{matches[:resource_attribute]}#{matches[:rparen]}#{matches[:post]}"
+              say "CHANGED TO: #{scoped.last}", :green
+          elsif matches = line.match(/(?<resource>(?<data>data\.)?(?<resource_type>(?<provider>aws|helm|local)[a-z_0-9]+)\.(?<resource_name>[a-z\-_0-9]+)\.(?<resource_attribute>[a-z_]+))/)
+            say "MATCHED RESOURCE REFERENCE: #{line}", :green
+            scoped << line.gsub(matches[:resource], "#{matches[:data]}#{matches[:resource_type]}.#{scope}_#{matches[:resource_name]}.#{matches[:resource_attribute]}")
+            say "CHANGED TO: #{scoped.last}", :green
           else
             scoped << line
           end

data/lib/proteus/templates/template_binding.rb

@@ -26,8 +26,8 @@ module Proteus
 
       def render_defaults(context, demo: false)
         @defaults.inject("") do |memo, default|
-          if context.has_key?(default)
-            memo << "#{demo ? "# " : ""}#{default} = \"#{context[default]}\"\n"
+          if context.has_key?(default[0])
+            memo << "#{demo ? "# " : ""}#{default[0]} = \"#{context[default[0]]}\"\n"
           else
             memo
           end

data/lib/proteus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Simon Albrecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
-- !ruby/object:Gem::Dependency
-  name: hcl-checker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: aws-sdk-rds
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +206,7 @@ files:
 - lib/proteus/helpers/path_helpers.rb
 - lib/proteus/helpers/string_helpers.rb
 - lib/proteus/init.rb
+- lib/proteus/modules/defaults_parser.rb
 - lib/proteus/modules/manager.rb
 - lib/proteus/modules/terraform_module.rb
 - lib/proteus/templates/partial.rb