pact_broker 2.77.0 → 2.80.0

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

@@ -1,6 +1,6 @@
-require 'pact_broker/api/pact_broker_urls'
-require 'pact_broker/ui/helpers/url_helper'
-require 'pact_broker/date_helper'
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/url_helper"
+require "pact_broker/date_helper"
 
 module PactBroker
   module UI

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

@@ -2,10 +2,24 @@
   != render :haml, :'index/_css_and_js', :layout => false
   .container
     != render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false, base_url: base_url}
-    - if index_items.empty?
+    - if index_items.empty? && search.blank?
       != render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
       Pacts
+
+    - unless errors.blank?
+      - errors.each do | error |
+        %div.alert.alert-danger
+          = error
+
+    %form{action: "#{base_url}"}
+      .field
+        %label{for: 'search'}
+          Search
+        %input{name: 'search', id: 'search', class: 'search', value: search}
+        %input{type: 'button', class: 'submit-search', value: 'Submit'}
+        %input{type: 'button', class: 'reset-search', value: 'Reset' }
+
     %table.table.table-bordered.table-striped{ id: 'relationships' }
       %thead
         %tr
@@ -39,21 +53,24 @@
               %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 + "]"
+                  = "branch: " + index_item.consumer_version_branch
               - index_item.consumer_version_latest_tag_names.each do | tag_name |
                 .tag.badge.badge-primary
-                  = tag_name
+                  = "tag: " + tag_name
+              - index_item.consumer_version_environment_names.each do | environment_name |
+                .tag.badge.badge-success
+                  = "env: " + environment_name
+              - if index_item.latest?
+                .tag.badge.bg-light
+                  latest
             %td.pact
               %span.pact
                 %a{ href: index_item.pact_url, title: "View pact" }
@@ -63,18 +80,21 @@
               %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 + "]"
+                  = "branch: " + index_item.provider_version_branch
               - index_item.provider_version_latest_tag_names.each do | tag_name |
                 .tag.badge.badge-primary
-                  = tag_name
+                  = "tag: " + tag_name
+              - index_item.provider_version_environment_names.each do | environment_name |
+                .tag.badge.badge-success
+                  = "env: " + environment_name
             %td{"data-text": index_item.publication_date_of_latest_pact_order}
               = index_item.publication_date_of_latest_pact.gsub("about ", "")
             %td{ class: "table-#{index_item.webhook_status}" }
@@ -112,3 +132,29 @@
         $(td).tooltip({container: $(td).first()});
       });
     });
+
+    $(".reset-search").on("click", function() {
+      const url = new URL(window.location)
+      url.searchParams.delete('search')
+      window.location = url.toString();
+    })
+
+    $(".submit-search").on("click", function() {
+      search = $("#search").val();
+      const url = new URL(window.location)
+      url.searchParams.set('search', search)
+      window.location = url.toString();
+    })
+
+    $(".search").keypress(function(event) {
+      const enterKeyCode = 13;
+
+      const key = event.which;
+      if (key === enterKeyCode) {
+        event.preventDefault();
+        search = $("#search").val();
+        const url = new URL(window.location)
+        url.searchParams.set('search', search)
+        window.location = url.toString();
+      }
+    })

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

@@ -2,10 +2,24 @@
   != render :haml, :'index/_css_and_js', :layout => false
   .container
     != render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true, base_url: base_url}
-    - if index_items.empty?
+    - if index_items.empty? && search.blank?
       != render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
       Pacts
+
+    - unless errors.blank?
+      - errors.each do | error |
+        %div.alert.alert-danger
+          = error
+
+    %form{action: "#{base_url}"}
+      .field
+        %label{for: 'search'}
+          Search
+        %input{name: 'search', id: 'search', class: 'search', value: search}
+        %input{type: 'submit', value: 'Submit'}
+        %input{type: 'button', class: 'reset-search', value: 'Reset' }
+
     %table.table.table-bordered.table-striped{ id: 'relationships' }
       %thead
         %tr
@@ -55,7 +69,8 @@
                   %span.warning-icon{ 'aria-hidden': true }
             %td
               %span.integration-settings.kebab-horizontal{ 'aria-hidden': true }
-    %div.pagination
+
+    %div.pagination.text-center
 
     - pagination_locals = { page_number: page_number, page_size: page_size, pagination_record_count: pagination_record_count, current_page_size: current_page_size }
     != render :haml, :'index/_pagination', :layout => false, locals: pagination_locals
@@ -75,3 +90,9 @@
         $(td).tooltip({container: $(td).first()});
       });
     });
+
+    $(".reset-search").on("click", function() {
+      const url = new URL(window.location)
+      url.searchParams.delete('search')
+      window.location = url.toString();
+    })

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

@@ -40,13 +40,22 @@
                 Latest version
               %option{ value: 'specify-version', selected: selector.specify_version }
                 Version number ...
+              %option{ value: 'specify-latest-branch', selected: selector.specify_latest_branch }
+                Latest version from branch ...
+              %option{ value: 'specify-environment', selected: selector.specify_environment }
+                Version(s) in environment ...
               %option{ value: 'specify-latest-tag', selected: selector.specify_latest_tag }
                 Latest version with tag ...
               %option{ value: 'specify-all-tagged', selected: selector.specify_all_tagged }
                 All versions with tag...
 
+
             %input{name: 'q[]version', type: 'text', id: "pacticipant#{index}_version", class: 'version', value: selector.pacticipant_version_number}
 
+            %input{name: 'q[]branch', type: 'text', id: "pacticipant#{index}_branch", class: 'branch', value: selector.branch}
+
+            %input{name: 'q[]environment', type: 'text', id: "pacticipant#{index}_environment", class: 'environment', value: selector.environment_name}
+
             %input{name: 'q[]tag', type: 'text', id: "pacticipant#{index}_tag", class: 'tag', value: selector.tag}
 
             %input{name: 'q[]latest', value: 'true', hidden: true, class: 'latest-flag'}
@@ -55,10 +64,15 @@
       - if options.latest || options.tag
         .selector
           %label{for: 'to'}
-            = options.latest ? 'To' : 'With all'
+            = 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
+          %label{for: 'environment'}
+            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}
@@ -112,7 +126,7 @@
             %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
@@ -122,17 +136,22 @@
               .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 + "]"
+                  = "branch: " + line.consumer_version_branch
+            - line.consumer_versions_in_environments.each do | version_in_environment |
+              .tag-parent{"title": version_in_environment.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                %a{href: version_in_environment.url}
+                  .tag.badge.badge-success
+                    = "env: " + version_in_environment.environment_name
             - line.latest_consumer_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: tag.url}
                   .tag.badge.badge-primary
-                    = tag.name
+                    = "tag: " + tag.name
             - line.other_consumer_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: tag.url}
                   .tag.badge.badge-secondary
-                    = tag.name
+                    = "tag: " + tag.name
           %td.pact-published{'data-sort-value' => line.pact_published_order, "data-toggle": "tooltip", "title": line.pact_version_sha_message, "data-placement": "right", "data-pact-version-sha": line.pact_version_sha}
             %a{href: line.pact_publication_date_url}
               - if options.all_rows_checked
@@ -144,7 +163,7 @@
             %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
@@ -154,17 +173,22 @@
               .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 + "]"
+                  = "branch: " + line.provider_version_branch
+            - line.provider_versions_in_environments.each do | version_in_environment |
+              .tag-parent{"title": version_in_environment.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                %a{href: version_in_environment.url}
+                  .tag.badge.badge-success
+                    = "env: " + version_in_environment.environment_name
             - line.latest_provider_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: tag.url}
                   .tag.badge.badge-primary
-                    = tag.name
+                    = "tag:" + tag.name
             - line.other_provider_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: tag.url}
                   .tag.badge.badge-secondary
-                    = tag.name
+                    = "tag: " + tag.name
           %td.verification-result{class: line.verification_status_class, "title": line.pre_verified_message, "data-toggle": "tooltip", "data-placement": "left"}
             %a{href: line.verification_status_url}
               - if options.all_rows_checked && line.number

data/lib/pact_broker/verifications/latest_verification_for_consumer_and_provider.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/domain/verification'
+require "pact_broker/domain/verification"
 
 module PactBroker
   module Verifications

data/lib/pact_broker/verifications/latest_verification_for_consumer_version_tag.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/domain/verification'
+require "pact_broker/domain/verification"
 
 module PactBroker
   module Verifications

data/lib/pact_broker/verifications/latest_verification_for_pact_version.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/domain/verification'
+require "pact_broker/domain/verification"
 
 module PactBroker
   module Verifications

data/lib/pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/domain/verification'
+require "pact_broker/domain/verification"
 
 module PactBroker
   module Verifications

data/lib/pact_broker/verifications/repository.rb

@@ -1,8 +1,8 @@
-require 'sequel'
-require 'pact_broker/domain/verification'
-require 'pact_broker/verifications/latest_verification_for_pact_version'
-require 'pact_broker/verifications/sequence'
-require 'pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version'
+require "sequel"
+require "pact_broker/domain/verification"
+require "pact_broker/verifications/latest_verification_for_pact_version"
+require "pact_broker/verifications/sequence"
+require "pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version"
 
 module PactBroker
   module Verifications
@@ -62,6 +62,10 @@ module PactBroker
         PactBroker::Pacts::PactPublication.where(id: pact.id).single_record.latest_verification
       end
 
+      def any_verifications?(consumer, provider)
+        PactBroker::Domain::Verification.where(consumer_id: consumer.id, provider_id: provider.id).any?
+      end
+
       def search_for_latest consumer_name, provider_name
         query = LatestVerificationForPactVersion
                   .select_all_qualified

data/lib/pact_broker/verifications/sequence.rb

@@ -1,5 +1,5 @@
-require 'sequel'
-require 'pact_broker/repositories/helpers'
+require "sequel"
+require "pact_broker/repositories/helpers"
 
 module PactBroker
   module Verifications

data/lib/pact_broker/verifications/service.rb

@@ -1,43 +1,42 @@
-require 'pact_broker/repositories'
-require 'pact_broker/api/decorators/verification_decorator'
-require 'pact_broker/verifications/summary_for_consumer_version'
-require 'pact_broker/logging'
-require 'pact_broker/hash_refinements'
+require "delegate"
+require "pact_broker/repositories"
+require "pact_broker/api/decorators/verification_decorator"
+require "pact_broker/verifications/summary_for_consumer_version"
+require "pact_broker/logging"
+require "pact_broker/hash_refinements"
+require "pact_broker/events/publisher"
 
 module PactBroker
-
   module Verifications
     module Service
 
+      extend Forwardable
+
       extend self
 
       extend PactBroker::Repositories
       extend PactBroker::Services
       include PactBroker::Logging
       using PactBroker::HashRefinements
+      extend PactBroker::Events::Publisher
+
+      delegate [:any_verifications?] => :verification_repository
 
       def next_number
         verification_repository.next_number
       end
 
-      def create next_verification_number, params, pact, event_context, webhook_options
+      def create next_verification_number, params, pact, event_context
         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')
+        provider_version_number = params.fetch("providerApplicationVersion")
         PactBroker::Api::Decorators::VerificationDecorator.new(verification).from_hash(params)
-        verification.wip = params.fetch('wip')
+        verification.wip = params.fetch("wip")
         verification.number = next_verification_number
         verification = verification_repository.create(verification, provider_version_number, pact)
 
-        execution_configuration = webhook_options[:webhook_execution_configuration]
-                                    .with_webhook_context(provider_version_tags: verification.provider_version_tag_names)
+        broadcast_events(verification, pact, event_context)
 
-        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
       end
 
@@ -89,6 +88,23 @@ module PactBroker
       def delete_all_verifications_between(consumer_name, options)
         verification_repository.delete_all_verifications_between(consumer_name, options)
       end
+
+      private
+
+      def broadcast_events(verification, pact, event_context)
+        event_params = {
+          pact: pact,
+          verification: verification,
+          event_context: event_context.merge(provider_version_tags: verification.provider_version_tag_names)
+        }
+
+        broadcast(:provider_verification_published, event_params)
+        if verification.success
+          broadcast(:provider_verification_succeeded, event_params)
+        else
+          broadcast(:provider_verification_failed, event_params)
+        end
+      end
     end
   end
 end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.77.0'
+  VERSION = "2.80.0"
 end

data/lib/pact_broker/versions/eager_loaders.rb

@@ -2,7 +2,7 @@ module PactBroker
   module Versions
     module EagerLoaders
       class LatestVersionForBranch
-        def self.call(eo, **other)
+        def self.call(eo, **_other)
           initialize_association(eo[:rows])
           populate_associations(eo[:rows])
         end
@@ -12,8 +12,8 @@ module PactBroker
         end
 
         def self.populate_associations(versions)
-          group_by_pacticipant_id(versions).each do | pacticipant, versions |
-            populate_associations_by_pacticipant(pacticipant, versions)
+          group_by_pacticipant_id(versions).each do | pacticipant, participant_versions |
+            populate_associations_by_pacticipant(pacticipant, participant_versions)
           end
         end
 
@@ -44,13 +44,13 @@ module PactBroker
       end
 
       class LatestVersionForPacticipant
-        def self.call(eo, **other)
+        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)
+          group_by_pacticipant(versions).each do | pacticipant, participant_versions |
+            populate_associations_by_pacticipant(pacticipant, participant_versions)
           end
         end