pact_broker 2.105.0 → 2.107.0.beta.1

data/lib/pact_broker/config/setting.rb

@@ -1,6 +1,7 @@
 module PactBroker
   module Config
     class Setting < Sequel::Model(:config)
+      set_primary_key :id
 
       def set_value_from(object)
         self.type = Setting.get_db_type(object)

data/lib/pact_broker/contracts/service.rb

@@ -7,6 +7,7 @@ require "pact_broker/contracts/notice"
 require "pact_broker/events/subscriber"
 require "pact_broker/api/pact_broker_urls"
 require "pact_broker/pacts/create_formatted_diff"
+require "pact_broker/pacts/pact_params"
 
 module PactBroker
   module Contracts

data/lib/pact_broker/date_helper.rb

@@ -14,7 +14,7 @@ module PactBroker
       end
 
       def t path, options
-        I18n.t path, @options.merge(options)
+        I18n.t(path, **@options.merge(options))
       end
     end
 

data/lib/pact_broker/db/clean_incremental.rb

@@ -25,6 +25,36 @@ module PactBroker
         @options = options
       end
 
+      def call
+        require "pact_broker/db/models"
+
+        if dry_run?
+          dry_run_results
+        else
+          execute_clean
+        end
+      end
+
+      private
+
+      attr_reader :db, :options
+
+      def execute_clean
+        db.transaction do
+          before_counts = current_counts
+          PactBroker::Domain::Version.where(id: versions_to_delete.from_self.select_map(:id)).delete
+          delete_orphan_pact_versions
+          after_counts = current_counts
+
+          TABLES.each_with_object({}) do | table_name, comparison_counts |
+            comparison_counts[table_name.to_s] = {
+                                                    "deleted" => before_counts[table_name] - after_counts[table_name],
+                                                    "kept" => after_counts[table_name]
+                                                  }
+          end
+        end
+      end
+
       def logger
         options[:logger] || PactBroker.logger
       end
@@ -42,47 +72,20 @@ module PactBroker
         options[:limit] || 1000
       end
 
-      def resolve_ids(query, column_name = :id)
-        query.collect { |h| h[column_name] }
-      end
-
-      def version_ids_to_delete
-        db[:versions].where(id: version_ids_to_keep).invert.limit(limit).order(Sequel.asc(:id))
+      def versions_to_delete(columns = [:id])
+        fully_qualified_columns = columns.collect { |col| Sequel[:versions][col] }
+        PactBroker::Domain::Version
+          .select(*fully_qualified_columns)
+          .left_outer_join(version_ids_to_keep, { Sequel[:versions][:id] => Sequel[:keep_versions][:id] }, table_alias: :keep_versions)
+          .where(Sequel[:keep_versions][:id] => nil)
+          .order(Sequel.asc( Sequel[:versions][:id]))
+          .limit(limit)
       end
 
       def version_ids_to_keep
-        @version_ids_to_keep ||= selected_versions_to_keep.reduce(&:union)
+        @version_ids_to_keep ||=  keep.collect { |selector| PactBroker::Domain::Version.for_selector(selector).select(:id) }.reduce(&:union)
       end
 
-      def selected_versions_to_keep
-        keep.collect do | selector |
-          PactBroker::Domain::Version.select(:id).for_selector(selector)
-        end
-      end
-
-      def call
-        require "pact_broker/db/models"
-
-        if dry_run?
-          dry_run_results
-        else
-          db.transaction do
-            before_counts = current_counts
-            PactBroker::Domain::Version.where(id: resolve_ids(version_ids_to_delete)).delete
-            delete_orphan_pact_versions
-            after_counts = current_counts
-
-            TABLES.each_with_object({}) do | table_name, comparison_counts |
-              comparison_counts[table_name.to_s] = { "deleted" => before_counts[table_name] - after_counts[table_name], "kept" => after_counts[table_name] }
-            end
-          end
-        end
-      end
-
-      private
-
-      attr_reader :db, :options
-
       def current_counts
         TABLES.each_with_object({}) do | table_name, counts |
           counts[table_name] = db[table_name].count
@@ -122,8 +125,8 @@ module PactBroker
       end
 
       def dry_run_results
-        to_delete = dry_run_to_delete
-        to_keep = dry_run_to_keep
+        to_delete = dry_run_to_delete_by_pacticipant
+        to_keep = dry_run_to_keep_by_pacticipant
 
         kept_per_selector = keep.collect do | selector |
           {
@@ -141,7 +144,7 @@ module PactBroker
 
         total_versions_count = PactBroker::Domain::Version.count
         versions_to_keep_count = version_ids_to_keep.count
-        versions_to_delete_count = version_ids_to_delete.count
+        versions_to_delete_count = versions_to_delete.count
 
         {
           "counts" => {
@@ -155,9 +158,15 @@ module PactBroker
         }
       end
 
-      def dry_run_latest_versions_to_keep
-        latest_undeleted_versions_by_order = PactBroker::Domain::Version.where(id: version_ids_to_delete.select(:id))
-          .invert
+      def expected_remaining_versions
+        PactBroker::Domain::Version
+          .left_outer_join(versions_to_delete, { Sequel[:versions][:id] => Sequel[:delete_versions][:id] }, table_alias: :delete_versions )
+          .where(Sequel[:delete_versions][:id] => nil)
+      end
+
+      # Returns the latest version that will be kept for each pacticipant
+      def dry_run_latest_versions_to_keep_by_pacticipant
+        latest_undeleted_versions_by_order = expected_remaining_versions
           .select_group(:pacticipant_id)
           .select_append{ max(order).as(latest_order) }
 
@@ -171,9 +180,9 @@ module PactBroker
           .join(latest_undeleted_versions_by_order, lv_versions_join, { table_alias: :lv })
       end
 
-      def dry_run_earliest_versions_to_keep
-        earliest_undeleted_versions_by_order = PactBroker::Domain::Version.where(id: version_ids_to_delete.select(:id))
-          .invert
+      # Returns the earliest version that will be kept for each pacticipant
+      def dry_run_earliest_versions_to_keep_by_pacticipant
+        earliest_undeleted_versions_by_order = expected_remaining_versions
           .select_group(:pacticipant_id)
           .select_append{ min(order).as(first_order) }
 
@@ -187,13 +196,16 @@ module PactBroker
           .join(earliest_undeleted_versions_by_order, ev_versions_join, { table_alias: :lv })
       end
 
-      def dry_run_to_delete
-        PactBroker::Domain::Version
-          .where(id: version_ids_to_delete.select(:id))
+      # Returns Hash of pacticipant name => Hash, where the Hash value contains the count, fromVersion and toVersion
+      # that will be deleted.
+      # @return Hash
+      def dry_run_to_delete_by_pacticipant
+        versions_to_delete
+          .select(Sequel[:versions].*)
           .all
           .group_by{ | v | v.pacticipant_id }
-          .each_with_object({}) do | (_pacticipant_id, versions), thing |
-            thing[versions.first.pacticipant.name] = {
+          .each_with_object({}) do | (_pacticipant_id, versions), hash |
+            hash[versions.first.pacticipant.name] = {
               "count" => versions.count,
               "fromVersion" => version_info(versions.first),
               "toVersion" => version_info(versions.last)
@@ -202,14 +214,14 @@ module PactBroker
       end
 
       # rubocop: disable Metrics/CyclomaticComplexity
-      def dry_run_to_keep
-        latest_to_keep = dry_run_latest_versions_to_keep.eager(:tags).each_with_object({}) do | version, r |
+      def dry_run_to_keep_by_pacticipant
+        latest_to_keep = dry_run_latest_versions_to_keep_by_pacticipant.eager(:tags).each_with_object({}) do | version, r |
           r[version.pacticipant_id] = {
             "firstVersion" => version_info(version)
           }
         end
 
-        earliest_to_keep = dry_run_earliest_versions_to_keep.eager(:tags).each_with_object({}) do | version, r |
+        earliest_to_keep = dry_run_earliest_versions_to_keep_by_pacticipant.eager(:tags).each_with_object({}) do | version, r |
           r[version.pacticipant_id] = {
             "latestVersion" => version_info(version)
           }
@@ -226,14 +238,10 @@ module PactBroker
       # rubocop: enable Metrics/CyclomaticComplexity
 
       def counts_to_keep
-        db[:versions].where(id: version_ids_to_delete.select(:id))
-          .invert
+        expected_remaining_versions
           .select_group(:pacticipant_id)
           .select_append{ count(1).as(count) }
-          .all
-          .each_with_object({}) do | row, counts |
-            counts[row[:pacticipant_id]] = row[:count]
-          end
+          .as_hash(:pacticipant_id, :count)
       end
 
       def pacticipants

data/lib/pact_broker/db/delete_overwritten_data.rb

@@ -36,9 +36,13 @@ module PactBroker
           to_keep = deleted_counts.keys.each_with_object({}) do | table_name, new_counts |
             new_counts[table_name] = kept_counts[table_name] - deleted_counts[table_name]
           end
-          { toDelete: deleted_counts, toKeep: to_keep }
+          deleted_counts.each_with_object({}) do | (key, value), new_hash |
+            new_hash[key] = { toDelete: value, toKeep: to_keep[key] }
+          end
         else
-          { deleted: deleted_counts, kept: kept_counts }
+          deleted_counts.each_with_object({}) do | (key, value), new_hash |
+            new_hash[key] = { deleted: value, kept: kept_counts[key] }
+          end
         end
       end
 

data/lib/pact_broker/deployments/currently_deployed_version_id.rb

@@ -4,6 +4,8 @@ require "pact_broker/repositories/helpers"
 module PactBroker
   module Deployments
     class CurrentlyDeployedVersionId < Sequel::Model
+      set_primary_key :id
+
       plugin :upsert, identifying_columns: [:pacticipant_id, :environment_id, :target_for_index]
 
       dataset_module do

data/lib/pact_broker/deployments/deployed_version.rb

@@ -4,6 +4,8 @@ require "pact_broker/deployments/currently_deployed_version_id"
 module PactBroker
   module Deployments
     class DeployedVersion < Sequel::Model
+      set_primary_key :id
+
       many_to_one :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id
       many_to_one :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id
       many_to_one :environment, :class => "PactBroker::Deployments::Environment", :key => :environment_id, :primary_key => :id

data/lib/pact_broker/deployments/deployed_version_service.rb

@@ -1,5 +1,6 @@
 require "pact_broker/deployments/deployed_version"
 require "pact_broker/repositories/scopes"
+require "pact_broker/events/publisher"
 
 module PactBroker
   module Deployments
@@ -7,6 +8,7 @@ module PactBroker
       include PactBroker::Logging
       extend PactBroker::Repositories::Scopes
       extend PactBroker::Services
+      extend PactBroker::Events::Publisher
 
       def self.next_uuid
         SecureRandom.uuid
@@ -22,7 +24,7 @@ module PactBroker
           deployed_version
         else
           record_previous_version_undeployed(version.pacticipant, environment, target)
-          DeployedVersion.create(
+          deployed_version = DeployedVersion.create(
             uuid: uuid,
             version: version,
             pacticipant_id: version.pacticipant_id,
@@ -30,6 +32,8 @@ module PactBroker
             target: target,
             auto_created: auto_created
           )
+          broadcast(:deployed_version_created, { deployed_version: deployed_version })
+          deployed_version
         end
       end
 

data/lib/pact_broker/deployments/environment.rb

@@ -5,6 +5,8 @@ require "sequel/plugins/serialization"
 module PactBroker
   module Deployments
     class Environment < Sequel::Model
+      set_primary_key :id
+
       OPEN_STRUCT_TO_JSON = lambda { | open_struct | Sequel.object_to_json(open_struct.collect(&:to_h)) }
       JSON_TO_OPEN_STRUCT = lambda { | json | Sequel.parse_json(json).collect{ | hash| OpenStruct.new(hash) } }
       plugin :upsert, identifying_columns: [:uuid]

data/lib/pact_broker/deployments/environment_service.rb

@@ -9,7 +9,6 @@ module PactBroker
     module EnvironmentService
       using PactBroker::StringRefinements
       extend PactBroker::Repositories::Scopes
-
       extend self
 
       def self.included(base)
@@ -36,8 +35,6 @@ module PactBroker
         environment.upsert
       end
 
-      alias_method :update, :replace # For PF
-
       def find_all
         scope_for(PactBroker::Deployments::Environment).order(Sequel.function(:lower, :display_name)).all
       end
@@ -57,6 +54,10 @@ module PactBroker
       def find_for_pacticipant(_pacticipant)
         find_all
       end
+
+      def scope_for(scope)
+        PactBroker.policy_scope!(scope)
+      end
     end
   end
 end

data/lib/pact_broker/deployments/released_version.rb

@@ -4,6 +4,8 @@ require "pact_broker/repositories/helpers"
 module PactBroker
   module Deployments
     class ReleasedVersion < Sequel::Model
+      set_primary_key :id
+
       many_to_one :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id
       many_to_one :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id
       many_to_one :environment, :class => "PactBroker::Deployments::Environment", :key => :environment_id, :primary_key => :id

data/lib/pact_broker/deployments/released_version_service.rb

@@ -1,10 +1,12 @@
 require "pact_broker/deployments/released_version"
 require "pact_broker/repositories/scopes"
+require "pact_broker/events/publisher"
 
 module PactBroker
   module Deployments
     class ReleasedVersionService
       extend PactBroker::Repositories::Scopes
+      extend PactBroker::Events::Publisher
 
       def self.next_uuid
         SecureRandom.uuid
@@ -25,6 +27,8 @@ module PactBroker
         # error when marking an existing row as supported again IRL.
         ReleasedVersion.where(id: released_version.id).set_currently_supported
         released_version.refresh
+        broadcast(:released_version_created, { released_version: released_version })
+        released_version
       end
 
       def self.find_currently_supported_versions_for_environment(environment, pacticipant_name: nil, pacticipant_version_number: nil)

data/lib/pact_broker/diagnostic/resources/base_resource.rb

@@ -13,7 +13,7 @@ module PactBroker
         end
 
         def forbidden?
-          return false if PactBroker.configuration.authorize.nil?
+          return false unless PactBroker.configuration.authorization_configured?
           !PactBroker.configuration.authorize.call(self, {})
         end
 

data/lib/pact_broker/doc/views/index/publish-contracts.markdown

@@ -33,7 +33,7 @@ This endpoint is designed to be used by a command line tool, and hence, the resp
 ### Success
 
 * `notices`
-  * `level`: one of `debug`, `info`, `warning`,`prompt`,`success`, `error`, `danger`
+  * `type`: one of `debug`, `info`, `warning`,`prompt`,`success`, `error`, `danger`
   * `text`: the text of the notice. This is designed to be displayed in the output of a CLI.
 
 The `_links` section will contain links to all the resources created by the publication. The relations are:
@@ -105,19 +105,19 @@ If there is a conflict with an existing published pact and `allow_dangerous_cont
       {
         "notices": [
           {
-            "level": "debug",
+            "type": "debug",
             "text": "Created Foo version dc5eb529230038a4673b8c971395bd2922d8b240 with branch main and tags main"
           },
           {
-            "level": "info",
+            "type": "info",
             "text": "Pact published for Foo version dc5eb529230038a4673b8c971395bd2922d8b240 and provider Bar."
           },
           {
-            "level": "debug",
+            "type": "debug",
             "text": "  Events detected: contract_published, contract_content_changed (first time any pact published for this consumer with consumer version tagged main)"
           },
           {
-            "level": "debug",
+            "type": "debug",
             "text": "  Webhook \"foo webhook\" triggered for event contract_content_changed.\n    See logs at http://example.org/triggered-webhooks/1234/logs\""
           }
         ],

data/lib/pact_broker/domain/label.rb

@@ -3,6 +3,7 @@ require "pact_broker/db"
 module PactBroker
   module Domain
     class Label < Sequel::Model
+      set_primary_key([:name, :pacticipant_id])
       unrestrict_primary_key
 
       associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)

data/lib/pact_broker/domain/tag.rb

@@ -5,6 +5,8 @@ require "pact_broker/tags/eager_loaders"
 module PactBroker
   module Domain
     class Tag < Sequel::Model
+      set_primary_key([:name, :version_id])
+
       plugin :timestamps, update_on_create: true
       plugin :insert_ignore, identifying_columns: [:name, :version_id]
 

data/lib/pact_broker/domain/verification.rb

@@ -228,7 +228,7 @@ module PactBroker
       end
 
       # So consumer_version_tag_name can be accessed by method name
-      def method_missing(m, *args, &block)
+      def method_missing(m, *args, **kwargs, &block)
         if values.key?(m) && args.size == 0
           values[m]
         else

data/lib/pact_broker/domain/version.rb

@@ -24,10 +24,12 @@ module PactBroker
     VERSION_COLUMNS = [:id, :number, :repository_ref, :pacticipant_id, :order, :created_at, :updated_at, :build_url]
 
     class Version < Sequel::Model(Sequel::Model.db[:versions].select(*VERSION_COLUMNS.collect{ | column | Sequel.qualify(:versions, column) }))
+      set_primary_key :id
+
       plugin :timestamps, update_on_create: true
+      plugin :age
       plugin :upsert, { identifying_columns: [:pacticipant_id, :number], ignore_columns_on_update: [:id, :created_at, :order] }
 
-      set_primary_key :id
       one_to_many :pact_publications, order: :revision_number, class: "PactBroker::Pacts::PactPublication", key: :consumer_version_id
       associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
       one_to_many :tags, :reciprocal => :version, order: :created_at
@@ -41,6 +43,7 @@ module PactBroker
       end
 
       one_to_many :deployed_versions, class: "PactBroker::Deployments::DeployedVersion", key: :version_id, primary_key: :id, order: [:created_at, :id]
+      one_to_many :released_versions, class: "PactBroker::Deployments::ReleasedVersion", key: :version_id, primary_key: :id, order: [:created_at, :id]
 
       many_to_one :latest_version_for_pacticipant, read_only: true, key: :id,
         class: Version,

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.slice(:user_agent, :disable_ssl_verification, :cert_store))
+        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/index/service.rb

@@ -18,7 +18,7 @@ module PactBroker
       DEFAULT_PAGE_NUMBER = 1
 
       # This method provides data for both the OSS server side rendered index (with and without tags)
-      # and the Pactflow UI. It really needs to be broken into to separate methods, as it's getting too messy
+      # and the PactFlow UI. It really needs to be broken into to separate methods, as it's getting too messy
       # supporting both
 
       def self.pact_publication_scope
@@ -109,7 +109,7 @@ module PactBroker
       # rubocop: disable Metrics/CyclomaticComplexity
       def self.latest_verification_for_pseudo_branch(pact_publication, is_overall_latest, latest_verifications_for_cv_tags, tags_option, options)
         if options[:view] == "branch" || (options[:view] == "all" && pact_publication.consumer_version.branch_heads.any?)
-          pact_publication.latest_verification || pact_publication.latest_verification_for_consumer_branches
+          pact_publication.latest_verification || pact_publication.latest_verification_for_consumer_branches(forbid_lazy_load: false)
         elsif tags_option == true
           latest_verifications_for_cv_tags
             .select{ | v | v.consumer_id == pact_publication.consumer_id && v.provider_id == pact_publication.provider_id && pact_publication.head_pact_tags.collect(&:name).include?(v.consumer_version_tag_name) }

data/lib/pact_broker/integrations/integration.rb

@@ -8,6 +8,7 @@ require "pact_broker/verifications/latest_verification_for_consumer_and_provider
 module PactBroker
   module Integrations
     class Integration < Sequel::Model(Sequel::Model.db[:integrations].select(:id, :consumer_id, :provider_id))
+      set_primary_key :id
       plugin :insert_ignore, identifying_columns: [:consumer_id, :provider_id]
       associate(:many_to_one, :consumer, :class => "PactBroker::Domain::Pacticipant", :key => :consumer_id, :primary_key => :id)
       associate(:many_to_one, :provider, :class => "PactBroker::Domain::Pacticipant", :key => :provider_id, :primary_key => :id)

data/lib/pact_broker/locale/en.yml

@@ -2,17 +2,10 @@ en:
   errors:
     not_blank?: "can't be blank"
     filled?: "can't be blank"
-    valid_method?: "is not a recognised HTTP method"
     valid_url?: "is not a valid URL eg. http://example.org"
     base64?: "is not valid Base64"
-    valid_version_number?: "Version number '%{value}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
-    name_in_path_matches_name_in_pact?: "does not match %{left} name in path ('%{right}')."
-    valid_consumer_version_number?: "Consumer version number '%{value}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
-    non_templated_host?: "cannot have a template parameter in the host"
-    pacticipant_exists?: "does not match an existing pacticipant"
     single_line?: "cannot contain multiple lines"
     no_spaces?: "cannot contain spaces"
-    environment_with_name_exists?: "with name '%{value}' does not exist"
     none?: "cannot be provided"
 
   pact_broker:
@@ -68,33 +61,61 @@ en:
         version_branch: Configure the version branch to be the value of your repository branch.
     errors:
       validation:
-        blank: "cannot be blank."
+        no_spaces: "cannot contain spaces"
+        single_line: "cannot contain multiple lines"
+        environment_not_found: "with name '%{value}' does not exist"
+        blank: "cannot be blank"
+        cannot_be_provided_at_same_time: "%{name_1} and %{name_2} cannot be provided at the same time"
+        blank_with_name: "%{name} cannot be blank"
         attribute_missing: "Missing required attribute '%{attribute}'"
         invalid_http_method: "Invalid HTTP method '%{method}'"
         invalid_url: "Invalid URL '%{url}'. Expected format: http://example.org"
         pact_missing_pacticipant_name: "was not found at expected path $.%{pacticipant}.name in the submitted pact file."
-        pact_content_modification_not_allowed: "Cannot change the content of the pact for %{consumer_name} version %{consumer_version_number} and provider %{provider_name}, as race conditions will cause unreliable results for can-i-deploy. Each pact must be published with a unique consumer version number. For more information see https://docs.pact.io/go/versioning"
+        pact_content_modification_not_allowed: "Cannot change the content of the pact for %{consumer_name} version %{consumer_version_number} and provider %{provider_name}, as race conditions will cause unreliable results for can-i-deploy. Each pact must be published with a unique consumer version number. Some Pact libraries generate random data when a concrete value for a type matcher is not specified, and this can cause the contract to mutate - ensure you have given example values for all type matchers. For more information see https://docs.pact.io/go/versioning"
         consumer_version_number_missing: "Please specify the consumer version number by setting the X-Pact-Consumer-Version header."
         consumer_version_number_header_invalid: "X-Pact-Consumer-Version '%{consumer_version_number}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
-        consumer_version_number_invalid: "Consumer version number '%{consumer_version_number}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
         pacticipant_name_mismatch: "in pact ('%{name_in_pact}') does not match %{pacticipant} name in path ('%{name}')."
-        consumer_name_in_content_mismatch_pacticipant_name: "consumer name in contract content ('%{consumer_name_in_content}') must match pacticipantName ('%{pacticipant_name}')"
         consumer_name_in_contract_mismatch_pacticipant_name: "consumerName ('%{consumer_name_in_contract}') must match pacticipantName ('%{pacticipant_name}')"
-        provider_name_in_content_mismatch: "provider name in contract content ('%{provider_name_in_content}') must match providerName ('%{provider_name}') in contracts"
+        consumer_name_in_content_mismatch: "consumer name in contract content ('%{consumer_name_in_content}') must match consumerName in contract params ('%{consumer_name}')"
+        provider_name_in_content_mismatch: "provider name in contract content ('%{provider_name_in_content}') must match providerName in contract params ('%{provider_name}')"
         connection_encoding_not_utf8: "The Sequel connection encoding (%{encoding}) is strongly recommended to be \"utf8\". If you need to set it to %{encoding} for some particular reason, then disable this check by setting config.validate_database_connection_config = false"
         invalid_webhook_uuid: The UUID can only contain the characters A-Z, a-z, 0-9, _ and -, and must be 16 or more characters.
         pacticipant_not_found: No pacticipant with name '%{name}' found
-        environment_name_must_be_unique: Another environment with name '%{name}' already exists.
+        environment_name_must_be_unique: "name '%{name}' is already used by an existing environment."
         must_specify_environment_or_tag: Must specify either an environment or a 'to' tag.
         cannot_specify_tag_and_environment: Cannot specify both a 'to' tag and an environment.
         cannot_specify_latest_and_environment: Cannot specify both latest=true and an environment.
         cannot_specify_more_than_one_destination_identifier: Cannot specify more than one of tag, environment and mainBranch.
         environment_with_name_not_found: "Environment with name '%{name}' does not exist"
         cannot_modify_version_branch: "The branch for a pacticipant version cannot be changed once set (currently '%{old_branch}', proposed value '%{new_branch}'). Your pact publication/verification publication configurations may be in conflict with each other if you are seeing this error. If the current branch value is incorrect, you must delete the pacticipant version resource at %{version_url} and publish the pacts/verification results again with a consistent branch name."
-        invalid_content_for_content_type: "The content could not be parsed as %{content_type}"
+        invalid_content_for_content_type: "content could not be parsed as %{content_type}"
         cannot_set_currently_deployed_true: The currentlyDeployed property cannot be set back to true. Please record a new deployment.
         cannot_set_currently_supported_true: The currentlySupported property cannot be set back to true. Please record a new deployment.
         invalid_limit: The limit must be 1 or greater.
+        pacts_for_verification_selector_fallback_tag: "fallbackTag can only be set if latest is true"
+        pacts_for_verification_selector_matching_branch_requires_provider_version_branch: the providerVersionBranch must be specified when the selector matchingBranch=true is used
+        pacts_for_verification_selector_tag_and_branch_disallowed: "cannot specify both a tag and a branch"
+        pacts_for_verification_selector_fallback_tag_requires_tag: "a tag must be specified when a fallbackTag is specified"
+        pacts_for_verification_selector_fallback_branch_requires_branch: "a branch must be specified when a fallbackBranch is specified"
+        pacts_for_verification_selector_branch_and_latest_false_disallowed: cannot specify a branch with latest=false
+        pacts_for_verification_selector_main_branch_and_latest_false_disallowed: cannot specify mainBranch=true with latest=false
+        pacts_for_verification_selector_fallback_branch_and_latest_false_disallowed: fallbackBranch can only be set if latest is true
+        pacts_for_verification_selector_required_params_missing: must specify a value for environment or tag or branch, or specify mainBranch=true, matchingBranch=true, latest=true, deployed=true, released=true or deployedOrReleased=true
+        pacts_for_verification_selector_main_branch_with_other_param_disallowed: cannot specify mainBranch=true with any other criteria apart from consumer
+        pacts_for_verification_selector_matching_branch_with_other_param_disallowed: cannot specify matchingBranch=true with any other criteria apart from consumer
+        pacts_for_verification_selector_deployed_and_released_disallowed: cannot specify both deployed=true and released=true
+        pacts_for_verification_selector_deployed_and_deployed_or_released_disallowed: cannot specify both deployed=true and deployedOrReleased=true
+        pacts_for_verification_selector_released_and_deployed_or_released_disallowed: cannot specify both released=true and deployedOrReleased=true
+        pacts_for_verification_selector_provider_version_branch_empty: when pending or WIP pacts are enabled and there are no tags provided, the provider version branch must not be an empty string, as it is used in the calculations for WIP/pending. A value must be provided (recommended), or it must not be set at all.
+        pact_name_in_path_mismatch_name_in_pact: "name in pact '%{name_in_pact}' does not match name in URL path '%{name_in_path}'."
+        base64: "is not valid Base64"
+        non_utf_8_char_in_contract: "contract content has a non UTF-8 character at char %{char_number} and cannot be parsed as JSON. Fragment preceding invalid character is: '%{fragment}'"
+        invalid_consumer_version_number: "Consumer version number '%{value}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
+        invalid_version_number: "Version number '%{value}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
+        invalid_url: "is not a valid URL eg. http://example.org"
+        pacticipant_with_name_not_found: "does not match an existing pacticipant"
+        invalid_http_method: "is not a recognised HTTP method"
+        webhook_templated_host_not_allowed: "cannot have a template parameter in the host"
       duplicate_pacticipant: |
         This is the first time a pact has been published for "%{new_name}".
         The name "%{new_name}" is very similar to the following existing pacticipants:
@@ -109,6 +130,7 @@ en:
       new_line_in_url_path: URL path cannot contain a new line character.
       tab_in_url_path: URL path cannot contain a tab character.
       non_utf_8_char_in_request_body: "Request body has a non UTF-8 character at char %{char_number} and cannot be parsed as JSON. Fragment preceding invalid character is: '%{fragment}'"
+      non_utf_8_char_in_contract: "Contract has a non UTF-8 character at char %{char_number} and cannot be parsed as JSON. Fragment preceding invalid character is: '%{fragment}'"
 
       "400":
         title: 400 Malformed Request

data/lib/pact_broker/matrix/query_ids.rb

@@ -17,10 +17,10 @@ module PactBroker
 
       def self.from_selectors(selectors)
         most_specific_criteria = selectors.collect(&:most_specific_criterion)
-        all_pacticipant_ids = selectors.collect(&:pacticipant_id)
-        specified_pacticipant_ids = selectors.select(&:specified?).collect(&:pacticipant_id)
-        pacticipant_version_ids = collect_ids(most_specific_criteria, :pacticipant_version_id)
-        pacticipant_ids = collect_ids(most_specific_criteria, :pacticipant_id)
+        all_pacticipant_ids = selectors.collect(&:pacticipant_id).uniq
+        specified_pacticipant_ids = selectors.select(&:specified?).collect(&:pacticipant_id).uniq
+        pacticipant_version_ids = collect_ids(most_specific_criteria, :pacticipant_version_id).uniq
+        pacticipant_ids = collect_ids(most_specific_criteria, :pacticipant_id).uniq
         QueryIds.new(all_pacticipant_ids, specified_pacticipant_ids, pacticipant_ids, pacticipant_version_ids)
       end