pact_broker 2.96.0 → 2.97.0

data/lib/pact_broker/pacts/repository.rb

@@ -7,7 +7,6 @@ require "pact_broker/pacts/pact_version"
 require "pact/shared/json_differ"
 require "pact_broker/domain"
 require "pact_broker/pacts/parse"
-require "pact_broker/matrix/head_row"
 require "pact_broker/pacts/latest_pact_publication_id_for_consumer_version"
 require "pact_broker/pacts/verifiable_pact"
 require "pact_broker/repositories/helpers"
@@ -117,8 +116,8 @@ module PactBroker
 
       def find_all_pact_versions_between consumer_name, options
         find_all_database_versions_between(consumer_name, options)
-          .eager(:tags)
           .reverse_order(:consumer_version_order)
+          .all
           .collect(&:to_domain)
       end
 
@@ -143,7 +142,7 @@ module PactBroker
       def find_latest_pacts_for_provider provider_name, tag = nil
         query = scope_for(PactPublication)
                   .for_provider_name(provider_name)
-                  .eager(:consumer)
+                  .eager_for_domain_with_content
 
         if tag
           query = query.latest_for_consumer_tag(tag)
@@ -151,7 +150,7 @@ module PactBroker
           query = query.overall_latest
         end
 
-        query.sort_by{ | p| p.consumer_name.downcase }.collect(&:to_head_pact)
+        query.all.sort_by{ | p| p.consumer_name.downcase }.collect(&:to_head_pact)
       end
 
       def find_for_verification(provider_name, consumer_version_selectors)
@@ -165,41 +164,45 @@ module PactBroker
       def find_pact_versions_for_provider provider_name, tag = nil
         query = scope_for(PactPublication)
             .select_all_qualified
+            .eager_for_domain_with_content
             .for_provider_name(provider_name)
-            .eager(:consumer)
-            .eager(:provider)
         query = query.for_consumer_version_tag(tag) if tag
-        query.collect(&:to_domain).sort
+        query.all.collect(&:to_domain).sort
       end
 
       # Returns latest pact version for the consumer_version_number
       def find_by_consumer_version consumer_name, consumer_version_number
         scope_for(PactPublication)
+          .eager_for_domain_with_content
           .for_consumer_name_and_maybe_version_number(consumer_name, consumer_version_number)
           .remove_overridden_revisions_from_complete_query
+          .all
           .collect(&:to_domain_with_content)
       end
 
       def find_by_version_and_provider version_id, provider_id
         scope_for(PactPublication)
-          .eager(:tags)
+          .eager_for_domain_with_content
           .where(consumer_version_id: version_id, provider_id: provider_id)
           .remove_overridden_revisions_from_complete_query
           .limit(1)
+          .all
           .collect(&:to_domain_with_content)[0]
       end
 
       def find_latest_pacts
         scope_for(PactPublication)
+          .eager_for_domain_with_content
           .overall_latest
-          .eager(:consumer)
           .eager(:provider)
+          .all
           .collect(&:to_domain)
           .sort
       end
 
       def find_latest_pact(consumer_name, provider_name, tag = nil)
         query = scope_for(PactPublication)
+          .eager_for_domain_with_content
           .select_all_qualified
           .for_consumer_name(consumer_name)
           .for_provider_name(provider_name)
@@ -214,7 +217,7 @@ module PactBroker
 
       # Allows optional consumer_name and provider_name
       def search_for_latest_pact(consumer_name, provider_name, tag = nil)
-        query = scope_for(PactPublication).select_all_qualified
+        query = scope_for(PactPublication).select_all_qualified.eager_for_domain_with_content
         query = query.for_consumer_name(consumer_name) if consumer_name
         query = query.for_provider_name(provider_name) if provider_name
 
@@ -233,6 +236,7 @@ module PactBroker
       # rubocop: disable Metrics/CyclomaticComplexity, Metrics/MethodLength
       def find_pact consumer_name, consumer_version_number, provider_name, pact_version_sha = nil
         pact_publication_by_consumer_version = scope_for(PactPublication)
+            .eager_for_domain_with_content
             .select_all_qualified
             .for_consumer_name_and_maybe_version_number(consumer_name, consumer_version_number)
             .for_provider_name(provider_name)
@@ -240,6 +244,7 @@ module PactBroker
             .limit(1)
 
         latest_pact_publication_by_sha = scope_for(PactPublication)
+            .eager_for_domain_with_content
             .select_all_qualified
             .for_consumer_name(consumer_name)
             .for_provider_name(provider_name)
@@ -249,46 +254,39 @@ module PactBroker
 
         if consumer_version_number && !pact_version_sha
           pact_publication_by_consumer_version
-            .eager(:tags)
-            .all_allowing_lazy_load
-            .collect(&:to_domain_with_content).first
+            .first&.to_domain_with_content
         elsif pact_version_sha && !consumer_version_number
           latest_pact_publication_by_sha
-            .eager(:tags)
-            .collect(&:to_domain_with_content).first
+            .first&.to_domain_with_content
         elsif consumer_version_number && pact_version_sha
-          pact_publication = pact_publication_by_consumer_version.all_allowing_lazy_load.first
+          pact_publication = pact_publication_by_consumer_version.first
           if pact_publication && pact_publication.pact_version.sha == pact_version_sha
-            pact_publication.tags
             pact_publication.to_domain_with_content
           else
-            latest_pact_publication_by_sha
-              .eager(:tags)
-              .all_allowing_lazy_load
-              .collect(&:to_domain_with_content).first
+            latest_pact_publication_by_sha.first&.to_domain_with_content
           end
         else
           pact_publication_by_consumer_version
-            .eager(:tags)
             .reverse_order(:consumer_version_order, :revision_number)
-            .all_allowing_lazy_load
-            .collect(&:to_domain_with_content).first
+            .first&.to_domain_with_content
         end
       end
       # rubocop: enable Metrics/CyclomaticComplexity, Metrics/MethodLength
 
       def find_all_revisions consumer_name, consumer_version_number, provider_name
         scope_for(PactPublication)
+          .eager_for_domain_with_content
           .for_provider_name(provider_name)
           .for_consumer_name_and_maybe_version_number(consumer_name, consumer_version_number)
           .order_by_consumer_version_order
+          .all
           .collect(&:to_domain_with_content)
       end
 
       def find_previous_pact pact, tag = nil
         query = scope_for(PactPublication)
+            .eager_for_domain_with_content
             .remove_overridden_revisions
-            .eager(:tags)
             .for_consumer_name(pact.consumer.name)
             .for_provider_name(pact.provider.name)
 
@@ -301,17 +299,19 @@ module PactBroker
         query
           .consumer_version_order_before(pact.consumer_version.order)
           .latest_by_consumer_version_order
+          .all
           .collect(&:to_domain_with_content)[0]
       end
 
       def find_next_pact pact
         scope_for(PactPublication)
-          .eager(:tags)
+          .eager_for_domain_with_content
           .for_consumer_name(pact.consumer.name)
           .for_provider_name(pact.provider.name)
           .remove_overridden_revisions
           .consumer_version_order_after(pact.consumer_version.order)
           .earliest
+          .all_allowing_lazy_load
           .collect(&:to_domain_with_content)[0]
       end
 
@@ -343,12 +343,13 @@ module PactBroker
       def find_previous_distinct_pact_by_sha pact
         pact_version = PactVersion.for_pact_domain(pact)
         scope_for(PactPublication)
-          .eager(:tags)
+          .eager_for_domain_with_content
           .for_consumer_name(pact.consumer.name)
           .for_provider_name(pact.provider.name)
           .consumer_version_order_before(pact.consumer_version.order)
           .exclude(pact_version_id: pact_version.id)
           .latest_by_consumer_version_order
+          .all_allowing_lazy_load
           .collect(&:to_domain_with_content)[0]
       end
 
@@ -377,6 +378,7 @@ module PactBroker
         provider_name = options.fetch(:and)
 
         query = scope_for(PactPublication)
+          .eager_for_domain_with_content
           .for_consumer_name(consumer_name)
           .for_provider_name(provider_name)
           .remove_overridden_revisions

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -74,8 +74,15 @@ module PactBroker
       def record_deployment(pacticipant:, version:, environment_name:)
         puts "Recording deployment of #{pacticipant} version #{version} to #{environment_name}"
         version_body = client.get("/pacticipants/#{encode(pacticipant)}/versions/#{encode(version)}").tap { |response| check_for_error(response) }.body
+
         environment_relation = version_body["_links"]["pb:record-deployment"].find { |relation| relation["name"] == environment_name }
-        client.post(environment_relation["href"], { replacedPreviousDeployedVersion: true }).tap { |response| check_for_error(response) }
+        if environment_relation.nil?
+          available_environments = version_body["_links"]["pb:record-deployment"].collect{ | relation | relation["name"]}.join
+          puts "Environment with name #{environment_name} not found. Available environments: #{available_environments}"
+        else
+          client.post(environment_relation["href"], { replacedPreviousDeployedVersion: true }).tap { |response| check_for_error(response) }
+        end
+
         separate
         self
       end

data/lib/pact_broker/test/test_data_builder.rb

@@ -25,7 +25,6 @@ require "pact_broker/verifications/service"
 require "pact_broker/tags/repository"
 require "pact_broker/webhooks/repository"
 require "pact_broker/certificates/certificate"
-require "pact_broker/matrix/row"
 require "pact_broker/deployments/environment_service"
 require "pact_broker/deployments/deployed_version_service"
 require "pact_broker/deployments/released_version_service"
@@ -260,6 +259,8 @@ module PactBroker
         set_created_at_if_set(params[:created_at], :pact_versions, sha: @pact.pact_version_sha) if pact_versions_count_after > pact_versions_count_before
         set_created_at_if_set(params[:created_at], :latest_pact_publication_ids_for_consumer_versions, consumer_version_id: @consumer_version.id)
         @pact = PactBroker::Pacts::PactPublication.find(id: @pact.id).to_domain
+        consumer_version.reload
+        consumer_version.pact_publications.each{ | pp | pp.allow_lazy_load if pp.respond_to?(:allow_lazy_load) }
         self
       end
 

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -46,19 +46,22 @@ module PactBroker
         end
 
         get "/provider/:provider_name/consumer/:consumer_name" do
-          selectors = [ PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:consumer_name]), PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:provider_name]) ]
-          options = {latestby: "cvpv", limit: 100}
+          selectors = [
+                        PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:consumer_name]),
+                        PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:provider_name])
+                      ]
+          options = { latestby: "cvpv", limit: 100 }
           lines = matrix_service.find(selectors, options)
           lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
-          locals = {
-            lines: lines,
-            consumer_name: params[:consumer_name],
-            provider_name: params[:provider_name],
-            selectors: create_selector_objects(selectors),
-            options: create_options_model(options),
-            badge_url: nil,
-            base_url: base_url
-          }
+          locals =  {
+                      lines: lines,
+                      consumer_name: params[:consumer_name],
+                      provider_name: params[:provider_name],
+                      selectors: create_selector_objects(selectors),
+                      options: create_options_model(options),
+                      badge_url: nil,
+                      base_url: base_url
+                    }
           haml :'matrix/show', { locals: locals, layout: :'layouts/main', escape_html: true }
         end
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.96.0"
+  VERSION = "2.97.0"
 end

data/pact_broker.gemspec

@@ -73,7 +73,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "dry-logic", "0.4.2" # Later version cases ArgumentError: wrong number of arguments
   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 "sanitize", "6.0"
   gem.add_runtime_dependency "wisper", "~> 2.0"
   gem.add_runtime_dependency "anyway_config", "~> 2.1"
   gem.add_runtime_dependency "request_store", "~> 1.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.96.0
+  version: 2.97.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-03-29 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.10
 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                        |