rspec-terraform 0.1.0.pre.3 → 0.1.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d1ae3bbe696449adf08d4e720aa1489623646ad6967e7db9c7ba3d8a16d5966
-  data.tar.gz: 79911852a97c2e56f9333db51cb9ecb018ed8279a44e5e0b15719c970da77e66
+  metadata.gz: 2cbb4df56947d1db97fd3a8dc56702f1a54549775d48a01c24aa2ca6d3466b44
+  data.tar.gz: 9aae54a4a4e1f9d0586a3da995b1cd522bd1b49fdbd6ace31be7c3e145eba567
 SHA512:
-  metadata.gz: 3a5e269614e7e46c619537d1caf3a11d27d41abf82f39ad7263c40753e0ba0f2482ccccb3ea87e08b5d4812c4305ea3fed9fb9509864c7554f2ac195ae882ff2
-  data.tar.gz: 1be570f2eab2149b815e747e9174d6dd86e4e73c37e1578d0364f6a34a3d78dbd125031d3ca466191234ba9cee401947213f7ef4923a7b7ad84fe44fd5f6f0e2
+  metadata.gz: 1a383a45a80f7058b11c565e91bc783337d2b6f6a2e1d741492d9c159676f039a3e42cd25cb229939b93a82d174132da05810caa7be8310b2418675c79a0d445
+  data.tar.gz: a30d834d32b46b724e4222dbb657a9151378ad775b6089cd40422d8844c328aad0c591078327ff8d5aef0c333988663bf2ec9e4b22e2e03773ab2bb850d70bb9

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.3)
+    rspec-terraform (0.1.0.pre.6)
       rspec (>= 3.0)
-      ruby-terraform (= 1.7.0.pre.1)
+      ruby-terraform (= 1.7.0.pre.3)
 
 GEM
   remote: https://rubygems.org/
@@ -37,7 +37,7 @@ GEM
     lino (3.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.16.1)
+    minitest (5.16.2)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
@@ -83,7 +83,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.31.1)
+    rubocop (1.31.2)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -97,10 +97,10 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.12.0)
+    rubocop-rspec (2.12.1)
       rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
-    ruby-terraform (1.7.0.pre.1)
+    ruby-terraform (1.7.0.pre.3)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
     ruby2_keywords (0.0.5)
@@ -142,4 +142,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.17
+   2.3.18

data/Rakefile

@@ -84,7 +84,7 @@ RakeCircleCI.define_project_tasks(
   t.environment_variables = {
     ENCRYPTION_PASSPHRASE:
         File.read('config/secrets/ci/encryption.passphrase')
-            .chomp
+          .chomp
   }
   t.checkout_keys = []
   t.ssh_keys = [

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

@@ -1,17 +1,74 @@
 # frozen_string_literal: true
 
+require 'rspec/core'
+require 'rspec/matchers'
+require 'rspec/matchers/built_in/eq'
+require 'rspec/matchers/built_in/count_expectation'
+
 module RSpec
   module Terraform
     module Matchers
       class IncludeResourceChange
+        include RSpec::Matchers::BuiltIn::CountExpectation
+
         attr_reader :definition
 
         def initialize(definition = {})
           @definition = definition
+          @attributes = []
         end
 
         def matches?(plan)
-          !plan.resource_changes_matching(definition).empty?
+          matches = attribute_matches(plan)
+
+          match_count = matches.count
+          if has_expected_count?
+            expected_count_matches?(match_count)
+          else
+            match_count.positive?
+          end
+        end
+
+        def with_attribute_value(*args)
+          stage, path, value = args.count == 3 ? args : [:after, *args]
+          path = [path] if path.is_a?(Symbol)
+          @attributes << { stage: stage, path: path, value: value }
+          self
+        end
+
+        private
+
+        def definition_matches(plan)
+          plan.resource_changes_matching(definition)
+        end
+
+        def attribute_matches(plan)
+          definition_matches(plan).filter do |resource_change|
+            change = resource_change.change
+            after = change.after_object
+            @attributes.all? do |attribute|
+              matcher = attribute_matcher(attribute)
+              value = attribute_value(after, attribute)
+              matcher.matches?(value)
+            end
+          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)
+          )
+        end
+
+        def attribute_value(object, attribute)
+          expected = attribute[:value]
+          actual = object.dig(*attribute[:path])
+          return actual&.value if expected.respond_to?(:matches?)
+
+          actual
         end
       end
     end

data/lib/rspec/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Terraform
-    VERSION = '0.1.0.pre.3'
+    VERSION = '0.1.0.pre.6'
   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.1'
+  spec.add_dependency 'ruby-terraform', '1.7.0.pre.3'
 
   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.3
+  version: 0.1.0.pre.6
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-03 00:00:00.000000000 Z
+date: 2022-07-17 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.1
+        version: 1.7.0.pre.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre.1
+        version: 1.7.0.pre.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement