pact_broker 2.99.0 → 2.100.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd8be1bf717f3b98618f1f585146efa701f4833a9c2d8ba05eb395278bd435c
-  data.tar.gz: 36c07bdd448edd40e623c0976ec65df4c2512ddf73ce400512e27d08f7a086d8
+  metadata.gz: f22862d2054c07b06fb947f8a1f710dab261ae6ac1207e6a15adebb07dc488db
+  data.tar.gz: 5cc63160ad026673f194af54237080aeb6eb8ab4f9ac93cbe5cd71b63727d60e
 SHA512:
-  metadata.gz: 023ae6605034518c73da217fff6be8c6888bd7d56abcbf11895f18ec3eab9e32775ec574381473e626e1bca75bc3b132fd30fd755157e980d3e16dea9c125f4f
-  data.tar.gz: 67d5dcb38a78a5e590ec961826951e32c4e391ad13eea43fbf57faa48de2c20212397cdb116b93c975ecdb576e7790112e6db16b43ba5c866af4c074c0370cd3
+  metadata.gz: 8b6c0cefc1e4847ed53627f0b2aae7cfd5be46e351ce1969f21b80f5f8899990cca3f612d9ab14a82d58c0521b91fb5f5a820f4c7d9e72f17fbc391f1583daff
+  data.tar.gz: 4c1c3fa1a8e983718f1f841c8b17088678c6f4ada22c36b3ededb71a46c2bf004712c4716a8af33c17e068c88b88a6b69f219a286549841c20fa8c79ae41a214

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+<a name="v2.100.0"></a>
+### v2.100.0 (2022-05-20)
+
+#### Features
+
+* check for potential duplicate pacticipants in publish contracts endpoint (#558)	 ([ed714f03](/../../commit/ed714f03))
+* add support for "can i merge" matrix query	 ([bb108ed2](/../../commit/bb108ed2))
+* remove inefficient skynet query for tags	 ([bdc2599c](/../../commit/bdc2599c))
+* update text for matrix version description when no version is in an enviroment	 ([3eb5581d](/../../commit/3eb5581d))
+
+* **pacts for verification**
+  * update wip and pending descriptions for wip pacts	 ([b06d4477](/../../commit/b06d4477))
+
+* **matrix**
+  * add support for selectors specified by branch and environment name when reporting that a version does not exist	 ([07ff8044](/../../commit/07ff8044))
+
+#### Bug Fixes
+
+* **matrix**
+  * identify the correct failed version when a selector resolves to multiple versions	 ([11e7dc1c](/../../commit/11e7dc1c))
+
 <a name="v2.99.0"></a>
 ### v2.99.0 (2022-05-13)
 

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

@@ -30,7 +30,7 @@ module PactBroker
           when PactBroker::Matrix::PactNotVerifiedByRequiredProviderVersion
             "There is no verified pact between #{reason.consumer_selector.description} and #{reason.provider_selector.description}"
           when PactBroker::Matrix::SpecifiedVersionDoesNotExist
-            version_does_not_exist_description(reason.selector)
+            reason.selector.version_does_not_exist_description
           when PactBroker::Matrix::VerificationFailed
             "The verification for the pact between #{reason.consumer_selector.description} and #{reason.provider_selector.description} failed"
           when PactBroker::Matrix::NoDependenciesMissing
@@ -53,20 +53,6 @@ module PactBroker
           end
         end
 
-        def version_does_not_exist_description selector
-          if selector.version_does_not_exist?
-            if selector.tag
-              "No version with tag #{selector.tag} exists for #{selector.pacticipant_name}"
-            elsif selector.pacticipant_version_number
-              "No pacts or verifications have been published for version #{selector.pacticipant_version_number} of #{selector.pacticipant_name}"
-            else
-              "No pacts or verifications have been published for #{selector.pacticipant_name}"
-            end
-          else
-            ""
-          end
-        end
-
         # TODO move this somewhere else
         def interaction_description(interaction)
           if interaction["providerState"] && interaction["providerState"] != ""

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

@@ -58,11 +58,17 @@ module PactBroker
         end
 
         def policy_name
-          :'versions::version'
+          :'versions::deployed_version'
+        end
+
+        def policy_record_context
+          {
+            pacticipant: deployed_version&.pacticipant
+          }
         end
 
         def policy_record
-          deployed_version&.version
+          deployed_version&.environment
         end
 
         private

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

@@ -40,11 +40,7 @@ module PactBroker
         end
 
         def policy_name
-          :'versions::deployed_version'
-        end
-
-        def policy_record
-          environment
+          :'versions::deployed_versions'
         end
 
         private

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

@@ -1,7 +1,6 @@
 module PactBroker
   module Api
     module Resources
-
       module PacticipantResourceMethods
 
         def potential_duplicate_pacticipants? pacticipant_names

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

@@ -100,7 +100,7 @@ module PactBroker
         end
 
         def conflict_notices
-          @conflict_notices ||= contract_service.conflict_notices(parsed_contracts)
+          @conflict_notices ||= contract_service.conflict_notices(parsed_contracts, base_url: base_url)
         end
 
         def base64_decode(content)

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

@@ -48,11 +48,17 @@ module PactBroker
         end
 
         def policy_name
-          :'versions::version'
+          :'versions::released_version'
+        end
+
+        def policy_record_context
+          {
+            pacticipant: released_version&.pacticipant
+          }
         end
 
         def policy_record
-          released_version&.version
+          released_version&.environment
         end
 
         private

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

@@ -45,7 +45,7 @@ module PactBroker
         end
 
         def policy_name
-          :'versions::released_version'
+          :'versions::released_versions'
         end
 
         def policy_record

data/lib/pact_broker/contracts/contract_to_publish.rb

@@ -14,6 +14,10 @@ module PactBroker
       def merge?
         on_conflict == "merge"
       end
+
+      def pacticipant_names
+        [consumer_name, provider_name]
+      end
     end
   end
 end

data/lib/pact_broker/contracts/contracts_to_publish.rb

@@ -6,6 +6,10 @@ module PactBroker
         new(pacticipant_name, pacticipant_version_number, tags, branch, build_url, contracts)
       end
       # rubocop: enable Metrics/ParameterLists
+
+      def pacticipant_names
+        contracts.flat_map(&:pacticipant_names).uniq
+      end
     end
   end
 end

data/lib/pact_broker/contracts/service.rb

@@ -43,19 +43,26 @@ module PactBroker
         )
       end
 
-      def conflict_notices(parsed_contracts)
+      def conflict_notices(parsed_contracts, base_url: )
         notices = []
+        add_pact_conflict_notices(notices, parsed_contracts)
+        add_pacticipant_conflict_notices(notices, parsed_contracts, base_url)
+        notices
+      end
+
+      def add_pact_conflict_notices(notices, parsed_contracts)
         parsed_contracts.contracts.collect do | contract_to_publish |
           pact_params = create_pact_params(parsed_contracts, contract_to_publish)
           existing_pact = pact_service.find_pact(pact_params)
           if existing_pact && pact_service.disallowed_modification?(existing_pact, contract_to_publish.decoded_content)
-            add_conflict_notice(notices, parsed_contracts, contract_to_publish, existing_pact.json_content, contract_to_publish.decoded_content)
+            add_pact_conflict_notice(notices, parsed_contracts, contract_to_publish, existing_pact.json_content, contract_to_publish.decoded_content)
           end
         end
-        notices
       end
 
-      def add_conflict_notice(notices, parsed_contracts, contract_to_publish, existing_json_content, new_json_content)
+      private :add_pact_conflict_notices
+
+      def add_pact_conflict_notice(notices, parsed_contracts, contract_to_publish, existing_json_content, new_json_content)
         message_params = {
           consumer_name: contract_to_publish.provider_name,
           consumer_version_number: parsed_contracts.pacticipant_version_number,
@@ -65,7 +72,18 @@ module PactBroker
         notices << Notice.info(PactBroker::Pacts::CreateFormattedDiff.call(new_json_content, existing_json_content))
       end
 
-      private :add_conflict_notice
+      private :add_pact_conflict_notice
+
+      def add_pacticipant_conflict_notices(notices, parsed_contracts, base_url)
+        if PactBroker.configuration.check_for_potential_duplicate_pacticipant_names
+          duplicate_pacticipant_messages = pacticipant_service.messages_for_potential_duplicate_pacticipants(parsed_contracts.pacticipant_names, base_url)
+          duplicate_pacticipant_messages.each do | message_text |
+            notices << Notice.error(message_text)
+          end
+        end
+      end
+
+      private :add_pacticipant_conflict_notices
 
       def create_version(parsed_contracts)
         version_params = {

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/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)

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,12 +96,14 @@ 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.

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

@@ -87,8 +87,10 @@ module PactBroker
           error_messages << "Please provide 1 or more version selectors."
         end
 
-        if options[:tag]&.not_blank? && options[:environment_name]&.not_blank?
-          error_messages << message("errors.validation.cannot_specify_tag_and_environment")
+        destination_identifiers = [options[:tag], options[:environment_name], options[:main_branch]&.to_s].compact
+
+        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?

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/service.rb

@@ -10,13 +10,14 @@ module PactBroker
       extend PactBroker::Repositories
       extend PactBroker::Services
       include PactBroker::Logging
+      extend PactBroker::Messages
 
       def self.messages_for_potential_duplicate_pacticipants(pacticipant_names, base_url)
         messages = []
         pacticipant_names.each do | name |
           potential_duplicate_pacticipants = find_potential_duplicate_pacticipants(name)
           if potential_duplicate_pacticipants.any?
-            messages << Messages.potential_duplicate_pacticipant_message(name, potential_duplicate_pacticipants, base_url)
+            messages << potential_duplicate_pacticipant_message(name, potential_duplicate_pacticipants, base_url)
           end
         end
         messages
@@ -98,6 +99,15 @@ module PactBroker
           pacticipant
         end
       end
+
+      private_class_method def self.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,
+          base_url: base_url)
+      end
     end
   end
 end

data/lib/pact_broker/pacts/verifiable_pact_messages.rb

@@ -31,7 +31,7 @@ module PactBroker
         version_text = head_consumer_tags.size == 1 || branches.size == 1 ? "version" : "versions"
         if wip?
           # WIP pacts will always have tags, because it is part of the definition of being a WIP pact
-          "The pact at #{pact_version_url} is being verified because it is a 'work in progress' pact (ie. it is the pact for the latest #{version_text} of #{consumer_name} #{joined_head_consumer_tags_and_branches} and is still in pending state). #{READ_MORE_WIP}"
+          "The pact at #{pact_version_url} is being verified because it is a 'work in progress' pact (ie. it is the pact for the latest #{version_text} of #{consumer_name} #{joined_head_consumer_tags_and_branches} and it has not yet been successfully verified by #{pending_provider_branch_or_tags_description("a")} when the pact's application version was explicitly specified in the consumer version selectors). #{READ_MORE_WIP}".tap { |it| puts it }
         else
           criteria_or_criterion = selectors.size > 1 ? "criteria" : "criterion"
           version_or_versions = pluralize("the consumer version", selectors.size)
@@ -40,7 +40,9 @@ module PactBroker
       end
 
       def pending_reason
-        if pending?
+        if pending? && wip?
+          "This pact is in pending state for this version of #{provider_name} because it was included as a 'work in progress' pact. If this verification fails, it will not cause the overall build to fail. #{READ_MORE_PENDING}"
+        elsif pending?
           "This pact is in pending state for this version of #{provider_name} because a successful verification result for #{pending_provider_branch_or_tags_description("a")} has not yet been published. If this verification fails, it will not cause the overall build to fail. #{READ_MORE_PENDING}"
         else
           "This pact has previously been successfully verified by #{non_pending_provider_branch_or_tags_description}. If this verification fails, it will fail the build. #{READ_MORE_PENDING}"

data/lib/pact_broker/repositories/helpers.rb

@@ -55,6 +55,19 @@ module PactBroker
         select_append(Sequel[model.table_name].*)
       end
 
+      # @param [Symbol] max_column the name of the column of which to calculate the maxiumum
+      # @param [Array<Symbol>] group_by_columns the names of the columns by which to group
+      def max_group_by(max_column, group_by_columns, &extra_criteria_block)
+        maximums_base_query = extra_criteria_block ? extra_criteria_block.call(self) : self
+        maximums = maximums_base_query.select_group(*group_by_columns).select_append(Sequel.function(:max, max_column).as(:max_value))
+
+        max_join = group_by_columns.each_with_object({ Sequel[:maximums][:max_value] => max_column }) do | column_name, joins |
+          joins[Sequel[:maximums][column_name]] = column_name
+        end
+
+        join(maximums, max_join, table_alias: :maximums)
+      end
+
       def select_for_subquery column
         if mysql? #stoopid mysql doesn't allow you to modify datasets with subqueries
           column_name = column.respond_to?(:alias) ? column.alias : column

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -323,6 +323,20 @@ module PactBroker
         self
       end
 
+      def can_i_merge(pacticipant:, version:)
+        can_i_merge_response = client.get("matrix", { q: [pacticipant: pacticipant, version: version], latestby: "cvp", mainBranch: true, latest: true }.compact ).tap { |response| check_for_error(response) }
+        can = !!(can_i_merge_response.body["summary"] || {})["deployable"]
+        puts "can-i-merge #{pacticipant} version #{version}: #{can ? 'yes' : 'no'}"
+        summary = can_i_merge_response.body["summary"]
+        verification_result_urls = (can_i_merge_response.body["matrix"] || []).collect do | row |
+          row.dig("verificationResult", "_links", "self", "href")
+        end.compact
+        summary.merge!("verification_result_urls" => verification_result_urls)
+        puts summary.to_yaml
+        separate
+        self
+      end
+
       def delete_integration(consumer:, provider:)
         puts "Deleting all data for the integration between #{consumer} and #{provider}"
         client.delete("integrations/provider/#{encode(provider)}/consumer/#{encode(consumer)}").tap { |response| check_for_error(response) }

data/lib/pact_broker/ui/views/matrix/show.haml

@@ -70,12 +70,14 @@
             %input{name: 'q[]latest', value: 'true', hidden: true, class: 'latest-flag'}
 
 
-      - if options.latest || options.tag
+      %input{name: 'latest', value: options.latest.to_s, hidden: true }
+      %input{name: 'mainBranch', value: options.mainBranch.to_s, hidden: true}
+
+      - if options.tag
         .selector
           %label{for: 'to'}
             = options.latest ? 'To (tag)' : 'With all (tagged)'
           %input{name: 'tag', id: 'to', value: options.tag }
-          %input{name: 'latest', value: options.latest.to_s, hidden: true}
 
       - if options.environment_name
         .selector
@@ -83,6 +85,7 @@
             To environment
           %input{name: 'environment', id: 'environment', value: options.environment_name }
 
+
       %div.top-of-group.form-check
         %input{type: 'radio', name: "latestby", class: 'form-check-input', value: '', id: 'all_rows', checked: options.all_rows_checked}
         %label{for: 'all_rows', class: "form-check-label"}

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.99.0"
+  VERSION = "2.100.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.99.0
+  version: 2.100.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -1222,7 +1222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: See description