pact_broker 2.93.3 → 2.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945a04d666baecd644bffd53da2de97fad0af2cc6c1170ed7dabaa657ef71184
-  data.tar.gz: 1eec76fd7c899f5547e3cd6c937589c0976c98642ee2d33be753cb4739e2ab61
+  metadata.gz: e077e361037618a0d58670de46b25753d8755cb1e21ef58e9f73a8fe5705cd7f
+  data.tar.gz: 0e64d6fee6eb4cf36f69dea5bf94c432c088c93984ca51783e68f20b7b2e3130
 SHA512:
-  metadata.gz: 5877ebb9cf131b6c8897c39c639e279daa5d785e252184f2cffbbd5376e18ae9936f11bcb879e08745ec63f00f5c4d65b4bc77ef1f93d64c5193c3b86810534c
-  data.tar.gz: 2ed197a1ee3e6050688ed6074149210b7a8188fa3e60b68c12155f4b26eb3fe5def95ae4e13bc994f42a802b93540738240b59119b51b59bd2bfee3f9d030940
+  metadata.gz: 8c7bbae3ff3736576977f15aaef79a3d6635667de76b994a83c8c4613ce7fa9999808af70838014f7b5d7c26e7ffbda5da5e5813b1394dd6c4557fe597c9a11f
+  data.tar.gz: 4783820b31a355a9c2bf9a36151cc0730dba2a1424a1c68b8da39ac1f658cec3334b18c406b58d1b211cb0a5f3cc72b14a619066ca9d0c2daca828720f144d08

data/CHANGELOG.md

@@ -1,3 +1,45 @@
+<a name="v2.95.0"></a>
+### v2.95.0 (2022-03-16)
+
+#### Features
+
+* add relation for can-i-deploy branch to environment badge	 ([6ece8e93](/../../commit/6ece8e93))
+* add badge url for 'can I deploy latest version of branch to envionment' endpoint	 ([086b8c10](/../../commit/086b8c10))
+
+#### Bug Fixes
+
+* **pacts for verification**
+  * do not de-duplicate pacts with the same content but different consumers	 ([ae3bb541](/../../commit/ae3bb541))
+
+<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)
 

data/README.md

@@ -140,15 +140,14 @@ You can use the [Pact Broker Docker image][docker] or [Terraform on AWS][terrafo
 #### Rolling your own
 
 * Are you sure you don't just want to use the [Pact Broker Docker image][docker]? No Docker at your company yet? Ah well, keep reading.
-* Create a PostgreSQL (recommended) or MySQL (not _as_ recommended because of @bethesque's personal prejudices, but still fully supported) database.
- * To ensure you're on a supported version of the database that you choose, check the [travis.yml][travisyml] file to see which versions we're currently running our tests against.
-* If you're using PostgreSQL (did we mention this was _recommended!_) you'll find the database creation script in the [example/config.ru](https://github.com/pact-foundation/pact_broker/blob/master/example/config.ru).
-* Install ruby 2.4 or later and the latest version of bundler (if you've come this far, I'm assuming you know how to do both of these. Did I mention there was a [Docker][docker] image?)
+* Create a PostgreSQL database.
+  * To ensure you're on a supported version of the database that you choose, check the [travis.yml][travisyml] file to see which versions we're currently running our tests against.
+  * MySQL was supported for the native Ruby application until around 2021, but the official `pactfoundation/pact-broker` Docker image does not support it. New features will not be optimised for MySQL, and some new features may not even be supported on it (eg. the database clean feature).
+* You'll find a sample database creation script in the [example/config.ru](https://github.com/pact-foundation/pact_broker/blob/master/example/config.ru).
+* Install ruby 2.7 or later and the latest version of bundler (if you've come this far, I'm assuming you know how to do both of these. Did I mention there was a [Docker][docker] image?)
 * Copy the [pact\_broker](https://github.com/DiUS/pact_broker-docker/tree/master/pact_broker) directory from the Pact Broker Docker project. This will have the recommended settings for database connections, logging, basic auth etc. Note that the Docker image uses Phusion Passenger as the web application server in front of the Pact Broker Ruby application, which is the recommended set up.
-* Modify the config.ru and Gemfile as desired (eg. choose database driver gem, set your database credentials. Use the "pg" gem if using Postgres and the "mysql2" gem if using MySQL)
-    * example Sequel configuration for postgres `{adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}`
-    * example Sequel configuration for mysql `{adapter: "mysql2", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}`
-`
+* Modify the config.ru and Gemfile as desired (eg. choose database driver gem, set your database credentials. Use the "pg" gem for Postgres)
+  * example Sequel configuration for postgres `{ adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8' }`
 * Please ensure you use `encoding: 'utf8'` in your Sequel options to avoid encoding issues.
 * For production usage, use a web application server like [Phusion Passenger](https://www.phusionpassenger.com) or [Nginx](http://nginx.org/) to serve the Pact Broker application. You'll need to read up on the documentation for these yourself as it is beyond the scope of this documentation. See the [wiki][reverse-proxy-docs] for instructions on using a reverse proxy with SSL.
 * Ensure the environment variable `RACK_ENV` is set to `production`.

data/db/migrations/20220303_increase_consumer_version_selector_hashes_column_size.rb

@@ -0,0 +1,14 @@
+require_relative "migration_helper"
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    if mysql?
+      run("ALTER TABLE verifications CHANGE consumer_version_selector_hashes consumer_version_selector_hashes mediumtext")
+    end
+  end
+
+  down do
+
+  end
+end

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/authorization/resource_access_policy.rb

@@ -38,11 +38,7 @@ module PactBroker
           ]
 
           if enable_public_badge_access
-            rules.concat([
-              [PUBLIC, READ_METHODS, PACT_BADGE_PATH],
-              [PUBLIC, READ_METHODS, MATRIX_BADGE_PATH],
-              [PUBLIC, READ_METHODS, CAN_I_DEPLOY_BADGE_PATH]
-            ])
+            rules.concat(BADGE_PATHS.collect { | badge_path | [PUBLIC, READ_METHODS, badge_path] })
           end
 
           if allow_public_access_to_heartbeat

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)
+            Sequel.string_to_datetime(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/decorators/pacticipant_decorator.rb

@@ -90,6 +90,14 @@ module PactBroker
           }
         end
 
+        link :'pb:can-i-deploy-branch-to-environment-badge' do | options |
+          {
+            title: "Can I Deploy #{represented.name} from branch to environment badge",
+            href: templated_can_i_deploy_branch_to_environment_badge_url(represented.name, options[:base_url]),
+            templated: true
+          }
+        end
+
         curies do | options |
           [{
             name: :pb,

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -255,6 +255,10 @@ module PactBroker
         templated_can_i_deploy_url(pacticipant_name, base_url) + "/badge"
       end
 
+      def templated_can_i_deploy_branch_to_environment_badge_url pacticipant_name, base_url = ""
+        pacticipant_url_from_params({ pacticipant_name: pacticipant_name }, base_url) + "/branches/{branch}/latest-version/can-i-deploy/to-environment/{environment}/badge"
+      end
+
       def label_url label, base_url
         "#{labels_url(label.pacticipant, base_url)}/#{url_encode(label.name)}"
       end

data/lib/pact_broker/api/paths.rb

@@ -3,9 +3,12 @@ module PactBroker
     module Paths
       PACT_BADGE_PATH =         %r{^/pacts/provider/[^/]+/consumer/.*/badge(?:\.[A-Za-z]+)?$}.freeze
       MATRIX_BADGE_PATH =       %r{^/matrix/provider/[^/]+/latest/[^/]+/consumer/[^/]+/latest/[^/]+/badge(?:\.[A-Za-z]+)?$}.freeze
-      CAN_I_DEPLOY_BADGE_PATH = %r{^/pacticipants/[^/]+/latest-version/[^/]+/can-i-deploy/to/[^/]+/badge(?:\.[A-Za-z]+)?$}.freeze
+      CAN_I_DEPLOY_TAG_BADGE_PATH = %r{^/pacticipants/[^/]+/latest-version/[^/]+/can-i-deploy/to/[^/]+/badge(?:\.[A-Za-z]+)?$}.freeze
+      CAN_I_DEPLOY_BRANCH_ENV_BADGE_PATH = %r{^/pacticipants/[^/]+/branches/[^/]+/latest-version/can-i-deploy/to-environment/[^/]+/badge(?:\.[A-Za-z]+)?$}.freeze
       VERIFICATION_RESULTS =    %r{^/pacts/provider/[^/]+/consumer/[^/]+/pact-version/[^/]+/verification-results/[^/]+}
 
+      BADGE_PATHS = [PACT_BADGE_PATH, MATRIX_BADGE_PATH, CAN_I_DEPLOY_TAG_BADGE_PATH, CAN_I_DEPLOY_BRANCH_ENV_BADGE_PATH]
+
       extend self
 
       def is_verification_results_path?(path)
@@ -14,7 +17,7 @@ module PactBroker
 
       def is_badge_path?(path)
         # Optimise by checking include? first - regexp slow
-        path.include?("/badge") && (path =~ PACT_BADGE_PATH || path =~ MATRIX_BADGE_PATH || path =~ CAN_I_DEPLOY_BADGE_PATH)
+        path.include?("/badge") && BADGE_PATHS.any?{ | regex | path =~ regex }
       end
     end
   end

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

@@ -1,37 +1,22 @@
 require "pact_broker/api/resources/base_resource"
 require "pact_broker/verifications/pseudo_branch_status"
 require "pact_broker/configuration"
+require "pact_broker/api/resources/badge_methods"
 
 module PactBroker
   module Api
     module Resources
       class Badge < BaseResource
-
-        def allowed_methods
-          ["GET", "OPTIONS"]
-        end
-
-        def content_types_provided
-          [["image/svg+xml", :to_svg]]
-        end
+        include BadgeMethods
 
         def resource_exists?
           !badge_service.can_provide_badge_using_redirect?
         end
 
-        # Only called if resource_exists? returns false
-        def previously_existed?
-          true
-        end
-
         def is_authorized?(authorization_header)
           super || PactBroker.configuration.enable_public_badge_access
         end
 
-        def forbidden?
-          false
-        end
-
         def to_svg
           response.headers["Cache-Control"] = "no-cache"
           comment + badge_service.pact_verification_badge(pact, label, initials, pseudo_branch_verification_status, tags)
@@ -42,10 +27,6 @@ module PactBroker
           badge_service.pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status, tags)
         end
 
-        def policy_name
-          :'badges::badge'
-        end
-
         private
 
         def pact
@@ -61,10 +42,6 @@ module PactBroker
           @pseudo_branch_verification_status ||= PactBroker::Verifications::PseudoBranchStatus.new(pact, latest_verification).to_sym
         end
 
-        def label
-          request.query["label"]
-        end
-
         def initials
           request.query["initials"] == "true"
         end

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

@@ -0,0 +1,57 @@
+module PactBroker
+  module Api
+    module Resources
+      module BadgeMethods
+        def allowed_methods
+          ["GET", "OPTIONS"]
+        end
+
+        def content_types_provided
+          [["image/svg+xml", :to_svg]]
+        end
+
+        def resource_exists?
+          false
+        end
+
+        # Only called if resource_exists? returns false
+        def previously_existed?
+          true
+        end
+
+        def forbidden?
+          false
+        end
+
+        def is_authorized?(authorization_header)
+          super || PactBroker.configuration.enable_public_badge_access
+        end
+
+        def policy_name
+          :'badges::badge'
+        end
+
+        def moved_temporarily?
+          response.headers["Cache-Control"] = "no-cache"
+          begin
+            badge_url
+          rescue StandardError => e
+            # Want to render a badge, even if there's an error
+            badge_service.error_badge_url("error", ErrorResponseBodyGenerator.display_message(e, "reference: #{PactBroker::Errors.generate_error_reference}"))
+          end
+        end
+
+        def badge_url
+          raise NotImplementedError
+        end
+
+        private
+
+        def label
+          lab = request.query["label"]
+          lab && !lab.empty? ? lab : nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+require "pact_broker/api/resources/matrix"
+require "pact_broker/matrix/can_i_deploy_query_schema"
+require "pact_broker/matrix/parse_can_i_deploy_query"
+require "pact_broker/api/decorators/matrix_decorator"
+require "pact_broker/api/decorators/matrix_text_decorator"
+
+module PactBroker
+  module Api
+    module Resources
+      class CanIDeployPacticipantVersionByBranchToEnvironment < BaseResource
+        def allowed_methods
+          ["GET", "OPTIONS"]
+        end
+
+        def content_types_provided
+          [
+            ["application/hal+json", :to_json],
+            ["text/plain", :to_text]
+          ]
+        end
+
+        def resource_exists?
+          !!(version && environment)
+        end
+
+        def policy_name
+          :'versions::version'
+        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 to_json
+          decorator_class(:matrix_decorator).new(results).to_json(decorator_options)
+        end
+
+        def results
+          @results ||= matrix_service.can_i_deploy(selectors, options)
+        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_by_branch_to_environment_badge.rb

@@ -0,0 +1,29 @@
+require "pact_broker/api/resources/can_i_deploy_pacticipant_version_by_branch_to_environment"
+
+module PactBroker
+  module Api
+    module Resources
+      class CanIDeployPacticipantVersionByBranchToEnvironmentBadge < CanIDeployPacticipantVersionByBranchToEnvironment
+        include BadgeMethods
+
+        private
+
+        def badge_url
+          if pacticipant && version && environment
+            badge_service.can_i_deploy_badge_url(identifier_from_path[:branch_name], identifier_from_path[:environment_name], label, results.deployable?)
+          elsif pacticipant.nil?
+            badge_service.error_badge_url("pacticipant", "not found")
+          elsif version.nil?
+            if branch_service.find_branch(identifier_from_path.slice(:pacticipant_name, :branch_name)).nil?
+              badge_service.error_badge_url("branch", "not found")
+            else
+              badge_service.error_badge_url("version", "not found")
+            end
+          else
+            badge_service.error_badge_url("environment", "not found")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+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 CanIDeployPacticipantVersionByTagToTag < Matrix
+        def resource_exists?
+          !!version
+        end
+
+        def policy_name
+          :'versions::version'
+        end
+
+        def malformed_request?
+          false
+        end
+
+        private
+
+        def selectors
+          @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]
+                        }
+        end
+
+        def version
+          @version ||= version_service.find_by_pacticipant_name_and_latest_tag(identifier_from_path[:pacticipant_name], identifier_from_path[:tag])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require "pact_broker/matrix/can_i_deploy_query_schema"
+require "pact_broker/matrix/parse_can_i_deploy_query"
+require "pact_broker/api/resources/badge_methods"
+
+module PactBroker
+  module Api
+    module Resources
+      class CanIDeployPacticipantVersionByTagToTagBadge < CanIDeployPacticipantVersionByTagToTag
+        include BadgeMethods
+
+        def badge_url
+          if pacticipant
+            if version
+              badge_service.can_i_deploy_badge_url(identifier_from_path[:tag], identifier_from_path[:to], label, results.deployable?)
+            else
+              badge_service.error_badge_url("version", "not found")
+            end
+          else
+            badge_service.error_badge_url("pacticipant", "not found")
+          end
+        end
+      end
+    end
+  end
+end

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::CanIDeployPacticipantVersionByTagToTagBadge, { 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::CanIDeployPacticipantVersionByBranchToEnvironmentBadge, { 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/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/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)