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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c0ef1824e2c32907a06a34ab775ab0004a9ddf57ab22c5b2baeb40812eb4df
-  data.tar.gz: af62f1d916db8ea95f186bb44903bd52641787c270b6c0e1fa7bf6073482204e
+  metadata.gz: 3cc8147616146ae0fde066315865ff6c1bfb32ac516da81783cbbbe9c17be24e
+  data.tar.gz: 58186f1efbcac84c1bccd3760ef667ea390c909dcb91e5421844b9dbab6bba3b
 SHA512:
-  metadata.gz: 3a2638bb48081a61c55f716459873c66e7bb3e730e80561ddff0605bcbbd48e67cc56498ce7a343747d08d80bdccd6536203b53728163562fd272ca0d4debc37
-  data.tar.gz: 26e7621f75e736abc0e0ba5a036513c4f6d32b2ae3cfd16ba357fe3c956b566773b2756963fba41cae6c57e9537b6af4d124db93beb5f6c3f4971d2e213e8fae
+  metadata.gz: 18228da814d613820107ea17d2abf5df5d22028c4ee701a29e14638c51261e2a4050a48f5eb447027cdcb860467c4e69f84897fb4a2747c15693f0fa08fb8c60
+  data.tar.gz: 73361b336ce497361eb27d3c6867e29dca996d0477ba74466b0a2b13a7bce96f8d3b41ec5d2eec1902900339872b497fd4d5759478c01c75f0af36b0d3fccfed

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.10)
+    rspec-terraform (0.1.0.pre.13)
       rspec (>= 3.0)
-      ruby-terraform (= 1.7.0.pre.5)
+      ruby-terraform (= 1.7.0.pre.9)
 
 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.9)
       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
@@ -34,6 +37,8 @@ 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
@@ -66,18 +71,24 @@ 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
@@ -172,28 +183,24 @@ module RSpec
         end
 
         def expected_attribute_lines
-          indent = '            '
-          attribute_fragments = attributes.collect do |a|
-            "#{indent}#{render(a[:path])} = #{a[:value].inspect}"
-          end
-          attribute_fragments.join("\n")
+          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
 
-        # 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
-            attribute_lines = attribute_lines.join("\n")
+            attribute_lines = attributes.render(level: 8, bare: true)
+
             "            - #{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|
@@ -203,10 +210,6 @@ module RSpec
           end
           available_lines.join("\n")
         end
-
-        def render(path)
-          path.collect { |elem| elem.to_s }.join(',')
-        end
       end
 
       # rubocop:enable Metrics/ClassLength

data/lib/rspec/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Terraform
-    VERSION = '0.1.0.pre.10'
+    VERSION = '0.1.0.pre.13'
   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.9'
 
   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.10
+  version: 0.1.0.pre.13
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-20 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.9
   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.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement