pact_broker 2.88.0 → 2.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b886a748e8133256c6b1a48f018263b18abe3e907878bd659941529791052b72
-  data.tar.gz: a236b15253a54764939b260d80aa77e1c3635448ce486606f6013df9f864029d
+  metadata.gz: c1634d0a3519aae8c805e0c8f13e2e132e86b623c92e019d37285b98ecd7574d
+  data.tar.gz: 2652bd80a29b04e222bad6ffb0513c95618f16185feb98cffc9c7bd283858b79
 SHA512:
-  metadata.gz: cededddf5b3eacacd0bc3347bb3350156d2acb5bd29bfd0f43b2a234470ec7a592f4a0b41c167d47f9ec25815092d5bdde16d688b4ded08cce6c1c57008683b3
-  data.tar.gz: 683226ee8e28b2055a0e99623c7b2fbbb0bc959308eee60d00f5f255a23411331818c236082f23f56ac4752bd32b63fbe37a702747ce99300e3980dbaa5d4262
+  metadata.gz: 8e3bc701ea3fe67d6ffe24330faf61b5def23d7293e2c59bfa1d4c5b8874dd3ef8b622f8adbef202bdfd784804f67a5c9efd39c79c1bba54bb52a8fe2abc7661
+  data.tar.gz: ab7a4c68f71251bbf36e3f58bb18267b28cc1bd72df5f3959caedd8fe1b776439b6ba25fd972f2a819ba5f0872d9861d22284da501a5d921f255aea368bedfab

data/CHANGELOG.md

@@ -1,3 +1,57 @@
+<a name="v2.91.0"></a>
+### v2.91.0 (2021-11-15)
+
+#### Features
+
+* add environments to matrix response	 ([fd50f22c](/../../commit/fd50f22c))
+* remove feature toggle around change to return the pact for the latest tagged version, rather than the latest pact that has a version with the tag	 ([fac3fc8a](/../../commit/fac3fc8a))
+
+#### Bug Fixes
+
+* load images from the correct path when the Pact Broker application is run from a non root context	 ([a268ef25](/../../commit/a268ef25))
+
+<a name="v2.90.0"></a>
+### v2.90.0 (2021-11-12)
+
+#### Features
+
+* do not let clean task delete currently deployed or currently released+supported versions	 ([b05f0b67](/../../commit/b05f0b67))
+* allow webhook certificates to be configured in the pact_broker.yml file	 ([7c60c955](/../../commit/7c60c955))
+
+#### Bug Fixes
+
+* handle conflict check for pacts where the interactions are missing in one or the other	 ([71844f0f](/../../commit/71844f0f))
+* fix error that occurs in some versions of Sqlite when running 20210702_drop_unused_columns_from_deployed_versions.rb	 ([0daa4459](/../../commit/0daa4459))
+* correct logic when redacting database URL without a password	 ([30d66cf7](/../../commit/30d66cf7))
+* set resolved environment for environment selectors	 ([f02474b7](/../../commit/f02474b7))
+
+* **deps**
+  * upgrade to bootstrap v4.6.1	 ([0433107c](/../../commit/0433107c))
+
+<a name="v2.89.1"></a>
+### v2.89.1 (2021-10-28)
+
+#### Bug Fixes
+
+* **clean**
+  * honour max_age when set in clean selector	 ([828420d4](/../../commit/828420d4))
+
+* null safe navigation in case a branch head does not exist for a branch version	 ([4b259a81](/../../commit/4b259a81))
+
+<a name="v2.89.0"></a>
+### v2.89.0 (2021-10-15)
+
+#### Features
+
+* add applicationInstance to deployed version resource as a replacement for target	 ([9bfafc8a](/../../commit/9bfafc8a))
+* apply allow_dangerous_contract_modification setting when publishing using the /contracts/publish endpoint	 ([956227fe](/../../commit/956227fe))
+* add support for matchingBranch property in consumer version selectors	 ([48068d29](/../../commit/48068d29))
+
+#### Bug Fixes
+
+* set missing provider branch name parameter for contract_requiring_verification_published webhooks	 ([777ccdd2](/../../commit/777ccdd2))
+* correct misnamed database port configuration property causing the PACT_BROKER_DATABASE_PORT not to be respected	 ([3d14013a](/../../commit/3d14013a))
+
 <a name="v2.88.0"></a>
 ### v2.88.0 (2021-10-11)
 

data/db/ddl_statements/all_verifications.rb

@@ -0,0 +1,21 @@
+def all_verifications_v2(connection)
+  # Need to fully qualify build_url because versions now has a build_url too.
+  # We don't use this view any more but we get an error when modifying other tables and views
+  # if we don't update this, so it must force some re-calculation to be done.
+  # See https://github.com/pact-foundation/pact_broker/issues/521
+  connection
+    .from(:verifications)
+    .select(
+      Sequel[:verifications][:id],
+      Sequel[:verifications][:number],
+      :success,
+      :provider_version_id,
+      Sequel[:v][:number].as(:provider_version_number),
+      Sequel[:v][:order].as(:provider_version_order),
+      Sequel[:verifications][:build_url],
+      :pact_version_id,
+      :execution_date,
+      Sequel[:verifications][:created_at],
+      :test_results
+    ).join(:versions, { id: :provider_version_id }, { :table_alias => :v })
+end

data/db/migrations/20210701_recreate_all_verifications.rb

@@ -0,0 +1,18 @@
+require_relative "../ddl_statements/all_verifications"
+
+# Naughtily insert this migration file after the creation of 20211104_switch_integrations_and_temp_integrations.rb
+# to fix the all_verifications view before
+# dropping the columns in 20210702_drop_unused_columns_from_deployed_versions.rb.
+# The update to all_verifications was already applied in
+# 20211101_recreate_all_verifications.rb, but some versions of SQLite error
+# if the view is not updated first, meaning 20210702 was never run.
+# It won't matter if this update runs out of order, as long as it's after
+# 20210117_add_branch_to_version.rb
+Sequel.migration do
+  up do
+    create_or_replace_view(:all_verifications, all_verifications_v2(self))
+  end
+
+  down do
+  end
+end

data/db/migrations/20211101_recreate_all_verifications.rb

@@ -0,0 +1,10 @@
+require_relative "../ddl_statements/all_verifications"
+
+Sequel.migration do
+  up do
+    create_or_replace_view(:all_verifications, all_verifications_v2(self))
+  end
+
+  down do
+  end
+end

data/db/migrations/20211102_create_table_temp_integrations.rb

@@ -0,0 +1,26 @@
+Sequel.migration do
+  up do
+    # Have not created indexes on the consumer_id or provider_id because the table is likely to be small
+    # (in the 10s or 100s) and it would probably just do a full table scan anyway.
+    create_table(:temp_integrations, charset: "utf8") do
+      primary_key :id, primary_key_constraint_name: "integrations_pkey"
+      foreign_key(:consumer_id, :pacticipants, null: false, on_delete: :cascade, foreign_key_constraint_name: "integrations_consumer_id_foreign_key")
+      foreign_key(:provider_id, :pacticipants, null: false, on_delete: :cascade, foreign_key_constraint_name: "integrations_provider_id_foreign_key")
+      String :consumer_name
+      String :provider_name
+      DateTime :created_at, null: false
+      index([:consumer_id, :provider_id], unique: true, name: "integrations_consumer_id_provider_id_unique")
+    end
+
+    # TODO drop these columns
+    # They are just for backwards compatiblity during schema migrations
+    # alter_table(:integrations) do
+    #   drop_column(:consumer_name)
+    #   drop_column(:provider_name)
+    # end
+  end
+
+  down do
+    drop_table(:temp_integrations)
+  end
+end

data/db/migrations/20211103_migrate_integrations.rb

@@ -0,0 +1,21 @@
+Sequel.migration do
+  up do
+    from(:temp_integrations).insert(
+      [:consumer_id, :consumer_name, :provider_id, :provider_name, :created_at],
+      from(:pact_publications)
+        .select(
+          :consumer_id,
+          Sequel[:c][:name].as(:consumer_name),
+          :provider_id,
+          Sequel[:p][:name].as(:provider_name),
+          Sequel[:c][:created_at]
+        ).distinct
+        .join(:pacticipants, {:id => :consumer_id}, {:table_alias => :c, implicit_qualifier: :pact_publications})
+        .join(:pacticipants, {:id => :provider_id}, {:table_alias => :p, implicit_qualifier: :pact_publications})
+    )
+  end
+
+  down do
+
+  end
+end

data/db/migrations/20211104_switch_integrations_and_temp_integrations.rb

@@ -0,0 +1,25 @@
+Sequel.migration do
+  up do
+    transaction do
+      drop_view :integrations
+      rename_table :temp_integrations, :integrations
+    end
+  end
+
+  down do
+    transaction do
+      rename_table :integrations, :temp_integrations
+      create_view(:integrations,
+        from(:pact_publications)
+          .select(
+            :consumer_id,
+            Sequel[:c][:name].as(:consumer_name),
+            :provider_id,
+            Sequel[:p][:name].as(:provider_name)
+          ).distinct
+          .join(:pacticipants, {:id => :consumer_id}, {:table_alias => :c, implicit_qualifier: :pact_publications})
+          .join(:pacticipants, {:id => :provider_id}, {:table_alias => :p, implicit_qualifier: :pact_publications})
+      )
+    end
+  end
+end

data/docs/CONFIGURATION.md

@@ -1,7 +1,7 @@
 # Pact Broker Configuration
 
 
-<!-- This is a generated file. Please do not edit it directly. -->
+<!-- This is a generated file. Please do not edit it directly. The source is https://github.com/pact-foundation/pact_broker/blob/master/docs/configuration.yml -->
 
 The Pact Broker supports configuration via environment variables or a YAML file from version 2.87.0.1 of the Docker images.
 
@@ -392,6 +392,26 @@ Please read the [Webhook whitelists section](https://docs.pact.io/pact_broker/co
 **Examples:** `github.com`, `10.2.3.41/24`, `/.*\\.foo\\.com$/`<br/>
 **More information:** https://docs.pact.io/pact_broker/configuration/#webhook-whitelists<br/>
 
+### webhook_certificates
+
+A list of SSL certificate configuration objects with the keys `description`, and either `content` or `path`. These
+certificates are used when a webhook needs to connect to a server that uses a self signed certificate.
+
+Each certificate configuration item accepts a chain of certificates in PEM format - there may be multiple 'BEGIN CERTIFICATE' and 'END CERTIFICATE' in the content of each item.
+
+When setting the content, use the syntax "content: |-" followed by a new line, and then the contents of the certificate
+chain in PEM format, indented by 2 more characters.
+
+When setting the path, the full path to the certificate file in PEM format must be specified.
+
+The certificate configuration is not validated on startup. If any of the configured certificates cannot be loaded during the execution of a webhook, an error
+will be logged, and they will be ignored. You can check if the configuration is working by testing the execution of
+a webhook that connects to the server with the self signed certificate by following these instructions https://docs.pact.io/pact_broker/webhooks/debugging_webhooks#testing-webhook-execution
+
+**YAML configuration key name:** `webhook_certificates`<br/>
+**Environment variable name:** `PACT_BROKER_WEBHOOK_CERTIFICATES`<br/>
+**Supported versions:** From v2.90.0<br/>
+
 ### disable_ssl_verification
 
 If set to true, SSL verification will be disabled for the HTTP requests made by the webhooks
@@ -481,6 +501,16 @@ is available (do not use this for load balancing, as it makes a database connect
 **Default:** `true`<br/>
 **Allowed values:** `true`, `false`<br/>
 
+### use_hal_browser
+
+Whether or not to enable the embedded HAL Browser.
+
+**YAML configuration key name:** `use_hal_browser`<br/>
+**Environment variable name:** `PACT_BROKER_USE_HAL_BROWSER`<br/>
+**Default:** `true`<br/>
+**Allowed values:** `true`, `false`<br/>
+**More information:** https://github.com/mikekelly/hal-browser<br/>
+
 <br/>
 
 ## Domain

data/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema.rb

@@ -15,7 +15,7 @@ module PactBroker
         using PactBroker::HashRefinements
         using PactBroker::StringRefinements
 
-        BRANCH_KEYS = [:latest, :tag, :fallbackTag, :branch, :fallbackBranch]
+        BRANCH_KEYS = [:latest, :tag, :fallbackTag, :branch, :fallbackBranch, :matchingBranch]
         ENVIRONMENT_KEYS = [:environment, :deployed, :released, :deployedOrReleased]
         ALL_KEYS = BRANCH_KEYS + ENVIRONMENT_KEYS
 
@@ -36,6 +36,7 @@ module PactBroker
               optional(:mainBranch).filled(included_in?: [true])
               optional(:tag).filled(:str?)
               optional(:branch).filled(:str?)
+              optional(:matchingBranch).filled(included_in?: [true])
               optional(:latest).filled(included_in?: [true, false])
               optional(:fallbackTag).filled(:str?)
               optional(:fallbackBranch).filled(:str?)
@@ -65,7 +66,7 @@ module PactBroker
           # This is a ducking joke. Need to get rid of dry-validation
           if params[:consumerVersionSelectors].is_a?(Array)
             errors = params[:consumerVersionSelectors].each_with_index.flat_map do | selector, index |
-              validate_consumer_version_selector(selector, index)
+              validate_consumer_version_selector(selector, index, params)
             end
             if errors.any?
               results[:consumerVersionSelectors] ||= []
@@ -82,7 +83,7 @@ module PactBroker
         # when setting the branch, it doesn't make sense to verify all pacts for a branch,
         # so latest is not required, but cannot be set to false
         # rubocop: disable Metrics/CyclomaticComplexity, Metrics/MethodLength
-        def self.validate_consumer_version_selector(selector, index)
+        def self.validate_consumer_version_selector(selector, index, params)
           errors = []
 
           if selector[:fallbackTag] && !selector[:latest]
@@ -97,17 +98,22 @@ module PactBroker
               not_provided?(selector[:tag]) &&
               not_provided?(selector[:branch]) &&
               not_provided?(selector[:environment]) &&
+              selector[:matchingBranch] != true &&
               selector[:deployed] != true &&
               selector[:released] != true &&
               selector[:deployedOrReleased] != true &&
               selector[:latest] != true
-            errors << "must specify a value for environment or tag or branch, or specify mainBranch=true, latest=true, deployed=true, released=true or deployedOrReleased=true (at index #{index})"
+            errors << "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 (at index #{index})"
           end
 
           if selector[:mainBranch] && selector.slice(*ALL_KEYS - [:consumer, :mainBranch]).any?
             errors << "cannot specify mainBranch=true with any other criteria apart from consumer (at index #{index})"
           end
 
+          if selector[:matchingBranch] && selector.slice(*ALL_KEYS - [:consumer, :matchingBranch]).any?
+            errors << "cannot specify matchingBranch=true with any other criteria apart from consumer (at index #{index})"
+          end
+
           if selector[:tag] && selector[:branch]
             errors << "cannot specify both a tag and a branch (at index #{index})"
           end
@@ -136,6 +142,10 @@ module PactBroker
             errors << "cannot specify both released=true and deployedOrReleased=true (at index #{index})"
           end
 
+          if selector[:matchingBranch] && not_provided?(params[:providerVersionBranch])
+            errors << "the providerVersionBranch must be specified when the selector matchingBranch=true is used (at index #{index})"
+          end
+
           non_environment_fields = selector.slice(*BRANCH_KEYS).keys.sort
           environment_related_fields = selector.slice(*ENVIRONMENT_KEYS).keys.sort
 

data/lib/pact_broker/api/decorators/deployed_version_decorator.rb

@@ -9,7 +9,8 @@ module PactBroker
       class DeployedVersionDecorator < BaseDecorator
         property :uuid
         property :currently_deployed, camelize: true
-        property :target, camelize: true
+        property :target, camelize: true # deprecated
+        property :applicationInstance, getter: lambda { |_| target }
         include Timestamps
         property :undeployedAt, getter: lambda { |_|  undeployed_at ? FormatDateTime.call(undeployed_at) : nil }, writeable: false
 

data/lib/pact_broker/api/decorators/embedded_environment_decorator.rb

@@ -0,0 +1,25 @@
+require_relative "base_decorator"
+require_relative "timestamps"
+
+module PactBroker
+  module Api
+    module Decorators
+      class EmbeddedEnvironmentDecorator < BaseDecorator
+        property :uuid, writeable: false
+        property :name
+        property :display_name, camelize: true
+        property :production
+
+        include Timestamps
+
+        link :self do | user_options |
+          {
+            title: "Environment",
+            name: represented.name,
+            href: environment_url(represented, user_options.fetch(:base_url))
+          }
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/decorators/matrix_decorator.rb

@@ -3,6 +3,7 @@ require "pact_broker/api/pact_broker_urls"
 require "pact_broker/api/decorators/reason_decorator"
 require "pact_broker/api/decorators/format_date_time"
 require "pact_broker/api/decorators/embedded_branch_version_decorator"
+require "pact_broker/api/decorators/embedded_environment_decorator"
 
 module PactBroker
   module Api
@@ -85,7 +86,9 @@ module PactBroker
             version: {
               number: line.consumer_version_number,
               branch: line.consumer_version_branch_versions.last&.branch_name,
-              branches: branches(line.consumer_version_branch_versions, base_url),
+              branches: branches(line.consumer_version_branch_versions, base_url), # TODO delete this
+              branchVersions: branches(line.consumer_version_branch_versions, base_url),
+              environments: environments(line.consumer_version_deployed_versions, line.consumer_version_released_versions, base_url),
               _links: {
                 self: {
                   href: version_url(base_url, consumer_version)
@@ -107,6 +110,16 @@ module PactBroker
           end
         end
 
+        def environments(deployed_versions, released_versions, base_url)
+          (deployed_versions + released_versions).sort_by(&:created_at).collect(&:environment).uniq.collect do | environment |
+            environment_decorator_class.new(environment).to_hash(user_options: { base_url: base_url })
+          end
+        end
+
+        def environment_decorator_class
+          PactBroker::Api::Decorators::EmbeddedEnvironmentDecorator
+        end
+
         def tags(tags, base_url)
           tags.sort_by(&:created_at).collect do | tag |
             {
@@ -136,7 +149,9 @@ module PactBroker
             hash[:version] = {
               number: line.provider_version_number,
               branch: line.provider_version_branch_versions.last&.branch_name,
-              branches: branches(line.provider_version_branch_versions, base_url),
+              branches: branches(line.provider_version_branch_versions, base_url), # TODO delete this
+              branchVersions: branches(line.provider_version_branch_versions, base_url),
+              environments: environments(line.provider_version_deployed_versions, line.provider_version_released_versions, base_url),
               _links: {
                 self: {
                   href: version_url(base_url, provider_version)

data/lib/pact_broker/api/decorators/pacts_for_verification_query_decorator.rb

@@ -21,6 +21,10 @@ module PactBroker
             represented.branch = fragment
             represented.latest = true
           }
+          property :matching_branch, setter: -> (fragment:, represented:, **) {
+            represented.matching_branch = fragment
+            represented.latest = true
+          }
           property :latest,
             setter: ->(fragment:, represented:, **) {
               represented.latest = (fragment == "true" || fragment == true)
@@ -53,6 +57,9 @@ module PactBroker
           result = super(hash&.snakecase_keys)
 
           result.consumer_version_selectors = split_out_deployed_or_released_selectors(result.consumer_version_selectors)
+          if result.provider_version_branch
+            result.consumer_version_selectors = set_branch_for_matching_branch_selectors(result.consumer_version_selectors, result.provider_version_branch)
+          end
 
           if result.consumer_version_selectors && !result.consumer_version_selectors.is_a?(PactBroker::Pacts::Selectors)
             result.consumer_version_selectors = PactBroker::Pacts::Selectors.new(result.consumer_version_selectors)
@@ -62,6 +69,17 @@ module PactBroker
 
         private
 
+        def set_branch_for_matching_branch_selectors(consumer_version_selectors, provider_version_branch)
+          consumer_version_selectors.collect do | consumer_version_selector |
+            if consumer_version_selector[:matching_branch]
+              consumer_version_selector[:branch] = provider_version_branch
+              consumer_version_selector
+            else
+              consumer_version_selector
+            end
+          end
+        end
+
         def split_out_deployed_or_released_selectors(consumer_version_selectors)
           consumer_version_selectors.flat_map do | selector |
             if selector.currently_deployed && selector.currently_supported

data/lib/pact_broker/api/decorators/version_decorator.rb

@@ -7,7 +7,9 @@ module PactBroker
       class VersionDecorator < BaseDecorator
 
         property :number, writeable: false
+        # TODO delete branches in preference for branchVersions
         collection :branch_versions, as: :branches, embedded: true, writeable: false, extend: PactBroker::Api::Decorators::EmbeddedBranchVersionDecorator
+        collection :branch_versions, as: :branchVersions, embedded: true, writeable: false, extend: PactBroker::Api::Decorators::EmbeddedBranchVersionDecorator
         property :build_url, as: :buildUrl
 
         collection :tags, embedded: true, :extend => PactBroker::Api::Decorators::EmbeddedTagDecorator, class: OpenStruct

data/lib/pact_broker/api/renderers/html_pact_renderer.rb

@@ -44,6 +44,10 @@ module PactBroker
           <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/material-menu.css'>
           <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/pact.css'>
           <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/jquery-confirm.min.css'>
+          <script type='text/javascript'>
+            const BASE_URL = '#{base_url}';
+          </script>
+          <script src='#{base_url}/javascripts/set-css-asset-base-url.js'></script>
           <script src='#{base_url}/javascripts/highlight.pack.js'></script>
           <script src='#{base_url}/javascripts/jquery-3.5.1.min.js'></script>
           <script src='#{base_url}/js/bootstrap.min.js'></script>

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

@@ -60,7 +60,9 @@ module PactBroker
           query = Rack::Utils.parse_query(request.env["QUERY_STRING"])
           q = {}
           q[:pacticipant_name] = request.query["pacticipant"] if query["pacticipant"]
-          if query["target"]
+          if query["applicationInstance"]
+            q[:target] = query["applicationInstance"].blank? ? nil : query["applicationInstance"]
+          elsif query["target"]
             q[:target] = query["target"].blank? ? nil : query["target"]
           end
           q

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

@@ -30,7 +30,7 @@ module PactBroker
         end
 
         def from_json
-          @deployed_version = deployed_version_service.find_or_create(deployed_version_uuid, version, environment, target)
+          @deployed_version = deployed_version_service.find_or_create(deployed_version_uuid, version, environment, application_instance)
           response.headers["Location"] = deployed_version_url(deployed_version, base_url)
           response.body = decorator_class(:deployed_version_decorator).new(deployed_version).to_json(decorator_options)
         end
@@ -72,8 +72,9 @@ module PactBroker
         end
 
         # TODO disallow an empty string because that is used as a NULL indicator in the database
-        def target
-          params(default: {})[:target]&.to_s
+        def application_instance
+          parameters = params(default: {})
+          (parameters[:applicationInstance] || parameters[:target])&.to_s
         end
 
         def title

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

@@ -110,7 +110,7 @@ module PactBroker
 
         def disallowed_modification?
           if request.really_put? && pact_service.disallowed_modification?(pact, pact_params.json_content)
-            message_params = { consumer_name: pact_params.consumer_name, consumer_version_number: pact_params.consumer_version_number }
+            message_params = { consumer_name: pact_params.consumer_name, consumer_version_number: pact_params.consumer_version_number, provider_name: pact_params.provider_name }
             set_json_error_message(message("errors.validation.pact_content_modification_not_allowed", message_params))
             true
           else

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

@@ -31,11 +31,13 @@ module PactBroker
         end
 
         def process_post
-          handle_webhook_events(consumer_version_branch: parsed_contracts.branch, build_url: parsed_contracts.build_url) do
-            results = contract_service.publish(parsed_contracts, base_url: base_url)
-            response.body = decorator_class(:publish_contracts_results_decorator).new(results).to_json(decorator_options)
+          if conflict_notices.any?
+            set_conflict_response
+            409
+          else
+            publish_contracts
+            true
           end
-          true
         end
 
         def policy_name
@@ -66,15 +68,53 @@ module PactBroker
         end
 
         def schema
-          PactBroker::Api::Contracts::PublishContractsSchema
+          api_contract_class(:publish_contracts_schema)
         end
 
         def decode_and_parse_content(contract)
-          contract["decodedContent"] = Base64.strict_decode64(contract["content"]) rescue nil
+          contract["decodedContent"] = base64_decode(contract["content"])
           if contract["decodedContent"]
-            contract["decodedParsedContent"] = PactBroker::Pacts::Parse.call(contract["decodedContent"]) rescue nil
+            if contract["contentType"]&.include?("json")
+              contract["decodedParsedContent"] = parse_json(contract["decodedContent"])
+            elsif contract["contentType"]&.include?("yml")
+              contract["decodedParsedContent"] = parse_yaml(contract["decodedContent"])
+            end
+          end
+        end
+
+        def publish_contracts
+          handle_webhook_events(consumer_version_branch: parsed_contracts.branch, build_url: parsed_contracts.build_url) do
+            results = contract_service.publish(parsed_contracts, base_url: base_url)
+            response.body = decorator_class(:publish_contracts_results_decorator).new(results).to_json(decorator_options)
           end
         end
+
+        def set_conflict_response
+          response.body = {
+            notices: conflict_notices.collect(&:to_h),
+            errors: {
+              contracts: conflict_notices.select(&:error?).collect(&:text)
+            }
+          }.to_json
+          response.headers["Content-Type"] = "application/json;charset=utf-8"
+        end
+
+        def conflict_notices
+          @conflict_notices ||= contract_service.conflict_notices(parsed_contracts)
+        end
+
+        def base64_decode(content)
+          Base64.strict_decode64(content) rescue nil
+        end
+
+        # TODO put this somewhere shareable
+        def parse_yaml(content)
+          YAML.safe_load(content, [Time, Date, DateTime]) rescue nil
+        end
+
+        def parse_json(content)
+          PactBroker::Pacts::Parse.call(content) rescue nil
+        end
       end
     end
   end

data/lib/pact_broker/app.rb

@@ -46,7 +46,7 @@ module PactBroker
       # 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 }
       @configuration = PactBroker.configuration
-      yield configuration
+      yield configuration if block_given?
       post_configure
       prepare_database
       load_configuration_from_database

data/lib/pact_broker/certificates/service.rb

@@ -25,9 +25,12 @@ module PactBroker
       end
 
       def find_all_certificates
+        certificates_from_database + certificates_from_config
+      end
+
+      def certificates_from_database
         Certificate.collect do | certificate |
-          cert_arr = certificate.content.split(/(-----END [^\-]+-----)/).each_slice(2).map(&:join).map(&:strip).select{|s| !s.empty?}
-          cert_arr.collect do |c|
+          split_certificate_chain(certificate.content).collect do |c|
             begin
               OpenSSL::X509::Certificate.new(c)
             rescue StandardError => e
@@ -37,6 +40,33 @@ module PactBroker
           end
         end.flatten.compact
       end
+
+      def certificates_from_config
+        PactBroker.configuration.webhook_certificates.select{| c| c[:content] || c[:path] }.collect do | certificate_config, i |
+          load_certificate_config(certificate_config, i)
+        end.flatten.compact
+      end
+
+      def load_certificate_config(certificate_config, i)
+        begin
+          content = certificate_config[:content] || File.read(certificate_config[:path])
+          split_certificate_chain(content).collect do |c|
+            begin
+              OpenSSL::X509::Certificate.new(c)
+            rescue StandardError => e
+              logger.warn("Error creating certificate object from webhook_certificate at index #{i} with description #{certificate_config[:description]}", e)
+              nil
+            end
+          end
+        rescue StandardError => e
+          logger.warn("Error loading webhook_certificate at index #{i} with description #{certificate_config[:description]}", e)
+          nil
+        end
+      end
+
+      def split_certificate_chain(content)
+        content.split(/(-----END [^\-]+-----)/).each_slice(2).map(&:join).map(&:strip).select{|s| !s.empty?}
+      end
     end
   end
 end