pact_broker 2.76.1 → 2.79.0

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

@@ -4,6 +4,7 @@ require 'pact_broker/date_helper'
 require 'pact_broker/ui/view_models/matrix_tag'
 require 'pact_broker/versions/abbreviate_number'
 require 'pact_broker/messages'
+require 'forwardable'
 
 module PactBroker
   module UI
@@ -11,6 +12,9 @@ module PactBroker
       class MatrixLine
         include PactBroker::Api::PactBrokerUrls
         include PactBroker::Messages
+        extend Forwardable
+
+        delegate [:consumer_version_branch, :provider_version_branch] => :line
 
         def initialize line, options = {}
           @line = line
@@ -97,27 +101,47 @@ module PactBroker
           end
         end
 
+        def consumer_version_branch_tooltip
+          branch_tooltip(consumer_name, consumer_version_branch, consumer_version_latest_for_branch?)
+        end
+
+        def consumer_version_latest_for_branch?
+          @line.consumer_version.latest_for_branch?
+        end
+
+        def provider_version_branch_tooltip
+          branch_tooltip(provider_name, provider_version_branch, provider_version_latest_for_branch?)
+        end
+
+        def provider_version_latest_for_branch?
+          @line.provider_version.latest_for_branch?
+        end
+
         def latest_consumer_version_tags
           @line.consumer_version_tags
             .select(&:latest)
+            .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
         end
 
         def other_consumer_version_tags
           @line.consumer_version_tags
             .reject(&:latest)
+            .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
         end
 
         def latest_provider_version_tags
           @line.provider_version_tags
             .select(&:latest)
+            .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
         end
 
         def other_provider_version_tags
           @line.provider_version_tags
             .reject(&:latest)
+            .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
         end
 
@@ -164,8 +188,8 @@ module PactBroker
 
         def verification_status_class
           case @line.success
-            when true then 'success'
-            when false then 'danger'
+            when true then 'table-success'
+            when false then 'table-danger'
             else ''
           end
         end
@@ -187,6 +211,18 @@ module PactBroker
         def base_url
           @options[:base_url]
         end
+
+        private
+
+        attr_reader :line
+
+        def branch_tooltip(pacticipant_name, branch, latest)
+          if latest
+            "This is the latest version of #{pacticipant_name} from branch \"#{branch}\"."
+          else
+            "A more recent version of #{pacticipant_name} from branch \"#{branch}\" exists."
+          end
+        end
       end
     end
   end

data/lib/pact_broker/ui/views/index/show-with-tags.haml

@@ -39,14 +39,18 @@
               %a{:href => index_item.consumer_group_url }
                 = index_item.consumer_name
             %td.consumer-version-number{"data-text": index_item.consumer_version_order}
-              %div.clippable
-                = index_item.consumer_version_number
-                - if index_item.consumer_version_number
+              %div.clippable{"data-clippable": index_item.consumer_version_number}
+                = index_item.display_consumer_version_number
+                - if index_item.display_consumer_version_number
                   %button.clippy.invisible{ title: "Copy to clipboard" }
                     %span.copy-icon
               - if index_item.latest?
                 .tag.badge.badge-success
                   latest
+              - if index_item.consumer_version_branch
+                - branch_class = index_item.latest_for_branch? ? "tag badge badge-dark" : "tag badge badge-secondary"
+                %div{"class": branch_class}
+                  = "[" + index_item.consumer_version_branch + "]"
               - index_item.consumer_version_latest_tag_names.each do | tag_name |
                 .tag.badge.badge-primary
                   = tag_name
@@ -59,11 +63,15 @@
               %a{ href: index_item.provider_group_url }
                 = index_item.provider_name
             %td.provider-version-number
-              %div.clippable
-                = index_item.provider_version_number
-                - if index_item.provider_version_number
+              %div.clippable{"data-clippable": index_item.provider_version_number}
+                = index_item.display_provider_version_number
+                - if index_item.display_provider_version_number
                   %button.clippy.invisible{ title: "Copy to clipboard" }
                     %span.copy-icon
+              - if index_item.provider_version_branch
+                - branch_class = "tag badge badge-dark"
+                %div{"class": branch_class}
+                  = "[" + index_item.provider_version_branch + "]"
               - index_item.provider_version_latest_tag_names.each do | tag_name |
                 .tag.badge.badge-primary
                   = tag_name

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

@@ -112,12 +112,17 @@
             %a{href: line.consumer_name_url}
               = line.consumer_name
           %td.consumer-version{'data-sort-value' => line.consumer_version_order, 'data-consumer-version-id' => line.consumer_version_id}
-            %div.clippable
+            %div.clippable{'data-clippable': line.consumer_version_number}
               %a{href: line.consumer_version_number_url}
                 = line.display_consumer_version_number
               - if line.display_consumer_version_number
                 %button.clippy.invisible{ title: "Copy to clipboard" }
                   %span.copy-icon
+            - if line.consumer_version_branch
+              .tag-parent{"title": line.consumer_version_branch_tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                - branch_class = line.consumer_version_latest_for_branch? ? "tag badge badge-dark" : "tag badge badge-secondary"
+                %div{"class": branch_class}
+                  = "[" + line.consumer_version_branch + "]"
             - line.latest_consumer_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: tag.url}
@@ -139,12 +144,17 @@
             %a{href: line.provider_name_url}
               = line.provider_name
           %td.provider-version{'data-sort-value' => line.provider_version_order, 'data-provider-version-id' => line.provider_version_id }
-            %div.clippable
+            %div.clippable{'data-clippable': line.provider_version_number}
               %a{href: line.provider_version_number_url}
                 = line.display_provider_version_number
               - if line.display_provider_version_number
                 %button.clippy.invisible{ title: "Copy to clipboard" }
                   %span.copy-icon
+            - if line.provider_version_branch
+              .tag-parent{"title": line.provider_version_branch_tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                - branch_class = line.provider_version_latest_for_branch? ? "tag badge badge-dark" : "tag badge badge-secondary"
+                %div{"class": branch_class}
+                  = "[" + line.provider_version_branch + "]"
             - line.latest_provider_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: tag.url}

data/lib/pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version.rb

@@ -16,12 +16,14 @@ module PactBroker
 end
 
 # Table: latest_verification_id_for_pact_version_and_provider_version
+# Primary Key: (pact_version_id, provider_version_id)
 # Columns:
-#  consumer_id         | integer | NOT NULL
-#  pact_version_id     | integer | NOT NULL
-#  provider_id         | integer | NOT NULL
-#  provider_version_id | integer | NOT NULL
-#  verification_id     | integer | NOT NULL
+#  consumer_id         | integer                     | NOT NULL
+#  pact_version_id     | integer                     | NOT NULL
+#  provider_id         | integer                     | NOT NULL
+#  provider_version_id | integer                     | NOT NULL
+#  verification_id     | integer                     | NOT NULL
+#  created_at          | timestamp without time zone |
 # Indexes:
 #  latest_v_id_for_pv_and_pv_pv_id_pv_id_unq | UNIQUE btree (pact_version_id, provider_version_id)
 #  latest_v_id_for_pv_and_pv_v_id_unq        | UNIQUE btree (verification_id)

data/lib/pact_broker/verifications/service.rb

@@ -20,7 +20,7 @@ module PactBroker
         verification_repository.next_number
       end
 
-      def create next_verification_number, params, pact, webhook_options
+      def create next_verification_number, params, pact, event_context, webhook_options
         logger.info "Creating verification #{next_verification_number} for pact_id=#{pact.id}", payload: params.reject{ |k,_| k == "testResults"}
         verification = PactBroker::Domain::Verification.new
         provider_version_number = params.fetch('providerApplicationVersion')
@@ -35,6 +35,7 @@ module PactBroker
         webhook_trigger_service.trigger_webhooks_for_verification_results_publication(
           pact,
           verification,
+          event_context.merge(provider_version_tags: verification.provider_version_tag_names),
           webhook_options.deep_merge(webhook_execution_configuration: execution_configuration)
         )
         verification

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.76.1'
+  VERSION = '2.79.0'
 end

data/lib/pact_broker/versions/eager_loaders.rb

@@ -0,0 +1,71 @@
+module PactBroker
+  module Versions
+    module EagerLoaders
+      class LatestVersionForBranch
+        def self.call(eo, **other)
+          initialize_association(eo[:rows])
+          populate_associations(eo[:rows])
+        end
+
+        def self.initialize_association(versions)
+          versions.each{|version| version.associations[:latest_version_for_branch] = nil }
+        end
+
+        def self.populate_associations(versions)
+          group_by_pacticipant_id(versions).each do | pacticipant, versions |
+            populate_associations_by_pacticipant(pacticipant, versions)
+          end
+        end
+
+        def self.group_by_pacticipant_id(versions)
+          versions.to_a.group_by(&:pacticipant_id)
+        end
+
+        def self.populate_associations_by_pacticipant(pacticipant_id, versions)
+          latest_versions_for_branches = latest_versions_for_pacticipant_branches(
+            pacticipant_id,
+            versions.collect(&:branch).uniq.compact,
+            versions.first.class
+          )
+          self.populate_versions_with_branches(versions, latest_versions_for_branches)
+        end
+
+        def self.populate_versions_with_branches(versions, latest_versions_for_branches)
+          versions.select(&:branch).each do | version |
+            version.associations[:latest_version_for_branch] = latest_versions_for_branches[[version.pacticipant_id, version.branch]]
+          end
+        end
+
+        def self.latest_versions_for_pacticipant_branches(pacticipant_id, branches, version_class)
+          version_class.latest_versions_for_pacticipant_branches(pacticipant_id, branches).each_with_object({}) do | row, hash |
+            hash[[row.pacticipant_id, row.branch]] = row
+          end
+        end
+      end
+
+      class LatestVersionForPacticipant
+        def self.call(eo, **other)
+          populate_associations(eo[:rows])
+        end
+
+        def self.populate_associations(versions)
+          group_by_pacticipant(versions).each do | pacticipant, versions |
+            populate_associations_by_pacticipant(pacticipant, versions)
+          end
+        end
+
+        def self.group_by_pacticipant(versions)
+          versions.to_a.group_by(&:pacticipant)
+        end
+
+        def self.populate_associations_by_pacticipant(pacticipant, versions)
+          latest_version = versions.first.class.latest_version_for_pacticipant(pacticipant).single_record
+
+          versions.each do | version |
+            version.associations[:latest_version_for_pacticipant] = latest_version
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/versions/lazy_loaders.rb

@@ -0,0 +1,13 @@
+module PactBroker
+  module Versions
+    module LazyLoaders
+      LATEST_VERSION_FOR_BRANCH = lambda {
+        self.class
+          .where(branch: branch, pacticipant_id: pacticipant_id)
+          .exclude(branch: nil)
+          .order(Sequel.desc(:order))
+          .limit(1)
+      }
+    end
+  end
+end

data/lib/pact_broker/versions/repository.rb

@@ -9,6 +9,7 @@ module PactBroker
 
       include PactBroker::Logging
       include PactBroker::Repositories::Helpers
+      include PactBroker::Repositories
 
       def find_by_pacticipant_id_and_number pacticipant_id, number
         PactBroker::Domain::Version.where(number: number, pacticipant_id: pacticipant_id).single_record
@@ -57,7 +58,26 @@ module PactBroker
           updated_at: Sequel.datetime_class.now
         }
 
-        PactBroker::Domain::Version.new(version_params).insert_ignore
+        PactBroker::Domain::Version.new(version_params).upsert
+      end
+
+      def create_or_overwrite(pacticipant, version_number, open_struct_version)
+        saved_version = PactBroker::Domain::Version.new(
+          number: version_number,
+          pacticipant: pacticipant,
+          build_url: open_struct_version.build_url,
+          branch: open_struct_version.branch
+        ).upsert
+
+        if open_struct_version.tags
+          tag_repository.delete_by_version_id(saved_version.id)
+          open_struct_version.tags.collect do | open_struct_tag |
+            tag_repository.create(version: saved_version, name: open_struct_tag.name)
+          end
+          saved_version.refresh
+        end
+
+        saved_version
       end
 
       def find_by_pacticipant_id_and_number_or_create pacticipant_id, number
@@ -79,7 +99,7 @@ module PactBroker
         version_ids_to_keep = (version_ids_with_pact_publications + version_ids_with_verifications).uniq
 
         PactBroker::Domain::Version
-          .where(pacticipant_id: [consumer.id, provider.id])
+          .where(Sequel[:versions][:pacticipant_id] => [consumer.id, provider.id])
           .exclude(id: (version_ids_with_pact_publications + version_ids_with_verifications).uniq)
           .delete
       end

data/lib/pact_broker/versions/service.rb

@@ -1,7 +1,6 @@
 require 'pact_broker/repositories'
 
 module PactBroker
-
   module Versions
     class Service
 
@@ -19,6 +18,11 @@ module PactBroker
         version_repository.find_by_pacticipant_name_and_latest_tag(pacticipant_name, tag)
       end
 
+      def self.create_or_overwrite(pacticipant_name, version_number, version)
+        pacticipant = pacticipant_repository.find_by_name_or_create(pacticipant_name)
+        version_repository.create_or_overwrite(pacticipant, version_number, version)
+      end
+
       def self.delete version
         tag_repository.delete_by_version_id version.id
         webhook_repository.delete_triggered_webhooks_by_version_id version.id

data/lib/pact_broker/webhooks/execution.rb

@@ -32,13 +32,14 @@ end
 
 # Table: webhook_executions
 # Columns:
-#  id                   | integer                     | PRIMARY KEY DEFAULT nextval('webhook_executions_id_seq'::regclass)
+#  id                   | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
 #  triggered_webhook_id | integer                     |
 #  success              | boolean                     | NOT NULL
 #  logs                 | text                        |
 #  created_at           | timestamp without time zone | NOT NULL
 # Indexes:
-#  webhook_executions_pkey | PRIMARY KEY btree (id)
+#  webhook_executions_pkey                       | PRIMARY KEY btree (id)
+#  webhook_executions_triggered_webhook_id_index | btree (triggered_webhook_id)
 # Foreign key constraints:
 #  webhook_executions_consumer_id_fkey          | (consumer_id) REFERENCES pacticipants(id)
 #  webhook_executions_pact_publication_id_fkey  | (pact_publication_id) REFERENCES pact_publications(id)

data/lib/pact_broker/webhooks/latest_triggered_webhook.rb

@@ -21,3 +21,5 @@ end
 #  status              | text                        |
 #  created_at          | timestamp without time zone |
 #  updated_at          | timestamp without time zone |
+#  verification_id     | integer                     |
+#  event_name          | text                        |

data/lib/pact_broker/webhooks/pact_and_verification_parameters.rb

@@ -13,6 +13,7 @@ module PactBroker
       BITBUCKET_VERIFICATION_STATUS = 'pactbroker.bitbucketVerificationStatus'
       CONSUMER_LABELS = 'pactbroker.consumerLabels'
       PROVIDER_LABELS = 'pactbroker.providerLabels'
+      EVENT_NAME = 'pactbroker.eventName'
 
       ALL = [
         CONSUMER_NAME,
@@ -26,7 +27,8 @@ module PactBroker
         GITHUB_VERIFICATION_STATUS,
         BITBUCKET_VERIFICATION_STATUS,
         CONSUMER_LABELS,
-        PROVIDER_LABELS
+        PROVIDER_LABELS,
+        EVENT_NAME
       ]
 
       def initialize(pact, trigger_verification, webhook_context)
@@ -49,7 +51,8 @@ module PactBroker
           GITHUB_VERIFICATION_STATUS => github_verification_status,
           BITBUCKET_VERIFICATION_STATUS => bitbucket_verification_status,
           CONSUMER_LABELS => pacticipant_labels(pact && pact.consumer),
-          PROVIDER_LABELS => pacticipant_labels(pact && pact.provider)
+          PROVIDER_LABELS => pacticipant_labels(pact && pact.provider),
+          EVENT_NAME => event_name
         }
       end
 
@@ -116,6 +119,10 @@ module PactBroker
       def pacticipant_labels pacticipant
         pacticipant && pacticipant.labels ? pacticipant.labels.collect(&:name).join(", ") : ""
       end
+
+      def event_name
+        webhook_context.fetch(:event_name)
+      end
     end
   end
-end
+end

data/lib/pact_broker/webhooks/service.rb

@@ -87,7 +87,7 @@ module PactBroker
         webhook_repository.find_all
       end
 
-      def self.test_execution webhook, execution_configuration
+      def self.test_execution webhook, event_context, execution_configuration
         merged_options = execution_configuration.with_failure_log_message("Webhook execution failed").to_hash
 
         verification = nil
@@ -96,7 +96,7 @@ module PactBroker
         end
 
         pact = pact_service.search_for_latest_pact(consumer_name: webhook.consumer_name, provider_name: webhook.provider_name) || PactBroker::Pacts::PlaceholderPact.new
-        webhook.execute(pact, verification, merged_options)
+        webhook.execute(pact, verification, event_context.merge(event_name: "test"), merged_options)
       end
 
       def self.execute_triggered_webhook_now triggered_webhook, webhook_execution_configuration_hash
@@ -121,23 +121,24 @@ module PactBroker
         webhook_repository.find_by_consumer_and_provider consumer, provider
       end
 
-      def self.trigger_webhooks pact, verification, event_name, options
+      def self.trigger_webhooks pact, verification, event_name, event_context, options
         webhooks = webhook_repository.find_by_consumer_and_or_provider_and_event_name pact.consumer, pact.provider, event_name
 
         if webhooks.any?
           webhook_execution_configuration = options.fetch(:webhook_execution_configuration).with_webhook_context(event_name: event_name)
-          run_later(webhooks, pact, verification, event_name, options.merge(webhook_execution_configuration: webhook_execution_configuration))
+          # bit messy to merge in base_url here, but easier than a big refactor
+          base_url = options.fetch(:webhook_execution_configuration).webhook_context.fetch(:base_url)
+          run_later(webhooks, pact, verification, event_name, event_context.merge(event_name: event_name, base_url: base_url), options.merge(webhook_execution_configuration: webhook_execution_configuration))
         else
           logger.info "No enabled webhooks found for consumer \"#{pact.consumer.name}\" and provider \"#{pact.provider.name}\" and event #{event_name}"
         end
       end
 
-      def self.run_later webhooks, pact, verification, event_name, options
+      def self.run_later webhooks, pact, verification, event_name, event_context, options
         trigger_uuid = next_uuid
         webhooks.each do | webhook |
           begin
-            webhook_context = options.fetch(:webhook_execution_configuration).webhook_context
-            triggered_webhook = webhook_repository.create_triggered_webhook(trigger_uuid, webhook, pact, verification, RESOURCE_CREATION, event_name, webhook_context)
+            triggered_webhook = webhook_repository.create_triggered_webhook(trigger_uuid, webhook, pact, verification, RESOURCE_CREATION, event_name, event_context)
             logger.info "Scheduling job for webhook with uuid #{webhook.uuid}"
             logger.debug "Schedule webhook with options #{options}"
             job_data = { triggered_webhook: triggered_webhook }.deep_merge(options)