pact_broker 2.80.0 → 2.81.0

data/lib/pact_broker/pacts/selector.rb

@@ -5,7 +5,7 @@ module PactBroker
     class Selector < Hash
       using PactBroker::HashRefinements
 
-      PROPERTY_NAMES = [:latest, :tag, :branch, :consumer, :consumer_version, :environment_name, :fallback_tag, :fallback_branch, :currently_supported, :currently_deployed]
+      PROPERTY_NAMES = [:latest, :tag, :branch, :consumer, :consumer_version, :environment_name, :fallback_tag, :fallback_branch, :main_branch, :currently_supported, :currently_deployed]
 
       def initialize(properties = {})
         properties.without(*PROPERTY_NAMES).tap { |it| warn("WARN: Unsupported property for #{self.class.name}: #{it.keys.join(", ")} at #{caller[0..3]}") if it.any? }
@@ -48,6 +48,10 @@ module PactBroker
       end
       # rubocop: enable Metrics/CyclomaticComplexity
 
+      def main_branch= main_branch
+        self[:main_branch] = main_branch
+      end
+
       def tag= tag
         self[:tag] = tag
       end
@@ -128,6 +132,10 @@ module PactBroker
         Selector.new(latest: true)
       end
 
+      def self.for_main_branch
+        Selector.new(main_branch: true)
+      end
+
       def self.latest_for_tag(tag)
         Selector.new(latest: true, tag: tag)
       end
@@ -196,6 +204,10 @@ module PactBroker
         Selector.new(hash)
       end
 
+      def latest_for_main_branch?
+        !!main_branch
+      end
+
       def fallback_tag?
         !!fallback_tag
       end
@@ -204,6 +216,10 @@ module PactBroker
         !!fallback_branch
       end
 
+      def main_branch
+        self[:main_branch]
+      end
+
       def tag
         self[:tag]
       end
@@ -213,7 +229,7 @@ module PactBroker
       end
 
       def overall_latest?
-        !!(latest? && !tag && !branch && !currently_deployed && !currently_supported && !environment_name)
+        !!(latest? && !tag && !branch && !main_branch && !currently_deployed && !currently_supported && !environment_name)
       end
 
       # Not sure if the fallback_tag logic is needed

data/lib/pact_broker/pacts/service.rb

@@ -85,8 +85,8 @@ module PactBroker
         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]
+      def find_latest_pacts_for_provider provider_name, options = {}
+        pact_repository.find_latest_pacts_for_provider provider_name, options[:tag]
       end
 
       def find_pact_versions_for_provider provider_name, options = {}
@@ -116,33 +116,23 @@ module PactBroker
       end
 
       def find_for_verification(provider_name, provider_version_branch, provider_version_tags, consumer_version_selectors, options)
-        verifiable_pacts_specified_in_request = pact_repository
+        explicitly_specified_verifiable_pacts = pact_repository
           .find_for_verification(provider_name, consumer_version_selectors)
           .collect do | selected_pact |
+            # Todo move this into the repository
             squash_pacts_for_verification(provider_version_tags, selected_pact, options[:include_pending_status])
           end
 
-        verifiable_wip_pacts = if options[:include_wip_pacts_since]
-                                 exclude_specified_pacts(
-                                   pact_repository.find_wip_pact_versions_for_provider(provider_name, provider_version_branch, provider_version_tags, options),
-                                   verifiable_pacts_specified_in_request)
-                               else
-                                 []
-                               end
+        verifiable_wip_pacts =  if options[:include_wip_pacts_since]
+                                  specified_pact_version_shas = explicitly_specified_verifiable_pacts.collect(&:pact_version_sha)
+                                  pact_repository.find_wip_pact_versions_for_provider(provider_name, provider_version_branch, provider_version_tags, specified_pact_version_shas, options)
+                                else
+                                  []
+                                end
 
-        verifiable_pacts_specified_in_request + verifiable_wip_pacts
+        explicitly_specified_verifiable_pacts + verifiable_wip_pacts
       end
 
-      def exclude_specified_pacts(wip_pacts, specified_pacts)
-        wip_pacts.reject do | wip_pact |
-          specified_pacts.any? do | specified_pact |
-            wip_pact.pact_version_sha == specified_pact.pact_version_sha
-          end
-        end
-      end
-
-      private :exclude_specified_pacts
-
       # Overwriting an existing pact with the same consumer/provider/consumer version number
       def update_pact params, existing_pact
         logger.info "Updating existing pact publication with params #{params.reject{ |k, _v| k == :json_content}}"
@@ -179,7 +169,8 @@ module PactBroker
           provider_id: provider.id,
           consumer_id: version.pacticipant_id,
           pact_version_sha: pact_version_sha,
-          json_content: json_content
+          json_content: json_content,
+          version: version
         )
 
         event_params = { event_context: { consumer_version_tags: pact.consumer_version_tag_names }, pact: pact }

data/lib/pact_broker/pacts/verifiable_pact_messages.rb

@@ -77,6 +77,10 @@ module PactBroker
 
       attr_reader :verifiable_pact, :pact_version_url
 
+      def consumer_main_branch
+        verifiable_pact.consumer.main_branch
+      end
+
       def join(list, last_joiner = " and ")
         join_unquoted(list.collect { | word | "'#{word}'" }, last_joiner)
       end
@@ -178,6 +182,7 @@ module PactBroker
       end
 
       # rubocop: disable Metrics/CyclomaticComplexity
+      # rubocop: disable Metrics/MethodLength
       def selector_description selector
         description = if selector.overall_latest?
                         consumer_label = selector.consumer ? selector.consumer : "a consumer"
@@ -189,6 +194,9 @@ module PactBroker
                         else
                           "latest #{version_label} tagged '#{selector.tag}'"
                         end
+                      elsif selector.latest_for_main_branch?
+                        version_label = selector.consumer ? "version of #{selector.consumer}" : "version"
+                        "latest #{version_label} from the main branch '#{consumer_main_branch}'"
                       elsif selector.latest_for_branch?
                         version_label = selector.consumer ? "version of #{selector.consumer}" : "version"
                         if selector.fallback_branch?
@@ -209,6 +217,7 @@ module PactBroker
         "#{description} (#{selector.consumer_version.number})"
       end
       # rubocop: enable Metrics/CyclomaticComplexity
+      # rubocop: enable Metrics/MethodLength
 
       def currently_deployed_selectors_description(selectors)
         selectors.group_by(&:consumer).flat_map do | consumer_name, consumer_selectors |
@@ -253,6 +262,8 @@ module PactBroker
           "one of #{selector.tag}"
         elsif selector.currently_deployed?
           "deployed to #{selector.environment.name}"
+        elsif selector.currently_supported?
+          "released in #{selector.environment.name}"
         else
           selector.to_json
         end

data/lib/pact_broker/repositories/helpers.rb

@@ -55,6 +55,10 @@ module PactBroker
           select(column)
         end
       end
+
+      def no_columns_selected?
+        opts[:select].nil?
+      end
     end
   end
 end

data/lib/pact_broker/repositories/scopes.rb

@@ -0,0 +1,15 @@
+module PactBroker
+  module Repositories
+    module Scopes
+      def scope_for(scope)
+        PactBroker.policy_scope!(scope)
+      end
+
+      # For the times when it doesn't make sense to use the scoped class, this is a way to
+      # indicate that it is an intentional use
+      def unscoped(scope)
+        scope
+      end
+    end
+  end
+end

data/lib/pact_broker/test/test_data_builder.rb

@@ -243,6 +243,7 @@ module PactBroker
           provider_id: @provider.id,
           pact_version_sha: pact_version_sha,
           json_content: prepare_json_content(json_content),
+          version: @consumer_version
         )
         pact_versions_count_after = PactBroker::Pacts::PactVersion.count
         set_created_at_if_set(params[:created_at], :pact_publications, id: @pact.id)
@@ -542,7 +543,7 @@ module PactBroker
 
       def create_deployed_version(uuid: , currently_deployed: , version:, environment_name: , target: nil, created_at: nil)
         env = find_environment(environment_name)
-        @deployed_version = PactBroker::Deployments::DeployedVersionService.create(uuid, version, env, target)
+        @deployed_version = PactBroker::Deployments::DeployedVersionService.find_or_create(uuid, version, env, target)
         PactBroker::Deployments::DeployedVersionService.record_version_undeployed(deployed_version) unless currently_deployed
         set_created_at_if_set(created_at, :deployed_versions, id: deployed_version.id)
       end

data/lib/pact_broker/ui/helpers/matrix_helper.rb

@@ -11,6 +11,7 @@ module PactBroker
             o = OpenStruct.new(selector_hash)
             o.specify_latest_tag = (o.tag && o.latest) ? "checked" : nil
             o.specify_latest_branch = (o.branch && o.latest) ? "checked" : nil
+            o.specify_all_branch = (o.branch && !o.latest) ? "checked" : nil
             o.specify_environment = o.environment_name ? "checked" : nil
             o.specify_all_tagged = (o.tag && !o.latest) ? "checked" : nil
             o.specify_latest = o.latest ? "checked" : nil

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

@@ -111,7 +111,7 @@
               - if index_item.show_settings?
                 %span.integration-settings.kebab-horizontal{ 'aria-hidden': true }
 
-    %p.pagination.text-center
+    %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

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

@@ -42,6 +42,8 @@
                 Version number ...
               %option{ value: 'specify-latest-branch', selected: selector.specify_latest_branch }
                 Latest version from branch ...
+              %option{ value: 'specify-all-branch', selected: selector.specify_all_branch }
+                All versions from branch ...
               %option{ value: 'specify-environment', selected: selector.specify_environment }
                 Version(s) in environment ...
               %option{ value: 'specify-latest-tag', selected: selector.specify_latest_tag }

data/lib/pact_broker/verifications/latest_verification_for_pact_version.rb

@@ -1,12 +1,13 @@
 require "pact_broker/domain/verification"
 
+# TODO delete this when AllPactPublications is deleted
+
 module PactBroker
   module Verifications
     class LatestVerificationForPactVersion < PactBroker::Domain::Verification
       set_dataset(:latest_verifications_for_pact_versions)
 
       # this view doesn't have a consumer_id
-      # TODO add it
       def consumer
         PactBroker::Domain::Pacticipant.find(id: PactBroker::Pacts::AllPactPublications
            .where(pact_version_id: pact_version_id)
@@ -14,7 +15,6 @@ module PactBroker
       end
 
       # this view doesn't have a provider_id
-      # TODO add it
       def provider
         PactBroker::Domain::Pacticipant.find(id: PactBroker::Pacts::AllPactPublications
            .where(pact_version_id: pact_version_id)

data/lib/pact_broker/verifications/repository.rb

@@ -67,24 +67,23 @@ module PactBroker
       end
 
       def search_for_latest consumer_name, provider_name
-        query = LatestVerificationForPactVersion
-                  .select_all_qualified
-                  .join(:all_pact_publications, pact_version_id: :pact_version_id)
-        query = query.consumer(consumer_name) if consumer_name
-        query = query.provider(provider_name) if provider_name
+        query = PactBroker::Domain::Verification.select_all_qualified
+        query = query.for_consumer_name(consumer_name) if consumer_name
+        query = query.for_provider_name(provider_name) if provider_name
         query.reverse(:execution_date, :id).first
       end
 
       def find_latest_verifications_for_consumer_version consumer_name, consumer_version_number
         # Use LatestPactPublicationsByConsumerVersion not AllPactPublcations because we don't
         # want verifications for shadowed revisions as it would be misleading.
-        LatestVerificationForPactVersion
+        PactBroker::Domain::Verification
           .select_all_qualified
-          .join(:latest_pact_publications_by_consumer_versions, pact_version_id: :pact_version_id)
-          .consumer(consumer_name)
-          .consumer_version_number(consumer_version_number)
-          .order(:provider_name)
+          .remove_verifications_for_overridden_consumer_versions
+          .for_consumer_name_and_consumer_version_number(consumer_name, consumer_version_number)
+          .latest_by_pact_version
+          .eager(:provider)
           .all
+          .sort_by { | v | v.provider_name.downcase }
       end
 
       # The most recent verification for the latest revision of the pact

data/lib/pact_broker/version.rb

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

data/public/javascripts/matrix.js

@@ -34,6 +34,9 @@ function showApplicableTextBoxes(selectorizor) {
   else if( selectorizorType === 'specify-latest-branch') {
     setTextboxVisibility(selectorizor, '.branch', true);
   }
+  else if( selectorizorType === 'specify-all-branch') {
+    setTextboxVisibility(selectorizor, '.branch', true);
+  }
   else if ( selectorizorType === 'specify-environment') {
     setTextboxVisibility(selectorizor, '.environment', true);
   }

data/spec/features/create_tag_spec.rb

@@ -29,4 +29,14 @@ describe "Creating a tag" do
       expect(subject.status).to be 200
     end
   end
+
+  context "when there is an envionment with a matching name" do
+    before do
+      td.create_environment("foo")
+    end
+
+    it "creates a deployed version" do
+      expect { subject }.to change { PactBroker::Deployments::DeployedVersion.count }.by(1)
+    end
+  end
 end

data/spec/features/execute_webhook_spec.rb

@@ -1,4 +1,3 @@
-require "support/test_data_builder"
 require "webmock/rspec"
 require "rack/pact_broker/database_transaction"
 
@@ -8,7 +7,6 @@ describe "Execute a webhook" do
       .create_webhook(method: "POST", body: "${pactbroker.pactUrl}")
   end
 
-  let(:td) { TestDataBuilder.new }
   let(:path) { "/webhooks/#{td.webhook.uuid}/execute" }
   let(:response_body) { JSON.parse(last_response.body, symbolize_names: true)}
 
@@ -77,7 +75,7 @@ describe "Execute a webhook" do
       PactBroker::Database.truncate
     end
 
-    subject { post path; last_response }
+    subject { post(path) }
 
     it "returns a 200 response" do
       expect(subject.status).to be 200

data/spec/features/get_integrations_spec.rb

@@ -1,7 +1,7 @@
 describe "Get integrations dot file" do
   before do
-    TestDataBuilder.new
-      .create_pact_with_hierarchy("Foo", "1", "Bar")
+    td.create_pact_with_hierarchy("Foo", "1", "Bar")
+      .create_verification(provider_version: "2")
   end
 
   let(:path) { "/integrations" }

data/spec/features/get_provider_pacts_for_verification_spec.rb

@@ -11,8 +11,7 @@ describe "Get provider pacts for verification" do
 
   context "when the provider exists" do
     before do
-      TestDataBuilder.new
-        .create_provider("Provider")
+      td.create_provider("Provider")
         .create_consumer("Consumer")
         .create_consumer_version("0.0.1")
         .create_pact(json_content: { some: "content" }.to_json)
@@ -71,7 +70,10 @@ describe "Get provider pacts for verification" do
 
       subject { post(path, request_body.to_json, request_headers) }
 
-      it { Approvals.verify(fixture, :name => "get_provider_pacts_for_verification", format: :json) }
+      # The metadata is different when the database IDs are different
+      it "matches the expected body", skip: !DB.sqlite? do
+        Approvals.verify(fixture, :name => "get_provider_pacts_for_verification", format: :json)
+      end
 
       it "returns a list of links to the pacts" do
         expect(pacts.size).to eq 1

data/spec/features/metadata_spec.rb

@@ -0,0 +1,66 @@
+require "webmock/rspec"
+require "pact_broker/api/pact_broker_urls"
+
+RSpec.describe "passing the pact selection criteria through the verification results to the triggered webhooks" do
+  before do
+    allow(PactBroker::Webhooks::Job).to receive(:perform_in)
+  end
+
+  let!(:pact) do
+    td.create_pact_with_hierarchy("Foo", "1", "Bar")
+      .create_consumer_version_tag("dev")
+      .create_consumer_version_tag("prod")
+      .create_global_verification_webhook
+  end
+
+  let(:verification_content) { load_fixture("verification.json") }
+  let(:event_context) { PactBroker::Webhooks::TriggeredWebhook.last.event_context }
+
+  context "when verifying the latest pact by URL" do
+    let(:pact_url) { PactBroker::Api::PactBrokerUrls.latest_pact_url("", pact) }
+    it "passes the consumer version number into the verification event context" do
+      response = get(pact_url)
+      publish_verification_results_url = JSON.parse(response.body)["_links"]["pb:publish-verification-results"]["href"]
+      post(publish_verification_results_url, verification_content, { "CONTENT_TYPE" => "application/json" })
+      expect(event_context["consumer_version_number"]).to eq "1"
+    end
+  end
+
+  context "when verifying the latest pact for a tag by URL" do
+    let(:pact_url) { PactBroker::Api::PactBrokerUrls.latest_pact_url("", pact) + "/dev" }
+    let(:event_context) { PactBroker::Webhooks::TriggeredWebhook.last.event_context }
+
+    it "passes the consumer version number and tag into the triggered webhook event context" do
+      response = get(pact_url)
+      publish_verification_results_url = JSON.parse(response.body)["_links"]["pb:publish-verification-results"]["href"]
+      post(publish_verification_results_url, verification_content, { "CONTENT_TYPE" => "application/json" })
+      expect(event_context).to include "consumer_version_number" => "1", "consumer_version_tags" => ["dev"]
+    end
+  end
+
+  context "when verifying pacts via the pacts for verification API" do
+    let(:request_body) do
+      {
+        consumerVersionSelectors: [ { tag: "dev", latest: true } ],
+      }
+    end
+
+    let(:request_headers) do
+      {
+        "CONTENT_TYPE" => "application/json",
+        "HTTP_ACCEPT" => "application/hal+json"
+      }
+    end
+
+    let(:path) { "/pacts/provider/Bar/for-verification" }
+
+    it "passes the consumer version number and tag into the triggered webhook event context" do
+      response = post(path, request_body.to_json, request_headers)
+      pact_url = JSON.parse(response.body)["_embedded"]["pacts"].first["_links"]["self"]["href"]
+      response = get(pact_url)
+      publish_verification_results_url = JSON.parse(response.body)["_links"]["pb:publish-verification-results"]["href"]
+      post(publish_verification_results_url, verification_content, { "CONTENT_TYPE" => "application/json" })
+      expect(event_context).to include "consumer_version_number" => "1", "consumer_version_tags" => ["dev"]
+    end
+  end
+end