pact_broker 2.8.0.beta.5 → 2.9.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cebfc643458ec866835a2820e3dcbc3f214266ae
-  data.tar.gz: 85ab89a5a77b328efe497d9846110a5291de65c1
+  metadata.gz: bf490a74cabeccee8ad6973db3e32c96a0ff2f6b
+  data.tar.gz: a4983395d117314b3c7da784a7855a20d5483147
 SHA512:
-  metadata.gz: 76afaaa40c825514aeeae6e334274caf8d52b850b41126ae68163214810bd0d5bf9244b9e737135f0baf82339f43a48d07d5ce0df2c6372d3705a86dfaa2d71d
-  data.tar.gz: 4f35850adae4e26e3ed41c83e71c0509b05f5ba7af7dacb30ca37bb059abe6c62c2eba346fc0b790ec6ca6f6a0f3e7c19b1e47818b3d93939e796ae1cea2010a
+  metadata.gz: 9720bb92c02c741b93c63b127c4c53fab0bbf980fc7af1842fce100186fc78edfd8936ef2c535dc6c51c1d2aeff4057b48c4a2c3f4e568243456e285a6604476
+  data.tar.gz: 67f17b7730351717e5c47b87b7813065c1eac0d02750c9908fbe5264acb75ddc38e659197766b5de85599949805e324924a0467e427fd4f60f99ce654d3d8498

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+<a name="v2.9.0.beta.5"></a>
+### v2.9.0.beta.5 (2017-11-09)
+
+
+#### Features
+
+* **webhook templating**
+  * add support for ${pactbroker.pactUrl} in query and body	 ([0eed596](/../../commit/0eed596))
+
+* **matrix**
+  * allow query to determine if a particular pacticipant version is compatible with the latest tagged versions of all its dependencies	 ([ba4a1cc](/../../commit/ba4a1cc))
+
+
 <a name="v2.8.0.beta.5"></a>
 ### v2.8.0.beta.5 (2017-11-06)
 

data/lib/pact_broker/app.rb

@@ -3,6 +3,7 @@ require 'pact_broker/db'
 require 'pact_broker/project_root'
 require 'rack-protection'
 require 'rack/hal_browser'
+require 'rack/pact_broker/store_base_url'
 require 'rack/pact_broker/add_pact_broker_version_header'
 require 'rack/pact_broker/convert_file_extension_to_accept_header'
 require 'rack/pact_broker/database_transaction'
@@ -106,6 +107,7 @@ module PactBroker
       # NOTE THAT NONE OF THIS IS PROTECTED BY AUTH - is that ok?
       @app_builder.use Rack::Protection, except: [:path_traversal, :remote_token, :session_hijacking, :http_origin]
       @app_builder.use Rack::PactBroker::InvalidUriProtection
+      @app_builder.use Rack::PactBroker::StoreBaseURL
       @app_builder.use Rack::PactBroker::AddPactBrokerVersionHeader
       @app_builder.use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts", "/images"], :root => PactBroker.project_root.join("public")
       @app_builder.use Rack::Static, :urls => ["/favicon.ico"], :root => PactBroker.project_root.join("public/images"), header_rules: [[:all, {'Content-Type' => 'image/x-icon'}]]

data/lib/pact_broker/configuration.rb

@@ -123,6 +123,10 @@ module PactBroker
       self.enable_public_badge_access = enable_badge_resources
     end
 
+    def base_url
+      ENV['PACT_BROKER_BASE_URL']
+    end
+
     def save_to_database
       # Can't require a Sequel::Model class before the connection has been set
       require 'pact_broker/config/save'

data/lib/pact_broker/domain/webhook.rb

@@ -31,9 +31,9 @@ module PactBroker
         request && request.description
       end
 
-      def execute options
+      def execute pact, options
         logger.info "Executing #{self}"
-        request.execute options
+        request.execute pact, options
       end
 
       def to_s

data/lib/pact_broker/domain/webhook_request.rb

@@ -4,6 +4,7 @@ require 'pact_broker/logging'
 require 'pact_broker/messages'
 require 'net/http'
 require 'pact_broker/webhooks/redact_logs'
+require 'pact_broker/api/pact_broker_urls'
 
 module PactBroker
 
@@ -47,11 +48,11 @@ module PactBroker
         password.nil? ? nil : "**********"
       end
 
-      def execute options = {}
+      def execute pact, options = {}
         logs = StringIO.new
         execution_logger = Logger.new(logs)
         begin
-          execute_and_build_result(options, logs, execution_logger)
+          execute_and_build_result(pact, options, logs, execution_logger)
         rescue StandardError => e
           handle_error_and_build_result(e, options, logs, execution_logger)
         end
@@ -59,9 +60,10 @@ module PactBroker
 
       private
 
-      def execute_and_build_result options, logs, execution_logger
-        req = build_request(execution_logger)
-        response = do_request(req)
+      def execute_and_build_result pact, options, logs, execution_logger
+        uri = build_uri(pact)
+        req = build_request(uri, pact, execution_logger)
+        response = do_request(uri, req)
         log_response(response, execution_logger)
         result = WebhookExecutionResult.new(response, logs.string)
         log_completion_message(options, execution_logger, result.success?)
@@ -75,9 +77,9 @@ module PactBroker
         WebhookExecutionResult.new(nil, logs.string, e)
       end
 
-      def build_request execution_logger
-        req = http_request
-        execution_logger.info "HTTP/1.1 #{method.upcase} #{url_with_credentials}"
+      def build_request uri, pact, execution_logger
+        req = http_request(uri)
+        execution_logger.info "HTTP/1.1 #{method.upcase} #{url_with_credentials(pact)}"
 
         headers.each_pair do | name, value |
           execution_logger.info Webhooks::RedactLogs.call("#{name}: #{value}")
@@ -88,9 +90,9 @@ module PactBroker
 
         unless body.nil?
           if String === body
-            req.body = body
+            req.body = gsub_body(pact, body)
           else
-            req.body = body.to_json
+            req.body = gsub_body(pact, body.to_json)
           end
         end
 
@@ -98,7 +100,7 @@ module PactBroker
         req
       end
 
-      def do_request req
+      def do_request uri, req
         logger.info "Making webhook #{uuid} request #{to_s}"
         Net::HTTP.start(uri.hostname, uri.port,
           :use_ssl => uri.scheme == 'https') do |http|
@@ -126,19 +128,31 @@ module PactBroker
         "#{method.upcase} #{url}, username=#{username}, password=#{display_password}, headers=#{headers}, body=#{body}"
       end
 
-      def http_request
-        Net::HTTP.const_get(method.capitalize).new(url)
+      def http_request(uri)
+        Net::HTTP.const_get(method.capitalize).new(uri)
       end
 
-      def uri
-        URI(url)
+      def build_uri pact
+        URI(gsub_url(pact, url))
       end
 
-      def url_with_credentials
-        u = URI(url)
+      def url_with_credentials pact
+        u = build_uri(pact)
         u.userinfo = "#{username}:#{display_password}" if username
         u
       end
+
+      def gsub_body pact, body
+        base_url = PactBroker.configuration.base_url
+        body.gsub('${pactbroker.pactUrl}', PactBroker::Api::PactBrokerUrls.pact_url(base_url, pact))
+      end
+
+      def gsub_url pact, url
+        base_url = PactBroker.configuration.base_url
+        pact_url = PactBroker::Api::PactBrokerUrls.pact_url(base_url, pact)
+        escaped_pact_url = CGI::escape(pact_url)
+        url.gsub('${pactbroker.pactUrl}', escaped_pact_url)
+      end
     end
   end
 end

data/lib/pact_broker/matrix/parse_query.rb

@@ -31,6 +31,12 @@ module PactBroker
         if params.key?('limit')
           options[:limit] = params['limit']
         end
+        if params.key?('latest')
+          options[:latest] = params['latest']
+        end
+        if params.key?('tag')
+          options[:tag] = params['tag']
+        end
         return selectors, options
       end
     end

data/lib/pact_broker/matrix/repository.rb

@@ -18,8 +18,8 @@ module PactBroker
       def find selectors, options = {}
         # The group with the nil provider_version_numbers will be the results of the left outer join
         # that don't have verifications, so we need to include them all.
-        lines = find_all(selectors, options)
-        lines = apply_scope(options, selectors, lines)
+        lines = query_matrix(resolve_selectors(selectors, options), options)
+        lines = apply_latestby(options, selectors, lines)
 
         if options.key?(:success)
           lines = lines.select{ |l| options[:success].include?(l.success) }
@@ -28,11 +28,7 @@ module PactBroker
         lines.sort.collect(&:values)
       end
 
-      def all_versions_specified? selectors
-        selectors.all?{ |s| s[:pacticipant_version_number] }
-      end
-
-      def apply_scope options, selectors, lines
+      def apply_latestby options, selectors, lines
         return lines unless options[:latestby] == 'cvp' || options[:latestby] == 'cp'
 
         group_by_columns = case options[:latestby]
@@ -48,46 +44,41 @@ module PactBroker
 
       def find_for_consumer_and_provider pacticipant_1_name, pacticipant_2_name
         selectors = [{ pacticipant_name: pacticipant_1_name }, { pacticipant_name: pacticipant_2_name }]
-        find_all(selectors, {latestby: 'cvpv'}).sort.collect(&:values)
+        options = { latestby: 'cvpv' }
+        query_matrix(resolve_selectors(selectors, options), options).sort.collect(&:values)
       end
 
       def find_compatible_pacticipant_versions selectors
         find(selectors, latestby: 'cvpv').select{|line| line[:success] }
       end
 
-      ##
-      # If the version is nil, it means all versions for that pacticipant are to be included
-      #
-      def find_all selectors, options
-        selectors = look_up_versions_for_tags(selectors)
-        query = base_table(options).select_all
-
-        if selectors.size == 1
-          query = where_consumer_or_provider_is(selectors.first, query)
-        else
-          query = where_consumer_and_provider_in(selectors, query)
-        end
-
+      def query_matrix selectors, options
+        query = view_for(options).select_all.matching_selectors(selectors)
         query = query.limit(options[:limit]) if options[:limit]
-        query.order(
-          Sequel.asc(:consumer_name),
-          Sequel.desc(:consumer_version_order),
-          Sequel.desc(:pact_revision_number),
-          Sequel.asc(:provider_name),
-          Sequel.desc(:provider_version_order),
-          Sequel.desc(:verification_id)).all
+        query.order_by_names_ascending_most_recent_first.all
       end
 
-      def base_table(options)
-        return Row unless options[:latestby]
-        return LatestRow
+      def view_for(options)
+        options[:latestby] ? LatestRow : Row
       end
 
-      def look_up_versions_for_tags(selectors)
+      def resolve_selectors(selectors, options)
+        selectors = look_up_versions_for_latest_and_tag(selectors, options)
+
+        if options[:latest]
+          apply_latest_and_tag_to_inferred_selectors(selectors, options)
+        else
+          selectors
+        end
+      end
+
+      # Find the version number for selectors with the latest (tagged) version specified
+      def look_up_versions_for_latest_and_tag(selectors, options)
         selectors.collect do | selector |
           # resource validation currently stops tag being specified without latest=true
           if selector[:tag] && selector[:latest]
             version = version_repository.find_by_pacticpant_name_and_latest_tag(selector[:pacticipant_name], selector[:tag])
+            raise "Could not find version with tag #{selector[:tag].inspect} for #{selector[:pacticipant_name]}" unless version
             # validation in resource should ensure we always have a version
             {
               pacticipant_name: selector[:pacticipant_name],
@@ -105,28 +96,63 @@ module PactBroker
         end
       end
 
-      def where_consumer_and_provider_in selectors, query
-          query.where{
-            Sequel.&(
-              Sequel.|(
-                *selectors.collect{ |s| s[:pacticipant_version_number] ? Sequel.&(consumer_name: s[:pacticipant_name], consumer_version_number: s[:pacticipant_version_number]) :  Sequel.&(consumer_name: s[:pacticipant_name]) }
-              ),
-              Sequel.|(
-                *(selectors.collect{ |s| s[:pacticipant_version_number] ? Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: s[:pacticipant_version_number]) :  Sequel.&(provider_name: s[:pacticipant_name]) } +
-                  selectors.collect{ |s| Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: nil) })
-              )
-            )
-          }
+      # eg. when checking to see if Foo version 2 can be deployed to prod,
+      # need to look up all the 'partner' pacticipants, and determine their latest prod versions
+      def apply_latest_and_tag_to_inferred_selectors(selectors, options)
+        all_pacticipant_names = all_pacticipant_names_in_specified_matrix(selectors, options)
+        specified_names = selectors.collect{ |s| s[:pacticipant_name] }
+        inferred_names = all_pacticipant_names - specified_names
+
+        inferred_selectors = inferred_names.collect do | pacticipant_name |
+          {
+            pacticipant_name: pacticipant_name,
+            latest: options[:latest]
+          }.tap { |it| it[:tag] = options[:tag] if options[:tag] }
+        end
+
+        selectors + look_up_versions_for_latest_and_tag(inferred_selectors, options)
       end
 
-      def where_consumer_or_provider_is s, query
-        query.where{
-          Sequel.|(
-            s[:pacticipant_version_number] ? Sequel.&(consumer_name: s[:pacticipant_name], consumer_version_number: s[:pacticipant_version_number]) :  Sequel.&(consumer_name: s[:pacticipant_name]),
-            s[:pacticipant_version_number] ? Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: s[:pacticipant_version_number]) :  Sequel.&(provider_name: s[:pacticipant_name])
-          )
-        }
+      def all_pacticipant_names_in_specified_matrix(selectors, options)
+        query = view_for(options).select(:consumer_name, :provider_name)
+        query = query.matching_selectors(selectors)
+        query
+          .all
+          .collect{ | row | [row.consumer_name, row.provider_name] }
+          .flatten
+          .uniq
       end
+
+      # def where_row_matches_selectors selectors, query
+      #   if selectors.size == 1
+      #     where_consumer_or_provider_is(selectors.first, query)
+      #   else
+      #     where_consumer_and_provider_in(selectors, query)
+      #   end
+      # end
+
+      # def where_consumer_and_provider_in selectors, query
+      #     query.where{
+      #       Sequel.&(
+      #         Sequel.|(
+      #           *selectors.collect{ |s| s[:pacticipant_version_number] ? Sequel.&(consumer_name: s[:pacticipant_name], consumer_version_number: s[:pacticipant_version_number]) :  Sequel.&(consumer_name: s[:pacticipant_name]) }
+      #         ),
+      #         Sequel.|(
+      #           *(selectors.collect{ |s| s[:pacticipant_version_number] ? Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: s[:pacticipant_version_number]) :  Sequel.&(provider_name: s[:pacticipant_name]) } +
+      #             selectors.collect{ |s| Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: nil) })
+      #         )
+      #       )
+      #     }
+      # end
+
+      # def where_consumer_or_provider_is s, query
+      #   query.where{
+      #     Sequel.|(
+      #       s[:pacticipant_version_number] ? Sequel.&(consumer_name: s[:pacticipant_name], consumer_version_number: s[:pacticipant_version_number]) :  Sequel.&(consumer_name: s[:pacticipant_name]),
+      #       s[:pacticipant_version_number] ? Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: s[:pacticipant_version_number]) :  Sequel.&(provider_name: s[:pacticipant_name])
+      #     )
+      #   }
+      # end
     end
   end
 end

data/lib/pact_broker/matrix/row.rb

@@ -6,6 +6,47 @@ module PactBroker
 
       dataset_module do
         include PactBroker::Repositories::Helpers
+
+        def matching_selectors selectors
+          if selectors.size == 1
+            where_consumer_or_provider_is(selectors.first)
+          else
+            where_consumer_and_provider_in(selectors)
+          end
+        end
+
+        def where_consumer_and_provider_in selectors
+          where{
+            Sequel.&(
+              Sequel.|(
+                *selectors.collect{ |s| s[:pacticipant_version_number] ? Sequel.&(consumer_name: s[:pacticipant_name], consumer_version_number: s[:pacticipant_version_number]) :  Sequel.&(consumer_name: s[:pacticipant_name]) }
+              ),
+              Sequel.|(
+                *(selectors.collect{ |s| s[:pacticipant_version_number] ? Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: s[:pacticipant_version_number]) :  Sequel.&(provider_name: s[:pacticipant_name]) } +
+                  selectors.collect{ |s| Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: nil) })
+              )
+            )
+          }
+        end
+
+        def where_consumer_or_provider_is s
+          where{
+            Sequel.|(
+              s[:pacticipant_version_number] ? Sequel.&(consumer_name: s[:pacticipant_name], consumer_version_number: s[:pacticipant_version_number]) :  Sequel.&(consumer_name: s[:pacticipant_name]),
+              s[:pacticipant_version_number] ? Sequel.&(provider_name: s[:pacticipant_name], provider_version_number: s[:pacticipant_version_number]) :  Sequel.&(provider_name: s[:pacticipant_name])
+            )
+          }
+        end
+
+        def order_by_names_ascending_most_recent_first
+          order(
+            Sequel.asc(:consumer_name),
+            Sequel.desc(:consumer_version_order),
+            Sequel.desc(:pact_revision_number),
+            Sequel.asc(:provider_name),
+            Sequel.desc(:provider_version_order),
+            Sequel.desc(:verification_id))
+        end
       end
 
       def summary
@@ -14,7 +55,6 @@ module PactBroker
 
       # Add logic for ignoring case
       def <=> other
-
         comparisons = [
           compare_name_asc(consumer_name, other.consumer_name),
           compare_number_desc(consumer_version_order, other.consumer_version_order),

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.8.0.beta.5'
+  VERSION = '2.9.0.beta.5'
 end

data/lib/pact_broker/webhooks/triggered_webhook.rb

@@ -46,7 +46,7 @@ module PactBroker
       end
 
       def execute options
-        webhook.to_domain.execute options
+        webhook.to_domain.execute pact_publication.to_domain, options
       end
 
       def consumer_name

data/lib/rack/pact_broker/store_base_url.rb

@@ -0,0 +1,14 @@
+module Rack
+  module PactBroker
+    class StoreBaseURL
+      def initialize app
+        @app = app
+      end
+
+      def call(env)
+        ENV['PACT_BROKER_BASE_URL'] ||= ::Rack::Request.new(env).base_url
+        @app.call(env)
+      end
+    end
+  end
+end

data/script/seed.rb

@@ -53,7 +53,7 @@ TestDataBuilder.new
   .create_label("microservice")
   .create_provider("Bar")
   .create_label("microservice")
-  .create_webhook(method: 'GET', url: 'http://localhost:9393/')
+  .create_webhook(method: 'GET', url: 'http://localhost:9393?url=${pactbroker.pactUrl}', body: '${pactbroker.pactUrl}')
   .create_consumer_version("1.2.100")
   .publish_pact
   .create_verification(provider_version: "1.4.234", success: true, execution_date: DateTime.now - 15)

data/script/webhook-server.ru

@@ -1,6 +1,10 @@
+require 'rack/utils'
+
 count = 0
 run -> (env) {
   count += 1
   status = (count % 3 == 0) ? 200 : 500
-  puts "Received request"; [status, {}, ["Hello. This might be an error.\n"]]
+  puts Rack::Utils.parse_nested_query(env['QUERY_STRING'])
+  puts env['rack.input'].read
+  [status, {}, ["Hello. This might be an error.\n"]]
 }

data/spec/features/execute_webhook_spec.rb

@@ -7,8 +7,13 @@ describe "Execute a webhook" do
   let(:td) { TestDataBuilder.new }
 
   before do
-    td.create_pact_with_hierarchy("Some Consumer", "1", "Some Provider")
-      .create_webhook(method: 'POST')
+    ENV['PACT_BROKER_BASE_URL'] = 'http://example.org'
+    td.create_pact_with_hierarchy("Foo", "1", "Bar")
+      .create_webhook(method: 'POST', body: '${pactbroker.pactUrl}')
+  end
+
+  after do
+    ENV.delete('PACT_BROKER_BASE_URL')
   end
 
   let(:path) { "/webhooks/#{td.webhook.uuid}/execute" }
@@ -18,7 +23,7 @@ describe "Execute a webhook" do
 
   context "when the execution is successful" do
     let!(:request) do
-      stub_request(:post, /http/).to_return(:status => 200)
+      stub_request(:post, /http/).with(body: 'http://example.org/pacts/provider/Bar/consumer/Foo/version/1').to_return(:status => 200)
     end
 
     it "performs the HTTP request" do

data/spec/lib/pact_broker/domain/webhook_request_spec.rb

@@ -7,6 +7,10 @@ module PactBroker
   module Domain
 
     describe WebhookRequest do
+      before do
+        allow(PactBroker::Api::PactBrokerUrls).to receive(:pact_url).and_return('http://example.org/pact-url')
+        allow(PactBroker.configuration).to receive(:base_url).and_return('http://example.org')
+      end
 
       let(:username) { nil }
       let(:password) { nil }
@@ -15,6 +19,7 @@ module PactBroker
       let(:logs) { StringIO.new }
       let(:execution_logger) { Logger.new(logs) }
       let(:options) { {failure_log_message: 'oops'}}
+      let(:pact) { instance_double('PactBroker::Domain::Pact') }
 
       subject do
         WebhookRequest.new(
@@ -26,7 +31,8 @@ module PactBroker
           body: body)
       end
 
-      let(:logs) { subject.execute(options).logs }
+      let(:logs) { subject.execute(pact, options).logs }
+
 
       describe "description" do
         it "returns a brief description of the HTTP request" do
@@ -56,15 +62,59 @@ module PactBroker
             to_return(:status => 200, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
         end
 
+        describe "when the String body contains a ${pactbroker.pactUrl} parameter" do
+          let!(:http_request) do
+            stub_request(:post, "http://example.org/hook").
+              with(:headers => {'Content-Type'=>'text/plain'}, :body => "<xml><url>http://example.org/pact-url</url></xml>").
+              to_return(:status => 200)
+          end
+
+          let(:body) { "<xml><url>${pactbroker.pactUrl}</url></xml>" }
+
+          it "replaces the token with the live value" do
+            subject.execute(pact, options)
+            expect(http_request).to have_been_made
+          end
+        end
+
+        describe "when the JSON body contains a ${pactbroker.pactUrl} parameter" do
+          let!(:http_request) do
+            stub_request(:post, "http://example.org/hook").
+              with(:headers => {'Content-Type'=>'text/plain'}, :body => '{"url":"http://example.org/pact-url"}').
+              to_return(:status => 200)
+          end
+
+          let(:body) { { url: '${pactbroker.pactUrl}' } }
+
+          it "replaces the token with the live value" do
+            subject.execute(pact, options)
+            expect(http_request).to have_been_made
+          end
+        end
+
+        describe "when the URL contains a ${pactbroker.pactUrl} parameter" do
+          let!(:http_request) do
+            stub_request(:post, "http://example.org/hook?url=http%3A%2F%2Fexample.org%2Fpact-url").
+              to_return(:status => 200)
+          end
+
+          let(:url) { 'http://example.org/hook?url=${pactbroker.pactUrl}' }
+
+          it "replaces the token with the live value" do
+            subject.execute(pact, options)
+            expect(http_request).to have_been_made
+          end
+        end
+
         it "executes the configured request" do
-          subject.execute(options)
+          subject.execute(pact, options)
           expect(http_request).to have_been_made
         end
 
         it "logs the request" do
           allow(PactBroker.logger).to receive(:info)
           expect(PactBroker.logger).to receive(:info).with(/POST.*example.*text.*body/)
-          subject.execute(options)
+          subject.execute(pact, options)
         end
 
         it "logs the response" do
@@ -72,7 +122,7 @@ module PactBroker
           allow(PactBroker.logger).to receive(:debug)
           expect(PactBroker.logger).to receive(:info).with(/response.*200/)
           expect(PactBroker.logger).to receive(:debug).with(/respbod/)
-          subject.execute(options)
+          subject.execute(pact, options)
         end
 
         describe "execution logs" do
@@ -144,7 +194,7 @@ module PactBroker
           end
 
           it "uses the credentials" do
-            subject.execute(options)
+            subject.execute(pact, options)
             expect(http_request_with_basic_auth).to have_been_made
           end
         end
@@ -160,7 +210,7 @@ module PactBroker
           end
 
           it "uses SSL" do
-            subject.execute(options)
+            subject.execute(pact, options)
             expect(https_request).to have_been_made
           end
         end
@@ -175,7 +225,7 @@ module PactBroker
           end
 
           it "converts the body to JSON before submitting the request" do
-            subject.execute(options)
+            subject.execute(pact, options)
             expect(http_request).to have_been_made
           end
         end
@@ -190,18 +240,18 @@ module PactBroker
           end
 
           it "executes the request without a body" do
-            subject.execute(options)
+            subject.execute(pact, options)
             expect(http_request).to have_been_made
           end
         end
 
         context "when the request is successful" do
           it "returns a WebhookExecutionResult with success=true" do
-            expect(subject.execute(options).success?).to be true
+            expect(subject.execute(pact, options).success?).to be true
           end
 
           it "sets the response on the result" do
-            expect(subject.execute(options).response).to be_instance_of(Net::HTTPOK)
+            expect(subject.execute(pact, options).response).to be_instance_of(Net::HTTPOK)
           end
         end
 
@@ -214,11 +264,11 @@ module PactBroker
           end
 
           it "returns a WebhookExecutionResult with success=false" do
-            expect(subject.execute(options).success?).to be false
+            expect(subject.execute(pact, options).success?).to be false
           end
 
           it "sets the response on the result" do
-            expect(subject.execute(options).response).to be_instance_of(Net::HTTPInternalServerError)
+            expect(subject.execute(pact, options).response).to be_instance_of(Net::HTTPInternalServerError)
           end
         end
 
@@ -233,15 +283,15 @@ module PactBroker
           it "logs the error" do
             allow(PactBroker.logger).to receive(:error)
             expect(PactBroker.logger).to receive(:error).with(/Error.*WebhookTestError.*blah/)
-            subject.execute(options)
+            subject.execute(pact, options)
           end
 
           it "returns a WebhookExecutionResult with success=false" do
-            expect(subject.execute(options).success?).to be false
+            expect(subject.execute(pact, options).success?).to be false
           end
 
           it "returns a WebhookExecutionResult with an error" do
-            expect(subject.execute(options).error).to be_instance_of WebhookTestError
+            expect(subject.execute(pact, options).error).to be_instance_of WebhookTestError
           end
 
           it "logs the failure_log_message" do

data/spec/lib/pact_broker/domain/webhook_spec.rb

@@ -11,6 +11,8 @@ module PactBroker
       let(:provider) { Pacticipant.new(name: 'Provider')}
       let(:request) { instance_double(PactBroker::Domain::WebhookRequest, execute: nil)}
       let(:options) { double('options') }
+      let(:pact) { double('pact') }
+
       subject { Webhook.new(request: request, consumer: consumer, provider: provider,) }
 
       describe "description" do
@@ -22,14 +24,14 @@ module PactBroker
       describe "execute" do
 
         it "executes the request" do
-          expect(request).to receive(:execute).with(options)
-          subject.execute options
+          expect(request).to receive(:execute).with(pact, options)
+          subject.execute pact, options
         end
 
         it "logs before and after" do
           allow(PactBroker.logger).to receive(:info)
           expect(PactBroker.logger).to receive(:info).with(/Executing/)
-          subject.execute options
+          subject.execute pact, options
         end
       end
     end

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

@@ -555,6 +555,139 @@ module PactBroker
         end
       end
 
+      describe "find with global latest and tag specified" do
+        subject { shorten_rows(Repository.new.find(selectors, options)) }
+
+        context "with one consumer/version and latest tag specified for all the other pacticipants" do
+          before do
+            td.create_pact_with_hierarchy("A", "1", "B")
+              .create_verification(provider_version: "1")
+              .create_verification(provider_version: "2", number: 2)
+              .use_provider_version("1")
+              .create_provider_version_tag("prod")
+              .create_provider("C")
+              .create_pact
+              .create_verification(provider_version: "3")
+              .use_provider_version("3")
+              .create_provider_version_tag("prod")
+              .create_verification(provider_version: "4", number: 2)
+          end
+
+          let(:selectors) { build_selectors('A'=> '1') }
+          let(:options) { { tag: 'prod', latest: true } }
+
+          it "finds the matrix for the latest tagged versions of each of the other other pacticipants" do
+            expect(subject).to include "A1 B1 n1"
+            expect(subject).to include "A1 C3 n1"
+            expect(subject.size).to eq 2
+          end
+        end
+
+        context "with one consumer/version and latest specified for all the other pacticipants" do
+          before do
+            td.create_pact_with_hierarchy("A", "1", "B")
+              .create_verification(provider_version: "1")
+              .create_verification(provider_version: "2", number: 2)
+              .use_provider_version("1")
+              .create_provider("C")
+              .create_pact
+              .create_verification(provider_version: "3")
+              .create_verification(provider_version: "4", number: 2)
+          end
+
+          let(:selectors) { build_selectors('A'=> '1') }
+          let(:options) { { latest: true } }
+
+          it "finds the matrix for the latest tagged versions of each of the other other pacticipants" do
+            expect(subject).to include "A1 B2 n2"
+            expect(subject).to include "A1 C4 n2"
+            expect(subject.size).to eq 2
+          end
+        end
+
+        context "with one pacticipant without a version and latest tag specified for all the other pacticipants" do
+          before do
+            td.create_pact_with_hierarchy("A", "1", "B")
+              .create_verification(provider_version: "1")
+              .create_verification(provider_version: "2", number: 2)
+              .use_provider_version("1")
+              .create_provider_version_tag("prod")
+              .create_provider("C")
+              .create_pact
+              .create_verification(provider_version: "3")
+              .use_provider_version("3")
+              .create_provider_version_tag("prod")
+              .create_verification(provider_version: "4", number: 2)
+              .create_consumer_version("2")
+              .create_pact
+          end
+
+          let(:selectors) { build_selectors('A'=> nil) }
+          let(:options) { { tag: 'prod', latest: true } }
+
+          it "finds the matrix for the latest tagged versions of each of the other other pacticipants" do
+            expect(subject).to include "A1 B1 n1"
+            expect(subject).to include "A1 C3 n1"
+            expect(subject).to include "A2 C? n?"
+            expect(subject.size).to eq 3
+          end
+        end
+
+        context "with one pacticipant/version that is both a consumer and provider and latest tag specified for all the other pacticipants" do
+          before do
+            td.create_pact_with_hierarchy("A", "1", "B")
+              .create_consumer_version_tag("prod")
+              .create_verification(provider_version: "1")
+              .use_provider_version("1")
+              .use_consumer("B")
+              .use_consumer_version("1")
+              .create_provider("C")
+              .create_pact
+              .create_verification(provider_version: "3")
+              .use_provider_version("3")
+              .create_provider_version_tag("prod")
+              .create_verification(provider_version: "4", number: 2)
+          end
+
+          let(:selectors) { build_selectors('B'=> '1') }
+          let(:options) { { tag: 'prod', latest: true } }
+
+          it "finds the matrix for the latest tagged versions of each of the other other pacticipants" do
+            expect(subject).to include "A1 B1 n1"
+            expect(subject).to include "B1 C3 n1"
+            expect(subject.size).to eq 2
+          end
+        end
+
+        context "with one pacticipant/latest tag and latest tag specified for all the other pacticipants" do
+          before do
+            td.create_pact_with_hierarchy("A", "1", "B")
+              .create_consumer_version_tag("dev")
+              .create_verification(provider_version: "1")
+              .use_provider_version("1")
+              .create_provider_version_tag("prod")
+              .create_provider("C")
+              .create_pact
+              .create_verification(provider_version: "3")
+              .use_provider_version("3")
+              .create_provider_version_tag("prod")
+              .create_verification(provider_version: "4", number: 2)
+          end
+
+          let(:selectors) { [{ pacticipant_name: 'A', latest: true, tag: 'dev' } ] }
+          let(:options) { { tag: 'prod', latest: true } }
+
+          it "finds the matrix for the latest tagged versions of each of the other other pacticipants" do
+            expect(subject).to include "A1 B1 n1"
+            expect(subject).to include "A1 C3 n1"
+            expect(subject).to_not include "A1 C4 n2"
+            expect(subject.size).to eq 2
+          end
+        end
+
+
+      end
+
       describe "#find_for_consumer_and_provider" do
         before do
           TestDataBuilder.new

data/spec/service_consumers/provider_states_for_pact_broker_client.rb

@@ -82,6 +82,17 @@ Pact.provider_states_for "Pact Broker Client" do
     end
   end
 
+  provider_state "the pact for Foo version 1.2.3 has been successfully verified by Bar version 4.5.6 (tagged prod) and version 5.6.7" do
+    set_up do
+      TestDataBuilder.new
+        .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .create_verification(provider_version: "4.5.6")
+        .use_provider_version("4.5.6")
+        .create_provider_version_tag("prod")
+        .create_verification(provider_version: "5.6.7", number: 2)
+    end
+  end
+
   provider_state "the 'Pricing Service' does not exist in the pact-broker" do
     no_op
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.8.0.beta.5
+  version: 2.9.0.beta.5
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -774,6 +774,7 @@ files:
 - lib/rack/pact_broker/database_transaction.rb
 - lib/rack/pact_broker/invalid_uri_protection.rb
 - lib/rack/pact_broker/no_auth.rb
+- lib/rack/pact_broker/store_base_url.rb
 - lib/rack/pact_broker/ui_authentication.rb
 - pact_broker.gemspec
 - pact_broker_client-pact_broker.json