pact_broker 2.73.0 → 2.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc95def65b82d8d938fa3b245bb6f306092d8d00572778f8b3f8ae377479fd0
-  data.tar.gz: 2790ca52a1db8ba01ca02ef24b6816482a4fdf38a925e8eb737d998ff2ff1213
+  metadata.gz: 4a3779dfce4701e31c25e10a37154785df8745aa022869f70bcdd3c080066169
+  data.tar.gz: d9c48a07a42949aea37a84ca43930a53d6403abe02a96d1c1de2d58a27d763bc
 SHA512:
-  metadata.gz: 9d2740784d48edea10528d9b3a1db0ec6f89d5474c2b7b3c4c4077a7b1d57c714f7f902066e7e76cf921ab5b51e8cc58b6d3146a2a752c3535394c87e7457831
-  data.tar.gz: 5fb6688a830ecd05bf7eb8985d651f0a406a5bfe348e29287b93328bb2cf9f36013fda31394e3499ee058c10e54c326366f59567dc3d5eadf02507d9512787f6
+  metadata.gz: 2a4a61fe0838766004ab06723b406d51149d748ec449c81139ada966a223b5491d4728fa0cdd52d6e369081af490eb03b4b7036c12c6f2a6b014bf20608c9d68
+  data.tar.gz: 569774601622663f53d824d40b0013afd6728f0c603fb9f2f8d66f759603daf7d361d6481003dc83a2a844415d93eae78694a076be1172eb45728d678cd672a2

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+<a name="v2.74.0"></a>
+### v2.74.0 (2021-01-04)
+
+#### Features
+
+* include the consumer version selectors in the metadata of the 'pact for verification' URL	 ([32bbe1c3](/../../commit/32bbe1c3))
+
+#### Bug Fixes
+
+* **deps**
+  * update nokogiri for CVE-2020-26247	 ([336ec897](/../../commit/336ec897))
+
 <a name="v2.73.0"></a>
 ### v2.73.0 (2020-12-16)
 

data/lib/pact_broker/api/decorators/verifiable_pact_decorator.rb

@@ -1,11 +1,13 @@
 require_relative 'base_decorator'
 require 'pact_broker/api/pact_broker_urls'
 require 'pact_broker/pacts/build_verifiable_pact_notices'
+require 'pact_broker/pacts/metadata'
 
 module PactBroker
   module Api
     module Decorators
       class VerifiablePactDecorator < BaseDecorator
+        include PactBroker::Pacts::Metadata
 
         property :shortDescription, getter: -> (context) { PactBroker::Pacts::VerifiablePactMessages.new(context[:represented], nil).pact_version_short_description }
 
@@ -27,7 +29,7 @@ module PactBroker
         end
 
         link :self do | user_options |
-          metadata = represented.wip ? { wip: true } : nil
+          metadata = build_metadata_for_pact_for_verification(represented)
           {
             href: pact_version_url_with_metadata(represented, metadata, user_options[:base_url]),
             name: represented.name

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -1,6 +1,8 @@
 require 'erb'
 require 'pact_broker/pacts/metadata'
 require 'pact_broker/logging'
+require 'base64'
+require 'rack'
 
 module PactBroker
   module Api
@@ -77,9 +79,7 @@ module PactBroker
       def decode_pact_metadata(metadata)
         if metadata && metadata != ''
           begin
-            Rack::Utils.parse_nested_query(Base64.strict_decode64(metadata)).each_with_object({}) do | (k, v), new_hash |
-              new_hash[k.to_sym] = v
-            end
+            Rack::Utils.parse_nested_query(Base64.strict_decode64(metadata))
           rescue StandardError => e
             logger.warn("Exception parsing webhook metadata: #{metadata}", e)
             {}

data/lib/pact_broker/api/resources/metadata_resource_methods.rb

@@ -1,4 +1,5 @@
 require 'pact_broker/hash_refinements'
+require 'pact_broker/pacts/metadata'
 
 module PactBroker
   module Api
@@ -15,7 +16,7 @@ module PactBroker
         end
 
         def metadata
-          @metadata ||= PactBrokerUrls.decode_pact_metadata(identifier_from_path[:metadata])
+          @metadata ||= PactBroker::Pacts::Metadata.parse_metadata(PactBrokerUrls.decode_pact_metadata(identifier_from_path[:metadata]))
         end
       end
     end

data/lib/pact_broker/domain/version.rb

@@ -47,13 +47,20 @@ module PactBroker
       dataset_module do
         include PactBroker::Repositories::Helpers
 
+        def for(pacticipant_name, version_number)
+          where_pacticipant_name(pacticipant_name).where_number(version_number).single_record
+        end
+
         def where_pacticipant_name(pacticipant_name)
-          join(:pacticipants) do | p |
-            Sequel.&(
-              { Sequel[first_source_alias][:pacticipant_id] => Sequel[p][:id] },
-              name_like(Sequel[p][:name], pacticipant_name)
-            )
-          end
+          where(pacticipant_id: db[:pacticipants].select(:id).where(name_like(:name, pacticipant_name)))
+          # If we do a join, we get the extra columns from the pacticipant table that then
+          # make == not work
+          # join(:pacticipants) do | p |
+          #   Sequel.&(
+          #     { Sequel[first_source_alias][:pacticipant_id] => Sequel[p][:id] },
+          #     name_like(Sequel[p][:name], pacticipant_name)
+          #   )
+          # end
         end
 
         def where_tag(tag)

data/lib/pact_broker/pacts/metadata.rb

@@ -3,6 +3,15 @@ module PactBroker
     module Metadata
       extend self
 
+      MAPPINGS = [
+        [:consumer_version_tags, "cvt"],
+        [:consumer_version_number, "cvn"],
+        [:wip, "w"],
+        [:consumer_version_selectors, "s"],
+        [:tag, "t"],
+        [:latest, "l"]
+      ]
+
       # When verifying a pact at /.../latest/TAG, this stores the
       # tag and the current consumer version number in the
       # metadata parameter of the URL for publishing the verification results.
@@ -11,12 +20,12 @@ module PactBroker
       def build_metadata_for_latest_pact(pact, selection_parameters)
         if selection_parameters[:tag]
           {
-            consumer_version_tags: [selection_parameters[:tag]],
-            consumer_version_number: pact.consumer_version_number
+            "cvt" => [selection_parameters[:tag]],
+            "cvn" => pact.consumer_version_number
           }
         else
           {
-            consumer_version_number: pact.consumer_version_number
+            "cvn" => pact.consumer_version_number
           }
         end
       end
@@ -28,12 +37,50 @@ module PactBroker
       # go back to the correct consumer version number (eg for git statuses)
       def build_metadata_for_webhook_triggered_by_pact_publication(pact)
         metadata = {
-          consumer_version_number: pact.consumer_version_number,
-          consumer_version_tags: pact.consumer_version_tag_names
+          "cvn" => pact.consumer_version_number,
+          "cvt" => pact.consumer_version_tag_names
         }
-        metadata[:wip] = "true"
+        metadata["w"] = "true"
         metadata
       end
+
+      def build_metadata_for_pact_for_verification(verifiable_pact)
+        # todo put in tags
+        if verifiable_pact.wip
+          {
+            "w" => true
+          }
+        else
+          {
+            "s" => verifiable_pact.selectors.collect do | selector |
+              {
+                "t" => selector.tag,
+                "l" => selector.latest,
+                "cvn" => selector.consumer_version.number
+              }.compact
+            end
+          }
+        end
+      end
+
+      def parse_metadata(metadata)
+        parse_object(metadata)
+      end
+
+      def parse_object(object)
+        case object
+        when Hash then parse_hash(object)
+        when Array then object.collect{|i| parse_object(i) }
+        else object
+        end
+      end
+
+      def parse_hash(hash)
+        hash.each_with_object({}) do | (key, value), new_hash |
+          long_key = MAPPINGS.find{ |mapping| mapping.last == key }&.first
+          new_hash[long_key || key] = parse_object(value)
+        end
+      end
     end
   end
 end

data/lib/pact_broker/pacts/repository.rb

@@ -168,7 +168,7 @@ module PactBroker
           .values
           .collect do | pact_publications |
             latest_pact_publication = pact_publications.sort_by{ |p| p.values.fetch(:consumer_version_order) }.last
-            SelectedPact.new(latest_pact_publication.to_domain, Selectors.new(selector))
+            SelectedPact.new(latest_pact_publication.to_domain, Selectors.new(selector).resolve(latest_pact_publication.consumer_version))
           end
       end
 
@@ -428,7 +428,7 @@ module PactBroker
             .order_ignore_case(:consumer_name)
             .collect do | latest_pact_publication |
               pact_publication = PactPublication.find(id: latest_pact_publication.id)
-              SelectedPact.new(pact_publication.to_domain, Selectors.create_for_overall_latest)
+              SelectedPact.new(pact_publication.to_domain, Selectors.create_for_overall_latest.resolve(pact_publication.consumer_version))
             end
         else
           selectors_for_overall_latest = consumer_version_selectors.select(&:overall_latest?)
@@ -438,7 +438,7 @@ module PactBroker
             query.collect do | latest_pact_publication |
               pact_publication = PactPublication.find(id: latest_pact_publication.id)
               resolved_selector = selector.consumer ? Selector.latest_for_consumer(selector.consumer) : Selector.overall_latest
-              SelectedPact.new(pact_publication.to_domain, Selectors.new(resolved_selector))
+              SelectedPact.new(pact_publication.to_domain, Selectors.new(resolved_selector).resolve(pact_publication.consumer_version))
             end
           end
         end
@@ -453,26 +453,19 @@ module PactBroker
           query = query.consumer(selector.consumer) if selector.consumer
           query.all.collect do | latest_tagged_pact_publication |
             pact_publication = PactPublication.find(id: latest_tagged_pact_publication.id)
-            resolved_pact = selector.consumer ? Selector.latest_for_tag_and_consumer(selector.tag, selector.consumer) : Selector.latest_for_tag(selector.tag)
+            resolved_selector = if selector.consumer
+              Selector.latest_for_tag_and_consumer(selector.tag, selector.consumer).resolve(pact_publication.consumer_version)
+            else
+              Selector.latest_for_tag(selector.tag).resolve(pact_publication.consumer_version)
+            end
             SelectedPact.new(
               pact_publication.to_domain,
-              Selectors.new(resolved_pact)
+              Selectors.new(resolved_selector)
             )
           end
         end
       end
 
-      def create_fallback_selected_pact(pact_publications, consumer_version_selectors)
-        selector_tag_names = pact_publications.collect(&:tag_name)
-        selectors = Selectors.create_for_latest_fallback_of_each_tag(selector_tag_names)
-        last_pact_publication = pact_publications.sort_by(&:consumer_version_order).last
-        pact_publication = unscoped(PactPublication).find(id: last_pact_publication.id)
-        SelectedPact.new(
-          pact_publication.to_domain,
-          selectors
-        )
-      end
-
       def find_pacts_for_which_the_latest_version_for_the_fallback_tag_is_required(provider_name, selectors)
         selectors.collect do | selector |
           query = scope_for(LatestTaggedPactPublications).provider(provider_name).where(tag_name: selector.fallback_tag)
@@ -482,7 +475,7 @@ module PactBroker
               pact_publication = unscoped(PactPublication).find(id: latest_tagged_pact_publication.id)
               SelectedPact.new(
                 pact_publication.to_domain,
-                Selectors.new(selector)
+                Selectors.new(selector.resolve(pact_publication.consumer_version))
               )
             end
         end.flatten

data/lib/pact_broker/pacts/selector.rb

@@ -5,6 +5,10 @@ module PactBroker
         merge!(options)
       end
 
+      def resolve(consumer_version)
+        ResolvedSelector.new(self.to_h, consumer_version)
+      end
+
       def tag= tag
         self[:tag] = tag
       end
@@ -94,6 +98,10 @@ module PactBroker
         !!(tag && !latest?)
       end
 
+      def == other
+        other.class == self.class && super
+      end
+
       def <=> other
         if overall_latest? || other.overall_latest?
           if overall_latest? == other.overall_latest?
@@ -124,5 +132,19 @@ module PactBroker
         !!self[:latest]
       end
     end
+
+    class ResolvedSelector < Selector
+      def initialize(options = {}, consumer_version)
+        super(options.merge(consumer_version: consumer_version))
+      end
+
+      def consumer_version
+        self[:consumer_version]
+      end
+
+      def == other
+        super && consumer_version == other.consumer_version
+      end
+    end
   end
 end

data/lib/pact_broker/pacts/selectors.rb

@@ -19,6 +19,10 @@ module PactBroker
         Selectors.new([Selector.overall_latest])
       end
 
+      def resolve(consumer_version)
+        Selectors.new(collect{ |selector| selector.resolve(consumer_version) })
+      end
+
       def + other
         Selectors.new(super)
       end

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -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,16 +68,18 @@ 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)
+        @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],
@@ -80,7 +89,7 @@ module PactBroker
         }.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,9 @@ 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
@@ -124,7 +143,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 +152,8 @@ 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
@@ -163,6 +183,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/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.73.0'
+  VERSION = '2.74.0'
 end

data/pact_broker.gemspec

@@ -64,4 +64,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'table_print', '~> 1.5'
   gem.add_runtime_dependency 'semantic_logger', '~> 4.3'
   gem.add_runtime_dependency 'sanitize', '>= 5.2.1', '~> 5.2'
+  gem.add_runtime_dependency 'nokogiri', '< 2.0', '>= 1.11.0.rc4' # For CVE-2020-26247 Remove when 1.11 is released properly
 end

data/script/reproduce-issue.rb

@@ -9,10 +9,15 @@ begin
 
   td = PactBroker::Test::HttpTestDataBuilder.new(base_url, { })
   td.delete_integration(consumer: "MyConsumer", provider: "MyProvider")
+    .create_pacticipant("MyConsumer")
+    .create_pacticipant("MyProvider")
     .publish_pact(consumer: "MyConsumer", consumer_version: "1", provider: "MyProvider", content_id: "111", tag: "main")
+    .publish_pact(consumer: "MyConsumer", consumer_version: "2", provider: "MyProvider", content_id: "222", tag: "main")
+    .publish_pact(consumer: "MyConsumer", consumer_version: "3", provider: "MyProvider", content_id: "111", tag: "feat/a")
     .get_pacts_for_verification(
       provider_version_tag: "main",
-      consumer_version_selectors: [{ tag: "main", latest: true }])
+      consumer_version_selectors: [{ tag: "main" }, { tag: "feat/a", latest: true }])
+    .verify_pact(success: true, provider_version_tag: "main", provider_version: "2" )
 
 
 rescue StandardError => e

data/spec/lib/pact_broker/api/decorators/verifiable_pact_decorator_spec.rb

@@ -8,6 +8,7 @@ module PactBroker
           allow_any_instance_of(PactBroker::Api::PactBrokerUrls).to receive(:pact_version_url_with_metadata).and_return('http://pact')
           allow(PactBroker::Pacts::BuildVerifiablePactNotices).to receive(:call).and_return(notices)
           allow_any_instance_of(PactBroker::Pacts::VerifiablePactMessages).to receive(:pact_version_short_description).and_return('short desc')
+          allow_any_instance_of(VerifiablePactDecorator).to receive(:build_metadata_for_pact_for_verification).and_return(metadata)
         end
 
         let(:pending_reason) { "the pending reason" }
@@ -45,13 +46,15 @@ module PactBroker
             name: "name",
             provider_name: "Bar",
             pending_provider_tags: pending_provider_tags,
-            consumer_tags: consumer_tags)
+            consumer_tags: consumer_tags,
+            selectors: PactBroker::Pacts::Selectors.new([PactBroker::Pacts::ResolvedSelector.new({ latest: true }, double('version', number: "2", id: 1))]))
         end
         let(:pending_provider_tags) { %w[dev] }
         let(:consumer_tags) { %w[dev] }
         let(:options) { { user_options: { base_url: 'http://example.org', include_pending_status: include_pending_status } } }
         let(:include_pending_status) { true }
         let(:wip){ false }
+        let(:metadata) { double('metadata') }
         let(:json) { decorator.to_json(options) }
 
         subject { JSON.parse(json) }
@@ -61,7 +64,7 @@ module PactBroker
         end
 
         it "creates the pact version url" do
-          expect(decorator).to receive(:pact_version_url_with_metadata).with(pact, nil, 'http://example.org')
+          expect(decorator).to receive(:pact_version_url_with_metadata).with(pact, metadata, 'http://example.org')
           subject
         end
 
@@ -84,11 +87,6 @@ module PactBroker
           it "includes the wip flag" do
             expect(subject['verificationProperties']['wip']).to be true
           end
-
-          it "includes it in the metadata" do
-            expect(decorator).to receive(:pact_version_url_with_metadata).with(pact, { wip: true }, 'http://example.org')
-            subject
-          end
         end
       end
     end

data/spec/lib/pact_broker/api/pact_broker_urls_spec.rb

@@ -107,13 +107,9 @@ module PactBroker
       end
 
       describe "webhook metadata" do
-        let(:expected_metadata) do
-          { consumer_version_number: "123/456", consumer_version_tags: %w[dev], wip: "true" }
-        end
-
         it "builds the webhook metadata" do
-          encoded_metadata = PactBrokerUrls.encode_metadata(PactBrokerUrls.build_metadata_for_webhook_triggered_by_pact_publication(pact))
-          expect(PactBrokerUrls.decode_pact_metadata(encoded_metadata)).to eq (expected_metadata)
+          encoded_metadata = PactBrokerUrls.encode_metadata("some" => "metadata")
+          expect(PactBrokerUrls.decode_pact_metadata(encoded_metadata)).to eq "some" => "metadata"
         end
       end
 

data/spec/lib/pact_broker/pacts/metadata_spec.rb

@@ -0,0 +1,73 @@
+require 'pact_broker/pacts/metadata'
+
+module PactBroker
+  module Pacts
+    module Metadata
+      describe "#build_metadata_for_pact_for_verification" do
+        let(:selectors) do
+          Selectors.new([ResolvedSelector.new({ latest: true, consumer: "consumer", tag: "tag" }, consumer_version)])
+        end
+        let(:consumer_version) { double('version', number: "2") }
+        let(:verifiable_pact) { double('PactBroker::Pacts::VerifiablePact', wip: wip, selectors: selectors) }
+        let(:wip) { false }
+
+        subject { Metadata.build_metadata_for_pact_for_verification(verifiable_pact) }
+
+        it "builds the metadata with the resolved selectors" do
+          expect(subject).to eq({
+            "s" => [
+              {
+                "l" => true,
+                "t" => "tag",
+                "cvn" => "2"
+              }
+            ]
+          })
+        end
+
+        context "when wip is true" do
+          let(:wip) { true }
+
+          it { is_expected.to eq "w" => true }
+
+        end
+      end
+
+      describe "parse_metadata" do
+        let(:incoming_metadata) do
+          {
+            "cvn" => "2",
+            "cvt" => ["tag"],
+            "w" => true,
+            "s" => [
+              {
+                "l" => true,
+                "t" => "tag",
+                "cvn" => "2"
+              }
+            ]
+          }
+        end
+
+        let(:parsed_metadata) do
+          {
+            :consumer_version_number => "2",
+            :consumer_version_tags => ["tag"],
+            :wip => true,
+            :consumer_version_selectors => [
+              {
+                :latest => true,
+                :tag => "tag",
+                :consumer_version_number => "2"
+              }
+            ]
+          }
+        end
+
+        it "expands the key names" do
+          expect(Metadata.parse_metadata(incoming_metadata)).to eq parsed_metadata
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/pacts/repository_find_for_verification_fallback_spec.rb

@@ -30,7 +30,7 @@ module PactBroker
           context "when a pact exists for the main tag" do
             it "returns the pact with the main tag" do
               expect(find_by_consumer_version_number("2")).to_not be nil
-              expect(find_by_consumer_version_number("2").selectors.first).to eq Selector.latest_for_tag(tag)
+              expect(find_by_consumer_version_number("2").selectors.first).to eq Selector.latest_for_tag(tag).resolve(PactBroker::Domain::Version.for("Foo", "2"))
             end
 
             it "does not set the fallback_tag on the selector" do
@@ -67,7 +67,7 @@ module PactBroker
               it "only returns the pacts for the consumer" do
                 expect(subject.size).to eq 1
                 expect(subject.first.consumer.name).to eq "Foo"
-                expect(subject.first.selectors.first).to eq selector
+                expect(subject.first.selectors.first).to eq selector.resolve(PactBroker::Domain::Version.for("Foo", "1"))
               end
             end
           end

data/spec/lib/pact_broker/pacts/repository_find_for_verification_spec.rb

@@ -3,8 +3,6 @@ require 'pact_broker/pacts/repository'
 module PactBroker
   module Pacts
     describe Repository do
-      let(:td) { TestDataBuilder.new }
-
       describe "#find_for_verification" do
         def find_by_consumer_version_number(consumer_version_number)
           subject.find{ |pact| pact.consumer_version_number == consumer_version_number }
@@ -55,8 +53,8 @@ module PactBroker
 
           it "returns the latest pact for each consumer" do
             expect(subject.size).to eq 2
-            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "2").selectors).to eq [Selector.overall_latest]
-            expect(find_by_consumer_name_and_consumer_version_number("Foo2", "3").selectors).to eq [Selector.overall_latest]
+            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "2").selectors).to eq [Selector.overall_latest.resolve(PactBroker::Domain::Version.find(number: "2"))]
+            expect(find_by_consumer_name_and_consumer_version_number("Foo2", "3").selectors).to eq [Selector.overall_latest.resolve(PactBroker::Domain::Version.find(number: "3"))]
           end
         end
 
@@ -76,7 +74,7 @@ module PactBroker
 
           it "returns the latest pact for each consumer" do
             expect(subject.size).to eq 1
-            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "2").selectors).to eq [pact_selector_1]
+            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "2").selectors).to eq [pact_selector_1.resolve(PactBroker::Domain::Version.find(number: "2"))]
           end
         end
 
@@ -98,7 +96,8 @@ module PactBroker
 
           it "returns the latest pact for each consumer" do
             expect(subject.size).to eq 1
-            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "1").selectors).to eq [pact_selector_1]
+            expected_consumer_version = PactBroker::Domain::Version.where_pacticipant_name("Foo1").where(number: "1").single_record
+            expect(find_by_consumer_name_and_consumer_version_number("Foo1", "1").selectors).to eq [pact_selector_1.resolve(expected_consumer_version)]
           end
         end
 
@@ -122,11 +121,17 @@ module PactBroker
           let(:consumer_version_selectors) do
             Selectors.new(pact_selector_1, pact_selector_2)
           end
+          let(:expected_sorted_selectors) do
+            [
+              ResolvedSelector.new({ tag: 'dev', latest: true }, PactBroker::Domain::Version.for("Baz", "baz-latest-dev-version")),
+              ResolvedSelector.new({ tag: 'prod', latest: true }, PactBroker::Domain::Version.for("Baz", "baz-latest-dev-version"))
+            ]
+          end
 
           it "returns the latest pact with the specified tags for each consumer" do
-            expect(find_by_consumer_version_number("foo-latest-prod-version").selectors).to eq [Selector.latest_for_tag('prod')]
-            expect(find_by_consumer_version_number("foo-latest-dev-version").selectors).to eq [Selector.latest_for_tag('dev')]
-            expect(find_by_consumer_version_number("baz-latest-dev-version").selectors.sort_by{ |s| s[:tag] }).to eq [{ tag: 'dev', latest: true }, { tag: 'prod', latest: true }]
+            expect(find_by_consumer_version_number("foo-latest-prod-version").selectors).to eq [Selector.latest_for_tag('prod').resolve(PactBroker::Domain::Version.for("Foo", "foo-latest-prod-version"))]
+            expect(find_by_consumer_version_number("foo-latest-dev-version").selectors).to eq [Selector.latest_for_tag('dev').resolve(PactBroker::Domain::Version.for("Foo", "foo-latest-dev-version"))]
+            expect(find_by_consumer_version_number("baz-latest-dev-version").selectors.sort_by{ |s| s[:tag] }).to eq expected_sorted_selectors
             expect(subject.size).to eq 3
           end
 
@@ -134,14 +139,29 @@ module PactBroker
             expect(find_by_consumer_version_number("foo-latest-prod-version").selectors.collect(&:tag)).to eq ['prod']
           end
 
-          context "when a consumer name is specified", pending: "not yet implemented, but will do" do
+          context "when a consumer name is specified" do
+            before do
+              td.create_pact_with_hierarchy("Foo", "2", "Bar")
+                .create_consumer_version_tag("prod")
+                .create_pact_with_hierarchy("Foo", "3", "Bar")
+                .create_consumer_version_tag("prod")
+                .create_consumer_version("4")
+                .create_consumer_version_tag("prod")
+                .republish_same_pact
+            end
+
             let(:consumer_version_selectors) do
               Selectors.new(Selector.all_for_tag_and_consumer('prod', 'Foo'))
             end
 
-            it "only returns the pacts for that consumer" do
+            it "returns all the pacts with that tag for that consumer" do
               expect(subject.size).to eq 3
-              expect(find_by_consumer_version_number("foo-latest-prod-version").selectors).to eq [Selector.all_for_tag_and_consumer('prod', 'Foo')]
+              expect(find_by_consumer_version_number("foo-latest-prod-version").selectors).to eq [Selector.all_for_tag_and_consumer('prod', 'Foo').resolve(PactBroker::Domain::Version.for("Foo", "foo-latest-prod-version"))]
+            end
+
+            it "uses the latest consumer verison number as the resolved version when the same pact content is selected multiple times" do
+              expect(find_by_consumer_version_number("3")).to be nil
+              expect(find_by_consumer_version_number("4").selectors).to eq [Selector.all_for_tag_and_consumer('prod', 'Foo').resolve(PactBroker::Domain::Version.for("Foo", "4"))]
             end
           end
         end
@@ -246,7 +266,7 @@ module PactBroker
           end
 
           it "does not set the tag name" do
-            expect(find_by_consumer_version_number("foo-latest-dev-version").selectors).to eq [{ latest: true }]
+            expect(find_by_consumer_version_number("foo-latest-dev-version").selectors).to eq [ResolvedSelector.new({ latest: true }, PactBroker::Domain::Version.find(number: "foo-latest-dev-version"))]
             expect(find_by_consumer_version_number("foo-latest-dev-version").overall_latest?).to be true
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.73.0
+  version: 2.74.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -354,6 +354,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.0.rc4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.0.rc4
 description: A server that stores and returns pact files generated by the pact gem.
   It enables head/prod cross testing of the consumer and provider projects.
 email:
@@ -1294,6 +1314,7 @@ files:
 - spec/lib/pact_broker/pacts/generate_sha_spec.rb
 - spec/lib/pact_broker/pacts/latest_tagged_pact_publications_spec.rb
 - spec/lib/pact_broker/pacts/merger_spec.rb
+- spec/lib/pact_broker/pacts/metadata_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_spec.rb
 - spec/lib/pact_broker/pacts/pact_version_spec.rb
@@ -1463,7 +1484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.1
+rubygems_version: 3.2.4
 signing_key: 
 specification_version: 4
 summary: See description
@@ -1693,6 +1714,7 @@ test_files:
 - spec/lib/pact_broker/pacts/generate_sha_spec.rb
 - spec/lib/pact_broker/pacts/latest_tagged_pact_publications_spec.rb
 - spec/lib/pact_broker/pacts/merger_spec.rb
+- spec/lib/pact_broker/pacts/metadata_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_spec.rb
 - spec/lib/pact_broker/pacts/pact_version_spec.rb