pact_broker 2.69.0 → 2.70.0

data/lib/pact_broker/domain/verification.rb

@@ -29,6 +29,12 @@ module PactBroker
         # Beware that when columns with the same name exist in both datasets
         # you may get the wrong column back in your model.
 
+        def delete
+          require 'pact_broker/webhooks/triggered_webhook'
+          PactBroker::Webhooks::TriggeredWebhook.where(verification: self).delete
+          super
+        end
+
         def consumer consumer_name
           where(name_like(:consumer_name, consumer_name))
         end

data/lib/pact_broker/domain/version.rb

@@ -5,6 +5,21 @@ require 'pact_broker/tags/tag_with_latest_flag'
 
 module PactBroker
   module Domain
+
+    # Same attributes as PactBroker::Tags::TagWithLatestFlag
+    class EagerTagWithLatestFlag < SimpleDelegator
+      attr_reader :latest
+
+      def initialize(tag, latest)
+        super(tag)
+        @latest = latest
+      end
+
+      def latest?
+        latest
+      end
+    end
+
     class Version < Sequel::Model
       plugin :timestamps, update_on_create: true
       plugin :insert_ignore, identifying_columns: [:pacticipant_id, :number]
@@ -13,7 +28,21 @@ module PactBroker
       one_to_many :pact_publications, order: :revision_number, class: "PactBroker::Pacts::PactPublication", key: :consumer_version_id
       associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
       one_to_many :tags, :reciprocal => :version, order: :created_at
-      one_to_many :tags_with_latest_flag, class: "PactBroker::Tags::TagWithLatestFlag", key: :version_id, primary_key: :id
+
+      one_to_many :tags_with_latest_flag, :class => "PactBroker::Tags::TagWithLatestFlag", primary_keys: [:id], key: [:version_id], :eager_loader=>(proc do |eo_opts|
+        tags_for_versions = PactBroker::Domain::Tag.where(version_id: eo_opts[:key_hash][:id].keys)
+        latest_tag_for_pacticipants = PactBroker::Domain::Tag.latest_tags_for_pacticipant_ids(eo_opts[:rows].collect(&:pacticipant_id)).all
+
+        eo_opts[:rows].each{|row| row.associations[:tags_with_latest_flag] = [] }
+
+        tags_for_versions.each do | tag |
+          latest = latest_tag_for_pacticipants.any? { |latest_tag| latest_tag.name == tag.name && latest_tag.version_id == tag.version_id }
+          eo_opts[:id_map][tag.version_id].each do | version |
+            version.associations[:tags_with_latest_flag] << EagerTagWithLatestFlag.new(tag, latest)
+          end
+        end
+      end)
+
 
       dataset_module do
         include PactBroker::Repositories::Helpers
@@ -50,6 +79,11 @@ module PactBroker
         end
 
         def delete
+          require 'pact_broker/pacts/pact_publication'
+          require 'pact_broker/domain/verification'
+          require 'pact_broker/domain/tag'
+
+          PactBroker::Domain::Verification.where(provider_version: self).delete
           PactBroker::Pacts::PactPublication.where(consumer_version: self).delete
           PactBroker::Domain::Tag.where(version: self).delete
           super

data/lib/pact_broker/logging.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'semantic_logger'
 
 module PactBroker
@@ -50,3 +51,9 @@ module PactBroker
 
   include Logging
 end
+
+# Hide the annoying warnings from Declarative gem. Need to upgrade Representable.
+def Warning.warn(w)
+  # super calls the original behavior, which is printing to $stderr
+  super unless (w.start_with?("[Declarative] Defaults#merge!") || w.include?("URI.unescape is obsolete"))
+end

data/lib/pact_broker/matrix/unresolved_selector.rb

@@ -1,10 +1,18 @@
+require 'pact_broker/hash_refinements'
+
 module PactBroker
   module Matrix
     class UnresolvedSelector < Hash
+      using PactBroker::HashRefinements
+
       def initialize(params = {})
         merge!(params)
       end
 
+      def self.from_hash(hash)
+        new(hash.symbolize_keys.snakecase_keys.slice(:pacticipant_name, :pacticipant_version_number, :latest, :tag, :max_age))
+      end
+
       def pacticipant_name
         self[:pacticipant_name]
       end

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -112,9 +112,7 @@ module PactBroker
       end
 
       def head_tag_names
-        # Avoid circular dependency
-        require 'pact_broker/pacts/latest_tagged_pact_publications'
-        @head_tag_names ||= LatestTaggedPactPublications.where(id: id).select(:tag_name).collect{|t| t[:tag_name]}
+        @head_tag_names ||= PactBroker::Domain::Tag.head_tags_for_pact_publication(self).collect(&:name)
       end
 
       def to_domain_with_content

data/lib/pact_broker/pacts/pact_publication.rb

@@ -101,6 +101,12 @@ module PactBroker
             self
           end
         end
+
+        def delete
+          require 'pact_broker/webhooks/triggered_webhook'
+          PactBroker::Webhooks::TriggeredWebhook.where(pact_publication: self).delete
+          super
+        end
       end
 
       def before_create
@@ -111,7 +117,7 @@ module PactBroker
       # The names of the tags for which this pact is the latest pact with that tag
       # (ie. it is not necessarily the pact for the latest consumer version with the given tag)
       def head_tag_names
-        LatestTaggedPactPublications.where(id: id).select(:tag_name).collect{|t| t[:tag_name]}
+        @head_tag_names ||= PactBroker::Domain::Tag.head_tags_for_pact_publication(self).collect(&:name)
       end
 
       def consumer_version_tags

data/lib/pact_broker/pacts/repository.rb

@@ -17,6 +17,7 @@ require 'pact_broker/repositories/helpers'
 require 'pact_broker/pacts/selected_pact'
 require 'pact_broker/pacts/selector'
 require 'pact_broker/pacts/selectors'
+require 'pact_broker/feature_toggle'
 
 module PactBroker
   module Pacts
@@ -214,14 +215,15 @@ module PactBroker
           .where(name: provider_tags_names)
           .all
 
-        wip_pacts.collect do | pact|
+        provider_version_count = scope_for(PactBroker::Domain::Version).where(pacticipant: provider).count
 
+        wip_pacts.collect do | pact|
           pending_tag_names = find_provider_tags_for_which_pact_publication_id_is_pending(pact, successfully_verified_head_pact_publication_ids_for_each_provider_tag)
           pre_existing_tag_names = find_provider_tag_names_that_were_first_used_before_pact_published(pact, provider_tag_collection)
 
           pre_existing_pending_tags = pending_tag_names & pre_existing_tag_names
 
-          if pre_existing_pending_tags.any?
+          if pre_existing_pending_tags.any? || (PactBroker.feature_enabled?(:experimental_no_provider_versions_makes_all_head_pacts_wip) && provider_version_count == 0)
             selectors = Selectors.create_for_latest_of_each_tag(pact.head_tag_names)
             VerifiablePact.new(pact.to_domain, selectors, true, pre_existing_pending_tags, [], true)
           end

data/lib/pact_broker/tasks/clean_task.rb

@@ -3,12 +3,23 @@ module PactBroker
     class CleanTask < ::Rake::TaskLib
 
       attr_accessor :database_connection
-      attr_accessor :keep
+      attr_reader :keep_version_selectors
+      attr_accessor :version_deletion_limit
 
       def initialize &block
+        require 'pact_broker/db/clean_incremental'
+        @version_deletion_limit = 1000
+        @keep_version_selectors = PactBroker::DB::CleanIncremental::DEFAULT_KEEP_SELECTORS
         rake_task &block
       end
 
+      def keep_version_selectors=(keep_version_selectors)
+        require 'pact_broker/matrix/unresolved_selector'
+        @keep_version_selectors = [*keep_version_selectors].collect do | hash |
+          PactBroker::Matrix::UnresolvedSelector.from_hash(hash)
+        end
+      end
+
       def rake_task &block
         namespace :pact_broker do
           namespace :db do
@@ -17,23 +28,28 @@ module PactBroker
 
               instance_eval(&block)
 
-              require 'pact_broker/db/clean'
-              require 'pact_broker/matrix/unresolved_selector'
+              require 'pact_broker/db/clean_incremental'
+              require 'pact_broker/error'
               require 'yaml'
+              require 'benchmark'
 
-              keep_selectors = nil
-              if keep
-                keep_selectors = [*keep].collect do | hash |
-                  PactBroker::Matrix::UnresolvedSelector.new(hash)
-                end
+              raise PactBroker::Error.new("You must specify the version_deletion_limit") unless version_deletion_limit
+
+              if keep_version_selectors.nil? || keep_version_selectors.empty?
+                raise PactBroker::Error.new("You must specify which versions to keep")
+              else
+                puts "Deleting oldest #{version_deletion_limit} versions, keeping versions that match the following selectors: #{keep_version_selectors}..."
               end
-              # TODO time it
-              results = PactBroker::DB::Clean.call(database_connection, keep: keep_selectors)
-              puts results.to_yaml
+
+              start_time = Time.now
+              results = PactBroker::DB::CleanIncremental.call(database_connection, keep: keep_version_selectors, limit: version_deletion_limit)
+              end_time = Time.now
+              elapsed_seconds = (end_time - start_time).to_i
+              puts results.to_yaml.gsub("---", "\nResults (#{elapsed_seconds} seconds)\n-------")
             end
           end
         end
       end
     end
   end
-end
+end

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -14,8 +14,10 @@ module PactBroker
         @client = Faraday.new(url: pact_broker_base_url) do |faraday|
           faraday.request :json
           faraday.response :json, :content_type => /\bjson$/
-          faraday.response :logger, ::Logger.new($stdout), headers: false do | logger |
-            logger.filter(/(Authorization: ).*/,'\1[REMOVED]')
+          if ENV['DEBUG'] == 'true'
+            faraday.response :logger, ::Logger.new($stdout), headers: false do | logger |
+              logger.filter(/(Authorization: ).*/,'\1[REMOVED]')
+            end
           end
           # faraday.headers['Authorization'] = "Bearer #{pactflow_api_token}"
           faraday.adapter  Faraday.default_adapter
@@ -27,6 +29,10 @@ module PactBroker
         self
       end
 
+      def separate
+        puts "\n=============================================================\n\n"
+      end
+
       def create_tagged_pacticipant_version(pacticipant:, version:, tag:)
         [*tag].each do | tag |
           create_tag(pacticipant: pacticipant, version: version, tag: tag)
@@ -40,6 +46,13 @@ module PactBroker
         self
       end
 
+      def deploy_to_prod(pacticipant:, version:)
+        puts "Deploying #{pacticipant} version #{version} to prod"
+        create_tag(pacticipant: pacticipant, version: version, tag: "prod")
+        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
@@ -49,11 +62,11 @@ module PactBroker
           create_tag(pacticipant: consumer, version: consumer_version, tag: tag)
         end
 
-
         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)
+        separate
         self
       end
 
@@ -65,13 +78,19 @@ module PactBroker
           includePendingStatus: enable_pending,
           includeWipPactsSince: include_wip_pacts_since
         }
+        puts body.to_yaml
+        puts ""
         @pacts_for_verification_response = client.post("/pacts/provider/#{encode(provider)}/for-verification", body)
+
+        print_pacts_for_verification
+        separate
         self
       end
 
       def print_pacts_for_verification
-        puts "Pacts for verification:"
-        @pacts_for_verification_response.body["_embedded"]["pacts"].each do | pact |
+        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"],
@@ -81,13 +100,41 @@ module PactBroker
         self
       end
 
+      def verify_pact(index: 0, success:, provider: last_provider_name, provider_version_tag: , provider_version: )
+        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)
+        verification_results_url = pact_response.body["_links"]["pb:publish-verification-results"]["href"]
+
+        results = {
+          success: success,
+          testResults: [],
+          providerApplicationVersion: provider_version
+        }
+        puts "\nPublishing verification"
+        response = client.post(verification_results_url, results.to_json)
+        separate
+        self
+      end
+
       def print_pacts_for_verification_response
         puts @pacts_for_verification_response.body
         self
       end
 
+      def can_i_deploy(pacticipant:, version:, to:)
+        can_i_deploy_response = client.get("/can-i-deploy", { pacticipant: pacticipant, version: version, to: to} )
+        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
+        separate
+        self
+      end
+
       def delete_integration(consumer:, provider:)
         client.delete("/integrations/provider/#{encode(provider)}/consumer/#{encode(consumer)}")
+        separate
         self
       end
 

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.69.0'
+  VERSION = '2.70.0'
 end

data/lib/pact_broker/webhooks/triggered_webhook.rb

@@ -21,6 +21,12 @@ module PactBroker
       dataset_module do
         include PactBroker::Repositories::Helpers
 
+        def delete
+          require 'pact_broker/webhooks/execution'
+          PactBroker::Webhooks::Execution.where(triggered_webhook: self).delete
+          super
+        end
+
         def retrying
           where(status: STATUS_RETRYING)
         end

data/pact_broker.gemspec

@@ -53,7 +53,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'semver2', '~> 3.4.2'
   gem.add_runtime_dependency 'rack', '>= 2.2.3', '~> 2.2'
   gem.add_runtime_dependency 'redcarpet', '>=3.3.2', '~>3.3'
-  gem.add_runtime_dependency 'pact-support', '1.15.0'
+  gem.add_runtime_dependency 'pact-support' , '~> 1.16', '>= 1.16.4'
   gem.add_runtime_dependency 'padrino-core', '>= 0.14.3', '~> 0.14'
   gem.add_runtime_dependency 'sinatra', '>= 2.0.8.1', '< 3.0'
   gem.add_runtime_dependency 'haml', '~>5.0'

data/script/docker/db-start.sh

@@ -4,4 +4,4 @@ docker run --name pact-broker-postgres \
   -e POSTGRES_PASSWORD=postgres \
   -p 5432:5432 \
   -v $PWD:/data \
-  -d postgres:10
+  -d postgres:12

data/script/reproduce-issue.rb

@@ -2,19 +2,42 @@
 
 $LOAD_PATH << "#{Dir.pwd}/lib"
 
-require 'pact_broker/test/http_test_data_builder'
+begin
+
+  require 'pact_broker/test/http_test_data_builder'
+  base_url = ENV['PACT_BROKER_BASE_URL'] || 'http://localhost:9292'
+
+  td = PactBroker::Test::HttpTestDataBuilder.new(base_url, { })
+  td.delete_integration(consumer: "MyConsumer", provider: "MyProvider")
+    .can_i_deploy(pacticipant: "MyProvider", version: "1", to: "prod")
+    .can_i_deploy(pacticipant: "MyConsumer", version: "1", to: "prod")
+    .publish_pact(consumer: "MyConsumer", consumer_version: "1", provider: "MyProvider", content_id: "111", tag: "feature/a")
+    .can_i_deploy(pacticipant: "MyProvider", version: "1", to: "prod")
+    .get_pacts_for_verification(
+      enable_pending: true,
+      provider_version_tag: "main",
+      include_wip_pacts_since: "2020-01-01",
+      consumer_version_selectors: [{ tag: "main", latest: true }])
+    .verify_pact(
+      index: 0,
+      provider_version_tag: "main",
+      provider_version: "1",
+      success: false
+    )
+    .get_pacts_for_verification(
+      enable_pending: true,
+      provider_version_tag: "main",
+      include_wip_pacts_since: "2020-01-01",
+      consumer_version_selectors: [{ tag: "main", latest: true }])
+    .can_i_deploy(pacticipant: "MyProvider", version: "1", to: "prod")
+    .can_i_deploy(pacticipant: "MyConsumer", version: "1", to: "prod")
+    .deploy_to_prod(pacticipant: "MyProvider", version: "1")
+    .can_i_deploy(pacticipant: "MyConsumer", version: "1", to: "prod")
+    .deploy_to_prod(pacticipant: "MyConsumer", version: "1")
+
+rescue StandardError => e
+  puts "#{e.class} #{e.message}"
+  puts e.backtrace
+  exit 1
+end
 
-td = PactBroker::Test::HttpTestDataBuilder.new('http://pact-broker:9292', { })
-td.delete_integration(consumer: "Foo", provider: "Bar")
-  .create_tagged_pacticipant_version(pacticipant: "Bar", version: "1", tag: "master")
-  .sleep
-  .publish_pact(consumer: "Foo", consumer_version: "1", provider: "Bar", content_id: "111", tag: "master")
-  .sleep
-  .publish_pact(consumer_version: "2", content_id: "222", tag: "feat-x")
-  .sleep
-  .get_pacts_for_verification(
-    enable_pending: true,
-    provider_version_tag: "master",
-    include_wip_pacts_since: "2020-01-01",
-    consumer_version_selectors: [{ tag: "master", latest: true }])
-  .print_pacts_for_verification

data/spec/fixtures/approvals/modifiable_resources.approved.json

@@ -3,6 +3,9 @@
     {
       "resource_class_name": "PactBroker::Api::Resources::AllWebhooks"
     },
+    {
+      "resource_class_name": "PactBroker::Api::Resources::Clean"
+    },
     {
       "resource_class_name": "PactBroker::Api::Resources::ErrorTest"
     },