pact_broker-client 1.71.0 → 1.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cab4d53c9ef3be0be8a1bdd732c4e7eefddad4e2bd27591ca06500e5c63a81d
-  data.tar.gz: 67e2015656535cf37325f9a45d7fca195c1a2fb64e157e6a1485447d76173551
+  metadata.gz: bfeaaf44e2dc8a19f90bd55795542da931dec46853371ea5a51955ccb1f3a39f
+  data.tar.gz: c9d00e81e65a20bc6f8a0b38c5c2af2c135e05266906f3b7bd45207a8f7e7b07
 SHA512:
-  metadata.gz: d70c00647a761e2cf37028514027b4a36ae0159a65145949144cdc2e3026dfdcaef93d3ac8a827bf1ad43e55e0cf8e7dc40a5ad1117e4424fe70054b153334e9
-  data.tar.gz: 88264d74be62413f138453b54a842eab64b975d3a5f433ffd370993f86afe4ebd2bb79f969f92c3b54b6ac51a641b729515224996d3c154d721e036cdc8d7448
+  metadata.gz: 521599522cf724dd5f0f28becbcc7faf2695c45e1050892ae0494573dc220d22427712548d4a1c5395d7caf9d59263405ff4b8158fdc2634ba8416292afc3447
+  data.tar.gz: 987e4569edfac0db3e0bc81483b67cee1d73803422e4dea145456dd61dd7afdad2ad632190cba28eb91501069fce9aa6a49b661cb6398be8a865a6dd681a81aa

data/.github/workflows/release_gem.yml

@@ -10,10 +10,8 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.2'
     - run: |
         gem install bundler -v 2.4
         bundle install
@@ -28,7 +26,7 @@ jobs:
       version: ${{ steps.release.outputs.version }}
       increment: ${{ steps.release.outputs.increment }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - uses: pact-foundation/release-gem@v0.0.14
@@ -38,6 +36,23 @@ jobs:
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         INCREMENT: '${{ github.event.client_payload.increment }}'
 
+  record-release:
+    needs: release
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+    - name: Bundle install
+      run: |
+        gem install bundler -v 2.4
+        bundle config set --local without development test
+        bundle install
+    - name: Record release
+      run: script/ci/record-release.sh
+      env:
+        PACT_BROKER_BASE_URL: https://pact-foundation.pactflow.io
+        PACT_BROKER_TOKEN: ${{ secrets.PACT_BROKER_TOKEN_PACT_FOUNDATION }}
+
   notify-gem-released:
     needs: release
     strategy:

data/.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
         ruby_version: ["2.7", "3.0", "3.1", "3.2"]
         os: ["ubuntu-latest","windows-latest","macos-latest"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
@@ -25,7 +25,7 @@ jobs:
       matrix:
         feature: [""]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.2"
@@ -47,11 +47,11 @@ jobs:
     steps:
       - run: |
           docker run --rm \
-           -e PACT_BROKER_BASE_URL=https://pact-oss.pactflow.io \
+           -e PACT_BROKER_BASE_URL=https://pact-foundation.pactflow.io \
            -e PACT_BROKER_TOKEN \
             pactfoundation/pact-cli:latest \
             broker can-i-deploy \
             --pacticipant "Pact Broker Client" --version ${GITHUB_SHA} \
-            --pacticipant "Pact Broker" --latest master
+            --pacticipant "Pact Broker" --branch master
         env:
-          PACT_BROKER_TOKEN: ${{ secrets.PACTFLOW_PACT_OSS_TOKEN }}
+          PACT_BROKER_TOKEN: ${{ secrets.PACT_BROKER_TOKEN_PACT_FOUNDATION }}

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+<a name="v1.73.0"></a>
+### v1.73.0 (2023-10-13)
+
+#### Features
+
+* print warnings and allow error to be raised when unknown option is used	 ([5412121](/../../commit/5412121))
+* raise an error when an em dash is used instead of a normal dash	 ([0e8e773](/../../commit/0e8e773))
+* support --help and -h flags	 ([a6458ab](/../../commit/a6458ab))
+* handle x509 certs in HTTP Client (#142)	 ([c3aa8dc](/../../commit/c3aa8dc))
+
+<a name="v1.72.0"></a>
+### v1.72.0 (2023-09-11)
+
+#### Features
+
+* enable publishing provider contracts using the 'all in one' endpoint	 ([398d58c](/../../commit/398d58c))
+
 <a name="v1.71.0"></a>
 ### v1.71.0 (2023-09-07)
 

data/DEVELOPING.md

@@ -0,0 +1,17 @@
+# Developing
+
+## Testing pact_broker-client locally
+
+1. Make sure you have `ruby` available on the command line
+2. Install with `bundle install`
+3. Run tests with `bundle exec rake`
+4. Run individual test with `rspec <path to test>`
+5. Run one of the scripts in `./example/scripts`, see the readme for more detail, and scripts
+
+##  Available Rake tasks
+
+1. check `bundle exec rake --tasks`
+
+## Generating docs
+
+If you change the CLI commands, run `bundle exec script/update-cli-usage-in-readme.rb` to update the `README.md` automatically.

data/Gemfile

@@ -12,5 +12,17 @@ if ENV['X_PACT_DEVELOPMENT'] == 'true'
 end
 
 group :development do
+  gem 'fakefs', '~> 2.4'
+  gem 'webmock', '~> 3.0'
+  gem 'conventional-changelog', '~>1.3'
+  gem 'pact', '~> 1.16'
+  gem 'pact-support', '~> 1.16'
+  gem 'approvals', '0.0.26'
+  gem 'rspec-its', '~> 1.3'
   gem 'pry-byebug'
-end
+end
+
+group :test do
+  gem 'faraday', '~>2.0'
+  gem 'faraday-retry', '~>2.0'
+end

data/README.md

@@ -42,6 +42,14 @@ Basic auth parameters can be specified using the `$PACT_BROKER_USERNAME` and `$P
 
 Authentication using a bearer token can be specified using the environment variable `$PACT_BROKER_TOKEN` or the `-k` or `--broker-token` parameters. This bearer token authentication is used by [PactFlow](https://pactflow.io) and is not available in the [OSS Pact Broker](https://docs.pact.io/pact_broker/), which only supports basic auth.
 
+### Handling unknown options
+
+By default, the underlying library used for the Pact Broker CLI (Thor) does not raise an error in every situation where there is an unknown option used.
+This can allow invalid commands to be executed that do not perform as expected.
+
+From version 1.73.0, warnings will be printed for unknown options, and if the environment variable `PACT_BROKER_ERROR_ON_UNKNOWN_OPTION=true` is set, an error will be raised when an unknown option is used.
+
+In the next major version, an error will be raised by default.
 
 <!-- start-autogenerated-docs -->
 
@@ -680,7 +688,9 @@ Options:
   -H, [--header=one two three]
               # Webhook Header
   -d, [--data=DATA]
-              # Webhook payload (file or string)
+              # Webhook payload. Provide a JSON string (remember to escape
+                characters appropriately for the shell) or a file path prefixed
+                with the @ symbol, as per the curl usage for this flag.
   -u, [--user=USER]
               # Webhook basic auth username and password eg. username:password
       [--consumer=CONSUMER]
@@ -743,7 +753,9 @@ Options:
   -H, [--header=one two three]
               # Webhook Header
   -d, [--data=DATA]
-              # Webhook payload (file or string)
+              # Webhook payload. Provide a JSON string (remember to escape
+                characters appropriately for the shell) or a file path prefixed
+                with the @ symbol, as per the curl usage for this flag.
   -u, [--user=USER]
               # Webhook basic auth username and password eg. username:password
       [--consumer=CONSUMER]

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

@@ -2305,8 +2305,7 @@ Pact Broker will respond with:
         "name": "Foo"
       },
       "version": {
-        "number": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30",
-        "buildUrl": "http://build"
+        "number": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30"
       }
     },
     "logs": [

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

@@ -1,30 +1,41 @@
 require 'thor'
+require 'pact_broker/client/cli/thor_unknown_options_monkey_patch'
 require 'pact_broker/client/hash_refinements'
 
 module PactBroker
   module Client
     module CLI
       class AuthError < ::Thor::Error; end
-
       ##
       # Custom Thor task allows the following:
       #
       # `--option 1 --option 2` to be interpreted as `--option 1 2` (the standard Thor format for multiple value options)
       #
+
       class CustomThor < ::Thor
         using PactBroker::Client::HashRefinements
 
+        EM_DASH = "\u2014"
+
+        check_unknown_options!
+
         no_commands do
           def self.exit_on_failure?
             true
           end
 
+          # Provide a wrapper method that can be stubbed in tests
+          def self.exit_with_error_code
+            exit(1)
+          end
+
           def self.start given_args = ARGV, config = {}
+            check_for_mdash!(given_args)
             super(massage_args(given_args))
           end
 
           def self.massage_args argv
-            add_broker_config_from_environment_variables(turn_muliple_tag_options_into_array(argv))
+            add_broker_config_from_environment_variables(turn_muliple_tag_options_into_array(handle_help(argv)))
           end
 
           def self.add_broker_config_from_environment_variables argv
@@ -42,6 +53,25 @@ module PactBroker
             end
           end
 
+          # Thor expects help to be invoked by typing `help <command>`, which is very odd.
+          # Add support for `command --help|-h` by massaging the arguments into the format that Thor expects.
+          def self.handle_help(argv)
+            if argv.last == "--help" || argv.last == "-h"
+              argv[0..-3] + ["help", argv[-2]].compact
+            else
+              argv
+            end
+          end
+
+          def self.check_for_mdash!(argv)
+            if (word_with_mdash = argv.find{ |arg | arg.include?(EM_DASH) })
+              # Can't use the `raise Thor::Error` approach here (which is designed to show the error without a backtrace)
+              # because the exception is not handled within the Thor code, and will show an ugly backtrace.
+              $stdout.puts "The argument '#{word_with_mdash}' contains an em dash (the long dash you get in Microsoft Word when you type two short dashes in a row). Please replace it with a normal dash and try again."
+              exit_with_error_code
+            end
+          end
+
           # other task names, help, and the help shortcuts
           def self.known_first_arguments
             @known_first_arguments ||= tasks.keys + ::Thor::HELP_MAPPINGS + ['help']

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

@@ -0,0 +1,38 @@
+require "thor"
+require "term/ansicolor"
+
+# Monkey patch Thor so we can print out a warning when there are unknown options, rather than raising an error.
+# If PACT_BROKER_ERROR_ON_UNKNOWN_OPTION=true, raise the error, as the user will have opted in to this behaviour.
+# This is for backwards compatibility reasons, and in the next major version, the flag will be removed.
+
+class Thor
+  class Options < Arguments
+
+    alias_method :original_check_unknown!, :check_unknown!
+
+    # Replace the original check_unknown! method with an implementation
+    # that will print a warning rather than raising an error
+    # unless PACT_BROKER_ERROR_ON_UNKNOWN_OPTION=true is set.
+    def check_unknown!
+      if raise_error_on_unknown_options?
+        original_check_unknown!
+      else
+        check_unknown_and_warn
+      end
+    end
+
+    def raise_error_on_unknown_options?
+      ENV["PACT_BROKER_ERROR_ON_UNKNOWN_OPTION"] == "true"
+    end
+
+    def check_unknown_and_warn
+      begin
+        original_check_unknown!
+      rescue UnknownArgumentError => e
+        $stderr.puts(::Term::ANSIColor.yellow(e.message))
+        $stderr.puts(::Term::ANSIColor.yellow("This is a warning rather than an error so as not to break backwards compatibility. To raise an error for unknown options set PACT_BROKER_ERROR_ON_UNKNOWN_OPTION=true"))
+        $stderr.puts("\n")
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module PactBroker
               def self.shared_options_for_webhook_commands
                 method_option :request, banner: "METHOD", aliases: "-X", desc: "Webhook HTTP method", required: true
                 method_option :header, aliases: "-H", type: :array, desc: "Webhook Header"
-                method_option :data, aliases: "-d", desc: "Webhook payload (file or string)"
+                method_option :data, aliases: "-d", desc: "Webhook payload. Provide a JSON string (remember to escape characters appropriately for the shell) or a file path prefixed with the @ symbol, as per the curl usage for this flag."
                 method_option :user, aliases: "-u", desc: "Webhook basic auth username and password eg. username:password"
                 method_option :consumer, desc: "Consumer name"
                 method_option :consumer_label, desc: "Consumer label, mutually exclusive with consumer name"

data/lib/pact_broker/client/hal/http_client.rb

@@ -71,6 +71,12 @@ module PactBroker
             # See https://github.com/pact-foundation/pact-ruby-standalone/issues/57
             http.ca_file = ENV['SSL_CERT_FILE'] if ENV['SSL_CERT_FILE'] && ENV['SSL_CERT_FILE'] != ''
             http.ca_path = ENV['SSL_CERT_DIR'] if ENV['SSL_CERT_DIR'] && ENV['SSL_CERT_DIR'] != ''
+
+            if x509_certificate?
+              http.cert = OpenSSL::X509::Certificate.new(x509_client_cert_file)
+              http.key = OpenSSL::PKey::RSA.new(x509_client_key_file)
+            end
+
             if disable_ssl_verification?
               if verbose?
                 $stdout.puts("SSL verification is disabled")
@@ -127,6 +133,19 @@ module PactBroker
           verbose || ENV["VERBOSE"] == "true"
         end
 
+        def x509_certificate?
+          ENV['X509_CLIENT_CERT_FILE'] && ENV['X509_CLIENT_CERT_FILE'] != '' &&
+            ENV['X509_CLIENT_KEY_FILE'] && ENV['X509_CLIENT_KEY_FILE'] != ''
+        end
+
+        def x509_client_cert_file
+          File.read(ENV['X509_CLIENT_CERT_FILE'])
+        end
+
+        def x509_client_key_file
+          File.read(ENV['X509_CLIENT_KEY_FILE'])
+        end
+
         def disable_ssl_verification?
           ENV['PACT_DISABLE_SSL_VERIFICATION'] == 'true' || ENV['PACT_BROKER_DISABLE_SSL_VERIFICATION'] == 'true'
         end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.71.0'
+    VERSION = '1.73.0'
   end
 end

data/lib/pactflow/client/provider_contracts/publish.rb

@@ -26,7 +26,7 @@ module Pactflow
         attr_reader :provider_name, :provider_version_number, :branch_name, :tags, :build_url, :contract, :verification_results
 
         def do_call
-          if enabled? && index_resource.assert_success!.can?(PUBLISH_RELATION)
+          if !disabled? && index_resource.assert_success!.can?(PUBLISH_RELATION)
             publish_provider_contracts
             PactBroker::Client::CommandResult.new(success?, message)
           else
@@ -34,8 +34,8 @@ module Pactflow
           end
         end
 
-        def enabled?
-          ENV.fetch("PACT_BROKER_FEATURES", "").include?("publish_provider_contracts_all_in_one")
+        def disabled?
+          ENV.fetch("PACTFLOW_FEATURES", "").include?("publish_provider_contracts_using_old_api")
         end
 
         def publish_provider_contracts

data/pact-broker-client.gemspec

@@ -27,12 +27,4 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'thor', '>= 0.20', '< 2.0'
   gem.add_runtime_dependency 'rake', '~> 13.0' #For FileList
   gem.add_runtime_dependency 'dig_rb', '~> 1.0'
-
-  gem.add_development_dependency 'fakefs', '~> 2.4'
-  gem.add_development_dependency 'webmock', '~> 3.0'
-  gem.add_development_dependency 'conventional-changelog', '~>1.3'
-  gem.add_development_dependency 'pact', '~> 1.16'
-  gem.add_development_dependency 'pact-support', '~> 1.16'
-  gem.add_development_dependency 'approvals', '0.0.26' 
-  gem.add_development_dependency 'rspec-its', '~> 1.3'
 end

data/script/ci/record-release.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eu
+
+bundle exec bin/pact-broker record-release \
+   --pacticipant "Pact Broker Client" --version $GITHUB_SHA \
+   --environment production

data/script/publish-pact.sh

@@ -29,7 +29,7 @@ export PACT_BROKER_TOKEN=${PACT_BROKER_TOKEN:-"localhost"}
 #   --contract-published
 
 
-bundle exec bin/pact-broker publish scripts/foo-bar.json \
+bundle exec bin/pact-broker publish script/foo-bar.json \
   --consumer-app-version 1.2.26 \
     --auto-detect-version-properties \
     --build-url http://mybuild \

data/script/update-cli-usage-in-readme.rb

@@ -1,4 +1,11 @@
 #!/usr/bin/env ruby
+require "bundler/inline"
+
+gemfile do
+  source "https://rubygems.org"
+  gem "pact_broker-client", path: "."
+end
+
 require "stringio"
 require "pact_broker/client/cli/broker"
 require "pactflow/client/cli/pactflow"

data/spec/fixtures/certificates/ca_cert.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDATCCAemgAwIBAgIUWfQF2Mh+eFd3q+cSVgekpaMTh9MwDQYJKoZIhvcNAQEL
+BQAwDzENMAsGA1UEAwwETXlDQTAgFw0yMzA5MTkxMTA2MjZaGA8yMTIzMDgyNjEx
+MDYyNlowDzENMAsGA1UEAwwETXlDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAK9Qha2OdeFrSCUqiYRUBngNLn8PRGDaKPWmjd+3WOWJNM1RNgFfGpKY
+nxYJp4J6eW7aeQ6o94Q+QOZp+Yxm6thrtvjRbcEafAore4EwC4tjXvoFoy+mKwzm
+njlJw+ha3TsMAqD3GGDLF7uDnmliURRo8TOmJ++Mwss9Uhb5p9LArjWXa3sV8da+
+gsxP2aTgBZfznUhNKDGUfezYa5UEbHQ869rA1PAqL3tOC2M5LTX08C2PlzzLOF5S
+gBzicV1PPDkmkbxKmFV+D8LmkwWNsRhrzZ6TIxYoXIRhziS7JuYOGU7G0+6ZKpIP
+mo7WXSoSrd7GL5PQJzlHKCsTckd4so0CAwEAAaNTMFEwHQYDVR0OBBYEFCeovNXs
+r1mcbprFaLyll+LrBJmQMB8GA1UdIwQYMBaAFCeovNXsr1mcbprFaLyll+LrBJmQ
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHOsbZ0iDiKiRU8Q
+hIAav056dboPjTK19Q736DUD6oCbTbvecfxMv/wu9LmYGW5jt/DWP6s+jDYhcPpj
+c3U03pPKCnvsG5z60ZgmNSqzyVAVPW17UVdw/ZnkKK/SFxYgYQaF/1g6opS2Zana
+4aBGypqqGoD4KE+DAnRjuuCUpiz3zXwGd86auajY6soMlLNnVXteVa/whW6IZ84x
+w4LISeMGUr+MXw9ye4WhcZYKZ4vwJdUYst2PA0pDuGwBDbGnrYloGm2BSpaHXUUo
+XrwKFFkIxcK63IpAhoceTJpyfjI1BSmItfjEwToOUu6xDBsHLNiH6BKstSxk0DfX
+01PHz2I=
+-----END CERTIFICATE-----

data/spec/fixtures/certificates/ca_cert.srl

@@ -0,0 +1 @@
+494F82D5FE5055D2C9C64941C421085B59521071

data/spec/fixtures/certificates/ca_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvUIWtjnXha0gl
+KomEVAZ4DS5/D0Rg2ij1po3ft1jliTTNUTYBXxqSmJ8WCaeCenlu2nkOqPeEPkDm
+afmMZurYa7b40W3BGnwKK3uBMAuLY176BaMvpisM5p45ScPoWt07DAKg9xhgyxe7
+g55pYlEUaPEzpifvjMLLPVIW+afSwK41l2t7FfHWvoLMT9mk4AWX851ITSgxlH3s
+2GuVBGx0POvawNTwKi97TgtjOS019PAtj5c8yzheUoAc4nFdTzw5JpG8SphVfg/C
+5pMFjbEYa82ekyMWKFyEYc4kuybmDhlOxtPumSqSD5qO1l0qEq3exi+T0Cc5Rygr
+E3JHeLKNAgMBAAECggEAF2EHQqWB24V2rIYnVT9DUZUobdyiWMF0aYtEK4uuzjAQ
+RjpzQkGQMJvWc0DnAW5wbTOzUHIrTTZkFJYYp6boiziUwPUPduCfnqznySBCxIbZ
+mUFRNBSBHzT4mq6B8qV+D9bChFFkrdvHlsOu8gzLaouyxsQnWo8MlxU0B55UHrWc
+nqIsPKVBeBtiF7c7eyZtpKmYgmWN8hnPzTZ2rtCL/BS3p2+/O+fFJKuul58Yo4t6
+bmMCPN5C6HxNhB6ADHm3lPVU3ap5g3a/4UHqVJ8c2SGKfAx6C1PgbajxiA74qMLS
+YOhMXzc3jSLmakqvSmVhQFJhFt7drbbGtx4oD3+XPQKBgQDj1k7O2A0yJRQPtvQJ
+A1m+H5fmynMnH6XuQuO8WzqCsDsE786EAG6AzY562SMEQrQ0zgpFx0A9ZmECNaOZ
+28OnzcA5xGKQh5dD0ou9lvRHXEavu7fYCrAG+wlQTo1eRHUDOAN4pQPoZ9r3bz1M
+tnGtG3rak4KemAsoX8aSy59ZswKBgQDE/C+eu012vzjyr2J1W0Gdms7fh5CWzMp8
+hCHk+kmLCY4DHIaUv0tT3IXGKebRH+PZObE3zZ5Hx2QXPjFQWsyTkd9D2tRIWHaZ
+ZpKPBLxYJJuBc3YWZM1qC2ZcRyvv1NgtNUFpB5xOGIUL3/QsfcOE25kC7Z21aN+e
+uXSi3CkivwKBgGFHSZLLcKbuaehjx0Jp6dFhj+v8mLolqyVV7gKoOQ0/zZNICLcX
+sBbSrXkKaQcSq/q31m8Aqg8NPXJCEL5KtPlawi5oCWWIXy+YIA4s+9PUNGIoFlDq
+D0qLuOhPAdE0DXn4WpMScd6zKSzolBXC+DpfN09IGEc6x9jPO+vFgR49AoGABPiw
+YvsrK1IMJ+PRQlD5SPb9PZr4RTYJ7jaPfG3sqTumf+Gaa+qgBg/MuIGaN7DsWTEh
+jdz8n6cimYuSRwrjmt3VmqrNLL4+0ARMsptV/Yt++TdmxY3puUFsZevN6hGfGxT6
+/6GXikkIIpKWYQETjCjWpcJFdqyc6C6aCPoxd5UCgYEA1B4AdDgxhZgXhz24sKM7
+aX2aY4glBsEZ7dxaqpqvwmsSshvdfudjuFxo5jjMKV2C9JmwrCGML9O6MvSP03n8
+B3R543JqKqWLTaSROHkcoil+LdIV9w7jrMBildOCHSDXwuM8Pl7YObIdKMq4pVwe
+87n9/ZihlrKGaZ8utMrrGmc=
+-----END PRIVATE KEY-----

data/spec/fixtures/certificates/client_cert.pem

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICrDCCAZQCFElPgtX+UFXSycZJQcQhCFtZUhBxMA0GCSqGSIb3DQEBCwUAMA8x
+DTALBgNVBAMMBE15Q0EwIBcNMjMwOTE5MTEwNzM1WhgPMjEyMzA4MjYxMTA3MzVa
+MBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAJj6DF+bu0DhXmkBaC2+CkoqNlsO+LzW9bZnNCQk0Jw99fgCGTLifU3N
+eyAhKgHs+V3G/9ULbMrxYMSQ/psrrXpS7FM9xtA0WZ0VAg7Oi4WEi+wueE0R1GmO
+NMuCVT2JCYd5uDh8+mrWoVqb9L4xIsy0kaV0Nnl+NX1zDvHXUHzfo3T3roaxRbd6
+N92qNPzrj8TviwbapT0bo4GKwTCOO1ewPFGCjsWEeLZ4p2UfbOzW/zjIBEUD8Kqg
+FOht48y9J6XG3Tb61/7neT0xj6E7cn6hGSzuiIM/oZbtuUt72VDgbLbOrS02oHTz
+YmC9tVL35Qvfgzrqw0DEv7zpm/3iG0sCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
+nndLK/t6+dmoAwg4K7pdo8xqUEDnUx8K7sU2whZvLEUM+mO+jWOe3USHjR3aXYnU
+OjNhN90/TAy5wlIK6U2C36nHyZJUeScxuiaVwErwayE+GgwYmw9R7HVofgcVfTve
+IpjyrT7mDOCMYjkHgZv1dSHQTcc6uclaw7SgywEEjxjCNSJCN+WPjxCdcuno0td8
+i7F6FL7FeOiP1mtQrTo42Tq+knerUc55CbTW4anbQfL+6TFEVCPJKduLHFieGB0k
+BFilUR3JD2t8/f4fIilQ6FrMZpUzKcLbgW9cjts8mxq0zNV+z6lISgKbdxZFQp+2
+fvyYdnoNLP0YeRI6j9x1pg==
+-----END CERTIFICATE-----

data/spec/fixtures/certificates/key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCY+gxfm7tA4V5p
+AWgtvgpKKjZbDvi81vW2ZzQkJNCcPfX4Ahky4n1NzXsgISoB7Pldxv/VC2zK8WDE
+kP6bK616UuxTPcbQNFmdFQIOzouFhIvsLnhNEdRpjjTLglU9iQmHebg4fPpq1qFa
+m/S+MSLMtJGldDZ5fjV9cw7x11B836N0966GsUW3ejfdqjT864/E74sG2qU9G6OB
+isEwjjtXsDxRgo7FhHi2eKdlH2zs1v84yARFA/CqoBTobePMvSelxt02+tf+53k9
+MY+hO3J+oRks7oiDP6GW7blLe9lQ4Gy2zq0tNqB082JgvbVS9+UL34M66sNAxL+8
+6Zv94htLAgMBAAECggEAF2l9Z0yANgfH2S478XQ6Qut+8iSycMQ9SrM0yatQufjJ
+ojFABgefwb6G733j3fOUnoOMN+DNv6l9c9f0/26J2ETEomC8ArVgWagTboyx0bdd
+asIZ60GlTppS/ipuPUKx0KgSR6Lo+FzsyN9Bb7I5bzbba4UDqUhli1OGoACh8tpS
+pyhD58C0nWBCYUjgkB2ilVoguQnnTvYC0VDbGOWK1P8bw0to810mkKTyv7ztifW2
+lHUwTe8vbQk7jY52+crvtgVZWNaXEdma3ivDSDHUjK3WLmPw9MFgVSMVYFLDZUQN
+Btd7PyBSkjeHOzoS5b9l4qnjn2vhObpjrT5PZT6TMQKBgQDI+xrzk351kyqezHuZ
+Bqo5CqEN3BHvwKALh3DA3uxHVaLqOo/yALv86yHgue/9ksaxxDwufAnVvcg5eEEh
+XIsZrfKBIaNV5umqJAkbCbx4hVCX9mE45THv3Nc7XhiHuZZpUHb1i7qcab1lly5Y
+7lFoCd5dCQJUoBf3/9Bw76OjRwKBgQDC2sba56V0dahFxTE3bOIRR2HIYWNfPv0a
+7ejiNSHVHGTLrEfnya5ZcerT0j6QNA2IQcKw5ovPKn2xgjGlfPWgtBAz55r+lfU2
++/6CRf8v6tu9FdPs7RDHxBuicOGQlQGSAH2+tfcY9ZCB8wcdGYB3v5ko0OFsFdZY
++fJOIt4h3QKBgByFJanzADsHC0FFmzR38afujjQ9Sn5PQ2bfbWyxNa5ZxKigbtTU
+rdiSNViCij/dmDyZsECYcXzXVZZyLivhygt217bjYx5JilcOjgw8MXaY1Hr8B4ff
+Xlq/Z/uQusJn36RKOtdVYMHZb3r/HSCZkQvGeruRD7eakEwtDRM5rmr5AoGAZFt9
+s90/ED5RDq5DbQJ9ZNzY9fWC0tmETsxd97PZ2wMmvufamPz8+UB86+ALLQZCOf10
+otv7AhYmarhdjZhQghZ7ieAtqhXeGBWtvbcDedCCoF6PqiVnURwmB4IQCwFTr7jl
+CsZ5n7dKWEOtVEWALyzVW3pJv/t3TJhfPfMjaVkCgYAxmC4/jmBCLmQZ3eWbmZHx
+X7N2qAI7Cu2JVi1Wut4WnBgFNynYH+kt67LZSQ9Jf9lHDnlBe5gOTvF5/8UeoTMv
+MGI4R4WJ6ezWV12ugbmKAvzHB/SiJ9U0ph78ibejCxW3gomuDzY1T+xF56kCKXJ0
+uPaEN0rPMT6wMEegJHaE8A==
+-----END PRIVATE KEY-----

data/spec/fixtures/certificates/server.csr

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICWTCCAUECAQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAmPoMX5u7QOFeaQFoLb4KSio2Ww74vNb1tmc0JCTQ
+nD31+AIZMuJ9Tc17ICEqAez5Xcb/1QtsyvFgxJD+myutelLsUz3G0DRZnRUCDs6L
+hYSL7C54TRHUaY40y4JVPYkJh3m4OHz6atahWpv0vjEizLSRpXQ2eX41fXMO8ddQ
+fN+jdPeuhrFFt3o33ao0/OuPxO+LBtqlPRujgYrBMI47V7A8UYKOxYR4tninZR9s
+7Nb/OMgERQPwqqAU6G3jzL0npcbdNvrX/ud5PTGPoTtyfqEZLO6Igz+hlu25S3vZ
+UOBsts6tLTagdPNiYL21UvflC9+DOurDQMS/vOmb/eIbSwIDAQABoAAwDQYJKoZI
+hvcNAQELBQADggEBAEz74PiDtYCL1XiZV4On0l5jRjBrKTVEAnjEtWgygy9V6U1d
+BYE3AxwsdTUygl/cS2i3g8U2yZGQ1ZAh/qHq0sHB6TDePLmNSEiksP7KOJwXU9vO
+/pCS9qbOYcWucLlQpnHxySpUlcxFWmrl33pMaNCzxxLN1q3eRbNmxoxACI/+vZsX
+M6sm2fhhw6yZkU7D04BDgSwsddW8ApDqbtwbndyv/ZL13xjG9yow8noSF7uxGQnn
+UnVFMGVGp3I6M/E3VFIwRvUYA1MJeqh9tLIEItlGmqkrQmxOnMvXKzJnQ9nK1KBq
+2gaBXdvbabkXKAHnV0tYbDmZXvTO+7Ci7wgapNU=
+-----END CERTIFICATE REQUEST-----

data/spec/fixtures/certificates/unsigned_cert.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDCzCCAfOgAwIBAgIUN2/oKOttkdOretzyqc+Zv8IqpT8wDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIzMDkxOTExMjEzM1oYDzIxMjMw
+ODI2MTEyMTMzWjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQD30tqrKrHa0p1RsGlDc7lUUS/ZF2/7ZtNWe0gRuuum
+6l/X5H8F+Ay1cO8DirGx3s/LPpj7DwvjjKo2eE+wcO2v/R5S+uPL4Bm0o+bPGwZP
+vw+XMMgBZUsNSMER6DUliP5bHQ/8TCXWpfP3rLJ9QitOAX/rD9bVrOs3g3I0uf2A
+RZ0O40//5q9fiXRC3PAfPbX7XdyI9Mr3duwmAW+nK2Gbd98ut27PkO0Fze27Xtk2
+EdIh3u5pajK/ub8rf5vyfk+c/6pcN9kMakPtlgIR/eqzTkfRWyIpMoFn/X8VumUQ
+X4ylj1SfSs+K47GBjrqknEh1BYlblW8WKg5cUjx/r/b/AgMBAAGjUzBRMB0GA1Ud
+DgQWBBQUEefafoC0qDhzThhEBMMwr/C5FTAfBgNVHSMEGDAWgBQUEefafoC0qDhz
+ThhEBMMwr/C5FTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDn
+dfkjZtgSdbsEPhUMfUlhZWXqxtLDQBoxM7xF+i5WC6w3yHpN/teA8SqA8CYiPb9d
+5rNfnmJLP4PeyfTu6Pc0EJpQsmK19i9z0FPrA7bqPIzgF4U4R1eQ5mvTzlNoGkp3
+1gnjDdwtTq0RFfuvHKm5EqECKX+hBEJKMiviEH/mGqQuoycpKifZ5WRTQonnWjGe
+BVkhdn4Psp83EWdnD/yQbo1XEbYRtsaPM4Dozr6uKbeq9Zbu+xDO9Uw4mTE/WSfb
+t4AXqOLDRafOP9w3twlFH2ZQxqpSaqXo8z1RkS9jtCm69JcDnsePKqkhesToMZAz
+2cylIQmuuNIRGLmCRsVK
+-----END CERTIFICATE-----

data/spec/fixtures/certificates/unsigned_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD30tqrKrHa0p1R
+sGlDc7lUUS/ZF2/7ZtNWe0gRuuum6l/X5H8F+Ay1cO8DirGx3s/LPpj7DwvjjKo2
+eE+wcO2v/R5S+uPL4Bm0o+bPGwZPvw+XMMgBZUsNSMER6DUliP5bHQ/8TCXWpfP3
+rLJ9QitOAX/rD9bVrOs3g3I0uf2ARZ0O40//5q9fiXRC3PAfPbX7XdyI9Mr3duwm
+AW+nK2Gbd98ut27PkO0Fze27Xtk2EdIh3u5pajK/ub8rf5vyfk+c/6pcN9kMakPt
+lgIR/eqzTkfRWyIpMoFn/X8VumUQX4ylj1SfSs+K47GBjrqknEh1BYlblW8WKg5c
+Ujx/r/b/AgMBAAECggEAR4aYzBwndvOgqioTR3+H9tjzyWFlVZbo2iX8t/lN+D/e
+562wJ6Xe7SMqKMiH3sFjEdMATj2afdNkcRIqVc9SGqAgd2yoAHiukp9Xh2DSYoPP
+WSCgKR72GWBtMODnLe0rFFr/+R51MU12a35xiYtmej4ekFZi+ArPXJdYh/VCQBnG
+BGF+EnUJqCAOXLz9zG3FoYVBWu071vEnpBtfblbHYfY2/o5CSoORkxcput6XDHxO
+7pOXN7IRt7DJZ0goda3OwZQ9suKyTLcOxa8cA+DteVP6cvh4u2l+ZMxUIYK5B1eh
+VAmJkIbcbAaz/SxyO9E2gWraz+pu6ArOGY/0krcBmQKBgQD9BlVtx7QTVzu+nLzF
+2++cB0LTsTD9T9rlMfIuQMBIOywmsivyvUDr9SjOPqICQUIRufHKqCgHs4TH7Ifs
+4AxyUEwQMG4xuYh3nU5eZlpUEjzUWbbe7o0NjhaJ4ZlUBvzHBcgptUlKTwvwamMs
+pnzQxWlFXFuh+pxPPdSXZVmWJQKBgQD6vN0pO/xc3bAqHSCavX95NBjUhFvkAsoo
+T8tfv2qoAN8RhI2/N8prix6tJk3AdhzdLmmMktv3MBDXd3cgLgmXQTYHIijWXPlF
+/WXWmZXK0E9fiDjfXI9eB7E237fYGOaSobOhLOLoHcuL0kndps67QP2BhtXhYB88
+1We7LoJVUwKBgQCnF1qtH5d0ukPTEdC73Q0z/buM7tPKRMTqXHxxPQN9782tVDYf
+nAlWiVTENqpoUM4fxKq/SSL+SvfhyvrMW/z8NLi2bDUpEzviufg58N+v60dOeFyC
+hgiSLgYGUfweeGrPx6qymGxo7SCWSLtrjhqZB/UIAADnTAeTcOKGhECQHQKBgAlM
+A29J+BuBZMzK87CJIjbeRaVrmvSjXdeMzd+o+01ratn9bjwO14SRTfvhlbRzLLLO
+y78YmutZbuZuWY5p5pUjJ9uv2o/INr3vnV0NqM4yVx8Vr/YoOnCkHGAKf4iVs8bw
+E/b/8RHmOOvgSjjbvIKY8E1jMH8Az2e0CfqYyOBdAoGAOlhTefyBGgAWFHqH/l4p
+ThbWupIMsw1ZXlArwBnTfsUFuz0Yq7B+0tqrV8lhS3P4/0jI2yWnzhluDk62clwz
+Xg187V85Ylagshsjv60mP5qBEF4N7Nf5fP2w6+GjMU+YiHEBsgGGt+2jPgKeCGQW
+IlV3ym59oL+wGyN9OK3z+aw=
+-----END PRIVATE KEY-----

data/spec/integration/publish_provider_contract_spec.rb

@@ -1,10 +1,6 @@
 require "pactflow/client/cli/pactflow"
 
 RSpec.describe "publish-provider-contract" do
-  before do
-    allow(ENV).to receive(:fetch).and_call_original
-    allow(ENV).to receive(:fetch).with("PACT_BROKER_FEATURES", "").and_return("publish_provider_contracts_all_in_one")
-  end
   let(:index_body_hash) do
     {
       _links: {

data/spec/integration/unknown_options_spec.rb

@@ -0,0 +1,39 @@
+require "open3"
+require "pact_broker/client/cli/broker"
+
+# This is not the ideal way to write a test, but I tried to write it with an in memory invocation,
+# and I couldn't get the capture to work, and it became super complicated.
+
+RSpec.describe "using unknown options", skip_windows: true do
+  let(:unknown_switches_text) { "Unknown switches" }
+  let(:warning_text) { "This is a warning"}
+  let(:command) { "bundle exec bin/pact-broker can-i-deploy --pacticipant Foo --foo --broker-base-url http://example.org" }
+
+  it "prints an 'unknown switches' warning to stderr and also includes the normal output of the command" do
+    stderr_lines = nil
+
+    Open3.popen3(command) do |stdin, stdout, stderr, thread|
+       stderr_lines = stderr.readlines
+    end
+
+    expect(stderr_lines.join("\n")).to include(unknown_switches_text)
+    expect(stderr_lines.join("\n")).to include(warning_text)
+
+    expect(stderr_lines.size).to be > 2
+  end
+
+
+  context "with PACT_BROKER_ERROR_ON_UNKNOWN_OPTION=true" do
+    it "prints an 'unknown switches' message to stderr and does NOT include the normal output of the command as it exits straight after" do
+      stderr_lines = nil
+
+      Open3.popen3({ "PACT_BROKER_ERROR_ON_UNKNOWN_OPTION" => "true" }, command) do |stdin, stdout, stderr, thread|
+         stderr_lines = stderr.readlines
+      end
+
+      expect(stderr_lines.first).to include(unknown_switches_text)
+      expect(stderr_lines.join("\n")).to_not include(warning_text)
+      expect(stderr_lines.size).to eq 1
+    end
+  end
+end

data/spec/lib/pact_broker/client/cli/custom_thor_spec.rb

@@ -7,6 +7,10 @@ module PactBroker::Client::CLI
   end
 
   class TestThor < CustomThor
+    def self.exit_on_failure?
+      false
+    end
+
     desc 'ARGUMENT', 'This is the description'
     def test_default(argument)
       Delegate.call(argument: argument)
@@ -96,6 +100,29 @@ module PactBroker::Client::CLI
       TestThor.start(%w{test_pact_broker_client_options})
     end
 
+    describe "when someone copy pastes from Word and uses an em dash instead of a normal dash" do
+      before do
+        allow(TestThor).to receive(:exit_with_error_code)
+      end
+
+      it "exits with an error message" do
+        expect($stdout).to receive(:puts).with(/contains an em dash/)
+        expect(TestThor).to receive(:exit_with_error_code)
+        TestThor.start(["test_default", "\u2014\u2014bar"])
+      end
+    end
+
+    describe ".handle_help" do
+      context "when the last argument is --help or -h" do
+        it "turns it into the form that Thor expects, which is a really odd one" do
+          expect(TestThor.handle_help(["foo", "--help"])).to eq ["help", "foo"]
+          expect(TestThor.handle_help(["foo", "-h"])).to eq ["help", "foo"]
+          expect(TestThor.handle_help(["-h"])).to eq ["help"]
+          expect(TestThor.handle_help(["--help"])).to eq ["help"]
+        end
+      end
+    end
+
     describe ".turn_muliple_tag_options_into_array" do
       it "turns '--tag foo --tag bar' into '--tag foo bar'" do
         input = %w{--ignore this --tag foo --tag bar --wiffle --that}

data/spec/lib/pact_broker/client/hal/http_client_spec.rb

@@ -1,4 +1,6 @@
 require 'pact_broker/client/hal/http_client'
+require "faraday"
+require "faraday/retry"
 
 module PactBroker::Client
   module Hal
@@ -157,6 +159,80 @@ module PactBroker::Client
           end
         end
       end
+
+      describe "x509 certificate" do
+        FAKE_SERVER_URL = 'https://localhost:4444'
+        X509_CERT_FILE_PATH = './spec/fixtures/certificates/client_cert.pem'
+        X509_KEY_FILE_PATH = './spec/fixtures/certificates/key.pem'
+        UNSIGNED_X509_CERT_FILE_PATH = './spec/fixtures/certificates/unsigned_cert.pem'
+        UNSIGNED_X509_KEY_FILE_PATH = './spec/fixtures/certificates/unsigned_key.pem'
+
+        def wait_for_server_to_start
+          Faraday.new(
+            url: FAKE_SERVER_URL,
+            ssl: {
+              verify: false,
+              client_cert: OpenSSL::X509::Certificate.new(File.read(X509_CERT_FILE_PATH)),
+              client_key: OpenSSL::PKey::RSA.new(File.read(X509_KEY_FILE_PATH))
+            }
+          ) do |builder|
+            builder.request :retry, max: 20, interval: 0.5, exceptions: [StandardError]
+            builder.adapter :net_http
+          end.get
+        end
+
+        let(:do_get) { subject.get(FAKE_SERVER_URL) }
+
+        before(:all) do
+          @pipe = IO.popen("bundle exec ruby ./spec/support/ssl_server.rb")
+          ENV['SSL_CERT_FILE'] = "./spec/fixtures/certificates/ca_cert.pem"
+
+          wait_for_server_to_start()
+        end
+
+        context "with valid x509 client certificates" do
+          before do
+            ENV['X509_CLIENT_CERT_FILE'] = X509_CERT_FILE_PATH
+            ENV['X509_CLIENT_KEY_FILE'] = X509_KEY_FILE_PATH
+          end
+
+          it "succeeds" do
+            expect(do_get.status).to eq 200
+          end
+        end
+
+        context "when invalid x509 certificates are set" do
+          before do
+            ENV['X509_CLIENT_CERT_FILE'] = UNSIGNED_X509_CERT_FILE_PATH
+            ENV['X509_CLIENT_KEY_FILE'] = UNSIGNED_X509_KEY_FILE_PATH
+          end
+
+          it "fails raising SSL error" do
+            expect { do_get }
+              .to raise_error { |error|
+                expect([OpenSSL::SSL::SSLError, Errno::ECONNRESET]).to include(error.class)
+              }
+          end
+        end
+
+        context "when no x509 certificates are set" do
+          before do
+            ENV['X509_CLIENT_CERT_FILE'] = nil
+            ENV['X509_CLIENT_KEY_FILE'] = nil
+          end
+
+          it "fails raising SSL error" do
+            expect { do_get }
+              .to raise_error { |error|
+                expect([OpenSSL::SSL::SSLError, Errno::ECONNRESET]).to include(error.class)
+              }
+          end
+        end
+
+        after(:all) do
+          Process.kill "KILL", @pipe.pid
+        end
+      end
     end
   end
 end

data/spec/lib/pactflow/client/provider_contracts/publish_spec.rb

@@ -7,8 +7,6 @@ module Pactflow
         before do
           allow_any_instance_of(PactBroker::Client::Hal::HttpClient).to receive(:sleep)
           allow_any_instance_of(PactBroker::Client::Hal::HttpClient).to receive(:default_max_tries).and_return(1)
-          allow(ENV).to receive(:fetch).and_call_original
-          allow(ENV).to receive(:fetch).with("PACT_BROKER_FEATURES", "").and_return("publish_provider_contracts_all_in_one")
         end
 
         let(:command_params) do
@@ -99,9 +97,10 @@ module Pactflow
           end
         end
 
-        context "when the feature is not enabled" do
+        context "when the feature is disabled" do
           before do
-            allow(ENV).to receive(:fetch).with("PACT_BROKER_FEATURES", "").and_return("")
+            allow(ENV).to receive(:fetch).and_call_original
+            allow(ENV).to receive(:fetch).with("PACTFLOW_FEATURES", "").and_return("publish_provider_contracts_using_old_api")
           end
 
           it "publishes the provider contracts the old way" do

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -1602,8 +1602,7 @@
               "name": "Foo"
             },
             "version": {
-              "number": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30",
-              "buildUrl": "http://build"
+              "number": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30"
             }
           },
           "logs": [

data/spec/service_providers/pactflow_publish_provider_contract_spec.rb

@@ -6,8 +6,6 @@ RSpec.describe "publishing a provider contract to PactFlow", pact: true do
   before do
     allow_any_instance_of(PactBroker::Client::Hal::HttpClient).to receive(:sleep)
     allow_any_instance_of(PactBroker::Client::Hal::HttpClient).to receive(:default_max_tries).and_return(1)
-    allow(ENV).to receive(:fetch).and_call_original
-    allow(ENV).to receive(:fetch).with("PACT_BROKER_FEATURES", "").and_return("publish_provider_contracts_all_in_one")
   end
 
   include_context "pact broker"

data/spec/service_providers/publish_pacts_spec.rb

@@ -88,8 +88,7 @@ RSpec.describe "publishing contracts", pact: true do
                 name: pacticipant_name
               },
               version: {
-                number: version_number,
-                buildUrl: build_url
+                number: version_number
               }
             },
             logs: Pact.each_like(level: "info", message: "some message"),

data/spec/support/ssl_server.rb

@@ -0,0 +1,42 @@
+if __FILE__ == $0
+
+  SSL_KEY = "spec/fixtures/certificates/key.pem"
+  SSL_CERT = "spec/fixtures/certificates/client_cert.pem"
+  SSL_CA_CERT = "spec/fixtures/certificates/ca_cert.pem"
+
+  trap(:INT) do
+    @server.shutdown
+    exit
+  end
+
+  def webrick_opts port
+    certificate = OpenSSL::X509::Certificate.new(File.read(SSL_CERT))
+    cert_name = certificate.subject.to_a.collect{|a| a[0..1] }
+    logger_stream = ENV["DEBUG"] ? $stderr : StringIO.new
+    {
+      Port: port,
+      Host: "0.0.0.0",
+      AccessLog: [],
+      Logger: WEBrick::Log.new(logger_stream,WEBrick::Log::INFO),
+      SSLVerifyClient: OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT | OpenSSL::SSL::VERIFY_PEER,
+      SSLCACertificateFile: SSL_CA_CERT,
+      SSLCertificate: certificate,
+      SSLPrivateKey: OpenSSL::PKey::RSA.new(File.read(SSL_KEY)),
+      SSLEnable: true,
+      SSLCertName: cert_name,
+    }
+  end
+
+  app = ->(_env) { puts "hello"; [200, {}, ["Hello world" + "\n"]] }
+
+  require "webrick"
+  require "webrick/https"
+  require "rack"
+  require "rack/handler/webrick"
+
+  opts = webrick_opts(4444)
+
+  Rack::Handler::WEBrick.run(app, **opts) do |server|
+    @server = server
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.71.0
+  version: 1.73.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -106,104 +106,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: conventional-changelog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: pact
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: pact-support
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: approvals
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.26
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.26
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 description: Client for the Pact Broker. Publish, retrieve and query pacts and verification
   results. Manage webhooks and environments.
 email:
@@ -224,6 +126,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - CHANGELOG.md
+- DEVELOPING.md
 - Dockerfile
 - Gemfile
 - LICENSE.txt
@@ -263,6 +166,7 @@ files:
 - lib/pact_broker/client/cli/pact_commands.rb
 - lib/pact_broker/client/cli/pacticipant_commands.rb
 - lib/pact_broker/client/cli/record_deployment_long_desc.txt
+- lib/pact_broker/client/cli/thor_unknown_options_monkey_patch.rb
 - lib/pact_broker/client/cli/version_commands.rb
 - lib/pact_broker/client/cli/version_selector_options_parser.rb
 - lib/pact_broker/client/cli/webhook_commands.rb
@@ -337,6 +241,7 @@ files:
 - pact-broker-client.gemspec
 - script/approve-all.sh
 - script/can-i-deploy.sh
+- script/ci/record-release.sh
 - script/create-pacticipant.sh
 - script/foo-bar.json
 - script/oas.yml
@@ -357,12 +262,21 @@ files:
 - spec/fixtures/approvals/describe_pacticipant.approved.txt
 - spec/fixtures/approvals/list_environments.approved.txt
 - spec/fixtures/approvals/publish_provider_contract.approved.txt
+- spec/fixtures/certificates/ca_cert.pem
+- spec/fixtures/certificates/ca_cert.srl
+- spec/fixtures/certificates/ca_key.pem
+- spec/fixtures/certificates/client_cert.pem
+- spec/fixtures/certificates/key.pem
+- spec/fixtures/certificates/server.csr
+- spec/fixtures/certificates/unsigned_cert.pem
+- spec/fixtures/certificates/unsigned_key.pem
 - spec/fixtures/foo-bar.json
 - spec/integration/can_i_deploy_spec.rb
 - spec/integration/can_i_merge_spec.rb
 - spec/integration/create_version_tag_spec.rb
 - spec/integration/describe_environment_spec.rb
 - spec/integration/publish_provider_contract_spec.rb
+- spec/integration/unknown_options_spec.rb
 - spec/lib/pact_broker/client/base_client_spec.rb
 - spec/lib/pact_broker/client/can_i_deploy_spec.rb
 - spec/lib/pact_broker/client/cli/broker_can_i_deploy_spec.rb
@@ -439,6 +353,7 @@ files:
 - spec/support/pacticipants_list.json
 - spec/support/pacts_latest_list.json
 - spec/support/shared_context.rb
+- spec/support/ssl_server.rb
 - tasks/pact.rake
 homepage: https://github.com/pact-foundation/pact_broker-client.git
 licenses:
@@ -459,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: See description
@@ -471,12 +386,21 @@ test_files:
 - spec/fixtures/approvals/describe_pacticipant.approved.txt
 - spec/fixtures/approvals/list_environments.approved.txt
 - spec/fixtures/approvals/publish_provider_contract.approved.txt
+- spec/fixtures/certificates/ca_cert.pem
+- spec/fixtures/certificates/ca_cert.srl
+- spec/fixtures/certificates/ca_key.pem
+- spec/fixtures/certificates/client_cert.pem
+- spec/fixtures/certificates/key.pem
+- spec/fixtures/certificates/server.csr
+- spec/fixtures/certificates/unsigned_cert.pem
+- spec/fixtures/certificates/unsigned_key.pem
 - spec/fixtures/foo-bar.json
 - spec/integration/can_i_deploy_spec.rb
 - spec/integration/can_i_merge_spec.rb
 - spec/integration/create_version_tag_spec.rb
 - spec/integration/describe_environment_spec.rb
 - spec/integration/publish_provider_contract_spec.rb
+- spec/integration/unknown_options_spec.rb
 - spec/lib/pact_broker/client/base_client_spec.rb
 - spec/lib/pact_broker/client/can_i_deploy_spec.rb
 - spec/lib/pact_broker/client/cli/broker_can_i_deploy_spec.rb
@@ -553,3 +477,4 @@ test_files:
 - spec/support/pacticipants_list.json
 - spec/support/pacts_latest_list.json
 - spec/support/shared_context.rb
+- spec/support/ssl_server.rb