pact_broker 2.72.0 → 2.76.0

data/lib/pact_broker/tags/tag_with_latest_flag.rb

@@ -5,6 +5,8 @@ module PactBroker
   module Tags
     # The tag associated with the latest verification for a given tag
     class TagWithLatestFlag < Sequel::Model(:tags_with_latest_flag)
+      associate(:many_to_one, :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)
+
       dataset_module do
         include PactBroker::Repositories::Helpers
       end

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -10,7 +10,7 @@ module PactBroker
 
       attr_reader :client, :last_consumer_name, :last_provider_name, :last_consumer_version_number, :last_provider_version_number
 
-      def initialize(pact_broker_base_url, auth)
+      def initialize(pact_broker_base_url, auth = {})
         @client = Faraday.new(url: pact_broker_base_url) do |faraday|
           faraday.request :json
           faraday.response :json, :content_type => /\bjson$/
@@ -19,13 +19,13 @@ module PactBroker
               logger.filter(/(Authorization: ).*/,'\1[REMOVED]')
             end
           end
-          # faraday.headers['Authorization'] = "Bearer #{pactflow_api_token}"
+          faraday.headers['Authorization'] = "Bearer #{auth[:token]}" if auth[:token]
           faraday.adapter  Faraday.default_adapter
         end
       end
 
       def sleep
-        Kernel.sleep 1
+        Kernel.sleep 0.5
         self
       end
 
@@ -42,7 +42,7 @@ module PactBroker
 
       def create_tag(pacticipant:, version:, tag:)
         puts "Creating tag '#{tag}' for #{pacticipant} version #{version}"
-        client.put("/pacticipants/#{encode(pacticipant)}/versions/#{encode(version)}/tags/#{encode(tag)}", {})
+        client.put("pacticipants/#{encode(pacticipant)}/versions/#{encode(version)}/tags/#{encode(tag)}", {}).tap { |response| check_for_error(response) }
         self
       end
 
@@ -53,6 +53,13 @@ module PactBroker
         self
       end
 
+      def create_pacticipant(name)
+        puts "Creating pacticipant with name #{name}"
+        client.post("pacticipants", { name: name}).tap { |response| check_for_error(response) }
+        separate
+        self
+      end
+
       def publish_pact(consumer: last_consumer_name, consumer_version:, provider: last_provider_name, content_id:, tag:)
         @last_consumer_name = consumer
         @last_provider_name = provider
@@ -61,26 +68,28 @@ module PactBroker
         [*tag].each do | tag |
           create_tag(pacticipant: consumer, version: consumer_version, tag: tag)
         end
+        puts "" if [*tag].any?
 
         content = generate_content(consumer, provider, content_id)
         puts "Publishing pact for consumer #{consumer} version #{consumer_version} and provider #{provider}"
-        pact_path = "/pacts/provider/#{encode(provider)}/consumer/#{encode(consumer)}/version/#{encode(consumer_version)}"
-        @publish_pact_response = client.put(pact_path, content)
+        pact_path = "pacts/provider/#{encode(provider)}/consumer/#{encode(consumer)}/version/#{encode(consumer_version)}"
+        @publish_pact_response = client.put(pact_path, content).tap { |response| check_for_error(response) }
         separate
         self
       end
 
       def get_pacts_for_verification(provider: last_provider_name, provider_version_tag: , consumer_version_selectors:, enable_pending: false, include_wip_pacts_since: nil)
+        @last_provider_name = provider
         puts "Fetching pacts for verification for #{provider}"
         body = {
           providerVersionTags: [*provider_version_tag],
           consumerVersionSelectors: consumer_version_selectors,
           includePendingStatus: enable_pending,
           includeWipPactsSince: include_wip_pacts_since
-        }
+        }.compact
         puts body.to_yaml
         puts ""
-        @pacts_for_verification_response = client.post("/pacts/provider/#{encode(provider)}/for-verification", body)
+        @pacts_for_verification_response = client.post("pacts/provider/#{encode(provider)}/for-verification", body).tap { |response| check_for_error(response) }
 
         print_pacts_for_verification
         separate
@@ -88,23 +97,32 @@ module PactBroker
       end
 
       def print_pacts_for_verification
-        pacts = @pacts_for_verification_response.body["_embedded"]["pacts"]
-        puts "Pacts for verification (#{pacts.count}):"
-        pacts.each do | pact |
-          puts({
-            "url" => pact["_links"]["self"]["href"],
-            "wip" => pact["verificationProperties"]["wip"],
-            "pending" => pact["verificationProperties"]["pending"]
-          }.to_yaml)
+        pacts = @pacts_for_verification_response.body&.dig("_embedded", "pacts")
+        if pacts
+          puts "Pacts for verification (#{pacts.count}):"
+          pacts.each do | pact |
+            puts({
+              "url" => pact["_links"]["self"]["href"],
+              "wip" => pact["verificationProperties"]["wip"],
+              "pending" => pact["verificationProperties"]["pending"]
+            }.to_yaml)
+          end
         end
         self
       end
 
       def verify_pact(index: 0, success:, provider: last_provider_name, provider_version_tag: , provider_version: )
+        @last_provider_name = provider
         pact_to_verify = @pacts_for_verification_response.body["_embedded"]["pacts"][index]
         raise "No pact found to verify at index #{index}" unless pact_to_verify
         url_of_pact_to_verify = pact_to_verify["_links"]["self"]["href"]
-        pact_response = client.get(url_of_pact_to_verify)
+
+        [*provider_version_tag].each do | tag |
+          create_tag(pacticipant: provider, version: provider_version, tag: tag)
+        end
+        puts "" if [*provider_version_tag].any?
+
+        pact_response = client.get(url_of_pact_to_verify).tap { |response| check_for_error(response) }
         verification_results_url = pact_response.body["_links"]["pb:publish-verification-results"]["href"]
 
         results = {
@@ -112,8 +130,36 @@ module PactBroker
           testResults: [],
           providerApplicationVersion: provider_version
         }
-        puts "\nPublishing verification"
-        response = client.post(verification_results_url, results.to_json)
+        puts "Publishing verification"
+        puts results.to_yaml
+        response = client.post(verification_results_url, results.to_json).tap { |response| check_for_error(response) }
+        separate
+        self
+      end
+
+      def create_global_webhook_for_contract_changed(uuid: nil, url: "https://postman-echo.com/post")
+        puts "Creating global webhook for contract changed event with uuid #{uuid}"
+        uuid ||= SecureRandom.uuid
+        request_body = {
+          "description" => "A webhook for all consumers and providers",
+          "events" => [{
+            "name" => "contract_content_changed"
+          }],
+          "request" => {
+            "method" => "POST",
+            "url" => url
+          }
+        }
+        path = "webhooks/#{uuid}"
+        response = client.put(path, request_body.to_json).tap { |response| check_for_error(response) }
+        separate
+        self
+      end
+
+      def delete_webhook(uuid:)
+        puts "Deleting webhook with uuid #{uuid}"
+        path = "webhooks/#{uuid}"
+        response = client.delete(path).tap { |response| check_for_error(response) }
         separate
         self
       end
@@ -124,7 +170,7 @@ module PactBroker
       end
 
       def can_i_deploy(pacticipant:, version:, to:)
-        can_i_deploy_response = client.get("/can-i-deploy", { pacticipant: pacticipant, version: version, to: to} )
+        can_i_deploy_response = client.get("can-i-deploy", { pacticipant: pacticipant, version: version, to: to} ).tap { |response| check_for_error(response) }
         can = !!(can_i_deploy_response.body['summary'] || {})['deployable']
         puts "can-i-deploy #{pacticipant} version #{version} to #{to}: #{can ? 'yes' : 'no'}"
         puts (can_i_deploy_response.body['summary'] || can_i_deploy_response.body).to_yaml
@@ -133,7 +179,15 @@ module PactBroker
       end
 
       def delete_integration(consumer:, provider:)
-        client.delete("/integrations/provider/#{encode(provider)}/consumer/#{encode(consumer)}")
+        puts "Deleting all data for the integration between #{consumer} and #{provider}"
+        client.delete("integrations/provider/#{encode(provider)}/consumer/#{encode(consumer)}").tap { |response| check_for_error(response) }
+        separate
+        self
+      end
+
+      def delete_pacticipant(name)
+        puts "Deleting pacticipant #{name}"
+        @publish_pact_response = client.delete("pacticipants/#{encode(name)}").tap { |response| check_for_error(response) }
         separate
         self
       end
@@ -148,6 +202,7 @@ module PactBroker
           },
           interactions: [
             {
+              description: "a request",
               request: {
                 method: "GET",
                 path: "/things/#{content_id}"
@@ -163,6 +218,13 @@ module PactBroker
       def encode string
         ERB::Util.url_encode(string)
       end
+
+      def check_for_error(response)
+        if ! response.success?
+          puts response.status
+          puts response.body
+        end
+      end
     end
   end
 end

data/lib/pact_broker/test/test_data_builder.rb

@@ -319,9 +319,10 @@ module PactBroker
         trigger_uuid = params[:trigger_uuid] || webhook_service.next_uuid
         event_name = params.key?(:event_name) ? params[:event_name] : @webhook.events.first.name # could be nil, for backwards compatibility
         verification = @webhook.trigger_on_provider_verification_published? ? @verification : nil
-        @triggered_webhook = webhook_repository.create_triggered_webhook trigger_uuid, @webhook, @pact, verification, PactBroker::Webhooks::Service::RESOURCE_CREATION, event_name
+        event_context = params[:event_context]
+        @triggered_webhook = webhook_repository.create_triggered_webhook(trigger_uuid, @webhook, @pact, verification, PactBroker::Webhooks::Service::RESOURCE_CREATION, event_name, event_context)
         @triggered_webhook.update(status: params[:status]) if params[:status]
-        set_created_at_if_set params[:created_at], :triggered_webhooks, {id: @triggered_webhook.id}
+        set_created_at_if_set params[:created_at], :triggered_webhooks, { id: @triggered_webhook.id }
         self
       end
 

data/lib/pact_broker/ui/views/index/_getting-started.haml

@@ -3,4 +3,4 @@
   %p
     Just getting started? Confused as to why there's nothing "clicky clicky" to see here? The Pact workflow is a "code first" approach. Your pacts will be generated by your consumer tests and then published here, ready to be retrieved by your provider tests for verification.
   %p
-    For step by step instructions on getting started, check out the <a href="https://docs.pact.io/best_practices/pact_nirvana">Effective Pact Setup Guide</a>.
+    For step by step instructions on getting started, check out the <a href="https://docs.pact.io/pact_nirvana">Effective Pact Setup Guide</a>.

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

@@ -11,25 +11,25 @@
         %tr
           %th.consumer
             Consumer
-            %span.glyphicon.glyphicon-sort.relationships-sort
+            %span.sort-icon.relationships-sort
           %th.consumer-version-number
             Consumer<br>Version
-            %span.glyphicon.glyphicon-sort.relationships-sort
+            %span.sort-icon.relationships-sort
           %th.pact{ style: 'width: 40px' }
           %th.provider
             Provider
-            %span.glyphicon.glyphicon-sort.relationships-sort
+            %span.sort-icon.relationships-sort
           %th.provider-version-number
             Provider<br>Version
-            %span.glyphicon.glyphicon-sort.relationships-sort
+            %span.sort-icon.relationships-sort
           %th
             Published
-            %span.glyphicon.glyphicon-sort.relationships-sort
+            %span.sort-icon.relationships-sort
           %th
             Webhook<br>status
           %th
             Last<br>verified
-            %span.glyphicon.glyphicon-sort.relationships-sort
+            %span.sort-icon.relationships-sort
           %th
       %tbody
 
@@ -43,12 +43,12 @@
                 = index_item.consumer_version_number
                 - if index_item.consumer_version_number
                   %button.clippy.invisible{ title: "Copy to clipboard" }
-                    %span.glyphicon.glyphicon-copy
+                    %span.copy-icon
               - if index_item.latest?
-                .tag.label.label-success
+                .tag.badge.badge-success
                   latest
               - index_item.consumer_version_latest_tag_names.each do | tag_name |
-                .tag.label.label-primary
+                .tag.badge.badge-primary
                   = tag_name
             %td.pact
               %span.pact
@@ -63,27 +63,27 @@
                 = index_item.provider_version_number
                 - if index_item.provider_version_number
                   %button.clippy.invisible{ title: "Copy to clipboard" }
-                    %span.glyphicon.glyphicon-copy
+                    %span.copy-icon
               - index_item.provider_version_latest_tag_names.each do | tag_name |
-                .tag.label.label-primary
+                .tag.badge.badge-primary
                   = tag_name
             %td{"data-text": index_item.publication_date_of_latest_pact_order}
               = index_item.publication_date_of_latest_pact.gsub("about ", "")
-            %td{ class: index_item.webhook_status }
+            %td{ class: "table-#{index_item.webhook_status}" }
               - if index_item.show_webhook_status?
                 %a{ href: index_item.webhook_url }
                   = index_item.webhook_label
 
-            %td{ class: 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" }
               %div
                 = index_item.last_verified_date.gsub("about ", "")
                 - if index_item.warning?
-                  %span.glyphicon.glyphicon-warning-sign{ 'aria-hidden': true }
+                  %span.warning-icon{ 'aria-hidden': true }
             %td
               - if index_item.show_settings?
-                %span.integration-settings.glyphicon.glyphicon-option-horizontal{ 'aria-hidden': true }
+                %span.integration-settings.kebab-horizontal{ 'aria-hidden': true }
 
-    %div.pagination
+    %p.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

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

@@ -12,12 +12,12 @@
           %th
           %th.consumer
             Consumer
-            %span.glyphicon.glyphicon-sort.relationships-sort
+            %span.sort-icon.relationships-sort
           %th.pact
 
           %th.provider
             Provider
-            %span.glyphicon.glyphicon-sort.relationships-sort
+            %span.sort-icon.relationships-sort
           %th
           %th
             Latest pact<br>published
@@ -44,17 +44,17 @@
             %td
             %td{"data-text": index_item.publication_date_of_latest_pact_order}
               = index_item.publication_date_of_latest_pact
-            %td{class: index_item.webhook_status}
+            %td{class: "table-#{index_item.webhook_status}"}
               %a{ href: index_item.webhook_url }
                 = index_item.webhook_label
 
-            %td{ class: 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" }
               %div
                 = index_item.last_verified_date
                 - if index_item.warning?
-                  %span.glyphicon.glyphicon-warning-sign{ 'aria-hidden': true }
+                  %span.warning-icon{ 'aria-hidden': true }
             %td
-              %span.integration-settings.glyphicon.glyphicon-option-horizontal{ 'aria-hidden': true }
+              %span.integration-settings.kebab-horizontal{ 'aria-hidden': true }
     %div.pagination
 
     - pagination_locals = { page_number: page_number, page_size: page_size, pagination_record_count: pagination_record_count, current_page_size: current_page_size }

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

@@ -4,6 +4,6 @@
     %title= defined?(title) ? title : ""
     %link{rel: 'shortcut icon', href: "#{base_url}/images/favicon.ico", type:'image/x-icon'}
     %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
-    %script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-3.3.1.min.js"}
-    %script{type: 'text/javascript', src:"#{base_url}/js/bootstrap.min.js"}
+    %script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-3.5.1.min.js"}
+    %script{type: 'text/javascript', src:"#{base_url}/js/bootstrap.bundle.min.js"}
   != yield

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

@@ -2,11 +2,11 @@
   %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
   %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/index.css"}
   %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/matrix.css"}
-  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery-3.3.1.min.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery-3.5.1.min.js"}
   %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery.tablesorter.min.js"}
   %script{type: 'text/javascript', src: "#{base_url}/javascripts/matrix.js"}
   %script{type: 'text/javascript', src: "#{base_url}/javascripts/clipboard.js"}
-  %script{type: 'text/javascript', src: "#{base_url}/js/bootstrap.min.js"}
+  %script{type: 'text/javascript', src: "#{base_url}/js/bootstrap.bundle.min.js"}
 
   .container
     .navbar-right
@@ -25,13 +25,14 @@
     %form{action: "#{base_url}/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}", class: 'pacticipant_name', value: selector.pacticipant_name}
+          .field
+            %label{for: "pacticipant#{index}"}
+              Pacticipant name
 
-          .input-group
+            %input{name: 'q[]pacticipant', id: "pacticipant1#{index}", class: 'pacticipant_name', value: selector.pacticipant_name}
+
+          .field
 
-          .input-group
             %select{ name: "ignorethis#{index}", class: 'version-selectorizor' }
               %option{ value: 'specify-all-versions', selected: selector.specify_all_versions }
                 All versions
@@ -59,20 +60,18 @@
           %input{name: 'latest', value: options.latest.to_s, hidden: true}
 
 
-      %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
+      %div.top-of-group.form-check
+        %input{type: 'radio', name: "latestby", class: 'form-check-input', value: '', id: 'all_rows', checked: options.all_rows_checked}
+        %label{for: 'all_rows', class: "form-check-label"}
+          Show all results
+      %div.form-check
+        %input{type: 'radio', name: "latestby", class: 'form-check-input', value: 'cvpv', id: 'cvpv', checked: options.cvpv_checked}
+        %label{for: 'cvpv', class: "form-check-label"}
+          Show latest result for each consumer version/provider version
+      %div.form-check
         .input-group
-          %input{type: 'radio', name: "latestby", class: '', value: 'cvp', id: 'cvp', checked: options.cvp_checked}
-          %label{for: 'cvp'}
+          %input{type: 'radio', name: "latestby", class: 'form-check-input', value: 'cvp', id: 'cvp', checked: options.cvp_checked}
+          %label{for: 'cvp', class: "form-check-label"}
             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."
@@ -90,22 +89,22 @@
         %tr
           %th.consumer
             = "Consumer"
-            %span.glyphicon.glyphicon-sort.sort
+            %span.sort-icon.sort
           %th.consumer-version
             = "Consumer Version"
-            %span.glyphicon.glyphicon-sort.sort
+            %span.sort-icon.sort
           %th.pact-published
             = "Pact Published"
-            %span.glyphicon.glyphicon-sort.sort
+            %span.sort-icon.sort
           %th.provider
             = "Provider"
-            %span.glyphicon.glyphicon-sort.sort
+            %span.sort-icon.sort
           %th.provider-version
             = "Provider Version"
-            %span.glyphicon.glyphicon-sort.sort
+            %span.sort-icon.sort
           %th.verification-result
             Pact verified
-            %span.glyphicon.glyphicon-sort.sort
+            %span.sort-icon.sort
       %tbody
       - lines.each do | line |
         %tr
@@ -118,16 +117,16 @@
                 = line.display_consumer_version_number
               - if line.display_consumer_version_number
                 %button.clippy.invisible{ title: "Copy to clipboard" }
-                  %span.glyphicon.glyphicon-copy
+                  %span.copy-icon
             - 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.badge.badge-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.badge.badge-secondary
                     = 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}
@@ -145,16 +144,16 @@
                 = line.display_provider_version_number
               - if line.display_provider_version_number
                 %button.clippy.invisible{ title: "Copy to clipboard" }
-                  %span.glyphicon.glyphicon-copy
+                  %span.copy-icon
             - 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.badge.badge-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.badge.badge-secondary
                     = 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}
@@ -163,4 +162,4 @@
               - else
                 = line.verification_status
             - if line.pre_verified_message
-              %span.glyphicon.glyphicon-time.pre-verified-icon{"aria-hidden": true}
+              %span.pre-verified-icon{"aria-hidden": true}