pact_broker 2.50.1 → 2.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43863849121069eb11a73a0aeb9c0c8e3420f322c76cd65400fdf2120ccf6145
-  data.tar.gz: 57cb765c73ffc1f59564a34ed00149d11401a93ddee678ed967146b44051f709
+  metadata.gz: 565c8989eb13e279daeb24f881fd53d0c56d72676d6a9eecaecbb3c52f823fa9
+  data.tar.gz: 54f7d26ec49742622aeffc7d66b9ee7903718ae507671b1384283bdd6317f16c
 SHA512:
-  metadata.gz: 8c85b2ee4bd3e27a5b085b0a6d7811e26c50f8d1b63a2e670c63aa71bdba4bfc867395b2a70ebd4c8095a7a9951f378dc05c18adcca77ba718630bf06941215e
-  data.tar.gz: 90c1473fa852776ded41444ca635189a9d0cd6149022de4ea11dca38b33ddebe2c95d324af3ff106070d42c06989f6e9cb725b6225d2687ac9ccd47a5a1149e6
+  metadata.gz: 61ca9dfdbebf5faf32ab678e9e4ca9d4bad0604a2fdd0c69653820adb001647f74ec980620d7943b330f245a03b4e138df2ebd19ac49dadc0888a0e9dd1393fc
+  data.tar.gz: 47c0ca191417d87ac73ac99e61e1de1a11942f512f00c734c07bbd773e4d5ff373d13b2b640845dcd702d62876a6b661deeaa713220ce41c5a303a0d2c19e6da

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+<a name="v2.51.0"></a>
+### v2.51.0 (2020-03-11)
+
+
+#### Features
+
+* **clean**
+  * all the latest version for all tags to be kept	 ([9ff7bbec](/../../commit/9ff7bbec))
+  * allow a maximum age to be specified for the versions to keep	 ([bc457492](/../../commit/bc457492))
+  * support specifying which versions to keep using selectors	 ([a06899eb](/../../commit/a06899eb))
+
+
+#### Bug Fixes
+
+* set consumer and provider relationships when a webhook is created and consumer/provider are set in the body of the request rather than the URL	 ([5ccdd31c](/../../commit/5ccdd31c))
+* sort matrix rows by last action date	 ([f625c9ad](/../../commit/f625c9ad))
+* gracefully handle badge redirects when the pact is not found	 ([2da36574](/../../commit/2da36574))
+
+
 <a name="v2.50.1"></a>
 ### v2.50.1 (2020-02-27)
 

data/config/database.yml

@@ -21,6 +21,10 @@ test:
   mysql:
     <<: *default
     adapter: mysql2
+  docker_compose_mysql:
+    <<: *default
+    adapter: mysql2
+    host: mysql
   docker_mysql:
     <<: *default
     adapter: mysql2

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

@@ -72,7 +72,7 @@ module PactBroker
         end
 
         def resource_url
-          request.uri.to_s.gsub(/\?.*/, '')
+          request.uri.to_s.gsub(/\?.*/, '').chomp('/')
         end
 
         def decorator_context options = {}

data/lib/pact_broker/badges/service.rb

@@ -39,6 +39,7 @@ module PactBroker
       private
 
       def badge_title pact, label, initials
+        return 'pact not found' if pact.nil?
         title = case (label || '').downcase
           when 'consumer' then prepare_name(pact.consumer_name, initials)
           when 'provider' then prepare_name(pact.provider_name, initials)

data/lib/pact_broker/db/clean.rb

@@ -17,12 +17,25 @@ module PactBroker
         deleted_counts = {}
         kept_counts = {}
         date = options[:date]
+
+        version_ids_to_keep = nil
+
+        if options[:keep]
+          version_ids_to_keep = options[:keep].collect do | selector |
+            PactBroker::Domain::Version.select(:id).for_selector(selector)
+          end.reduce(&:union)
+        end
+
         pact_publication_ids_to_delete = if date
           db[:pact_publications].select(:id).where(Sequel.lit('created_at < ?', date))
+        elsif version_ids_to_keep
+          db[:pact_publications].select(:id).where(consumer_version_id: version_ids_to_keep).invert
         else
-          db[:pact_publications].select(:id).where(id: db[:head_matrix].select(:pact_publication_id)).invert
+          keep = db[:latest_tagged_pact_publications].select(:id).union(db[:latest_pact_publications].select(:id))
+          db[:pact_publications].select(:id).where(id: keep).invert
         end
 
+
         deleted_counts[:pact_publications] = pact_publication_ids_to_delete.count
         kept_counts[:pact_publications] = db[:pact_publications].where(id: pact_publication_ids_to_delete).invert.count
 

data/lib/pact_broker/domain/version.rb

@@ -6,6 +6,8 @@ require 'pact_broker/tags/tag_with_latest_flag'
 module PactBroker
   module Domain
     class Version < Sequel::Model
+      plugin :timestamps, update_on_create: true
+
       set_primary_key :id
       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)
@@ -15,10 +17,72 @@ module PactBroker
       dataset_module do
         include PactBroker::Repositories::Helpers
 
+        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
+        end
+
+        def where_tag(tag)
+          if tag == true
+            join(:tags, Sequel[:tags][:version_id] => Sequel[first_source_alias][:id])
+          else
+            join(:tags) do | tags |
+              Sequel.&(
+                { Sequel[first_source_alias][:id] => Sequel[tags][:version_id] },
+                name_like(Sequel[tags][:name], tag)
+              )
+            end
+          end
+        end
+
+        def where_number(number)
+          where(name_like(:number, number))
+        end
+
+        def where_age_less_than(days)
+          start_date = Date.today - days
+          where{ versions[:created_at] >= start_date }
+        end
+
         def delete
           PactBroker::Domain::Tag.where(version: self).delete
           super
         end
+
+        def for_selector(selector)
+          query = self
+          query = query.where_pacticipant_name(selector.pacticipant_name) if selector.pacticipant_name
+          query = query.where_tag(selector.tag) if selector.tag
+          query = query.where_number(selector.pacticipant_version_number) if selector.pacticipant_version_number
+          query = query.where_age_less_than(selector.max_age) if selector.max_age
+
+          if selector.latest
+            calculate_max_version_order_and_join_back_to_versions(query, selector)
+          else
+            query
+          end
+        end
+
+        # private
+
+        def calculate_max_version_order_and_join_back_to_versions(query, selector)
+          versions_join = {
+            Sequel[:versions][:pacticipant_id] => Sequel[:latest][:pacticipant_id],
+            Sequel[:versions][:order]          => Sequel[:latest][:latest_version_order]
+          }
+
+          group_by_cols = selector.tag == true ? [:pacticipant_id, Sequel[:tags][:name]] : [:pacticipant_id]
+
+          max_order_for_each_pacticipant = query
+              .select_group(*group_by_cols)
+              .select_append{ max(order).as(latest_version_order) }
+
+          join(max_order_for_each_pacticipant, versions_join, table_alias: :latest)
+        end
       end
 
       def after_create
@@ -43,8 +107,6 @@ module PactBroker
         pact_publications.last
       end
     end
-
-    Version.plugin :timestamps, :update_on_create=>true
   end
 end
 

data/lib/pact_broker/matrix/every_row.rb

@@ -16,7 +16,7 @@ module PactBroker
         Sequel[:v][:id].as(:verification_id)
       ]
 
-      ALL_COLUMNS = CONSUMER_COLUMNS + CONSUMER_VERSION_COLUMNS + PACT_COLUMNS +
+      ALL_COLUMNS = [LAST_ACTION_DATE] + CONSUMER_COLUMNS + CONSUMER_VERSION_COLUMNS + PACT_COLUMNS +
                     PROVIDER_COLUMNS + PROVIDER_VERSION_COLUMNS + VERIFICATION_COLUMNS
 
       SELECT_ALL_COLUMN_ARGS = [:select_all_columns] + ALL_COLUMNS

data/lib/pact_broker/matrix/parse_can_i_deploy_query.rb

@@ -1,21 +1,22 @@
 require 'rack/utils'
+require 'pact_broker/matrix/unresolved_selector'
 
 module PactBroker
   module Matrix
     class ParseCanIDeployQuery
       def self.call params
-        selector = {}
+        selector = PactBroker::Matrix::UnresolvedSelector.new
         options = {
           latestby: 'cvp',
           latest: true
         }
 
         if params[:pacticipant].is_a?(String)
-          selector[:pacticipant_name] = params[:pacticipant]
+          selector.pacticipant_name = params[:pacticipant]
         end
 
         if params[:version].is_a?(String)
-          selector[:pacticipant_version_number] = params[:version]
+          selector.pacticipant_version_number = params[:version]
         end
 
         if params[:to].is_a?(String)

data/lib/pact_broker/matrix/parse_query.rb

@@ -1,4 +1,5 @@
 require 'rack/utils'
+require 'pact_broker/matrix/unresolved_selector'
 
 module PactBroker
   module Matrix
@@ -6,7 +7,7 @@ module PactBroker
       def self.call query
         params = Rack::Utils.parse_nested_query(query)
         selectors = (params['q'] || []).collect do |i|
-          p = {}
+          p = PactBroker::Matrix::UnresolvedSelector.new
           p[:pacticipant_name] = i['pacticipant'] if i['pacticipant'] && i['pacticipant'] != ''
           p[:pacticipant_version_number] = i['version'] if i['version'] && i['version'] != ''
           p[:latest] = true if i['latest'] == 'true'

data/lib/pact_broker/matrix/quick_row.rb

@@ -59,10 +59,13 @@ module PactBroker
       VERIFICATION_COLUMNS = [
         Sequel[:v][:verification_id]
       ]
-      ALL_COLUMNS = CONSUMER_COLUMNS + CONSUMER_VERSION_COLUMNS + PACT_COLUMNS +
+      LAST_ACTION_DATE = Sequel.lit("CASE WHEN (pv.created_at IS NOT NULL AND pv.created_at > cv.created_at) THEN pv.created_at ELSE cv.created_at END").as(:last_action_date)
+
+      ALL_COLUMNS = [LAST_ACTION_DATE] + CONSUMER_COLUMNS + CONSUMER_VERSION_COLUMNS + PACT_COLUMNS +
                     PROVIDER_COLUMNS + PROVIDER_VERSION_COLUMNS + VERIFICATION_COLUMNS
 
 
+
       # cachable select arguments
       SELECT_ALL_COLUMN_ARGS = [:select_all_columns] + ALL_COLUMNS
       SELECT_PACTICIPANT_IDS_ARGS = [:select_pacticipant_ids, Sequel[:p][:consumer_id], Sequel[:p][:provider_id]]
@@ -127,6 +130,10 @@ module PactBroker
             Sequel.desc(:verification_id))
         end
 
+        def order_by_last_action_date
+          order(Sequel.desc(1), Sequel.desc(:consumer_version_order))
+        end
+
         def eager_all_the_things
           eager(:consumer)
           .eager(:provider)
@@ -376,6 +383,10 @@ module PactBroker
         return_or_raise_if_not_set(:provider_version_order)
       end
 
+      def last_action_date
+        return_or_raise_if_not_set(:last_action_date)
+      end
+
       def has_verification?
         !!verification_id
       end

data/lib/pact_broker/matrix/repository.rb

@@ -8,6 +8,7 @@ require 'pact_broker/matrix/query_results'
 require 'pact_broker/matrix/integration'
 require 'pact_broker/matrix/query_results_with_deployment_status_summary'
 require 'pact_broker/matrix/resolved_selector'
+require 'pact_broker/matrix/unresolved_selector'
 require 'pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version'
 require 'pact_broker/pacts/latest_pact_publications_by_consumer_version'
 
@@ -75,7 +76,7 @@ module PactBroker
       end
 
       def find_for_consumer_and_provider pacticipant_1_name, pacticipant_2_name
-        selectors = [{ pacticipant_name: pacticipant_1_name }, { pacticipant_name: pacticipant_2_name }]
+        selectors = [ UnresolvedSelector.new(pacticipant_name: pacticipant_1_name), UnresolvedSelector.new(pacticipant_name: pacticipant_2_name)]
         options = { latestby: 'cvpv' }
         find(selectors, options)
       end
@@ -118,7 +119,7 @@ module PactBroker
         # that don't have verifications, so we need to include them all.
         lines.group_by{|line| group_by_columns.collect{|key| line.send(key) }}
           .values
-          .collect{ | lines | lines.first.provider_version_number.nil? ? lines : lines.first }
+          .collect{ | lines | lines.first.provider_version_number.nil? ? lines : lines.sort_by(&:provider_version_order).last }
           .flatten
       end
 
@@ -126,7 +127,17 @@ module PactBroker
         query = base_model(options)
                   .select_all_columns
                   .matching_selectors(selectors)
-                  .order_by_names_ascending_most_recent_first
+
+        # These two could both probably use the order by last action date,
+        # but I just want to give the implications a little more thought before changing
+        # the can-i-deploy query order.
+        if selectors.all?(&:only_pacticipant_name_specified?)
+          # Can only be the UI, as can-i-deploy requires a version to be specified
+          query = query.order_by_last_action_date
+        else
+          query = query.order_by_names_ascending_most_recent_first
+        end
+
         query = query.limit(options[:limit]) if options[:limit]
         query.eager_all_the_things.all
       end
@@ -138,12 +149,26 @@ module PactBroker
       # Find the version number for selectors with the latest and/or tag specified
       def resolve_versions_and_add_ids(selectors, selector_type)
         selectors.collect do | selector |
-          pacticipant = PactBroker::Domain::Pacticipant.find(name: selector[:pacticipant_name])
+          pacticipant = PactBroker::Domain::Pacticipant.find(name: selector.pacticipant_name)
           versions = find_versions_for_selector(selector)
           build_resolved_selectors(pacticipant, versions, selector, selector_type)
         end.flatten
       end
 
+      def find_versions_for_selector(selector)
+        # For selectors that just set the pacticipant name, there's no need to resolve the version -
+        # only the pacticipant ID will be used in the query
+        return nil unless (selector.tag || selector.latest || selector.pacticipant_version_number)
+
+        versions = version_repository.find_versions_for_selector(selector)
+
+        if selector.latest
+          [versions.first]
+        else
+          versions.empty? ? [nil] : versions
+        end
+      end
+
       # When a single selector specifies multiple versions (eg. "all prod pacts"), this expands
       # the single selector into one selector for each version.
       def build_resolved_selectors(pacticipant, versions, original_selector, selector_type)
@@ -160,24 +185,6 @@ module PactBroker
         end
       end
 
-      def find_versions_for_selector(selector)
-        if selector[:tag] && selector[:latest]
-          version = version_repository.find_by_pacticipant_name_and_latest_tag(selector[:pacticipant_name], selector[:tag])
-          [version]
-        elsif selector[:latest]
-          version = version_repository.find_latest_by_pacticpant_name(selector[:pacticipant_name])
-          [version]
-        elsif selector[:tag]
-          versions = version_repository.find_by_pacticipant_name_and_tag(selector[:pacticipant_name], selector[:tag])
-          versions.any? ? versions : [nil]
-        elsif selector[:pacticipant_version_number]
-          version = version_repository.find_by_pacticipant_name_and_number(selector[:pacticipant_name], selector[:pacticipant_version_number])
-          [version]
-        else
-          nil
-        end
-      end
-
       def infer_selectors_for_integrations?(options)
         options[:latest] || options[:tag]
       end
@@ -193,11 +200,9 @@ module PactBroker
 
       def build_inferred_selectors(inferred_pacticipant_names, options)
         selectors = inferred_pacticipant_names.collect do | pacticipant_name |
-          selector = {
-            pacticipant_name: pacticipant_name
-          }
-          selector[:tag] = options[:tag] if options[:tag]
-          selector[:latest] = options[:latest] if options[:latest]
+          selector = UnresolvedSelector.new(pacticipant_name: pacticipant_name)
+          selector.tag = options[:tag] if options[:tag]
+          selector.latest = options[:latest] if options[:latest]
           selector
         end
         resolve_versions_and_add_ids(selectors, :inferred)

data/lib/pact_broker/matrix/resolved_selector.rb

@@ -79,6 +79,10 @@ module PactBroker
         end
       end
 
+      def only_pacticipant_name_specified?
+        pacticipant_name && !tag && !latest?
+      end
+
       def latest_tagged?
         latest? && tag
       end

data/lib/pact_broker/matrix/row.rb

@@ -5,6 +5,8 @@ require 'pact_broker/logging'
 require 'pact_broker/verifications/latest_verification_for_consumer_version_tag'
 require 'pact_broker/verifications/latest_verification_for_consumer_and_provider'
 
+# TODO DELETE THIS!!!
+
 module PactBroker
   module Matrix
     class Row < Sequel::Model(:matrix)

data/lib/pact_broker/matrix/service.rb

@@ -17,22 +17,22 @@ module PactBroker
       end
 
       def find_for_consumer_and_provider params, options = {}
-        selectors = [{ pacticipant_name: params[:consumer_name] }, { pacticipant_name: params[:provider_name] }]
+        selectors = [ UnresolvedSelector.new(pacticipant_name: params[:consumer_name]), UnresolvedSelector.new(pacticipant_name: params[:provider_name]) ]
         find(selectors, options)
       end
 
       def find_for_consumer_and_provider_with_tags params
-        consumer_criteria = {
+        consumer_selector = UnresolvedSelector.new(
           pacticipant_name: params[:consumer_name],
           tag: params[:tag],
           latest: true
-        }
-        provider_criteria = {
+        )
+        provider_selector = UnresolvedSelector.new(
           pacticipant_name: params[:provider_name],
           tag: params[:provider_tag],
           latest: true
-        }
-        selectors = [consumer_criteria, provider_criteria]
+        )
+        selectors = [consumer_selector, provider_selector]
         options = { latestby: 'cvpv' }
         if validate_selectors(selectors).empty?
           matrix_repository.find(selectors, options).first

data/lib/pact_broker/matrix/unresolved_selector.rb

@@ -0,0 +1,53 @@
+module PactBroker
+  module Matrix
+    class UnresolvedSelector < Hash
+      def initialize(params = {})
+        merge!(params)
+      end
+
+      def pacticipant_name
+        self[:pacticipant_name]
+      end
+
+      def pacticipant_version_number
+        self[:pacticipant_version_number]
+      end
+
+      def latest?
+        !!latest
+      end
+
+      def latest
+        self[:latest]
+      end
+
+      def tag
+        self[:tag]
+      end
+
+      def latest= latest
+        self[:latest] = latest
+      end
+
+      def tag= tag
+        self[:tag] = tag
+      end
+
+      def pacticipant_name= pacticipant_name
+        self[:pacticipant_name] = pacticipant_name
+      end
+
+      def pacticipant_version_number= pacticipant_version_number
+        self[:pacticipant_version_number] = pacticipant_version_number
+      end
+
+      def max_age= max_age
+        self[:max_age] = max_age
+      end
+
+      def max_age
+        self[:max_age]
+      end
+    end
+  end
+end