pact_broker-client 1.28.2 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75733826388c0e949cc668a58d42f2020383afab1a5434f0357a3f8e4b807042
-  data.tar.gz: 536c574d886e62b61b76ec9d6e19c20719fb61facf5d75537cf882841515c364
+  metadata.gz: d7be73ef3705005ce0808a1d74dba560c4f590fce09871ae7597c06479ce2316
+  data.tar.gz: ec3b757187ce7c60dbc4835933debbe68fa2f5fb2b08ffdb6f9e5cb7141943e1
 SHA512:
-  metadata.gz: 96ddbb368e99906b3a7b8d69d118283edfad013e8ed605af7430cca7babcbfe0f10bb1ffd43b7dec98cbe134368d48f811b04454aa60baa431eb81ac4b2856bb
-  data.tar.gz: 971e100f31ec4a5ea338e60d6f6e0f13f924430f98b40d637e23d2d80be39c243ac4ea0cd9905515563de486d3cb35b7e79993a92fea0884f499e987381d55b3
+  metadata.gz: 5f035fa2d68c909fc2d3865ebcd76be24ae9af0a0a4bc4cd0e2503f3a1da822456a6439b61364a83a73ff6e9021a5fa5caa24addeb4f9d9a10980ab33e1ffb74
+  data.tar.gz: 2fe9a489c6c2824f1d218b693559bf1be1713d2989c62283979acc7ddda0684a0b60607fce0abd5d813dbb279c7ff5a4b5ca6bb186c79af3911855803f79837a

data/.github/workflows/release_gem.yml

@@ -6,7 +6,21 @@ on:
       - release-triggered
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: '2.6'
+    - run: |
+        gem install bundler -v 2.1
+        bundle install
+    - name: Test
+      run: bundle exec rake
+
   release:
+    needs: test
     runs-on: ubuntu-latest
     outputs:
       gem_name: ${{ steps.release.outputs.gem_name }}
@@ -16,17 +30,18 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - uses: pact-foundation/release-gem@v0.0.10
+    - uses: pact-foundation/release-gem@v0.0.11
       id: release
       env:
         GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         INCREMENT: '${{ github.event.client_payload.increment }}'
-  dispatch:
+
+  notify-gem-released:
     needs: release
     strategy:
       matrix:
-        repository: [pact-foundation/pact-ruby-cli, pact-foundation/pact-ruby-standalone]
+        repository: [pact-foundation/pact-ruby-cli, pact-foundation/pact-ruby-standalone, pact-foundation/pact_broker-client]
     runs-on: ubuntu-latest
     steps:
       - name: Notify ${{ matrix.repository }} of gem release

data/.github/workflows/trigger_pact_docs_update.yml

@@ -6,6 +6,9 @@ on:
       - master
     paths:
       - '**.md'
+  repository_dispatch:
+    types:
+      - gem-released
 
 jobs:
   build:

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+<a name="v1.30.0"></a>
+### v1.30.0 (2020-10-09)
+
+#### Features
+
+* remove outdated comment from pact publishing output	 ([251b4df](/../../commit/251b4df))
+
+<a name="v1.29.1"></a>
+### v1.29.1 (2020-08-07)
+
+#### Bug Fixes
+
+* explicitly set the CA file and path from SSL_CERT_FILE and SSL_CERT_DIR for the pact-ruby-standalone	 ([27a0fe6](/../../commit/27a0fe6))
+
+<a name="v1.29.0"></a>
+### v1.29.0 (2020-08-05)
+
+#### Features
+
+* print out helpful error message for 403	 ([5d5a18a](/../../commit/5d5a18a))
+* support publishing pacts for multiple consumers at the same time	 ([573e97c](/../../commit/573e97c))
+
+<a name="v1.28.4"></a>
+### v1.28.4 (2020-07-31)
+
+#### Bug Fixes
+
+* add missing require for PactBroker::Client::Error	 ([72eb796](/../../commit/72eb796))
+
+<a name="v1.28.3"></a>
+### v1.28.3 (2020-07-19)
+
 <a name="v1.28.2"></a>
 ### v1.28.2 (2020-07-17)
 

data/Gemfile

@@ -6,10 +6,6 @@ gemspec
 # even thought it's in the development dependencies. Trying it here.
 gem 'rake', '~> 13.0'
 
-group :release do
-  gem 'bump', git: 'https://github.com/bethesque/bump.git'
-end
-
 if ENV['X_PACT_DEVELOPMENT'] == 'true'
   gem 'pact-mock_service', path: '../pact-mock_service'
   gem 'pact-support', path: '../pact-support'

data/README.md

@@ -153,7 +153,7 @@ Can I deploy the latest version of the application Foo that has the tag "test" t
 
 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 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). If you have a monorepo and you deploy a group of applications together, you can either call `can-i-deploy` once for each application, or you can group them all together by specifying a `--pacticipant` and `--version` for each sub-application.
 
 You can use explictly declared dependencies with or without the `--to ENVIRONMENT`. For example, if you declare two (or more) application versions with no `--to ENVIRONMENT`, 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.
 
@@ -182,6 +182,13 @@ Can I deploy the latest version of Foo with tag "master" and the latest version
                                --pacticipant Bar --latest master \
                                --broker-base-url BROKER_BASE_URL
 
+Can I deploy all the applications in my monorepo to prod?
+
+    $ pact-broker can-i-deploy --pacticipant A --version a7e28207 \
+                               --pacticipant B --version a7e28207 \
+                               --pacticipant C --version a7e28207 \
+                               --to prod \
+                               --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.)
 

data/lib/pact_broker/client/base_client.rb

@@ -69,6 +69,12 @@ module PactBroker
           yield response
         elsif response.code == 404
           nil
+        elsif response.code == 403
+          message = "Authorization failed (insufficient permissions)"
+          if response.body && response.body.size > 0
+            message = message + ": #{response.body}"
+          end
+          raise Error.new(message)
         elsif response.code == 401
           message = "Authentication failed"
           if response.body && response.body.size > 0

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

@@ -53,6 +53,7 @@ module PactBroker
         method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
 
         def publish(*pact_files)
+          require 'pact_broker/client/error'
           validate_credentials
           validate_pact_files(pact_files)
           success = publish_pacts(pact_files)

data/lib/pact_broker/client/git.rb

@@ -11,7 +11,7 @@ APPVEYOR_REPO_COMMIT APPVEYOR_REPO_BRANCH       https://www.appveyor.com/docs/en
 CI_COMMIT_REF_NAME https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
 CI_BRANCH CI_COMMIT_ID https://documentation.codeship.com/pro/builds-and-configuration/environment-variables/
 bamboo.repository.git.branch https://confluence.atlassian.com/bamboo/bamboo-variables-289277087.html
-BITBUCKET_BRANCH https://confluence.atlassian.com/bitbucket/variables-in-pipelines-794502608.html
+BITBUCKET_BRANCH BITBUCKET_COMMIT https://confluence.atlassian.com/bitbucket/variables-in-pipelines-794502608.html
 
 =end
 
@@ -21,6 +21,11 @@ module PactBroker
     module Git
       COMMAND = 'git name-rev --name-only HEAD'.freeze
       BRANCH_ENV_VAR_NAMES = %w{BUILDKITE_BRANCH CIRCLE_BRANCH TRAVIS_BRANCH GIT_BRANCH GIT_LOCAL_BRANCH APPVEYOR_REPO_BRANCH CI_COMMIT_REF_NAME BITBUCKET_BRANCH}.freeze
+      COMMIT_ENV_VAR_NAMES = %w{BUILDKITE_COMMIT CIRCLE_SHA1 TRAVIS_COMMIT GIT_COMMIT APPVEYOR_REPO_COMMIT CI_COMMIT_ID BITBUCKET_COMMIT}
+
+      def self.commit
+        find_commit_from_env_vars
+      end
 
       def self.branch
         find_branch_from_env_vars || branch_from_git_command
@@ -28,11 +33,15 @@ module PactBroker
 
       # private
 
+      def self.find_commit_from_env_vars
+        COMMIT_ENV_VAR_NAMES.collect { |env_var_name| value_from_env_var(env_var_name) }.compact.first
+      end
+
       def self.find_branch_from_env_vars
-        BRANCH_ENV_VAR_NAMES.collect { |env_var_name| branch_from_env_var(env_var_name) }.compact.first
+        BRANCH_ENV_VAR_NAMES.collect { |env_var_name| value_from_env_var(env_var_name) }.compact.first
       end
 
-      def self.branch_from_env_var(env_var_name)
+      def self.value_from_env_var(env_var_name)
         val = ENV[env_var_name]
         if val && val.strip.size > 0
           val

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

@@ -57,6 +57,11 @@ module PactBroker
             http = Net::HTTP.new(uri.host, uri.port, :ENV)
             http.set_debug_output(output_stream) if verbose
             http.use_ssl = (uri.scheme == 'https')
+            # Need to manually set the ca_file and ca_path for the pact-ruby-standalone.
+            # The env vars seem to be picked up automatically in later Ruby versions.
+            # 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'] != ''
             http.start do |http|
               http.request request
             end

data/lib/pact_broker/client/publish_pacts.rb

@@ -52,6 +52,10 @@ module PactBroker
         @pact_files ||= pact_file_paths.collect{ |pact_file_path| PactFile.new(pact_file_path) }
       end
 
+      def consumer_names
+        pact_files.collect(&:consumer_name).uniq
+      end
+
       def publish_pact pact
         begin
           $stdout.puts "Publishing #{pact.pact_name} to pact broker at #{pact_broker_base_url}"
@@ -72,12 +76,14 @@ module PactBroker
       def tag_consumer_version tag
         versions = pact_broker_client.pacticipants.versions
         Retry.while_error do
-          $stdout.puts "Tagging version #{consumer_version} of #{consumer_name} as #{tag.inspect}"
-          versions.tag(pacticipant: consumer_name, version: consumer_version, tag: tag)
-          true
+          consumer_names.collect do | consumer_name |
+            $stdout.puts "Tagging version #{consumer_version} of #{consumer_name} as #{tag.inspect}"
+            versions.tag(pacticipant: consumer_name, version: consumer_version, tag: tag)
+            true
+          end
         end
       rescue => e
-        $stderr.puts "Failed to tag version #{consumer_version} of #{consumer_name} due to error: #{e.class} - #{e}}"
+        $stderr.puts "Failed to tag versions due to error: #{e.class} - #{e}"
         false
       end
 
@@ -89,15 +95,11 @@ module PactBroker
           end
 
           latest_pact_url = pacts.publish(pact_hash: pact, consumer_version: consumer_version)
-          $stdout.puts "The latest version of this pact can be accessed at the following URL (use this to configure the provider verification):\n#{latest_pact_url}"
+          $stdout.puts "The latest version of this pact can be accessed at the following URL:\n#{latest_pact_url}"
           true
         end
       end
 
-      def consumer_name
-        pact_files.first.consumer_name
-      end
-
       def validate
         raise PactBroker::Client::Error.new("Please specify the consumer_version") unless (consumer_version && consumer_version.to_s.strip.size > 0)
         raise PactBroker::Client::Error.new("Please specify the pact_broker_base_url") unless (pact_broker_base_url && pact_broker_base_url.to_s.strip.size > 0)

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.28.2'
+    VERSION = '1.30.0'
   end
 end

data/script/create-pacticipant.sh

@@ -0,0 +1,2 @@
+bundle exec bin/pact-broker create-or-update-pacticipant --name Bethtest
+

data/spec/lib/pact_broker/client/publish_pacts_spec.rb

@@ -81,6 +81,25 @@ module PactBroker
           end
         end
 
+        context "when publishing multiple files with different consumers" do
+          let(:pact_file_paths) { ['spec/pacts/consumer-provider.json','spec/pacts/foo-bar.json']}
+          let(:tags) { ['dev'] }
+
+          it "tags each consumer" do
+            expect(pact_versions_client).to receive(:tag).with(
+              pacticipant: "Consumer",
+              version: consumer_version,
+              tag: "dev"
+            )
+            expect(pact_versions_client).to receive(:tag).with(
+              pacticipant: "Foo",
+              version: consumer_version,
+              tag: "dev"
+            )
+            subject.call
+          end
+        end
+
         context "when publishing one or more pacts fails" do
           let(:pact_file_paths) { ['spec/pacts/consumer-provider.json','spec/pacts/foo-bar.json']}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.28.2
+  version: 1.30.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -216,6 +216,7 @@ files:
 - lib/pact_broker/client/webhooks/test.rb
 - lib/pact_broker_client.rb
 - pact-broker-client.gemspec
+- script/create-pacticipant.sh
 - script/generate-cli-usage.sh
 - script/publish-pact.sh
 - script/release.sh