pact_broker 2.86.0 → 2.87.0

data/lib/pact_broker/deployments/environment_service.rb

@@ -2,11 +2,14 @@ require "pact_broker/deployments/environment"
 require "securerandom"
 require "pact_broker/pacticipants/generate_display_name"
 require "pact_broker/string_refinements"
+require "pact_broker/repositories/scopes"
 
 module PactBroker
   module Deployments
     module EnvironmentService
       using PactBroker::StringRefinements
+      extend PactBroker::Repositories::Scopes
+
       extend self
 
       def self.included(base)
@@ -34,7 +37,7 @@ module PactBroker
       end
 
       def find_all
-        PactBroker::Deployments::Environment.order(Sequel.function(:lower, :display_name)).all
+        scope_for(PactBroker::Deployments::Environment).order(Sequel.function(:lower, :display_name)).all
       end
 
       def find(uuid)

data/lib/pact_broker/deployments/released_version_service.rb

@@ -52,6 +52,7 @@ module PactBroker
           .where(pacticipant_id: pacticipant.id)
           .eager(:version)
           .eager(:environment)
+          .order(:created_at, :id)
           .all
       end
     end

data/lib/pact_broker/doc/controllers/app.rb

@@ -17,6 +17,7 @@ module PactBroker
           "webhooks-webhooks" => "webhooks",
           "webhook" => "webhooks",
           "can-i-deploy-pacticipant-version-to-tag" => "can-i-deploy",
+          "can-i-deploy-pacticipant-version-to-environment" => "can-i-deploy",
           "pacticipant" => "pacticipants"
         }.freeze
 

data/lib/pact_broker/doc/views/can-i-deploy.markdown

@@ -10,7 +10,8 @@ A simplified resource that accepts the same parameters as the basic usage of the
 * _version_: The version of the pacticipant (application) you want to deploy (required).
 * _environment_: The name of the environment into which the pacticipant (application) is to be deployed. 
 * _to_: The tag used to identify the environment into which you wish to deploy the application (eg. `test` or `prod`). Deprecated - use the `environment=ENVIRONMENT` parameter in preference to the `to=TAG` parameter as deployments and environments are now explictly supported.
-* _ignore[]_: The name of the pacticipant to ignore when determining if it is safe to deploy (optional). May be used multiple times.
+* _ignore[]_: The name of the pacticipant to ignore when determining if it is safe to deploy (optional). May be used multiple times. eg `ignore[]=foo&ignore[]=bar`
+* _ignore[][pacticipant]_ and _ignore[][version]_: When ignoring a specific pacticipant version, the name and version of the application to ignore may be specified using "nested" param names syntax. eg. `ignore[][pacticipant]=foo&ignore[][version]=2ac5a946&ignore[][pacticipant]=bar`
 
 
 If you have an environment that you identify with the name `prod`, and each time you deployed an application to the prod environment you recorded the deployment of relevant application version in the Pact Broker using `record-deployment`, then calling `/can-i-deploy?pacticipant=Foo&version=734137278d&environment=prod` will check that version 734137278d of Foo has a successful verification result with each of the integrated application versions that are currently in prod. That is, it is safe to deploy.

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

@@ -4,11 +4,16 @@ Allowed methods: `POST`
 
 Path: `/contracts/publish`
 
+Index relation: `pb:publish-contracts`
+
+Supported from: `v2.86.0`
+
 This is the preferred endpoint with which to publish contracts (previously, contracts were published using multiple calls to different endpoints to create the tag and contract resources). To detect whether this endpoint exists in a particular version of the Pact Broker, make a request to the index resource, and locate the `pb:publish-contracts` relation. Do a `POST` to the href specified for that relation. 
 
-The previous tag and pact endpoints are still supported, however, future features that build on this endpoint may not be able to be backported into those endpoints (eg. publishing pacts with a branch).
+The previous tag and pact endpoints are still supported, however, future features that build on this endpoint may not be able to be backported into those endpoints.
 
 ## Parameters
+
 * `pacticipantName`: the name of the application. Required.
 * `pacticipantVersionNumber`: the version number of the application. Required. It is recommended that this should be or include the git SHA. See [http://docs.pact.io/versioning](http://docs.pact.io/versioning).
 * `branch`: The git branch name. Optional but strongly recommended.
@@ -20,7 +25,31 @@ The previous tag and pact endpoints are still supported, however, future feature
   * `specification`: currently, only contracts of type "pact" are supported, but this will be extended in the future. Required.
   * `contentType`: currently, only contracts with a content type of "application/json" are supported. Required.
   * `content`: the content of the contract. Must be Base64 encoded. Required.
-  * `onConflict`: Specifies the action to take when a contract for this consumer version already exists with different content. Allowed values are `overwrite`|`merge`. Optional. Defaults to `overwrite`. When `merge` is specified, the interactions are merged into any pre-existing pact. This is required when the tests that generate pact files are split over multiple nodes.
+
+## Responses
+
+### Success
+
+* `notices`
+  * `level`: one of `debug`, `info`, `warning`,`prompt`,`success`
+  * `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:
+
+* `pb:contracts` (array)
+* `pb:pacticipant-version-tags` (array)
+* `pb:pacticipant-version`
+* `pb:pacticipant`
+
+### Errors
+
+Any validation errors will be returned in the standard Pact Broker format:
+
+    {
+      "errors": {
+        "<fieldName>": ["message 1", "message 2"]
+      }
+    }
 
 ## Example
 
@@ -37,30 +66,29 @@ The previous tag and pact endpoints are still supported, however, future feature
           "providerName": "Bar",
           "specification": "pact",
           "contentType": "application/json",
-          "content": "<base64 encoded JSON pact>",
-          "onConflict": "overwrite"
+          "content": "<base64 encoded JSON pact>"
         }
       ]
     }
     
     {
       {
-        "logs": [
+        "notices": [
           {
             "level": "debug",
-            "message": "Created Foo version dc5eb529230038a4673b8c971395bd2922d8b240 with branch main and tags main"
+            "text": "Created Foo version dc5eb529230038a4673b8c971395bd2922d8b240 with branch main and tags main"
           },
           {
             "level": "info",
-            "message": "Pact published for Foo version dc5eb529230038a4673b8c971395bd2922d8b240 and provider Bar."
+            "text": "Pact published for Foo version dc5eb529230038a4673b8c971395bd2922d8b240 and provider Bar."
           },
           {
             "level": "debug",
-            "message": "  Events detected: contract_published, contract_content_changed (first time any pact published for this consumer with consumer version tagged main)"
+            "text": "  Events detected: contract_published, contract_content_changed (first time any pact published for this consumer with consumer version tagged main)"
           },
           {
             "level": "debug",
-            "message": "  Webhook \"foo webhook\" triggered for event contract_content_changed.\n    See logs at http://example.org/triggered-webhooks/1234/logs\""
+            "text": "  Webhook \"foo webhook\" triggered for event contract_content_changed.\n    See logs at http://example.org/triggered-webhooks/1234/logs\""
           }
         ],
         "_embedded": {
@@ -118,3 +146,4 @@ The previous tag and pact endpoints are still supported, however, future feature
         }
       }
     }
+

data/lib/pact_broker/domain/index_item.rb

@@ -74,6 +74,10 @@ module PactBroker
         consumer_version.branch_heads.collect(&:branch_name)
       end
 
+      def consumer_version_branch_heads
+        consumer_version.branch_heads
+      end
+
       def consumer_version_environment_names
         (consumer_version.current_deployed_versions.collect(&:environment).collect(&:name) + consumer_version.current_supported_released_versions.collect(&:environment).collect(&:name)).uniq
       end
@@ -90,6 +94,11 @@ module PactBroker
         @latest_verification ? @latest_verification.provider_version_number : nil
       end
 
+      def provider_version_branch_heads
+        provider_version&.branch_heads || []
+      end
+
+
       def provider_version_branches
         provider_version&.branch_heads&.collect(&:branch_name) || []
       end

data/lib/pact_broker/domain/verification.rb

@@ -258,6 +258,9 @@ end
 #  wip                              | boolean                     | NOT NULL DEFAULT false
 #  consumer_version_selector_hashes | text                        |
 #  tag_names                        | text                        |
+#  pact_pending                     | boolean                     |
+#  verified_by_implementation       | text                        |
+#  verified_by_version              | text                        |
 # Indexes:
 #  verifications_pkey                          | PRIMARY KEY btree (id)
 #  verifications_pact_version_id_number_index  | UNIQUE btree (pact_version_id, number)

data/lib/pact_broker/index/service.rb

@@ -138,8 +138,8 @@ module PactBroker
         pact_publications = head_pact_publications(consumer_name: consumer_name, provider_name: provider_name, tags: true, page_number: page_number, page_size: page_size)
           .eager(:consumer)
           .eager(:provider)
-          .eager(pact_version: { latest_verification: { provider_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, :branch_heads, { tags: :head_tag }]} })
-          .eager(consumer_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, :branch_heads, { tags: :head_tag }])
+          .eager(pact_version: { latest_verification: { provider_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, { branch_heads: :branch_version }, { tags: :head_tag }]} })
+          .eager(consumer_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, { branch_heads: :branch_version }, { tags: :head_tag }])
           .eager(:head_pact_publications_for_tags)
 
         pact_publications.all.collect do | pact_publication |

data/lib/pact_broker/locale/en.yml

@@ -34,16 +34,18 @@ en:
             consumerVersionTags: The list of tag names for the most recent consumer version associated with the pact content, separated by ", "
             consumerVersionBranch: The repository branch associated with the consumer version
             providerVersionTags: The list of tag names for the provider version associated with the verification result, separated by ", ".
+            providerVersionDescriptions: The descriptions of the provider version(s) for which the contract_requiring_verification_published webhook has been triggered.
             providerVersionBranch: The repository branch associated with the provider version
             consumerLabels: The list of labels for the consumer associated with the pact content, separated by ", ".
             providerLabels: The list of labels for the provider associated with the pact content, separated by ", ".
-            pactUrl: The "permalink" URL to the newly published pact (the URL specifying the consumer version URL, rather than the "/latest" format.
+            pactUrl: The "permalink" URL to the newly published pact content (using the pact version SHA).
             verificationResultUrl: The URL to the relevant verification result.
             githubVerificationStatus: The verification status using the correct keywords for posting to the Github commit status API. See https://developer.github.com/v3/repos/statuses
             bitbucketVerificationStatus: The verification status using the correct keywords for posting to the Bitbucket commit status API. See https://developer.atlassian.com/server/bitbucket/how-tos/updating-build-status-for-commits/
             azureDevOpsVerificationStatus: The verification status using the correct keywords for posting to the Azure DevOps GitStatusState API. See https://docs.microsoft.com/en-us/rest/api/azure/devops/git/statuses/create?view=azure-devops-rest-6.0
             gitlabVerificationStatus: The verification status using the correct keywords for posting to the Gitlab Commits API. See https://docs.gitlab.com/ee/api/commits.html#post-the-build-status-to-a-commit
             eventName: The name of the event that triggered the webhook
+            buildUrl: The URL of the build that published the resources that have triggered the webhook (currently only supported for contracts published using the 'all in one' endpoint).
             currentlyDeployedProviderVersionNumber: The version number of the currently deployed provider version (when used in a template, the webhook will be triggered once for each currently deployed provider version)
         no_webhooks_enabled_for_event: No enabled webhooks found for the detected events
         webhook_triggered_for_event: Webhook %{webhook_description} triggered for event %{event_name}.

data/lib/pact_broker/matrix/parse_can_i_deploy_query.rb

@@ -29,9 +29,11 @@ module PactBroker
         end
 
         if params[:ignore].is_a?(Array)
-          options[:ignore_selectors] = params[:ignore].collect do | pacticipant_name |
-            if pacticipant_name.is_a?(String)
-              PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: pacticipant_name)
+          options[:ignore_selectors] = params[:ignore].collect do | param |
+            if param.is_a?(String)
+              PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: param)
+            elsif param.is_a?(Hash) && param.key?(:pacticipant)
+              PactBroker::Matrix::UnresolvedSelector.new({ pacticipant_name: param[:pacticipant], pacticipant_version_number: param[:version] }.compact)
             end
           end.compact
         else

data/lib/pact_broker/pacticipants/repository.rb

@@ -95,7 +95,7 @@ module PactBroker
       end
 
       def search_by_name(pacticipant_name)
-        terms = pacticipant_name.split.map { |v| v.gsub("_", '\\_') }
+        terms = pacticipant_name.split.map { |v| v.gsub("_", "\\_") }
         string_match_query = Sequel.|( *terms.map { |term| Sequel.ilike(Sequel[:pacticipants][:name], "%#{term}%") })
         PactBroker::Domain::Pacticipant.where(string_match_query)
       end

data/lib/pact_broker/pacts/metadata.rb

@@ -5,7 +5,7 @@ module PactBroker
 
       MAPPINGS = [
         [:consumer_version_tags, "cvt"],
-        [:consumer_version_number, "cvn"], # for old urls
+        [:consumer_version_number, "cvn"], # for old urls and build_metadata_for_consumer_version_number
         [:consumer_version_id, "cv"],
         [:wip, "w"],
         [:pending, "p"],
@@ -33,6 +33,12 @@ module PactBroker
         end
       end
 
+      def build_metadata_for_consumer_version_number(consumer_version_number)
+        {
+          "cvn" => consumer_version_number
+        }
+      end
+
       # When a pact is published, and a webhook is triggered, this stores
       # the current tags and consumer version number in the metadata parameter of the
       # pact version URL that is made available in the webhook template

data/lib/pact_broker/pacts/pacts_for_verification_repository.rb

@@ -132,6 +132,7 @@ module PactBroker
         selectors = selector_for_latest_main_version_or_overall_latest(provider)
         selectors << Selector.for_currently_deployed
         selectors << Selector.for_currently_supported
+        logger.debug("Default selectors", payload: selectors)
         selectors
       end
 
@@ -140,9 +141,9 @@ module PactBroker
         consumers = integration_service.find_for_provider(provider).collect(&:consumer)
 
         consumers.collect do | consumer |
-          if consumer.main_branch && PactBroker::Domain::Version.for_selector(PactBroker::Matrix::UnresolvedSelector.new(branch: consumer.main_branch, latest: true)).any?
+          if consumer.main_branch && PactBroker::Domain::Version.for_selector(PactBroker::Matrix::UnresolvedSelector.new(branch: consumer.main_branch, pacticipant_name: consumer.name, latest: true)).any?
             selectors << Selector.for_main_branch.for_consumer(consumer.name)
-          elsif consumer.main_branch && PactBroker::Domain::Version.for_selector(PactBroker::Matrix::UnresolvedSelector.new(tag: consumer.main_branch, latest: true)).any?
+          elsif consumer.main_branch && PactBroker::Domain::Version.for_selector(PactBroker::Matrix::UnresolvedSelector.new(tag: consumer.main_branch, pacticipant_name: consumer.name, latest: true)).any?
             selectors << Selector.latest_for_tag(consumer.main_branch).for_consumer(consumer.name)
           else
             selectors << Selector.overall_latest.for_consumer(consumer.name)

data/lib/pact_broker/pacts/service.rb

@@ -56,7 +56,7 @@ module PactBroker
         existing_pact = pact_repository.find_by_version_and_provider(consumer_version.id, provider.id)
 
         if existing_pact
-          update_pact params, existing_pact
+          create_pact_revision params, existing_pact
         else
           create_pact params, consumer_version, provider
         end
@@ -72,7 +72,7 @@ module PactBroker
           existing_pact.json_content, params[:json_content]
         )
 
-        update_pact params, existing_pact
+        create_pact_revision params, existing_pact
       end
 
       def find_all_pact_versions_between consumer, options
@@ -155,7 +155,7 @@ module PactBroker
       end
 
       # Overwriting an existing pact with the same consumer/provider/consumer version number
-      def update_pact params, existing_pact
+      def create_pact_revision params, existing_pact
         logger.info "Updating existing pact publication with params #{params.reject{ |k, _v| k == :json_content}}"
         logger.debug "Content #{params[:json_content]}"
         pact_version_sha = generate_sha(params[:json_content])
@@ -177,12 +177,12 @@ module PactBroker
         updated_pact
       end
 
+      private :create_pact_revision
+
       def disallowed_modification?(existing_pact, new_json_content)
         !PactBroker.configuration.allow_dangerous_contract_modification && existing_pact && existing_pact.pact_version_sha != generate_sha(new_json_content)
       end
 
-      private :update_pact
-
       # When no publication for the given consumer/provider/consumer version number exists
       def create_pact params, version, provider
         logger.info "Creating new pact publication with params #{params.reject{ |k, _v| k == :json_content}}"

data/lib/pact_broker/string_refinements.rb

@@ -38,7 +38,7 @@ module PactBroker
           first_letter = separators.shift
         end
 
-        separators = ["_", '\s'] if separators.empty?
+        separators = ["_", "\\s"] if separators.empty?
 
         str = self.dup
 

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -20,6 +20,7 @@ module PactBroker
               logger.filter(/(Authorization: ).*/,'\1[REMOVED]')
             end
           end
+          faraday.basic_auth(auth[:username], auth[:password]) if auth[:username]
           faraday.headers["Authorization"] = "Bearer #{auth[:token]}" if auth[:token]
           faraday.adapter Faraday.default_adapter
         end
@@ -229,6 +230,7 @@ module PactBroker
           "providerVersionBranch" => "${pactbroker.providerVersionBranch}",
           "providerName" => "${pactbroker.providerName}",
           "providerVersionNumber" => "${pactbroker.providerVersionNumber}",
+          "providerVersionDescriptions" => "${pactbroker.providerVersionDescriptions}",
           "consumerVersionBranch" => "${pactbroker.consumerVersionBranch}",
         }
         request_body = {

data/lib/pact_broker/ui/helpers/url_helper.rb

@@ -18,6 +18,18 @@ module PactBroker
         def matrix_url consumer_name, provider_name, base_url = ""
           "#{base_url}/matrix/provider/#{ERB::Util.url_encode(provider_name)}/consumer/#{ERB::Util.url_encode(consumer_name)}"
         end
+
+        def matrix_url_for_consumer_version consumer_name, consumer_version_number, provider_name, base_url = ""
+          query = {
+            q:
+            [
+              { pacticipant: consumer_name, version: consumer_version_number },
+              { pacticipant: provider_name }
+            ],
+            latestby: "cvpv"
+          }
+          "#{base_url}/matrix?" + Rack::Utils.build_nested_query(query)
+        end
       end
     end
   end

data/lib/pact_broker/ui/view_models/index_item.rb

@@ -3,6 +3,8 @@ require "pact_broker/ui/helpers/url_helper"
 require "pact_broker/date_helper"
 require "pact_broker/versions/abbreviate_number"
 require "pact_broker/configuration"
+require "pact_broker/ui/view_models/index_item_branch_head"
+require "pact_broker/ui/view_models/index_item_provider_branch_head"
 require "forwardable"
 
 module PactBroker
@@ -66,6 +68,12 @@ module PactBroker
           @relationship.latest?
         end
 
+        def consumer_version_branch_heads
+          @relationship.consumer_version_branch_heads.collect do | branch_head |
+            IndexItemBranchHead.new(branch_head, consumer_name)
+          end
+        end
+
         def consumer_version_latest_tag_names
           @relationship.tag_names
         end
@@ -74,6 +82,12 @@ module PactBroker
           @relationship.latest_verification_latest_tags.collect(&:name)
         end
 
+        def provider_version_branch_heads
+          @relationship.provider_version_branch_heads.collect do | branch_head |
+            IndexItemProviderBranchHead.new(branch_head, provider_name)
+          end
+        end
+
         def consumer_group_url
           Helpers::URLHelper.group_url(consumer_name, base_url)
         end
@@ -95,7 +109,7 @@ module PactBroker
         end
 
         def pact_matrix_url
-          Helpers::URLHelper.matrix_url(consumer_name, provider_name, base_url)
+          Helpers::URLHelper.matrix_url_for_consumer_version(consumer_name, consumer_version_number, provider_name, base_url)
         end
 
         def any_webhooks?

data/lib/pact_broker/ui/view_models/index_item_branch_head.rb

@@ -0,0 +1,39 @@
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/url_helper"
+require "pact_broker/date_helper"
+
+module PactBroker
+  module UI
+    module ViewDomain
+      class IndexItemBranchHead
+
+        include PactBroker::Api::PactBrokerUrls
+
+        def initialize branch_head, pacticipant_name
+          @branch_head = branch_head
+          @pacticipant_name = pacticipant_name
+        end
+
+        def branch_name
+          branch_head.branch_name
+        end
+
+        def tooltip
+          if branch_head.branch_version.auto_created
+            "This is the latest pact from branch \"#{branch_name}\". This branch was automatically inferred from the first tag because the Pact Broker configuration setting `use_first_tag_as_branch` was true."
+          else
+            "This is the latest pact from branch \"#{branch_name}\"."
+          end
+        end
+
+        def latest?
+          true
+        end
+
+        private
+
+        attr_reader :branch_head, :pacticipant_name
+      end
+    end
+  end
+end

data/lib/pact_broker/ui/view_models/index_item_provider_branch_head.rb

@@ -0,0 +1,39 @@
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/url_helper"
+require "pact_broker/date_helper"
+
+module PactBroker
+  module UI
+    module ViewDomain
+      class IndexItemProviderBranchHead
+
+        include PactBroker::Api::PactBrokerUrls
+
+        def initialize branch_head, pacticipant_name
+          @branch_head = branch_head
+          @pacticipant_name = pacticipant_name
+        end
+
+        def branch_name
+          branch_head.branch_name
+        end
+
+        def tooltip
+          if branch_head.branch_version.auto_created
+            "The latest verification is from branch \"#{branch_name}\". This branch was automatically inferred from the first tag because the Pact Broker configuration setting `use_first_tag_as_branch` was true."
+          else
+            "The latest verification is from branch \"#{branch_name}\"."
+          end
+        end
+
+        def latest?
+          true
+        end
+
+        private
+
+        attr_reader :branch_head, :pacticipant_name
+      end
+    end
+  end
+end

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

@@ -85,9 +85,9 @@
                     %button.clippy.invisible{ title: "Copy to clipboard" }
                       %span.copy-icon
                 - if view == "branch" || view == "all"
-                  - index_item.consumer_version_branches.each do | branch_name |
-                    %div{"class": "tag badge badge-dark"}
-                      = "branch: " + branch_name
+                  - index_item.consumer_version_branch_heads.each do | branch_head |
+                    %div{"class": "tag badge badge-dark", "title": branch_head.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                      = "branch: " + branch_head.branch_name
                 - if view == "tag" || view == "all"
                   - index_item.consumer_version_latest_tag_names.each do | tag_name |
                     .tag.badge.badge-primary
@@ -106,9 +106,9 @@
                     %button.clippy.invisible{ title: "Copy to clipboard" }
                       %span.copy-icon
                 - if view == "branch" || view == "all"
-                  - index_item.provider_version_branches.each do | branch_name |
-                    %div{"class": "tag badge badge-dark"}
-                      = "branch: " + branch_name
+                  - index_item.provider_version_branch_heads.each do | branch_head |
+                    %div{"class": "tag badge badge-dark", "title": branch_head.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                      = "branch: " + branch_head.branch_name
                 - if view == "tag" || view == "all"
                   - index_item.provider_version_latest_tag_names.each do | tag_name |
                     .tag.badge.badge-primary
@@ -159,8 +159,15 @@
       $('td[data-toggle="tooltip"]').each(function(index, td){
         //appended tooltip div screws up table if it's appended after a
         //td, so need to append it to a div
-        $(td).tooltip({container: $(td).first()});
+        $(td).tooltip({ container: $(td).first() });
       });
+
+      // https://www.w3schools.com/bootstrap/bootstrap_ref_js_tooltip.asp
+
+      $('div[data-toggle="tooltip"]').each(function(index, div){
+        $(div).tooltip()
+      });
+
     });
 
     $(".reset-search").on("click", function() {

data/lib/pact_broker/verifications/service.rb

@@ -138,7 +138,7 @@ module PactBroker
         latest_version_from_main_branch = [version_service.find_latest_version_from_main_branch(pact_version.provider)].compact
 
         latest_version_from_main_branch.collect do | main_branch_version |
-          identify_required_verification(pact_version, main_branch_version, "latest version from main branch")
+          identify_required_verification(pact_version, main_branch_version, "latest from main branch")
         end.compact
       end
       private :required_verifications_for_main_branch
@@ -148,7 +148,7 @@ module PactBroker
           unscoped_service.find_currently_deployed_versions_for_pacticipant(pact_version.provider)
         end
         deployed_versions.collect do | deployed_version |
-          identify_required_verification(pact_version, deployed_version.version, "currently deployed version (#{deployed_version.environment_name})")
+          identify_required_verification(pact_version, deployed_version.version, "deployed in #{deployed_version.environment_name}")
         end.compact
       end
       private :required_verifications_for_deployed_versions
@@ -158,7 +158,7 @@ module PactBroker
           unscoped_service.find_currently_supported_versions_for_pacticipant(pact_version.provider)
         end
         released_versions.collect do | released_version |
-          identify_required_verification(pact_version, released_version.version, "currently released version (#{released_version.environment_name})")
+          identify_required_verification(pact_version, released_version.version, "released in #{released_version.environment_name}")
         end.compact
       end
       private :required_verifications_for_released_versions

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.86.0"
+  VERSION = "2.87.0"
 end

data/lib/pact_broker/versions/branch_head.rb

@@ -28,14 +28,12 @@ end
 
 # Table: branch_heads
 # Columns:
-#  id                | integer | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
 #  branch_id         | integer | NOT NULL
 #  branch_version_id | integer | NOT NULL
 #  version_id        | integer | NOT NULL
 #  pacticipant_id    | integer | NOT NULL
 #  branch_name       | text    | NOT NULL
 # Indexes:
-#  branch_heads_pkey                 | PRIMARY KEY btree (id)
 #  branch_heads_branch_id_index      | UNIQUE btree (branch_id)
 #  branch_heads_branch_name_index    | btree (branch_name)
 #  branch_heads_pacticipant_id_index | btree (pacticipant_id)

data/lib/pact_broker/versions/branch_version.rb

@@ -51,6 +51,7 @@ end
 #  branch_name    | text                        | NOT NULL
 #  created_at     | timestamp without time zone | NOT NULL
 #  updated_at     | timestamp without time zone | NOT NULL
+#  auto_created   | boolean                     | DEFAULT false
 # Indexes:
 #  branch_versions_pkey                                         | PRIMARY KEY btree (id)
 #  branch_versions_branch_id_version_id_index                   | UNIQUE btree (branch_id, version_id)

data/lib/pact_broker/versions/repository.rb

@@ -53,7 +53,6 @@ module PactBroker
 
       # There may be a race condition if two simultaneous requests come in to create the same version
       def create(args)
-        logger.info "Upserting version #{args[:number]} for pacticipant_id=#{args[:pacticipant_id]}"
         version_params = {
           number: args[:number],
           pacticipant_id: args[:pacticipant_id],