pact_broker 2.105.0 → 2.107.0.beta.1

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

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:pact_versions_decorator).new(pacts).to_json(decorator_options(identifier_from_path))
+          decorator_class(:pact_versions_decorator).new(pacts).to_json(**decorator_options(identifier_from_path))
         end
 
         def pacts

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

@@ -25,18 +25,7 @@ module PactBroker
         end
 
         def malformed_request?
-          super || (request.post? && validation_errors?(webhook))
-        end
-
-        def validation_errors? webhook
-          errors = webhook_service.errors(webhook)
-
-          unless errors.empty?
-            response.headers["Content-Type"] = "application/hal+json;charset=utf-8"
-            response.body = { errors: errors.messages }.to_json
-          end
-
-          !errors.empty?
+          super || (request.post? && validation_errors_for_schema?)
         end
 
         def create_path
@@ -49,11 +38,11 @@ module PactBroker
 
         def from_json
           saved_webhook = webhook_service.create next_uuid, webhook, consumer, provider
-          response.body = decorator_class(:webhook_decorator).new(saved_webhook).to_json(decorator_options)
+          response.body = decorator_class(:webhook_decorator).new(saved_webhook).to_json(**decorator_options)
         end
 
         def to_json
-          decorator_class(:webhooks_decorator).new(webhooks).to_json(decorator_options(resource_title: "Pact webhooks"))
+          decorator_class(:webhooks_decorator).new(webhooks).to_json(**decorator_options(resource_title: "Pact webhooks"))
         end
 
         def policy_name
@@ -62,6 +51,10 @@ module PactBroker
 
         private
 
+        def schema
+          api_contract_class(:webhook_contract)
+        end
+
         def webhooks
           @webhooks ||= webhook_service.find_by_consumer_and_provider consumer, provider
         end

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

@@ -19,11 +19,15 @@ module PactBroker
         end
 
         def to_json
-          decorator_for(latest_triggered_webhooks).to_json(decorator_options(identifier_from_path))
+          decorator_for(latest_triggered_webhooks).to_json(**decorator_options(identifier_from_path))
         end
 
         def policy_name
-          :'webhooks::webhooks'
+          :'pacts::pact'
+        end
+
+        def policy_record
+          pact
         end
 
         private

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

@@ -71,7 +71,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:pacticipant_decorator).new(pacticipant).to_json(decorator_options)
+          decorator_class(:pacticipant_decorator).new(pacticipant).to_json(**decorator_options)
         end
 
         def parsed_pacticipant(pacticipant)

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

@@ -2,13 +2,11 @@ require "pact_broker/api/resources/base_resource"
 require "pact_broker/api/decorators/webhook_decorator"
 require "pact_broker/api/decorators/webhooks_decorator"
 require "pact_broker/api/contracts/webhook_contract"
-require "pact_broker/api/resources/webhook_resource_methods"
 
 module PactBroker
   module Api
     module Resources
       class PacticipantWebhooks < BaseResource
-        include WebhookResourceMethods
 
         def allowed_methods
           ["POST", "GET", "OPTIONS"]
@@ -27,7 +25,7 @@ module PactBroker
         end
 
         def malformed_request?
-          super || (request.post? && webhook_validation_errors?(webhook))
+          super || (request.post? && validation_errors_for_schema?)
         end
 
         def create_path
@@ -40,11 +38,11 @@ module PactBroker
 
         def from_json
           saved_webhook = webhook_service.create next_uuid, webhook, consumer, provider
-          response.body = decorator_class(:webhook_decorator).new(saved_webhook).to_json(decorator_options)
+          response.body = decorator_class(:webhook_decorator).new(saved_webhook).to_json(**decorator_options)
         end
 
         def to_json
-          decorator_class(:webhooks_decorator).new(webhooks).to_json(decorator_options(resource_title: "Webhooks"))
+          decorator_class(:webhooks_decorator).new(webhooks).to_json(**decorator_options(resource_title: "Webhooks"))
         end
 
         def policy_name
@@ -57,6 +55,10 @@ module PactBroker
 
         private
 
+        def schema
+          api_contract_class(:webhook_contract)
+        end
+
         def webhooks
           webhook_service.find_by_consumer_and_provider(consumer, provider)
         end

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

@@ -3,12 +3,15 @@ require "pact_broker/api/decorators/pacticipant_decorator"
 require "pact_broker/domain/pacticipant"
 require "pact_broker/hash_refinements"
 require "pact_broker/api/contracts/pacticipant_create_schema"
+require "pact_broker/api/resources/pagination_methods"
 
 module PactBroker
   module Api
     module Resources
       class Pacticipants < BaseResource
         using PactBroker::HashRefinements
+        include PaginationMethods
+
 
         def content_types_provided
           [["application/hal+json", :to_json]]
@@ -36,7 +39,7 @@ module PactBroker
 
         def from_json
           created_model = pacticipant_service.create(parsed_pacticipant.to_h)
-          response.body = decorator_for(created_model).to_json(decorator_options)
+          response.body = decorator_for(created_model).to_json(**decorator_options)
         end
 
         def create_path
@@ -44,11 +47,11 @@ module PactBroker
         end
 
         def to_json
-          generate_json(pacticipant_service.find_all_pacticipants)
+          generate_json(pacticipant_service.find_all_pacticipants(pagination_options))
         end
 
         def generate_json pacticipants
-          decorator_class(:deprecated_pacticipant_collection_decorator).new(pacticipants).to_json(decorator_options)
+          decorator_class(:deprecated_pacticipant_collection_decorator).new(pacticipants).to_json(**decorator_options)
         end
 
         def decorator_for model

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

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def generate_json pacticipants
-          decorator_class(:pacticipant_collection_decorator).new(pacticipants).to_json(decorator_options)
+          decorator_class(:pacticipant_collection_decorator).new(pacticipants).to_json(**decorator_options)
         end
 
         def policy_name

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

@@ -3,10 +3,14 @@ module PactBroker
     module Resources
       module PaginationMethods
         def pagination_options
-          {
-            page_number: request.query["pageNumber"]&.to_i,
-            page_size: request.query["pageSize"]&.to_i
-          }.compact
+          if request.query["pageNumber"] || request.query["pageSize"]
+            {
+              page_number: request.query["pageNumber"]&.to_i || 1,
+              page_size: request.query["pageSize"]&.to_i || 100
+            }
+          else
+            {}
+          end
         end
       end
     end

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

@@ -21,7 +21,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:pact_decorator).new(pact).to_json(decorator_options)
+          decorator_class(:pact_decorator).new(pact).to_json(**decorator_options)
         end
 
         def pact

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

@@ -24,7 +24,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:provider_pacts_decorator).new(pacts).to_json(decorator_options(identifier_from_path.merge(title: resource_title)))
+          decorator_class(:provider_pacts_decorator).new(pacts).to_json(**decorator_options(identifier_from_path.merge(title: resource_title)))
         end
 
         private

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

@@ -20,7 +20,7 @@ module PactBroker
         end
 
         def malformed_request?
-          super || ((request.get? || (request.post? && content_type_json?)) && schema_validation_errors?)
+          super || ((request.get? || (request.post? && content_type_json?)) && validation_errors_for_schema?(schema, query))
         end
 
         def process_post
@@ -58,7 +58,7 @@ module PactBroker
         def to_json
           log_request
           decorator_class(:verifiable_pacts_decorator).new(pacts).to_json(
-            decorator_options(
+            **decorator_options(
               include_pending_status: parsed_query_params.include_pending_status,
               title: "Pacts to be verified by provider #{provider_name}",
               deprecated: request.get?
@@ -66,10 +66,10 @@ module PactBroker
           )
         end
 
-        def query_schema
+        def schema
           if request.get?
             PactBroker::Api::Contracts::PactsForVerificationQueryStringSchema
-          else
+          elsif request.post?
             PactBroker::Api::Contracts::PactsForVerificationJSONQuerySchema
           end
         end
@@ -95,15 +95,6 @@ module PactBroker
         def nested_query
           @nested_query ||= Rack::Utils.parse_nested_query(request.uri.query)
         end
-
-        def schema_validation_errors?
-          if (errors = query_schema.call(query)).any?
-            set_json_validation_error_messages(errors)
-            true
-          else
-            false
-          end
-        end
       end
     end
   end

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

@@ -40,11 +40,16 @@ module PactBroker
           :'contracts::contracts'
         end
 
-        # for Pactflow
+        # for pactflow
         def policy_record
           @policy_record ||= pacticipant_service.find_pacticipant_by_name(parsed_contracts.pacticipant_name)
         end
 
+        # for pactflow
+        def policy_record_context
+          { pacticipant: policy_record }
+        end
+
         private
 
         def parsed_contracts
@@ -81,7 +86,7 @@ module PactBroker
         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)
+            response.body = decorator_class(:publish_contracts_results_decorator).new(results).to_json(**decorator_options)
           end
         end
 
@@ -105,7 +110,7 @@ module PactBroker
 
         # TODO put this somewhere shareable
         def parse_yaml(content)
-          YAML.safe_load(content, [Time, Date, DateTime]) rescue nil
+          YAML.safe_load(content, permitted_classes: [Time, Date, DateTime]) rescue nil
         end
 
         def parse_json(content)

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

@@ -31,7 +31,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:released_version_decorator).new(released_version).to_json(decorator_options)
+          decorator_class(:released_version_decorator).new(released_version).to_json(**decorator_options)
         end
 
         def from_merge_patch_json

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

@@ -32,12 +32,12 @@ module PactBroker
         def from_json
           existing_released_version # make sure we have this before we update the database
           @released_version = released_version_service.create_or_update(next_released_version_uuid, version, environment)
-          response.body = decorator_class(:released_version_decorator).new(released_version).to_json(decorator_options)
+          response.body = decorator_class(:released_version_decorator).new(released_version).to_json(**decorator_options)
           true
         end
 
         def to_json
-          decorator_class(:released_versions_decorator).new(released_versions).to_json(decorator_options(title: title))
+          decorator_class(:released_versions_decorator).new(released_versions).to_json(**decorator_options(title: title))
         end
 
         def policy_name

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

@@ -36,7 +36,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:tag_decorator).new(tag).to_json(decorator_options)
+          decorator_class(:tag_decorator).new(tag).to_json(**decorator_options)
         end
 
         def tag

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

@@ -22,7 +22,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:tagged_pact_versions_decorator).new(pacts).to_json(decorator_options(identifier_from_path))
+          decorator_class(:tagged_pact_versions_decorator).new(pacts).to_json(**decorator_options(identifier_from_path))
         end
 
         def delete_resource

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

@@ -28,11 +28,11 @@ module PactBroker
         end
 
         def policy_name
-          :'webhooks::webhook'
+          :'webhooks::triggered_webhook'
         end
 
         def policy_record
-          triggered_webhook&.webhook
+          triggered_webhook
         end
 
         private

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

@@ -38,11 +38,11 @@ module PactBroker
         end
 
         def to_json
-          decorator_for(verification).to_json(decorator_options(pact: pact))
+          decorator_for(verification).to_json(**decorator_options(pact: pact))
         end
 
         def to_extended_json
-          extended_decorator_for(verification).to_json(decorator_options(pact: pact))
+          extended_decorator_for(verification).to_json(**decorator_options(pact: pact))
         end
 
         def delete_resource

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

@@ -18,7 +18,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:triggered_webhooks_decorator).new(triggered_webhooks).to_json(decorator_options(resource_title: resource_title))
+          decorator_class(:triggered_webhooks_decorator).new(triggered_webhooks).to_json(**decorator_options(resource_title: resource_title))
         end
 
         def policy_name

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

@@ -34,7 +34,7 @@ module PactBroker
         end
 
         def malformed_request?
-          super || (request.post? && any_validation_errors?)
+          super || (request.post? && validation_errors_for_schema?)
         end
 
         def create_path
@@ -45,7 +45,7 @@ module PactBroker
           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)
+            response.body = decorator_for(verification).to_json(**decorator_options)
           end
           true
         end
@@ -84,10 +84,8 @@ module PactBroker
           params(symbolize_names: false).merge("wip" => wip?, "pending" => pending?)
         end
 
-        def any_validation_errors?
-          errors = verification_service.errors(params)
-          set_json_validation_error_messages(errors.messages) if !errors.empty?
-          !errors.empty?
+        def schema
+          PactBroker::Api::Contracts::VerificationContract
         end
       end
     end

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

@@ -54,7 +54,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:version_decorator).new(version).to_json(decorator_options(environments: environments))
+          decorator_class(:version_decorator).new(version).to_json(**decorator_options(environments: environments))
         end
 
         def delete_resource

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

@@ -1,11 +1,15 @@
 require "pact_broker/api/resources/base_resource"
 require "pact_broker/configuration"
 require "pact_broker/api/decorators/versions_decorator"
+require "pact_broker/api/resources/pagination_methods"
+
 
 module PactBroker
   module Api
     module Resources
       class Versions < BaseResource
+        include PaginationMethods
+
         def content_types_provided
           [["application/hal+json", :to_json]]
         end
@@ -19,27 +23,16 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:versions_decorator).new(versions).to_json(decorator_options(identifier_from_path))
+          decorator_class(:versions_decorator).new(versions).to_json(**decorator_options(identifier_from_path))
         end
 
         def versions
-          @versions ||= pacticipant_service.find_all_pacticipant_versions_in_reverse_order(pacticipant_name, pagination_options)
+          @versions ||= version_service.find_all_pacticipant_versions_in_reverse_order(pacticipant_name, pagination_options)
         end
 
         def policy_name
           :'versions::versions'
         end
-
-        def pagination_options
-          if request.query["pageNumber"] || request.query["pageSize"]
-            {
-              page_number: request.query["pageNumber"]&.to_i || 1,
-              page_size: request.query["pageSize"]&.to_i || 100
-            }
-          else
-            nil
-          end
-        end
       end
     end
   end

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

@@ -1,15 +1,12 @@
 require "pact_broker/api/resources/base_resource"
 require "pact_broker/services"
 require "pact_broker/api/decorators/webhook_decorator"
-require "pact_broker/api/resources/webhook_resource_methods"
+require "pact_broker/api/contracts/webhook_contract"
 
 module PactBroker
   module Api
     module Resources
       class Webhook < BaseResource
-
-        include WebhookResourceMethods
-
         def content_types_accepted
           [["application/json", :from_json]]
         end
@@ -31,7 +28,7 @@ module PactBroker
         end
 
         def malformed_request?
-          super || (request.put? && webhook_validation_errors?(parsed_webhook, uuid))
+          super || (request.put? && validation_errors_for_schema?(schema, { uuid: uuid }.compact.merge(params)))
         end
 
         def from_json
@@ -46,7 +43,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_class(:webhook_decorator).new(webhook).to_json(decorator_options)
+          decorator_class(:webhook_decorator).new(webhook).to_json(**decorator_options)
         end
 
         def delete_resource
@@ -80,6 +77,10 @@ module PactBroker
           @parsed_webhook ||= decorator_class(:webhook_decorator).new(PactBroker::Domain::Webhook.new).from_json(request_body)
         end
 
+        def schema
+          api_contract_class(:webhook_contract)
+        end
+
         def uuid
           identifier_from_path[:uuid]
         end

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

@@ -1,7 +1,6 @@
 require "pact_broker/api/resources/base_resource"
 require "pact_broker/services"
 require "pact_broker/api/decorators/webhook_execution_result_decorator"
-require "pact_broker/api/resources/webhook_resource_methods"
 require "pact_broker/constants"
 require "pact_broker/webhooks/execution_configuration"
 require "pact_broker/api/resources/webhook_execution_methods"
@@ -10,7 +9,6 @@ module PactBroker
   module Api
     module Resources
       class WebhookExecution < BaseResource
-        include WebhookResourceMethods
         include WebhookExecutionMethods
 
         def content_types_provided
@@ -39,7 +37,7 @@ module PactBroker
             if uuid
               false
             else
-              webhook_validation_errors?(webhook)
+              validation_errors_for_schema?
             end
           else
             false
@@ -61,7 +59,7 @@ module PactBroker
         private
 
         def post_response_body webhook_execution_result
-          decorator_class(:webhook_execution_result_decorator).new(webhook_execution_result).to_json(decorator_options)
+          decorator_class(:webhook_execution_result_decorator).new(webhook_execution_result).to_json(**decorator_options)
         end
 
         def webhook
@@ -88,6 +86,10 @@ module PactBroker
         def build_unsaved_webhook
           decorator_class(:webhook_decorator).new(PactBroker::Domain::Webhook.new).from_json(request_body)
         end
+
+        def schema
+          api_contract_class(:webhook_contract)
+        end
       end
     end
   end

data/lib/pact_broker/api.rb

@@ -1,7 +1,8 @@
-require "webmachine/adapters/rack_mapped"
+require "pact_broker/webmachine"
 require "pact_broker/db/models"
 require "pact_broker/api/resources"
 require "pact_broker/api/decorators"
+require "pact_broker/api/contracts"
 require "pact_broker/application_context"
 require "pact_broker/feature_toggle"
 
@@ -25,7 +26,7 @@ end
 module PactBroker
   # rubocop: disable Metrics/MethodLength
   def self.build_api(application_context = PactBroker::ApplicationContext.default_application_context)
-    pact_api = Webmachine::Application.new do |app|
+    Webmachine.build_rack_api(application_context) do |app|
       app.routes do
         add(["trace", :*], Webmachine::Trace::TraceResource) unless ENV["RACK_ENV"] == "production"
 
@@ -139,17 +140,6 @@ module PactBroker
         add [], Api::Resources::Index, {resource_name: "index"}
       end
     end
-
-    # naughty, but better than setting each route manually
-    pact_api.routes.each do | route |
-      route.instance_variable_get(:@bindings)[:application_context] = application_context
-    end
-
-    pact_api.configure do |config|
-      config.adapter = :RackMapped
-    end
-
-    pact_api.adapter
   end
 
 

data/lib/pact_broker/app.rb

@@ -20,7 +20,6 @@ require "rack/pact_broker/ui_request_filter"
 require "rack/pact_broker/ui_authentication"
 require "rack/pact_broker/configurable_make_it_later"
 require "rack/pact_broker/no_auth"
-require "rack/pact_broker/convert_404_to_hal"
 require "rack/pact_broker/reset_thread_data"
 require "rack/pact_broker/add_vary_header"
 require "rack/pact_broker/use_when"
@@ -256,7 +255,6 @@ module PactBroker
       api_apps.unshift(@custom_api) if @custom_api
       builder = ::Rack::Builder.new
       builder.use @make_it_later_api_auth
-      builder.use Rack::PactBroker::Convert404ToHal
       builder.use Rack::PactBroker::DatabaseTransaction, configuration.database_connection
       builder.run Rack::Cascade.new(api_apps, [404])
       builder

data/lib/pact_broker/application_context.rb

@@ -3,7 +3,7 @@ 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_body_generator"
+require "pact_broker/api/resources/error_response_generator"
 
 module PactBroker
   class ApplicationContext
@@ -15,7 +15,7 @@ module PactBroker
                 :before_resource,
                 :after_resource,
                 :error_logger,
-                :error_response_body_generator
+                :error_response_generator
 
     def initialize(params = {})
       params_with_defaults = {
@@ -24,7 +24,7 @@ module PactBroker
         decorator_context_creator: PactBroker::Api::Decorators::DecoratorContextCreator,
         webhook_execution_configuration_creator: PactBroker::Webhooks::ExecutionConfigurationCreator,
         error_logger: PactBroker::Errors::ErrorLogger,
-        error_response_body_generator: PactBroker::Api::Resources::ErrorResponseBodyGenerator
+        error_response_generator: PactBroker::Api::Resources::ErrorResponseGenerator
       }.merge(params)
 
       @decorator_configuration = params_with_defaults[:decorator_configuration]
@@ -35,7 +35,7 @@ module PactBroker
       @before_resource = params_with_defaults[:before_resource]
       @after_resource = params_with_defaults[:after_resource]
       @error_logger = params_with_defaults[:error_logger]
-      @error_response_body_generator = params_with_defaults[:error_response_body_generator]
+      @error_response_generator = params_with_defaults[:error_response_generator]
 
     end
 

data/lib/pact_broker/certificates/certificate.rb

@@ -1,6 +1,7 @@
 module PactBroker
   module Certificates
     class Certificate < Sequel::Model
+      set_primary_key :id
     end
 
     Certificate.plugin :timestamps, update_on_create: true