pact_broker 2.107.1 → 2.108.0

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

@@ -1,11 +1,17 @@
 require "pact_broker/api/resources/base_resource"
 require "pact_broker/api/renderers/integrations_dot_renderer"
 require "pact_broker/api/decorators/integrations_decorator"
+require "pact_broker/api/resources/filter_methods"
+require "pact_broker/api/resources/pagination_methods"
+require "pact_broker/api/contracts/pagination_query_params_schema"
 
 module PactBroker
   module Api
     module Resources
       class Integrations < BaseResource
+        include PaginationMethods
+        include FilterMethods
+
         def content_types_provided
           [
             ["text/vnd.graphviz", :to_dot],
@@ -17,18 +23,20 @@ module PactBroker
           ["GET", "OPTIONS", "DELETE"]
         end
 
+        def malformed_request?
+          super || (request.get? && validation_errors_for_schema?(schema, request.query))
+        end
+
         def to_dot
+          integrations = integration_service.find_all(filter_options, pagination_options)
           PactBroker::Api::Renderers::IntegrationsDotRenderer.call(integrations)
         end
 
         def to_json
+          integrations = integration_service.find_all(filter_options, pagination_options, decorator_class(:integrations_decorator).eager_load_associations)
           decorator_class(:integrations_decorator).new(integrations).to_json(**decorator_options)
         end
 
-        def integrations
-          @integrations ||= integration_service.find_all
-        end
-
         def delete_resource
           integration_service.delete_all
           true
@@ -37,6 +45,12 @@ module PactBroker
         def policy_name
           :'integrations::integrations'
         end
+
+        def schema
+          if request.get?
+            PactBroker::Api::Contracts::PaginationQueryParamsSchema
+          end
+        end
       end
     end
   end

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

@@ -17,6 +17,8 @@ module PactBroker
         def version
           if identifier_from_path[:tag]
             @version ||= version_service.find_by_pacticipant_name_and_latest_tag(identifier_from_path[:pacticipant_name], identifier_from_path[:tag])
+          elsif identifier_from_path[:branch_name]
+            @version ||= version_service.find_latest_by_pacticipant_name_and_branch_name(identifier_from_path[:pacticipant_name], identifier_from_path[:branch_name])
           else
             @version ||= version_service.find_latest_by_pacticpant_name(identifier_from_path)
           end

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

@@ -9,14 +9,17 @@ require "pact_broker/api/contracts/put_pact_params_contract"
 require "pact_broker/webhooks/execution_configuration"
 require "pact_broker/api/resources/webhook_execution_methods"
 require "pact_broker/api/resources/pact_resource_methods"
+require "pact_broker/api/resources/event_methods"
+require "pact_broker/integrations/event_listener"
 
 module PactBroker
   module Api
     module Resources
       class Pact < BaseResource
+        include EventMethods
         include PacticipantResourceMethods
-        include WebhookExecutionMethods
         include PactResourceMethods
+        include WebhookExecutionMethods
         include PactBroker::Messages
 
         def content_types_provided
@@ -65,11 +68,13 @@ module PactBroker
         def from_json
           response_code = pact ? 200 : 201
 
-          handle_webhook_events do
-            if request.patch? && resource_exists?
-              @pact = pact_service.merge_pact(pact_params)
-            else
-              @pact = pact_service.create_or_update_pact(pact_params)
+          subscribe(PactBroker::Integrations::EventListener.new) do
+            handle_webhook_events do
+              if request.patch? && resource_exists?
+                @pact = pact_service.merge_pact(pact_params)
+              else
+                @pact = pact_service.create_or_update_pact(pact_params)
+              end
             end
           end
           response.body = to_json

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

@@ -0,0 +1,67 @@
+require "pact_broker/api/resources/base_resource"
+require "pact_broker/api/resources/pagination_methods"
+require "pact_broker/api/resources/filter_methods"
+require "pact_broker/api/resources/after_reply"
+require "rack/utils"
+
+module PactBroker
+  module Api
+    module Resources
+      class PacticipantBranches < BaseResource
+        include PaginationMethods
+        include FilterMethods
+        include AfterReply
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET", "DELETE", "OPTIONS"]
+        end
+
+        def resource_exists?
+          !!pacticipant
+        end
+
+        def to_json
+          decorator_class(:pacticipant_branches_decorator).new(branches).to_json(**decorator_options(pacticipant: pacticipant))
+        end
+
+        def policy_name
+          :'versions::branches'
+        end
+
+        # Allows bulk deletion of pacticipant branches, keeping the specified branches and the main branch.
+        # Deletes the branches asyncronously, after the response has been sent, for performance reasons.
+        def delete_resource
+          after_reply do
+            branch_service.delete_branches_for_pacticipant(pacticipant, exclude: exclude)
+          end
+          notices = branch_service.branch_deletion_notices(pacticipant, exclude: exclude)
+          response.body = decorator_class(:notices_decorator).new(notices).to_json(**decorator_options)
+          202
+        end
+
+        private
+
+        def branches
+          @branches ||= branch_service.find_all_branches_for_pacticipant(
+                          pacticipant,
+                          filter_options,
+                          default_pagination_options.merge(pagination_options),
+                          eager_load_associations
+                        )
+        end
+
+        def exclude
+          Rack::Utils.parse_nested_query(request.uri.query)["exclude"] || []
+        end
+
+        def eager_load_associations
+          decorator_class(:pacticipant_branches_decorator).eager_load_associations
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,6 @@ module PactBroker
         using PactBroker::HashRefinements
         include PaginationMethods
 
-
         def content_types_provided
           [["application/hal+json", :to_json]]
         end
@@ -26,7 +25,15 @@ module PactBroker
         end
 
         def malformed_request?
-          super || (request.post? && validation_errors_for_schema?)
+          if super
+            true
+          elsif request.post? && validation_errors_for_schema?
+            true
+          elsif request.get? && validation_errors_for_schema?(schema, request.query)
+            true
+          else
+            false
+          end
         end
 
         def request_body_required?
@@ -47,11 +54,11 @@ module PactBroker
         end
 
         def to_json
-          generate_json(pacticipant_service.find_all_pacticipants(pagination_options))
+          generate_json(pacticipant_service.find_all_pacticipants(filter_options, pagination_options, eager_load_associations))
         end
 
         def generate_json pacticipants
-          decorator_class(:deprecated_pacticipant_collection_decorator).new(pacticipants).to_json(**decorator_options)
+          decorator_class(:deprecated_pacticipants_decorator).new(pacticipants).to_json(**decorator_options)
         end
 
         def decorator_for model
@@ -69,11 +76,23 @@ module PactBroker
         private
 
         def schema
-          PactBroker::Api::Contracts::PacticipantCreateSchema
+          if request.get?
+            PactBroker::Api::Contracts::PaginationQueryParamsSchema
+          else
+            PactBroker::Api::Contracts::PacticipantCreateSchema
+          end
+        end
+
+        def eager_load_associations
+          decorator_class(:deprecated_pacticipants_decorator).eager_load_associations
         end
 
-        def pacticipants
-          @pacticipants ||= pacticipant_service.find_all_pacticipants
+        def filter_options
+          if (request.query.has_key?("q"))
+            { query_string: request.query["q"] }
+          else
+            {}
+          end
         end
       end
     end

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

@@ -1,5 +1,5 @@
 require "pact_broker/api/resources/base_resource"
-require "pact_broker/api/decorators/pacticipant_collection_decorator"
+require "pact_broker/api/decorators/pacticipants_decorator"
 
 module PactBroker
   module Api
@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def generate_json pacticipants
-          decorator_class(:pacticipant_collection_decorator).new(pacticipants).to_json(**decorator_options)
+          decorator_class(:pacticipants_decorator).new(pacticipants).to_json(**decorator_options)
         end
 
         def policy_name

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

@@ -2,8 +2,14 @@ module PactBroker
   module Api
     module Resources
       module PaginationMethods
+        # rubocop: disable Metrics/CyclomaticComplexity
         def pagination_options
-          if request.query["pageNumber"] || request.query["pageSize"]
+          if request.query["page"] || request.query["size"]
+            {
+              page_number: request.query["page"]&.to_i || 1,
+              page_size: request.query["size"]&.to_i || 100
+            }
+          elsif request.query["pageNumber"] || request.query["pageSize"]
             {
               page_number: request.query["pageNumber"]&.to_i || 1,
               page_size: request.query["pageSize"]&.to_i || 100
@@ -12,6 +18,10 @@ module PactBroker
             {}
           end
         end
+
+        def default_pagination_options
+          { page_number: 1, page_size: 100 }
+        end
       end
     end
   end

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

@@ -5,6 +5,8 @@ require "pact_broker/api/contracts/verification_contract"
 require "pact_broker/api/decorators/verification_decorator"
 require "pact_broker/api/resources/webhook_execution_methods"
 require "pact_broker/api/resources/metadata_resource_methods"
+require "pact_broker/api/resources/event_methods"
+require "pact_broker/integrations/event_listener"
 
 module PactBroker
   module Api
@@ -12,6 +14,7 @@ module PactBroker
       class Verifications < BaseResource
         include WebhookExecutionMethods
         include MetadataResourceMethods
+        include EventMethods
 
         def content_types_accepted
           [["application/json", :from_json]]
@@ -42,10 +45,12 @@ module PactBroker
         end
 
         def from_json
-          handle_webhook_events(build_url: verification_params["buildUrl"]) do
-            verified_pacts = pact_service.find_for_verification_publication(pact_params, event_context[:consumer_version_selectors])
-            verification = verification_service.create(next_verification_number, verification_params, verified_pacts, event_context)
-            response.body = decorator_for(verification).to_json(**decorator_options)
+          subscribe(PactBroker::Integrations::EventListener.new) do
+            handle_webhook_events(build_url: verification_params["buildUrl"]) do
+              verified_pacts = pact_service.find_for_verification_publication(pact_params, event_context[:consumer_version_selectors])
+              verification = verification_service.create(next_verification_number, verification_params, verified_pacts, event_context)
+              response.body = decorator_for(verification).to_json(**decorator_options)
+            end
           end
           true
         end

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

@@ -18,6 +18,10 @@ module PactBroker
           ["GET", "OPTIONS"]
         end
 
+        def malformed_request?
+          super || request.get? && validation_errors_for_schema?(schema, request.query)
+        end
+
         def resource_exists?
           !!pacticipant
         end
@@ -33,6 +37,14 @@ module PactBroker
         def policy_name
           :'versions::versions'
         end
+
+        private
+
+        def schema
+          if request.get?
+            PactBroker::Api::Contracts::PaginationQueryParamsSchema
+          end
+        end
       end
     end
   end

data/lib/pact_broker/api.rb

@@ -64,6 +64,7 @@ module PactBroker
         # Latest pacts
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "latest"], Api::Resources::LatestPact, {resource_name: "latest_pact_publication"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "latest", :tag], Api::Resources::LatestPact, {resource_name: "latest_tagged_pact_publication"}
+        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", :branch_name, "latest"], Api::Resources::LatestPact, {resource_name: "latest_pact_publication_for_branch"}
         add ["pacts", "provider", :provider_name], Api::Resources::ProviderPacts, {resource_name: "provider_pact_publications"}
         add ["pacts", "provider", :provider_name, "tag", :tag], Api::Resources::ProviderPacts, {resource_name: "tagged_provider_pact_publications"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "latest-untagged"], Api::Resources::LatestPact, {resource_name: "latest_untagged_pact_publication", tag: :untagged}
@@ -86,12 +87,16 @@ module PactBroker
 
         # Versions
         add ["pacticipants", :pacticipant_name, "versions"], Api::Resources::Versions, {resource_name: "pacticipant_versions"}
+        add ["pacticipants", :pacticipant_name, "branches", :branch_name, "versions"], Api::Resources::BranchVersions, {resource_name: "pacticipant_branch_versions"}
         add ["pacticipants", :pacticipant_name, "versions", :pacticipant_version_number], Api::Resources::Version, {resource_name: "pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "latest-version", :tag], Api::Resources::LatestVersion, {resource_name: "latest_tagged_pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to], Api::Resources::CanIDeployPacticipantVersionByTagToTag, { resource_name: "can_i_deploy_latest_tagged_version_to_tag" }
         add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to, "badge"], Api::Resources::CanIDeployPacticipantVersionByTagToTagBadge, { resource_name: "can_i_deploy_latest_tagged_version_to_tag_badge" }
         add ["pacticipants", :pacticipant_name, "latest-version"], Api::Resources::LatestVersion, {resource_name: "latest_pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "versions", :pacticipant_version_number, "tags", :tag_name], Api::Resources::Tag, {resource_name: "pacticipant_version_tag"}
+        add ["pacticipants", :pacticipant_name, "branches"], Api::Resources::PacticipantBranches, {resource_name: "pacticipant_branches"}
+        add ["pacticipants", :pacticipant_name, "branches", :branch_name], Api::Resources::Branch, { resource_name: "branch" }
+        add ["pacticipants", :pacticipant_name, "branches", :branch_name, "latest-version"], Api::Resources::LatestVersion, { resource_name: "latest_pacticipant_version_for_branch" }
         add ["pacticipants", :pacticipant_name, "branches", :branch_name, "versions", :version_number], Api::Resources::BranchVersion, { resource_name: "branch_version" }
         add ["pacticipants", :pacticipant_name, "branches", :branch_name, "latest-version", "can-i-deploy", "to-environment", :environment_name], Api::Resources::CanIDeployPacticipantVersionByBranchToEnvironment, { resource_name: "can_i_deploy_latest_branch_version_to_environment" }
         add ["pacticipants", :pacticipant_name, "branches", :branch_name, "latest-version", "can-i-deploy", "to-environment", :environment_name, "badge"], Api::Resources::CanIDeployPacticipantVersionByBranchToEnvironmentBadge, { resource_name: "can_i_deploy_latest_branch_version_to_environment_badge" }

data/lib/pact_broker/app.rb

@@ -21,14 +21,17 @@ require "rack/pact_broker/ui_authentication"
 require "rack/pact_broker/configurable_make_it_later"
 require "rack/pact_broker/no_auth"
 require "rack/pact_broker/reset_thread_data"
+require "rack/pact_broker/add_cache_header"
 require "rack/pact_broker/add_vary_header"
 require "rack/pact_broker/use_when"
+require "rack/pact_broker/application_context"
 require "sucker_punch"
 require "pact_broker/api/middleware/configuration"
 require "pact_broker/api/middleware/basic_auth"
 require "pact_broker/config/basic_auth_configuration"
 require "pact_broker/api/authorization/resource_access_policy"
 require "pact_broker/api/middleware/http_debug_logs"
+require "pact_broker/application_context"
 
 module PactBroker
 
@@ -36,15 +39,16 @@ module PactBroker
     include PactBroker::Logging
     using Rack::PactBroker::UseWhen
 
-    attr_accessor :configuration
+    attr_accessor :configuration, :application_context
 
-    def initialize
+    def initialize(application_context = PactBroker::ApplicationContext.default_application_context)
+      @application_context = application_context
       @app_builder = ::Rack::Builder.new
       @cascade_apps = []
       @make_it_later_api_auth = ::Rack::PactBroker::ConfigurableMakeItLater.new(Rack::PactBroker::NoAuth)
       @make_it_later_ui_auth = ::Rack::PactBroker::ConfigurableMakeItLater.new(Rack::PactBroker::NoAuth)
       # Can only be required after database connection has been made because the decorators rely on the Sequel models
-      @create_pact_broker_api_block = ->() { require "pact_broker/api"; PactBroker::API }
+      @create_pact_broker_api_block = ->() { require "pact_broker/api"; PactBroker.build_api(application_context) }
       @configuration = PactBroker.configuration
       yield configuration if block_given?
       post_configure
@@ -55,7 +59,7 @@ module PactBroker
       @configuration.freeze
     end
 
-    # Allows middleware to be inserted at the bottom of the shared middlware stack
+    # Allows middleware to be inserted at the bottom of the shared middleware stack
     # (ie just before the cascade is called for diagnostic, UI and API).
     # To insert middleware at the top of the stack, initialize
     # the middleware with the app, and run it manually.
@@ -177,12 +181,14 @@ module PactBroker
       @app_builder.use PactBroker::Api::Middleware::HttpDebugLogs if configuration.http_debug_logging_enabled
       configure_basic_auth
       configure_rack_protection
+      @app_builder.use Rack::PactBroker::ApplicationContext, application_context
       @app_builder.use Rack::PactBroker::InvalidUriProtection
       @app_builder.use Rack::PactBroker::ResetThreadData
       @app_builder.use Rack::PactBroker::AddPactBrokerVersionHeader
       @app_builder.use Rack::PactBroker::AddVaryHeader
       @app_builder.use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts", "/images"], :root => PactBroker.project_root.join("public")
       @app_builder.use Rack::Static, :urls => ["/favicon.ico"], :root => PactBroker.project_root.join("public/images"), header_rules: [[:all, {"Content-Type" => "image/x-icon"}]]
+      @app_builder.use Rack::PactBroker::AddCacheHeader
       @app_builder.use Rack::PactBroker::ConvertFileExtensionToAcceptHeader
       # Rack::PactBroker::SetBaseUrl needs to be before the Rack::PactBroker::HalBrowserRedirect
       @app_builder.use Rack::PactBroker::SetBaseUrl, configuration.base_urls

data/lib/pact_broker/application_context.rb

@@ -1,10 +1,3 @@
-require "pact_broker/api/decorators/configuration"
-require "pact_broker/api/contracts/configuration"
-require "pact_broker/api/decorators/decorator_context_creator"
-require "pact_broker/webhooks/execution_configuration_creator"
-require "pact_broker/errors/error_logger"
-require "pact_broker/api/resources/error_response_generator"
-
 module PactBroker
   class ApplicationContext
     attr_reader :decorator_configuration,
@@ -15,32 +8,43 @@ module PactBroker
                 :before_resource,
                 :after_resource,
                 :error_logger,
+                :error_reporter,
                 :error_response_generator
 
-    def initialize(params = {})
-      params_with_defaults = {
+    def initialize(params)
+      @decorator_configuration = params[:decorator_configuration]
+      @api_contract_configuration = params[:api_contract_configuration]
+      @decorator_context_creator = params[:decorator_context_creator]
+      @webhook_execution_configuration_creator = params[:webhook_execution_configuration_creator]
+      @resource_authorizer = params[:resource_authorizer]
+      @before_resource = params[:before_resource]
+      @after_resource = params[:after_resource]
+      @error_logger = params[:error_logger]
+      @error_reporter = params[:error_reporter]
+      @error_response_generator = params[:error_response_generator]
+    end
+
+    # TODO pass in configuration
+    def self.default_application_context(overrides = {})
+      require "pact_broker/api/decorators/configuration"
+      require "pact_broker/api/contracts/configuration"
+      require "pact_broker/api/decorators/decorator_context_creator"
+      require "pact_broker/webhooks/execution_configuration_creator"
+      require "pact_broker/errors/error_logger"
+      require "pact_broker/errors/error_reporter"
+      require "pact_broker/api/resources/error_response_generator"
+
+      params = {
         decorator_configuration: PactBroker::Api::Decorators::Configuration.default_configuration,
         api_contract_configuration: PactBroker::Api::Contracts::Configuration.default_configuration,
         decorator_context_creator: PactBroker::Api::Decorators::DecoratorContextCreator,
         webhook_execution_configuration_creator: PactBroker::Webhooks::ExecutionConfigurationCreator,
         error_logger: PactBroker::Errors::ErrorLogger,
-        error_response_generator: PactBroker::Api::Resources::ErrorResponseGenerator
-      }.merge(params)
+        error_reporter: PactBroker::Errors::ErrorReporter.new(PactBroker.configuration.api_error_reporters),
+        error_response_generator: PactBroker::Api::Resources::ErrorResponseGenerator,
+      }.merge(overrides)
 
-      @decorator_configuration = params_with_defaults[:decorator_configuration]
-      @api_contract_configuration = params_with_defaults[:api_contract_configuration]
-      @decorator_context_creator = params_with_defaults[:decorator_context_creator]
-      @webhook_execution_configuration_creator = params_with_defaults[:webhook_execution_configuration_creator]
-      @resource_authorizer = params_with_defaults[:resource_authorizer]
-      @before_resource = params_with_defaults[:before_resource]
-      @after_resource = params_with_defaults[:after_resource]
-      @error_logger = params_with_defaults[:error_logger]
-      @error_response_generator = params_with_defaults[:error_response_generator]
-
-    end
-
-    def self.default_application_context(overrides = {})
-      ApplicationContext.new(overrides)
+      ApplicationContext.new(params)
     end
   end
 end

data/lib/pact_broker/async/after_reply.rb

@@ -0,0 +1,30 @@
+# Saves a block for execution after the HTTP response has been sent to the user.
+# When the block is executed, it connects to the database before executing the code.
+# This is good for doing things that might take a while and don't have to be done before
+# the response is sent, and don't need retries (in which case, it might be better to use a SuckerPunch Job).
+#
+# This leverages a feature of Puma which I'm not sure is meant to be public or not.
+# There are serveral mentions of it on the internet, so I assume it's ok to use it.
+# Puma itself uses the rack.after_reply for http request logging.
+#
+# https://github.com/search?q=repo%3Apuma%2Fpuma%20rack.after_reply&type=code
+
+module PactBroker
+  module Async
+    class AfterReply
+      def initialize(rack_env)
+        @rack_env = rack_env
+        @database_connector = rack_env.fetch("pactbroker.database_connector")
+      end
+
+      def execute(&block)
+        dc = @database_connector
+        @rack_env["rack.after_reply"] << lambda {
+          dc.call do
+            block.call
+          end
+        }
+      end
+    end
+  end
+end

data/lib/pact_broker/config/runtime_configuration.rb

@@ -31,6 +31,8 @@ module PactBroker
       include RuntimeConfigurationDatabaseMethods
       include RuntimeConfigurationBasicAuthMethods
 
+      config_name :pact_broker
+
       # logging attributes
       attr_config(
         log_dir: File.expand_path("./log"),
@@ -91,7 +93,8 @@ module PactBroker
         allow_dangerous_contract_modification: false,
         semver_formats: ["%M.%m.%p%s%d", "%M.%m", "%M"],
         seed_example_data: true,
-        features: []
+        network_diagram_max_pacticipants: 150,
+        features: {}
       )
 
       def self.getter_and_setter_method_names
@@ -105,8 +108,11 @@ module PactBroker
         config_attributes + config_attributes.collect{ |k| "#{k}=".to_sym } + extra_methods  - [:base_url]
       end
 
-      config_name :pact_broker
-
+      coerce_types(
+        features: COERCE_FEATURES,
+        network_diagram_max_pacticipants: :integer,
+        webhook_certificates: COERCE_WEBHOOKS
+      )
       sensitive_values(:database_url, :database_password)
 
       def log_level= log_level
@@ -179,10 +185,6 @@ module PactBroker
         super(value_to_string_array(main_branch_candidates, "main_branch_candidates"))
       end
 
-      def features= features
-        super(value_to_string_array(features, "features").collect(&:downcase))
-      end
-
       def rack_protection_use= rack_protection_use
         super(value_to_string_array(rack_protection_use, "rack_protection_use")&.collect(&:to_sym))
       end
@@ -191,20 +193,6 @@ module PactBroker
         super(value_to_string_array(rack_protection_except, "rack_protection_except")&.collect(&:to_sym))
       end
 
-      def webhook_certificates= webhook_certificates
-        if webhook_certificates.is_a?(Array)
-          super(webhook_certificates.collect(&:symbolize_keys))
-        elsif webhook_certificates.is_a?(Hash)
-          if all_keys_are_number_strings?(webhook_certificates)
-            super(convert_hash_with_number_string_keys_to_array(webhook_certificates).collect(&:symbolize_keys))
-          else
-            raise_validation_error("webhook_certificates must be an array, or a hash where each key is an integer in string format.")
-          end
-        elsif !webhook_certificates.nil?
-          raise_validation_error("webhook_certificates cannot be set using a #{webhook_certificates.class}")
-        end
-      end
-
       def warning_error_classes
         warning_error_class_names.collect do | class_name |
           begin

data/lib/pact_broker/config/runtime_configuration_coercion_methods.rb

@@ -1,15 +1,45 @@
 require "pact_broker/config/space_delimited_string_list"
 require "pact_broker/config/space_delimited_integer_list"
+require "pact_broker/hash_refinements"
+require "pact_broker/error"
 
 module PactBroker
   module Config
     module RuntimeConfigurationCoercionMethods
 
-      def all_keys_are_number_strings?(hash)
+      using PactBroker::HashRefinements
+
+      COERCE_FEATURES = lambda { | value |
+        if value.is_a?(String)
+          value.split(" ").each_with_object({}) { | k, h | h[k.downcase.to_sym] = true }
+        elsif value.is_a?(Array)
+          value.each_with_object({}) { | k, h | h[k.downcase.to_sym] = true }
+        elsif value.is_a?(Hash)
+          value.each_with_object({}) { | (k, v), new_hash | new_hash[k.downcase.to_sym] = Anyway::AutoCast.call(v) }
+        else
+          raise PactBroker::ConfigurationError, "Expected a String, Hash or Array for features but got a #{value.class.name}"
+        end
+      }
+
+      COERCE_WEBHOOKS = lambda { | value |
+        if value.is_a?(Hash) # from env vars
+          if RuntimeConfigurationCoercionMethods.all_keys_are_number_strings?(value)
+            RuntimeConfigurationCoercionMethods.convert_hash_with_number_string_keys_to_array(value).collect(&:symbolize_keys)
+          else
+            raise PactBroker::ConfigurationError, "Could not coerce #{value} into an array of webhook configurations. Please check docs for the expected format."
+          end
+        elsif value.is_a?(Array) # from YAML
+          value.collect(&:symbolize_keys)
+        else
+          raise PactBroker::ConfigurationError, "Webhook certificates cannot be set using a #{value.class}"
+        end
+      }
+
+      def self.all_keys_are_number_strings?(hash)
         hash.keys.all? { | k | k.to_s.to_i.to_s == k } # is an integer as a string
       end
 
-      def convert_hash_with_number_string_keys_to_array(hash)
+      def self.convert_hash_with_number_string_keys_to_array(hash)
         hash.keys.collect{ |k| [k, k.to_i]}.sort_by(&:last).collect(&:first).collect do | key |
           hash[key]
         end

data/lib/pact_broker/config/runtime_configuration_database_methods.rb

@@ -27,7 +27,7 @@ module PactBroker
             allow_missing_migration_files: true,
             validate_database_connection_config: true,
             database_statement_timeout: 15,
-            metrics_sql_statement_timeout: 30,
+            metrics_sql_statement_timeout: 30, # TODO get rid of this in next major version
             database_connection_validation_timeout: nil
           )