pact_broker-client 1.50.0 → 1.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb0899f37221475b93ac43b01a535aa03a0f991fcf367556e83697f293873b8
-  data.tar.gz: 1627a56a6fc1302c6bc381786c4a6f385485fa26a75cded5b3630ffb5afa1809
+  metadata.gz: c645adf22b85e738f227eec38baf09fe06241aeaeb4c75abc4c4558c66c2716f
+  data.tar.gz: e32efad31615c7335df1c36dea365fcc5e001574143a3df3d98e23c1c5c84c71
 SHA512:
-  metadata.gz: 45636dfd9a5b865d870baf6147833562365e4fbf9fbbe80b9b0d5f34779defd3dacec69ddf1772167a65ab17da6389d8c7f183764e594fc23b85cecfe15b60ca
-  data.tar.gz: 02d6f6a5a7514a32711179de4667bd57a247c440d6c95c046eacd291b0a31bf2eff89f9027bf79a0f14bf78fcb45aa9102b415c0945bee13477de539bfa4f4f8
+  metadata.gz: 02c18bab0a1d08d568524ccd0a48d526e2aebf3d17db29dc83884f82db4c4ebf9864fd2e6d3de01ab6b11febc658d94efe28a817f351266059771fff8a95a446
+  data.tar.gz: d647f077b021640b520babbc4e7ba5ed8bd4d460ebe826e98900f356bbd79dda96ee7c425d0ee6eeff7aa2648f996ded578f22a24708b8efdf5725cfd8fd97b9

data/.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        feature: ["", "publish_contracts"]
+        feature: [""]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+<a name="v1.52.0"></a>
+### v1.52.0 (2021-09-29)
+
+#### Features
+
+* rename target to application-instance for record-deployment and record-undeployment (backwards compatible)	 ([53d23eb](/../../commit/53d23eb))
+
+<a name="v1.51.2"></a>
+### v1.51.2 (2021-09-27)
+
+#### Bug Fixes
+
+* **deps**
+  * lock httparty to 0.18.1	 ([1ab2d9c](/../../commit/1ab2d9c))
+
+<a name="v1.51.1"></a>
+### v1.51.1 (2021-09-22)
+
+#### Bug Fixes
+
+* remove deprecated method of handling branches	 ([6d26487](/../../commit/6d26487))
+
+<a name="v1.51.0"></a>
+### v1.51.0 (2021-09-22)
+
+#### Features
+
+* enable use of the new 'all in one' contracts publishing endpoint without a feature toggle	 ([6850ace](/../../commit/6850ace))
+
 <a name="v1.50.0"></a>
 ### v1.50.0 (2021-08-16)
 

data/README.md

@@ -275,29 +275,33 @@ Usage:
   pact-broker record-deployment --environment=ENVIRONMENT -a, --pacticipant=PACTICIPANT -b, --broker-base-url=BROKER_BASE_URL -e, --version=VERSION
 
 Options:
-  -a, --pacticipant=PACTICIPANT            
+  -a, --pacticipant=PACTICIPANT                      
               # The name of the pacticipant that was deployed.
-  -e, --version=VERSION                    
+  -e, --version=VERSION                              
               # The pacticipant version number that was deployed.
-      --environment=ENVIRONMENT            
+      --environment=ENVIRONMENT                      
               # The name of the environment that the pacticipant version was
                 deployed to.
-      [--target=TARGET]                    
-              # Optional. The target of the deployment - a logical identifer
-                required to differentiate deployments when there are multiple
-                instances of the same application in an environment.
-  -o, [--output=OUTPUT]                    
+      [--application-instance=APPLICATION_INSTANCE]  
+              # Optional. The application instance to which the deployment has
+                occurred - a logical identifer required to differentiate
+                deployments when there are multiple instances of the same
+                application in an environment. This field was called 'target'
+                in a beta release.
+      [--target=TARGET]                              
+              # Renamed to application_instance
+  -o, [--output=OUTPUT]                              
               # json or text
               # Default: text
-  -b, --broker-base-url=BROKER_BASE_URL    
+  -b, --broker-base-url=BROKER_BASE_URL              
               # The base URL of the Pact Broker
-  -u, [--broker-username=BROKER_USERNAME]  
+  -u, [--broker-username=BROKER_USERNAME]            
               # Pact Broker basic auth username
-  -p, [--broker-password=BROKER_PASSWORD]  
+  -p, [--broker-password=BROKER_PASSWORD]            
               # Pact Broker basic auth password
-  -k, [--broker-token=BROKER_TOKEN]        
+  -k, [--broker-token=BROKER_TOKEN]                  
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]          
+  -v, [--verbose], [--no-verbose]                    
               # Verbose output. Default: false
 ```
 
@@ -310,28 +314,34 @@ Usage:
   pact-broker record-undeployment --environment=ENVIRONMENT -a, --pacticipant=PACTICIPANT -b, --broker-base-url=BROKER_BASE_URL
 
 Options:
-  -a, --pacticipant=PACTICIPANT            
+  -a, --pacticipant=PACTICIPANT                      
               # The name of the pacticipant that was undeployed.
-      --environment=ENVIRONMENT            
+      --environment=ENVIRONMENT                      
               # The name of the environment that the pacticipant version was
                 undeployed from.
-      [--target=TARGET]                    
+      [--application-instance=APPLICATION_INSTANCE]  
+              # Optional. The application instance from which the application
+                is being undeployed - a logical identifer required to
+                differentiate deployments when there are multiple instances of
+                the same application in an environment. This field was called
+                'target' in a beta release.
+      [--target=TARGET]                              
               # Optional. The target that the application is being undeployed
                 from - a logical identifer required to differentiate
                 deployments when there are multiple instances of the same
                 application in an environment.
-  -o, [--output=OUTPUT]                    
+  -o, [--output=OUTPUT]                              
               # json or text
               # Default: text
-  -b, --broker-base-url=BROKER_BASE_URL    
+  -b, --broker-base-url=BROKER_BASE_URL              
               # The base URL of the Pact Broker
-  -u, [--broker-username=BROKER_USERNAME]  
+  -u, [--broker-username=BROKER_USERNAME]            
               # Pact Broker basic auth username
-  -p, [--broker-password=BROKER_PASSWORD]  
+  -p, [--broker-password=BROKER_PASSWORD]            
               # Pact Broker basic auth password
-  -k, [--broker-token=BROKER_TOKEN]        
+  -k, [--broker-token=BROKER_TOKEN]                  
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]          
+  -v, [--verbose], [--no-verbose]                    
               # Verbose output. Default: false
 ```
 
@@ -469,8 +479,8 @@ Description:
   support for environments, deployments and releases. For documentation on how to use can-i-deploy with tags, please see
   https://docs.pact.io/pact_broker/client_cli/can_i_deploy_usage_with_tags/
 
-  Before `can-i-deploy` can be used, the relevant environment resources must first be created in the Pact Broker using the `create-environment` command. The "test"
-  and "production" environments will have been seeded for you. You can check the existing environments by running `pact-broker list-environments`. See
+  Before `can-i-deploy` can be used, the relevant environment resources must first be created in the Pact Broker using the `create-environment` command. The
+  "test" and "production" environments will have been seeded for you. You can check the existing environments by running `pact-broker list-environments`. See
   https://docs.pact.io/pact_broker/client_cli/readme#environments for more information.
 
   $ pact-broker create-environment --name "uat" --display-name "UAT" --no-production
@@ -480,8 +490,8 @@ Description:
 
   $ pact-broker record-deployment --pacticipant Foo --version 173153ae0 --environment uat
 
-  Before an application is deployed or released to an environment, the can-i-deploy command must be run to check that the application version is safe to deploy with
-  the versions of each integrated application that are already in that environment.
+  Before an application is deployed or released to an environment, the can-i-deploy command must be run to check that the application version is safe to deploy
+  with the versions of each integrated application that are already in that environment.
 
   $ pact-broker can-i-deploy --pacticipant PACTICIPANT --version VERSION --to-environment ENVIRONMENT
 
@@ -489,8 +499,8 @@ Description:
 
   $ pact-broker can-i-deploy --pacticipant Foo --version 173153ae0 --to-environment test
 
-  Can-i-deploy can also be used to check if arbitrary versions have a successful verification. When asking "Can I deploy this application version with the latest version
-  from the main branch of another application" it functions as a "can I merge" check.
+  Can-i-deploy can also be used to check if arbitrary versions have a successful verification. When asking "Can I deploy this application version with the
+  latest version from the main branch of another application" it functions as a "can I merge" check.
 
   $ pact-broker can-i-deploy --pacticipant Foo 173153ae0 \ --pacticipant Bar --latest main
 
@@ -628,8 +638,8 @@ Options:
 ```
 
 Description:
-  Create a curl command that executes the request that you want your webhook to execute, then replace "curl" with "pact-broker create-webhook" and add the consumer,
-  provider, event types and broker details. Note that the URL must be the first parameter when executing create-webhook.
+  Create a curl command that executes the request that you want your webhook to execute, then replace "curl" with "pact-broker create-webhook" and add the
+  consumer, provider, event types and broker details. Note that the URL must be the first parameter when executing create-webhook.
 
   Note that the -u option from the curl command clashes with the -u option from the pact-broker CLI. When used in this command, the -u will be used as a curl
   option. Please use the --broker-username or environment variable for the Pact Broker username.
@@ -686,9 +696,9 @@ Options:
 ```
 
 Description:
-  Create a curl command that executes the request that you want your webhook to execute, then replace "curl" with "pact-broker create-or-update-webhook" and add the
-  consumer, provider, event types and broker details. Note that the URL must be the first parameter when executing create-or-update-webhook and a uuid must
-  also be provided. You can generate a valid UUID by using the `generate-uuid` command.
+  Create a curl command that executes the request that you want your webhook to execute, then replace "curl" with "pact-broker create-or-update-webhook" and
+  add the consumer, provider, event types and broker details. Note that the URL must be the first parameter when executing create-or-update-webhook and a uuid
+  must also be provided. You can generate a valid UUID by using the `generate-uuid` command.
 
   Note that the -u option from the curl command clashes with the -u option from the pact-broker CLI. When used in this command, the -u will be used as a curl
   option. Please use the --broker-username or environment variable for the Pact Broker username.

data/doc/pacts/markdown/Pact Broker Client - Pact Broker.md

@@ -40,7 +40,7 @@
 
 * [A request for the index resource](#a_request_for_the_index_resource_given_the_pb:pacticipant-version_and_pb:environments_relations_exist_in_the_index_resource) given the pb:pacticipant-version and pb:environments relations exist in the index resource
 
-* [A request for the index resource](#a_request_for_the_index_resource_given_the_pb:pacticipant-version_relation_exists_in_the_index_resource) given the pb:pacticipant-version relation exists in the index resource
+* [A request for the index resource](#a_request_for_the_index_resource_given_the_pb:publish-contracts_relations_exists_in_the_index_resource) given the pb:publish-contracts relations exists in the index resource
 
 * [A request for the index resource with the webhook relation](#a_request_for_the_index_resource_with_the_webhook_relation)
 
@@ -56,10 +56,6 @@
 
 * [A request to create a pacticipant](#a_request_to_create_a_pacticipant)
 
-* [A request to create a pacticipant version](#a_request_to_create_a_pacticipant_version_given_version_26f353580936ad3b9baddb17b00e84f33c69e7cb_of_pacticipant_Foo_does_exist) given version 26f353580936ad3b9baddb17b00e84f33c69e7cb of pacticipant Foo does exist
-
-* [A request to create a pacticipant version](#a_request_to_create_a_pacticipant_version_given_version_26f353580936ad3b9baddb17b00e84f33c69e7cb_of_pacticipant_Foo_does_not_exist) given version 26f353580936ad3b9baddb17b00e84f33c69e7cb of pacticipant Foo does not exist
-
 * [A request to create a webhook for a consumer and provider](#a_request_to_create_a_webhook_for_a_consumer_and_provider_given_'Condor'_does_not_exist_in_the_pact-broker) given 'Condor' does not exist in the pact-broker
 
 * [A request to create a webhook with a JSON body and a uuid](#a_request_to_create_a_webhook_with_a_JSON_body_and_a_uuid_given_the_'Pricing_Service'_and_'Condor'_already_exist_in_the_pact-broker) given the 'Pricing Service' and 'Condor' already exist in the pact-broker
@@ -100,6 +96,8 @@
 
 * [A request to publish a pact with method put](#a_request_to_publish_a_pact_with_method_put_given_the_'Pricing_Service'_and_'Condor'_already_exist_in_the_pact-broker,_and_Condor_already_has_a_pact_published_for_version_1.3.0) given the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0
 
+* [A request to publish contracts](#a_request_to_publish_contracts)
+
 * [A request to record a deployment](#a_request_to_record_a_deployment_given_version_5556b8149bf8bac76bc30f50a8a2dd4c22c85f30_of_pacticipant_Foo_exists_with_a_test_environment_available_for_deployment) given version 5556b8149bf8bac76bc30f50a8a2dd4c22c85f30 of pacticipant Foo exists with a test environment available for deployment
 
 * [A request to record a release](#a_request_to_record_a_release_given_version_5556b8149bf8bac76bc30f50a8a2dd4c22c85f30_of_pacticipant_Foo_exists_with_a_test_environment_available_for_deployment) given version 5556b8149bf8bac76bc30f50a8a2dd4c22c85f30 of pacticipant Foo exists with a test environment available for deployment
@@ -855,11 +853,11 @@ Pact Broker will respond with:
   }
 }
 ```
-<a name="a_request_for_the_index_resource_given_the_pb:pacticipant-version_relation_exists_in_the_index_resource"></a>
-Given **the pb:pacticipant-version relation exists in the index resource**, upon receiving **a request for the index resource** from Pact Broker Client, with
+<a name="a_request_for_the_index_resource_given_the_pb:publish-contracts_relations_exists_in_the_index_resource"></a>
+Given **the pb:publish-contracts relations exists in the index resource**, upon receiving **a request for the index resource** from Pact Broker Client, with
 ```json
 {
-  "method": "get",
+  "method": "GET",
   "path": "/",
   "headers": {
     "Accept": "application/hal+json"
@@ -875,8 +873,8 @@ Pact Broker will respond with:
   },
   "body": {
     "_links": {
-      "pb:pacticipant-version": {
-        "href": "http://localhost:1234/HAL-REL-PLACEHOLDER-INDEX-PB-PACTICIPANT-VERSION-{pacticipant}-{version}"
+      "pb:publish-contracts": {
+        "href": "http://localhost:1234/HAL-REL-PLACEHOLDER-PB-PUBLISH-CONTRACTS"
       }
     }
   }
@@ -1134,74 +1132,6 @@ Pact Broker will respond with:
   }
 }
 ```
-<a name="a_request_to_create_a_pacticipant_version_given_version_26f353580936ad3b9baddb17b00e84f33c69e7cb_of_pacticipant_Foo_does_exist"></a>
-Given **version 26f353580936ad3b9baddb17b00e84f33c69e7cb of pacticipant Foo does exist**, upon receiving **a request to create a pacticipant version** from Pact Broker Client, with
-```json
-{
-  "method": "put",
-  "path": "/HAL-REL-PLACEHOLDER-INDEX-PB-PACTICIPANT-VERSION-Foo-26f353580936ad3b9baddb17b00e84f33c69e7cb",
-  "headers": {
-    "Content-Type": "application/json",
-    "Accept": "application/hal+json"
-  },
-  "body": {
-    "branch": "main",
-    "buildUrl": "http://my-ci/builds/1"
-  }
-}
-```
-Pact Broker will respond with:
-```json
-{
-  "status": 200,
-  "headers": {
-    "Content-Type": "application/hal+json;charset=utf-8"
-  },
-  "body": {
-    "number": "26f353580936ad3b9baddb17b00e84f33c69e7cb",
-    "buildUrl": "http://my-ci/builds/1",
-    "_links": {
-      "self": {
-        "href": "http://localhost:1234/some-url"
-      }
-    }
-  }
-}
-```
-<a name="a_request_to_create_a_pacticipant_version_given_version_26f353580936ad3b9baddb17b00e84f33c69e7cb_of_pacticipant_Foo_does_not_exist"></a>
-Given **version 26f353580936ad3b9baddb17b00e84f33c69e7cb of pacticipant Foo does not exist**, upon receiving **a request to create a pacticipant version** from Pact Broker Client, with
-```json
-{
-  "method": "put",
-  "path": "/HAL-REL-PLACEHOLDER-INDEX-PB-PACTICIPANT-VERSION-Foo-26f353580936ad3b9baddb17b00e84f33c69e7cb",
-  "headers": {
-    "Content-Type": "application/json",
-    "Accept": "application/hal+json"
-  },
-  "body": {
-    "branch": "main",
-    "buildUrl": "http://my-ci/builds/1"
-  }
-}
-```
-Pact Broker will respond with:
-```json
-{
-  "status": 201,
-  "headers": {
-    "Content-Type": "application/hal+json;charset=utf-8"
-  },
-  "body": {
-    "number": "26f353580936ad3b9baddb17b00e84f33c69e7cb",
-    "buildUrl": "http://my-ci/builds/1",
-    "_links": {
-      "self": {
-        "href": "http://localhost:1234/some-url"
-      }
-    }
-  }
-}
-```
 <a name="a_request_to_create_a_webhook_for_a_consumer_and_provider_given_&#39;Condor&#39;_does_not_exist_in_the_pact-broker"></a>
 Given **'Condor' does not exist in the pact-broker**, upon receiving **a request to create a webhook for a consumer and provider** from Pact Broker Client, with
 ```json
@@ -2119,6 +2049,75 @@ Pact Broker will respond with:
   }
 }
 ```
+<a name="a_request_to_publish_contracts"></a>
+Upon receiving **a request to publish contracts** from Pact Broker Client, with
+```json
+{
+  "method": "POST",
+  "path": "/HAL-REL-PLACEHOLDER-PB-PUBLISH-CONTRACTS",
+  "headers": {
+    "Content-Type": "application/json",
+    "Accept": "application/hal+json"
+  },
+  "body": {
+    "pacticipantName": "Foo",
+    "pacticipantVersionNumber": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30",
+    "branch": "main",
+    "tags": [
+      "dev"
+    ],
+    "buildUrl": "http://build",
+    "contracts": [
+      {
+        "consumerName": "Foo",
+        "providerName": "Bar",
+        "specification": "pact",
+        "contentType": "application/json",
+        "content": "eyJjb25zdW1lciI6eyJuYW1lIjoiRm9vIn0sInByb3ZpZGVyIjp7Im5hbWUiOiJCYXIifSwiaW50ZXJhY3Rpb25zIjpbeyJkZXNjcmlwdGlvbiI6ImFuIGV4YW1wbGUgcmVxdWVzdCIsInByb3ZpZGVyU3RhdGUiOiJhIHByb3ZpZGVyIHN0YXRlIiwicmVxdWVzdCI6eyJtZXRob2QiOiJHRVQiLCJwYXRoIjoiLyIsImhlYWRlcnMiOnt9fSwicmVzcG9uc2UiOnsic3RhdHVzIjoyMDAsImhlYWRlcnMiOnsiQ29udGVudC1UeXBlIjoiYXBwbGljYXRpb24vaGFsK2pzb24ifX19XSwibWV0YWRhdGEiOnsicGFjdFNwZWNpZmljYXRpb24iOnsidmVyc2lvbiI6IjIuMC4wIn19fQ==",
+        "onConflict": "merge"
+      }
+    ]
+  }
+}
+```
+Pact Broker will respond with:
+```json
+{
+  "status": 200,
+  "headers": {
+    "Content-Type": "application/hal+json;charset=utf-8"
+  },
+  "body": {
+    "_embedded": {
+      "pacticipant": {
+        "name": "Foo"
+      },
+      "version": {
+        "number": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30",
+        "buildUrl": "http://build"
+      }
+    },
+    "logs": [
+      {
+        "level": "info",
+        "message": "some message"
+      }
+    ],
+    "_links": {
+      "pb:pacticipant-version-tags": [
+        {
+          "name": "dev"
+        }
+      ],
+      "pb:contracts": [
+        {
+          "href": "http://some-pact"
+        }
+      ]
+    }
+  }
+}
+```
 <a name="a_request_to_record_a_deployment_given_version_5556b8149bf8bac76bc30f50a8a2dd4c22c85f30_of_pacticipant_Foo_exists_with_a_test_environment_available_for_deployment"></a>
 Given **version 5556b8149bf8bac76bc30f50a8a2dd4c22c85f30 of pacticipant Foo exists with a test environment available for deployment**, upon receiving **a request to record a deployment** from Pact Broker Client, with
 ```json
@@ -2130,6 +2129,7 @@ Given **version 5556b8149bf8bac76bc30f50a8a2dd4c22c85f30 of pacticipant Foo exis
     "Accept": "application/hal+json"
   },
   "body": {
+    "applicationInstance": "blue",
     "target": "blue"
   }
 }

data/lib/pact_broker/client/cli/deployment_commands.rb

@@ -14,16 +14,18 @@ module PactBroker
             method_option :pacticipant, required: true, aliases: "-a", desc: "The name of the pacticipant that was deployed."
             method_option :version, required: true, aliases: "-e", desc: "The pacticipant version number that was deployed."
             method_option :environment, required: true, desc: "The name of the environment that the pacticipant version was deployed to."
-            method_option :target, default: nil, required: false, desc: "Optional. The target of the deployment - a logical identifer required to differentiate deployments when there are multiple instances of the same application in an environment."
+            method_option :application_instance, default: nil, required: false, desc: "Optional. The application instance to which the deployment has occurred - a logical identifer required to differentiate deployments when there are multiple instances of the same application in an environment. This field was called 'target' in a beta release."
+            method_option :target, hidden: true, default: nil, required: false, desc: "Renamed to application_instance"
             output_option_json_or_text
             shared_authentication_options
 
             def record_deployment
+              $stderr.puts("WARN: target has been renamed to application-instance") if options.target
               params = {
                 pacticipant_name: options.pacticipant,
                 version_number: options.version,
                 environment_name: options.environment,
-                target: options.target
+                application_instance: options.application_instance || options.target
               }
               execute_deployment_command(params, "RecordDeployment")
             end
@@ -32,15 +34,17 @@ module PactBroker
             long_desc "Note that use of this command is only required if you are permanently removing an application instance from an environment. It is not required if you are deploying over a previous version, as record-deployment will automatically mark the previously deployed version as undeployed for you. See #{RECORD_UNDEPLOYMENT_HELP_URL} for more information."
             method_option :pacticipant, required: true, aliases: "-a", desc: "The name of the pacticipant that was undeployed."
             method_option :environment, required: true, desc: "The name of the environment that the pacticipant version was undeployed from."
+            method_option :application_instance, default: nil, required: false, desc: "Optional. The application instance from which the application is being undeployed - a logical identifer required to differentiate deployments when there are multiple instances of the same application in an environment. This field was called 'target' in a beta release."
             method_option :target, default: nil, required: false, desc: "Optional. The target that the application is being undeployed from - a logical identifer required to differentiate deployments when there are multiple instances of the same application in an environment."
             output_option_json_or_text
             shared_authentication_options
 
             def record_undeployment
+              $stderr.puts("WARN: target has been renamed to application-instance") if options.target
               params = {
                 pacticipant_name: options.pacticipant,
                 environment_name: options.environment,
-                target: options.target
+                application_instance: options.application_instance || options.target
               }
               execute_deployment_command(params, "RecordUndeployment")
             end

data/lib/pact_broker/client/deployments/record_deployment.rb

@@ -6,12 +6,12 @@ module PactBroker
       class RecordDeployment < PactBroker::Client::Deployments::RecordRelease
         def initialize(params, options, pact_broker_client_options)
           super
-          @target = params.fetch(:target)
+          @application_instance = params.fetch(:application_instance)
         end
 
         private
 
-        attr_reader :target
+        attr_reader :application_instance
 
         def action
           "deployment"
@@ -22,12 +22,13 @@ module PactBroker
         end
 
         def record_action_request_body
-          { target: target }.compact
+          # for backwards compatibility with old broker
+          { applicationInstance: application_instance, target: application_instance }.compact
         end
 
         def result_text_message
-          if target
-            "#{super} (target #{target})"
+          if application_instance
+            "#{super} (application instance #{application_instance})"
           else
             super
           end

data/lib/pact_broker/client/deployments/record_undeployment.rb

@@ -8,7 +8,7 @@ module PactBroker
           super
           @pacticipant_name = params.fetch(:pacticipant_name)
           @environment_name = params.fetch(:environment_name)
-          @target = params.fetch(:target)
+          @application_instance = params.fetch(:application_instance)
         end
 
         private
@@ -21,7 +21,7 @@ module PactBroker
           end
         end
 
-        attr_reader :pacticipant_name, :environment_name, :target
+        attr_reader :pacticipant_name, :environment_name, :application_instance
 
         def currently_deployed_versions_link
           environment_resource._link("pb:currently-deployed-deployed-versions", "pb:currently-deployed-versions") or raise PactBroker::Client::Error.new(not_supported_message)
@@ -31,14 +31,19 @@ module PactBroker
           @deployed_version_links ||= currently_deployed_versions_link.get!(pacticipant: pacticipant_name).embedded_entities!("deployedVersions")
         end
 
-        def currently_deployed_version_entities_for_pacticipant_and_target
+        def currently_deployed_version_entities_for_pacticipant_and_instance
           currently_deployed_version_entities_for_pacticipant.select do | entity |
-            entity.target == target
+            if application_instance
+              entity.applicationInstance == application_instance || entity.target == application_instance
+            else
+              entity.applicationInstance == nil && entity.target == nil
+            end
+
           end
         end
 
         def undeployed_versions_resources
-          @undeployed_versions_resources ||= currently_deployed_version_entities_for_pacticipant_and_target.collect do | entity |
+          @undeployed_versions_resources ||= currently_deployed_version_entities_for_pacticipant_and_instance.collect do | entity |
             entity._link!("self").patch(currentlyDeployed: false)
           end
         end
@@ -75,7 +80,7 @@ module PactBroker
           message = "Recorded #{action} of #{pacticipant_name}"
           message = "#{message} version #{version.number}" if (version && version.number)
           message = "#{message} from #{environment_name} environment"
-          message = "#{message} (target #{target})" if target
+          message = "#{message} (application instance #{application_instance})" if application_instance
           message
         end
 
@@ -92,19 +97,22 @@ module PactBroker
             "No pacticipant with name '#{pacticipant_name}' found."
           else
             if currently_deployed_version_entities_for_pacticipant.any?
-              target_does_not_match_message
+              application_instance_does_not_match_message
             else
               "#{pacticipant_name} is not currently deployed to #{environment_name} environment. Cannot record undeployment."
             end
           end
         end
 
-        def target_does_not_match_message
-          potential_targets = currently_deployed_version_entities_for_pacticipant.collect(&:target).collect { |target| target || "<no target>"}
-          if target
-            "#{pacticipant_name} is not currently deployed to target '#{target}' in #{environment_name} environment. Please specify one of the following targets to record the undeployment from: #{potential_targets.join(", ")}"
+        def application_instance_does_not_match_message
+          potential_application_instances = currently_deployed_version_entities_for_pacticipant.collect{|e| e.applicationInstance || e.target }
+
+          if application_instance
+            omit_text = potential_application_instances.include?(nil) ? "omit the application instance to undeploy from the anonymous instance" : nil
+            specify_text = potential_application_instances.compact.any? ? "specify one of the following application instances to record the undeployment from: #{potential_application_instances.compact.join(", ")}" : nil
+            "#{pacticipant_name} is not currently deployed to application instance '#{application_instance}' in #{environment_name} environment. Please #{[omit_text, specify_text].compact.join(" or ")}."
           else
-            "Please specify one of the following targets to record the undeployment from: #{potential_targets.join(", ")}"
+            "Please specify one of the following application instances to record the undeployment from: #{potential_application_instances.compact.join(", ")}"
           end
         end
 

data/lib/pact_broker/client/publish_pacts.rb

@@ -28,7 +28,7 @@ module PactBroker
 
       def call
         validate
-        if ENV.fetch("PACT_BROKER_FEATURES", "").include?("publish_contracts") && index_resource.can?("pb:publish-contracts")
+        if index_resource.can?("pb:publish-contracts")
           publish_pacts
           PactBroker::Client::CommandResult.new(success?, message)
         else
@@ -115,9 +115,8 @@ module PactBroker
             specification: "pact",
             contentType: "application/json",
             content: Base64.strict_encode64(pact_hash.to_json),
-            writeMode: write_mode,
-            onConflict: write_mode
-          }
+            onConflict: on_conflict
+          }.compact
         end
       end
 
@@ -137,8 +136,8 @@ module PactBroker
         pact_files.collect(&:consumer_name).uniq
       end
 
-      def write_mode
-        options[:merge] ? "merge" : "overwrite"
+      def on_conflict
+        options[:merge] ? "merge" : nil
       end
 
       def validate