pact_broker 2.82.0 → 2.85.1

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

@@ -0,0 +1,7 @@
+%nav{'aria-label': 'breadcrumb'}
+  %ol.breadcrumb
+    %li.breadcrumb-item
+      %a{'href': "#{base_url}/"}
+        Home
+    %li.breadcrumb-item.active{'aria-current': 'page'}
+      Pact publications

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

@@ -3,12 +3,5 @@
     .navbar-header
     %ul.navbar-right#top-left-menu
       %li
-        - if tag_toggle
-          %a{href: "#{base_url}?tags=true"}
-            Show latest tags
-        - else
-          %a{href: "#{base_url}/"}
-            Hide latest tags
-
         %a{href: "#{base_url}/hal-browser/browser.html"}
           API Browser

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

@@ -48,7 +48,13 @@
       %tbody
 
         - index_items.each do | index_item |
-          %tr{'data-pact-versions-url': index_item.pact_versions_url, 'data-consumer-name': index_item.consumer_name, 'data-provider-name': index_item.provider_name, 'data-integration-url': index_item.integration_url}
+          %tr{'data-pact-versions-url': index_item.pact_versions_url,
+              'data-consumer-name': index_item.consumer_name,
+              'data-provider-name': index_item.provider_name,
+              'data-integration-url': index_item.integration_url,
+              'data-pact-tags': index_item.pact_tags,
+              'data-pact-branches': index_item.pact_branches
+              }
             %td.consumer
               %a{:href => index_item.consumer_group_url }
                 = index_item.consumer_name
@@ -58,10 +64,9 @@
                 - if index_item.display_consumer_version_number
                   %button.clippy.invisible{ title: "Copy to clipboard" }
                     %span.copy-icon
-              - 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}
-                  = "branch: " + index_item.consumer_version_branch
+              - index_item.consumer_version_branches.each do | branch_name |
+                %div{"class": "tag badge badge-dark"}
+                  = "branch: " + branch_name
               - index_item.consumer_version_latest_tag_names.each do | tag_name |
                 .tag.badge.badge-primary
                   = "tag: " + tag_name
@@ -85,10 +90,9 @@
                 - 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}
-                  = "branch: " + index_item.provider_version_branch
+              - index_item.provider_version_branches.each do | branch_name |
+                %div{"class": "tag badge badge-dark"}
+                  = "branch: " + branch_name
               - index_item.provider_version_latest_tag_names.each do | tag_name |
                 .tag.badge.badge-primary
                   = "tag: " + tag_name
@@ -108,8 +112,7 @@
                 - if index_item.warning?
                   %span.warning-icon{ 'aria-hidden': true }
             %td
-              - if index_item.show_settings?
-                %span.integration-settings.kebab-horizontal{ 'aria-hidden': true }
+              %span.integration-settings.kebab-horizontal{ 'aria-hidden': true }
 
     %div.pagination.text-center
 

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

@@ -13,7 +13,7 @@
           = error
 
     %form{action: "#{base_url}"}
-      .field
+      .search-field
         %label{for: 'search'}
           Search
         %input{name: 'search', id: 'search', class: 'search', value: search}
@@ -27,11 +27,11 @@
           %th.consumer
             Consumer
             %span.sort-icon.relationships-sort
-          %th.pact
 
           %th.provider
             Provider
             %span.sort-icon.relationships-sort
+          %th.pact
           %th
           %th
             Latest pact<br>published
@@ -42,31 +42,42 @@
           %th
       %tbody
         - index_items.each do | index_item |
-          %tr{'data-pact-versions-url': index_item.pact_versions_url, 'data-consumer-name': index_item.consumer_name, 'data-provider-name': index_item.provider_name, 'data-integration-url': index_item.integration_url}
-            %td
-            %td.consumer
+          %tr{
+            'class':'pact-row',
+            'data-pact-versions-url': index_item.pact_versions_url,
+            'data-consumer-name': index_item.consumer_name,
+            'data-provider-name': index_item.provider_name,
+            'data-integration-url': index_item.integration_url,
+            'data-href': index_item.dashboard_url,
+            'data-index': "true"
+            }
+            %td{'role':"button"}
+            %td.consumer{'role':"button"}
               %a{ href: index_item.consumer_group_url }
                 = index_item.consumer_name
-            %td.pact
+            %td.provider{'role':"button"}
+              %a{ href: index_item.provider_group_url }
+                = index_item.provider_name
+            %td.pact{'role':"button"}
               %span.pact
                 %a{ href: index_item.latest_pact_url, :title => "View pact" }
               %span.pact-matrix
                 %a{ href: index_item.pact_matrix_url, title: "View pact matrix" }
-            %td.provider
-              %a{ href: index_item.provider_group_url }
-                = index_item.provider_name
-            %td
-            %td{"data-text": index_item.publication_date_of_latest_pact_order}
+            %td{'role':"button"}
+            %td{"data-text": index_item.publication_date_of_latest_pact_order, 'role':"button"}
               = index_item.publication_date_of_latest_pact
-            %td{class: "table-#{index_item.webhook_status}"}
+            %td{class: "table-#{index_item.webhook_status}", 'role':"button"}
               %a{ href: index_item.webhook_url }
                 = index_item.webhook_label
 
-            %td{ class: "table-#{index_item.pseudo_branch_verification_status}", title: index_item.verification_tooltip, "data-toggle": "tooltip", "data-placement": "left" }
+            %td{ class: "table-#{index_item.pseudo_branch_verification_status}", title: index_item.verification_tooltip, "data-toggle": "tooltip", "data-placement": "left", 'role':"button"}
               %div
                 = index_item.last_verified_date
                 - if index_item.warning?
                   %span.warning-icon{ 'aria-hidden': true }
+                - if index_item.failed_and_pact_pending?
+                  %div
+                    (pact pending)
             %td
               %span.integration-settings.kebab-horizontal{ 'aria-hidden': true }
 
@@ -75,6 +86,11 @@
     - 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
 
+  :css
+    .table tbody tr:hover td, .table tbody tr:hover th {
+        background-color: #ccc;
+        cursor: pointer;
+    }
 
   :javascript
     $(function(){
@@ -89,6 +105,12 @@
         //td, so need to append it to a div
         $(td).tooltip({container: $(td).first()});
       });
+
+      $(function(){
+        $(".table").on("click", "td[role=\"button\"]", function (e) {
+          window.location = $(this).parent("tr").data("href");
+        });
+      });
     });
 
     $(".reset-search").on("click", function() {

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

@@ -11,9 +11,13 @@
   %script{type: 'text/javascript', src: "#{base_url}/js/bootstrap.bundle.min.js?v=#{PactBroker::VERSION}"}
 
   .container
-    .navbar-right
-      %a{href: "#{base_url}/"}
-        Home
+    %nav{'aria-label': 'breadcrumb'}
+      %ol.breadcrumb
+        %li.breadcrumb-item
+          %a{'href': "#{base_url}/"}
+            Home
+        %li.breadcrumb-item.active{'aria-current': 'page'}
+          The Matrix
     %h1.page-header
       The Matrix
       - if defined?(badge_url) && badge_url
@@ -136,11 +140,11 @@
               - 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"
+            - line.consumer_version_branches.each do | branch |
+              .tag-parent{"title": branch.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                - branch_class = branch.latest? ? "tag badge badge-dark" : "tag badge badge-secondary"
                 %div{"class": branch_class}
-                  = "branch: " + line.consumer_version_branch
+                  = "branch: " + branch.name
             - 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}
@@ -173,11 +177,11 @@
               - 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"
+            - line.provider_version_branches.each do | branch |
+              .tag-parent{"title": branch.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                - branch_class = branch.latest? ? "tag badge badge-dark" : "tag badge badge-secondary"
                 %div{"class": branch_class}
-                  = "branch: " + line.provider_version_branch
+                  = "branch: " + branch.name
             - 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}

data/lib/pact_broker/verifications/pseudo_branch_status.rb

@@ -28,6 +28,8 @@ module PactBroker
           else
             :success
           end
+        elsif latest_verification.failed_and_pact_pending?
+          :failed_pending
         else
           :failed
         end

data/lib/pact_broker/verifications/repository.rb

@@ -19,14 +19,13 @@ module PactBroker
         Sequence.next_val
       end
 
-      def create verification, provider_version_number, pact
-        provider = pacticipant_repository.find_by_name(pact.provider_name)
-        consumer = pacticipant_repository.find_by_name(pact.consumer_name)
-        version = version_repository.find_by_pacticipant_id_and_number_or_create(provider.id, provider_version_number)
-        verification.pact_version_id = pact_version_id_for(pact)
+      def create verification, provider_version_number, pact_version
+        version = version_repository.find_by_pacticipant_id_and_number_or_create(pact_version.provider_id, provider_version_number)
+        verification.pact_version_id = pact_version.id
         verification.provider_version = version
-        verification.provider_id = provider.id
-        verification.consumer_id = consumer.id
+        verification.provider_id = pact_version.provider_id
+        verification.consumer_id = pact_version.consumer_id
+        verification.tag_names = version.tag_names # TODO pass this in from contracts service
         verification.save
         update_latest_verification_id(verification)
         verification
@@ -150,10 +149,6 @@ module PactBroker
         provider = pacticipant_repository.find_by_name!(options.fetch(:and))
         PactBroker::Domain::Verification.where(provider: provider, consumer: consumer).delete
       end
-
-      def pact_version_id_for pact
-        PactBroker::Pacts::PactPublication.select(:pact_version_id).where(id: pact.id)
-      end
     end
   end
 end

data/lib/pact_broker/verifications/service.rb

@@ -27,16 +27,22 @@ module PactBroker
         verification_repository.next_number
       end
 
-      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"}
+      # verified_pacts is an array of SelectedPact objects
+      def create next_verification_number, params, verified_pacts, event_context
+        first_verified_pact = verified_pacts.first
+        logger.info "Creating verification #{next_verification_number} for pact_version_sha=#{first_verified_pact.pact_version_sha}", payload: params.reject{ |k,_| k == "testResults"}
         verification = PactBroker::Domain::Verification.new
         provider_version_number = params.fetch("providerApplicationVersion")
         PactBroker::Api::Decorators::VerificationDecorator.new(verification).from_hash(params)
         verification.wip = params.fetch("wip")
+        verification.pact_pending = params.fetch("pending")
         verification.number = next_verification_number
-        verification = verification_repository.create(verification, provider_version_number, pact)
-
-        broadcast_events(verification, pact, event_context)
+        verification.consumer_version_selector_hashes = event_context[:consumer_version_selectors]
+        pact_version = pact_repository.find_pact_version(first_verified_pact.consumer, first_verified_pact.provider, first_verified_pact.pact_version_sha)
+        verification = verification_repository.create(verification, provider_version_number, pact_version)
+        # TODO set the latest_verification_id on each PactPublication
+        # TODO broadcast the verified_pacts for the webhooks
+        broadcast_events(verification, first_verified_pact.pact, event_context)
 
         verification
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.82.0"
+  VERSION = "2.85.1"
 end

data/lib/pact_broker/versions/branch.rb

@@ -0,0 +1,29 @@
+require "pact_broker/db"
+require "pact_broker/repositories/helpers"
+
+module PactBroker
+  module Versions
+    class Branch < Sequel::Model(:branches)
+      plugin :timestamps, update_on_create: true
+      plugin :insert_ignore, identifying_columns: [:name, :pacticipant_id]
+
+      associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
+    end
+  end
+end
+
+# Table: branches
+# Columns:
+#  id             | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  name           | text                        |
+#  pacticipant_id | integer                     | NOT NULL
+#  created_at     | timestamp without time zone | NOT NULL
+#  updated_at     | timestamp without time zone | NOT NULL
+# Indexes:
+#  branches_pkey                      | PRIMARY KEY btree (id)
+#  branches_pacticipant_id_name_index | UNIQUE btree (pacticipant_id, name)
+# Foreign key constraints:
+#  branches_pacticipant_id_fkey | (pacticipant_id) REFERENCES pacticipants(id) ON DELETE CASCADE
+# Referenced By:
+#  branch_heads    | branch_heads_branch_id_fkey | (branch_id) REFERENCES branches(id) ON DELETE CASCADE
+#  branch_versions | branch_versions_branches_fk | (branch_id) REFERENCES branches(id) ON DELETE CASCADE

data/lib/pact_broker/versions/branch_head.rb

@@ -0,0 +1,45 @@
+require "pact_broker/db"
+require "pact_broker/repositories/helpers"
+
+module PactBroker
+  module Versions
+    class BranchHead < Sequel::Model
+      plugin :upsert, identifying_columns: [:branch_id]
+      set_primary_key :branch_id
+      unrestrict_primary_key
+
+      associate(:many_to_one, :branch, :class => "PactBroker::Versions::Branch", :key => :branch_id, :primary_key => :id)
+      associate(:many_to_one, :branch_version, :class => "PactBroker::Versions::BranchVersion", :key => :branch_version_id, :primary_key => :id)
+      associate(:many_to_one, :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)
+
+      def before_save
+        super
+        self.pacticipant_id = branch.pacticipant_id
+        self.version_id = branch_version.version_id
+        self.branch_name = branch.name
+      end
+
+      def branch_name
+        branch.name
+      end
+    end
+  end
+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)
+#  branch_heads_version_id_index     | btree (version_id)
+# Foreign key constraints:
+#  branch_heads_branch_id_fkey         | (branch_id) REFERENCES branches(id) ON DELETE CASCADE
+#  branch_heads_branch_version_id_fkey | (branch_version_id) REFERENCES branch_versions(id) ON DELETE CASCADE

data/lib/pact_broker/versions/branch_service.rb

@@ -0,0 +1,24 @@
+require "pact_broker/logging"
+require "pact_broker/repositories"
+require "pact_broker/messages"
+
+module PactBroker
+  module Versions
+    class BranchService
+      extend PactBroker::Repositories
+
+      def self.find_branch_version(pacticipant_name:, branch_name:, version_number:, **)
+        BranchVersion.where(
+          version: PactBroker::Domain::Version.where_pacticipant_name_and_version_number(pacticipant_name, version_number),
+          branch: Branch.where(name: branch_name)
+        ).single_record
+      end
+
+      def self.find_or_create_branch_version(pacticipant_name:, branch_name:, version_number:, **)
+        pacticipant = pacticipant_repository.find_by_name_or_create(pacticipant_name)
+        version = version_repository.find_by_pacticipant_id_and_number_or_create(pacticipant.id, version_number)
+        branch_version_repository.add_branch(version, branch_name)
+      end
+    end
+  end
+end

data/lib/pact_broker/versions/branch_version.rb

@@ -0,0 +1,64 @@
+require "pact_broker/db"
+require "pact_broker/repositories/helpers"
+
+module PactBroker
+  module Versions
+    class BranchVersion < Sequel::Model(:branch_versions)
+      plugin :timestamps, update_on_create: true
+      plugin :insert_ignore, identifying_columns: [:branch_id, :version_id]
+      plugin :upsert, identifying_columns: [:branch_id, :version_id]
+
+      associate(:many_to_one, :branch, :class => "PactBroker::Versions::Branch", :key => :branch_id, :primary_key => :id)
+      associate(:many_to_one, :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)
+      associate(:many_to_one, :branch_head, :class => "PactBroker::Versions::BranchHead", :key => :branch_id, :primary_key => :branch_id)
+
+      dataset_module do
+        def find_latest_for_branch(branch)
+          max_version_order = BranchVersion.select(Sequel.function(:max, :version_order)).where(branch_id: branch.id)
+          BranchVersion.where(branch_id: branch.id, version_order: max_version_order).single_record
+        end
+      end
+
+      def before_save
+        super
+        self.version_order = version.order
+        self.pacticipant_id = version.pacticipant_id
+        self.branch_name = branch.name
+      end
+
+      def latest?
+        branch_head.branch_version_id == id
+      end
+
+      def version_number
+        version.number
+      end
+
+      def pacticipant
+        branch.pacticipant
+      end
+    end
+  end
+end
+
+# Table: branch_versions
+# Columns:
+#  id             | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  branch_id      | integer                     | NOT NULL
+#  version_id     | integer                     | NOT NULL
+#  version_order  | integer                     | NOT NULL
+#  pacticipant_id | integer                     | NOT NULL
+#  branch_name    | text                        | NOT NULL
+#  created_at     | timestamp without time zone | NOT NULL
+#  updated_at     | timestamp without time zone | NOT NULL
+# Indexes:
+#  branch_versions_pkey                                         | PRIMARY KEY btree (id)
+#  branch_versions_branch_id_version_id_index                   | UNIQUE btree (branch_id, version_id)
+#  branch_versions_branch_name_index                            | btree (branch_name)
+#  branch_versions_pacticipant_id_branch_id_version_order_index | btree (pacticipant_id, branch_id, version_order)
+#  branch_versions_version_id_index                             | btree (version_id)
+# Foreign key constraints:
+#  branch_versions_branches_fk | (branch_id) REFERENCES branches(id) ON DELETE CASCADE
+#  branch_versions_versions_fk | (version_id) REFERENCES versions(id) ON DELETE CASCADE
+# Referenced By:
+#  branch_heads | branch_heads_branch_version_id_fkey | (branch_version_id) REFERENCES branch_versions(id) ON DELETE CASCADE