pact_broker-client 1.49.0 → 1.51.2

data/doc/CAN_I_DEPLOY_USAGE_WITH_TAGS.md

@@ -0,0 +1,107 @@
+# Using can-i-deploy with tags
+
+The can-i-deploy tool was originally written to support specifying versions and dependencies using tags. This usage has now been superseded by first class support for [environments, deployments and releases](https://docs.pact.io/pact_broker/recording_deployments_and_releases/).
+
+The following documentation covers the usage of can-i-deploy for users who are still using tags to track environments and deployments.
+
+There are two ways to use `can-i-deploy` with tags. The first (recommended and most commonly used) approach is to specify just the application version you want to deploy and let the Pact Broker work out the dependencies for you. The second approach is to specify each application version explicitly. This would generally only be used if there were limitations that stopped you being able to use the first approach.
+
+#### Specifying an application version
+
+To specify an application (pacticipant) version you need to provide:
+
+* the name of the application using the `--pacticipant PACTICIPANT` parameter,
+* directly followed by *one* of the following parameters:
+    * `--version VERSION` to specify a known application version (recommended)
+    * `--latest` to specify the latest version
+    * `--latest TAG` to specify the latest version that has a particular tag
+    * `--all TAG` to specify all the versions that have a particular tag (eg. "all prod" versions). This would be used when ensuring you have backwards compatiblity with all production mobile clients for a provider. Note, when using this option, you need to specify dependency explicitly (see the second usage option).
+
+Using a specific version is the easiest way to ensure you get an accurate response that won't be affected by race conditions.
+
+#### Recommended usage - allowing the Pact Broker to automatically determine the dependencies
+
+Prerequisite: if you would like the Pact Broker to calculate the dependencies for you when you want to deploy an application into a given environment, you will need to let the Broker know which version of each application is in that environment.
+
+How you do this depends on the version of the Pact Broker you are running.
+
+If you are using a Broker version where deployment versions are supported, then you would notify the Broker of the deployment of this application version like so:
+
+    $ pact-broker record-deployment --pacticipant Foo --version 173153ae0 --environment test
+
+This assumes that you have already set up an environment named "test" in the Broker.
+
+If you are using a Broker version that does not support deployment environments, then you will need to use tags to notify the broker of the deployment of this application version, like so:
+
+    $ pact-broker create-version-tag --pacticipant Foo --version 173153ae0 --tag test
+
+Once you have configured your build to notify the Pact Broker of the successful deployment using either method describe above, you can use the following simple command to find out if you are safe to deploy (use either `--to` or  `--to-environment` as supported):
+
+    $ pact-broker can-i-deploy --pacticipant PACTICIPANT --version VERSION
+                               [--to-environment ENVIRONMENT | --to ENVIRONMENT_TAG ]
+                               --broker-base-url BROKER_BASE_URL
+
+If the `--to` or `--to-environment` options are omitted, then the query will return the compatiblity with the overall latest version of each of the other applications.
+
+Examples:
+
+
+Can I deploy version 173153ae0 of application Foo to the test environment?
+
+
+    $ pact-broker can-i-deploy --pacticipant Foo --version 173153ae0 \
+                               --to-environment test \
+                               --broker-base-url https://my-pact-broker
+
+
+Can I deploy the latest version of application Foo with the latest version of each of the applications it integrates to?
+
+
+    $ pact-broker can-i-deploy --pacticipant Foo --latest \
+                               --broker-base-url https://my-pact-broker
+
+
+Can I deploy the latest version of the application Foo that has the tag "test" to the "prod" environment?
+
+    $ pact-broker can-i-deploy --pacticipant Foo --latest test \
+                               --to prod \
+                               --broker-base-url https://my-pact-broker
+
+
+#### Alternate usage - specifying dependencies explicitly
+
+If you are unable to use tags, or there is some other limitation that stops you from using the recommended approach, you can specify one or more of the dependencies explictly. You must also do this if you want to use the `--all TAG` option for any of the pacticipants.
+
+You can specify as many application versions as you like, and you can even specify multiple versions of the same application (repeat the `--pacticipant` name and supply a different version.)
+
+You can use explictly declared dependencies with or without the `--to ENVIRONMENT_TAG`. For example, if you declare two (or more) application versions with no `--to ENVIRONMENT_TAG`, then only the applications you specify will be taken into account when determining if it is safe to deploy. If you declare two (or more) application versions _as well as_ a `--to ENVIRONMENT`, then the Pact Broker will work out what integrations your declared applications will have in that environment when determining if it safe to deploy. When using this script for a production release, and you are using tags, it is always the most future-proof option to use the `--to` if possible, as it will catch any newly added consumers or providers.
+
+If you are finding that your dependencies are not being automatically included when you supply multiple pacticipant versions, please upgrade to the latest version of the Pact Broker, as this is a more recently added feature.
+
+
+    $ pact-broker can-i-deploy --pacticipant PACTICIPANT_1 [--version VERSION_1 | --latest [TAG_1] | --all TAG_1] \
+                               --pacticipant PACTICIPANT_2 [--version VERSION_2 | --latest [TAG_2] | --all TAG_2] \
+                               [--to-environment ENVIRONMENT | --to ENVIRONMENT_TAG]
+
+Examples:
+
+
+Can I deploy version Foo version 173153ae0 and Bar version ac23df1e8 together?
+
+
+    $ pact-broker can-i-deploy --pacticipant Foo --version 173153ae0 \
+                               --pacticipant Bar --version ac23df1e8
+
+
+Can I deploy the latest version of Foo with tag "master" and the latest version of Bar with tag "master" together?
+
+    $ pact-broker can-i-deploy --pacticipant Foo --latest master \
+                               --pacticipant Bar --latest master
+
+
+Mobile provider use case - can I deploy version b80e7b1b of Bar, all versions of Foo with tag "prod", and the latest version tagged "prod" of any other automatically calculated dependencies together? (Eg. where Bar is a provider and Foo is a mobile consumer with multiple versions in production, and Bar also has its own providers it needs to be compatible with.)
+
+
+    $ pact-broker can-i-deploy --pacticipant Bar --version b80e7b1b \
+                               --pacticipant Foo --all prod \
+                               --to prod

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,76 +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",
-    "branch": "main",
-    "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",
-    "branch": "main",
-    "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
@@ -2121,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

data/example/scripts/verify-changed-pact.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Use this to stop unnecessary verifications from running when triggered by the
+# `contract_content_changed` webhook, or when using the webhookless flow.
+
+set -eu
+
+PACT_CLI_VERSION="0.47.0.0"
+
+: "${PACT_URL:?PACT_URL is not set, cannot run verification.}"
+: "${CONSUMER_NAME:?CONSUMER_NAME is not set, cannot check if verification is required.}"
+: "${CONSUMER_VERSION_NUMBER:?CONSUMER_VERSION_NUMBER is not set, cannot check if verification is required.}"
+
+# Delete unnecessary username/password/token
+if docker run --rm \
+    -e PACT_BROKER_BASE_URL \
+    -e PACT_BROKER_TOKEN \
+    -e PACT_BROKER_USERNAME \
+    -e PACT_BROKER_PASSWORD \
+    -e PACT_BROKER_FEATURES="verification_required" \
+    -it \
+    pactfoundation/pact-cli:$PACT_CLI_VERSION \
+      broker verification-required \
+      --pacticipant pactflow-application-saas \
+      --version ${RELEASE_VERSION} \
+      --pacticipant ${CONSUMER_NAME} \
+      --version ${CONSUMER_VERSION_NUMBER} \
+      --verbose ; then
+  echo "Run the verification here"
+fi

data/lib/pact_broker/client/cli/can_i_deploy_long_desc.txt

@@ -1,109 +1,24 @@
-Returns exit code 0 or 1, indicating whether or not the specified application (pacticipant) versions are compatible (ie. safe to deploy). Prints out the relevant pact/verification details, indicating any missing or failed verification results.
+Returns exit code 0 or 1, indicating whether or not the specified application (pacticipant) has a successful verification result with each of the application versions that are already deployed to a particular environment. Prints out the relevant pact/verification details, indicating any missing or failed verification results.
 
-The environment variables PACT_BROKER_BASE_URL, PACT_BROKER_USERNAME and PACT_BROKER_PASSWORD may be used instead of their respective command line options.
+The can-i-deploy tool was originally written to support specifying versions and dependencies using tags. This usage has now been superseded by first class 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/
 
-There are two ways to use `can-i-deploy`. The first (recommended and most commonly used) approach is to specify just the application version you want to deploy and let the Pact Broker work out the dependencies for you. The second approach is to specify each application version explicitly. This would generally only be used if there were limitations that stopped you being able to use the first approach.
+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.
 
-#### Specifying an application version
+    $ pact-broker create-environment --name "uat" --display-name "UAT" --no-production
 
-To specify an application (pacticipant) version you need to provide:
+After an application is deployed or released, its deployment must be recorded using the `record-deployment` or `record-release` commands. See https://docs.pact.io/pact_broker/recording_deployments_and_releases/ for more information.
 
-* the name of the application using the `--pacticipant PACTICIPANT` parameter,
-* directly followed by *one* of the following parameters:
-    * `--version VERSION` to specify a known application version (recommended)
-    * `--latest` to specify the latest version
-    * `--latest TAG` to specify the latest version that has a particular tag
-    * `--all TAG` to specify all the versions that have a particular tag (eg. "all prod" versions). This would be used when ensuring you have backwards compatiblity with all production mobile clients for a provider. Note, when using this option, you need to specify dependency explicitly (see the second usage option).
+    $ pact-broker record-deployment --pacticipant Foo --version 173153ae0 --environment uat
 
-Using a specific version is the easiest way to ensure you get an accurate response that won't be affected by race conditions.
+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.
 
-#### Recommended usage - allowing the Pact Broker to automatically determine the dependencies
+    $ pact-broker can-i-deploy --pacticipant PACTICIPANT --version VERSION --to-environment ENVIRONMENT
 
-Prerequisite: if you would like the Pact Broker to calculate the dependencies for you when you want to deploy an application into a given environment, you will need to let the Broker know which version of each application is in that environment.
+Example: can I deploy version 173153ae0 of application Foo to the test environment?
 
-How you do this depends on the version of the Pact Broker you are running.
+    $ pact-broker can-i-deploy --pacticipant Foo --version 173153ae0 --to-environment test
 
-If you are using a Broker version where deployment versions are supported, then you would notify the Broker of the deployment of this application version like so:
+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 record-deployment --pacticipant Foo --version 173153ae0 --environment test
-
-This assumes that you have already set up an environment named "test" in the Broker.
-
-If you are using a Broker version that does not support deployment environments, then you will need to use tags to notify the broker of the deployment of this application version, like so:
-
-    $ pact-broker create-version-tag --pacticipant Foo --version 173153ae0 --tag test
-
-Once you have configured your build to notify the Pact Broker of the successful deployment using either method describe above, you can use the following simple command to find out if you are safe to deploy (use either `--to` or  `--to-environment` as supported):
-
-    $ pact-broker can-i-deploy --pacticipant PACTICIPANT --version VERSION
-                               [--to-environment ENVIRONMENT | --to ENVIRONMENT_TAG ]
-                               --broker-base-url BROKER_BASE_URL
-
-If the `--to` or `--to-environment` options are omitted, then the query will return the compatiblity with the overall latest version of each of the other applications.
-
-Examples:
-
-
-Can I deploy version 173153ae0 of application Foo to the test environment?
-
-
-    $ pact-broker can-i-deploy --pacticipant Foo --version 173153ae0 \
-                               --to-environment test \
-                               --broker-base-url https://my-pact-broker
-
-
-Can I deploy the latest version of application Foo with the latest version of each of the applications it integrates to?
-
-
-    $ pact-broker can-i-deploy --pacticipant Foo --latest \
-                               --broker-base-url https://my-pact-broker
-
-
-Can I deploy the latest version of the application Foo that has the tag "test" to the "prod" environment?
-
-    $ pact-broker can-i-deploy --pacticipant Foo --latest test \
-                               --to prod \
-                               --broker-base-url https://my-pact-broker
-
-
-#### Alternate usage - specifying dependencies explicitly
-
-If you are unable to use tags, or there is some other limitation that stops you from using the recommended approach, you can specify one or more of the dependencies explictly. You must also do this if you want to use the `--all TAG` option for any of the pacticipants.
-
-You can specify as many application versions as you like, and you can even specify multiple versions of the same application (repeat the `--pacticipant` name and supply a different version.)
-
-You can use explictly declared dependencies with or without the `--to ENVIRONMENT_TAG`. For example, if you declare two (or more) application versions with no `--to ENVIRONMENT_TAG`, then only the applications you specify will be taken into account when determining if it is safe to deploy. If you declare two (or more) application versions _as well as_ a `--to ENVIRONMENT`, then the Pact Broker will work out what integrations your declared applications will have in that environment when determining if it safe to deploy. When using this script for a production release, and you are using tags, it is always the most future-proof option to use the `--to` if possible, as it will catch any newly added consumers or providers.
-
-If you are finding that your dependencies are not being automatically included when you supply multiple pacticipant versions, please upgrade to the latest version of the Pact Broker, as this is a more recently added feature.
-
-
-    $ pact-broker can-i-deploy --pacticipant PACTICIPANT_1 [--version VERSION_1 | --latest [TAG_1] | --all TAG_1] \
-                               --pacticipant PACTICIPANT_2 [--version VERSION_2 | --latest [TAG_2] | --all TAG_2] \
-                               [--to-environment ENVIRONMENT | --to ENVIRONMENT_TAG] \
-                               --broker-base-url BROKER_BASE_URL
-
-Examples:
-
-
-Can I deploy version Foo version 173153ae0 and Bar version ac23df1e8 together?
-
-
-    $ pact-broker can-i-deploy --pacticipant Foo --version 173153ae0 \
-                               --pacticipant Bar --version ac23df1e8 \
-                               --broker-base-url BROKER_BASE_URL
-
-
-Can I deploy the latest version of Foo with tag "master" and the latest version of Bar with tag "master" together?
-
-    $ pact-broker can-i-deploy --pacticipant Foo --latest master \
-                               --pacticipant Bar --latest master \
-                               --broker-base-url BROKER_BASE_URL
-
-
-Mobile provider use case - can I deploy version b80e7b1b of Bar, all versions of Foo with tag "prod", and the latest version tagged "prod" of any other automatically calculated dependencies together? (Eg. where Bar is a provider and Foo is a mobile consumer with multiple versions in production, and Bar also has its own providers it needs to be compatible with.)
-
-
-    $ pact-broker can-i-deploy --pacticipant Bar --version b80e7b1b \
-                               --pacticipant Foo --all prod \
-                               --to prod \
-                               --broker-base-url BROKER_BASE_URL
+    $ pact-broker can-i-deploy --pacticipant Foo 173153ae0 \
+                               --pacticipant Bar --latest main

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

@@ -38,7 +38,7 @@ module PactBroker
               execute_environment_command(params_from_options([:uuid]), "DescribeEnvironment")
             end
 
-            desc "list-environments", "List environment"
+            desc "list-environments", "List environments"
             method_option :output, aliases: "-o", desc: "json or text", default: 'text'
             shared_authentication_options
             def list_environments

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

@@ -12,8 +12,8 @@ module PactBroker
             method_option :version, required: false, aliases: "-e", desc: "The pacticipant version. Must be entered after the --pacticipant that it relates to."
             method_option :ignore, required: false, desc: "The pacticipant name to ignore. Use once for each pacticipant being ignored. A specific version can be ignored by also specifying a --version after the pacticipant name option."
             method_option :latest, required: false, aliases: "-l", banner: "[TAG]", desc: "Use the latest pacticipant version. Optionally specify a TAG to use the latest version with the specified tag."
-            method_option :to, required: false, banner: "TAG", desc: "This is too hard to explain in a short sentence. Look at the examples.", default: nil
-            method_option :to_environment, required: false, banner: "ENVIRONMENT", desc: "The environment into which the pacticipant(s) are to be deployed", default: nil, hide: true
+            method_option :to_environment, required: false, banner: "ENVIRONMENT", desc: "The environment into which the pacticipant(s) are to be deployed", default: nil
+            method_option :to, required: false, banner: "TAG", desc: "The tag that represents the branch or environment of the integrated applications for which you want to check the verification result status.", default: nil
             method_option :output, aliases: "-o", desc: "json or table", default: "table"
             method_option :retry_while_unknown, banner: "TIMES", type: :numeric, default: 0, required: false, desc: "The number of times to retry while there is an unknown verification result (ie. the provider verification is likely still running)"
             method_option :retry_interval, banner: "SECONDS", type: :numeric, default: 10, required: false, desc: "The time between retries in seconds. Use in conjuction with --retry-while-unknown"

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

@@ -22,6 +22,9 @@ module PactBroker
                 method_option :provider_verification_published, type: :boolean, desc: "Trigger this webhook when a provider verification result is published"
                 method_option :provider_verification_failed, type: :boolean, desc: "Trigger this webhook when a failed provider verification result is published"
                 method_option :provider_verification_succeeded, type: :boolean, desc: "Trigger this webhook when a successful provider verification result is published"
+                if ENV.fetch("PACT_BROKER_FEATURES", "").include?("contract_requiring_verification_published")
+                  method_option :contract_requiring_verification_published, type: :boolean, desc: "Trigger this webhook when a contract is published that requires verification"
+                end
                 method_option :team_uuid, banner: "UUID", desc: "UUID of the Pactflow team to which the webhook should be assigned (Pactflow only)"
                 shared_authentication_options
               end
@@ -62,12 +65,14 @@ module PactBroker
                 events << 'provider_verification_published' if options.provider_verification_published
                 events << 'provider_verification_succeeded' if options.provider_verification_succeeded
                 events << 'provider_verification_failed' if options.provider_verification_failed
+                events << 'contract_requiring_verification_published' if options.contract_requiring_verification_published
                 events
               end
 
               def parse_webhook_options(webhook_url)
                 events = parse_webhook_events
 
+                # TODO update for contract_requiring_verification_published when released
                 if events.size == 0
                   raise WebhookCreationError.new("You must specify at least one of --contract-content-changed, --contract-published, --provider-verification-published, --provider-verification-succeeded or --provider-verification-failed")
                 end

data/lib/pact_broker/client/matrix/abbreviate_version_number.rb

@@ -2,11 +2,33 @@ module PactBroker
   module Client
     class Matrix
       class AbbreviateVersionNumber
-        def self.call version_number
-          if version_number
-            version_number.gsub(/[A-Za-z0-9]{40}/) do | val |
-              val[0...7] + "..."
-            end
+        # Official regex from https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+        SEMVER_REGEX = /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?/
+        SHA1_REGEX = /[A-Za-z0-9]{40}/
+
+        class << self
+          def call version_number
+            return unless version_number
+
+            return replace_all_git_sha(version_number) if [SEMVER_REGEX, SHA1_REGEX].all?{|r| regex_match?(r, version_number) }
+
+            return replace_all_git_sha(version_number) if regex_match?(Regexp.new("\\A#{SHA1_REGEX.source}\\z"), version_number)
+
+            # Trim to some meaningful value in case we couldn't match anything, just not to mess with the output
+            return version_number[0...60] + '...' if version_number.length > 60
+
+            version_number
+          end
+
+          private
+
+          # To support ruby2.2
+          def regex_match?(regex, value)
+            !regex.match(value).nil?
+          end
+
+          def replace_all_git_sha(version)
+            version.gsub(SHA1_REGEX) { |val| val[0...7] + '...' }
           end
         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