terraform_landscape 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf360fe1ed1556c181a434de199f8d8e339773ed
-  data.tar.gz: 515377583effa0f3c924d4b4e080ab54c569ca11
+  metadata.gz: e6de58a2bcb0f3d318ce203f19adeb2d54493b52
+  data.tar.gz: 55845cf9aa9e8653de8fc6944aa031d21be3f7bf
 SHA512:
-  metadata.gz: 760a0f9f7ec82bdb8020accb56f59b70262222984a088bc8f4e33614479c1802954877c158488c755717af0f4a54c7455d13e8b843e9e15fd1b4b6c93d20316e
-  data.tar.gz: 00d0f78fd2f0d2ba6db1d6899c1ba122a711508281e8357d73cb4b72b6b8b62faac97bea9bc4deedd0a04662d74656c4ce59bc9a015a3daae083c41539f5a358
+  metadata.gz: da0a63b397506b8e79b11a4ff9c83242f2abf7293baa283ebe02dc660cb777b1e25c88169d7d759b880cf356d5e7bfa9a4cc65be3211e2ae529cfa49975af7aa
+  data.tar.gz: 40a468725bfb87c9d5b81dda6370d809b34db3f61fc57a312f19adac3d990685bdc830cd8e72db355a94ec7c683ecf430789c06a4df0c566735dd16195457a87

data/grammar/terraform_plan.treetop

@@ -77,7 +77,27 @@ grammar TerraformPlan
   rule attribute
     attribute_name:[^:]* ':' _? attribute_value:[^\n]+ {
       def to_ast
-        { attribute_name.text_value => attribute_value.text_value }
+        { attribute_name.text_value => sanitize_value_and_reason }
+      end
+
+      def sanitize_value_and_reason
+        val = attribute_value.text_value
+
+        # We'll perform some sanitization of the values within the parser.
+
+        # Handle case where attribute has an annotation (e.g. "forces new resource")
+        if (match = val.match(/\s+\((?<reason>[^)]+)\)$/))
+          reason = match['reason']
+          val = val[0...match.begin(0)]
+        end
+
+        # With Terraform >= 0.10.4, the <computed> field is now without quotes,
+        # which will cause problem with how downstream we process the output.
+        # Convert it to have quotes and handle < 0.10.4 as well.
+        val = val.gsub(%r{=> <computed>$}, '=> "<computed>"')
+                 .gsub(%r{^<computed>}, '"<computed>"')
+
+        { value: val, reason: reason }
       end
     }
   end

data/lib/terraform_landscape/printer.rb

@@ -41,6 +41,8 @@ module TerraformLandscape
       # Remove preface
       if (match = scrubbed_output.match(/^Path:[^\n]+/))
         scrubbed_output = scrubbed_output[match.end(0)..-1]
+      elsif (match = scrubbed_output.match(/^Terraform.+following\sactions:/))
+        scrubbed_output = scrubbed_output[match.end(0)..-1]
       elsif (match = scrubbed_output.match(/^\s*(~|\+|\-)/))
         scrubbed_output = scrubbed_output[match.begin(0)..-1]
       elsif scrubbed_output =~ /^No changes/

data/lib/terraform_landscape/terraform_plan.rb

@@ -76,11 +76,14 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
     # Determine longest attribute name so we align all values at same indentation
     attribute_value_indent_amount = attribute_indent_amount_for_resource(resource)
 
-    resource[:attributes].each do |attribute_name, attribute_value|
+    resource[:attributes].each do |attribute_name, attribute_value_and_reason|
+      attribute_value = attribute_value_and_reason[:value]
+      attribute_change_reason = attribute_value_and_reason[:reason]
       display_attribute(resource,
                         change_color,
                         attribute_name,
                         attribute_value,
+                        attribute_change_reason,
                         attribute_value_indent_amount)
     end
   end
@@ -122,6 +125,7 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
     change_color,
     attribute_name,
     attribute_value,
+    attribute_change_reason,
     attribute_value_indent_amount
   )
     attribute_value_indent = ' ' * attribute_value_indent_amount
@@ -130,6 +134,7 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
       display_modified_attribute(change_color,
                                  attribute_name,
                                  attribute_value,
+                                 attribute_change_reason,
                                  attribute_value_indent,
                                  attribute_value_indent_amount)
     else
@@ -145,17 +150,10 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
     change_color,
     attribute_name,
     attribute_value,
+    attribute_change_reason,
     attribute_value_indent,
     attribute_value_indent_amount
   )
-    # Handle case where attribute has an annotation (e.g. "forces new resource")
-    # appended onto the end. This is hard to parse in the Treetop grammar, so we
-    # instead catch it here and extract
-    if (match = attribute_value.match(/\((?<reason>[^)]+)\)$/))
-      reason = match['reason']
-      attribute_value = attribute_value[0...match.begin(0)]
-    end
-
     # Since the attribute line is always of the form
     # "old value" => "new value", we can add curly braces and parse with
     # `eval` to obtain a hash with a single key/value.
@@ -181,7 +179,7 @@ class TerraformLandscape::TerraformPlan # rubocop:disable Metrics/ClassLength
       @out.print '"' + new.colorize(:green) + '"'
     end
 
-    @out.print " (#{reason})".colorize(:magenta) if reason
+    @out.print " (#{attribute_change_reason})".colorize(:magenta) if attribute_change_reason
 
     @out.newline
   end

data/lib/terraform_landscape/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module TerraformLandscape
-  VERSION = '0.1.10'.freeze
+  VERSION = '0.1.11'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terraform_landscape
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Coinbase
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize