pact_broker 2.106.0 → 2.107.0.beta.1

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/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

@@ -23,7 +23,7 @@ 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

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,9 +1,8 @@
-require "webmachine/adapters/rack_mapped"
-require "webmachine/application_monkey_patch"
-require "webmachine/render_error_monkey_patch"
+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"
 
@@ -27,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"
 
@@ -141,14 +140,6 @@ module PactBroker
         add [], Api::Resources::Index, {resource_name: "index"}
       end
     end
-
-    pact_api.application_context = application_context
-
-    pact_api.configure do |config|
-      config.adapter = :RackMapped
-    end
-
-    pact_api.adapter
   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

data/lib/pact_broker/config/setting.rb

@@ -1,6 +1,7 @@
 module PactBroker
   module Config
     class Setting < Sequel::Model(:config)
+      set_primary_key :id
 
       def set_value_from(object)
         self.type = Setting.get_db_type(object)

data/lib/pact_broker/contracts/service.rb

@@ -7,6 +7,7 @@ require "pact_broker/contracts/notice"
 require "pact_broker/events/subscriber"
 require "pact_broker/api/pact_broker_urls"
 require "pact_broker/pacts/create_formatted_diff"
+require "pact_broker/pacts/pact_params"
 
 module PactBroker
   module Contracts

data/lib/pact_broker/date_helper.rb

@@ -14,7 +14,7 @@ module PactBroker
       end
 
       def t path, options
-        I18n.t path, @options.merge(options)
+        I18n.t(path, **@options.merge(options))
       end
     end
 

data/lib/pact_broker/db/clean_incremental.rb

@@ -83,7 +83,7 @@ module PactBroker
       end
 
       def version_ids_to_keep
-        @version_ids_to_keep ||=  keep.collect { |selector| PactBroker::Domain::Version.select(:id).for_selector(selector) }.reduce(&:union)
+        @version_ids_to_keep ||=  keep.collect { |selector| PactBroker::Domain::Version.for_selector(selector).select(:id) }.reduce(&:union)
       end
 
       def current_counts

data/lib/pact_broker/db/delete_overwritten_data.rb

@@ -36,9 +36,13 @@ module PactBroker
           to_keep = deleted_counts.keys.each_with_object({}) do | table_name, new_counts |
             new_counts[table_name] = kept_counts[table_name] - deleted_counts[table_name]
           end
-          { toDelete: deleted_counts, toKeep: to_keep }
+          deleted_counts.each_with_object({}) do | (key, value), new_hash |
+            new_hash[key] = { toDelete: value, toKeep: to_keep[key] }
+          end
         else
-          { deleted: deleted_counts, kept: kept_counts }
+          deleted_counts.each_with_object({}) do | (key, value), new_hash |
+            new_hash[key] = { deleted: value, kept: kept_counts[key] }
+          end
         end
       end
 

data/lib/pact_broker/deployments/currently_deployed_version_id.rb

@@ -4,6 +4,8 @@ require "pact_broker/repositories/helpers"
 module PactBroker
   module Deployments
     class CurrentlyDeployedVersionId < Sequel::Model
+      set_primary_key :id
+
       plugin :upsert, identifying_columns: [:pacticipant_id, :environment_id, :target_for_index]
 
       dataset_module do

data/lib/pact_broker/deployments/deployed_version.rb

@@ -4,6 +4,8 @@ require "pact_broker/deployments/currently_deployed_version_id"
 module PactBroker
   module Deployments
     class DeployedVersion < Sequel::Model
+      set_primary_key :id
+
       many_to_one :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id
       many_to_one :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id
       many_to_one :environment, :class => "PactBroker::Deployments::Environment", :key => :environment_id, :primary_key => :id

data/lib/pact_broker/deployments/deployed_version_service.rb

@@ -1,5 +1,6 @@
 require "pact_broker/deployments/deployed_version"
 require "pact_broker/repositories/scopes"
+require "pact_broker/events/publisher"
 
 module PactBroker
   module Deployments
@@ -7,6 +8,7 @@ module PactBroker
       include PactBroker::Logging
       extend PactBroker::Repositories::Scopes
       extend PactBroker::Services
+      extend PactBroker::Events::Publisher
 
       def self.next_uuid
         SecureRandom.uuid
@@ -22,7 +24,7 @@ module PactBroker
           deployed_version
         else
           record_previous_version_undeployed(version.pacticipant, environment, target)
-          DeployedVersion.create(
+          deployed_version = DeployedVersion.create(
             uuid: uuid,
             version: version,
             pacticipant_id: version.pacticipant_id,
@@ -30,6 +32,8 @@ module PactBroker
             target: target,
             auto_created: auto_created
           )
+          broadcast(:deployed_version_created, { deployed_version: deployed_version })
+          deployed_version
         end
       end
 

data/lib/pact_broker/deployments/environment.rb

@@ -5,6 +5,8 @@ require "sequel/plugins/serialization"
 module PactBroker
   module Deployments
     class Environment < Sequel::Model
+      set_primary_key :id
+
       OPEN_STRUCT_TO_JSON = lambda { | open_struct | Sequel.object_to_json(open_struct.collect(&:to_h)) }
       JSON_TO_OPEN_STRUCT = lambda { | json | Sequel.parse_json(json).collect{ | hash| OpenStruct.new(hash) } }
       plugin :upsert, identifying_columns: [:uuid]

data/lib/pact_broker/deployments/environment_service.rb

@@ -9,7 +9,6 @@ module PactBroker
     module EnvironmentService
       using PactBroker::StringRefinements
       extend PactBroker::Repositories::Scopes
-
       extend self
 
       def self.included(base)
@@ -36,8 +35,6 @@ module PactBroker
         environment.upsert
       end
 
-      alias_method :update, :replace # For PF
-
       def find_all
         scope_for(PactBroker::Deployments::Environment).order(Sequel.function(:lower, :display_name)).all
       end
@@ -57,6 +54,10 @@ module PactBroker
       def find_for_pacticipant(_pacticipant)
         find_all
       end
+
+      def scope_for(scope)
+        PactBroker.policy_scope!(scope)
+      end
     end
   end
 end

data/lib/pact_broker/deployments/released_version.rb

@@ -4,6 +4,8 @@ require "pact_broker/repositories/helpers"
 module PactBroker
   module Deployments
     class ReleasedVersion < Sequel::Model
+      set_primary_key :id
+
       many_to_one :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id
       many_to_one :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id
       many_to_one :environment, :class => "PactBroker::Deployments::Environment", :key => :environment_id, :primary_key => :id

data/lib/pact_broker/deployments/released_version_service.rb

@@ -1,10 +1,12 @@
 require "pact_broker/deployments/released_version"
 require "pact_broker/repositories/scopes"
+require "pact_broker/events/publisher"
 
 module PactBroker
   module Deployments
     class ReleasedVersionService
       extend PactBroker::Repositories::Scopes
+      extend PactBroker::Events::Publisher
 
       def self.next_uuid
         SecureRandom.uuid
@@ -25,6 +27,8 @@ module PactBroker
         # error when marking an existing row as supported again IRL.
         ReleasedVersion.where(id: released_version.id).set_currently_supported
         released_version.refresh
+        broadcast(:released_version_created, { released_version: released_version })
+        released_version
       end
 
       def self.find_currently_supported_versions_for_environment(environment, pacticipant_name: nil, pacticipant_version_number: nil)

data/lib/pact_broker/diagnostic/resources/base_resource.rb

@@ -13,7 +13,7 @@ module PactBroker
         end
 
         def forbidden?
-          return false if PactBroker.configuration.authorize.nil?
+          return false unless PactBroker.configuration.authorization_configured?
           !PactBroker.configuration.authorize.call(self, {})
         end
 

data/lib/pact_broker/doc/views/index/publish-contracts.markdown

@@ -33,7 +33,7 @@ This endpoint is designed to be used by a command line tool, and hence, the resp
 ### Success
 
 * `notices`
-  * `level`: one of `debug`, `info`, `warning`,`prompt`,`success`, `error`, `danger`
+  * `type`: one of `debug`, `info`, `warning`,`prompt`,`success`, `error`, `danger`
   * `text`: the text of the notice. This is designed to be displayed in the output of a CLI.
 
 The `_links` section will contain links to all the resources created by the publication. The relations are:
@@ -105,19 +105,19 @@ If there is a conflict with an existing published pact and `allow_dangerous_cont
       {
         "notices": [
           {
-            "level": "debug",
+            "type": "debug",
             "text": "Created Foo version dc5eb529230038a4673b8c971395bd2922d8b240 with branch main and tags main"
           },
           {
-            "level": "info",
+            "type": "info",
             "text": "Pact published for Foo version dc5eb529230038a4673b8c971395bd2922d8b240 and provider Bar."
           },
           {
-            "level": "debug",
+            "type": "debug",
             "text": "  Events detected: contract_published, contract_content_changed (first time any pact published for this consumer with consumer version tagged main)"
           },
           {
-            "level": "debug",
+            "type": "debug",
             "text": "  Webhook \"foo webhook\" triggered for event contract_content_changed.\n    See logs at http://example.org/triggered-webhooks/1234/logs\""
           }
         ],

data/lib/pact_broker/domain/label.rb

@@ -3,6 +3,7 @@ require "pact_broker/db"
 module PactBroker
   module Domain
     class Label < Sequel::Model
+      set_primary_key([:name, :pacticipant_id])
       unrestrict_primary_key
 
       associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)

data/lib/pact_broker/domain/tag.rb

@@ -5,6 +5,8 @@ require "pact_broker/tags/eager_loaders"
 module PactBroker
   module Domain
     class Tag < Sequel::Model
+      set_primary_key([:name, :version_id])
+
       plugin :timestamps, update_on_create: true
       plugin :insert_ignore, identifying_columns: [:name, :version_id]
 

data/lib/pact_broker/domain/verification.rb

@@ -228,7 +228,7 @@ module PactBroker
       end
 
       # So consumer_version_tag_name can be accessed by method name
-      def method_missing(m, *args, &block)
+      def method_missing(m, *args, **kwargs, &block)
         if values.key?(m) && args.size == 0
           values[m]
         else