pact_broker 2.106.0 → 2.107.0

data/lib/pact_broker/domain/version.rb

@@ -24,10 +24,12 @@ module PactBroker
     VERSION_COLUMNS = [:id, :number, :repository_ref, :pacticipant_id, :order, :created_at, :updated_at, :build_url]
 
     class Version < Sequel::Model(Sequel::Model.db[:versions].select(*VERSION_COLUMNS.collect{ | column | Sequel.qualify(:versions, column) }))
+      set_primary_key :id
+
       plugin :timestamps, update_on_create: true
+      plugin :age
       plugin :upsert, { identifying_columns: [:pacticipant_id, :number], ignore_columns_on_update: [:id, :created_at, :order] }
 
-      set_primary_key :id
       one_to_many :pact_publications, order: :revision_number, class: "PactBroker::Pacts::PactPublication", key: :consumer_version_id
       associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
       one_to_many :tags, :reciprocal => :version, order: :created_at
@@ -41,6 +43,7 @@ module PactBroker
       end
 
       one_to_many :deployed_versions, class: "PactBroker::Deployments::DeployedVersion", key: :version_id, primary_key: :id, order: [:created_at, :id]
+      one_to_many :released_versions, class: "PactBroker::Deployments::ReleasedVersion", key: :version_id, primary_key: :id, order: [:created_at, :id]
 
       many_to_one :latest_version_for_pacticipant, read_only: true, key: :id,
         class: Version,

data/lib/pact_broker/domain/webhook.rb

@@ -50,7 +50,7 @@ module PactBroker
       def execute pact, verification, event_context, options
         logger.info "Executing #{self} event_context=#{event_context}"
         template_params = template_parameters(pact, verification, event_context, options)
-        webhook_request = request.build(template_params, options.slice(:user_agent, :disable_ssl_verification, :cert_store))
+        webhook_request = request.build(template_params, **options.slice(:user_agent, :disable_ssl_verification, :cert_store))
         http_response, error = execute_request(webhook_request)
         success = success?(http_response, options)
         http_request = webhook_request.http_request

data/lib/pact_broker/index/service.rb

@@ -109,7 +109,7 @@ module PactBroker
       # rubocop: disable Metrics/CyclomaticComplexity
       def self.latest_verification_for_pseudo_branch(pact_publication, is_overall_latest, latest_verifications_for_cv_tags, tags_option, options)
         if options[:view] == "branch" || (options[:view] == "all" && pact_publication.consumer_version.branch_heads.any?)
-          pact_publication.latest_verification || pact_publication.latest_verification_for_consumer_branches
+          pact_publication.latest_verification || pact_publication.latest_verification_for_consumer_branches(forbid_lazy_load: false)
         elsif tags_option == true
           latest_verifications_for_cv_tags
             .select{ | v | v.consumer_id == pact_publication.consumer_id && v.provider_id == pact_publication.provider_id && pact_publication.head_pact_tags.collect(&:name).include?(v.consumer_version_tag_name) }

data/lib/pact_broker/integrations/integration.rb

@@ -8,6 +8,7 @@ require "pact_broker/verifications/latest_verification_for_consumer_and_provider
 module PactBroker
   module Integrations
     class Integration < Sequel::Model(Sequel::Model.db[:integrations].select(:id, :consumer_id, :provider_id))
+      set_primary_key :id
       plugin :insert_ignore, identifying_columns: [:consumer_id, :provider_id]
       associate(:many_to_one, :consumer, :class => "PactBroker::Domain::Pacticipant", :key => :consumer_id, :primary_key => :id)
       associate(:many_to_one, :provider, :class => "PactBroker::Domain::Pacticipant", :key => :provider_id, :primary_key => :id)

data/lib/pact_broker/locale/en.yml

@@ -2,17 +2,10 @@ en:
   errors:
     not_blank?: "can't be blank"
     filled?: "can't be blank"
-    valid_method?: "is not a recognised HTTP method"
     valid_url?: "is not a valid URL eg. http://example.org"
     base64?: "is not valid Base64"
-    valid_version_number?: "Version number '%{value}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
-    name_in_path_matches_name_in_pact?: "does not match %{left} name in path ('%{right}')."
-    valid_consumer_version_number?: "Consumer version number '%{value}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
-    non_templated_host?: "cannot have a template parameter in the host"
-    pacticipant_exists?: "does not match an existing pacticipant"
     single_line?: "cannot contain multiple lines"
     no_spaces?: "cannot contain spaces"
-    environment_with_name_exists?: "with name '%{value}' does not exist"
     none?: "cannot be provided"
 
   pact_broker:
@@ -68,33 +61,61 @@ en:
         version_branch: Configure the version branch to be the value of your repository branch.
     errors:
       validation:
-        blank: "cannot be blank."
+        no_spaces: "cannot contain spaces"
+        single_line: "cannot contain multiple lines"
+        environment_not_found: "with name '%{value}' does not exist"
+        blank: "cannot be blank"
+        cannot_be_provided_at_same_time: "%{name_1} and %{name_2} cannot be provided at the same time"
+        blank_with_name: "%{name} cannot be blank"
         attribute_missing: "Missing required attribute '%{attribute}'"
         invalid_http_method: "Invalid HTTP method '%{method}'"
         invalid_url: "Invalid URL '%{url}'. Expected format: http://example.org"
         pact_missing_pacticipant_name: "was not found at expected path $.%{pacticipant}.name in the submitted pact file."
-        pact_content_modification_not_allowed: "Cannot change the content of the pact for %{consumer_name} version %{consumer_version_number} and provider %{provider_name}, as race conditions will cause unreliable results for can-i-deploy. Each pact must be published with a unique consumer version number. For more information see https://docs.pact.io/go/versioning"
+        pact_content_modification_not_allowed: "Cannot change the content of the pact for %{consumer_name} version %{consumer_version_number} and provider %{provider_name}, as race conditions will cause unreliable results for can-i-deploy. Each pact must be published with a unique consumer version number. Some Pact libraries generate random data when a concrete value for a type matcher is not specified, and this can cause the contract to mutate - ensure you have given example values for all type matchers. For more information see https://docs.pact.io/go/versioning"
         consumer_version_number_missing: "Please specify the consumer version number by setting the X-Pact-Consumer-Version header."
         consumer_version_number_header_invalid: "X-Pact-Consumer-Version '%{consumer_version_number}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
-        consumer_version_number_invalid: "Consumer version number '%{consumer_version_number}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
         pacticipant_name_mismatch: "in pact ('%{name_in_pact}') does not match %{pacticipant} name in path ('%{name}')."
-        consumer_name_in_content_mismatch_pacticipant_name: "consumer name in contract content ('%{consumer_name_in_content}') must match pacticipantName ('%{pacticipant_name}')"
         consumer_name_in_contract_mismatch_pacticipant_name: "consumerName ('%{consumer_name_in_contract}') must match pacticipantName ('%{pacticipant_name}')"
-        provider_name_in_content_mismatch: "provider name in contract content ('%{provider_name_in_content}') must match providerName ('%{provider_name}') in contracts"
+        consumer_name_in_content_mismatch: "consumer name in contract content ('%{consumer_name_in_content}') must match consumerName in contract params ('%{consumer_name}')"
+        provider_name_in_content_mismatch: "provider name in contract content ('%{provider_name_in_content}') must match providerName in contract params ('%{provider_name}')"
         connection_encoding_not_utf8: "The Sequel connection encoding (%{encoding}) is strongly recommended to be \"utf8\". If you need to set it to %{encoding} for some particular reason, then disable this check by setting config.validate_database_connection_config = false"
         invalid_webhook_uuid: The UUID can only contain the characters A-Z, a-z, 0-9, _ and -, and must be 16 or more characters.
         pacticipant_not_found: No pacticipant with name '%{name}' found
-        environment_name_must_be_unique: Another environment with name '%{name}' already exists.
+        environment_name_must_be_unique: "name '%{name}' is already used by an existing environment."
         must_specify_environment_or_tag: Must specify either an environment or a 'to' tag.
         cannot_specify_tag_and_environment: Cannot specify both a 'to' tag and an environment.
         cannot_specify_latest_and_environment: Cannot specify both latest=true and an environment.
         cannot_specify_more_than_one_destination_identifier: Cannot specify more than one of tag, environment and mainBranch.
         environment_with_name_not_found: "Environment with name '%{name}' does not exist"
         cannot_modify_version_branch: "The branch for a pacticipant version cannot be changed once set (currently '%{old_branch}', proposed value '%{new_branch}'). Your pact publication/verification publication configurations may be in conflict with each other if you are seeing this error. If the current branch value is incorrect, you must delete the pacticipant version resource at %{version_url} and publish the pacts/verification results again with a consistent branch name."
-        invalid_content_for_content_type: "The content could not be parsed as %{content_type}"
+        invalid_content_for_content_type: "content could not be parsed as %{content_type}"
         cannot_set_currently_deployed_true: The currentlyDeployed property cannot be set back to true. Please record a new deployment.
         cannot_set_currently_supported_true: The currentlySupported property cannot be set back to true. Please record a new deployment.
         invalid_limit: The limit must be 1 or greater.
+        pacts_for_verification_selector_fallback_tag: "fallbackTag can only be set if latest is true"
+        pacts_for_verification_selector_matching_branch_requires_provider_version_branch: the providerVersionBranch must be specified when the selector matchingBranch=true is used
+        pacts_for_verification_selector_tag_and_branch_disallowed: "cannot specify both a tag and a branch"
+        pacts_for_verification_selector_fallback_tag_requires_tag: "a tag must be specified when a fallbackTag is specified"
+        pacts_for_verification_selector_fallback_branch_requires_branch: "a branch must be specified when a fallbackBranch is specified"
+        pacts_for_verification_selector_branch_and_latest_false_disallowed: cannot specify a branch with latest=false
+        pacts_for_verification_selector_main_branch_and_latest_false_disallowed: cannot specify mainBranch=true with latest=false
+        pacts_for_verification_selector_fallback_branch_and_latest_false_disallowed: fallbackBranch can only be set if latest is true
+        pacts_for_verification_selector_required_params_missing: must specify a value for environment or tag or branch, or specify mainBranch=true, matchingBranch=true, latest=true, deployed=true, released=true or deployedOrReleased=true
+        pacts_for_verification_selector_main_branch_with_other_param_disallowed: cannot specify mainBranch=true with any other criteria apart from consumer
+        pacts_for_verification_selector_matching_branch_with_other_param_disallowed: cannot specify matchingBranch=true with any other criteria apart from consumer
+        pacts_for_verification_selector_deployed_and_released_disallowed: cannot specify both deployed=true and released=true
+        pacts_for_verification_selector_deployed_and_deployed_or_released_disallowed: cannot specify both deployed=true and deployedOrReleased=true
+        pacts_for_verification_selector_released_and_deployed_or_released_disallowed: cannot specify both released=true and deployedOrReleased=true
+        pacts_for_verification_selector_provider_version_branch_empty: when pending or WIP pacts are enabled and there are no tags provided, the provider version branch must not be an empty string, as it is used in the calculations for WIP/pending. A value must be provided (recommended), or it must not be set at all.
+        pact_name_in_path_mismatch_name_in_pact: "name in pact '%{name_in_pact}' does not match name in URL path '%{name_in_path}'."
+        base64: "is not valid Base64"
+        non_utf_8_char_in_contract: "contract content has a non UTF-8 character at char %{char_number} and cannot be parsed as JSON. Fragment preceding invalid character is: '%{fragment}'"
+        invalid_consumer_version_number: "Consumer version number '%{value}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
+        invalid_version_number: "Version number '%{value}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
+        invalid_url: "is not a valid URL eg. http://example.org"
+        pacticipant_with_name_not_found: "does not match an existing pacticipant"
+        invalid_http_method: "is not a recognised HTTP method"
+        webhook_templated_host_not_allowed: "cannot have a template parameter in the host"
       duplicate_pacticipant: |
         This is the first time a pact has been published for "%{new_name}".
         The name "%{new_name}" is very similar to the following existing pacticipants:

data/lib/pact_broker/matrix/query_ids.rb

@@ -17,10 +17,10 @@ module PactBroker
 
       def self.from_selectors(selectors)
         most_specific_criteria = selectors.collect(&:most_specific_criterion)
-        all_pacticipant_ids = selectors.collect(&:pacticipant_id)
-        specified_pacticipant_ids = selectors.select(&:specified?).collect(&:pacticipant_id)
-        pacticipant_version_ids = collect_ids(most_specific_criteria, :pacticipant_version_id)
-        pacticipant_ids = collect_ids(most_specific_criteria, :pacticipant_id)
+        all_pacticipant_ids = selectors.collect(&:pacticipant_id).uniq
+        specified_pacticipant_ids = selectors.select(&:specified?).collect(&:pacticipant_id).uniq
+        pacticipant_version_ids = collect_ids(most_specific_criteria, :pacticipant_version_id).uniq
+        pacticipant_ids = collect_ids(most_specific_criteria, :pacticipant_id).uniq
         QueryIds.new(all_pacticipant_ids, specified_pacticipant_ids, pacticipant_ids, pacticipant_version_ids)
       end
 

data/lib/pact_broker/matrix/resolved_selector.rb

@@ -1,12 +1,17 @@
+require "pact_broker/hash_refinements"
+
 # A selector with the pacticipant id, name, version number, and version id set
 # This is created from either specified or inferred data, based on the user's query
 # eg.
 # can-i-deploy --pacticipant Foo --version 1 (this is a specified selector)
 #              --to prod (this is used to create inferred selectors)
+
 module PactBroker
   module Matrix
     class ResolvedSelector < Hash
 
+      using PactBroker::HashRefinements
+
       # A version ID of -1 will not match any rows, which is what we want to ensure that
       # no matrix rows are returned for a version that does not exist.
       NULL_VERSION_ID = -1
@@ -124,7 +129,7 @@ module PactBroker
       end
 
       def only_pacticipant_name_specified?
-        !!pacticipant_name && !branch && !tag && !latest? && !pacticipant_version_number && !main_branch?
+        !!pacticipant_name && self[:original_selector].without(:pacticipant_name).none?{ |_key, value| value }
       end
 
       def latest_tagged?

data/lib/pact_broker/matrix/service.rb

@@ -52,6 +52,7 @@ module PactBroker
         end
       end
 
+      # TODO create a proper contract for this
       # rubocop: disable Metrics/CyclomaticComplexity
       def validate_selectors selectors, options = {}
         error_messages = []

data/lib/pact_broker/messages.rb

@@ -16,13 +16,17 @@ module PactBroker
     #   variables to interpolate.
     # @return [String] the interpolated string
     def message(key, options={})
-      ::I18n.t(key, { :scope => :pact_broker }.merge(options))
+      ::I18n.t(key, **{ :scope => :pact_broker }.merge(options))
     end
 
     def validation_message key, options = {}
       message("errors.validation." + key, options)
     end
 
+    def validation_message_at_index key, index, options = {}
+      message("errors.validation." + key, options).chomp(".") + " (at index #{index})"
+    end
+
     def pluralize(word, count)
       if count == 1
         word

data/lib/pact_broker/pacticipants/repository.rb

@@ -2,13 +2,15 @@ require "sequel"
 require "pact_broker/domain/pacticipant"
 require "pact_broker/repositories/helpers"
 require "pact_broker/error"
+require "pact_broker/repositories/scopes"
 
 module PactBroker
   module Pacticipants
     class Repository
 
-      include PactBroker::Repositories::Helpers
       include PactBroker::Repositories
+      include PactBroker::Repositories::Helpers
+      include PactBroker::Repositories::Scopes
 
       def find_by_name name
         pacticipants = PactBroker::Domain::Pacticipant.where(name_like(:name, name)).all
@@ -22,6 +24,13 @@ module PactBroker
         pacticipant
       end
 
+      # @param [Array<String>] the array of names by which to find the pacticipants
+      def find_by_names(names)
+        return [] if names.empty?
+        name_likes = names.collect{ | name | name_like(:name, name) }
+        scope_for(PactBroker::Domain::Pacticipant).where(Sequel.|(*name_likes)).all
+      end
+
       def find_by_id id
         PactBroker::Domain::Pacticipant.where(id: id).single_record
       end
@@ -31,7 +40,7 @@ module PactBroker
       end
 
       def find(options = {}, pagination_options = {})
-        query = PactBroker::Domain::Pacticipant.select_all_qualified
+        query = scope_for(PactBroker::Domain::Pacticipant).select_all_qualified
         query = query.label(options[:label_name]) if options[:label_name]
         query.order_ignore_case(Sequel[:pacticipants][:name]).eager(:labels).eager(:latest_version).all_with_pagination_options(pagination_options)
       end
@@ -96,7 +105,7 @@ module PactBroker
       def search_by_name(pacticipant_name)
         terms = pacticipant_name.split.map { |v| v.gsub("_", "\\_") }
         string_match_query = Sequel.|( *terms.map { |term| Sequel.ilike(Sequel[:pacticipants][:name], "%#{term}%") })
-        PactBroker::Domain::Pacticipant.where(string_match_query)
+        scope_for(PactBroker::Domain::Pacticipant).where(string_match_query)
       end
 
       def set_main_branch(pacticipant, main_branch)

data/lib/pact_broker/pacticipants/service.rb

@@ -40,6 +40,13 @@ module PactBroker
         pacticipant_repository.find_by_name(name)
       end
 
+      # Used by pf
+      # @param [Array<String>]
+      # @return [Array<PactBroker::Domain::Pacticipant>]
+      def self.find_pacticipants_by_names(names)
+        pacticipant_repository.find_by_names(names)
+      end
+
       def self.find_pacticipant_by_name!(name)
         pacticipant_repository.find_by_name!(name)
       end

data/lib/pact_broker/pacts/pact_params.rb

@@ -81,24 +81,13 @@ module PactBroker
         self[:provider_name_in_pact]
       end
 
-      def consumer
-        PacticipantName.new(consumer_name, consumer_name_in_pact, "consumer")
+      def to_hash_for_validation
+        {
+          consumer_version_number: consumer_version_number,
+          consumer: { name: consumer_name, name_in_pact: consumer_name_in_pact },
+          provider: { name: provider_name, name_in_pact: provider_name_in_pact }
+        }
       end
-
-      def provider
-        PacticipantName.new(provider_name, provider_name_in_pact, "provider")
-      end
-
-      class PacticipantName < Struct.new(:name, :name_in_pact, :pacticipant)
-        def message_args
-          {
-            name: name,
-            name_in_pact: name_in_pact,
-            pacticipant: pacticipant
-          }
-        end
-      end
-
     end
   end
 end

data/lib/pact_broker/pacts/pact_version.rb

@@ -7,6 +7,7 @@ module PactBroker
   module Pacts
     class PactVersion < Sequel::Model(:pact_versions)
       include PactVersionAssociationLoaders
+      set_primary_key :id
 
       plugin :timestamps
       plugin :upsert, identifying_columns: [:consumer_id, :provider_id, :sha]

data/lib/pact_broker/policies.rb

@@ -7,19 +7,19 @@ module PactBroker
       @resource = resource
     end
 
-    def update?
+    def read?
       true
     end
 
-    def delete?
+    def update?
       true
     end
 
-    def create?
+    def delete?
       true
     end
 
-    def view?
+    def create?
       true
     end
 

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -3,20 +3,59 @@ require "logger"
 require "erb"
 require "yaml"
 require "base64"
+require "securerandom"
 
 module PactBroker
   module Test
     class HttpTestDataBuilder
 
+      class SetRequestId < Faraday::Middleware
+        def initialize(app, correlation_id, logger)
+          super(app)
+          @correlation_id = correlation_id
+          @logger = logger
+        end
+
+        def on_request(env)
+          request_id = "#{@correlation_id}-#{Time.now.to_f.to_s[7... -1]}"
+          env.request_headers["X-Request-Id"] = request_id
+          @logger.info("X-Request-Id: #{request_id}")
+        end
+      end
+
+      class LogRequestLength < Faraday::Middleware
+        def initialize(app, logger)
+          super(app)
+          @app = app
+          @logger = logger
+        end
+
+        def call(env)
+          starting = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          response = @app.call(env)
+          ending = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          elapsed = ending - starting
+          @logger.info "Response time: #{elapsed}"
+          response
+        end
+      end
+
       attr_reader :client, :last_consumer_name, :last_provider_name, :last_consumer_version_number, :last_provider_version_number, :last_provider_version_tag, :last_provider_version_branch
 
       def initialize(pact_broker_base_url, auth = {})
+        @correlation_id = SecureRandom.hex(10)
+
+        stream = ENV["DEBUG"] == "true" ? $stdout : StringIO.new
+        logger = ::Logger.new(stream)
+
         @client = Faraday.new(url: pact_broker_base_url) do |faraday|
+          faraday.use LogRequestLength, logger
+          faraday.use SetRequestId, @correlation_id, logger
           faraday.request :json
           faraday.response :json, :content_type => /\bjson$/
           if ENV["DEBUG"] == "true"
-            faraday.response :logger, ::Logger.new($stdout), headers: false, body: true do | logger |
-              logger.filter(/(Authorization: ).*/,'\1[REMOVED]')
+            faraday.response :logger, logger, headers: false, body: true do | l |
+              l.filter(/(Authorization: ).*/,'\1[REMOVED]')
             end
           end
           faraday.basic_auth(auth[:username], auth[:password]) if auth[:username]
@@ -30,6 +69,11 @@ module PactBroker
         self
       end
 
+      def print_correlation_id
+        puts "Correlation ID is #{@correlation_id}"
+        self
+      end
+
       def separate
         puts "\n=============================================================\n\n"
       end

data/lib/pact_broker/ui/app.rb

@@ -26,7 +26,7 @@ module PactBroker
     class App
 
       def initialize
-        @app = ::Rack::Builder.new {
+        @app = ::Rack::Builder.new do
 
           map "/ui/relationships" do
             run PactBroker::UI::Controllers::Index
@@ -69,7 +69,7 @@ module PactBroker
             use PathInfoFixer
             run PactBroker::UI::Controllers::Index
           end
-        }
+        end
       end
 
       def call env

data/lib/pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version.rb

@@ -3,8 +3,8 @@ require "pact_broker/domain/verification"
 module PactBroker
   module Verifications
     class LatestVerificationIdForPactVersionAndProviderVersion < Sequel::Model(:latest_verification_id_for_pact_version_and_provider_version)
-      unrestrict_primary_key
       set_primary_key [:pact_version_id, :provider_version_id]
+      unrestrict_primary_key
 
       plugin :upsert, identifying_columns: [:pact_version_id, :provider_version_id]
 

data/lib/pact_broker/verifications/pact_version_provider_tag_successful_verification.rb

@@ -5,6 +5,7 @@ require "pact_broker/domain/verification"
 module PactBroker
   module Verifications
     class PactVersionProviderTagSuccessfulVerification < Sequel::Model
+      set_primary_key :id
       plugin :insert_ignore, identifying_columns: [:pact_version_id, :provider_version_tag_name, :wip]
     end
   end

data/lib/pact_broker/verifications/service.rb

@@ -57,12 +57,6 @@ module PactBroker
         verification_repository.delete(verification.id)
       end
 
-      def errors params
-        contract = PactBroker::Api::Contracts::VerificationContract.new(PactBroker::Domain::Verification.new)
-        contract.validate(params)
-        contract.errors
-      end
-
       def find params
         verification_repository.find(params.fetch(:consumer_name), params.fetch(:provider_name), params.fetch(:pact_version_sha), params.fetch(:verification_number))
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.106.0"
+  VERSION = "2.107.0"
 end

data/lib/pact_broker/versions/branch.rb

@@ -4,6 +4,7 @@ require "pact_broker/repositories/helpers"
 module PactBroker
   module Versions
     class Branch < Sequel::Model(:branches)
+      set_primary_key :id
       plugin :timestamps, update_on_create: true
       plugin :insert_ignore, identifying_columns: [:name, :pacticipant_id]
 

data/lib/pact_broker/versions/branch_head.rb

@@ -4,10 +4,11 @@ require "pact_broker/repositories/helpers"
 module PactBroker
   module Versions
     class BranchHead < Sequel::Model
-      plugin :upsert, identifying_columns: [:branch_id]
       set_primary_key :branch_id
       unrestrict_primary_key
 
+      plugin :upsert, identifying_columns: [:branch_id]
+
       associate(:many_to_one, :branch, :class => "PactBroker::Versions::Branch", :key => :branch_id, :primary_key => :id)
       associate(:many_to_one, :branch_version, :class => "PactBroker::Versions::BranchVersion", :key => :branch_version_id, :primary_key => :id)
       associate(:many_to_one, :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)

data/lib/pact_broker/versions/branch_version.rb

@@ -4,6 +4,7 @@ require "pact_broker/repositories/helpers"
 module PactBroker
   module Versions
     class BranchVersion < Sequel::Model(:branch_versions)
+      set_primary_key :id
       plugin :timestamps, update_on_create: true
       plugin :insert_ignore, identifying_columns: [:branch_id, :version_id]
       plugin :upsert, identifying_columns: [:branch_id, :version_id]
@@ -38,6 +39,16 @@ module PactBroker
       def pacticipant
         branch.pacticipant
       end
+
+      # For Pactflow
+      def main_branch?
+        branch_name == branch.pacticipant.main_branch
+      end
+
+      # For Pactflow
+      def number_of_versions_from_head
+        @number_of_versions_from_head ||= BranchVersion.where(branch_id: branch_id).where(Sequel.lit("version_order > ?", version_order) ).count
+      end
     end
   end
 end

data/lib/pact_broker/webhooks/execution.rb

@@ -12,7 +12,7 @@ module PactBroker
         :logs,
         Sequel[:webhook_executions][:created_at])
       )
-
+      set_primary_key :id
       plugin :timestamps
 
       dataset_module do

data/lib/pact_broker/webhooks/repository.rb

@@ -159,7 +159,7 @@ module PactBroker
 
       def find_latest_triggered_webhooks consumer, provider
         # policy already applied to pact
-        deliberately_unscoped(TriggeredWebhook)
+        scope_for(TriggeredWebhook)
           .where(consumer: consumer, provider: provider)
           .latest_triggered_webhooks
           .all

data/lib/pact_broker/webhooks/service.rb

@@ -29,6 +29,7 @@ module PactBroker
       extend PactBroker::Messages
 
       delegate [
+        :create,
         :find_by_uuid,
         :find_all,
         :update_triggered_webhook_status,
@@ -37,34 +38,15 @@ module PactBroker
         :find_latest_triggered_webhooks_for_pact,
         :fail_retrying_triggered_webhooks,
         :find_triggered_webhooks_for_pact,
-        :find_triggered_webhooks_for_verification
+        :find_triggered_webhooks_for_verification,
+        :delete_by_uuid
       ] => :webhook_repository
 
-      # Not actually a UUID. Ah well.
-      def valid_uuid_format?(uuid)
-        !!(uuid =~ /^[A-Za-z0-9_\-]{16,}$/)
-      end
 
       def next_uuid
         SecureRandom.urlsafe_base64
       end
 
-      def errors webhook, uuid = nil
-        contract = PactBroker::Api::Contracts::WebhookContract.new(webhook)
-        contract.validate(webhook.attributes)
-        messages = contract.errors.messages
-
-        if uuid && !valid_uuid_format?(uuid)
-          messages["uuid"] = [message("errors.validation.invalid_webhook_uuid")]
-        end
-
-        OpenStruct.new(messages: messages, empty?: messages.empty?, any?: messages.any?)
-      end
-
-      def create uuid, webhook, consumer, provider
-        webhook_repository.create uuid, webhook, consumer, provider
-      end
-
       def update_by_uuid uuid, params
         webhook = webhook_repository.find_by_uuid(uuid)
         maintain_redacted_params(webhook, params)
@@ -72,10 +54,6 @@ module PactBroker
         webhook_repository.update_by_uuid uuid, webhook
       end
 
-      def delete_by_uuid uuid
-        webhook_repository.delete_by_uuid uuid
-      end
-
       def delete_all_webhhook_related_objects_by_pacticipant pacticipant
         webhook_repository.delete_by_pacticipant(pacticipant)
       end

data/lib/pact_broker/webhooks/triggered_webhook.rb

@@ -10,6 +10,7 @@ module PactBroker
   module Webhooks
     class TriggeredWebhook < Sequel::Model(:triggered_webhooks)
       using PactBroker::HashRefinements
+      set_primary_key :id
       plugin :timestamps, update_on_create: true
       plugin :serialization, :json, :event_context
 

data/lib/pact_broker/webhooks/webhook_event.rb

@@ -4,6 +4,7 @@ require "pact_broker/repositories/helpers"
 module PactBroker
   module Webhooks
     class WebhookEvent < Sequel::Model
+      set_primary_key :id
       plugin :timestamps, update_on_create: true
 
       CONTRACT_PUBLISHED = "contract_published"

data/lib/pact_broker/webmachine.rb

@@ -0,0 +1,22 @@
+require "webmachine"
+require "webmachine/application_monkey_patch"
+require "webmachine/adapters/rack_mapped"
+require "webmachine/application_monkey_patch"
+require "webmachine/render_error_monkey_patch"
+
+
+module Webmachine
+  def self.build_rack_api(application_context)
+    api = Webmachine::Application.new do |app|
+      yield app
+    end
+
+    api.application_context = application_context
+
+    api.configure do |config|
+      config.adapter = :RackMapped
+    end
+
+    api.adapter
+  end
+end