pact_broker 2.42.0 → 2.43.0

data/lib/pact_broker/matrix/repository.rb

@@ -82,12 +82,8 @@ module PactBroker
       def find_integrations_for_specified_selectors(resolved_specified_selectors)
         specified_pacticipant_names = resolved_specified_selectors.collect(&:pacticipant_name)
         QuickRow
-          .select(:consumer_name, :consumer_id, :provider_name, :provider_id)
-          .matching_selectors(resolved_specified_selectors)
-          .distinct
-          .all
+          .distinct_integrations(resolved_specified_selectors)
           .collect(&:to_hash)
-          .uniq
           .collect do | hash |
             required = is_a_row_for_this_integration_required?(specified_pacticipant_names, hash[:consumer_name])
             Integration.from_hash(hash.merge(required: required))
@@ -122,8 +118,8 @@ module PactBroker
       end
 
       def query_matrix selectors, options
-        query = options[:latestby] ? QuickRow.eager_all_the_things : Row
-        query = query.select_all.matching_selectors(selectors)
+        query = options[:latestby] ? QuickRow.select_all_columns.eager_all_the_things : Row.select_all
+        query = query.matching_selectors(selectors)
         query = query.limit(options[:limit]) if options[:limit]
         query
           .order_by_names_ascending_most_recent_first
@@ -216,26 +212,7 @@ module PactBroker
       end
 
       def selector_for_version(pacticipant, version, original_selector, selector_type, latestby)
-        pact_publication_ids, verification_ids = nil, nil
-
-        # Querying for the "pre-filtered" pact publications and verifications directly, rather than just using the consumer
-        # and provider versions allows us to remove the "overwritten" pact revisions and verifications from the
-        # matrix result set, making the final matrix query more efficient and stopping the query limit from
-        # removing relevant data (eg. https://github.com/pact-foundation/pact_broker-client/issues/53)
-        if latestby
-          pact_publication_ids = PactBroker::Pacts::LatestPactPublicationsByConsumerVersion
-                                            .select(:id)
-                                            .where(consumer_version_id: version.id)
-                                            .collect{ |pact_publication| pact_publication[:id] }
-
-          verification_ids = PactBroker::Verifications::LatestVerificationIdForPactVersionAndProviderVersion
-                                .select(:verification_id)
-                                .distinct
-                                .where(provider_version_id: version.id)
-                                .collect{ |pact_publication| pact_publication[:verification_id] }
-        end
-
-        ResolvedSelector.for_pacticipant_and_version(pacticipant, version, pact_publication_ids, verification_ids, original_selector, selector_type)
+        ResolvedSelector.for_pacticipant_and_version(pacticipant, version, original_selector, selector_type)
       end
 
       def selector_without_version(pacticipant, selector_type)

data/lib/pact_broker/matrix/resolved_selector.rb

@@ -23,13 +23,11 @@ module PactBroker
         )
       end
 
-      def self.for_pacticipant_and_version(pacticipant, version, pact_publication_ids = [], verification_ids = [], original_selector, type)
+      def self.for_pacticipant_and_version(pacticipant, version, original_selector, type)
         ResolvedSelector.new(
           pacticipant_id: pacticipant.id,
           pacticipant_name: pacticipant.name,
           pacticipant_version_id: version.id,
-          pact_publication_ids: pact_publication_ids,
-          verification_ids: verification_ids,
           pacticipant_version_number: version.number,
           latest: original_selector[:latest],
           tag: original_selector[:tag],
@@ -73,6 +71,14 @@ module PactBroker
         self[:tag]
       end
 
+      def most_specific_criterion
+        if pacticipant_version_id
+          { pacticipant_version_id: pacticipant_version_id }
+        else
+          { pacticipant_id: pacticipant_id }
+        end
+      end
+
       def latest_tagged?
         latest? && tag
       end

data/lib/pact_broker/test/test_data_builder.rb

@@ -73,16 +73,23 @@ module PactBroker
         self
       end
 
-      def create_pact_with_hierarchy consumer_name = "Consumer", consumer_version = "1.2.3", provider_name = "Provider", json_content = default_json_content
+      def create_pact_with_hierarchy consumer_name = "Consumer", consumer_version_number = "1.2.3", provider_name = "Provider", json_content = default_json_content
         use_consumer(consumer_name)
         create_consumer(consumer_name) if !consumer
         use_provider(provider_name)
         create_provider provider_name if !provider
-        create_consumer_version consumer_version
+        use_consumer_version(consumer_version_number)
+        create_consumer_version(consumer_version_number) if !consumer_version
         create_pact json_content: json_content
         self
       end
 
+      def create_pact_with_verification consumer_name = "Consumer", consumer_version = "1.0.#{model_counter}", provider_name = "Provider", provider_version = "1.0.#{model_counter}"
+        create_pact_with_hierarchy(consumer_name, consumer_version, provider_name)
+        create_verification(number: model_counter, provider_version: provider_version)
+        self
+      end
+
       def create_version_with_hierarchy pacticipant_name, pacticipant_version
         pacticipant = pacticipant_service.create(:name => pacticipant_name)
         version = PactBroker::Domain::Version.create(:number => pacticipant_version, :pacticipant => pacticipant)
@@ -325,6 +332,16 @@ module PactBroker
         self
       end
 
+      def create_everything_for_an_integration
+        create_pact_with_verification("Foo", "1", "Bar", "2")
+          .create_label("label")
+          .create_consumer_version_tag("master")
+          .create_provider_version_tag("master")
+          .create_webhook
+          .create_triggered_webhook
+          .create_webhook_execution
+      end
+
       def model_counter
         @@model_counter ||= 0
         @@model_counter += 1

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.42.0'
+  VERSION = '2.43.0'
 end

data/lib/rack/pact_broker/request_target.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Rack
+  module PactBroker
+    module RequestTarget
+      extend self
+
+      WEB_ASSET_EXTENSIONS = %w[.js .woff .woff2 .css .png .html .map .ttf .ico].freeze
+      API_CONTENT_TYPES = %w[application/hal+json application/json text/csv application/yaml].freeze
+
+      def request_for_ui?(env)
+        !(request_for_api?(env))
+      end
+
+      def request_for_api?(env)
+        explicit_request_for_api(env) || no_accept_header(env) || (accept_all(env) && !is_web_extension(env))
+      end
+
+      private
+
+      def body_is_json(env)
+        env['CONTENT_TYPE']&.include?("json")
+      end
+
+      def explicit_request_for_api(env)
+        accepts_api_content_type(env) || body_is_api_content_type(env)
+      end
+
+      def accepts_api_content_type(env)
+        is_api_content_type((env['HTTP_ACCEPT']&.downcase) || "")
+      end
+
+      def body_is_api_content_type(env)
+        is_api_content_type((env['CONTENT_TYPE']&.downcase) || "")
+      end
+
+      def is_api_content_type(header)
+        API_CONTENT_TYPES.any?{ |content_type| header.include?(content_type) }
+      end
+
+      # default curl Accept header
+      # Also used by browsers to request various web assets like woff files
+      def accept_all(env)
+        env['HTTP_ACCEPT'] == "*/*"
+      end
+
+      # No browser ever makes a request without an accept header, so it must be an API
+      # request if there is no Accept header
+      def no_accept_header(env)
+        env['HTTP_ACCEPT'] == nil || env['HTTP_ACCEPT'] == ""
+      end
+
+      def is_web_extension(env)
+        env['PATH_INFO'].end_with?(*WEB_ASSET_EXTENSIONS)
+      end
+    end
+  end
+end

data/lib/rack/pact_broker/ui_request_filter.rb

@@ -4,62 +4,25 @@
 # to actually handle the request, as it would short circuit the cascade
 # logic.
 
+require 'rack/pact_broker/request_target'
+
 module Rack
   module PactBroker
     class UIRequestFilter
-      WEB_ASSET_EXTENSIONS = %w[.js .woff .woff2 .css .png .html .map .ttf .ico].freeze
-      API_CONTENT_TYPES = %w[application/hal+json application/json text/csv application/yaml].freeze
+      include RequestTarget
 
       def initialize app
         @app = app
       end
 
       def call env
-        if request_for_api(env) || no_accept_header(env) || (accept_all(env) && !is_web_extension(env))
+        if request_for_ui?(env)
+          @app.call(env)
+        else
           # send the request on to the next app in the Rack::Cascade
           [404, {},[]]
-        else
-          @app.call(env)
         end
       end
-
-      private
-
-      def body_is_json(env)
-        env['CONTENT_TYPE'] && env['CONTENT_TYPE'].include?("json")
-      end
-
-      def request_for_api(env)
-        accepts_api_content_type(env) || body_is_api_content_type(env)
-      end
-
-      def accepts_api_content_type(env)
-        is_api_content_type((env['HTTP_ACCEPT'] && env['HTTP_ACCEPT'].downcase) || "")
-      end
-
-      def body_is_api_content_type(env)
-        is_api_content_type((env['CONTENT_TYPE'] && env['CONTENT_TYPE'].downcase) || "")
-      end
-
-      def is_api_content_type(header)
-        API_CONTENT_TYPES.any?{ |content_type| header.include?(content_type) }
-      end
-
-      # default curl Accept header
-      # Also used by browsers to request various web assets like woff files
-      def accept_all(env)
-        env['HTTP_ACCEPT'] == "*/*"
-      end
-
-      # No browser ever makes a request without an accept header, so it must be an API
-      # request if there is no Accept header
-      def no_accept_header(env)
-        env['HTTP_ACCEPT'] == nil || env['HTTP_ACCEPT'] == ""
-      end
-
-      def is_web_extension(env)
-        env['PATH_INFO'].end_with?(*WEB_ASSET_EXTENSIONS)
-      end
     end
   end
 end

data/pact_broker.gemspec

@@ -51,14 +51,14 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'sequel', '~> 5.6'
   gem.add_runtime_dependency 'webmachine', '1.5.0'
   gem.add_runtime_dependency 'semver2', '~> 3.4.2'
-  gem.add_runtime_dependency 'rack', '>= 2.0.6', '~>2.0'
+  gem.add_runtime_dependency 'rack', '>= 2.0.8', '~>2.0'
   gem.add_runtime_dependency 'redcarpet', '>=3.3.2', '~>3.3'
   gem.add_runtime_dependency 'pact-support'
   gem.add_runtime_dependency 'padrino-core', '>= 0.14.3', '~> 0.14'
-  gem.add_runtime_dependency 'sinatra', '>= 2.0.2'
+  gem.add_runtime_dependency 'sinatra', '>= 2.0.8.1', '< 3.0'
   gem.add_runtime_dependency 'haml', '~>5.0'
   gem.add_runtime_dependency 'sucker_punch', '~>2.0'
-  gem.add_runtime_dependency 'rack-protection', '~>2.0'
+  gem.add_runtime_dependency 'rack-protection', '>= 2.0.8.1', '< 3.0'
   gem.add_runtime_dependency 'dry-types', '~> 0.10.3' # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
   gem.add_runtime_dependency 'dry-logic', '0.4.2' # Later version cases ArgumentError: wrong number of arguments
   gem.add_runtime_dependency 'table_print', '~> 1.5'

data/spec/lib/pact_broker/badges/service_spec.rb

@@ -219,6 +219,25 @@ module PactBroker
           end
         end
 
+        context "when a timeout exception is raised connecting to the shields.io server" do
+          before do
+            allow(Net::HTTP).to receive(:start).and_raise(Net::OpenTimeout)
+          end
+
+          it "logs a warning rather than an error as this will happen reasonably often" do
+            expect(logger).to receive(:warn).with(/Timeout retrieving badge from.*shield.*Net::OpenTimeout/)
+            subject
+          end
+
+          it "returns a static image" do
+            expect(subject).to include ">pact</"
+          end
+
+          it "does not cache the response" do
+            expect(Service::CACHE.size).to eq 0
+          end
+        end
+
         context "when an exception is raised connecting to the shields.io server" do
           before do
             allow(Net::HTTP).to receive(:start).and_raise("an error")

data/spec/lib/pact_broker/integrations/service_spec.rb

@@ -249,6 +249,16 @@ module PactBroker
           end
         end
       end
+
+      describe "delete_all" do
+        before do
+          td.create_everything_for_an_integration
+        end
+
+        it "doesn't blow up" do
+          Service.delete_all
+        end
+      end
     end
   end
 end

data/spec/lib/pact_broker/matrix/deployment_status_summary_spec.rb

@@ -190,8 +190,6 @@ module PactBroker
               pacticipant_name: "Bar",
               pacticipant_version_id: 10,
               pacticipant_version_number: "14131c5da3abf323ccf410b1b619edac76231243",
-              pact_publication_ids: [],
-              verification_ids: [],
               latest: nil,
               tag: nil,
               type: :inferred

data/spec/lib/pact_broker/matrix/integration_spec.rb

@@ -4,6 +4,7 @@ module PactBroker
   module Matrix
     describe Service do
       let(:td) { TestDataBuilder.new }
+
       describe "find" do
         subject { Service.find(selectors, options) }
 
@@ -236,6 +237,45 @@ module PactBroker
             expect(subject.deployment_status_summary.deployable?).to be true
           end
         end
+
+        describe "when two applications have pacts with each other (nureva use case)" do
+          # ServiceA v 1 has been verified by ServiceB v 100
+          # but ServiceB v 100 has only been verified by ServiceA v 99.
+          # It's missing a verification from ServiceA v1.
+          before do
+            td.create_pact_with_verification("ServiceB", "100", "ServiceA", "99")
+              .create_pact_with_verification("ServiceA", "1", "ServiceB", "100")
+          end
+
+          context "when both application versions are specified explictly" do
+            let(:selectors) do
+              [
+                { pacticipant_name: "ServiceA", pacticipant_version_number: "1" },
+                { pacticipant_name: "ServiceB", pacticipant_version_number: "100" }
+              ]
+            end
+
+            let(:options) { { latestby: "cvpv" } }
+
+            it "does not allow the two apps to be deployed together" do
+              expect(subject.deployment_status_summary.deployable?).to_not be true
+            end
+          end
+
+          context "when only one application is specified" do
+            let(:selectors) do
+              [
+                { pacticipant_name: "ServiceB", pacticipant_version_number: "100" }
+              ]
+            end
+
+            let(:options) { { latestby: "cvp", latest: true } }
+
+            it "does not allow the two apps to be deployed together" do
+              expect(subject.deployment_status_summary.deployable?).to_not be true
+            end
+          end
+        end
       end
     end
   end

data/spec/lib/pact_broker/matrix/quick_row_spec.rb

@@ -1,4 +1,5 @@
 require 'pact_broker/matrix/quick_row'
+require 'pact_broker/matrix/resolved_selector'
 
 module PactBroker
   module Matrix
@@ -18,9 +19,9 @@ module PactBroker
           .create_pact
       end
 
-      it "behaves like a Row, except smarter" do
+      it "behaves like a Row, except quicker" do
         a_id = QuickRow.db[:pacticipants].where(name: "A").select(:id).single_record[:id]
-        rows = QuickRow.consumer_id(a_id).eager(:consumer).eager(:verification).all
+        rows = QuickRow.default_scope.where(consumer_id: a_id).eager(:consumer).eager(:verification).all
         expect(rows.first.consumer).to be rows.last.consumer
         expect(rows.first.verification).to_not be nil
         expect(rows.first.consumer_name).to_not be nil

data/spec/lib/pact_broker/matrix/repository_spec.rb

@@ -633,7 +633,7 @@ module PactBroker
           end
         end
 
-        context "when the latest version is specified for a provider without a tag but the latest known version for a provider does not have a verification" do
+        context "when the latest version is specified for a provider ignoring tags but the latest known version for a provider does not have a verification" do
           before do
             td.create_pact_with_hierarchy("A", "1.2.3", "B")
               .create_verification(provider_version: "1.0.0")
@@ -647,7 +647,7 @@ module PactBroker
             ]
           end
 
-          it "returns no data - this may be confusing. Might need to re-think this logic." do
+          it "returns no data" do
             expect(subject.size).to eq 0
           end
         end
@@ -981,6 +981,8 @@ module PactBroker
       end
 
       describe "find pact_broker-client issue 33" do
+        # foo1.0.0 bar10.0.0 n1
+        # foo1.0.0 baz9.0.0 n1
         before do
           td
           .create_consumer("foo")
@@ -1003,7 +1005,7 @@ module PactBroker
         subject { shorten_rows(results) }
 
         it "only returns a row for the foo pact version that has been verified by the current production version of bar" do
-          expect(subject).to eq ["foo1.0.0 bar10.0.0 n1"]
+          expect(subject).to eq ["foo1.0.0 bar10.0.0 n1", "foo1.0.0 baz? n?"]
         end
 
         it "returns 2 integrations" do

data/spec/lib/rack/pact_broker/{ui_request_filter_spec.rb → request_target_spec.rb}

@@ -1,67 +1,60 @@
-require 'rack/pact_broker/ui_request_filter'
-require 'rack/test'
+require 'rack/pact_broker/request_target'
 
 module Rack
   module PactBroker
-    describe UIRequestFilter do
-      include Rack::Test::Methods
+    describe RequestTarget do
+      let(:rack_env) do
+        {
+          'CONTENT_TYPE' => content_type,
+          'HTTP_ACCEPT' => accept,
+          'PATH_INFO' => path
+        }
+      end
+      let(:content_type) { nil }
+      let(:accept) { nil }
+      let(:path) { '' }
 
-      describe "#call" do
-        let(:target_app) { double('target_app', call: [200, {}, []]) }
-        let(:app) { UIRequestFilter.new(target_app) }
+      describe "#request_for_ui?" do
         let(:path) { "/" }
-        let(:accept) { "text/html" }
 
-        subject { get path, nil, { "HTTP_ACCEPT" => accept } }
+        subject { RequestTarget.request_for_ui?(rack_env) }
 
         context "when the Accept header includes text/html" do
-          it "forwards the request to the target app" do
-            expect(target_app).to receive(:call)
-            subject
-          end
+          let(:accept) { "text/html" }
+
+          it { is_expected.to be true }
         end
 
         context "when the request is for a web asset with an Accept header of */*" do
           let(:path) { "/blah/foo.woff" }
           let(:accept) { "*/*" }
 
-          it "forwards the request to the target app" do
-            expect(target_app).to receive(:call)
-            subject
-          end
+          it { is_expected.to be true }
         end
 
         context "when the request is for a content type served by the API (HAL browser request)" do
           let(:accept) { "application/hal+json, application/json, */*; q=0.01" }
 
-          it "returns a 404" do
-            expect(subject.status).to eq 404
-          end
+          it { is_expected.to be false }
         end
 
         context "when the request is not for a web asset and the Accept headers is */* (default Accept header from curl request)" do
           let(:accept) { "*/*" }
 
-          it "returns a 404" do
-            expect(subject.status).to eq 404
-          end
+          it { is_expected.to be false }
         end
 
         context "when the request is not for a web asset and no Accept header is specified" do
           let(:accept) { nil }
 
-          it "returns a 404" do
-            expect(subject.status).to eq 404
-          end
+          it { is_expected.to be false }
         end
 
         context "when the request ends in a web asset extension but has Accept application/hal+json" do
           let(:accept) { "application/hal+json" }
           let(:path) { "/blah/foo.woff" }
 
-          it "returns a 404" do
-            expect(subject.status).to eq 404
-          end
+          it { is_expected.to be false }
         end
       end
     end