pact_broker 2.96.0 → 2.99.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.96.0
+  version: 2.99.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -346,22 +346,16 @@ dependencies:
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.1
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.1
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: wisper
   requirement: !ruby/object:Gem::Requirement
@@ -689,6 +683,7 @@ files:
 - lib/pact_broker/api/decorators/webhooks_decorator.rb
 - lib/pact_broker/api/middleware/basic_auth.rb
 - lib/pact_broker/api/middleware/configuration.rb
+- lib/pact_broker/api/middleware/http_debug_logs.rb
 - lib/pact_broker/api/pact_broker_urls.rb
 - lib/pact_broker/api/paths.rb
 - lib/pact_broker/api/renderers/html_pact_renderer.rb
@@ -918,11 +913,9 @@ files:
 - lib/pact_broker/locale/en.yml
 - lib/pact_broker/logging.rb
 - lib/pact_broker/logging/default_formatter.rb
-- lib/pact_broker/matrix/aggregated_row.rb
 - lib/pact_broker/matrix/can_i_deploy_query_schema.rb
 - lib/pact_broker/matrix/deployment_status_summary.rb
 - lib/pact_broker/matrix/every_row.rb
-- lib/pact_broker/matrix/head_row.rb
 - lib/pact_broker/matrix/integration.rb
 - lib/pact_broker/matrix/parse_can_i_deploy_query.rb
 - lib/pact_broker/matrix/parse_query.rb
@@ -934,7 +927,6 @@ files:
 - lib/pact_broker/matrix/reason.rb
 - lib/pact_broker/matrix/repository.rb
 - lib/pact_broker/matrix/resolved_selector.rb
-- lib/pact_broker/matrix/row.rb
 - lib/pact_broker/matrix/service.rb
 - lib/pact_broker/matrix/unresolved_selector.rb
 - lib/pact_broker/messages.rb
@@ -963,6 +955,7 @@ files:
 - lib/pact_broker/pacts/pact_publication_selector_dataset_module.rb
 - lib/pact_broker/pacts/pact_publication_wip_dataset_module.rb
 - lib/pact_broker/pacts/pact_version.rb
+- lib/pact_broker/pacts/pact_version_association_loaders.rb
 - lib/pact_broker/pacts/pacts_for_verification_repository.rb
 - lib/pact_broker/pacts/parse.rb
 - lib/pact_broker/pacts/placeholder_pact.rb
@@ -1229,7 +1222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: See description

data/lib/pact_broker/matrix/aggregated_row.rb

@@ -1,79 +0,0 @@
-require "forwardable"
-require "pact_broker/verifications/repository"
-
-# A collection of matrix rows with the same pact publication id
-# It's basically a normalised view of a denormalised view :(
-# A pact publication may be the overall latest, and/or the latest for a tag
-module PactBroker
-  module Matrix
-    class AggregatedRow
-      extend Forwardable
-
-      delegate [:consumer, :consumer_name, :consumer_version, :consumer_version_number, :consumer_version_order, :consumer_version_tags] => :first_row
-      delegate [:provider, :provider_name, :provider_version, :provider_version_number, :provider_version_order, :provider_version_tags] => :first_row
-      delegate [:pact, :pact_version, :pact_revision_number, :webhooks, :latest_triggered_webhooks, :'<=>'] => :first_row
-      delegate [:verification_id, :verification] => :first_row
-
-      def initialize matrix_rows
-        @matrix_rows = matrix_rows
-        @first_row = matrix_rows.first
-      end
-
-      def overall_latest?
-        !!matrix_rows.find{ | row| row.consumer_version_tag_name.nil? }
-      end
-
-      # If this comes back nil, it won't be "cached", but it's a reasonably
-      # quick query, so it's probably ok.
-      # The collection of pacts that belong to the same tag can be considered
-      # a pseudo branch. Find the latest verification for each pseudo branch
-      # and return the most recent. If this pact is the most recent overall,
-      # and there were no verifications found for any of the tags, then
-      # return the most recent verification
-      def latest_verification_for_pseudo_branch
-        @latest_verification ||= begin
-          verification = matrix_rows.collect do | row|
-            row.verification || latest_verification_for_consumer_version_tag(row)
-          end.compact.sort_by(&:id).last
-
-          if !verification && overall_latest?
-            overall_latest_verification
-          else
-            verification
-          end
-        end
-      end
-
-      def latest_verification_for_pact_version
-        @latest_verificaton_for_pact_version ||= begin
-          matrix_rows.collect(&:verification).compact.sort_by(&:id).last
-        end
-      end
-
-      # The list of tag names for which this pact publication is the most recent with that tag
-      # There could, however, be a later consumer version that does't have a pact (perhaps because it was deleted)
-      # that has the same tag.
-      # TODO show a warning when the data is "corrupted" as above.
-      def consumer_head_tag_names
-        matrix_rows.collect(&:consumer_version_tag_name).compact
-      end
-
-      private
-
-      attr_reader :matrix_rows, :first_row
-
-      def latest_verification_for_consumer_version_tag row
-        row.latest_verification_for_consumer_version_tag if row.consumer_version_tag_name
-      end
-
-      def overall_latest_verification
-        # not eager loaded because it shouldn't be called that often
-        first_row.latest_verification_for_consumer_and_provider
-      end
-
-      def consumer_version_tag_names
-        matrix_rows.collect(&:consumer_version_tag_name)
-      end
-    end
-  end
-end

data/lib/pact_broker/matrix/head_row.rb

@@ -1,80 +0,0 @@
-require "pact_broker/matrix/row"
-require "pact_broker/webhooks/webhook"
-
-module PactBroker
-  module Matrix
-    # A row for each of the overall latest pacts, and a row for each of the latest tagged pacts
-    # Rows with a nil consumer_tag_name are the overall latest
-    class HeadRow < Row
-      set_dataset(:head_matrix)
-
-      # one_to_one :latest_verification_for_consumer_version_tag,
-      #   :class => "PactBroker::Verifications::LatestVerificationForConsumerVersionTag",
-      #   primary_key: [:provider_id, :consumer_id, :consumer_version_tag_name], key: [:provider_id, :consumer_id, :consumer_version_tag_name]
-
-      # Loading the latest_verification_for_consumer_version_tag objects this way is quicker than
-      # doing it using an inbult relation with primary_key/key, if we are loading the relation for
-      # the entire HeadRow table
-      # Using the inbuilt relation puts constraints on the columns that are not necessary and slow
-      # the query down.
-      # This relation relies on consumer_version_tags already being loaded
-      one_to_one :latest_verification_for_consumer_version_tag, :class => "PactBroker::Verifications::LatestVerificationForConsumerVersionTag", primary_keys: [], key: [], :eager_loader=>(proc do |eo_opts|
-        # create an index of provider_id/consumer_id/consumer_version_tag_name => row
-        tag_to_row = eo_opts[:rows].each_with_object({}) { | row, map | map[[row.provider_id, row.consumer_id, row.consumer_version_tag_name]] = row }
-        # Initialise the association with nil - not sure why?
-        eo_opts[:rows].each{|row| row.associations[:latest_verification_for_consumer_version_tag] = nil}
-
-        # Need the all then the each to ensure the eager loading works
-        PactBroker::Verifications::LatestVerificationForConsumerVersionTag.each do | verification |
-          key = [verification.provider_id, verification.consumer_id, verification.consumer_version_tag_name]
-          if tag_to_row[key]
-            tag_to_row[key].associations[:latest_verification_for_consumer_version_tag] = verification
-          end
-        end
-      end)
-
-      # When viewing the index, every webhook in the database will match at least one of the rows, so
-      # it makes sense to load the entire table and match each webhook to the appropriate row.
-      # This will only work when using eager loading. The keys are just blanked out to avoid errors.
-      # I don't understand how they work at all.
-      # It would be nice to do this declaratively.
-      many_to_many :webhooks, class: :'PactBroker::Webhooks::Webhook', :left_key => [], left_primary_key: [], :eager_loader=>(proc do |eo_opts|
-        eo_opts[:rows].each do |row|
-          row.associations[:webhooks] = []
-        end
-
-        PactBroker::Webhooks::Webhook.each do | webhook |
-          eo_opts[:rows].each do | row |
-            if webhook.is_for?(row)
-              row.associations[:webhooks] << webhook
-            end
-          end
-        end
-      end)
-    end
-  end
-end
-
-# Table: head_matrix
-# Columns:
-#  consumer_id               | integer                     |
-#  consumer_name             | text                        |
-#  consumer_version_id       | integer                     |
-#  consumer_version_number   | text                        |
-#  consumer_version_order    | integer                     |
-#  pact_publication_id       | integer                     |
-#  pact_version_id           | integer                     |
-#  pact_version_sha          | text                        |
-#  pact_revision_number      | integer                     |
-#  pact_created_at           | timestamp without time zone |
-#  provider_id               | integer                     |
-#  provider_name             | text                        |
-#  provider_version_id       | integer                     |
-#  provider_version_number   | text                        |
-#  provider_version_order    | integer                     |
-#  verification_id           | integer                     |
-#  success                   | boolean                     |
-#  verification_number       | integer                     |
-#  verification_executed_at  | timestamp without time zone |
-#  verification_build_url    | text                        |
-#  consumer_version_tag_name | text                        |

data/lib/pact_broker/matrix/row.rb

@@ -1,287 +0,0 @@
-require "pact_broker/repositories/helpers"
-require "pact_broker/webhooks/latest_triggered_webhook"
-require "pact_broker/tags/tag_with_latest_flag"
-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)
-
-      # Used when using table_print to output query results
-      TP_COLS = [ :consumer_version_number, :pact_revision_number, :provider_version_number, :verification_number]
-
-      associate(:one_to_many, :latest_triggered_webhooks, :class => "PactBroker::Webhooks::LatestTriggeredWebhook", primary_key: :pact_publication_id, key: :pact_publication_id)
-      associate(:one_to_many, :consumer_version_tags, :class => "PactBroker::Tags::TagWithLatestFlag", primary_key: :consumer_version_id, key: :version_id)
-      associate(:one_to_many, :provider_version_tags, :class => "PactBroker::Tags::TagWithLatestFlag", primary_key: :provider_version_id, key: :version_id)
-
-      many_to_one :latest_verification_for_consumer_and_provider,
-        :class => "PactBroker::Verifications::LatestVerificationForConsumerAndProvider",
-        primary_key: [:provider_id, :consumer_id], key: [:provider_id, :consumer_id]
-
-      dataset_module do
-        include PactBroker::Repositories::Helpers
-        include PactBroker::Logging
-
-        def consumer consumer_name
-          where(name_like(:consumer_name, consumer_name))
-        end
-
-        def provider provider_name
-          where(name_like(:provider_name, provider_name))
-        end
-
-        def matching_selectors selectors
-          if selectors.size == 1
-            where_consumer_or_provider_is(selectors.first)
-          else
-            where_consumer_and_provider_in(selectors)
-          end
-        end
-
-        # find rows where (the consumer (and optional version) matches any of the selectors)
-        # AND
-        # the (provider (and optional version) matches any of the selectors OR the provider matches
-        #      and the verification is missing (and hence the provider version is null))
-        def where_consumer_and_provider_in selectors
-          where{
-            Sequel.&(
-              Sequel.|(
-                *QueryHelper.consumer_and_maybe_consumer_version_match_any_selector(selectors)
-              ),
-              Sequel.|(
-                *QueryHelper.provider_and_maybe_provider_version_match_any_selector_or_verification_is_missing(selectors)
-              ),
-              QueryHelper.either_consumer_or_provider_was_specified_in_query(selectors)
-            )
-          }
-        end
-
-        # Can't access other dataset_module methods from inside the Sequel `where{ ... }` block, so make a private class
-        # with some helper methods
-        class QueryHelper
-          def self.consumer_and_maybe_consumer_version_match_any_selector(selectors)
-            selectors.collect { |s| consumer_and_maybe_consumer_version_match_selector(s) }
-          end
-
-          def self.consumer_and_maybe_consumer_version_match_selector(s)
-            if s[:pact_publication_ids]
-              Sequel.&(pact_publication_id: s[:pact_publication_ids])
-            elsif s[:pacticipant_version_id]
-              Sequel.&(consumer_id: s[:pacticipant_id], consumer_version_id: s[:pacticipant_version_id])
-            else
-              Sequel.&(consumer_id: s[:pacticipant_id])
-            end
-          end
-
-          def self.provider_and_maybe_provider_version_match_selector(s)
-            if s[:verification_ids]
-              Sequel.&(verification_id: s[:verification_ids])
-            elsif s[:pacticipant_version_id]
-              Sequel.&(provider_id: s[:pacticipant_id], provider_version_id: s[:pacticipant_version_id])
-            else
-              Sequel.&(provider_id: s[:pacticipant_id])
-            end
-          end
-
-          # if the pact for a consumer version has never been verified, it exists in the matrix as a row
-          # with a blank provider version id
-          def self.provider_verification_is_missing_for_matching_selector(s)
-            Sequel.&(provider_id: s[:pacticipant_id], provider_version_id: nil)
-          end
-
-          def self.provider_and_maybe_provider_version_match_any_selector_or_verification_is_missing(selectors)
-            selectors.collect { |s|
-              provider_and_maybe_provider_version_match_selector(s)
-            } + selectors.collect { |s|
-              provider_verification_is_missing_for_matching_selector(s)
-            }
-          end
-
-          # Some selecters are specified in the query, others are implied (when only one pacticipant is specified,
-          # the integrations are automatically worked out, and the selectors for these are of type :implied )
-          # When there are 3 pacticipants that each have dependencies on each other (A->B, A->C, B->C), the query
-          # to deploy C (implied A, implied B, specified C) was returning the A->B row because it matched the
-          # implied selectors as well.
-          # This extra filter makes sure that every row that is returned actually matches one of the specified
-          # selectors.
-          def self.either_consumer_or_provider_was_specified_in_query(selectors)
-            specified_pacticipant_ids = selectors.select{ |s| s[:type] == :specified }.collect{ |s| s[:pacticipant_id] }
-            Sequel.|({ consumer_id: specified_pacticipant_ids } , { provider_id: specified_pacticipant_ids })
-          end
-        end
-
-        def where_consumer_or_provider_is s
-          where{
-            Sequel.|(
-              s[:pacticipant_version_id] ? Sequel.&(consumer_id: s[:pacticipant_id], consumer_version_id: s[:pacticipant_version_id]) :  Sequel.&(consumer_id: s[:pacticipant_id]),
-              s[:pacticipant_version_id] ? Sequel.&(provider_id: s[:pacticipant_id], provider_version_id: s[:pacticipant_version_id]) :  Sequel.&(provider_id: s[:pacticipant_id])
-            )
-          }
-        end
-
-        def order_by_names_ascending_most_recent_first
-          order(
-            Sequel.asc(:consumer_name),
-            Sequel.desc(:consumer_version_order),
-            Sequel.desc(:pact_revision_number),
-            Sequel.asc(:provider_name),
-            Sequel.desc(:provider_version_order),
-            Sequel.desc(:verification_id))
-        end
-      end
-
-      # Temporary method while we transition from returning Hashes to return Matrix objects
-      # from the repository find methods
-      # Need to make the object act as a hash and an object
-      def [] key
-        if key == :provider_version_tags || key == :consumer_version_tags
-          send(key)
-        else
-          super
-        end
-      end
-
-      def summary
-        "#{consumer_name}#{consumer_version_number} #{provider_name}#{provider_version_number || '?'} (r#{pact_revision_number}n#{verification_number || '?'})"
-      end
-
-      def consumer
-        @consumer ||= Domain::Pacticipant.new(name: consumer_name).tap { |pacticipant| pacticipant.id = consumer_id }
-      end
-
-      def provider
-        @provider ||= Domain::Pacticipant.new(name: provider_name).tap { |pacticipant| pacticipant.id = provider_id }
-      end
-
-      def consumer_version
-        @consumer_version ||= OpenStruct.new(number: consumer_version_number, order: consumer_version_order, id: consumer_version_id, pacticipant: consumer)
-      end
-
-      def provider_version
-        if provider_version_number
-          @provider_version ||= OpenStruct.new(number: provider_version_number, order: provider_version_order, id: provider_version_id, pacticipant: provider)
-        end
-      end
-
-      def pact
-        @pact ||= OpenStruct.new(
-          consumer: consumer,
-          provider: provider,
-          consumer_version: consumer_version,
-          consumer_version_number: consumer_version_number,
-          created_at: pact_created_at,
-          revision_number: pact_revision_number,
-          pact_version_sha: pact_version_sha
-        )
-      end
-
-      def verification
-        if verification_executed_at
-          @latest_verification ||= OpenStruct.new(
-            id: verification_id,
-            success: success,
-            number: verification_number,
-            execution_date: verification_executed_at,
-            created_at: verification_executed_at,
-            provider_version_number: provider_version_number,
-            provider_version_order: provider_version_order,
-            build_url: verification_build_url,
-            provider_version: provider_version,
-            consumer_name: consumer_name,
-            provider_name: provider_name,
-            pact_version_sha: pact_version_sha
-          )
-        end
-      end
-
-      # Add logic for ignoring case
-      def <=> other
-        comparisons = [
-          compare_name_asc(consumer_name, other.consumer_name),
-          compare_number_desc(consumer_version_order, other.consumer_version_order),
-          compare_number_desc(pact_revision_number, other.pact_revision_number),
-          compare_name_asc(provider_name, other.provider_name),
-          compare_number_desc(provider_version_order, other.provider_version_order),
-          compare_number_desc(verification_id, other.verification_id)
-        ]
-
-        comparisons.find{|c| c != 0 } || 0
-      end
-
-      def compare_name_asc name1, name2
-        name1 <=> name2
-      end
-
-      def to_s
-        "#{consumer_name} #{consumer_version_number} #{provider_name} #{provider_version_number} #{success}"
-      end
-
-      def compare_number_desc number1, number2
-        if number1 && number2
-          number2 <=> number1
-        elsif number1
-          1
-        else
-          -1
-        end
-      end
-
-      # For some reason, with MySQL, the success column value
-      # comes back as an integer rather than a boolean
-      # for the latest_matrix view (but not the matrix view!)
-      # Maybe something to do with the union?
-      # Haven't investigated as this is an easy enough fix.
-      def success
-        value = super
-        value.nil? ? nil : value == true || value == 1
-      end
-
-      def values
-        super.merge(success: success)
-      end
-
-      # Need to overwrite eql? from lib/sequel/model/base.rb
-      # because it uses @values instead of self.values
-      # so the success boolean/integer problem mentioned above
-      # screws things up
-      def eql?(obj)
-        (obj.class == model) && (obj.values == values)
-      end
-
-      def pacticipant_names
-        [consumer_name, provider_name]
-      end
-
-      def involves_pacticipant_with_name?(pacticipant_name)
-        pacticipant_name.include?(pacticipant_name)
-      end
-    end
-  end
-end
-
-# Table: matrix
-# Columns:
-#  consumer_id              | integer                     |
-#  consumer_name            | text                        |
-#  consumer_version_id      | integer                     |
-#  consumer_version_number  | text                        |
-#  consumer_version_order   | integer                     |
-#  pact_publication_id      | integer                     |
-#  pact_version_id          | integer                     |
-#  pact_version_sha         | text                        |
-#  pact_revision_number     | integer                     |
-#  pact_created_at          | timestamp without time zone |
-#  provider_id              | integer                     |
-#  provider_name            | text                        |
-#  provider_version_id      | integer                     |
-#  provider_version_number  | text                        |
-#  provider_version_order   | integer                     |
-#  verification_id          | integer                     |
-#  success                  | boolean                     |
-#  verification_number      | integer                     |
-#  verification_executed_at | timestamp without time zone |
-#  verification_build_url   | text                        |