pact_broker 2.119.0 → 2.121.0

data/lib/pact_broker/logging/open_telemetry_appender_setup.rb

@@ -0,0 +1,73 @@
+require "semantic_logger"
+require "pact_broker/error"
+
+module PactBroker
+  module Logging
+    # Adds semantic_logger's :open_telemetry appender when configured, without
+    # taking a hard dependency on the OpenTelemetry gems.
+    class OpenTelemetryAppenderSetup
+      def self.call(runtime_configuration)
+        new(runtime_configuration).call
+      end
+
+      def initialize(runtime_configuration)
+        @runtime_configuration = runtime_configuration
+      end
+
+      # Returns the added (or already-present) appender, or nil if none was added.
+      def call
+        case @runtime_configuration.log_otel_enabled
+        when false
+          nil
+        when true
+          unless otel_available?
+            raise PactBroker::ConfigurationError,
+              "log_otel_enabled is set to true but the opentelemetry-logs-sdk gem could not be loaded. " \
+              "Add it to your Gemfile, or set log_otel_enabled to auto/false."
+          end
+          add_appender(warn_if_no_provider: true)
+        else # :auto
+          add_appender(warn_if_no_provider: false) if otel_available? && otel_provider_configured?
+        end
+      end
+
+      private
+
+      def add_appender(warn_if_no_provider:)
+        existing = existing_otel_appender
+        return existing if existing
+
+        if warn_if_no_provider && !otel_provider_configured?
+          SemanticLogger["pact-broker"].warn(
+            "log_otel_enabled is true but no OpenTelemetry LoggerProvider is configured; " \
+            "OTel log records may be dropped."
+          )
+        end
+
+        SemanticLogger.add_appender(appender: :open_telemetry)
+      end
+
+      def existing_otel_appender
+        return nil unless defined?(SemanticLogger::Appender::OpenTelemetry)
+
+        SemanticLogger.appenders.find { |appender| appender.is_a?(SemanticLogger::Appender::OpenTelemetry) }
+      end
+
+      def otel_available?
+        require "opentelemetry-logs-sdk"
+        defined?(OpenTelemetry::Logs) ? true : false
+      rescue LoadError
+        false
+      end
+
+      def otel_provider_configured?
+        return false unless defined?(OpenTelemetry)
+
+        # A no-op / proxy provider means no real logs pipeline is configured.
+        OpenTelemetry.logger_provider.class.name.to_s.start_with?("OpenTelemetry::SDK::Logs")
+      rescue StandardError
+        false
+      end
+    end
+  end
+end

data/lib/pact_broker/logging/trace_aware_json_formatter.rb

@@ -0,0 +1,38 @@
+require "semantic_logger"
+require "semantic_logger/formatters/json"
+
+module PactBroker
+  module Logging
+    # A JSON log formatter that adds the standard OpenTelemetry log-correlation
+    # fields (trace_id, span_id, trace_flags) when a valid span is active.
+    # Degrades to plain JSON when OTel is not loaded or there is no active span,
+    # so it is safe for the open-source Pact Broker.
+    class TraceAwareJsonFormatter < SemanticLogger::Formatters::Json
+      def call(log, logger)
+        json = super
+        context = otel_trace_context
+        return json if context.empty?
+
+        # `hash` was populated by Raw#call during `super`; reuse it.
+        SemanticLogger::Utils.to_json(hash.merge(context))
+      end
+
+      private
+
+      def otel_trace_context
+        return {} unless defined?(OpenTelemetry::Trace)
+
+        span_context = OpenTelemetry::Trace.current_span.context
+        return {} unless span_context.valid?
+
+        {
+          trace_id: span_context.hex_trace_id,
+          span_id: span_context.hex_span_id,
+          trace_flags: span_context.trace_flags.sampled? ? "01" : "00"
+        }
+      rescue StandardError
+        {}
+      end
+    end
+  end
+end

data/lib/pact_broker/matrix/matrix_row_dataset_module.rb

@@ -61,8 +61,13 @@ module PactBroker
         end
 
         # consumer
-        pact_publication_matching_consumer = select_pact_columns_with_aliases.most_recent(limit).from_self(alias: :p).inner_join_versions_for_selectors_as_consumer(resolved_selectors)
-        rows_where_selector_matches_consumer = pact_publication_matching_consumer.left_outer_join_verifications.select_all_columns_after_join
+        pact_publication_matching_consumer = select_pact_columns_with_aliases
+          .most_recent(limit)
+          .from_self(alias: :p)
+          .where_consumer_version_matches_selectors(resolved_selectors)
+        rows_where_selector_matches_consumer = pact_publication_matching_consumer
+          .left_outer_join_verifications
+          .select_all_columns_after_join
 
         # provider
         verifications_matching_provider = verification_dataset.matching_selectors_as_provider_for_any_consumer(resolved_selectors)
@@ -143,24 +148,37 @@ module PactBroker
 
         if resolved_selectors_with_versions_specified.any?
           select_pact_columns_with_aliases
-            .inner_join_versions_for_selectors_as_consumer(resolved_selectors_with_versions_specified)
+            .where_consumer_version_matches_selectors(resolved_selectors_with_versions_specified)
             .where(provider_id: all_pacticipant_ids)
             .most_recent(limit)
         end
       end
 
+      # Name-only selectors carry no version ID — matching_one_selector_for_either_consumer_or_provider
+      # passes its selectors unfiltered — so they filter on the pacticipant instead. That
+      # identifies the same rows, because a pact publication's consumer_id is the
+      # pacticipant_id of its consumer_version.
       # @private
-      def inner_join_versions_for_selectors_as_consumer(resolved_selectors)
-        # get the UnresolvedSelector objects back out of the resolved_selectors because the Version.for_selector() method uses the UnresolvedSelector
-        unresolved_selectors = resolved_selectors.collect(&:original_selector).uniq
-        versions = PactBroker::Domain::Version.ids_for_selectors(unresolved_selectors)
-        inner_join_versions_dataset(versions)
+      # @param [Array<PactBroker::Matrix::ResolvedSelector>] resolved_selectors
+      def where_consumer_version_matches_selectors(resolved_selectors)
+        if resolved_selectors.empty?
+          raise ArgumentError.new("resolved_selectors must not be empty")
+        end
+
+        criteria = consumer_criteria_for_selectors(resolved_selectors)
+        where(criteria.size > 1 ? Sequel.|(*criteria) : criteria.first)
       end
 
       # @private
-      def inner_join_versions_dataset(versions)
-        versions_join = { Sequel[:p][:consumer_version_id] => Sequel[:versions][:id] }
-        join(versions, versions_join, table_alias: :versions)
+      # @param [Array<PactBroker::Matrix::ResolvedSelector>] resolved_selectors
+      # @return [Array<Hash>]
+      def consumer_criteria_for_selectors(resolved_selectors)
+        name_only, with_versions = resolved_selectors.partition(&:only_pacticipant_name_specified?)
+
+        criteria = []
+        criteria << { Sequel[:p][:consumer_id] => name_only.collect(&:pacticipant_id).uniq } if name_only.any?
+        criteria << { Sequel[:p][:consumer_version_id] => with_versions.collect(&:pacticipant_version_id).uniq } if with_versions.any?
+        criteria
       end
 
       # @private

data/lib/pact_broker/matrix/matrix_row_verification_dataset_module.rb

@@ -21,7 +21,7 @@ module PactBroker
       # @return [Sequel::Dataset<Verification>, nil]
       def matching_selectors_as_provider_for_any_consumer(resolved_selectors)
         select_verification_columns_with_aliases
-          .inner_join_versions_for_selectors_as_provider(resolved_selectors)
+          .where_provider_version_matches_selectors(resolved_selectors)
       end
 
       # Return verifications where the provider is described by any of the resolved_selectors *that only specify the pacticipant NAME*,
@@ -51,32 +51,43 @@ module PactBroker
       # @param [Array<PactBroker::Matrix::ResolvedSelector>] resolved_selectors
       # @return [Sequel::Dataset<Verification>, nil]
       def matching_only_selectors_as_provider_where_not_only_pacticipant_name_in_selector(resolved_selectors)
-        # get the UnresolvedSelector objects back out of the resolved_selectors because the Version.for_selector() method uses the UnresolvedSelector
         all_pacticipant_ids = resolved_selectors.collect(&:pacticipant_id).uniq
         resolved_selectors_with_versions_specified = resolved_selectors.reject(&:only_pacticipant_name_specified?)
 
         if resolved_selectors_with_versions_specified.any?
           select_verification_columns_with_aliases
-            .inner_join_versions_for_selectors_as_provider(resolved_selectors_with_versions_specified)
+            .where_provider_version_matches_selectors(resolved_selectors_with_versions_specified)
             .where(consumer_id: all_pacticipant_ids)
         end
       end
 
-      # Don't think it's worth splitting this into 2 different queries for selectors with only pacticipant name/selectors with version properties,
-      # as it's unlikely for there ever to be a query through the UI or CLI that results in 1 selector which only has a pacticipant name in it.
+      # Name-only selectors carry no version id — matching_selectors_as_provider_for_any_consumer
+      # passes its selectors unfiltered — so they filter on the provider pacticipant instead. That
+      # identifies the same rows, because a verification's provider_id is the
+      # pacticipant_id of its provider_version.
       # @private
       # @param [Array<PactBroker::Matrix::ResolvedSelector>] resolved_selectors
       # @return [Sequel::Dataset<Verification>]
-      def inner_join_versions_for_selectors_as_provider(resolved_selectors)
-        # get the UnresolvedSelector objects back out of the resolved_selectors because the Version.for_selector() method uses the UnresolvedSelector
-        unresolved_selectors = resolved_selectors.collect(&:original_selector).uniq
-        versions = PactBroker::Domain::Version.ids_for_selectors(unresolved_selectors)
-        join_versions_dataset(versions)
+      def where_provider_version_matches_selectors(resolved_selectors)
+        if resolved_selectors.empty?
+          raise ArgumentError.new("resolved_selectors must not be empty")
+        end
+
+        criteria = provider_criteria_for_selectors(resolved_selectors)
+        where(criteria.size > 1 ? Sequel.|(*criteria) : criteria.first)
       end
 
       # @private
-      def join_versions_dataset(versions_dataset)
-        join(versions_dataset, { Sequel[self.model.table_name][:provider_version_id] => Sequel[:versions][:id] }, table_alias: :versions)
+      # @param [Array<PactBroker::Matrix::ResolvedSelector>] resolved_selectors
+      # @return [Array<Hash>]
+      def provider_criteria_for_selectors(resolved_selectors)
+        name_only, with_versions = resolved_selectors.partition(&:only_pacticipant_name_specified?)
+        table = self.model.table_name
+
+        criteria = []
+        criteria << { Sequel[table][:provider_id] => name_only.collect(&:pacticipant_id).uniq } if name_only.any?
+        criteria << { Sequel[table][:provider_version_id] => with_versions.collect(&:pacticipant_version_id).uniq } if with_versions.any?
+        criteria
       end
     end
   end

data/lib/pact_broker/matrix/parse_can_i_deploy_query.rb

@@ -26,6 +26,11 @@ module PactBroker
 
         if params[:environment].is_a?(String)
           options[:environment_name] = params[:environment]
+          # Multiple versions of an integrated application can be simultaneously released to an
+          # environment (record-release), or deployed to it on different targets (record-deployment).
+          # "cvp" collapses these down to the latest provider version, hiding incompatible versions
+          # that are still live. "cvpv" evaluates every co-resident version independently. See issue #903.
+          options[:latestby] = "cvpv"
         end
 
         if params[:ignore].is_a?(Array)

data/lib/pact_broker/matrix/selector_resolver.rb

@@ -73,15 +73,43 @@ module PactBroker
 
         private :resolve_versions_and_add_ids
 
-        # Return a Hash of the pacticipant names used in the selectors, where the key is the name and the value is the pacticipant
+        # Return a Hash of the pacticipant names used in the selectors, where the key is the name
+        # as specified in the selector (not necessarily the pacticipant's stored name, when
+        # use_case_sensitive_resource_names is false), and the value is the pacticipant.
         # @return [Hash<String, PactBroker::Domain::Pacticipant>]
         def find_pacticipants_for_selectors(unresolved_selectors)
           names = unresolved_selectors.collect(&:pacticipant_name)
-          PactBroker::Domain::Pacticipant.where(name: names).all.group_by(&:name).transform_values(&:first)
+          pacticipants = pacticipants_matching_names(names)
+
+          names.uniq.each_with_object({}) do | name, hash |
+            matching = pacticipants.select { | candidate | pacticipant_name_matches?(candidate.name, name) }
+            pacticipant_repository.handle_multiple_pacticipants_found(name, matching) if matching.size > 1
+            hash[name] = matching.first if matching.any?
+          end
         end
 
         private :find_pacticipants_for_selectors
 
+        # @param [Array<String>] names
+        # @return [Array<PactBroker::Domain::Pacticipant>]
+        def pacticipants_matching_names(names)
+          return [] if names.empty?
+
+          PactBroker::Domain::Pacticipant.where(Sequel.|(*names.collect { | name | Sequel.name_like(:name, name) })).all
+        end
+
+        private :pacticipants_matching_names
+
+        def pacticipant_name_matches?(stored_name, requested_name)
+          if PactBroker.configuration.use_case_sensitive_resource_names
+            stored_name == requested_name
+          else
+            stored_name.casecmp?(requested_name)
+          end
+        end
+
+        private :pacticipant_name_matches?
+
         def build_selectors(pacticipants_hash, unresolved_selector, selector_type, selector_ignorer)
           selector_builder = ResolvedSelectorBuilder.new(unresolved_selector, selector_type, selector_ignorer)
           selector_builder.pacticipant = pacticipants_hash[unresolved_selector.pacticipant_name]

data/lib/pact_broker/pacticipants/repository.rb

@@ -1,3 +1,4 @@
+require "pact_broker/dataset"
 require "pact_broker/domain/pacticipant"
 require "pact_broker/error"
 require "pact_broker/repositories/scopes"
@@ -41,12 +42,14 @@ module PactBroker
         return [] if query.empty?
 
         query = query.select_all_qualified
-        query = query.filter(:name, options[:query_string]) if options[:query_string]
+        query = query.filter(Sequel[:pacticipants][:name], options[:query_string]) if options[:query_string]
         query = query.label(options[:label_name]) if options[:label_name]
         query.order_ignore_case(Sequel[:pacticipants][:name]).eager(*eager_load_associations).all_with_pagination_options(pagination_options)
       end
 
       def find_by_name_or_create name
+        raise PactBroker::Error, "Cannot create a pacticipant with a blank name" if name.to_s.strip.empty?
+        
         pacticipant = find_by_name(name)
         pacticipant ? pacticipant : create(name: name)
       end
@@ -104,7 +107,7 @@ module PactBroker
       end
 
       def search_by_name(pacticipant_name)
-        terms = pacticipant_name.split.map { |v| v.gsub("_", "\\_") }
+        terms = pacticipant_name.split.map { |v| PactBroker::Dataset::Helpers.escape_wildcards(v) }
         columns = [:name, :display_name]
         string_match_query = Sequel.|(
           *terms.map do |term|

data/lib/pact_broker/pacts/service.rb

@@ -182,7 +182,7 @@ module PactBroker
       # Modifing pacts is strongly discouraged now, and support for it will be dropped in the next major version of the Pact Broker
       def create_pact_revision params, existing_pact
         logger.info("Updating existing pact publication", params.without(:json_content))
-        logger.debug("Content #{params[:json_content]}")
+        logger.debug { "Content #{params[:json_content]}" }
         pact_version_sha = params.fetch(:pact_version_sha)
         json_content = add_interaction_ids(params[:json_content])
         update_params = { pact_version_sha: pact_version_sha, json_content: json_content }
@@ -211,7 +211,7 @@ module PactBroker
       # When no publication for the given consumer/provider/consumer version number exists
       def create_pact(params, version, provider)
         logger.debug("Creating new pact publication", params.without(:json_content))
-        logger.debug("Content #{params[:json_content]}")
+        logger.debug { "Content #{params[:json_content]}" }
         json_content = add_interaction_ids(params[:json_content])
         pact = pact_repository.create(
           version_id: version.id,

data/lib/pact_broker/tags/service.rb

@@ -24,17 +24,16 @@ module PactBroker
       end
 
       def delete args
-        version = version_repository.find_by_pacticipant_name_and_number args.fetch(:pacticipant_name), args.fetch(:pacticipant_version_number)
-        connection = PactBroker::Domain::Tag.new.db
-        connection.run("delete from tags where name = '#{args.fetch(:tag_name)}' and version_id = '#{version.id}'")
+        version = version_repository.find_by_pacticipant_name_and_number(args.fetch(:pacticipant_name), args.fetch(:pacticipant_version_number))
+        PactBroker::Domain::Tag.where(name: args.fetch(:tag_name), version_id: version.id).delete
       end
 
       def find_all_tag_names_for_pacticipant pacticipant_name
-        tag_repository.find_all_tag_names_for_pacticipant pacticipant_name
+        tag_repository.find_all_tag_names_for_pacticipant(pacticipant_name)
       end
 
       def find_all_by_pacticipant_name_and_tag pacticipant_name:, tag_name:
-        tag_repository.find_all_by_pacticipant_name_and_tag pacticipant_name, tag_name
+        tag_repository.find_all_by_pacticipant_name_and_tag(pacticipant_name, tag_name)
       end
     end
   end

data/lib/pact_broker/tasks/clean_task.rb

@@ -10,7 +10,9 @@ module PactBroker
 
       attr_accessor :database_connection
       attr_reader :keep_version_selectors
+      attr_reader :keep_branch_selectors
       attr_accessor :version_deletion_limit
+      attr_accessor :branch_deletion_limit
       attr_accessor :logger
       attr_accessor :dry_run
       attr_accessor :use_lock # allow disabling of postgres lock if it is causing problems
@@ -21,6 +23,7 @@ module PactBroker
         @dry_run = false
         @use_lock = true
         @keep_version_selectors = PactBroker::DB::CleanIncremental::DEFAULT_KEEP_SELECTORS
+        @keep_branch_selectors = PactBroker::DB::CleanIncremental::DEFAULT_KEEP_BRANCH_SELECTORS
         rake_task(&block)
       end
 
@@ -31,10 +34,17 @@ module PactBroker
         end
       end
 
+      def keep_branch_selectors=(keep_branch_selectors)
+        require "pact_broker/db/clean/branch_selector"
+        @keep_branch_selectors = keep_branch_selectors.nil? ? nil : [*keep_branch_selectors].collect do | hash |
+          PactBroker::DB::Clean::BranchSelector.from_hash(hash)
+        end
+      end
+
       def rake_task &block
         namespace :pact_broker do
           namespace :db do
-            desc "Clean unnecessary pacts and verifications from database"
+            desc "Clean unnecessary pacts, verifications and stale branches from database"
             task :clean do | _t, _args |
               instance_eval(&block)
 
@@ -61,10 +71,14 @@ module PactBroker
           output "Deleting oldest #{version_deletion_limit} versions, keeping versions that match the configured selectors", keep_version_selectors.collect(&:to_hash)
         end
 
+        output_keep_branch_selectors
+
         start_time = Time.now
         results = PactBroker::DB::CleanIncremental.call(database_connection,
           keep: keep_version_selectors,
+          keep_branches: keep_branch_selectors,
           limit: version_deletion_limit,
+          branch_limit: branch_deletion_limit,
           logger: logger,
           dry_run: dry_run
         )
@@ -109,6 +123,14 @@ module PactBroker
         logger ? logger.info("#{prefix}#{string}", payload) : puts("#{prefix}#{string} #{payload.to_json}")
       end
 
+      def output_keep_branch_selectors
+        if keep_branch_selectors.nil? || keep_branch_selectors.empty?
+          output "Stale branch cleanup is disabled (no keep_branch_selectors configured)"
+        else
+          output "Deleting stale branches that do not match the configured selectors (main branches are always kept)", keep_branch_selectors.collect(&:to_hash)
+        end
+      end
+
       def add_defaults_to_keep_selectors
         if keep_version_selectors.none?(&:currently_deployed?)
           selector = PactBroker::DB::Clean::Selector.new(deployed: true)

data/lib/pact_broker/verifications/repository.rb

@@ -10,7 +10,7 @@ module PactBroker
       include PactBroker::Repositories
       include PactBroker::Repositories::Scopes
 
-      # Ideally this would just be a sequence, but Sqlite and MySQL don't support sequences
+      # Ideally this would just be a sequence, but Sqlite doesn't support sequences
       # in the way we need to use them ie. determining what the next number will be before we
       # create the record, because Webmachine wants to set the URL of the resource that is about
       # to be created *before* we actually create it.

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.119.0"
+  VERSION = "2.121.0"
 end

data/lib/pact_broker/versions/branch_repository.rb

@@ -13,7 +13,7 @@ module PactBroker
         query = scope_for(Branch).where(pacticipant_id: pacticipant.id).select_all_qualified
         query = query.filter(:name, filter_options[:query_string]) if filter_options[:query_string]
         query
-          .order(Sequel.desc(:created_at), Sequel.desc(:id))
+          .order(Sequel.desc(:updated_at), Sequel.desc(:id))
           .eager(*eager_load_associations)
           .all_with_pagination_options(pagination_options)
       end

data/lib/pact_broker/versions/branch_service.rb

@@ -21,7 +21,7 @@ module PactBroker
         # @return [Array<PactBroker::Contracts::Notice>]
         def branch_deletion_notices(pacticipant, exclude:)
           count = branch_repository.count_branches_to_delete(pacticipant, exclude: exclude)
-          remaining = branch_repository.remaining_branches_after_future_deletion(pacticipant, exclude: exclude).sort_by(&:created_at).collect(&:name).join(", ")
+          remaining = branch_repository.remaining_branches_after_future_deletion(pacticipant, exclude: exclude).sort_by(&:updated_at).collect(&:name).join(", ")
           [PactBroker::Contracts::Notice.success(message("messages.branch.bulk_delete", count: count, pacticipant_name: pacticipant.name, remaining: remaining))]
         end
       end

data/lib/pact_broker/versions/branch_version_repository.rb

@@ -27,13 +27,14 @@ module PactBroker
           branch = find_or_create_branch(version.pacticipant, branch_name)
           branch_version = version.branch_version_for_branch(branch)
           if branch_version
-            PactBroker.logger.info("Updating branch version #{branch_version.inspect}, time: #{Time.now}")
-            branch_version.update(updated_at: Sequel.datetime_class.now)
+            PactBroker.logger.debug("Branch version already exists #{branch_version.inspect}")
           else
             PactBroker.logger.info("Creating branch version time: #{Time.now}")
             branch_version = PactBroker::Versions::BranchVersion.new(version: version, branch: branch, auto_created: auto_created).insert_ignore
             PactBroker::Versions::BranchHead.new(branch: branch, branch_version: branch_version).upsert
           end
+          now = Sequel.datetime_class.now
+          Branch.where(id: branch.id).where(Sequel[:updated_at] < now - Rational(60, 86400)).update(updated_at: now)
           pacticipant_service.maybe_set_main_branch(version.pacticipant, branch_name)
           branch_version
         end

data/lib/pact_broker/versions/repository.rb

@@ -89,22 +89,13 @@ module PactBroker
       end
 
       def create_or_update(pacticipant, version_number, open_struct_version)
-        saved_version = PactBroker::Domain::Version.where(pacticipant_id: pacticipant.id, number: version_number).single_record
         params = open_struct_version.to_h
         tags = params.delete(:tags)
         branch_name = params.delete(:branch)
-        if saved_version
-          saved_version.update(params)
-        else
-          # Upsert is only for race conditions
-          # Upsert blanks out any fields that are not provided
-          saved_version = PactBroker::Domain::Version.new(
-            params.merge(
-              pacticipant_id: pacticipant.id,
-              number: version_number
-            ).compact
-          ).upsert
-        end
+        insert_params = params.merge(pacticipant_id: pacticipant.id, number: version_number).compact
+        saved_version = PactBroker::Domain::Version.new(insert_params).insert_ignore
+        update_params = params.reject { |k, _| [:created_at, :order].include?(k) }
+        saved_version.update(update_params) if update_params.any?
 
         branch_version_repository.add_branch(saved_version, branch_name) if branch_name
         replace_tags(saved_version, tags) if tags

data/lib/pact_broker/webhooks/render.rb

@@ -3,7 +3,7 @@ require "pact_broker/webhooks/pact_and_verification_parameters"
 module PactBroker
   module Webhooks
     class Render
-      TEMPLATE_PARAMETER_REGEXP = /\$\{pactbroker\.[^\}]+\}/
+      TEMPLATE_PARAMETER_REGEXP = /\$\{pactbroker\.[^\}]++\}/
       DEFAULT_ESCAPER = lambda { |it| it }
 
       def self.includes_parameter?(value)

data/lib/sequel/plugins/upsert.rb

@@ -19,7 +19,7 @@ module Sequel
 
         def upsert(opts = {})
           @upsert_plugin_upserting = true
-          if postgres? || mysql?
+          if postgres?
             save(opts)
           else
             manual_upsert(opts)
@@ -92,9 +92,6 @@ module Sequel
           if upsert_plugin_upserting
             if postgres?
               super.insert_conflict(update: values_to_update, target: self.class.upsert_plugin_identifying_columns)
-            elsif mysql?
-              columns_to_update = values_to_update.keys - self.class.upsert_plugin_identifying_columns
-              super.on_duplicate_key_update(*columns_to_update)
             else
               super
             end
@@ -103,10 +100,6 @@ module Sequel
           end
         end
 
-        def mysql?
-          model.db.adapter_scheme.to_s =~ /mysql/
-        end
-
         def postgres?
           model.db.adapter_scheme.to_s =~ /postgres/
         end

data/pact_broker.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{See description}
   gem.homepage      = "https://github.com/pact-foundation/pact_broker"
 
-  gem.required_ruby_version = ">= 2.7.0"
+  gem.required_ruby_version = ">= 3.2.0"
 
   gem.files         = begin
                         if Dir.exist?(".git")
@@ -49,22 +49,22 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license       = "MIT"
 
-  gem.add_runtime_dependency "json", "~> 2.3"
+  gem.add_runtime_dependency "json", ">= 2.19.9"
   gem.add_runtime_dependency "psych", "~> 5.0"
   gem.add_runtime_dependency "roar", "~> 1.1"
   gem.add_runtime_dependency "dry-validation", "~> 1.8"
   gem.add_runtime_dependency "reform", "~> 2.6"
   gem.add_runtime_dependency "sequel", "~> 5.90"
-  gem.add_runtime_dependency "webmachine", ">= 2.0.0.beta", "< 3.0"
+  gem.add_runtime_dependency "webmachine", "~> 2.0"
   gem.add_runtime_dependency "semver2", "~> 3.4.2"
   gem.add_runtime_dependency "rack", "~> 3.2"
-  gem.add_runtime_dependency "redcarpet", ">= 3.5.1", "~>3.5"
-  gem.add_runtime_dependency "pact-support" , ">= 1.21.2", "~> 1.21"
+  gem.add_runtime_dependency "redcarpet", "~> 3.5"
+  gem.add_runtime_dependency "pact-support", "~> 1.21"
   gem.add_runtime_dependency "haml", "~>5.0"
   gem.add_runtime_dependency "sucker_punch", "~>3.0"
   gem.add_runtime_dependency "rack-protection", "~> 4.1"
   gem.add_runtime_dependency "table_print", "~> 1.5"
-  gem.add_runtime_dependency "semantic_logger", "~> 4.11"
+  gem.add_runtime_dependency "semantic_logger", "~> 5.0"
   gem.add_runtime_dependency "sanitize", "~> 6.0"
   gem.add_runtime_dependency "wisper", "~> 2.0"
   gem.add_runtime_dependency "anyway_config", "~> 2.1"
@@ -74,6 +74,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "mutex_m", "~> 0.3" # until as-notifications -> webmachine requires it
   gem.add_runtime_dependency "csv", "~> 3.0" # lib/pact_broker/api/decorators/relationships_csv_decorator.rb
   # dropped in ruby 3.5 stdlib
-  gem.add_runtime_dependency "ostruct", "~> 0.5" 
+  gem.add_runtime_dependency "ostruct", "~> 0.5"
+  gem.add_runtime_dependency "json_schemer", "~> 2.5"
   gem.add_development_dependency "pstore", "~> 0.1" # until webmachine requires it
 end