pact 1.56.0 → 1.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07691380e13b6856eb1c2df42bf7ce5f360ed46b8e75aff4e122c22f685e45b5'
-  data.tar.gz: f2ce2cf40b492b0f163fe27732ef09f37c5b1a5061a05e07427807343cfee431
+  metadata.gz: 2c47a890620bb658d731e15874d9a2921bdc0b349c0f4c7b5a5cab6f4d4938ee
+  data.tar.gz: 133ccad2b3905c2cff2cee872c790bc11334a155a799b92824f0a669a2f1538e
 SHA512:
-  metadata.gz: cf78bed99d4180a145ae7edf411a8d6840e622e315f2b1173294ded82288b87d404ef23796e38bb025fea51f8e437a09fc7d5e643835156400bda73cafc64ebe
-  data.tar.gz: a69c674a42bab959fe7483ac568a2e7102d141f3d861327c1b4f64c4d7e22864f298385917fbbb0b93bcc205565c4233d4a455423885d91a86b315796063c2b4
+  metadata.gz: 2b655070423818845c7ba052ca1ce81a9e73c3066c4f1b5c915169ef8d3c810696bc84cb773c4b10993a471e9428ad93021480fda51cc26d949568ecc1ecca73
+  data.tar.gz: 9f7e7d365fc7326e9714120bfaa4c0cfd4df27c29d44deb213310ed5cc9374e44e462f311e57fe3e7181ade321a0f1543202da24267da10eb78ced5cc872865c

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+<a name="v1.60.0"></a>
+### v1.60.0 (2021-10-01)
+
+#### Features
+
+* allow SSL verification to be disabled in the HAL client by setting the environment variable PACT_DISABLE_SSL_VERIFICATION=true	 ([ce07d32](/../../commit/ce07d32))
+
+<a name="v1.59.0"></a>
+### v1.59.0 (2021-09-07)
+
+#### Features
+
+* update descriptions for new consumer version selectors	 ([0471397](/../../commit/0471397))
+
+<a name="v1.58.0"></a>
+### v1.58.0 (2021-09-01)
+
+#### Features
+
+* support publishing verification results with a version branch	 ([da2facf](/../../commit/da2facf))
+
+#### Bug Fixes
+
+* gracefully handle display of username that causes InvalidComponentError to be raised when composing a URI	 ([cecb98f](/../../commit/cecb98f))
+
+<a name="v1.57.0"></a>
+### v1.57.0 (2021-01-27)
+
+#### Features
+
+* allow verbose flag to be set when publishing verifications	 ([9238e4c](/../../commit/9238e4c))
+
 <a name="v1.56.0"></a>
 ### v1.56.0 (2021-01-22)
 

data/lib/pact/cli/run_pact_verification.rb

@@ -79,6 +79,7 @@ module Pact
       def pact_spec_options
         {
           full_backtrace: options[:backtrace],
+          verbose: options[:verbose] || ENV['VERBOSE'] == 'true',
           criteria: SpecCriteria.call(options),
           format: options[:format],
           out: options[:out],

data/lib/pact/cli.rb

@@ -16,6 +16,7 @@ module Pact
     method_option :pact_broker_password, aliases: "-w", desc: "Pact broker password"
     method_option :pact_broker_token, aliases: "-k", desc: "Pact broker token"
     method_option :backtrace, aliases: "-b", desc: "Show full backtrace", :default => false, :type => :boolean
+    method_option :verbose, aliases: "-v", desc: "Show verbose HTTP logging", :default => false, :type => :boolean
     method_option :interactions_replay_order, aliases: "-o",
                   desc: "Interactions replay order: randomised or recorded (default)",
                   default: Pact.configuration.interactions_replay_order

data/lib/pact/hal/http_client.rb

@@ -2,6 +2,7 @@ require 'pact/retry'
 require 'pact/hal/authorization_header_redactor'
 require 'net/http'
 require 'rack'
+require 'openssl'
 
 module Pact
   module Hal
@@ -48,10 +49,16 @@ module Pact
       def perform_request request, uri
         response = Retry.until_true do
           http = Net::HTTP.new(uri.host, uri.port, :ENV)
-          http.set_debug_output(output_stream) if verbose
+          http.set_debug_output(output_stream) if verbose?
           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 disable_ssl_verification?
+            if verbose?
+              Pact.configuration.output_stream.puts("SSL verification is disabled")
+            end
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
           http.start do |http|
             http.request request
           end
@@ -63,6 +70,14 @@ module Pact
         AuthorizationHeaderRedactor.new(Pact.configuration.output_stream)
       end
 
+      def verbose?
+        verbose || ENV['VERBOSE'] == 'true'
+      end
+
+      def disable_ssl_verification?
+        ENV['PACT_DISABLE_SSL_VERIFICATION'] == 'true' || ENV['PACT_BROKER_DISABLE_SSL_VERIFICATION'] == 'true'
+      end
+
       class Response < SimpleDelegator
         def body
           bod = raw_body

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -10,7 +10,7 @@ module Pact
   module PactBroker
     class FetchPactURIsForVerification
       include PactSelectionDescription
-      attr_reader :provider, :consumer_version_selectors, :provider_version_tags, :broker_base_url, :http_client_options, :http_client, :options
+      attr_reader :provider, :consumer_version_selectors, :provider_version_branch, :provider_version_tags, :broker_base_url, :http_client_options, :http_client, :options
 
       PACTS_FOR_VERIFICATION_RELATION = 'pb:provider-pacts-for-verification'.freeze
       PACTS_FOR_VERIFICATION_RELATION_BETA = 'beta:provider-pacts-for-verification'.freeze
@@ -20,9 +20,10 @@ module Pact
       SELF = 'self'.freeze
       EMBEDDED = '_embedded'.freeze
 
-      def initialize(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options, options = {})
+      def initialize(provider, consumer_version_selectors, provider_version_branch, provider_version_tags, broker_base_url, http_client_options, options = {})
         @provider = provider
         @consumer_version_selectors = consumer_version_selectors || []
+        @provider_version_branch = provider_version_branch
         @provider_version_tags = [*provider_version_tags]
         @http_client_options = http_client_options
         @broker_base_url = broker_base_url
@@ -30,8 +31,8 @@ module Pact
         @options = options
       end
 
-      def self.call(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options, options = {})
-        new(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options, options).call
+      def self.call(provider, consumer_version_selectors, provider_version_branch, provider_version_tags, broker_base_url, http_client_options, options = {})
+        new(provider, consumer_version_selectors, provider_version_branch, provider_version_tags, broker_base_url, http_client_options, options).call
       end
 
       def call
@@ -76,6 +77,7 @@ module Pact
         q["includePendingStatus"] = true if options[:include_pending_status]
         q["consumerVersionSelectors"] = consumer_version_selectors if consumer_version_selectors.any?
         q["providerVersionTags"] = provider_version_tags if provider_version_tags.any?
+        q["providerVersionBranch"] = provider_version_branch if provider_version_branch
         q["includeWipPactsSince"] = options[:include_wip_pacts_since] if options[:include_wip_pacts_since]
         q
       end

data/lib/pact/pact_broker/pact_selection_description.rb

@@ -5,11 +5,48 @@ module Pact
         message = "Fetching pacts for #{provider} from #{broker_base_url} with the selection criteria: "
         if consumer_version_selectors.any?
           desc = consumer_version_selectors.collect do |selector|
-            all_or_latest = !selector[:latest] ? "all for tag" : "latest for tag"
-            consumer = selector[:consumer] ? "of consumer #{selector[:consumer]}" : nil
+            desc = nil
+            if selector[:tag]
+              desc = !selector[:latest] ? "all for tag #{selector[:tag]}" : "latest for tag #{selector[:tag]}"
+              desc = "#{desc} of #{selector[:consumer]}" if selector[:consumer]
+            elsif selector[:branch]
+              desc = "latest from branch #{selector[:branch]}"
+              desc = "#{desc} of #{selector[:consumer]}" if selector[:consumer]
+            elsif selector[:mainBranch]
+              desc = "latest from main branch"
+              desc = "#{desc} of #{selector[:consumer]}" if selector[:consumer]
+            elsif selector[:deployed]
+              if selector[:environment]
+                desc = "currently deployed to #{selector[:environment]}"
+              else
+                desc = "currently deployed"
+              end
+              desc = "#{selector[:consumer]} #{desc}" if selector[:consumer]
+            elsif selector[:released]
+              if selector[:environment]
+                desc = "currently released to #{selector[:environment]}"
+              else
+                desc = "currently released"
+              end
+              desc = "#{selector[:consumer]} #{desc}" if selector[:consumer]
+            elsif selector[:deployedOrReleased]
+              if selector[:environment]
+                desc = "currently deployed or released to #{selector[:environment]}"
+              else
+                desc = "currently deployed or released"
+              end
+              desc = "#{selector[:consumer]} #{desc}" if selector[:consumer]
+            elsif selector[:environment]
+              desc = "currently in #{selector[:environment]}"
+              desc = "#{selector[:consumer]} #{desc}" if selector[:consumer]
+            else
+              desc = selector.to_s
+            end
+
             fallback = selector[:fallback] || selector[:fallbackTag]
-            name = fallback ? "#{selector[:tag]} (or #{fallback} if not found)" : selector[:tag]
-            [all_or_latest, name, consumer].compact.join(" ")
+            desc = "#{desc} (or #{fallback} if not found)" if fallback
+
+            desc
           end.join(", ")
           if options[:include_wip_pacts_since]
             desc = "#{desc}, work in progress pacts created after #{options[:include_wip_pacts_since]}"

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

@@ -15,10 +15,11 @@ 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_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
 
-        def initialize(provider_name, provider_version_tags)
+        def initialize(provider_name, provider_version_branch, provider_version_tags)
           @_provider_name = provider_name
+          @_provider_version_branch = provider_version_branch
           @_provider_version_tags = provider_version_tags
           @_consumer_version_tags = []
           @_consumer_version_selectors = []
@@ -69,6 +70,7 @@ module Pact
           fetch_pacts = Pact::PactBroker::FetchPactURIsForVerification.new(
             _provider_name,
             consumer_version_selectors,
+            _provider_version_branch,
             _provider_version_tags,
             _pact_broker_base_url,
             _basic_auth_options.merge(verbose: _verbose),

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

@@ -4,9 +4,11 @@ module Pact
       class ServiceProviderConfig
 
         attr_accessor :application_version
+        attr_reader :branch
 
-        def initialize application_version, tags, publish_verification_results, &app_block
+        def initialize application_version, branch, tags, publish_verification_results, &app_block
           @application_version = application_version
+          @branch = branch
           @tags = [*tags]
           @publish_verification_results = publish_verification_results
           @app_block = app_block

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

@@ -15,7 +15,7 @@ module Pact
 
         extend Pact::DSL
 
-        attr_accessor :name, :app_block, :application_version, :tags, :publish_verification_results
+        attr_accessor :name, :app_block, :application_version, :branch, :tags, :publish_verification_results
 
         CONFIG_RU_APP = lambda {
           unless File.exist? Pact.configuration.config_ru_path
@@ -44,6 +44,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
@@ -65,7 +69,7 @@ module Pact
         end
 
         def create_pact_verification_from_broker(&block)
-          PactVerificationFromBroker.build(name, tags, &block)
+          PactVerificationFromBroker.build(name, branch, tags, &block)
         end
 
         def finalize
@@ -85,7 +89,7 @@ module Pact
         end
 
         def create_service_provider
-          Pact.configuration.provider = ServiceProviderConfig.new(application_version, tags, publish_verification_results, &@app_block)
+          Pact.configuration.provider = ServiceProviderConfig.new(application_version, branch, tags, publish_verification_results, &@app_block)
         end
       end
     end

data/lib/pact/provider/pact_spec_runner.rb

@@ -75,6 +75,7 @@ module Pact
         end
 
         # For the Pact::Provider::RSpec::PactBrokerFormatter
+        Pact.provider_world.verbose = options[:verbose]
         Pact.provider_world.pact_sources = pact_sources
         jsons = pact_jsons
         executing_with_ruby = executing_with_ruby?

data/lib/pact/provider/pact_uri.rb

@@ -30,7 +30,11 @@ module Pact
 
       def to_s
         if basic_auth? && http_or_https_uri?
-          URI(@uri).tap { |x| x.userinfo="#{username}:*****"}.to_s
+          begin
+            URI(@uri).tap { |x| x.userinfo="#{username}:*****"}.to_s
+          rescue URI::InvalidComponentError
+            URI(@uri).tap { |x| x.userinfo="*****:*****"}.to_s
+          end
         elsif personal_access_token? && http_or_https_uri?
           URI(@uri).tap { |x| x.userinfo="*****"}.to_s
         else
@@ -45,7 +49,7 @@ module Pact
       private def http_or_https_uri?
         uri.start_with?('http://', 'https://')
       end
-      
+
     end
   end
 end

data/lib/pact/provider/rspec/pact_broker_formatter.rb

@@ -25,7 +25,7 @@ module Pact
         end
 
         def close(_notification)
-          Pact::Provider::VerificationResults::PublishAll.call(Pact.provider_world.pact_sources, output_hash)
+          Pact::Provider::VerificationResults::PublishAll.call(Pact.provider_world.pact_sources, output_hash, { verbose: Pact.provider_world.verbose })
         end
 
       private

data/lib/pact/provider/rspec.rb

@@ -36,7 +36,7 @@ module Pact
               pact_source: pact_source,
               consumer_contract: consumer_contract,
               criteria: options[:criteria]
-              )
+            )
           end
         end
 

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

@@ -16,21 +16,23 @@ module Pact
         PUBLISH_RELATION = 'pb:publish-verification-results'.freeze
         PROVIDER_RELATION = 'pb:provider'.freeze
         VERSION_TAG_RELATION = 'pb:version-tag'.freeze
+        BRANCH_VERSION_RELATION = 'pb:branch-version'.freeze
 
-        def self.call pact_source, verification_result
-          new(pact_source, verification_result).call
+        def self.call pact_source, verification_result, options = {}
+          new(pact_source, verification_result, options).call
         end
 
-        def initialize pact_source, verification_result
+        def initialize pact_source, verification_result, options = {}
           @pact_source = pact_source
           @verification_result = verification_result
           http_client_options = pact_source.uri.options.reject{ |k, v| ![:username, :password, :token].include?(k) }
-          @http_client = Pact::Hal::HttpClient.new(http_client_options)
+          @http_client = Pact::Hal::HttpClient.new(http_client_options.merge(verbose: options[:verbose]))
           @pact_entity = Pact::Hal::Entity.new(pact_source.uri, pact_source.pact_hash, http_client)
         end
 
         def call
           if can_publish_verification_results?
+            create_branch_version_if_configured
             tag_versions_if_configured
             publish_verification_results
             true
@@ -72,8 +74,28 @@ module Pact
           end
         end
 
+        def create_branch_version_if_configured
+          if Pact.configuration.provider.branch
+            branch_version_link = provider_entity._link(BRANCH_VERSION_RELATION)
+            if branch_version_link
+              version_number = Pact.configuration.provider.application_version
+              branch = Pact.configuration.provider.branch
+
+              Pact.configuration.output_stream.puts "INFO: Creating #{provider_name} version #{version_number} with branch \"#{branch}\""
+              branch_entity = branch_version_link.expand(
+                version: version_number,
+                branch: branch
+              ).put
+              unless branch_entity.success?
+                raise PublicationError.new("Error returned from tagging request: status=#{branch_entity.response.code} body=#{branch_entity.response.body}")
+              end
+            else
+              raise PublicationError.new("This version of the Pact Broker does not support version branches. Please update to version 2.58.0 or later.")
+            end
+          end
+        end
+
         def tag_versions
-          provider_entity = pact_entity.get(PROVIDER_RELATION)
           tag_link = provider_entity._link(VERSION_TAG_RELATION) || hacky_tag_url(provider_entity)
           provider_application_version = Pact.configuration.provider.application_version
 
@@ -111,6 +133,10 @@ module Pact
         def provider_name
           pact_source.pact_hash['provider']['name']
         end
+
+        def provider_entity
+          @provider_entity ||= pact_entity.get(PROVIDER_RELATION)
+        end
       end
     end
   end

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

@@ -6,20 +6,21 @@ module Pact
     module VerificationResults
       class PublishAll
 
-        def self.call pact_sources, test_results_hash
-          new(pact_sources, test_results_hash).call
+        def self.call pact_sources, test_results_hash, options = {}
+          new(pact_sources, test_results_hash, options).call
         end
 
-        def initialize pact_sources, test_results_hash
+        def initialize pact_sources, test_results_hash, options = {}
           @pact_sources = pact_sources
           @test_results_hash = test_results_hash
+          @options = options
         end
 
         def call
           verification_results.collect do | (pact_source, verification_result) |
             published = false
             begin
-              published = Publish.call(pact_source, verification_result)
+              published = Publish.call(pact_source, verification_result, { verbose: options[:verbose] })
             ensure
               print_after_verification_notices(pact_source, verification_result, published)
             end
@@ -42,7 +43,7 @@ module Pact
           end
         end
 
-        attr_reader :pact_sources, :test_results_hash
+        attr_reader :pact_sources, :test_results_hash, :options
       end
     end
   end

data/lib/pact/provider/world.rb

@@ -14,7 +14,7 @@ module Pact
   module Provider
     class World
 
-      attr_accessor :pact_sources, :failed_examples
+      attr_accessor :pact_sources, :failed_examples, :verbose
 
       def provider_states
         @provider_states_proxy ||= Pact::Provider::State::ProviderStateProxy.new

data/lib/pact/version.rb

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

data/pact.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'webrick', '~> 1.3'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
-  gem.add_runtime_dependency 'pact-support', '~> 1.15'
+  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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.56.0
+  version: 1.60.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,14 +102,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.9
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -405,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.2.28
 signing_key: 
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL