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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9201cae0c0d9e4823bc90ce3159757ed2171fd2a440d1a1179d37bd2482c9237
-  data.tar.gz: 385dba92ea4a772cdb897db40483451c624506d74cfeb87fd1eb5a2f9e657c79
+  metadata.gz: 1f38869b0e2c2de7b280ff09e070c6fa66fecd2ede8dba1e182300306110a20f
+  data.tar.gz: 384a2ec52c9fbf9162ba773a866fec91463c055a0b59bb4fea922fb421d53e9c
 SHA512:
-  metadata.gz: 93b16c7d3c5eeeed2ffee8dd91cf0ff8ea7ff5cc8eef4bb1ab549d2dfa78f1deb2d3ad7708cc5f090f25e1c10613f34c23af447ea190583d60e35d023dcee174
-  data.tar.gz: 07ac2b1aaa4a98e87766f7de30307011811717627ed96879a7c12d3fe13de9f422e64291011ffc972bf0fdb8309cff04f5429fdc3c92de33f004896a66a5d0ee
+  metadata.gz: dabc8823fc35214035ea62093bfcc7623ab8d6921b381cb3c74a3f6691d23a35ae4bbb58f65c3d900245a355fd6e69ac3a139f097efb3b81dc8a409c648e0e35
+  data.tar.gz: 97f7670c091ea2051bf812f126fdc32df5f8b10f9e234a3dc95a23b59842b9b0f30af9ffd4164bfaffd57b90e9c6f5b185468648a0da53bb1d3a562eafa7d9c9

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.9)
+    rspec-terraform (0.1.0.pre.12)
       rspec (>= 3.0)
-      ruby-terraform (= 1.7.0.pre.5)
+      ruby-terraform (= 1.7.0.pre.8)
 
 GEM
   remote: https://rubygems.org/
@@ -20,7 +20,7 @@ GEM
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    excon (0.92.3)
+    excon (0.92.4)
     faker (2.21.0)
       i18n (>= 1.8.11, < 2)
     faraday (2.3.0)
@@ -83,14 +83,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.31.2)
+    rubocop (1.32.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.19.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.19.1)
@@ -100,7 +100,7 @@ GEM
     rubocop-rspec (2.12.1)
       rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
-    ruby-terraform (1.7.0.pre.5)
+    ruby-terraform (1.7.0.pre.8)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
     ruby2_keywords (0.0.5)
@@ -116,7 +116,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
 

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

@@ -5,6 +5,9 @@ require 'rspec/matchers'
 require 'rspec/matchers/built_in/eq'
 require 'rspec/matchers/built_in/count_expectation'
 
+require 'ruby_terraform/models/path'
+require 'ruby_terraform/models/path_set'
+
 module RSpec
   module Terraform
     module Matchers
@@ -12,7 +15,7 @@ module RSpec
       class IncludeResourceChange
         include RSpec::Matchers::BuiltIn::CountExpectation
 
-        attr_reader :definition, :plan
+        attr_reader :definition, :attributes, :plan
 
         def initialize(definition = {})
           @definition = definition
@@ -34,15 +37,15 @@ module RSpec
         def with_attribute_value(*args)
           stage, path, value = args.count == 3 ? args : [:after, *args]
           path = [path] if path.is_a?(Symbol)
+          path = RubyTerraform::Models::Path.new(path)
+          value = maybe_box_value(value)
           @attributes << { stage: stage, path: path, value: value }
           self
         end
 
         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
@@ -68,37 +71,62 @@ module RSpec
           end
         end
 
+        def maybe_box_value(value)
+          if value.respond_to?(:matches?)
+            value
+          else
+            RubyTerraform::Models::Objects.box(value)
+          end
+        end
+
         def attribute_matcher(attribute)
           expected = attribute[:value]
           return expected if expected.respond_to?(:matches?)
 
-          RSpec::Matchers::BuiltIn::Eq.new(
-            RubyTerraform::Models::Objects.box(expected)
-          )
+          RSpec::Matchers::BuiltIn::Eq.new(expected)
         end
 
         def attribute_value(object, attribute)
           expected = attribute[:value]
-          actual = object.dig(*attribute[:path])
+          actual = attribute[:path].read(object)
           return actual&.unbox if expected.respond_to?(:matches?)
 
           actual
         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 +134,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 +176,42 @@ 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})"
-            end
-            .join("\n")
+        def expected_attribute_lines
+          paths = attributes.collect { |attribute| attribute[:path] }
+          path_set = RubyTerraform::Models::PathSet.new(paths)
+          values = attributes.collect { |attribute| attribute[:value] }
+          object = RubyTerraform::Models::Objects.object(path_set, values)
+          object.render(level: 6, bare: true)
+        end
+
+        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.render(level: 8, bare: true)
+
+            "            - #{address} (#{actions})\n#{attribute_lines}"
+          end
+          relevant_lines.join("\n")
+        end
+
+        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
       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.12'
   end
 end

data/rspec-terraform.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'rspec', '>= 3.0'
-  spec.add_dependency 'ruby-terraform', '1.7.0.pre.5'
+  spec.add_dependency 'ruby-terraform', '1.7.0.pre.8'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'faker'

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.12
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre.5
+        version: 1.7.0.pre.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre.5
+        version: 1.7.0.pre.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement