pact_broker 2.107.1 → 2.109.0

data/lib/pact_broker/pacts/pact_publication.rb

@@ -1,7 +1,7 @@
 require "forwardable"
+require "pact_broker/dataset"
 require "pact_broker/domain/pact"
 require "pact_broker/pacts/pact_version"
-require "pact_broker/repositories/helpers"
 require "pact_broker/integrations/integration"
 require "pact_broker/tags/head_pact_tags"
 require "pact_broker/pacts/pact_publication_dataset_module"
@@ -52,16 +52,22 @@ module PactBroker
       plugin :timestamps, update_on_create: true
 
       dataset_module do
-        include PactBroker::Repositories::Helpers
+        include PactBroker::Dataset
         include PactPublicationDatasetModule
         include PactPublicationCleanSelectorDatasetModule
         include PactPublicationWipDatasetModule
 
         def eager_for_domain_with_content
-          eager(:tags, :consumer, :provider, :consumer_version, :pact_version)
+          eager(:tags, :consumer, :provider, :pact_version, { consumer_version: :branch_versions })
         end
       end
 
+      def with_version_branches_and_tags
+        consumer_version.tags
+        consumer_version.branch_versions
+        self
+      end
+
       def self.subtract(a, *b)
         b_ids = b.flat_map{ |pact_publications| pact_publications.collect(&:id) }
         a.reject{ |pact_publication| b_ids.include?(pact_publication.id) }
@@ -125,8 +131,9 @@ module PactBroker
         @latest_for_branch
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def to_domain
-        PactBroker::Domain::Pact.new(
+        attributes = {
           id: id,
           provider: provider,
           consumer: consumer,
@@ -139,8 +146,19 @@ module PactBroker
           created_at: created_at,
           head_tag_names: [],
           db_model: self
-        )
+        }
+
+        if associations[:tags] || consumer_version.associations[:tags]
+          attributes[:consumer_version_tag_names] = associations[:tags]&.collect(&:name) || consumer_version.associations[:tags]&.collect(&:name)
+        end
+
+        if consumer_version.associations[:branch_versions]
+          attributes[:consumer_version_branch_names] = consumer_version.branch_versions.collect(&:branch_name)
+        end
+
+        PactBroker::Domain::Pact.new(attributes)
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def to_domain_lightweight
         PactBroker::Domain::Pact.new(

data/lib/pact_broker/pacts/pact_publication_dataset_module.rb

@@ -132,10 +132,14 @@ module PactBroker
           .remove_overridden_revisions_from_complete_query
       end
 
+      # The pact that belongs to the branch head.
+      # May return nil if the branch head does not have a pact published for it.
       def latest_for_consumer_branch(branch_name)
         for_branch_heads(branch_name)
       end
 
+      # The latest pact that belongs to a version on the specified branch (might not be the version that is the branch head)
+      # Always returns a pact, if any pacts exist for this branch.
       def old_latest_for_consumer_branch(branch_name)
         branch_versions_join = {
           Sequel[:pact_publications][:consumer_version_id] => Sequel[:branch_versions][:version_id]
@@ -148,7 +152,7 @@ module PactBroker
 
         max_orders = join(:branch_versions, branch_versions_join)
                       .join(:branches, branches_join)
-                      .select_group(:consumer_id, :provider_id, Sequel[:branches][:name].as(:branch_name))
+                      .select_group(Sequel[:pact_publications][:consumer_id], Sequel[:pact_publications][:provider_id], Sequel[:branches][:name].as(:branch_name))
                       .select_append{ max(consumer_version_order).as(latest_consumer_version_order) }
 
         max_join = {

data/lib/pact_broker/pacts/pact_version.rb

@@ -1,5 +1,4 @@
-require "sequel"
-require "pact_broker/repositories/helpers"
+require "pact_broker/dataset"
 require "pact_broker/pacts/content"
 require "pact_broker/pacts/pact_version_association_loaders"
 
@@ -52,7 +51,7 @@ module PactBroker
       )
 
       dataset_module do
-        include PactBroker::Repositories::Helpers
+        include PactBroker::Dataset
 
         def for_pact_domain(pact_domain)
           where(

data/lib/pact_broker/pacts/pacts_for_verification_repository.rb

@@ -1,9 +1,7 @@
-require "sequel"
 require "pact_broker/logging"
 require "pact_broker/pacts/pact_publication"
 require "pact_broker/domain"
 require "pact_broker/pacts/verifiable_pact"
-require "pact_broker/repositories/helpers"
 require "pact_broker/pacts/selected_pact"
 require "pact_broker/pacts/selector"
 require "pact_broker/pacts/selectors"
@@ -17,7 +15,6 @@ module PactBroker
       include PactBroker::Logging
       include PactBroker::Repositories
       include PactBroker::Services
-      include PactBroker::Repositories::Helpers
       include PactBroker::Repositories::Scopes
 
       PUBLICATION_ASSOCIATIONS_FOR_EAGER_LOAD = [
@@ -221,9 +218,9 @@ module PactBroker
 
       def create_selectors_for_wip_pact(pact_publication)
         if pact_publication.values[:tag_name]
-          Selectors.create_for_latest_for_tag(pact_publication.values[:tag_name])
+          Selectors.create_for_latest_for_tag(pact_publication.values[:tag_name]).resolve(pact_publication.consumer_version)
         else
-          Selectors.create_for_latest_for_branch(pact_publication.values.fetch(:branch_name))
+          Selectors.create_for_latest_for_branch(pact_publication.values.fetch(:branch_name)).resolve(pact_publication.consumer_version)
         end
       end
 

data/lib/pact_broker/pacts/placeholder_pact.rb

@@ -6,11 +6,13 @@ module PactBroker
       def initialize
         consumer = OpenStruct.new(name: "placeholder-consumer", labels: [OpenStruct.new(name: "placeholder-consumer-label")])
         @provider = OpenStruct.new(name: "placeholder-provider", labels: [OpenStruct.new(name: "placeholder-provider-label")])
-        @consumer_version = OpenStruct.new(number: "gggghhhhjjjjkkkkllll66667777888899990000", pacticipant: consumer, tags: [OpenStruct.new(name: "master")])
+        @consumer_version = OpenStruct.new(number: "gggghhhhjjjjkkkkllll66667777888899990000", pacticipant: consumer)
         @consumer_version_number = @consumer_version.number
         @created_at = DateTime.now
         @revision_number = 1
         @pact_version_sha = "5d445a4612743728dfd99ccd4210423c052bb9db"
+        @consumer_version_tag_names = ["dev"]
+        @consumer_version_branch_names = ["main"]
       end
     end
   end

data/lib/pact_broker/pacts/repository.rb

@@ -1,4 +1,3 @@
-require "sequel"
 require "ostruct"
 require "pact_broker/logging"
 require "pact_broker/pacts/generate_sha"
@@ -9,7 +8,6 @@ require "pact_broker/domain"
 require "pact_broker/pacts/parse"
 require "pact_broker/pacts/latest_pact_publication_id_for_consumer_version"
 require "pact_broker/pacts/verifiable_pact"
-require "pact_broker/repositories/helpers"
 require "pact_broker/pacts/selected_pact"
 require "pact_broker/pacts/selector"
 require "pact_broker/pacts/selectors"
@@ -24,7 +22,6 @@ module PactBroker
     class Repository
       include PactBroker::Logging
       include PactBroker::Repositories
-      include PactBroker::Repositories::Helpers
 
       def scope_for(scope)
         PactBroker.policy_scope!(scope)
@@ -53,7 +50,7 @@ module PactBroker
           consumer_version_order: params.fetch(:version).order,
         ).upsert
         update_latest_pact_publication_ids(pact_publication)
-        pact_publication.to_domain
+        pact_publication.with_version_branches_and_tags.to_domain
       end
 
       def update id, params
@@ -75,9 +72,9 @@ module PactBroker
             created_at: Sequel.datetime_class.now
           ).upsert
           update_latest_pact_publication_ids(pact_publication)
-          pact_publication.to_domain
+          pact_publication.with_version_branches_and_tags.to_domain
         else
-          existing_model.to_domain
+          existing_model.with_version_branches_and_tags.to_domain
         end
       end
 
@@ -201,7 +198,7 @@ module PactBroker
           .sort
       end
 
-      def find_latest_pact(consumer_name, provider_name, tag = nil)
+      def find_latest_pact(consumer_name, provider_name, tag = nil, branch_name = nil)
         query = scope_for(PactPublication)
           .eager_for_domain_with_content
           .select_all_qualified
@@ -212,6 +209,8 @@ module PactBroker
           query = query.untagged
         elsif tag
           query = query.for_consumer_version_tag_all_revisions(tag)
+        elsif branch_name
+          query = query.old_latest_for_consumer_branch(branch_name)
         end
         query.latest_by_consumer_version_order.all.collect(&:to_domain_with_content)[0]
       end
@@ -253,23 +252,24 @@ module PactBroker
             .reverse_order(:consumer_version_order, :revision_number)
             .limit(1)
 
+        # Must use .all to trigger the eager loading
         if consumer_version_number && !pact_version_sha
           pact_publication_by_consumer_version
-            .first&.to_domain_with_content
+            .all.first&.to_domain_with_content
         elsif pact_version_sha && !consumer_version_number
           latest_pact_publication_by_sha
-            .first&.to_domain_with_content
+            .all.first&.to_domain_with_content
         elsif consumer_version_number && pact_version_sha
-          pact_publication = pact_publication_by_consumer_version.first
+          pact_publication = pact_publication_by_consumer_version.all.first
           if pact_publication && pact_publication.pact_version.sha == pact_version_sha
             pact_publication.to_domain_with_content
           else
-            latest_pact_publication_by_sha.first&.to_domain_with_content
+            latest_pact_publication_by_sha.all.first&.to_domain_with_content
           end
         else
           pact_publication_by_consumer_version
             .reverse_order(:consumer_version_order, :revision_number)
-            .first&.to_domain_with_content
+            .all.first&.to_domain_with_content
         end
       end
       # rubocop: enable Metrics/CyclomaticComplexity, Metrics/MethodLength

data/lib/pact_broker/pacts/service.rb

@@ -22,8 +22,12 @@ module PactBroker
       extend PactBroker::Messages
       extend SquashPactsForVerification
 
+      def generate_sha(json_content)
+        PactBroker.configuration.sha_generator.call(json_content)
+      end
+
       def find_latest_pact params
-        pact_repository.find_latest_pact(params[:consumer_name], params[:provider_name], params[:tag])
+        pact_repository.find_latest_pact(params[:consumer_name], params[:provider_name], params[:tag], params[:branch_name])
       end
 
       def search_for_latest_pact params
@@ -154,10 +158,12 @@ module PactBroker
       end
 
       # Overwriting an existing pact with the same consumer/provider/consumer version number
+      # by creating a new revision (that is, a new PactPublication with an incremented revision number)
+      # 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]}")
-        pact_version_sha = generate_sha(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 }
         updated_pact = pact_repository.update(existing_pact.id, update_params)
@@ -178,21 +184,20 @@ module PactBroker
 
       private :create_pact_revision
 
-      def disallowed_modification?(existing_pact, new_json_content)
-        !PactBroker.configuration.allow_dangerous_contract_modification && existing_pact && existing_pact.pact_version_sha != generate_sha(new_json_content)
+      def disallowed_modification?(existing_pact, new_pact_version_sha)
+        !PactBroker.configuration.allow_dangerous_contract_modification && existing_pact && existing_pact.pact_version_sha != new_pact_version_sha
       end
 
       # When no publication for the given consumer/provider/consumer version number exists
-      def create_pact params, version, provider
+      def create_pact(params, version, provider)
         logger.info("Creating new pact publication", params.without(:json_content))
         logger.debug("Content #{params[:json_content]}")
-        pact_version_sha = generate_sha(params[:json_content])
         json_content = add_interaction_ids(params[:json_content])
         pact = pact_repository.create(
           version_id: version.id,
           provider_id: provider.id,
           consumer_id: version.pacticipant_id,
-          pact_version_sha: pact_version_sha,
+          pact_version_sha: params.fetch(:pact_version_sha),
           json_content: json_content,
           version: version
         )
@@ -212,12 +217,6 @@ module PactBroker
 
       private :create_pact
 
-      def generate_sha(json_content)
-        PactBroker.configuration.sha_generator.call(json_content)
-      end
-
-      private :generate_sha
-
       def add_interaction_ids(json_content)
         Content.from_json(json_content).with_ids.to_json
       end

data/lib/pact_broker/repositories.rb

@@ -47,6 +47,10 @@ module PactBroker
       get_repository(:matrix_repository)
     end
 
+    def branch_repository
+      get_repository(:branch_repository)
+    end
+
     def branch_version_repository
       get_repository(:branch_version_repository)
     end
@@ -96,6 +100,11 @@ module PactBroker
         Matrix::Repository.new
       end
 
+      register_repository(:branch_repository) do
+        require "pact_broker/versions/branch_repository"
+        PactBroker::Versions::BranchRepository.new
+      end
+
       register_repository(:branch_version_repository) do
         require "pact_broker/versions/branch_version_repository"
         PactBroker::Versions::BranchVersionRepository.new
@@ -105,7 +114,6 @@ module PactBroker
         require "pact_broker/integrations/repository"
         PactBroker::Integrations::Repository.new
       end
-
       # rubocop: enable Metrics/MethodLength
     end
   end

data/lib/pact_broker/string_refinements.rb

@@ -37,6 +37,10 @@ module PactBroker
     end
 
     refine String do
+      def integer?
+        self =~ /^\d+$/
+      end
+
       def present?
         !blank?
       end

data/lib/pact_broker/tags/head_pact_tags.rb

@@ -1,12 +1,9 @@
-require "pact_broker/db"
-require "pact_broker/repositories/helpers"
+require "pact_broker/dataset"
 
 module PactBroker
   module Tags
     class HeadPactTag < Sequel::Model
-      dataset_module do
-        include PactBroker::Repositories::Helpers
-      end
+      dataset_module(PactBroker::Dataset)
     end
   end
 end

data/lib/pact_broker/tags/repository.rb

@@ -1,12 +1,8 @@
 require "pact_broker/domain/tag"
-require "pact_broker/repositories/helpers"
 
 module PactBroker
   module Tags
     class Repository
-
-      include PactBroker::Repositories::Helpers
-
       def create args
         params = {
           name: args.fetch(:name),
@@ -22,9 +18,9 @@ module PactBroker
           .select_all_qualified
           .join(:versions, { id: :version_id })
           .join(:pacticipants, {Sequel.qualify("pacticipants", "id") => Sequel.qualify("versions", "pacticipant_id")})
-          .where(name_like(Sequel.qualify("tags", "name"), args.fetch(:tag_name)))
-          .where(name_like(Sequel.qualify("versions", "number"), args.fetch(:pacticipant_version_number)))
-          .where(name_like(Sequel.qualify("pacticipants", "name"), args.fetch(:pacticipant_name)))
+          .where(Sequel.name_like(Sequel.qualify("tags", "name"), args.fetch(:tag_name)))
+          .where(Sequel.name_like(Sequel.qualify("versions", "number"), args.fetch(:pacticipant_version_number)))
+          .where(Sequel.name_like(Sequel.qualify("pacticipants", "name"), args.fetch(:pacticipant_name)))
           .single_record
       end
 

data/lib/pact_broker/test/test_data_builder.rb

@@ -31,6 +31,8 @@ require "pact_broker/deployments/released_version_service"
 require "pact_broker/versions/branch_version_repository"
 require "pact_broker/integrations/repository"
 require "pact_broker/contracts/service"
+require "pact_broker/contracts/contract_to_publish"
+require "pact_broker/contracts/contracts_to_publish"
 
 require "ostruct"
 
@@ -86,6 +88,12 @@ module PactBroker
         self
       end
 
+      # Creates a consumer, consumer version, provider and pact with the specified JSON content
+      # Does NOT rely on previous state.
+      # @param [String] consumer_name
+      # @param [String] consumer_version_number
+      # @param [Strig] provider_name
+      # @param [String] json_content
       def create_pact_with_hierarchy consumer_name = "Consumer", consumer_version_number = "1.2.3", provider_name = "Provider", json_content = nil
         use_consumer(consumer_name)
         create_consumer(consumer_name) if !consumer
@@ -97,18 +105,39 @@ module PactBroker
         self
       end
 
+      # Creates a consumer, consumer version with tag, provider and pact
+      # Does NOT rely on previous state.
+      # @param [String] consumer_name
+      # @param [String] consumer_version_number
+      # @param [String] consumer_version_tag_name
+      # @param [Strig] provider_name
       def create_pact_with_consumer_version_tag consumer_name, consumer_version_number, consumer_version_tag_name, provider_name
         create_pact_with_hierarchy(consumer_name, consumer_version_number, provider_name)
         create_consumer_version_tag(consumer_version_tag_name)
         self
       end
 
+      # Creates a consumer, consumer version, provider, pact and verification
+      # Does NOT rely on previous state.
+      # @param [String] consumer_name
+      # @param [String] consumer_version
+      # @param [String] provider_name
+      # @param [String] provider_version
+      # @param [Boolean] success default true
       def create_pact_with_verification consumer_name = "Consumer", consumer_version = "1.0.#{model_counter}", provider_name = "Provider", provider_version = "1.0.#{model_counter}", success = true
         create_pact_with_hierarchy(consumer_name, consumer_version, provider_name)
         create_verification(number: model_counter, provider_version: provider_version, success: success)
         self
       end
 
+      # Creates a consumer, consumer version, provider, pact and verification
+      # Does NOT rely on previous state.
+      # @param [String] consumer_name
+      # @param [String] consumer_version
+      # @param [Array<String>] consumer_version_tags
+      # @param [String] provider_name
+      # @param [String] provider_version
+      # @param [Array<String>] provider_version_tags
       def create_pact_with_verification_and_tags consumer_name = "Consumer", consumer_version = "1.0.#{model_counter}", consumer_version_tags = [], provider_name = "Provider", provider_version = "1.0.#{model_counter}", provider_version_tags = []
         create_pact_with_hierarchy(consumer_name, consumer_version, provider_name)
         consumer_version_tags.each do | tag |
@@ -118,6 +147,10 @@ module PactBroker
         self
       end
 
+      # Create a pacticipant and version
+      # Does NOT rely on previous state
+      # @param [String] pacticipant_name
+      # @param [String] pacticipant_version
       def create_version_with_hierarchy pacticipant_name, pacticipant_version
         pacticipant = pacticipant_service.create(:name => pacticipant_name)
         version = PactBroker::Domain::Version.create(:number => pacticipant_version, :pacticipant => pacticipant)
@@ -223,7 +256,13 @@ module PactBroker
       def publish_pact(consumer_name:, provider_name:, consumer_version_number: , tags: nil, branch: nil, build_url: nil, json_content: nil)
         json_content = json_content || random_json_content(consumer_name, provider_name)
         contracts = [
-          PactBroker::Contracts::ContractToPublish.from_hash(consumer_name: consumer_name, provider_name: provider_name, decoded_content: json_content, content_type: "application/json", specification: "pact")
+          PactBroker::Contracts::ContractToPublish.from_hash(
+            consumer_name: consumer_name,
+            provider_name: provider_name,
+            decoded_content: json_content,
+            content_type: "application/json",
+            specification: "pact",
+            pact_version_sha: PactBroker::Pacts::GenerateSha.call(json_content))
         ]
         contracts_to_publish = PactBroker::Contracts::ContractsToPublish.from_hash(
           pacticipant_name: consumer_name,
@@ -386,6 +425,14 @@ module PactBroker
         self
       end
 
+      # @param [Hash] parameters
+      # @option parameters [String] :provider_version
+      # @option parameters [Array<String>] :tag_names
+      # @option parameters [String] :branch
+      # @option parameters [Boolean] :success
+      # @option parameters [Integer] :number
+      # @option parameters [Boolean] :wip
+      # @option parameters [Boolean] :test_results
       def create_verification parameters = {}
         # This should use the verification service. what a mess
         parameters.delete(:comment)
@@ -493,6 +540,10 @@ module PactBroker
         instance_variable_get("@#{instance_variable_name}")
       end
 
+      def clear_now
+        @now = nil
+      end
+
       def set_now date
         @now = date.to_date
         self
@@ -602,6 +653,10 @@ module PactBroker
           tag = PactBroker::Domain::Tag.create(name: tag_name, version: version)
           set_created_at_if_set(params[:created_at], :tags, { name: tag.name, version_id: version.id })
         end
+        if params[:branch]
+          set_created_at_if_set params[:created_at], :branches, { name: params[:branch], pacticipant_id: pacticipant.id }
+          set_created_at_if_set params[:created_at], :branch_versions, { branch_name: params[:branch], pacticipant_id: pacticipant.id, version_id: version.id }
+        end
         version
       end
 
@@ -638,7 +693,7 @@ module PactBroker
         if date_to_set
           Sequel::Model.db[table_name].where(selector).update(date_column_name => date_to_set)
           if Sequel::Model.db.schema(table_name).any?{ |col| col.first == :updated_at }
-            Sequel::Model.db[table_name].where(selector.keys.first => selector.values.first).update(updated_at: date_to_set)
+            Sequel::Model.db[table_name].where(selector).update(updated_at: date_to_set)
           end
         end
       end

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

@@ -10,8 +10,10 @@ module PactBroker
         using PactBroker::StringRefinements
 
         set :root, File.join(File.dirname(__FILE__), "..")
-        set :show_exceptions, ENV["RACK_ENV"] != "production"
-        set :dump_errors, false # The padrino logger logs these for us. If this is enabled we get duplicate logging.
+        set :show_exceptions, ENV["RACK_ENV"] == "development"
+        # The padrino logger logs these for us, but only in production. If this is enabled we get duplicate logging.
+        set :dump_errors, ENV["RACK_ENV"] != "production"
+        set :raise_errors, ENV["RACK_ENV"] == "test"
 
         def base_url
           # Using the X-Forwarded headers in the UI can leave the app vulnerable

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

@@ -30,12 +30,13 @@ module PactBroker
           pacticipant = pacticipant_service.find_pacticipant_by_name(params[:name])
           {
             csv_path: "#{base_url}/groups/#{ERB::Util.url_encode(params[:name])}.csv",
+            max_pacticipants: PactBroker.configuration.network_diagram_max_pacticipants,
             pacticipant_name: params[:name],
             repository_url: pacticipant&.repository_url,
             base_url: base_url,
             pacticipant: pacticipant,
             details_url: "#{base_url}/pacticipants/#{ERB::Util.url_encode(params[:name])}",
-            network_url: "#{base_url}/pacticipants/#{ERB::Util.url_encode(params[:name])}/network"
+            network_url: "#{base_url}/pacticipants/#{ERB::Util.url_encode(params[:name])}/network?maxPacticipants=#{PactBroker.configuration.network_diagram_max_pacticipants}"
           }.merge(overrides)
         end
       end

data/lib/pact_broker/ui/view_models/matrix_line.rb

@@ -110,14 +110,14 @@ module PactBroker
 
         def latest_consumer_version_tags
           @line.consumer_version_tags
-            .select(&:latest)
+            .select(&:latest?)
             .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
         end
 
         def other_consumer_version_tags
           @line.consumer_version_tags
-            .reject(&:latest)
+            .reject(&:latest?)
             .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
         end
@@ -138,14 +138,14 @@ module PactBroker
 
         def latest_provider_version_tags
           @line.provider_version_tags
-            .select(&:latest)
+            .select(&:latest?)
             .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
         end
 
         def other_provider_version_tags
           @line.provider_version_tags
-            .reject(&:latest)
+            .reject(&:latest?)
             .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
         end

data/lib/pact_broker/ui/views/groups/show.html.erb

@@ -329,8 +329,9 @@ window.onload = function() {
         .attr("d","M 10 0 L 10 10 L 0 5 z")
         .attr("fill", "#A0A0A0");
 
+    const maxPacticipants = new URL(location).searchParams.get("maxPacticipants") || <%= max_pacticipants %>;
 
-    d3.text("<%= csv_path %>", "text/csv", function(unparsedData) {
+    d3.text(`<%= csv_path %>?maxPacticipants=${maxPacticipants}`, "text/csv", function(unparsedData) {
         var data=d3.csv.parseRows(unparsedData);
         pacticipants = parseCSV(data);
         pacticipantNameArray = getPacticipantNames(pacticipants);

data/lib/pact_broker/ui.rb

@@ -1,14 +1,25 @@
-require "pact_broker/configuration"
+# Must be defined before loading Padrino
 # Stop Padrino creating a log file, as it will try to create it in the gems directory
 # http://www.padrinorb.com/api/Padrino/Logger.html
-unless defined? PADRINO_LOGGER
-  log_path = File.join(PactBroker.configuration.log_dir, "ui.log")
-  PADRINO_LOGGER = {
-    production:  { log_level: :error, stream: :to_file, log_path: log_path },
-    staging:     { log_level: :error, stream: :to_file, log_path: log_path },
-    test:        { log_level: :warn,  stream: :to_file, log_path: log_path },
-    development: { log_level: :warn,  stream: :to_file, log_path: log_path }
-  }
+# This configuration will be replaced by the SemanticLogger later on.
+PADRINO_LOGGER ||= {
+  ENV.fetch("RACK_ENV", "production").to_sym =>  { stream: :stdout }
+}
+
+require "padrino-core"
+
+class PactBrokerPadrinoLogger < SemanticLogger::Logger
+  include Padrino::Logger::Extensions
+
+  # Padrino expects level to return an integer, not a symbol
+  def level
+    Padrino::Logger::Levels[SemanticLogger.default_level]
+  end
 end
 
+Padrino.logger = PactBrokerPadrinoLogger.new("Padrino")
+# Log a test message to ensure that the logger works properly, as it only
+# seems to be used in production.
+Padrino.logger.info("Padrino has been configured with SemanticLogger")
+
 require "pact_broker/ui/app"

data/lib/pact_broker/verifications/latest_verification_for_consumer_and_provider.rb

@@ -2,9 +2,6 @@ require "pact_broker/domain/verification"
 
 module PactBroker
   module Verifications
-
-    include PactBroker::Repositories::Helpers
-
     class LatestVerificationForConsumerAndProvider < PactBroker::Domain::Verification
       set_dataset(:latest_verifications_for_consumer_and_provider)