pact_broker 2.27.2 → 2.27.3

data/lib/pact_broker/logging/default_formatter.rb

@@ -0,0 +1,16 @@
+require 'logger'
+require 'semantic_logger'
+
+module PactBroker
+  module Logging
+    class DefaultFormatter < SemanticLogger::Formatters::Default
+      def initialize
+        @formatter = ::Logger::Formatter.new
+      end
+
+      def call(log, output)
+        @formatter.call(log.level.upcase, log.time, nil, log.message)
+      end
+    end
+  end
+end

data/lib/pact_broker/matrix/deployment_status_summary.rb

@@ -3,6 +3,8 @@ require 'pact_broker/logging'
 module PactBroker
   module Matrix
     class DeploymentStatusSummary
+      include PactBroker::Logging
+
       attr_reader :rows, :resolved_selectors, :integrations
 
       def initialize(rows, resolved_selectors, integrations)
@@ -88,7 +90,7 @@ module PactBroker
         if resolved_selector
           resolved_selector[:pacticipant_version_number]
         else
-          PactBroker.logger.warn "Could not find the resolved version for pacticipant_id #{pacticipant_id} from integrations #{integrations.collect(&:to_s).join(", ")} in resolved selectors #{resolved_selectors.inspect}"
+          logger.warn "Could not find the resolved version for pacticipant_id #{pacticipant_id} from integrations #{integrations.collect(&:to_s).join(", ")} in resolved selectors #{resolved_selectors.inspect}"
           "unresolved version"
         end
       end

data/lib/pact_broker/pacticipants/service.rb

@@ -10,7 +10,7 @@ module PactBroker
 
       extend PactBroker::Repositories
       extend PactBroker::Services
-      extend PactBroker::Logging
+      include PactBroker::Logging
 
       def self.messages_for_potential_duplicate_pacticipants pacticipant_names, base_url
         messages = []

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -15,7 +15,7 @@ module PactBroker
 
       set_primary_key :id
       associate(:one_to_many, :tags, :class => "PactBroker::Domain::Tag", :reciprocal => :version, :key => :version_id, :primary_key => :consumer_version_id)
-      associate(:many_to_one, :pact_version, :key => :pact_version_sha, :primary_key => :sha)
+      associate(:many_to_one, :pact_version, :key => :pact_version_id, :primary_key => :id)
 
       dataset_module do
         include PactBroker::Repositories::Helpers

data/lib/pact_broker/pacts/repository.rb

@@ -75,15 +75,18 @@ module PactBroker
       end
 
       def find_all_pact_versions_between consumer_name, options
-        provider_name = options.fetch(:and)
-        LatestPactPublicationsByConsumerVersion
+        find_all_database_versions_between(consumer_name, options)
           .eager(:tags)
-          .consumer(consumer_name)
-          .provider(provider_name)
           .reverse_order(:consumer_version_order)
           .collect(&:to_domain)
       end
 
+      def delete_all_pact_versions_between consumer_name, options
+        ids = find_all_database_versions_between(consumer_name, options).select_for_subquery(:id)
+        webhook_repository.delete_triggered_webhooks_by_pact_publication_ids(ids)
+        PactPublication.where(id: ids).delete
+      end
+
       def find_latest_pact_versions_for_provider provider_name, tag = nil
         if tag
           LatestTaggedPactPublications.provider(provider_name).order_ignore_case(:consumer_name).where(tag_name: tag).collect(&:to_domain)
@@ -255,6 +258,17 @@ module PactBroker
         pact_version = PactVersion.new(consumer_id: consumer_id, provider_id: provider_id, sha: sha, content: json_content)
         pact_version.save
       end
+
+      def find_all_database_versions_between(consumer_name, options)
+        provider_name = options.fetch(:and)
+
+        query = LatestPactPublicationsByConsumerVersion
+          .consumer(consumer_name)
+          .provider(provider_name)
+
+        query = query.tag(options[:tag]) if options[:tag]
+        query
+      end
     end
   end
 end

data/lib/pact_broker/pacts/service.rb

@@ -68,6 +68,10 @@ module PactBroker
         pact_repository.find_all_pact_versions_between consumer, options
       end
 
+      def delete_all_pact_versions_between consumer, options
+        pact_repository.delete_all_pact_versions_between consumer, options
+      end
+
       def find_latest_pact_versions_for_provider provider_name, options = {}
         pact_repository.find_latest_pact_versions_for_provider provider_name, options[:tag]
       end

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

@@ -18,27 +18,28 @@
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }
       %thead
-        %th.consumer
-          Consumer
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.consumer-version-number
-          Consumer<br>Version
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.pact{ style: 'width: 40px' }
-        %th.provider
-          Provider
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.provider-version-number
-          Provider<br>Version
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th
-          Published
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th
-          Webhook<br>status
-        %th
-          Last<br>verified
-          %span.glyphicon.glyphicon-sort.relationships-sort
+        %tr
+          %th.consumer
+            Consumer
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th.consumer-version-number
+            Consumer<br>Version
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th.pact{ style: 'width: 40px' }
+          %th.provider
+            Provider
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th.provider-version-number
+            Provider<br>Version
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th
+            Published
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th
+            Webhook<br>status
+          %th
+            Last<br>verified
+            %span.glyphicon.glyphicon-sort.relationships-sort
       %tbody
 
       - index_items.each do | index_item |
@@ -84,17 +85,17 @@
     %div.relationships-size
       = index_items.size_label
 
-:javascript
-  $(function(){
-    $("#relationships").tablesorter();
-  });
+  :javascript
+    $(function(){
+      $("#relationships").tablesorter();
+    });
 
-  $(document).ready(function(){
-    $("span.pact a").load("/images/doc-text.svg");
-    $("span.pact-matrix a").load("/images/doc-matrix.svg");
-    $('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()});
+    $(document).ready(function(){
+      $("span.pact a").load("/images/doc-text.svg");
+      $("span.pact-matrix a").load("/images/doc-matrix.svg");
+      $('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()});
+      });
     });
-  });

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

@@ -18,22 +18,23 @@
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }
       %thead
-        %th
-        %th.consumer
-          Consumer
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.pact
+        %tr
+          %th
+          %th.consumer
+            Consumer
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th.pact
 
-        %th.provider
-          Provider
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th
-        %th
-          Latest pact<br>published
-        %th
-          Webhook<br>status
-        %th
-          Last<br>verified
+          %th.provider
+            Provider
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th
+          %th
+            Latest pact<br>published
+          %th
+            Webhook<br>status
+          %th
+            Last<br>verified
       %tbody
 
       - index_items.each do | index_item |
@@ -65,17 +66,17 @@
     %div.relationships-size
       = index_items.size_label
 
-:javascript
-  $(function(){
-    $("#relationships").tablesorter();
-  });
+  :javascript
+    $(function(){
+      $("#relationships").tablesorter();
+    });
 
-  $(document).ready(function(){
-    $("span.pact a").load("/images/doc-text.svg");
-    $("span.pact-matrix a").load("/images/doc-matrix.svg");
-    $('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()});
+    $(document).ready(function(){
+      $("span.pact a").load("/images/doc-text.svg");
+      $("span.pact-matrix a").load("/images/doc-matrix.svg");
+      $('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()});
+      });
     });
-  });

data/lib/pact_broker/ui/views/layouts/main.haml

@@ -1,6 +1,6 @@
+<!DOCTYPE html>
 %html
   %head
     %title= defined?(title) ? title : ""
     %link{rel: 'shortcut icon', href: '/images/favicon.ico', type:'image/x-icon'}
-  %body
-    = yield
+  = yield

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

@@ -7,142 +7,141 @@
   %script{type: 'text/javascript', src:'/javascripts/matrix.js'}
   %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
 
--# This code is an embarassment. Sorry. Just trying to get as much stuff done in the little time I have.
+  .container
+    .navbar-right
+      %a{href: '/'}
+        Home
+    %h1.page-header
+      = title
 
-.container
-  .navbar-right
-    %a{href: '/'}
-      Home
-  %h1.page-header
-    = title
+    - if defined?(errors) && errors.any?
+      - errors.each do | error |
+        %div.alert.alert-danger
+          = error
 
-  - if defined?(errors) && errors.any?
-    - errors.each do | error |
-      %div.alert.alert-danger
-        = error
+    %form{action: '/matrix', onsubmit:'return onSubmit()'}
+      - selectors.each_with_index do | selector, index |
+        .selector
+          %label{for: "pacticipant#{index}"}
+            Pacticipant name
+          %input{name: 'q[]pacticipant', id: "pacticipant1#{index}", value: selector.pacticipant_name}
 
-  %form{action: '/matrix', onsubmit:'return onSubmit()'}
-    - selectors.each_with_index do | selector, index |
-      .selector
-        %label{for: "pacticipant#{index}"}
-          Pacticipant name
-        %input{name: 'q[]pacticipant', id: "pacticipant1#{index}", value: selector.pacticipant_name}
+          .input-group
 
-        .input-group
-
-        .input-group
-          %select{ name: "ignorethis#{index}", class: 'version-selectorizor' }
-            %option{ value: 'specify-all-versions', selected: selector.specify_all_versions }
-              All versions
-            %option{ value: 'specify-latest', selected: selector.specify_latest }
-              Latest version
-            %option{ value: 'specify-version', selected: selector.specify_version }
-              Version number ...
-            %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-group
+            %select{ name: "ignorethis#{index}", class: 'version-selectorizor' }
+              %option{ value: 'specify-all-versions', selected: selector.specify_all_versions }
+                All versions
+              %option{ value: 'specify-latest', selected: selector.specify_latest }
+                Latest version
+              %option{ value: 'specify-version', selected: selector.specify_version }
+                Version number ...
+              %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[]version', type: 'text', id: "pacticipant#{index}_version", class: 'version', value: selector.pacticipant_version_number}
 
-          %input{name: 'q[]tag', type: 'text', id: "pacticipant#{index}_tag", class: 'tag', value: selector.tag}
+            %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'}
+            %input{name: 'q[]latest', value: 'true', hidden: true, class: 'latest-flag'}
 
 
-    %div.top-of-group
-      .input-group
-        %input{type: 'radio', name: "latestby", class: '', value: '', id: 'all_rows', checked: options.all_rows_checked}
-        %label{for: 'all_rows'}
-          Show all results
-    %div
-      .input-group
-        %input{type: 'radio', name: "latestby", class: '', value: 'cvpv', id: 'cvpv', checked: options.cvpv_checked}
-        %label{for: 'cvpv'}
-          Show latest result for each consumer version/provider version
-    %div
-      .input-group
-        %input{type: 'radio', name: "latestby", class: '', value: 'cvp', id: 'cvp', checked: options.cvp_checked}
-        %label{for: 'cvp'}
-          Show latest result for each consumer version/provider
-    %div.top-of-group
-      - limit_text = "Note that the 'Show latest...' options are summaries of the 'Show all results' query, and that the limit applies to the underlying query, rather than the number of rows returned in the summary."
-      %label{for: "limit", "title": limit_text, "data-toggle": "tooltip", "data-placement": "right"}
-        Limit*
-      %input{name: 'limit', id: "limit", value: options.limit}
-    %div.top-of-group
-      %input{type: 'submit'}
+      %div.top-of-group
+        .input-group
+          %input{type: 'radio', name: "latestby", class: '', value: '', id: 'all_rows', checked: options.all_rows_checked}
+          %label{for: 'all_rows'}
+            Show all results
+      %div
+        .input-group
+          %input{type: 'radio', name: "latestby", class: '', value: 'cvpv', id: 'cvpv', checked: options.cvpv_checked}
+          %label{for: 'cvpv'}
+            Show latest result for each consumer version/provider version
+      %div
+        .input-group
+          %input{type: 'radio', name: "latestby", class: '', value: 'cvp', id: 'cvp', checked: options.cvp_checked}
+          %label{for: 'cvp'}
+            Show latest result for each consumer version/provider
+      %div.top-of-group
+        - limit_text = "Note that the 'Show latest...' options are summaries of the 'Show all results' query, and that the limit applies to the underlying query, rather than the number of rows returned in the summary."
+        %label{for: "limit", "title": limit_text, "data-toggle": "tooltip", "data-placement": "right"}
+          Limit*
+        %input{name: 'limit', id: "limit", value: options.limit}
+      %div.top-of-group
+        %input{type: 'submit'}
 
 
-  %p{style: 'text-align:right'}
-    = "#{lines.size} rows"
-  %table.table.table-bordered.table-striped{id: 'matrix'}
-    %thead
-      %th.consumer
-        = "Consumer"
-        %span.glyphicon.glyphicon-sort.sort
-      %th.consumer-version
-        = "Consumer Version"
-        %span.glyphicon.glyphicon-sort.sort
-      %th.pact-published
-        = "Pact Published"
-        %span.glyphicon.glyphicon-sort.sort
-      %th.provider
-        = "Provider"
-        %span.glyphicon.glyphicon-sort.sort
-      %th.provider-version
-        = "Provider Version"
-        %span.glyphicon.glyphicon-sort.sort
-      %th.verification-result
-        Pact verified
-        %span.glyphicon.glyphicon-sort.sort
-    %tbody
-    - lines.each do | line |
-      %tr
-        %td.consumer{'data-sort-value' => line.consumer_name}
-          %a{href: line.consumer_name_url}
-            = line.consumer_name
-        %td.consumer-version{'data-sort-value' => line.consumer_version_order}
-          %div
-            %a{href: line.consumer_version_number_url}
-              = line.display_consumer_version_number
-          - line.latest_consumer_version_tags.each do | tag |
-            .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
-              %a{href: tag.url}
-                .tag.label.label-primary
-                  = 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.label.label-default
-                  = tag.name
-        %td.pact-published{'data-sort-value' => line.pact_published_order, "title": line.inherited_verification_message, "data-toggle": "tooltip"}
-          %a{href: line.pact_publication_date_url}
-            - if options.all_rows_checked
-              = "#{line.pact_publication_date} (revision #{line.pact_revision_number})"
-            - else
-              = line.pact_publication_date
+    %p{style: 'text-align:right'}
+      = "#{lines.size} rows"
+    %table.table.table-bordered.table-striped{id: 'matrix'}
+      %thead
+        %tr
+          %th.consumer
+            = "Consumer"
+            %span.glyphicon.glyphicon-sort.sort
+          %th.consumer-version
+            = "Consumer Version"
+            %span.glyphicon.glyphicon-sort.sort
+          %th.pact-published
+            = "Pact Published"
+            %span.glyphicon.glyphicon-sort.sort
+          %th.provider
+            = "Provider"
+            %span.glyphicon.glyphicon-sort.sort
+          %th.provider-version
+            = "Provider Version"
+            %span.glyphicon.glyphicon-sort.sort
+          %th.verification-result
+            Pact verified
+            %span.glyphicon.glyphicon-sort.sort
+      %tbody
+      - lines.each do | line |
+        %tr
+          %td.consumer{'data-sort-value' => line.consumer_name}
+            %a{href: line.consumer_name_url}
+              = line.consumer_name
+          %td.consumer-version{'data-sort-value' => line.consumer_version_order}
+            %div
+              %a{href: line.consumer_version_number_url}
+                = line.display_consumer_version_number
+            - line.latest_consumer_version_tags.each do | tag |
+              .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                %a{href: tag.url}
+                  .tag.label.label-primary
+                    = 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.label.label-default
+                    = tag.name
+          %td.pact-published{'data-sort-value' => line.pact_published_order, "title": line.inherited_verification_message, "data-toggle": "tooltip"}
+            %a{href: line.pact_publication_date_url}
+              - if options.all_rows_checked
+                = "#{line.pact_publication_date} (revision #{line.pact_revision_number})"
+              - else
+                = line.pact_publication_date
 
-        %td.provider{'data-sort-value' => line.provider_name}
-          %a{href: line.provider_name_url}
-            = line.provider_name
-        %td.provider-version{'data-sort-value' => line.provider_version_order}
-          %div
-            %a{href: line.provider_version_number_url}
-              = line.display_provider_version_number
-          - line.latest_provider_version_tags.each do | tag |
-            .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
-              %a{href: tag.url}
-                .tag.label.label-primary
-                  = 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.label.label-default
-                  = tag.name
-        %td.verification-result{class: line.verification_status_class, "title": line.inherited_verification_message, "data-toggle": "tooltip"}
-          %a{href: line.verification_status_url}
-            - if options.all_rows_checked && line.number
-              = "#{line.verification_status} (number #{line.number})"
-            - else
-              = line.verification_status
+          %td.provider{'data-sort-value' => line.provider_name}
+            %a{href: line.provider_name_url}
+              = line.provider_name
+          %td.provider-version{'data-sort-value' => line.provider_version_order}
+            %div
+              %a{href: line.provider_version_number_url}
+                = line.display_provider_version_number
+            - line.latest_provider_version_tags.each do | tag |
+              .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                %a{href: tag.url}
+                  .tag.label.label-primary
+                    = 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.label.label-default
+                    = tag.name
+          %td.verification-result{class: line.verification_status_class, "title": line.inherited_verification_message, "data-toggle": "tooltip"}
+            %a{href: line.verification_status_url}
+              - if options.all_rows_checked && line.number
+                = "#{line.verification_status} (number #{line.number})"
+              - else
+                = line.verification_status