pact_broker 2.99.0 → 2.102.0

data/lib/pact_broker/domain/tag.rb

@@ -39,53 +39,28 @@ module PactBroker
         end
 
         def latest_tags
-          self_join = {
-            Sequel[:tags][:pacticipant_id] => Sequel[:tags_2][:pacticipant_id],
-            Sequel[:tags][:name] => Sequel[:tags_2][:name]
-          }
-
-          PactBroker::Domain::Tag
+          Tag
             .select_all_qualified
-            .left_join(:tags, self_join, { table_alias: :tags_2 }) do
-              Sequel[:tags_2][:version_order] > Sequel[:tags][:version_order]
-            end
-            .where(Sequel[:tags_2][:name] => nil)
+            .max_group_by(:version_order, [:pacticipant_id, :name])
         end
 
         # Does NOT care about whether or not there is a pact publication
         # for the version
         def latest_tags_for_pacticipant_ids(pacticipant_ids)
-          self_join = {
-            Sequel[:tags][:pacticipant_id] => Sequel[:tags_2][:pacticipant_id],
-            Sequel[:tags][:name] => Sequel[:tags_2][:name],
-            Sequel[:tags_2][:pacticipant_id] => pacticipant_ids,
-          }
-
           Tag
             .select_all_qualified
-            .left_join(:tags, self_join, { table_alias: :tags_2 }) do
-              Sequel[:tags_2][:version_order] > Sequel[:tags][:version_order]
+            .max_group_by(:version_order, [:pacticipant_id, :name]) do | ds |
+              ds.where(Sequel[:tags][:pacticipant_id] => pacticipant_ids)
             end
-            .where(Sequel[:tags_2][:name] => nil)
-            .where(Sequel[:tags][:pacticipant_id] => pacticipant_ids)
         end
 
         def latest_tags_for_pacticipant_ids_and_tag_names(pacticipant_ids, tag_names)
-          self_join = {
-            Sequel[:tags][:pacticipant_id] => Sequel[:tags_2][:pacticipant_id],
-            Sequel[:tags][:name] => Sequel[:tags_2][:name],
-            Sequel[:tags_2][:pacticipant_id] => pacticipant_ids,
-            Sequel[:tags_2][:name] => tag_names
-          }
-
           Tag
             .select_all_qualified
-            .left_join(:tags, self_join, { table_alias: :tags_2 }) do
-              Sequel[:tags_2][:version_order] > Sequel[:tags][:version_order]
+            .max_group_by(:version_order, [:pacticipant_id, :name]) do | ds |
+              ds.where(Sequel[:tags][:name] => tag_names)
+                .where(Sequel[:tags][:pacticipant_id] => pacticipant_ids)
             end
-            .where(Sequel[:tags_2][:name] => nil)
-            .where(Sequel[:tags][:pacticipant_id] => pacticipant_ids)
-            .where(Sequel[:tags][:name] => tag_names)
         end
 
         # ignores tags that don't have a pact publication
@@ -110,6 +85,7 @@ module PactBroker
             .join(lp, versions_pact_publications_join)
         end
 
+        # TODO convert this to use max and join
         def head_tags_for_pact_publication(pact_publication)
           Tag.where(version_id: pact_publication.consumer_version_id).all.select do | tag |
             tag_pp_join = {

data/lib/pact_broker/domain/verification.rb

@@ -274,5 +274,6 @@ end
 #  verifications_pact_version_id_fkey | (pact_version_id) REFERENCES pact_versions(id)
 #  verifications_provider_id_fkey     | (provider_id) REFERENCES pacticipants(id)
 # Referenced By:
-#  latest_verification_id_for_pact_version_and_provider_version | latest_v_id_for_pv_and_pv_verification_id_fk | (verification_id) REFERENCES verifications(id) ON DELETE CASCADE
-#  triggered_webhooks                                           | triggered_webhooks_verification_id_fkey      | (verification_id) REFERENCES verifications(id)
+#  latest_verification_id_for_pact_version_and_provider_version | latest_v_id_for_pv_and_pv_verification_id_fk               | (verification_id) REFERENCES verifications(id) ON DELETE CASCADE
+#  pact_version_provider_tag_successful_verifications           | pact_version_provider_tag_successful_verifications_v_id_fk | (verification_id) REFERENCES verifications(id) ON DELETE SET NULL
+#  triggered_webhooks                                           | triggered_webhooks_verification_id_fkey                    | (verification_id) REFERENCES verifications(id)

data/lib/pact_broker/domain/version.rb

@@ -141,10 +141,12 @@ module PactBroker
             where(id: PactBroker::Versions::BranchVersion.select(:version_id))
           else
             matching_branch_ids = PactBroker::Versions::Branch.select(:id).where(name: branch_name)
-            matching_branch_version_ids = PactBroker::Versions::BranchVersion
-                                            .select(:version_id)
+            branch_version_ids = PactBroker::Versions::BranchVersion
+                                            .select(:version_id, :branch_name)
                                             .where(branch_id: matching_branch_ids)
-            where(id: matching_branch_version_ids)
+            select_append(:branch_name)
+              .join(branch_version_ids, { Sequel[first_source_alias][:id] => Sequel[:bv][:version_id] }, { table_alias: :bv})
+
           end
         end
 
@@ -152,18 +154,22 @@ module PactBroker
           if branch_name == true
             where(id: PactBroker::Versions::BranchHead.select(:version_id))
           else
-            where(id: PactBroker::Versions::BranchHead.select(:version_id).where(branch_name: branch_name))
+            branch_heads = PactBroker::Versions::BranchHead.select(:version_id, :branch_name).where(branch_name: branch_name)
+            select_append(:branch_name)
+              .join(branch_heads, { Sequel[first_source_alias][:id] => Sequel[:bh][:version_id] }, { table_alias: :bh })
           end
         end
 
 
         def for_main_branches
-          matching_branch_version_ids = PactBroker::Versions::BranchVersion
-                                          .select(:version_id)
+          branch_version_ids = PactBroker::Versions::BranchVersion
+                                          .select(:version_id, :branch_name)
                                           .join(:pacticipants, { Sequel[:branch_versions][:pacticipant_id] => Sequel[:pacticipants][:id] })
                                           .join(:branches, { Sequel[:branches][:id] => Sequel[:branch_versions][:branch_id], Sequel[:branches][:name] => Sequel[:pacticipants][:main_branch] })
 
-          where(id: matching_branch_version_ids)
+          select_append(Sequel[:bv][:branch_name])
+            .join(branch_version_ids, { Sequel[first_source_alias][:id] => Sequel[:bv][:version_id]  }, table_alias: :bv)
+
         end
 
         def latest_for_main_branches
@@ -171,11 +177,13 @@ module PactBroker
             Sequel[:branch_heads][:pacticipant_id] => Sequel[:pacticipants][:id],
             Sequel[:branch_heads][:branch_name] => Sequel[:pacticipants][:main_branch]
           }
-          matching_branch_version_ids = PactBroker::Versions::BranchHead
-                                          .select(:version_id)
+          branch_head_version_ids = PactBroker::Versions::BranchHead
+                                          .select(:version_id, :branch_name)
                                           .join(:pacticipants, pacticipants_join)
 
-          where(id: matching_branch_version_ids)
+          select_append(Sequel[:bh][:branch_name])
+            .join(branch_head_version_ids, { Sequel[first_source_alias][:id] => Sequel[:bh][:version_id]  }, table_alias: :bh)
+
         end
 
         def where_number(number)
@@ -322,6 +330,14 @@ module PactBroker
       def tag_names
         tags.collect(&:name)
       end
+
+      def branch
+        raise NotImplementedError
+      end
+
+      def branch= branch
+        raise NotImplementedError
+      end
     end
   end
 end

data/lib/pact_broker/locale/en.yml

@@ -87,6 +87,7 @@ en:
         environment_name_must_be_unique: Another environment with name '%{name}' already exists.
         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}"
@@ -95,15 +96,18 @@ en:
         invalid_limit: The limit must be 1 or greater.
       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 consumers/providers:
+        The name "%{new_name}" is very similar to the following existing pacticipants:
         %{existing_names}
         If you meant to specify one of the above names, please correct the pact configuration, and re-publish the pact.
-        If the pact is intended to be for a new consumer or provider, please manually create "%{new_name}" using the following command, and then re-publish the pact:
-        $ curl -v -XPOST -H "Content-Type: application/json" -d "{\"name\": \"%{new_name}\"}" %{create_pacticipant_url}
-        If the pact broker requires basic authentication, add '-u <username:password>' to the command.
+        If the pact is intended to be for a new consumer or provider, please manually create "%{new_name}" using the following command from the Pact Broker CLI, and then re-publish the pact:
+
+        pact-broker create-or-update-pacticipant --name "%{new_name}" --broker-base-url %{base_url}
+
+        For information on the Pact Broker CLI see https://docs.pact.io/go/pbc-cli
         To disable this check, set `check_for_potential_duplicate_pacticipant_names` to false in the configuration.
       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}'"
 
       "400":
         title: 400 Malformed Request

data/lib/pact_broker/matrix/deployment_status_summary.rb

@@ -62,7 +62,7 @@ module PactBroker
       def bad_practice_warnings
         warnings = []
 
-        if no_to_tag_or_environment_specified?
+        if resolved_selectors.count(&:specified?) == 1 && no_to_tag_or_branch_or_environment_specified?
           warnings << NoEnvironmentSpecified.new
         end
 
@@ -91,8 +91,8 @@ module PactBroker
           .any?
       end
 
-      def no_to_tag_or_environment_specified?
-        !(query_results.options[:tag] || query_results.options[:environment_name])
+      def no_to_tag_or_branch_or_environment_specified?
+        !(query_results.options[:tag] || query_results.options[:environment_name] || query_results.options[:main_branch])
       end
 
       def considered_specified_selectors_that_do_not_exist
@@ -170,16 +170,6 @@ module PactBroker
         end.flatten
       end
 
-      def selectors_without_a_version_for(integration)
-        selectors_with_non_existing_versions.select do | selector |
-          integration.involves_pacticipant_with_name?(selector.pacticipant_name)
-        end
-      end
-
-      def selectors_with_non_existing_versions
-        @selectors_with_non_existing_versions ||= resolved_selectors.select(&:latest_tagged_version_that_does_not_exist?)
-      end
-
       def missing_specified_version_reasons(selectors)
         selectors.collect(&:version_does_not_exist_description)
       end
@@ -192,13 +182,32 @@ module PactBroker
         PactNotEverVerifiedByProvider.new(*selectors_for(row))
       end
 
-      def selector_for(pacticipant_name)
-        resolved_selectors.find{ | s| s.pacticipant_name == pacticipant_name } ||
-          dummy_selectors.find{ | s| s.pacticipant_name == pacticipant_name }
+      # Find the resolved version selector that caused the matrix row with the
+      # specified pacticipant name and version number to be returned in the query.
+      #
+      # @return [PactBroker::Matrix::ResolvedSelector]
+      def selector_for(pacticipant_name, pacticipant_version_number)
+        found = resolved_selectors.select{ | s| s.pacticipant_name == pacticipant_name }
+
+        if found.size == 1
+          found.first
+        elsif pacticipant_version_number
+          found.find{ |s| s.pacticipant_version_number == pacticipant_version_number } || dummy_selector_for(pacticipant_name)
+        else
+          dummy_selector_for(pacticipant_name)
+        end
+      end
+
+      def selectors_for(row_or_integration)
+        if row_or_integration.respond_to?(:consumer_version_number)
+          [selector_for(row_or_integration.consumer_name, row_or_integration.consumer_version_number), selector_for(row_or_integration.provider_name, row_or_integration.provider_version_number)]
+        else
+          [selector_for(row_or_integration.consumer_name, nil), selector_for(row_or_integration.provider_name, nil)]
+        end
       end
 
-      def selectors_for(row)
-        [selector_for(row.consumer_name), selector_for(row.provider_name)]
+      def dummy_selector_for(pacticipant_name)
+        dummy_selectors.find{ | s| s.pacticipant_name == pacticipant_name }
       end
 
       # When the user has not specified a version of the provider (eg no 'latest' and/or 'tag', which means 'all versions')
@@ -232,7 +241,7 @@ module PactBroker
         considered_rows.select(&:success).collect do | row |
           begin
             if row.verification.interactions_missing_test_results.any? && !row.verification.all_interactions_missing_test_results?
-              InteractionsMissingVerifications.new(selector_for(row.consumer_name), selector_for(row.provider_name), row.verification.interactions_missing_test_results)
+              InteractionsMissingVerifications.new(selector_for(row.consumer_name, row.consumer_version_number), selector_for(row.provider_name, row.provider_version_number), row.verification.interactions_missing_test_results)
             end
           rescue StandardError => e
             logger.warn("Error determining if there were missing interaction verifications", e)

data/lib/pact_broker/matrix/parse_query.rb

@@ -48,6 +48,10 @@ module PactBroker
           options[:environment_name] = params["environment"]
         end
 
+        if params.key?("mainBranch") && params["mainBranch"] != ""
+          options[:main_branch] = params["mainBranch"] == "true"
+        end
+
         if params["ignore"].is_a?(Array)
           options[:ignore_selectors] = params["ignore"].collect{ |i| parse_selector(i) }
         else
@@ -65,6 +69,7 @@ module PactBroker
         p.branch = i["branch"] if i["branch"] && i["branch"] != ""
         p.tag = i["tag"] if i["tag"] && i["tag"] != ""
         p.environment_name = i["environment"] if i["environment"] && i["environment"] != ""
+        p.main_branch = true if i["mainBranch"] && i["mainBranch"] == "true"
         p
       end
       # rubocop: enable Metrics/CyclomaticComplexity

data/lib/pact_broker/matrix/quick_row.rb

@@ -72,6 +72,8 @@ module PactBroker
       SELECT_ALL_COLUMN_ARGS = [:select_all_columns] + ALL_COLUMNS
       SELECT_PACTICIPANT_IDS_ARGS = [:select_pacticipant_ids, Sequel[:p][:consumer_id], Sequel[:p][:provider_id]]
 
+      EAGER_LOADED_RELATIONSHIPS_FOR_VERSION = { current_deployed_versions: :environment, current_supported_released_versions: :environment, branch_versions: [:branch_head, :version, branch: :pacticipant] }
+
       associate(:many_to_one, :pact_publication, :class => "PactBroker::Pacts::PactPublication", :key => :pact_publication_id, :primary_key => :id)
       associate(:many_to_one, :provider, :class => "PactBroker::Domain::Pacticipant", :key => :provider_id, :primary_key => :id)
       associate(:many_to_one, :consumer, :class => "PactBroker::Domain::Pacticipant", :key => :consumer_id, :primary_key => :id)
@@ -141,6 +143,7 @@ module PactBroker
           order(Sequel.desc(:consumer_version_created_at), Sequel.desc(:pact_order))
         end
 
+        # eager load tags?
         def eager_all_the_things
           eager(
             :consumer,
@@ -148,8 +151,8 @@ module PactBroker
             :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: EAGER_LOADED_RELATIONSHIPS_FOR_VERSION,
+            provider_version: EAGER_LOADED_RELATIONSHIPS_FOR_VERSION,
             consumer_version_tags: { version: :pacticipant },
             provider_version_tags: { version: :pacticipant }
           )

data/lib/pact_broker/matrix/repository.rb

@@ -262,10 +262,9 @@ module PactBroker
       end
 
       # The user has specified --to TAG or --to-environment ENVIRONMENT in the CLI
-      # (or nothing, which to defaults to "with the latest version of the other integrated applications")
-      # The branch isn't implemented in the CLI yet (March 2022), but the API supports it.
+      # (or nothing, which to defaults to latest=true - "with the latest version of the other integrated applications")
       def infer_selectors_for_integrations?(options)
-        options[:latest] || options[:tag] || options[:branch] || options[:environment_name]
+        options[:latest] || options[:tag] || options[:branch] || options[:environment_name] || options[:main_branch]
       end
 
       # When only one selector is specified, (eg. checking to see if Foo version 2 can be deployed to prod),
@@ -282,6 +281,7 @@ module PactBroker
           selector = UnresolvedSelector.new(pacticipant_name: pacticipant_name)
           selector.tag = options[:tag] if options[:tag]
           selector.branch = options[:branch] if options[:branch]
+          selector.main_branch = options[:main_branch] if options[:main_branch]
           selector.latest = options[:latest] if options[:latest]
           selector.environment_name = options[:environment_name] if options[:environment_name]
           selector

data/lib/pact_broker/matrix/resolved_selector.rb

@@ -45,7 +45,8 @@ module PactBroker
           pacticipant_version_number: version.number,
           latest: original_selector[:latest],
           tag: original_selector[:tag],
-          branch: original_selector[:branch],
+          branch: original_selector[:branch] || (original_selector[:main_branch] ? version&.values[:branch_name] : nil),
+          main_branch: original_selector[:main_branch],
           environment_name: original_selector[:environment_name],
           type: type,
           ignore: ignore,
@@ -64,6 +65,7 @@ module PactBroker
           latest: original_selector[:latest],
           tag: original_selector[:tag],
           branch: original_selector[:branch],
+          main_branch: original_selector[:main_branch],
           environment_name: original_selector[:environment_name],
           type: type,
           ignore: ignore,
@@ -99,10 +101,16 @@ module PactBroker
         self[:tag]
       end
 
+      # @return [String] the name of the branch
       def branch
         self[:branch]
       end
 
+      # @return [Boolean]
+      def main_branch?
+        self[:main_branch]
+      end
+
       def environment_name
         self[:environment_name]
       end
@@ -116,7 +124,7 @@ module PactBroker
       end
 
       def only_pacticipant_name_specified?
-        !!pacticipant_name && !branch && !tag && !latest? && !pacticipant_version_number
+        !!pacticipant_name && !branch && !tag && !latest? && !pacticipant_version_number && !main_branch?
       end
 
       def latest_tagged?
@@ -127,6 +135,10 @@ module PactBroker
         latest? && branch
       end
 
+      def latest_from_main_branch?
+        latest? && main_branch?
+      end
+
       def pacticipant_or_version_does_not_exist?
         pacticipant_does_not_exist? || version_does_not_exist?
       end
@@ -139,10 +151,6 @@ module PactBroker
         !version_exists?
       end
 
-      def latest_tagged_version_that_does_not_exist?
-        version_does_not_exist? && latest_tagged?
-      end
-
       def specified_version_that_does_not_exist?
         specified? && version_does_not_exist?
       end
@@ -174,16 +182,25 @@ module PactBroker
         !ignore?
       end
 
-      # rubocop: disable Metrics/CyclomaticComplexity
+      # rubocop: disable Metrics/CyclomaticComplexity, Metrics/MethodLength
       def description
         if latest_tagged? && pacticipant_version_number
           "the latest version of #{pacticipant_name} with tag #{tag} (#{pacticipant_version_number})"
         elsif latest_tagged?
           "the latest version of #{pacticipant_name} with tag #{tag} (no such version exists)"
+        elsif main_branch? && pacticipant_version_number.nil?
+          "a version of #{pacticipant_name} from the main branch (no such version exists)"
+        elsif latest_from_main_branch? && pacticipant_version_number.nil?
+          "the latest version of #{pacticipant_name} from the main branch (no such verison exists)"
         elsif latest_from_branch? && pacticipant_version_number
           "the latest version of #{pacticipant_name} from branch #{branch} (#{pacticipant_version_number})"
         elsif latest_from_branch?
           "the latest version of #{pacticipant_name} from branch #{branch} (no such version exists)"
+        elsif branch && pacticipant_version_number
+          prefix = one_of_many? ? "one of the versions " : "the version "
+          prefix + "of #{pacticipant_name} from branch #{branch} (#{pacticipant_version_number})"
+        elsif branch
+          "a version of #{pacticipant_name} from branch #{branch} (no such version exists)"
         elsif latest? && pacticipant_version_number
           "the latest version of #{pacticipant_name} (#{pacticipant_version_number})"
         elsif latest?
@@ -194,9 +211,9 @@ module PactBroker
           "a version of #{pacticipant_name} with tag #{tag} (no such version exists)"
         elsif environment_name && pacticipant_version_number
           prefix = one_of_many? ? "one of the versions" : "the version"
-          "#{prefix} of #{pacticipant_name} currently deployed to #{environment_name} (#{pacticipant_version_number})"
+          "#{prefix} of #{pacticipant_name} currently deployed or released to #{environment_name} (#{pacticipant_version_number})"
         elsif environment_name
-          "the version of #{pacticipant_name} currently deployed to #{environment_name} (no such version exists)"
+          "a version of #{pacticipant_name} currently deployed or released to #{environment_name} (no version is currently recorded as deployed/released in this environment)"
         elsif pacticipant_version_number && version_does_not_exist?
           "version #{pacticipant_version_number} of #{pacticipant_name} (no such version exists)"
         elsif pacticipant_version_number
@@ -207,7 +224,27 @@ module PactBroker
           "any version of #{pacticipant_name}"
         end
       end
-      # rubocop: enable Metrics/CyclomaticComplexity
+      # rubocop: enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+
+      def version_does_not_exist_description
+        if version_does_not_exist?
+          if tag
+            "No version with tag #{tag} exists for #{pacticipant_name}"
+          elsif branch
+            "No version of #{pacticipant_name} from branch #{branch} exists"
+          elsif main_branch?
+            "No version of #{pacticipant_name} from the main branch exists"
+          elsif environment_name
+            "No version of #{pacticipant_name} is currently recorded as deployed or released in environment #{environment_name}"
+          elsif pacticipant_version_number
+            "No pacts or verifications have been published for version #{pacticipant_version_number} of #{pacticipant_name}"
+          else
+            "No pacts or verifications have been published for #{pacticipant_name}"
+          end
+        else
+          ""
+        end
+      end
     end
   end
 end

data/lib/pact_broker/matrix/service.rb

@@ -52,7 +52,7 @@ module PactBroker
         end
       end
 
-      # rubocop: disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop: disable Metrics/CyclomaticComplexity
       def validate_selectors selectors, options = {}
         error_messages = []
 
@@ -73,6 +73,18 @@ module PactBroker
           end
         end
 
+        if selectors.size == 0
+          error_messages << "Please provide 1 or more version selectors."
+        end
+
+        error_messages + validate_options(options)
+      end
+      # rubocop: enable Metrics/CyclomaticComplexity
+
+      # rubocop: disable Metrics/CyclomaticComplexity
+      def validate_options(options = {})
+        error_messages = []
+
         options.fetch(:ignore_selectors, []).each do | s |
           if s[:pacticipant_name].nil?
             error_messages << "Please specify the pacticipant name to ignore"
@@ -83,12 +95,10 @@ module PactBroker
           end
         end
 
-        if selectors.size == 0
-          error_messages << "Please provide 1 or more version selectors."
-        end
+        destination_identifiers = [options[:tag], options[:environment_name], options[:main_branch]&.to_s].compact
 
-        if options[:tag]&.not_blank? && options[:environment_name]&.not_blank?
-          error_messages << message("errors.validation.cannot_specify_tag_and_environment")
+        if destination_identifiers.size > 1
+          error_messages << message("errors.validation.cannot_specify_more_than_one_destination_identifier")
         end
 
         if options[:latest] && options[:environment_name]&.not_blank?
@@ -105,7 +115,7 @@ module PactBroker
 
         error_messages
       end
-      # rubocop: enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop: enable Metrics/CyclomaticComplexity
     end
   end
 end

data/lib/pact_broker/matrix/unresolved_selector.rb

@@ -11,7 +11,7 @@ module PactBroker
 
       # 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))
+        new(hash.symbolize_keys.snakecase_keys.slice(:pacticipant_name, :pacticipant_version_number, :latest, :tag, :branch, :environment_name, :main_branch))
       end
 
       def pacticipant_name
@@ -42,6 +42,11 @@ module PactBroker
         self[:branch]
       end
 
+      # @return [Boolean]
+      def main_branch
+        self[:main_branch]
+      end
+
       def environment_name
         self[:environment_name]
       end
@@ -58,6 +63,11 @@ module PactBroker
         self[:branch] = branch
       end
 
+      # @param [Boolean] main_branch
+      def main_branch= main_branch
+        self[:main_branch] = main_branch
+      end
+
       def environment_name= environment_name
         self[:environment_name] = environment_name
       end
@@ -79,9 +89,11 @@ module PactBroker
         self[:max_age]
       end
 
+      # rubocop: disable Metrics/CyclomaticComplexity
       def all_for_pacticipant?
-        !!pacticipant_name && !pacticipant_version_number && !tag && !branch && !latest && !environment_name && !max_age
+        !!pacticipant_name && !pacticipant_version_number && !tag && !branch && !latest && !environment_name && !max_age && !main_branch
       end
+      # rubocop: enable Metrics/CyclomaticComplexity
 
       def latest_for_pacticipant_and_tag?
         !!(pacticipant_name && tag && latest)

data/lib/pact_broker/messages.rb

@@ -23,15 +23,6 @@ module PactBroker
       message("errors.validation." + key, options)
     end
 
-    def potential_duplicate_pacticipant_message new_name, potential_duplicate_pacticipants, base_url
-      existing_names = potential_duplicate_pacticipants.
-        collect{ | p | "* #{p.name}"  }.join("\n")
-      message("errors.duplicate_pacticipant",
-        new_name: new_name,
-        existing_names: existing_names,
-        create_pacticipant_url: pacticipants_url(base_url))
-    end
-
     def pluralize(word, count)
       if count == 1
         word
@@ -43,11 +34,5 @@ module PactBroker
         end
       end
     end
-
-    private
-
-    def pacticipants_url base_url
-      PactBroker::Api::PactBrokerUrls.pacticipants_url base_url
-    end
   end
 end

data/lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names.rb

@@ -5,12 +5,12 @@ module PactBroker
     class FindPotentialDuplicatePacticipantNames
       attr_reader :new_name, :existing_names
 
-      def initialize new_name, existing_names
+      def initialize(new_name, existing_names)
         @new_name = new_name
         @existing_names = existing_names
       end
 
-      def self.call new_name, existing_names
+      def self.call(new_name, existing_names)
         new(new_name, existing_names).call
       end
 
@@ -22,7 +22,7 @@ module PactBroker
         end
       end
 
-      def clean name
+      def clean(name)
         self.class.split(name).collect{|w| w.chomp("s") } - ["api", "provider", "service"]
       end
 

data/lib/pact_broker/pacticipants/repository.rb

@@ -59,22 +59,23 @@ module PactBroker
           repository_name: params[:repository_name],
           repository_namespace: params[:repository_namespace],
           main_branch: params[:main_branch]
-        ).insert_ignore
+        ).insert_ignore.refresh
       end
 
       def update(pacticipant_name, pacticipant)
         pacticipant.name = pacticipant_name
-        pacticipant.save
+        pacticipant.save.refresh
       end
 
-      def replace(_pacticipant_name, open_struct_pacticipant)
+      def replace(pacticipant_name, open_struct_pacticipant)
         PactBroker::Domain::Pacticipant.new(
+          name: pacticipant_name,
           display_name: open_struct_pacticipant.display_name,
           repository_url: open_struct_pacticipant.repository_url,
           repository_name: open_struct_pacticipant.repository_name,
           repository_namespace: open_struct_pacticipant.repository_namespace,
           main_branch: open_struct_pacticipant.main_branch
-        ).save
+        ).upsert
       end
 
       def delete(pacticipant)