pact_broker 2.86.0 → 2.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 349e4547b3d6dbd536df4c39648a8ab89975580509e895d98283535b4406cf06
-  data.tar.gz: '096c7874fd1497771def8096b581bd68e675a0339ed43dfbc340e21f455a73f6'
+  metadata.gz: f376a0bea2db36abf0b4b601badefb182b836bad4c43be53063388ad65ecc1c0
+  data.tar.gz: 5ab7478d03702755dea935bde89173461b6221c4723c719267a9a6e8360d6e9c
 SHA512:
-  metadata.gz: f1e9248d5f73dc92fc48ddc0ba33f735533dda17276398bbddf38b9437808fc7dc4ecb8fa16ed55532b88b72101883490778447eafd6996c4af8e1e2b1684ec0
-  data.tar.gz: 750b601c780b37d3df11570e468348e58accaed804d9a34904200c24895be014c4a898d07d714aeb8c0828620db230317b4e41f844c77448c80f065b348053e5
+  metadata.gz: 7bb19660447b2f13d2f815b6ce13b3aa27dac289ba023d4463de204fd6605c1f2d787f8e08d36c5868947ba4fa44fb277cf04a77a9e90ad1a9c5e0642d5ec269
+  data.tar.gz: 1a68a6c2393f42469045b4fffd1fa548b4833e66401733e75a43382103c8481f38c54d5ed4241e3f4232596b5a23dab6af6a518bad5398d8777b23137c8d9fc9

data/.github/workflows/release_gem.yml

@@ -35,7 +35,7 @@ jobs:
     needs: release
     strategy:
       matrix:
-        repository: [pact-foundation/pact-broker-docker, DiUS/pact_broker-docker, pact-foundation/gem-released]
+        repository: [pact-foundation/pact-broker-docker, DiUS/pact_broker-docker]
     runs-on: ubuntu-latest
     steps:
       - name: Notify ${{ matrix.repository }} of gem release

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+<a name="v2.87.0"></a>
+### v2.87.0 (2021-10-05)
+
+#### Features
+
+* **matrix**
+  * preselect the consumer version when clicking through to matrix page from integration dashboard	 ([b550b470](/../../commit/b550b470))
+
+* **dashboard**
+  * show tooltip explaining auto created branches	 ([cdaf7f6e](/../../commit/cdaf7f6e))
+
+* **can-i-deploy**
+  * support ignoring specific version numbers	 ([2ac5a946](/../../commit/2ac5a946))
+  * make verification results URL reference the appropriate consumer version as the pb:pact-version	 ([145bb37b](/../../commit/145bb37b))
+
+* add pb:can-i-deploy-pacticipant-version-to-environment relation	 ([67328194](/../../commit/67328194))
+
+* **webhooks**
+  * support ${pactbroker.providerVersionDescriptions} template parameter	 ([54a073eb](/../../commit/54a073eb))
+  * support ${pactbroker.buildUrl} template parameter	 ([9b79b33f](/../../commit/9b79b33f))
+  * support $pactbroker.consumerVersionBranch template parameter	 ([b97ba84c](/../../commit/b97ba84c))
+
+#### Bug Fixes
+
+* **mysql**
+  * increase size of event_context column	 ([c1596419](/../../commit/c1596419))
+
+* correctly merge dry validation and custom validation error messages when publishing contracts	 ([688b1e3f](/../../commit/688b1e3f))
+
+* **pacts for verification**
+  * correct logic for returning pact for main branch when no consumer version selectors are specified	 ([8847e442](/../../commit/8847e442))
+
+* **db clean**
+  * optimise calls to identify overwritten data to delete	 ([aaef9e6d](/../../commit/aaef9e6d))
+
 <a name="v2.86.0"></a>
 ### v2.86.0 (2021-09-17)
 

data/db/migrations/20210929_increase_event_context_column_size.rb

@@ -0,0 +1,14 @@
+require_relative "migration_helper"
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    if mysql?
+      run("ALTER TABLE triggered_webhooks CHANGE event_context event_context mediumtext")
+    end
+  end
+
+  down do
+
+  end
+end

data/docker-compose-test.yml

@@ -49,6 +49,7 @@ services:
       - ./.rubocop:/home/.rubocop
       - ./.gitignore:/home/.gitignore
       - ./public:/home/public
+      - ./docs:/home/docs
 
   mysql:
     image: mysql:5.7.28
@@ -97,4 +98,5 @@ services:
       - ./.rubocop:/home/.rubocop
       - ./.gitignore:/home/.gitignore
       - ./public:/home/public
+      - ./docs:/home/docs
 

data/lib/pact/doc/interaction_view_model.rb

@@ -57,7 +57,7 @@ module Pact
       def formatted_provider_states mark_bold: false
         bold_marker = mark_bold ? MARKDOWN_BOLD_CHARACTERS : ""
 
-        (@interaction.provider_states || []).map do |ps| 
+        (@interaction.provider_states || []).map do |ps|
           "#{bold_marker}" \
           "#{markdown_escape(apply_capitals(ps.name.strip, false))}" \
           "#{bold_marker}"
@@ -129,7 +129,7 @@ module Pact
 
       def markdown_escape string
         return nil unless string
-        string.gsub("*",'\*').gsub("_",'\_')
+        string.gsub("*","\\*").gsub("_","\\_")
       end
     end
   end

data/lib/pact/doc/markdown/consumer_contract_renderer.rb

@@ -60,7 +60,7 @@ module Pact
         end
 
         def markdown_escape string
-          string.gsub("*",'\*').gsub("_",'\_')
+          string.gsub("*","\\*").gsub("_","\\_")
         end
 
         def h(text)

data/lib/pact_broker/api/contracts/configuration.rb

@@ -0,0 +1,33 @@
+require "pact_broker/string_refinements"
+
+module PactBroker
+  module Api
+    module Contracts
+      class Configuration
+        using PactBroker::StringRefinements
+
+        def initialize(overrides = {})
+          @overrides = overrides
+        end
+
+        def class_for(name)
+          if overrides[name].is_a?(String)
+            Object.const_get(overrides[name])
+          elsif overrides[name].is_a?(Class)
+            overrides[name]
+          else
+            Object.const_get("PactBroker::Api::Contracts::#{name.to_s.camelcase(true)}")
+          end
+        end
+
+        def self.default_configuration
+          Configuration.new
+        end
+
+        private
+
+        attr_reader :overrides
+      end
+    end
+  end
+end

data/lib/pact_broker/api/contracts/publish_contracts_schema.rb

@@ -34,14 +34,14 @@ module PactBroker
         end
 
         def self.call(params)
-          select_first_message(
-            flatten_indexed_messages(
-              add_cross_field_validation_errors(
-                params&.symbolize_keys,
-                SCHEMA.call(params&.symbolize_keys).messages(full: true)
-              )
-            )
-          )
+          dry_results = SCHEMA.call(params&.symbolize_keys).messages(full: true)
+          dry_results.then do | results |
+            add_cross_field_validation_errors(params&.symbolize_keys, results)
+          end.then do | results |
+            select_first_message(results)
+          end.then do | results |
+            flatten_indexed_messages(results)
+          end
         end
 
         def self.add_cross_field_validation_errors(params, errors)
@@ -61,43 +61,62 @@ module PactBroker
 
         def self.validate_consumer_name(params, contract, i, errors)
           if params[:pacticipantName] && contract[:consumerName] && (contract[:consumerName] != params[:pacticipantName])
-            add_contract_error(validation_message("consumer_name_in_contract_mismatch_pacticipant_name", { consumer_name_in_contract: contract[:consumerName], pacticipant_name: params[:pacticipantName] } ), i, errors)
+            add_contract_error(:consumerName, validation_message("consumer_name_in_contract_mismatch_pacticipant_name", { consumer_name_in_contract: contract[:consumerName], pacticipant_name: params[:pacticipantName] } ), i, errors)
           end
         end
 
         def self.validate_consumer_name_in_content(params, contract, i, errors)
           consumer_name_in_content = contract.dig(:decodedParsedContent, :consumer, :name)
           if consumer_name_in_content && consumer_name_in_content != params[:pacticipantName]
-            add_contract_error(validation_message("consumer_name_in_content_mismatch_pacticipant_name", { consumer_name_in_content: consumer_name_in_content, pacticipant_name: params[:pacticipantName] } ), i, errors)
+            add_contract_error(:consumerName, validation_message("consumer_name_in_content_mismatch_pacticipant_name", { consumer_name_in_content: consumer_name_in_content, pacticipant_name: params[:pacticipantName] } ), i, errors)
           end
         end
 
         def self.validate_provider_name_in_content(contract, i, errors)
           provider_name_in_content = contract.dig(:decodedParsedContent, :provider, :name)
           if provider_name_in_content && provider_name_in_content != contract[:providerName]
-            add_contract_error(validation_message("provider_name_in_content_mismatch", { provider_name_in_content: provider_name_in_content, provider_name: contract[:providerName] } ), i, errors)
+            add_contract_error(:providerName, validation_message("provider_name_in_content_mismatch", { provider_name_in_content: provider_name_in_content, provider_name: contract[:providerName] } ), i, errors)
           end
         end
 
         def self.validate_encoding(contract, i, errors)
           if contract[:decodedContent].nil?
-            add_contract_error(message("errors.base64?", scope: nil), i, errors)
+            add_contract_error(:content, message("errors.base64?", scope: nil), i, errors)
           end
         end
 
         def self.validate_content_matches_content_type(contract, i, errors)
           if contract[:decodedParsedContent].nil? && contract[:contentType]
-            add_contract_error(validation_message("invalid_content_for_content_type", { content_type: contract[:contentType]}), i, errors)
+            add_contract_error(:content, validation_message("invalid_content_for_content_type", { content_type: contract[:contentType]}), i, errors)
           end
         end
 
 
-        def self.add_contract_error(message, i, errors)
+        def self.add_contract_error(field, message, i, errors)
           errors[:contracts] ||= {}
-          errors[:contracts][i] ||= []
-          errors[:contracts][i] << message
+          errors[:contracts][i] ||= {}
+          errors[:contracts][i][field] ||= []
+          errors[:contracts][i][field] << message
           errors
         end
+
+        # Need to fix this whole dry-validation eff up
+        def self.select_first_message(results)
+          case results
+          when Hash then results.each_with_object({}) { |(key, value), new_hash| new_hash[key] = select_first_message(value) }
+          when Array then select_first_message_from_array(results)
+          else
+            results
+          end
+        end
+
+        def self.select_first_message_from_array(results)
+          if results.all?{ |value| value.is_a?(String) }
+            results[0...1]
+          else
+            results.collect { |value| select_first_message(value) }
+          end
+        end
       end
     end
   end

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

@@ -162,9 +162,11 @@ module PactBroker
 
         def verification_hash(line, base_url)
           if !line.success.nil?
-            url_params = { consumer_name: line.consumer_name,
+            url_params = {
+              consumer_name: line.consumer_name,
               provider_name: line.provider_name,
               pact_version_sha: line.pact_version_sha,
+              consumer_version_number: line.consumer_version_number,
               verification_number: line.verification_number
             }
             {

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

@@ -21,18 +21,20 @@ module PactBroker
         end
 
         link :self do | options |
+          pact = options[:pact] || represented.latest_pact_publication
           {
             title: "Verification result",
-            name: "Verification result #{represented.number} for #{represented.latest_pact_publication.name}",
+            name: "Verification result #{represented.number} for #{pact.name}",
             href: verification_url(represented, options.fetch(:base_url), )
           }
         end
 
         link "pb:pact-version" do | options |
+          pact = options[:pact] || represented.latest_pact_publication
           {
             title: "Pact",
-            name: represented.latest_pact_publication.name,
-            href: pact_url(options.fetch(:base_url), represented.latest_pact_publication)
+            name: pact.name,
+            href: pact_version_with_consumer_version_metadata_url(pact, options.fetch(:base_url))
           }
         end
 

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -64,6 +64,10 @@ module PactBroker
         "#{pactigration_base_url(base_url, pact)}/pact-version/#{pact.pact_version_sha}"
       end
 
+      def pact_version_with_consumer_version_metadata_url pact, base_url = ""
+        "#{pactigration_base_url(base_url, pact)}/pact-version/#{pact.pact_version_sha}/metadata/#{encode_metadata(build_metadata_for_consumer_version_number(pact.consumer_version_number))}"
+      end
+
       def pact_version_url_with_metadata pact, metadata, base_url = ""
         if metadata && metadata.any?
           "#{pact_version_url(pact, base_url)}/metadata/#{encode_metadata(metadata)}"
@@ -166,12 +170,28 @@ module PactBroker
       end
 
       def verification_url_from_params params, base_url = ""
-        [ base_url, "pacts",
-          "provider", url_encode(params.fetch(:provider_name)),
-          "consumer", url_encode(params.fetch(:consumer_name)),
-          "pact-version", params.fetch(:pact_version_sha),
-          "verification-results", params.fetch(:verification_number)
-        ].join("/")
+        if params[:consumer_version_number]
+          metadata = encode_metadata(build_metadata_for_consumer_version_number(params[:consumer_version_number]))
+
+          [
+            base_url,
+            "pacts",
+            "provider", url_encode(params.fetch(:provider_name)),
+            "consumer", url_encode(params.fetch(:consumer_name)),
+            "pact-version", params.fetch(:pact_version_sha),
+            "metadata", metadata,
+            "verification-results", params.fetch(:verification_number)
+          ].join("/")
+        else
+          [
+            base_url,
+            "pacts",
+            "provider", url_encode(params.fetch(:provider_name)),
+            "consumer", url_encode(params.fetch(:consumer_name)),
+            "pact-version", params.fetch(:pact_version_sha),
+            "verification-results", params.fetch(:verification_number)
+          ].join("/")
+        end
       end
 
       def latest_verifications_for_consumer_version_url version, base_url

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

@@ -254,6 +254,10 @@ module PactBroker
           application_context.decorator_configuration.class_for(name)
         end
 
+        def api_contract_class(name)
+          application_context.api_contract_configuration.class_for(name)
+        end
+
         def schema
           nil
         end

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

@@ -68,7 +68,7 @@ module PactBroker
         end
 
         def schema
-          PactBroker::Api::Contracts::EnvironmentSchema
+          api_contract_class(:environment_schema)
         end
       end
     end

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

@@ -71,7 +71,7 @@ module PactBroker
         end
 
         def schema
-          PactBroker::Api::Contracts::EnvironmentSchema
+          api_contract_class(:environment_schema)
         end
       end
     end

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

@@ -136,7 +136,13 @@ module PactBroker
             "pb:can-i-deploy-pacticipant-version-to-tag" =>
             {
               href: base_url + "/can-i-deploy?pacticipant={pacticipant}&version={version}&to={tag}",
-              title: "Determine if an application can be safely deployed to an environment identified by the given tag",
+              title: "Determine if an application version can be safely deployed to an environment identified by the given tag",
+              templated: true
+            },
+            "pb:can-i-deploy-pacticipant-version-to-environment" =>
+            {
+              href: base_url + "/can-i-deploy?pacticipant={pacticipant}&version={version}&environment={environment}",
+              title: "Determine if an application version can be safely deployed to an environment",
               templated: true
             },
             "pb:provider-pacts-for-verification" => {

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

@@ -31,7 +31,7 @@ module PactBroker
         end
 
         def process_post
-          handle_webhook_events do
+          handle_webhook_events(consumer_version_branch: parsed_contracts.branch, build_url: parsed_contracts.build_url) do
             results = contract_service.publish(parsed_contracts, base_url: base_url)
             response.body = decorator_class(:publish_contracts_results_decorator).new(results).to_json(decorator_options)
           end

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

@@ -4,11 +4,14 @@ require "pact_broker/domain/verification"
 require "pact_broker/api/contracts/verification_contract"
 require "pact_broker/api/decorators/verification_decorator"
 require "pact_broker/api/decorators/extended_verification_decorator"
+require "pact_broker/api/resources/metadata_resource_methods"
 
 module PactBroker
   module Api
     module Resources
       class Verification < BaseResource
+        include MetadataResourceMethods
+
         def content_types_provided
           [
             ["application/hal+json", :to_json],
@@ -35,11 +38,11 @@ module PactBroker
         end
 
         def to_json
-          decorator_for(verification).to_json(decorator_options)
+          decorator_for(verification).to_json(decorator_options(pact: pact))
         end
 
         def to_extended_json
-          extended_decorator_for(verification).to_json(decorator_options)
+          extended_decorator_for(verification).to_json(decorator_options(pact: pact))
         end
 
         def delete_resource

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

@@ -5,29 +5,15 @@ module PactBroker
   module Api
     module Resources
       module WebhookExecutionMethods
-        def webhook_execution_configuration
-          application_context.webhook_execution_configuration_creator.call(self)
-        end
-
-        def webhook_options
-          {
-            database_connector: database_connector,
-            webhook_execution_configuration: webhook_execution_configuration
-          }
-        end
-
-        def webhook_event_listener
-          @webhook_event_listener ||= PactBroker::Webhooks::EventListener.new(webhook_options)
-        end
-
-        def handle_webhook_events
+        def handle_webhook_events(event_context = {})
+          @webhook_event_listener = PactBroker::Webhooks::EventListener.new(webhook_options(event_context))
           PactBroker::Events.subscribe(webhook_event_listener) do
             yield
           end
         end
 
         def schedule_triggered_webhooks
-          webhook_event_listener.schedule_triggered_webhooks
+          webhook_event_listener&.schedule_triggered_webhooks
         end
 
         def finish_request
@@ -36,6 +22,26 @@ module PactBroker
           end
           super
         end
+
+
+        def webhook_options(event_context = {})
+          {
+            database_connector: database_connector,
+            webhook_execution_configuration: webhook_execution_configuration.with_webhook_context(event_context)
+          }
+        end
+        private :webhook_options
+
+        def webhook_execution_configuration
+          application_context.webhook_execution_configuration_creator.call(self)
+        end
+        private :webhook_execution_configuration
+
+        def webhook_event_listener
+          @webhook_event_listener
+        end
+
+        private :webhook_event_listener
       end
     end
   end

data/lib/pact_broker/api.rb

@@ -49,6 +49,7 @@ module PactBroker
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "version", :consumer_version_number, "verification-results", "latest"], Api::Resources::LatestVerificationForPact, {resource_name: "latest_verification_results_for_pact_publication"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "pact-version", :pact_version_sha, "verification-results", "latest"], Api::Resources::LatestVerificationForPact, {resource_name: "latest_verification_results_for_pact_version"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "pact-version", :pact_version_sha, "verification-results", :verification_number], Api::Resources::Verification, {resource_name: "verification_result"}
+        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "pact-version", :pact_version_sha, "metadata", :metadata, "verification-results", :verification_number], Api::Resources::Verification, {resource_name: "verification_result"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "pact-version", :pact_version_sha, "verification-results", :verification_number, "triggered-webhooks"], Api::Resources::VerificationTriggeredWebhooks, {resource_name: "verification_result_triggered_webhooks"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "latest", "verification-results","latest"], Api::Resources::LatestVerificationForLatestPact, {resource_name: "latest_verification_results_for_latest_pact_publication"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "latest", :tag, "verification-results","latest"], Api::Resources::LatestVerificationForLatestPact, {resource_name: "latest_verification_results_for_latest_tagged_pact_publication"}

data/lib/pact_broker/application_context.rb

@@ -1,4 +1,5 @@
 require "pact_broker/api/decorators/configuration"
+require "pact_broker/api/contracts/configuration"
 require "pact_broker/api/decorators/decorator_context_creator"
 require "pact_broker/webhooks/execution_configuration_creator"
 require "pact_broker/errors/error_logger"
@@ -7,6 +8,7 @@ require "pact_broker/api/resources/error_response_body_generator"
 module PactBroker
   class ApplicationContext
     attr_reader :decorator_configuration,
+                :api_contract_configuration,
                 :decorator_context_creator,
                 :webhook_execution_configuration_creator,
                 :resource_authorizer,
@@ -18,6 +20,7 @@ module PactBroker
     def initialize(params = {})
       params_with_defaults = {
         decorator_configuration: PactBroker::Api::Decorators::Configuration.default_configuration,
+        api_contract_configuration: PactBroker::Api::Contracts::Configuration.default_configuration,
         decorator_context_creator: PactBroker::Api::Decorators::DecoratorContextCreator,
         webhook_execution_configuration_creator: PactBroker::Webhooks::ExecutionConfigurationCreator,
         error_logger: PactBroker::Errors::ErrorLogger,
@@ -25,6 +28,7 @@ module PactBroker
       }.merge(params)
 
       @decorator_configuration = params_with_defaults[:decorator_configuration]
+      @api_contract_configuration = params_with_defaults[:api_contract_configuration]
       @decorator_context_creator = params_with_defaults[:decorator_context_creator]
       @webhook_execution_configuration_creator = params_with_defaults[:webhook_execution_configuration_creator]
       @resource_authorizer = params_with_defaults[:resource_authorizer]
@@ -32,6 +36,7 @@ module PactBroker
       @after_resource = params_with_defaults[:after_resource]
       @error_logger = params_with_defaults[:error_logger]
       @error_response_body_generator = params_with_defaults[:error_response_body_generator]
+
     end
 
     def self.default_application_context(overrides = {})

data/lib/pact_broker/db/delete_overwritten_data.rb

@@ -51,13 +51,17 @@ module PactBroker
       end
 
       def delete_webhook_data
-        ids_to_keep = db[:latest_triggered_webhooks].select(:id)
-        resolved_ids_to_delete = db[:triggered_webhooks]
-          .where(id: ids_to_keep)
-          .invert
-          .where(Sequel.lit("created_at < ?", cut_off_date))
-          .limit(limit)
-          .collect{ |row| row[:id] }
+        ltw_join = {
+          Sequel[:triggered_webhooks][:id] => Sequel[:ltw][:id]
+        }
+        resolved_ids_to_delete =  db[:triggered_webhooks]
+                                    .select(Sequel[:triggered_webhooks][:id])
+                                    .left_join(:latest_triggered_webhooks, ltw_join, { table_alias: :ltw })
+                                    .where(Sequel[:ltw][:id] => nil)
+                                    .where(Sequel.lit("triggered_webhooks.created_at < ?", cut_off_date))
+                                    .order(Sequel[:triggered_webhooks][:id])
+                                    .limit(limit)
+                                    .collect{ |row| row[:id] }
 
         PactBroker::Webhooks::TriggeredWebhook.where(id: resolved_ids_to_delete).delete unless dry_run?
         { triggered_webhooks: resolved_ids_to_delete.count }
@@ -65,36 +69,50 @@ module PactBroker
 
       def delete_orphan_pact_versions
         referenced_pact_version_ids = db[:pact_publications].select(:pact_version_id).union(db[:verifications].select(:pact_version_id))
-        pact_version_ids_to_delete = db[:pact_versions].where(id: referenced_pact_version_ids).invert.order(:id).limit(limit).collect{ |row| row[:id] }
+        rpv_join = {
+          Sequel[:pact_versions][:id] => Sequel[:rpv][:pact_version_id]
+        }
+        pact_version_ids_to_delete = db[:pact_versions]
+                                      .select(Sequel[:pact_versions][:id])
+                                      .left_join(referenced_pact_version_ids, rpv_join, { table_alias: :rpv })
+                                      .where(Sequel[:rpv][:pact_version_id] => nil)
+                                      .order(Sequel[:pact_versions][:id])
+                                      .limit(limit)
+                                      .collect{ |row| row[:id] }
         db[:pact_versions].where(id: pact_version_ids_to_delete).delete unless dry_run?
         { pact_versions: pact_version_ids_to_delete.count }
       end
 
       def delete_overwritten_pact_publications
-        ids_to_keep = db[:latest_pact_publication_ids_for_consumer_versions].select(:pact_publication_id)
+        lp_join = {
+          Sequel[:pact_publications][:id] => Sequel[:lp][:pact_publication_id]
+        }
 
         resolved_ids_to_delete = db[:pact_publications]
-          .where(id: ids_to_keep)
-          .invert
-          .where(Sequel.lit("created_at < ?", cut_off_date))
-          .order(:id)
-          .limit(limit)
-          .collect{ |row| row[:id] }
+                                  .select(Sequel[:pact_publications][:id])
+                                  .left_join(:latest_pact_publication_ids_for_consumer_versions, lp_join, { table_alias: :lp })
+                                  .where(Sequel[:lp][:pact_publication_id] => nil)
+                                  .where(Sequel.lit("pact_publications.created_at < ?", cut_off_date))
+                                  .order(:id)
+                                  .limit(limit)
+                                  .collect{ |row| row[:id] }
 
         PactBroker::Pacts::PactPublication.where(id: resolved_ids_to_delete).delete unless dry_run?
-
         { pact_publications: resolved_ids_to_delete.count }
       end
 
       def delete_overwritten_verifications
-        ids_to_keep = db[:latest_verification_id_for_pact_version_and_provider_version].select(:verification_id)
+        lv_join = {
+          Sequel[:verifications][:id] => Sequel[:lv][:verification_id]
+        }
         resolved_ids_to_delete = db[:verifications]
-          .where(id: ids_to_keep)
-          .invert
-          .where(Sequel.lit("created_at < ?", cut_off_date))
-          .order(:id)
-          .limit(limit)
-          .collect{ |row| row[:id] }
+                                  .select(Sequel[:verifications][:id])
+                                  .left_join(:latest_verification_id_for_pact_version_and_provider_version, lv_join, { table_alias: :lv})
+                                  .where(Sequel[:lv][:verification_id] => nil)
+                                  .where(Sequel.lit("verifications.created_at < ?", cut_off_date))
+                                  .order(Sequel[:verifications][:id])
+                                  .limit(limit)
+                                  .collect{ |row| row[:id] }
 
         PactBroker::Domain::Verification.where(id: resolved_ids_to_delete).delete unless dry_run?
         { verification_results: resolved_ids_to_delete.count }

data/lib/pact_broker/deployments/deployed_version.rb

@@ -117,6 +117,7 @@ end
 #  undeployed_at    | timestamp without time zone |
 #  target           | text                        |
 #  target_for_index | text                        | NOT NULL DEFAULT ''::text
+#  auto_created     | boolean                     | DEFAULT false
 # Indexes:
 #  deployed_versions_pkey       | PRIMARY KEY btree (id)
 #  deployed_versions_uuid_index | UNIQUE btree (uuid)

data/lib/pact_broker/deployments/deployed_version_service.rb

@@ -65,6 +65,7 @@ module PactBroker
           .where(pacticipant_id: pacticipant.id)
           .eager(:version)
           .eager(:environment)
+          .order(:created_at, :id)
           .all
       end