pact_broker 2.93.1 → 2.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de53f660bed816c0008b97aa61e0a83048b25ad3661d64c9ffdf2afae4c172e7
-  data.tar.gz: 20a5cbff3cc5b088e10d7291230fd80192d133c8f69ffadd551a123a35010f84
+  metadata.gz: 15cc9869c313dbadd50a4bcc89d3912717cc5f8512af30326b716d2a3cc636ad
+  data.tar.gz: 5d8c0f7240e7b312e096afb75ab8d2f9b91a9f26284be9e90e680bc59615cb02
 SHA512:
-  metadata.gz: 7010895f3d08993533b1a9b9cd6521ffe5e2e49a83bf3721938d9b1fa18dcf3510639b0b08747dc3c27a823c4562787566e345d50ff306f9a793e878411f16c8
-  data.tar.gz: 85ddcc1ad9a17391ef4aa0c27e7d8f9e9e2a873c3acd89a8b67f42dd609198d2f4866a3e0d83857cc7e3b15028c5257e360867fb0c3dfe0487083d5eff2c2b1f
+  metadata.gz: 1d223aa03faeac6cda65c71fab594b2bebed430690758ba768b34002e50434acfd556629593909aad8e494e59c26a067abf0243dae0345b482f9f111065e46ff
+  data.tar.gz: db169a6db83b20c37e28bacf7e83975f89fa204e41ed8c75a58708a658b6ae3177f7235a32a54db2138d0a5f9f471a92f3e6934f00d222fa6b8310ba987e55e0

data/CHANGELOG.md

@@ -1,3 +1,52 @@
+<a name="v2.94.0"></a>
+### v2.94.0 (2022-02-22)
+
+#### Features
+
+* add can-i-deploy endpoint for checking if the latest version for a branch can be deployed to a particular environment	 ([34b145e8](/../../commit/34b145e8))
+* truncate tags, branches and versions in UI when they are super long (#513)	 ([94bbf915](/../../commit/94bbf915))
+
+* **integration dashboard**
+  * add copy buttons next to the branch, tag and environment labels	 ([5b86ac88](/../../commit/5b86ac88))
+
+#### Bug Fixes
+
+* Improve Matrix request performance (#537)	 ([123f8629](/../../commit/123f8629))
+* Eagerly load pact publication fields (#536)	 ([c3f6993b](/../../commit/c3f6993b))
+
+* **hal-browser**
+  * properties accordion should be collapsed by default (#544)	 ([19466121](/../../commit/19466121))
+
+<a name="v2.93.4"></a>
+### v2.93.4 (2022-02-21)
+
+#### Bug Fixes
+
+* **matrix page**
+  * set correct base URL for links when a path is specified in the base URL	 ([8305456b](/../../commit/8305456b))
+
+* handle DateTimes that come back from Sqlite as Strings	 ([1312a049](/../../commit/1312a049))
+
+<a name="v2.93.3"></a>
+### v2.93.3 (2022-02-02)
+
+#### Bug Fixes
+
+* ensure webhook_certificates setting is honoured in webhook	 ([7933a526](/../../commit/7933a526))
+* ensure disable_ssl_verification setting is honoured in webhook	 ([08bc758c](/../../commit/08bc758c))
+* ensure webhook_certificates setting is honoured in webhook	 ([8a720cdb](/../../commit/8a720cdb))
+* ensure disable_ssl_verification setting is honoured in webhook	 ([0728b3d7](/../../commit/0728b3d7))
+
+* **hal-browser**
+  * fixing vulnerability by upgrading HAL browser dependencies	 ([a6b06f66](/../../commit/a6b06f66))
+
+<a name="v2.93.2"></a>
+### v2.93.2 (2021-12-23)
+
+#### Bug Fixes
+
+* Improve SortContent performance on large contracts (#538)	 ([1914c01f](/../../commit/1914c01f))
+
 <a name="v2.93.1"></a>
 ### v2.93.1 (2021-12-21)
 

data/db/migrations/migration_helper.rb

@@ -23,7 +23,7 @@ module PactBroker
     end
 
     def postgres?
-      adapter == "postgres"
+      adapter =~ /postgres/
     end
 
     def adapter

data/lib/db.rb

@@ -71,7 +71,7 @@ module DB
   end
 
   def self.postgres?
-    !!(PACT_BROKER_DB.adapter_scheme.to_s == "postgres")
+    !!(PACT_BROKER_DB.adapter_scheme.to_s =~ /postgres/)
   end
 
   PACT_BROKER_DB ||= connection_for_env ENV.fetch("RACK_ENV")

data/lib/pact_broker/api/decorators/format_date_time.rb

@@ -2,8 +2,16 @@ module PactBroker
   module Api
     module Decorators
       module FormatDateTime
+        # Keep this in sync with Sequel.datetime_class.
+        # Needs to be upgraded from DateTime to Time as Time is deprecated
+        DATE_TIME_CLASS = DateTime
+
         def self.call(date_time)
-          date_time.to_time.utc.to_datetime.xmlschema if date_time
+          if date_time.is_a?(String)
+            DATE_TIME_CLASS.strptime(date_time).to_time.utc.to_datetime.xmlschema
+          elsif date_time
+            date_time.to_time.utc.to_datetime.xmlschema if date_time
+          end
         end
 
         def format_date_time(date_time)

data/lib/pact_broker/api/resources/can_i_deploy_pacticipant_version_by_branch_to_environment.rb

@@ -0,0 +1,50 @@
+require "pact_broker/api/resources/matrix"
+require "pact_broker/matrix/can_i_deploy_query_schema"
+require "pact_broker/matrix/parse_can_i_deploy_query"
+
+module PactBroker
+  module Api
+    module Resources
+      class CanIDeployPacticipantVersionByBranchToEnvironment < Matrix
+        def resource_exists?
+          !!(version && environment)
+        end
+
+        def malformed_request?
+          false
+        end
+
+        def policy_name
+          :'matrix::can_i_deploy'
+        end
+
+        private
+
+        def selectors
+          @selectors ||= [
+                            PactBroker::Matrix::UnresolvedSelector.new(
+                              pacticipant_name: pacticipant_name,
+                              latest: true,
+                              branch: identifier_from_path[:branch_name]
+                            )
+                          ]
+        end
+
+        def options
+          @options ||=  {
+                          latestby: "cvp",
+                          environment_name: identifier_from_path[:environment_name]
+                        }
+        end
+
+        def version
+          @version ||= version_service.find_latest_by_pacticipant_name_and_branch_name(identifier_from_path[:pacticipant_name], identifier_from_path[:branch_name])
+        end
+
+        def environment
+          @environment ||= environment_service.find_by_name(identifier_from_path[:environment_name])
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/resources/{can_i_deploy_pacticipant_version.rb → can_i_deploy_pacticipant_version_by_tag_to_tag.rb}

@@ -5,7 +5,7 @@ require "pact_broker/matrix/parse_can_i_deploy_query"
 module PactBroker
   module Api
     module Resources
-      class CanIDeployPacticipantVersion < Matrix
+      class CanIDeployPacticipantVersionByTagToTag < Matrix
         def resource_exists?
           !!version
         end
@@ -14,26 +14,29 @@ module PactBroker
           :'matrix::can_i_deploy'
         end
 
+        def malformed_request?
+          false
+        end
+
         private
 
         def selectors
-          @selectors ||= begin
-            [
-              PactBroker::Matrix::UnresolvedSelector.new(
-                pacticipant_name: pacticipant_name,
-                latest: true,
-                tag: identifier_from_path[:tag]
-              )
-            ]
-          end
+          @selectors ||= [
+                            PactBroker::Matrix::UnresolvedSelector.new(
+                              pacticipant_name: pacticipant_name,
+                              latest: true,
+                              tag: identifier_from_path[:tag],
+                            )
+                          ]
+
         end
 
         def options
           @options ||= {
-            latestby: "cvp",
-            latest: true,
-            tag: identifier_from_path[:to]
-          }
+                          latestby: "cvp",
+                          latest: true,
+                          tag: identifier_from_path[:to]
+                        }
         end
 
         def version

data/lib/pact_broker/api.rb

@@ -81,15 +81,19 @@ module PactBroker
         add ["pacticipants"], Api::Resources::Pacticipants, {resource_name: "pacticipants"}
         add ["pacticipants", "label", :label_name], PactBroker::Api::Resources::PacticipantsForLabel, {resource_name: "pacticipants_for_label"}
         add ["pacticipants", :pacticipant_name], Api::Resources::Pacticipant, {resource_name: "pacticipant"}
+        add ["pacticipants", :pacticipant_name, "labels", :label_name], Api::Resources::Label, {resource_name: "pacticipant_label"}
+
+        # Versions
         add ["pacticipants", :pacticipant_name, "versions"], Api::Resources::Versions, {resource_name: "pacticipant_versions"}
         add ["pacticipants", :pacticipant_name, "versions", :pacticipant_version_number], Api::Resources::Version, {resource_name: "pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "latest-version", :tag], Api::Resources::LatestVersion, {resource_name: "latest_tagged_pacticipant_version"}
-        add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to], Api::Resources::CanIDeployPacticipantVersion, { resource_name: "can_i_deploy_latest_tagged_version" }
-        add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to, "badge"], Api::Resources::CanIDeployBadge, { resource_name: "can_i_deploy_badge" }
+        add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to], Api::Resources::CanIDeployPacticipantVersionByTagToTag, { resource_name: "can_i_deploy_latest_tagged_version_to_tag" }
+        add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to, "badge"], Api::Resources::CanIDeployBadge, { resource_name: "can_i_deploy_latest_tagged_version_to_tag_badge" }
         add ["pacticipants", :pacticipant_name, "latest-version"], Api::Resources::LatestVersion, {resource_name: "latest_pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "versions", :pacticipant_version_number, "tags", :tag_name], Api::Resources::Tag, {resource_name: "pacticipant_version_tag"}
-        add ["pacticipants", :pacticipant_name, "labels", :label_name], Api::Resources::Label, {resource_name: "pacticipant_label"}
         add ["pacticipants", :pacticipant_name, "branches", :branch_name, "versions", :version_number], Api::Resources::BranchVersion, { resource_name: "branch_version" }
+        add ["pacticipants", :pacticipant_name, "branches", :branch_name, "latest-version", "can-i-deploy", "to-environment", :environment_name], Api::Resources::CanIDeployPacticipantVersionByBranchToEnvironment, { resource_name: "can_i_deploy_latest_branch_version_to_environment" }
+        #add ["pacticipants", :pacticipant_name, "branches", :branch_name, "latest-version", "can-i-deploy", "to-environment", :environment_name, "badge"], Api::Resources::CanIDeployPacticipantVersionByBranchToEnvironment, { resource_name: "can_i_deploy_latest_branch_version_to_environment_badge" }
 
         # Webhooks
         add ["webhooks", "provider", :provider_name, "consumer", :consumer_name ], Api::Resources::PacticipantWebhooks, {resource_name: "pacticipant_webhooks"}

data/lib/pact_broker/badges/service.rb

@@ -132,7 +132,7 @@ module PactBroker
         with_cache uri do
           request = Net::HTTP::Get.new(uri)
           options = {read_timeout: 3, open_timeout: 1, ssl_timeout: 1, continue_timeout: 1}
-          options.merge! PactBroker::BuildHttpOptions.call(uri)
+          options.merge! PactBroker::BuildHttpOptions.call(uri, disable_ssl_verification: PactBroker.configuration.disable_ssl_verification)
 
           Net::HTTP.start(uri.hostname, uri.port, :ENV, options) do |http|
             http.request request

data/lib/pact_broker/build_http_options.rb

@@ -4,14 +4,14 @@ module PactBroker
   class BuildHttpOptions
     extend PactBroker::Services
 
-    def self.call  uri
+    def self.call uri, disable_ssl_verification: false, cert_store: nil
       uri = URI(uri)
       options = {}
-      
+
       if uri.scheme == "https"
         options[:use_ssl] = true
-        options[:cert_store] = cert_store
-        if disable_ssl_verification?
+        options[:cert_store] = cert_store if cert_store
+        if disable_ssl_verification
           options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
         else
           options[:verify_mode] = OpenSSL::SSL::VERIFY_PEER
@@ -19,14 +19,6 @@ module PactBroker
       end
       options
     end
-    
-    def self.disable_ssl_verification?
-      PactBroker.configuration.disable_ssl_verification
-    end
-    
-    def self.cert_store
-      certificate_service.cert_store
-    end    
   end
 end
 

data/lib/pact_broker/certificates/service.rb

@@ -15,7 +15,7 @@ module PactBroker
         cert_store.set_default_paths
         find_all_certificates.each do | certificate |
           begin
-            logger.debug("Loading certificate #{certificate.subject} in to cert store")
+            logger.debug("Loading certificate for subject #{certificate.subject} and issuer #{certificate.issuer} in to cert store")
             cert_store.add_cert(certificate)
           rescue StandardError => e
             logger.warn("Error adding certificate object #{certificate} to store", e)
@@ -42,7 +42,7 @@ module PactBroker
       end
 
       def certificates_from_config
-        PactBroker.configuration.webhook_certificates.select{| c| c[:content] || c[:path] }.collect do | certificate_config, i |
+        PactBroker.configuration.webhook_certificates.select{| c| c[:content] || c[:path] }.collect.with_index do | certificate_config, i |
           load_certificate_config(certificate_config, i)
         end.flatten.compact
       end
@@ -54,7 +54,7 @@ module PactBroker
             begin
               OpenSSL::X509::Certificate.new(c)
             rescue StandardError => e
-              logger.warn("Error creating certificate object from webhook_certificate at index #{i} with description #{certificate_config[:description]}", e)
+              logger.warn("Error creating certificate object from webhook_certificates at index #{i} with description #{certificate_config[:description]}", e)
               nil
             end
           end

data/lib/pact_broker/config/runtime_configuration_database_methods.rb

@@ -72,7 +72,7 @@ module PactBroker
           end
 
           def postgres?
-            database_credentials[:adapter] == "postgres"
+            database_credentials[:adapter] =~ /postgres/
           end
           private :postgres?
 

data/lib/pact_broker/date_helper.rb

@@ -4,7 +4,6 @@ module PactBroker
     extend self
 
     # Ripped from actionview/lib/action_view/helpers/date_helper.rb
-
     def local_date_in_words datetime
       datetime.to_time.localtime.to_datetime.strftime("%a %d %b %Y, %l:%M%P %:z").gsub("  ", " ")
     end
@@ -31,9 +30,6 @@ module PactBroker
       distance_in_minutes = ((to_time - from_time)/60.0).round
       distance_in_seconds = (to_time - from_time).round
 
-      # require 'pry'; pry(binding);
-
-      # locale = I18n.with_options :locale => options[:locale], :scope => options[:scope]
       locale = Locale.new(:locale => options[:locale], :scope => options[:scope])
       case distance_in_minutes
       when 0..1

data/lib/pact_broker/domain/pact.rb

@@ -41,7 +41,7 @@ module PactBroker
       end
 
       def consumer
-        consumer_version.pacticipant
+        @consumer || consumer_version.pacticipant
       end
 
       def consumer_version_tag_names

data/lib/pact_broker/domain/version.rb

@@ -241,6 +241,13 @@ module PactBroker
         end
         # rubocop: enable Metrics/CyclomaticComplexity
 
+        def pacticipants_set
+          from_self(alias: :v)
+            .select_group(Sequel[:v][:pacticipant_id])
+            .collect(&:pacticipant_id)
+            .to_set
+        end
+
         # private
 
         def calculate_max_version_order_and_join_back_to_versions(query, selector)

data/lib/pact_broker/domain/webhook.rb

@@ -50,7 +50,7 @@ module PactBroker
       def execute pact, verification, event_context, options
         logger.info "Executing #{self} event_context=#{event_context}"
         template_params = template_parameters(pact, verification, event_context, options)
-        webhook_request = request.build(template_params, options.fetch(:user_agent))
+        webhook_request = request.build(template_params, options.slice(:user_agent, :disable_ssl_verification, :cert_store))
         http_response, error = execute_request(webhook_request)
         success = success?(http_response, options)
         http_request = webhook_request.http_request

data/lib/pact_broker/domain/webhook_request.rb

@@ -18,7 +18,7 @@ module PactBroker
 
       HEADERS_TO_REDACT = [/authorization/i, /token/i]
 
-      attr_accessor :method, :url, :headers, :body, :username, :password, :uuid, :user_agent
+      attr_accessor :method, :url, :headers, :body, :username, :password, :uuid, :user_agent, :disable_ssl_verification, :cert_store
 
       # Reform gets confused by the :method method, as :method is a standard
       # Ruby method.
@@ -47,7 +47,7 @@ module PactBroker
       end
 
       def execute
-        options = PactBroker::BuildHttpOptions.call(uri).merge(read_timeout: 15, open_timeout: 15)
+        options = PactBroker::BuildHttpOptions.call(uri, disable_ssl_verification: disable_ssl_verification, cert_store: cert_store).merge(read_timeout: 15, open_timeout: 15)
         req = http_request
         Net::HTTP.start(uri.hostname, uri.port, :ENV, options) do |http|
           http.request req

data/lib/pact_broker/locale/en.yml

@@ -124,6 +124,9 @@ en:
   datetime:
     distance_in_words:
       half_a_minute: "half a minute"
+      less_than_x_minutes:
+        one: "less than 1 minute"
+        other: "less than %{count} minutes"
       less_than_x_seconds:
         one:   "less than 1 second"
         other: "less than %{count} seconds"

data/lib/pact_broker/matrix/quick_row.rb

@@ -124,15 +124,17 @@ module PactBroker
         end
 
         def eager_all_the_things
-          eager(:consumer)
-          .eager(:provider)
-          .eager(consumer_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, { branch_versions: :branch_head }])
-          .eager(provider_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, { branch_versions: :branch_head }])
-          .eager(:verification)
-          .eager(:pact_publication)
-          .eager(:pact_version)
-          .eager(:consumer_version_tags)
-          .eager(:provider_version_tags)
+          eager(
+            :consumer,
+            :provider,
+            :verification,
+            :pact_publication,
+            :pact_version,
+            consumer_version: { current_deployed_versions: :environment, current_supported_released_versions: :environment, branch_versions: [:branch_head, :version, branch: :pacticipant] },
+            provider_version: { current_deployed_versions: :environment, current_supported_released_versions: :environment, branch_versions: [:branch_head, :version, branch: :pacticipant] },
+            consumer_version_tags: { version: :pacticipant },
+            provider_version_tags: { version: :pacticipant }
+          )
         end
 
         def default_scope

data/lib/pact_broker/matrix/repository.rb

@@ -127,20 +127,19 @@ module PactBroker
       def integrations_where_specified_selector_is_provider(resolved_specified_selectors, options)
         integrations_involving_specified_providers = PactBroker::Integrations::Integration
                                                       .where(provider_id: resolved_specified_selectors.collect(&:pacticipant_id))
-                                                      .eager(:consumer)
+                                                      .eager(:consumer, :provider)
                                                       .all
 
         destination_selector = PactBroker::Matrix::UnresolvedSelector.new(options.slice(:latest, :tag, :branch, :environment_name).compact)
+        required = PactBroker::Domain::Version.for_selector(destination_selector).pacticipants_set
 
         integrations_involving_specified_providers.collect do | integration |
-          required = PactBroker::Domain::Version.where(pacticipant: integration.consumer).for_selector(destination_selector).any?
-
           Integration.from_hash(
             consumer_id: integration.consumer.id,
             consumer_name: integration.consumer.name,
             provider_id: integration.provider.id,
             provider_name: integration.provider.name,
-            required: required
+            required: required.member?(integration.consumer.id)
           )
         end
       end
@@ -221,8 +220,10 @@ module PactBroker
 
       # Find the version number for selectors with the latest and/or tag specified
       def resolve_versions_and_add_ids(unresolved_selectors, selector_type, resolved_ignore_selectors = [])
+        names = unresolved_selectors.collect(&:pacticipant_name)
+        pacticipants = PactBroker::Domain::Pacticipant.where(name: names).to_a.group_by(&:name).transform_values(&:first)
         unresolved_selectors.collect do | unresolved_selector |
-          pacticipant = PactBroker::Domain::Pacticipant.find(name: unresolved_selector.pacticipant_name)
+          pacticipant = pacticipants[unresolved_selector.pacticipant_name]
           if pacticipant
             versions = find_versions_for_selector(unresolved_selector)
             build_resolved_selectors(pacticipant, versions, unresolved_selector, selector_type, resolved_ignore_selectors)

data/lib/pact_broker/matrix/unresolved_selector.rb

@@ -9,6 +9,7 @@ module PactBroker
         merge!(params)
       end
 
+      # TODO rename branch to branch_name
       def self.from_hash(hash)
         new(hash.symbolize_keys.snakecase_keys.slice(:pacticipant_name, :pacticipant_version_number, :latest, :tag, :branch, :environment_name))
       end

data/lib/pact_broker/metrics/service.rb

@@ -18,7 +18,7 @@ module PactBroker
             withMainBranchSetCount: PactBroker::Domain::Pacticipant.with_main_branch_set.count
           },
           integrations: {
-            count: PactBroker::Integrations::Integration.count
+            count: PactBroker::Pacts::PactPublication.select(:consumer_id, :provider_id).distinct.count
           },
           pactPublications: {
             count: PactBroker::Pacts::PactPublication.count,

data/lib/pact_broker/pacts/pacts_for_verification_repository.rb

@@ -19,6 +19,13 @@ module PactBroker
       include PactBroker::Repositories::Helpers
       include PactBroker::Repositories::Scopes
 
+      PUBLICATION_ASSOCIATIONS_FOR_EAGER_LOAD = [
+        :provider,
+        :consumer,
+        :consumer_version,
+        pact_version: :latest_verification
+      ]
+
       def find(provider_name, consumer_version_selectors)
         selected_pacts = find_pacts_by_selector(provider_name, consumer_version_selectors)
         selected_pacts = selected_pacts + find_pacts_for_fallback_tags(selected_pacts, provider_name, consumer_version_selectors)
@@ -104,7 +111,7 @@ module PactBroker
 
         specified_selectors_or_defaults(consumer_version_selectors, provider).flat_map do | selector |
           query = scope_for(PactPublication).for_provider_and_consumer_version_selector(provider, selector)
-          query.all.collect do | pact_publication |
+          query.eager(*PUBLICATION_ASSOCIATIONS_FOR_EAGER_LOAD).all.collect do | pact_publication |
             create_selected_pact(pact_publication, selector)
           end
         end
@@ -265,7 +272,12 @@ module PactBroker
           log_pact_publications("Ignoring pacts successfully verified by another provider branch when not WIP", verified_by_other_branch)
         end
 
-        PactPublication.subtract(pact_publications_query.all, specified_explicitly.all, verified_by_this_branch.all, verified_by_other_branch.all)
+        PactPublication.subtract(
+          pact_publications_query.eager(*PUBLICATION_ASSOCIATIONS_FOR_EAGER_LOAD).all,
+          specified_explicitly.all,
+          verified_by_this_branch.all,
+          verified_by_other_branch.all
+        )
       end
 
       def remove_non_wip_for_tag(pact_publications_query, provider, tag, specified_pact_version_shas)
@@ -279,7 +291,11 @@ module PactBroker
           log_pact_publications("Ignoring pacts successfully verified by another provider tag when not WIP", verified_by_another_tag)
         end
 
-        PactPublication.subtract(pact_publications_query.all, specified_explicitly.all, verified_by_this_tag.all, verified_by_another_tag.all)
+        PactPublication.subtract(
+          pact_publications_query.eager(*PUBLICATION_ASSOCIATIONS_FOR_EAGER_LOAD).all,
+          specified_explicitly.all,
+          verified_by_this_tag.all,
+          verified_by_another_tag.all)
       end
 
       def collect_consumer_name_and_version_number(pact_publications_query)

data/lib/pact_broker/pacts/selector.rb

@@ -283,8 +283,6 @@ module PactBroker
 
       # rubocop: disable Metrics/CyclomaticComplexity
       def <=> other
-        # elsif consumer || other.consumer
-        #   consumer_comparison(other)
         if overall_latest? || other.overall_latest?
           overall_latest_comparison(other)
         elsif latest_for_branch? || other.latest_for_branch?
@@ -297,6 +295,8 @@ module PactBroker
           currently_deployed_comparison(other)
         elsif currently_supported? || other.currently_supported?
           currently_supported_comparison(other)
+        elsif consumer || other.consumer
+          consumer_comparison(other)
         else
           0
         end
@@ -358,8 +358,8 @@ module PactBroker
       end
 
       def consumer_comparison(other)
-        if consumer == other.consumer
-          0
+        if consumer && other.consumer
+          consumer <=> other.consumer
         else
           consumer ? -1 : 1
         end

data/lib/pact_broker/pacts/service.rb

@@ -43,7 +43,7 @@ module PactBroker
       end
 
       def delete params
-        logger.info "Deleting pact version with params #{params}"
+        logger.info "Deleting pact version", payload: params
         pacts = pact_repository.find_all_revisions(params[:consumer_name], params[:consumer_version_number], params[:provider_name])
         webhook_service.delete_all_webhook_related_objects_by_pact_publication_ids(pacts.collect(&:id))
         pact_repository.delete(params)
@@ -156,7 +156,7 @@ module PactBroker
 
       # Overwriting an existing pact with the same consumer/provider/consumer version number
       def create_pact_revision params, existing_pact
-        logger.info "Updating existing pact publication", payload: params.reject{ |k, _v| k == :json_content }
+        logger.info "Updating existing pact publication", payload: params.without(:json_content)
         logger.debug "Content #{params[:json_content]}"
         pact_version_sha = generate_sha(params[:json_content])
         json_content = add_interaction_ids(params[:json_content])
@@ -185,7 +185,7 @@ module PactBroker
 
       # When no publication for the given consumer/provider/consumer version number exists
       def create_pact params, version, provider
-        logger.info "Creating new pact publication with params #{params.reject{ |k, _v| k == :json_content}}"
+        logger.info "Creating new pact publication", payload: params.without(:json_content)
         logger.debug "Content #{params[:json_content]}"
         pact_version_sha = generate_sha(params[:json_content])
         json_content = add_interaction_ids(params[:json_content])

data/lib/pact_broker/pacts/sort_content.rb

@@ -34,7 +34,7 @@ module PactBroker
         # You never can tell what people will do...
         if probably_array.is_a?(Array)
           array_with_ordered_hashes = order_hash_keys(probably_array)
-          array_with_ordered_hashes.sort{ |a, b| a.to_json <=> b.to_json }
+          array_with_ordered_hashes.sort_by(&:to_json)
         else
           probably_array
         end

data/lib/pact_broker/repositories/helpers.rb

@@ -36,7 +36,7 @@ module PactBroker
       end
 
       def postgres?
-        Sequel::Model.db.adapter_scheme.to_s == "postgres"
+        Sequel::Model.db.adapter_scheme.to_s =~ /postgres/
       end
 
       def select_all_qualified

data/lib/pact_broker/string_refinements.rb

@@ -55,6 +55,15 @@ module PactBroker
 
         str
       end
+
+      # Adopt from https://stackoverflow.com/questions/1451384/how-can-i-center-truncate-a-string
+      def ellipsisize(minimum_length: 20, edge_length: 10)
+        return self if self.length < minimum_length || self.length <= edge_length * 2
+
+        edge = "." * edge_length
+        mid_length = self.length - edge_length * 2
+        gsub(/(#{edge}).{#{mid_length},}(#{edge})/, '\1...\2')
+      end
     end
   end
 end