pact 1.63.0 → 1.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bbef2d45df174d528bf23ecd3c5b380196789c842d49b32dd7c49478aca0942
-  data.tar.gz: ef0bdd2ea78d03ab7db7eec95c5b5e293495ce5aab33d614daca1ffe4215229b
+  metadata.gz: 24b61e9c910570243bd6054ebc23bf968f5bd20a308ab887184d0860c2b2018d
+  data.tar.gz: 62ba67e2a1ff00b591da39accfe05010d2836f5aa386df0129aa9df786b89156
 SHA512:
-  metadata.gz: 30e6ab38f2b4475474af538a149ba504462a36438f9b2cd2a4ccf148c2081ee92c973b3bb0d61d07edf19389869e631b6bc7011d4a758b54f752baa341eec715
-  data.tar.gz: abc1767938dcc4e417b3d76798c742f7e4bccbd850cd19cd3034d9ad9e28502c063c5b3272ac75cfd98c008dd5e3786e7a8708fb3f8b3332bb933c6a6b8c1acb
+  metadata.gz: b473ff4c78e3310449e8cae9a78bc379c36d20c6b646d3d587d83652598e32cae6f12ec50ad84623a1349655bbb841f7dc79aa8c0784dc79b53306f006ddc990
+  data.tar.gz: 91464395e4565d96df5025b998caa1e42a9ba71d9a72bfa0220dad95745bf3cc7d911f22171a1957d01a40a06c7042b9d53d49f75206ef757457227db5931260

data/CHANGELOG.md

@@ -1,3 +1,44 @@
+<a name="v1.65.0"></a>
+### v1.65.0 (2024-08-06)
+
+#### Features
+
+* support app_version_branch in MessageProviderDSL	 ([1653128](/../../commit/1653128))
+* allow setting fail_if_no_pacts_found in honours_pacts_from_pact_broker	 ([f0f142e](/../../commit/f0f142e))
+
+#### Bug Fixes
+
+* handle case in no_pacts_found - undefined method empty? for nil	 ([0145d2d](/../../commit/0145d2d))
+* remove unused ConsumerContractBuilder contract_details accessor	 ([fb5488e](/../../commit/fb5488e))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([2bbefe2](/../../commit/2bbefe2))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([e10f914](/../../commit/e10f914))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([7560918](/../../commit/7560918))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([b4cbe85](/../../commit/b4cbe85))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([4028087](/../../commit/4028087))
+* ConsumerContractBuilder exposing incorrect field	 ([c805c3e](/../../commit/c805c3e))
+
+* **test**
+  * alias Rack/Rackup WEBrick handler in x509 test for backwards compat	 ([cc77498](/../../commit/cc77498))
+
+<a name="v1.64.0"></a>
+### v1.64.0 (2023-11-09)
+
+#### Features
+
+* support x509 certs in HTTP Client (#298)	 ([3ed5680](/../../commit/3ed5680))
+
+* **CI**
+  * use setup-ruby's bundle installer and cache (#275)	 ([f5621b6](/../../commit/f5621b6))
+
+#### Bug Fixes
+
+* assert provider retrieved successfully before using link	 ([0af0691](/../../commit/0af0691))
+* update call to Rack::Builder.parse_file for rack 3	 ([652047c](/../../commit/652047c))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([b4ca8cb](/../../commit/b4ca8cb))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([7ad2073](/../../commit/7ad2073))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([dd417fd](/../../commit/dd417fd))
+* example/animal-service/Gemfile to reduce vulnerabilities (#281)	 ([4ea07cd](/../../commit/4ea07cd))
+
 <a name="v1.63.0"></a>
 ### v1.63.0 (2022-09-28)
 

data/lib/pact/cli/run_pact_verification.rb

@@ -72,7 +72,6 @@ module Pact
 
       def run_with_configured_pacts_from_pact_helper
         pact_urls = Pact.provider_world.pact_urls
-        raise "Please configure a pact to verify" if pact_urls.empty?
         Pact::Provider::PactSpecRunner.new(pact_urls, pact_spec_options).run
       end
 

data/lib/pact/consumer/consumer_contract_builder.rb

@@ -11,7 +11,7 @@ module Pact
 
       include Pact::Logging
 
-      attr_reader :consumer_contract, :mock_service_base_url
+      attr_reader :mock_service_base_url
 
       def initialize(attributes)
         @interaction_builder = nil

data/lib/pact/hal/entity.rb

@@ -23,6 +23,10 @@ module Pact
         _link(key).get(*args)
       end
 
+      def get!(key, *args)
+        _link(key).get!(*args)
+      end
+
       def post(key, *args)
         _link(key).post(*args)
       end

data/lib/pact/hal/http_client.rb

@@ -53,6 +53,12 @@ module Pact
           http.use_ssl = (uri.scheme == 'https')
           http.ca_file = ENV['SSL_CERT_FILE'] if ENV['SSL_CERT_FILE'] && ENV['SSL_CERT_FILE'] != ''
           http.ca_path = ENV['SSL_CERT_DIR'] if ENV['SSL_CERT_DIR'] && ENV['SSL_CERT_DIR'] != ''
+
+          if x509_certificate?
+            http.cert = OpenSSL::X509::Certificate.new(x509_client_cert_file)
+            http.key = OpenSSL::PKey::RSA.new(x509_client_key_file)
+          end
+
           if disable_ssl_verification?
             if verbose?
               Pact.configuration.output_stream.puts("SSL verification is disabled")
@@ -74,6 +80,19 @@ module Pact
         verbose || ENV['VERBOSE'] == 'true'
       end
 
+      def x509_certificate?
+        ENV['X509_CLIENT_CERT_FILE'] && ENV['X509_CLIENT_CERT_FILE'] != '' &&
+          ENV['X509_CLIENT_KEY_FILE'] && ENV['X509_CLIENT_KEY_FILE'] != ''
+      end
+
+      def x509_client_cert_file
+        File.read(ENV['X509_CLIENT_CERT_FILE'])
+      end
+
+      def x509_client_key_file
+        File.read(ENV['X509_CLIENT_KEY_FILE'])
+      end
+
       def disable_ssl_verification?
         ENV['PACT_DISABLE_SSL_VERIFICATION'] == 'true' || ENV['PACT_BROKER_DISABLE_SSL_VERIFICATION'] == 'true'
       end

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -39,15 +39,17 @@ module Pact
       end
 
       def call
-        if index.can?(PACTS_FOR_VERIFICATION_RELATION) || index.can?(PACTS_FOR_VERIFICATION_RELATION_BETA)
-          log_message
-          pacts_for_verification
-        else
-          old_selectors = consumer_version_selectors.collect do | selector |
-            { name: selector[:tag], all: !selector[:latest], fallback: selector[:fallbackTag]}
+        handling_no_pacts_found do
+          if index.can?(PACTS_FOR_VERIFICATION_RELATION) || index.can?(PACTS_FOR_VERIFICATION_RELATION_BETA)
+            log_message
+            pacts_for_verification
+          else
+            old_selectors = consumer_version_selectors.collect do | selector |
+              { name: selector[:tag], all: !selector[:latest], fallback: selector[:fallbackTag]}
+            end
+            # Fall back to old method of fetching pacts
+            FetchPacts.call(provider, old_selectors, broker_base_url, http_client_options)
           end
-          # Fall back to old method of fetching pacts
-          FetchPacts.call(provider, old_selectors, broker_base_url, http_client_options)
         end
       end
 
@@ -96,6 +98,15 @@ module Pact
       def log_message
         Pact.configuration.output_stream.puts "INFO: #{pact_selection_description(provider, consumer_version_selectors, options, broker_base_url)}"
       end
+
+      def handling_no_pacts_found
+        pacts_found = yield
+        raise "No pacts found to verify" if pacts_found.blank? && options[:fail_if_no_pacts_found] != false
+        if pacts_found.blank? && options[:fail_if_no_pacts_found] == false
+          Pact.configuration.output_stream.puts "WARN: No pacts found to verify & fail_if_no_pacts_found is set to false."
+        end
+        pacts_found
+      end
     end
   end
 end

data/lib/pact/provider/configuration/message_provider_dsl.rb

@@ -34,6 +34,10 @@ module Pact
             self.tags = tags
           end
 
+          def app_version_branch branch
+            self.branch = branch
+          end
+
           def publish_verification_results publish_verification_results
             self.publish_verification_results = publish_verification_results
             Pact::RSpec.with_rspec_2 do

data/lib/pact/provider/configuration/pact_verification_from_broker.rb

@@ -15,7 +15,7 @@ module Pact
         # in parent scope, it will clash with these ones,
         # so put an underscore in front of the name to be safer.
 
-        attr_accessor :_provider_name, :_pact_broker_base_url, :_consumer_version_tags, :_provider_version_branch, :_provider_version_tags, :_basic_auth_options, :_enable_pending, :_include_wip_pacts_since, :_verbose, :_consumer_version_selectors
+        attr_accessor :_provider_name, :_pact_broker_base_url, :_consumer_version_tags, :_provider_version_branch, :_provider_version_tags, :_basic_auth_options, :_enable_pending, :_include_wip_pacts_since, :_verbose, :_consumer_version_selectors, :_fail_if_no_pacts_found
 
         def initialize(provider_name, provider_version_branch, provider_version_tags)
           @_provider_name = provider_name
@@ -26,6 +26,7 @@ module Pact
           @_enable_pending = false
           @_include_wip_pacts_since = nil
           @_verbose = false
+          @_fail_if_no_pacts_found = true # CLI defaults to false, unfortunately for consistency
         end
 
         dsl do
@@ -46,6 +47,11 @@ module Pact
             self._enable_pending = enable_pending
           end
 
+          # Underlying code defaults to true if not specified
+          def fail_if_no_pacts_found fail_if_no_pacts_found
+            self._fail_if_no_pacts_found = fail_if_no_pacts_found
+          end
+
           def include_wip_pacts_since since
             self._include_wip_pacts_since = if since.respond_to?(:xmlschema)
               since.xmlschema
@@ -74,7 +80,7 @@ module Pact
             _provider_version_tags,
             _pact_broker_base_url,
             _basic_auth_options.merge(verbose: _verbose),
-            { include_pending_status: _enable_pending, include_wip_pacts_since: _include_wip_pacts_since }
+            { include_pending_status: _enable_pending, include_wip_pacts_since: _include_wip_pacts_since, fail_if_no_pacts_found: _fail_if_no_pacts_found }
           )
 
           Pact.provider_world.add_pact_uri_source fetch_pacts

data/lib/pact/provider/configuration/service_provider_dsl.rb

@@ -21,7 +21,13 @@ module Pact
           unless File.exist? Pact.configuration.config_ru_path
             raise "Could not find config.ru file at #{Pact.configuration.config_ru_path} Please configure the service provider app or create a config.ru file in the root directory of the project. See https://github.com/pact-foundation/pact-ruby/wiki/Verifying-pacts for more information."
           end
-          Rack::Builder.parse_file(Pact.configuration.config_ru_path).first
+          result = Rack::Builder.parse_file(Pact.configuration.config_ru_path)
+
+          if result.respond_to?(:first) # rack 2
+            result.first
+          else # rack 3
+            result
+          end
         }
 
         def initialize name

data/lib/pact/provider/verification_results/publish.rb

@@ -135,7 +135,7 @@ module Pact
         end
 
         def provider_entity
-          @provider_entity ||= pact_entity.get(PROVIDER_RELATION)
+          @provider_entity ||= pact_entity.get!(PROVIDER_RELATION)
         end
       end
     end

data/lib/pact/version.rb

@@ -1,4 +1,4 @@
 # Remember to bump pact-provider-proxy when this changes major version
 module Pact
-  VERSION = "1.63.0"
+  VERSION = "1.65.0"
 end

data/pact.gemspec

@@ -29,16 +29,16 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'rspec', '~> 3.0'
   gem.add_runtime_dependency 'rack-test', '>= 0.6.3', '< 3.0.0'
   gem.add_runtime_dependency 'thor', '>= 0.20', '< 2.0'
-  gem.add_runtime_dependency 'webrick', '~> 1.3'
-  gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
+  gem.add_runtime_dependency 'webrick', '~> 1.8'
+  gem.add_runtime_dependency 'term-ansicolor', '~> 1.7'
 
   gem.add_runtime_dependency 'pact-support', '~> 1.16', '>= 1.16.9'
   gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
 
   gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'webmock', '~> 3.0'
-  gem.add_development_dependency 'fakefs', '0.5' # 0.6.0 blows up
-  gem.add_development_dependency 'hashie', '~> 2.0'
+  gem.add_development_dependency 'fakefs', '2.4' # 0.6.0 blows up
+  gem.add_development_dependency 'hashie', '~> 5.0'
   gem.add_development_dependency 'faraday', '~>1.0', '<3.0'
   gem.add_development_dependency 'faraday-multipart', '~> 1.0'
   gem.add_development_dependency 'conventional-changelog', '~> 1.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.63.0
+  version: 1.65.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -74,28 +74,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -419,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL