pact_broker 2.99.0 → 2.102.0

data/docs/api/WEBHOOKS.md

@@ -33,7 +33,7 @@ Body:
   "enabled": true,
   "request": {
     "method": "POST",
-    "url": "https://example.org/example",
+    "url": "https://example.org/webhook",
     "headers": {
       "Content-Type": "application/json"
     },
@@ -50,29 +50,29 @@ Body:
   "_links": {
     "self": {
       "title": "an example webhook",
-      "href": "http://example.org/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
+      "href": "https://pact-broker/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
     },
     "pb:execute": {
       "title": "Test the execution of the webhook with the latest matching pact or verification by sending a POST request to this URL",
-      "href": "http://example.org/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac/execute"
+      "href": "https://pact-broker/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac/execute"
     },
     "pb:consumer": {
       "title": "Consumer",
       "name": "Foo",
-      "href": "http://example.org/pacticipants/Foo"
+      "href": "https://pact-broker/pacticipants/Foo"
     },
     "pb:provider": {
       "title": "Provider",
       "name": "Bar",
-      "href": "http://example.org/pacticipants/Bar"
+      "href": "https://pact-broker/pacticipants/Bar"
     },
     "pb:pact-webhooks": {
       "title": "All webhooks for consumer Foo and provider Bar",
-      "href": "http://example.org/webhooks/provider/Bar/consumer/Foo"
+      "href": "https://pact-broker/webhooks/provider/Bar/consumer/Foo"
     },
     "pb:webhooks": {
       "title": "All webhooks",
-      "href": "http://example.org/webhooks"
+      "href": "https://pact-broker/webhooks"
     }
   }
 }
@@ -142,15 +142,15 @@ Body:
   "_links": {
     "self": {
       "title": "an example webhook",
-      "href": "http://example.org/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
+      "href": "https://pact-broker/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
     },
     "pb:execute": {
       "title": "Test the execution of the webhook with the latest matching pact or verification by sending a POST request to this URL",
-      "href": "http://example.org/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac/execute"
+      "href": "https://pact-broker/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac/execute"
     },
     "pb:webhooks": {
       "title": "All webhooks",
-      "href": "http://example.org/webhooks"
+      "href": "https://pact-broker/webhooks"
     }
   }
 }
@@ -191,13 +191,13 @@ Body:
       {
         "title": "A webhook for the pact between Foo and Bar",
         "name": "an example webhook",
-        "href": "http://example.org/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
+        "href": "https://pact-broker/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
       }
     ],
     "curies": [
       {
         "name": "pb",
-        "href": "http://example.org/doc/webhooks-{rel}",
+        "href": "https://pact-broker/doc/webhooks-{rel}",
         "templated": true
       }
     ]
@@ -240,7 +240,7 @@ Body:
 #### Response
 
 Status: `201`<br/>
-Headers: `{"Content-Type":"application/hal+json;charset=utf-8","Location":"http://example.org/webhooks/dCGCl-Ba3PqEFJ_iE9mJkQ"}`<br/>
+Headers: `{"Content-Type":"application/hal+json;charset=utf-8","Location":"https://pact-broker/webhooks/dCGCl-Ba3PqEFJ_iE9mJkQ"}`<br/>
 Body:
 
 ```
@@ -269,15 +269,15 @@ Body:
   "_links": {
     "self": {
       "title": "an example webhook",
-      "href": "http://example.org/webhooks/dCGCl-Ba3PqEFJ_iE9mJkQ"
+      "href": "https://pact-broker/webhooks/dCGCl-Ba3PqEFJ_iE9mJkQ"
     },
     "pb:execute": {
       "title": "Test the execution of the webhook with the latest matching pact or verification by sending a POST request to this URL",
-      "href": "http://example.org/webhooks/dCGCl-Ba3PqEFJ_iE9mJkQ/execute"
+      "href": "https://pact-broker/webhooks/dCGCl-Ba3PqEFJ_iE9mJkQ/execute"
     },
     "pb:webhooks": {
       "title": "All webhooks",
-      "href": "http://example.org/webhooks"
+      "href": "https://pact-broker/webhooks"
     }
   }
 }
@@ -320,7 +320,7 @@ Body:
     "curies": [
       {
         "name": "pb",
-        "href": "http://example.org/doc/webhooks-{rel}",
+        "href": "https://pact-broker/doc/webhooks-{rel}",
         "templated": true
       }
     ]
@@ -365,7 +365,7 @@ Body:
     "curies": [
       {
         "name": "pb",
-        "href": "http://example.org/doc/webhooks-{rel}",
+        "href": "https://pact-broker/doc/webhooks-{rel}",
         "templated": true
       }
     ]
@@ -408,13 +408,13 @@ Body:
       {
         "title": "A webhook for the pact between Foo and Bar",
         "name": "an example webhook",
-        "href": "http://example.org/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
+        "href": "https://pact-broker/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
       }
     ],
     "curies": [
       {
         "name": "pb",
-        "href": "http://example.org/doc/webhooks-{rel}",
+        "href": "https://pact-broker/doc/webhooks-{rel}",
         "templated": true
       }
     ]
@@ -457,13 +457,13 @@ Body:
       {
         "title": "A webhook for the pact between Foo and Bar",
         "name": "an example webhook",
-        "href": "http://example.org/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
+        "href": "https://pact-broker/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac"
       }
     ],
     "curies": [
       {
         "name": "pb",
-        "href": "http://example.org/doc/webhooks-{rel}",
+        "href": "https://pact-broker/doc/webhooks-{rel}",
         "templated": true
       }
     ]
@@ -510,12 +510,12 @@ Body:
         "triggeredAt": "2021-09-01T00:07:21+00:00",
         "_links": {
           "pb:logs": {
-            "href": "http://example.org/triggered-webhooks/6cd5cc48-db3c-4a4c-a36d-e9bedeb9d91e/logs",
+            "href": "https://pact-broker/triggered-webhooks/6cd5cc48-db3c-4a4c-a36d-e9bedeb9d91e/logs",
             "title": "Webhook execution logs",
             "name": "POST example.org"
           },
           "pb:webhook": {
-            "href": "http://example.org/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac",
+            "href": "https://pact-broker/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac",
             "title": "Webhook",
             "name": "POST example.org"
           }
@@ -533,20 +533,20 @@ Body:
     ],
     "pb:pact-webhooks": {
       "title": "Webhooks for the pact between Foo and Bar",
-      "href": "http://example.org/pacts/provider/Bar/consumer/Foo/webhooks"
+      "href": "https://pact-broker/pacts/provider/Bar/consumer/Foo/webhooks"
     },
     "pb:pact-version": {
-      "href": "http://example.org/pacts/provider/Bar/consumer/Foo/version/2",
+      "href": "https://pact-broker/pacts/provider/Bar/consumer/Foo/version/3e1f00a04",
       "title": "Pact",
-      "name": "Pact between Foo (2) and Bar"
+      "name": "Pact between Foo (3e1f00a04) and Bar"
     },
     "pb:consumer": {
-      "href": "http://example.org/pacticipants/Foo",
+      "href": "https://pact-broker/pacticipants/Foo",
       "title": "Consumer",
       "name": "Foo"
     },
     "pb:provider": {
-      "href": "http://example.org/pacticipants/Bar",
+      "href": "https://pact-broker/pacticipants/Bar",
       "title": "Provider",
       "name": "Bar"
     }
@@ -579,13 +579,13 @@ Body:
   "request": {
     "headers": {
       "accept": "*/*",
-      "user-agent": "Pact Broker v2.87.0",
+      "user-agent": "Pact Broker",
       "content-type": "application/json"
     },
     "body": {
-      "pactUrl": "http://example.org/pacts/provider/Bar/consumer/Foo/pact-version/3e193ecb37ad04b43ce974a38352c704b2e0ed6b/metadata/Y3ZuPTImdz10cnVl"
+      "pactUrl": "https://pact-broker/pacts/provider/Bar/consumer/Foo/pact-version/3e193ecb37ad04b43ce974a38352c704b2e0ed6b/metadata/3e193ecb37ad04b43ce974a38352c704b2e0ed6b"
     },
-    "url": "/example"
+    "url": "/webhook"
   },
   "response": {
     "status": 200,
@@ -593,7 +593,7 @@ Body:
     },
     "body": ""
   },
-  "logs": "[2021-09-01T10:07:21Z] DEBUG: Webhook context {\"base_url\":\"http://example.org\",\"event_name\":\"test\"}\n[2021-09-01T10:07:21Z] INFO: HTTP/1.1 POST https://example.org/example\n[2021-09-01T10:07:21Z] INFO: accept: */*\n[2021-09-01T10:07:21Z] INFO: user-agent: Pact Broker v2.87.0\n[2021-09-01T10:07:21Z] INFO: content-type: application/json\n[2021-09-01T10:07:21Z] INFO: {\"pactUrl\":\"http://example.org/pacts/provider/Bar/consumer/Foo/pact-version/3e193ecb37ad04b43ce974a38352c704b2e0ed6b/metadata/Y3ZuPTImdz10cnVl\"}\n[2021-09-01T10:07:21Z] INFO: HTTP/1.0 200 \n[2021-09-01T10:07:21Z] INFO: \n",
+  "logs": "[2021-09-01T10:07:21Z] DEBUG: Webhook context {\"base_url\":\"https://pact-broker\",\"event_name\":\"test\"}\n[2021-09-01T10:07:21Z] INFO: HTTP/1.1 POST https://example.org/webhook\n[2021-09-01T10:07:21Z] INFO: accept: */*\n[2021-09-01T10:07:21Z] INFO: user-agent: Pact Broker\n[2021-09-01T10:07:21Z] INFO: content-type: application/json\n[2021-09-01T10:07:21Z] INFO: {\"pactUrl\":\"https://pact-broker/pacts/provider/Bar/consumer/Foo/pact-version/3e193ecb37ad04b43ce974a38352c704b2e0ed6b/metadata/3e193ecb37ad04b43ce974a38352c704b2e0ed6b\"}\n[2021-09-01T10:07:21Z] INFO: HTTP/1.0 200 \n[2021-09-01T10:07:21Z] INFO: \n",
   "success": true,
   "_links": {
   }
@@ -649,11 +649,11 @@ Body:
   "request": {
     "headers": {
       "accept": "application/json",
-      "user-agent": "Pact Broker v2.87.0",
+      "user-agent": "Pact Broker",
       "authorization": "**********"
     },
     "body": {
-      "pactUrl": "http://example.org/pacts/provider/Bar/consumer/Foo/pact-version/3e193ecb37ad04b43ce974a38352c704b2e0ed6b/metadata/Y3ZuPTImdz10cnVl"
+      "pactUrl": "https://pact-broker/pacts/provider/Bar/consumer/Foo/pact-version/3e193ecb37ad04b43ce974a38352c704b2e0ed6b/metadata/3e193ecb37ad04b43ce974a38352c704b2e0ed6b"
     },
     "url": "/example"
   },
@@ -663,7 +663,7 @@ Body:
     },
     "body": ""
   },
-  "logs": "[2021-09-01T10:07:21Z] DEBUG: Webhook context {\"base_url\":\"http://example.org\",\"event_name\":\"test\"}\n[2021-09-01T10:07:21Z] INFO: HTTP/1.1 POST https://example.org/example\n[2021-09-01T10:07:21Z] INFO: accept: application/json\n[2021-09-01T10:07:21Z] INFO: user-agent: Pact Broker v2.87.0\n[2021-09-01T10:07:21Z] INFO: authorization: **********\n[2021-09-01T10:07:21Z] INFO: {\"pactUrl\":\"http://example.org/pacts/provider/Bar/consumer/Foo/pact-version/3e193ecb37ad04b43ce974a38352c704b2e0ed6b/metadata/Y3ZuPTImdz10cnVl\"}\n[2021-09-01T10:07:21Z] INFO: HTTP/1.0 200 \n[2021-09-01T10:07:21Z] INFO: \n",
+  "logs": "[2021-09-01T10:07:21Z] DEBUG: Webhook context {\"base_url\":\"https://pact-broker\",\"event_name\":\"test\"}\n[2021-09-01T10:07:21Z] INFO: HTTP/1.1 POST https://example.org/example\n[2021-09-01T10:07:21Z] INFO: accept: application/json\n[2021-09-01T10:07:21Z] INFO: user-agent: Pact Broker\n[2021-09-01T10:07:21Z] INFO: authorization: **********\n[2021-09-01T10:07:21Z] INFO: {\"pactUrl\":\"https://pact-broker/pacts/provider/Bar/consumer/Foo/pact-version/3e193ecb37ad04b43ce974a38352c704b2e0ed6b/metadata/3e193ecb37ad04b43ce974a38352c704b2e0ed6b\"}\n[2021-09-01T10:07:21Z] INFO: HTTP/1.0 200 \n[2021-09-01T10:07:21Z] INFO: \n",
   "success": true,
   "_links": {
   }
@@ -704,12 +704,12 @@ Body:
         "triggeredAt": "2021-09-01T00:07:21+00:00",
         "_links": {
           "pb:logs": {
-            "href": "http://example.org/triggered-webhooks/6cd5cc48-db3c-4a4c-a36d-e9bedeb9d91e/logs",
+            "href": "https://pact-broker/triggered-webhooks/6cd5cc48-db3c-4a4c-a36d-e9bedeb9d91e/logs",
             "title": "Webhook execution logs",
             "name": "POST example.org"
           },
           "pb:webhook": {
-            "href": "http://example.org/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac",
+            "href": "https://pact-broker/webhooks/d2181b32-8b03-4daf-8cc0-d9168b2f6fac",
             "title": "Webhook",
             "name": "POST example.org"
           }
@@ -719,8 +719,8 @@ Body:
   },
   "_links": {
     "self": {
-      "title": "Webhooks triggered by the publication of the pact between Foo (2) and Bar",
-      "href": "http://example.org/pacts/provider/Bar/consumer/Foo/version/2/triggered-webhooks"
+      "title": "Webhooks triggered by the publication of the pact between Foo (3e1f00a04) and Bar",
+      "href": "http://example.org/pacts/provider/Bar/consumer/Foo/version/3e1f00a04/triggered-webhooks"
     }
   }
 }

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

@@ -0,0 +1,28 @@
+require "pact_broker/api/contracts/pacticipant_schema"
+
+module PactBroker
+  module Api
+    module Contracts
+      class PacticipantCreateSchema
+        extend DryValidationWorkarounds
+        extend PactBroker::Messages
+        using PactBroker::HashRefinements
+
+        SCHEMA = Dry::Validation.Schema do
+          configure do
+            predicates(DryValidationPredicates)
+            config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
+          end
+          required(:name).filled(:str?, :single_line?)
+        end
+
+        def self.call(params_with_string_keys)
+          params = params_with_string_keys&.symbolize_keys
+          update_errors = PacticipantSchema::SCHEMA.call(params).messages(full: true)
+          create_errors = SCHEMA.call(params).messages(full: true)
+          select_first_message(flatten_indexed_messages(update_errors.merge(create_errors)))
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,6 @@ module PactBroker
 
         property :number
         if PactBroker.feature_enabled?(:branches)
-          property :branch
           property :build_url
         end
 

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

@@ -30,7 +30,7 @@ module PactBroker
           when PactBroker::Matrix::PactNotVerifiedByRequiredProviderVersion
             "There is no verified pact between #{reason.consumer_selector.description} and #{reason.provider_selector.description}"
           when PactBroker::Matrix::SpecifiedVersionDoesNotExist
-            version_does_not_exist_description(reason.selector)
+            reason.selector.version_does_not_exist_description
           when PactBroker::Matrix::VerificationFailed
             "The verification for the pact between #{reason.consumer_selector.description} and #{reason.provider_selector.description} failed"
           when PactBroker::Matrix::NoDependenciesMissing
@@ -53,20 +53,6 @@ module PactBroker
           end
         end
 
-        def version_does_not_exist_description selector
-          if selector.version_does_not_exist?
-            if selector.tag
-              "No version with tag #{selector.tag} exists for #{selector.pacticipant_name}"
-            elsif selector.pacticipant_version_number
-              "No pacts or verifications have been published for version #{selector.pacticipant_version_number} of #{selector.pacticipant_name}"
-            else
-              "No pacts or verifications have been published for #{selector.pacticipant_name}"
-            end
-          else
-            ""
-          end
-        end
-
         # TODO move this somewhere else
         def interaction_description(interaction)
           if interaction["providerState"] && interaction["providerState"] != ""

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

@@ -10,8 +10,7 @@ module PactBroker
         property :number_of_attempts_remaining, as: :attemptsRemaining
         property :trigger_type, as: :triggerType
         property :event_name, as: :eventName
-
-        property :created_at, as: :triggeredAt
+        property :created_at, as: :triggeredAt, getter: lambda { |_|  FormatDateTime.call(created_at) }, writeable: false
 
         link :'pb:logs' do | context |
           {

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

@@ -30,10 +30,7 @@ module PactBroker
         end
 
         def malformed_request?
-          if request.post?
-            return invalid_json? || validation_errors?(webhook)
-          end
-          false
+          super || (request.post? && validation_errors?(webhook))
         end
 
         def to_json

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

@@ -15,6 +15,7 @@ module PactBroker
   module Api
     module Resources
       class InvalidJsonError < PactBroker::Error ; end
+      class NonUTF8CharacterFound < PactBroker::Error ; end
 
       class BaseResource < Webmachine::Resource
         include PactBroker::Services
@@ -39,6 +40,10 @@ module PactBroker
           super + ["PATCH"]
         end
 
+        def malformed_request?
+          content_type_is_json_but_invalid_json_provided?
+        end
+
         def finish_request
           application_context.after_resource&.call(self)
           PactBroker.configuration.after_resource.call(self)
@@ -125,17 +130,32 @@ module PactBroker
           else
             @params_with_string_keys ||= JSON.parse(request_body, { symbolize_names: false }.merge(PACT_PARSING_OPTIONS)) #Not load! Otherwise it will try to load Ruby classes.
           end
-        rescue JSON::JSONError => e
-          raise InvalidJsonError.new("Error parsing JSON - #{e.message}")
+        rescue StandardError => e
+          fragment = fragment_before_invalid_utf_8_char
+
+          if fragment
+            raise NonUTF8CharacterFound.new(message("errors.non_utf_8_char_in_request_body", char_number: fragment.length + 1, fragment: fragment))
+          else
+            raise InvalidJsonError.new(e.message)
+          end
         end
         # rubocop: enable Metrics/CyclomaticComplexity
 
+        def fragment_before_invalid_utf_8_char
+          request_body.each_char.with_index do | char, index |
+            if !char.valid_encoding?
+              return index < 100 ? request_body[0...index] : request_body[index-100...index]
+            end
+          end
+          nil
+        end
+
         def params_with_string_keys
           params(symbolize_names: false)
         end
 
         def pact_params
-          @pact_params ||= PactBroker::Pacts::PactParams.from_request request, identifier_from_path
+          @pact_params ||= PactBroker::Pacts::PactParams.from_request(request, identifier_from_path)
         end
 
         def set_json_error_message message
@@ -192,9 +212,15 @@ module PactBroker
           begin
             params
             false
+          rescue NonUTF8CharacterFound => e
+            logger.info(e.message) # Don't use the default SemanticLogger error logging method because it will try and print out the cause which will contain non UTF-8 chars in the message
+            set_json_error_message(e.message)
+            response.headers["Content-Type"] = "application/hal+json;charset=utf-8"
+            true
           rescue StandardError => e
-            logger.info "Error parsing JSON #{e} - #{request_body}"
-            set_json_error_message "Error parsing JSON - #{e.message}"
+            message = "#{e.cause ? e.cause.class.name : e.class.name} - #{e.message}"
+            logger.info(message)
+            set_json_error_message(message)
             response.headers["Content-Type"] = "application/hal+json;charset=utf-8"
             true
           end
@@ -279,6 +305,33 @@ module PactBroker
         def malformed_request_for_json_with_schema?(schema_to_use = schema, params_to_validate = params)
           invalid_json? || validation_errors_for_schema?(schema_to_use, params_to_validate)
         end
+
+        # Ensure we have valid JSON if a JSON body is required OR if a body has been provided
+        def content_type_is_json_but_invalid_json_provided?
+          content_type_json? && ((request_body_required? || any_request_body?) && invalid_json?)
+        end
+
+        def content_type_json?
+          request.content_type&.include?("json")
+        end
+
+        def request_body_required?
+          false
+        end
+
+        # TODO rename to put_to_create_supported, otherwise it sounds like it's a policy issue
+        # Not a Webmachine method. This is used by security policy code to identify whether
+        # a PUT to a non existing resource can create a new object.
+        def put_can_create?
+          false
+        end
+
+        # TODO rename to patch_to_create_supported, otherwise it sounds like it's a policy issue
+        # Not a Webmachine method. This is used by security policy code to identify whether
+        # a PATCH to a non existing resource can create a new object.
+        def patch_can_create?
+          false
+        end
       end
     end
   end

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

@@ -14,7 +14,11 @@ module PactBroker
         end
 
         def allowed_methods
-          ["GET", "PUT", "OPTIONS"]
+          ["GET", "PUT", "DELETE", "OPTIONS"]
+        end
+
+        def put_can_create?
+          true
         end
 
         def resource_exists?
@@ -25,6 +29,11 @@ module PactBroker
           decorator_class(:branch_version_decorator).new(branch_version).to_json(decorator_options)
         end
 
+        def delete_resource
+          branch_service.delete_branch_version(branch_version)
+          true
+        end
+
         def from_json
           already_existed = !!branch_version
           @branch_version = branch_service.find_or_create_branch_version(identifier_from_path)

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

@@ -2,14 +2,12 @@ require "pact_broker/api/resources/base_resource"
 require "pact_broker/db/clean"
 require "pact_broker/matrix/unresolved_selector"
 
+# Not exposed yet as we'd need to support administrator auth first
+
 module PactBroker
   module Api
     module Resources
       class Clean < BaseResource
-        def content_types_accepted
-          [["application/json"]]
-        end
-
         def content_types_provided
           [["application/hal+json"]]
         end
@@ -19,12 +17,16 @@ module PactBroker
         end
 
         def process_post
-          keep_selectors = (params[:keep] || []).collect do | hash |
-            PactBroker::Matrix::UnresolvedSelector.new(hash)
-          end
+          if content_type_json?
+            keep_selectors = (params[:keep] || []).collect do | hash |
+              PactBroker::Matrix::UnresolvedSelector.new(hash)
+            end
 
-          result = PactBroker::DB::Clean.call(Sequel::Model.db, { keep: keep_selectors })
-          response.body = result.to_json
+            result = PactBroker::DB::Clean.call(Sequel::Model.db, { keep: keep_selectors })
+            response.body = result.to_json
+          else
+            415
+          end
         end
 
         def policy_name

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

@@ -8,10 +8,6 @@ module PactBroker
       class CurrentlyDeployedVersionsForEnvironment < BaseResource
         using PactBroker::StringRefinements
 
-        def content_types_accepted
-          [["application/json", :from_json]]
-        end
-
         def content_types_provided
           [["application/hal+json", :to_json]]
         end

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

@@ -8,10 +8,6 @@ module PactBroker
       class CurrentlySupportedVersionsForEnvironment < BaseResource
         using PactBroker::StringRefinements
 
-        def content_types_accepted
-          [["application/json", :from_json]]
-        end
-
         def content_types_provided
           [["application/hal+json", :to_json]]
         end

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

@@ -8,11 +8,6 @@ module PactBroker
       class DeployedVersion < BaseResource
         include PactBroker::Messages
 
-        def initialize
-          super
-          @currently_deployed_param = params(default: {})[:currentlyDeployed]
-        end
-
         def content_types_provided
           [
             ["application/hal+json", :to_json]
@@ -29,16 +24,12 @@ module PactBroker
           ["GET", "PATCH", "OPTIONS"]
         end
 
-        def resource_exists?
-          !!deployed_version
+        def patch_can_create?
+          false
         end
 
-        def malformed_request?
-          if request.patch?
-            return invalid_json?
-          else
-            false
-          end
+        def resource_exists?
+          !!deployed_version
         end
 
         def to_json
@@ -58,16 +49,29 @@ module PactBroker
         end
 
         def policy_name
-          :'versions::version'
+          :'versions::deployed_version'
+        end
+
+        def policy_record_context
+          {
+            pacticipant: deployed_version&.pacticipant
+          }
         end
 
         def policy_record
-          deployed_version&.version
+          deployed_version&.environment
         end
 
         private
 
-        attr_reader :currently_deployed_param
+        # can't use ||= with a potentially nil value
+        def currently_deployed_param
+          if defined?(@currently_deployed_param)
+            @currently_deployed_param
+          else
+            @currently_deployed_param = params(default: {})[:currentlyDeployed]
+          end
+        end
 
         def process_currently_deployed_param
           if currently_deployed_param == false

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

@@ -40,7 +40,7 @@ module PactBroker
         end
 
         def policy_name
-          :'versions::deployed_version'
+          :'versions::deployed_versions'
         end
 
         def policy_record

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

@@ -17,16 +17,16 @@ module PactBroker
           ["GET", "PUT", "DELETE", "OPTIONS"]
         end
 
+        def put_can_create?
+          false
+        end
+
         def resource_exists?
           !!environment
         end
 
         def malformed_request?
-          if request.put? && environment
-            invalid_json? || validation_errors_for_schema?(schema, params.merge(uuid: uuid))
-          else
-            false
-          end
+          super || (request.put? && environment && validation_errors_for_schema?(schema, params.merge(uuid: uuid)))
         end
 
         def from_json