rspec-terraform 0.1.0.pre.9 → 0.1.0.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9201cae0c0d9e4823bc90ce3159757ed2171fd2a440d1a1179d37bd2482c9237
-  data.tar.gz: 385dba92ea4a772cdb897db40483451c624506d74cfeb87fd1eb5a2f9e657c79
+  metadata.gz: f8c0ef1824e2c32907a06a34ab775ab0004a9ddf57ab22c5b2baeb40812eb4df
+  data.tar.gz: af62f1d916db8ea95f186bb44903bd52641787c270b6c0e1fa7bf6073482204e
 SHA512:
-  metadata.gz: 93b16c7d3c5eeeed2ffee8dd91cf0ff8ea7ff5cc8eef4bb1ab549d2dfa78f1deb2d3ad7708cc5f090f25e1c10613f34c23af447ea190583d60e35d023dcee174
-  data.tar.gz: 07ac2b1aaa4a98e87766f7de30307011811717627ed96879a7c12d3fe13de9f422e64291011ffc972bf0fdb8309cff04f5429fdc3c92de33f004896a66a5d0ee
+  metadata.gz: 3a2638bb48081a61c55f716459873c66e7bb3e730e80561ddff0605bcbbd48e67cc56498ce7a343747d08d80bdccd6536203b53728163562fd272ca0d4debc37
+  data.tar.gz: 26e7621f75e736abc0e0ba5a036513c4f6d32b2ae3cfd16ba357fe3c956b566773b2756963fba41cae6c57e9537b6af4d124db93beb5f6c3f4971d2e213e8fae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.9)
+    rspec-terraform (0.1.0.pre.10)
       rspec (>= 3.0)
       ruby-terraform (= 1.7.0.pre.5)
 

data/lib/rspec/terraform/matchers/include_resource_change.rb

@@ -12,7 +12,7 @@ module RSpec
       class IncludeResourceChange
         include RSpec::Matchers::BuiltIn::CountExpectation
 
-        attr_reader :definition, :plan
+        attr_reader :definition, :attributes, :plan
 
         def initialize(definition = {})
           @definition = definition
@@ -40,9 +40,7 @@ module RSpec
 
         def failure_message
           "\nexpected: #{positive_expected_line}" \
-            "\n     got: #{positive_got_line}" \
-            "\n          available resource changes are:" \
-            "\n#{resource_change_lines}"
+            "\n     got: #{positive_got_line}"
         end
 
         def failure_message_when_negated
@@ -86,19 +84,38 @@ module RSpec
         end
 
         def positive_expected_line
+          maybe_with_expected_attributes(
+            maybe_with_definition(
+              positive_plan_line
+            )
+          )
+        end
+
+        def positive_plan_line
           cardinality = cardinality_fragment
           plurality = expected_count.nil? || expected_count == 1 ? '' : 's'
-          expected_line =
-            "a plan including #{cardinality} resource change#{plurality}"
 
+          "a plan including #{cardinality} resource change#{plurality}"
+        end
+
+        def maybe_with_definition(expected_line)
           unless @definition.empty?
             expected_line =
               "#{expected_line} matching definition:\n#{definition_lines}"
           end
+          expected_line
+        end
 
+        def maybe_with_expected_attributes(expected_line)
+          unless @attributes.empty?
+            expected_line =
+              "#{expected_line}\n          with attribute values after " \
+              "the resource change is applied of:\n#{expected_attribute_lines}"
+          end
           expected_line
         end
 
+        # rubocop:disable Metrics/MethodLength
         def positive_got_line
           if plan.resource_changes.empty?
             'a plan including no resource changes.'
@@ -106,9 +123,21 @@ module RSpec
             count = attribute_matches(plan).count
             amount = count.zero? ? 'no' : cardinality_amount(count)
             plurality = count == 1 ? '' : 's'
-            "a plan including #{amount} matching resource change#{plurality}."
+            got_line =
+              "a plan including #{amount} matching " \
+              "resource change#{plurality}."
+
+            unless attributes.empty?
+              got_line =
+                "#{got_line}\n          relevant resource changes are:" \
+                "\n#{relevant_resource_change_lines}"
+            end
+
+            "#{got_line}\n          available resource changes are:" \
+              "\n#{available_resource_change_lines}"
           end
         end
+        # rubocop:enable Metrics/MethodLength
 
         def cardinality_fragment
           qualifier = cardinality_qualifier
@@ -136,21 +165,50 @@ module RSpec
         end
 
         def definition_lines
+          indent = '            '
           definition
-            .collect { |k, v| "            #{k}: #{v}" }
+            .collect { |k, v| "#{indent}#{k} = #{v.inspect}" }
             .join("\n")
         end
 
-        def resource_change_lines
-          plan.resource_changes
-            .collect do |rc|
-              address = rc.address
-              actions = rc.change.actions.join(', ')
-              "            - #{address} (#{actions})"
+        def expected_attribute_lines
+          indent = '            '
+          attribute_fragments = attributes.collect do |a|
+            "#{indent}#{render(a[:path])} = #{a[:value].inspect}"
+          end
+          attribute_fragments.join("\n")
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def relevant_resource_change_lines
+          relevant_lines = definition_matches(plan).collect do |rc|
+            address = rc.address
+            actions = rc.change.actions.join(', ')
+            attributes = rc.change.after_object
+            attribute_lines = attributes.collect do |key, value|
+              "                #{key} = #{value.inspect}"
             end
-            .join("\n")
+            attribute_lines = attribute_lines.join("\n")
+            "            - #{address} (#{actions})\n#{attribute_lines}"
+          end
+          relevant_lines.join("\n")
+        end
+        # rubocop:enable Metrics/MethodLength
+
+        def available_resource_change_lines
+          available_lines = plan.resource_changes.collect do |rc|
+            address = rc.address
+            actions = rc.change.actions.join(', ')
+            "            - #{address} (#{actions})"
+          end
+          available_lines.join("\n")
+        end
+
+        def render(path)
+          path.collect { |elem| elem.to_s }.join(',')
         end
       end
+
       # rubocop:enable Metrics/ClassLength
     end
   end

data/lib/rspec/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Terraform
-    VERSION = '0.1.0.pre.9'
+    VERSION = '0.1.0.pre.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.9
+  version: 0.1.0.pre.10
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec