pact_broker-client 1.67.0 → 1.69.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f188bc33e3294bd2bea28a4bebd4f3d9c2047da2e36b1e4a435e04878d89b4b
-  data.tar.gz: fab940f0461e06d9ed0fb81be5947ad749a75616c85c42c312d8aecfc038eb86
+  metadata.gz: d04543119f56e452c3c57968e73850a026d249e4db7a179b07d7fd9e08b1b39e
+  data.tar.gz: e29701ac23814dc00deea077e9dc318e21dcad486b5e01f28e3b422e0394310c
 SHA512:
-  metadata.gz: '0129bc2ee4f7e871adc49c1e21056dff0c49d8ff286582a0c01418c317e29c04b543ab70b41e52ccdffd64bfbffec712fd7fe930f1ffe8971d5c9d9b17fad747'
-  data.tar.gz: 3a76b75837e15f3e9a31a3bd8624a3d160d5c9e547235fb4d01f688906decd9ab2819a359c9fb22224707c6e17b5b1f8826bf93c1146439c6268ae20bb62d506
+  metadata.gz: 79f0f70224a4991f745e25b04251831f6a57872247780a9c0a4de75f3c1e04116534f42501a0c5fec982305fe235887ab21b7d915651be9275f706fba334a097
+  data.tar.gz: 007d7e79f2ffe068775cecb79324f811371bec604f18d657befebbe597391e70fda5bca489719dcd1fc395d673518b2dcc5a11537a94155562d353a8fc37fa11

data/.github/workflows/triage.yml

@@ -0,0 +1,15 @@
+name: Triage Issue
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+  pull_request:
+    types:
+      - labeled
+
+jobs:
+  call-workflow:
+    uses: pact-foundation/.github/.github/workflows/triage.yml@master
+    secrets: inherit

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+<a name="v1.69.0"></a>
+### v1.69.0 (2023-08-29)
+
+#### Features
+
+* can-i-merge (#117)	 ([badb030](/../../commit/badb030))
+
+<a name="v1.68.0"></a>
+### v1.68.0 (2023-07-08)
+
+#### Features
+
+* support Cirrus CI environment	 ([7610f28](/../../commit/7610f28))
+
+#### Bug Fixes
+
+* pact-broker --help command failed with Could not find command "__broker_base_url" (#135)	 ([7edfd58](/../../commit/7edfd58))
+
 <a name="v1.67.0"></a>
 ### v1.67.0 (2023-05-04)
 

data/LICENSE.txt

@@ -0,0 +1,20 @@
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -444,16 +444,24 @@ Options:
   -l, [--latest=[TAG]]
               # Use the latest pacticipant version. Optionally specify a TAG
                 to use the latest version with the specified tag.
-      [--to-environment=ENVIRONMENT]
-              # The environment into which the pacticipant(s) are to be
-                deployed
       [--branch=BRANCH]
               # The branch of the version for which you want to check the
+                verification results.
+      [--main-branch], [--no-main-branch]
+              # Use the latest version of the configured main branch of the
+                pacticipant as the version for which you want to check the
                 verification results
+      [--to-environment=ENVIRONMENT]
+              # The environment into which the pacticipant(s) are to be
+                deployed
       [--to=TAG]
               # The tag that represents the branch or environment of the
                 integrated applications for which you want to check the
                 verification result status.
+      [--ignore=IGNORE]
+              # 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.
   -o, [--output=OUTPUT]
               # json or table
               # Default: table

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

@@ -15,19 +15,6 @@ module PactBroker
         using PactBroker::Client::HashRefinements
 
         no_commands do
-          def initialize(args = [], options = {}, config = {})
-            super
-            postprocess_options
-          end
-
-          def postprocess_options
-            new_options = {}
-            if options.include?("broker_base_url")
-              new_options["broker_base_url"] = options["broker_base_url"].chomp('/')
-            end
-            self.options = options.merge(new_options)
-          end
-
           def self.exit_on_failure?
             true
           end
@@ -41,7 +28,7 @@ module PactBroker
           end
 
           def self.add_broker_config_from_environment_variables argv
-            return argv if argv[0] == 'help' || argv.empty?
+            return argv if argv[0] == '--help' || argv[0] == 'help' || argv.empty?
 
             add_option_from_environment_variable(argv, 'broker-base-url', 'b', 'PACT_BROKER_BASE_URL')
           end
@@ -129,7 +116,7 @@ module PactBroker
           end
 
           def pact_broker_client_options
-            client_options = { verbose: options.verbose, pact_broker_base_url: options.broker_base_url }
+            client_options = { verbose: options.verbose, pact_broker_base_url: options.broker_base_url&.chomp('/') }
             client_options[:token] = options.broker_token || ENV['PACT_BROKER_TOKEN']
             if options.broker_username || ENV['PACT_BROKER_USERNAME']
               client_options[:basic_auth] = {

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

@@ -1,20 +1,25 @@
+require "pact_broker/client/string_refinements"
 module PactBroker
   module Client
     module CLI
       module MatrixCommands
+        using PactBroker::Client::StringRefinements
+
         def self.included(thor)
           thor.class_eval do
 
-            desc "can-i-deploy", ""
+            desc "can-i-deploy", "Checks if the specified pacticipant version is safe to be deployed."
             long_desc File.read(File.join(__dir__, "can_i_deploy_long_desc.txt"))
 
             method_option :pacticipant, required: true, aliases: "-a", desc: "The pacticipant name. Use once for each pacticipant being checked."
             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. The environment variable PACT_BROKER_CAN_I_DEPLOY_IGNORE may also be used to specify a pacticipant name to ignore, with commas to separate multiple pacticipant names if necessary."
             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 :branch, required: false, desc: "The branch of the version for which you want to check the verification results.", default: nil
+            method_option :main_branch, required: false, type: :boolean, desc: "Use the latest version of the configured main branch of the pacticipant as the version for which you want to check the verification results", default: false
             method_option :to_environment, required: false, banner: "ENVIRONMENT", desc: "The environment into which the pacticipant(s) are to be deployed", default: nil
-            method_option :branch, required: false, desc: "The branch of the version for which you want to check the verification results", 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 :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 :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"
@@ -40,6 +45,31 @@ module PactBroker
               exit(can_i_deploy_exit_status) unless result.success
             end
 
+            desc "can-i-merge", "Checks if the specified pacticipant version is safe to merge into the main branch."
+            long_desc "Checks if the specified pacticipant version is compatible with the configured main branch of each of the pacticipants with which it is integrated."
+            method_option :pacticipant, required: true, aliases: "-a", desc: "The pacticipant name. Use once for each pacticipant being checked."
+            method_option :version, required: false, aliases: "-e", desc: "The pacticipant version. Must be entered after the --pacticipant that it relates to."
+            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"
+            method_option :dry_run, type: :boolean, default: false, desc: "When dry-run is enabled, always exit process with a success code. Can also be enabled by setting the environment variable PACT_BROKER_CAN_I_MERGE_DRY_RUN=true. This mode is useful when setting up your CI/CD pipeline for the first time, or in a 'break glass' situation where you need to knowingly deploy what Pact considers a breaking change. For the second scenario, it is recommended to use the environment variable and just set it for the build required to deploy that particular version, so you don't accidentally leave the dry run mode enabled."
+            shared_authentication_options
+
+            def can_i_merge(*ignored_but_necessary)
+              require "pact_broker/client/cli/version_selector_options_parser"
+              require "pact_broker/client/can_i_deploy"
+
+              validate_credentials
+              selectors = VersionSelectorOptionsParser.call(ARGV)
+              validate_can_i_deploy_selectors(selectors)
+              dry_run = options.dry_run || ENV["PACT_BROKER_CAN_I_MERGE_DRY_RUN"] == "true"
+              can_i_merge_options = { output: options.output, retry_while_unknown: options.retry_while_unknown, retry_interval: options.retry_interval, dry_run: dry_run, verbose: options.verbose }
+              result = CanIDeploy.call(selectors, { with_main_branches: true  }, can_i_merge_options, pact_broker_client_options)
+              $stdout.puts result.message
+              $stdout.flush
+              exit(1) unless result.success
+            end
+
             if ENV.fetch("PACT_BROKER_FEATURES", "").include?("verification_required")
 
               method_option :pacticipant, required: true, aliases: "-a", desc: "The pacticipant name. Use once for each pacticipant being checked."
@@ -50,7 +80,7 @@ module PactBroker
               method_option :output, aliases: "-o", desc: "json or table", default: "table"
 
               shared_authentication_options
-              desc "verification-required", "Checks if there is a verification required between the given pacticipant versions"
+              desc "verification-required", "Checks if there is a verification required between the given pacticipant versions."
               def verification_required(*ignored_but_necessary)
                 require "pact_broker/client/cli/version_selector_options_parser"
                 require "pact_broker/client/verification_required"
@@ -78,7 +108,7 @@ module PactBroker
                 end
               end
 
-              def validate_can_i_deploy_selectors selectors
+              def validate_can_i_deploy_selectors(selectors)
                 pacticipants_without_versions = selectors.select{ |s| s[:version].nil? && s[:latest].nil? && s[:tag].nil? && s[:branch].nil? }.collect{ |s| s[:pacticipant] }
                 raise ::Thor::RequiredArgumentMissingError, "The version must be specified using `--version VERSION`, `--branch BRANCH` `--latest`, `--latest TAG`, or `--all TAG` for pacticipant #{pacticipants_without_versions.join(", ")}" if pacticipants_without_versions.any?
               end

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

@@ -17,6 +17,10 @@ module PactBroker
             when "--latest", "-l"
               selectors << { pacticipant: nil } if selectors.empty?
               selectors.last[:latest] = true
+            when "--main-branch"
+              selectors << { pacticipant: nil } if selectors.empty?
+              selectors.last[:main_branch] = true
+              selectors.last[:latest] = true
             when /^\-/
               nil
             else
@@ -35,6 +39,10 @@ module PactBroker
                 selectors << { pacticipant: nil } if selectors.empty?
                 selectors.last[:branch] = word
                 selectors.last[:latest] = true
+              when "--main-branch"
+                selectors << { pacticipant: nil } if selectors.empty?
+                selectors.last[:main_branch] = true
+                selectors.last[:latest] = true
               when "--all"
                 selectors << { pacticipant: nil } if selectors.empty?
                 selectors.last[:tag] = word

data/lib/pact_broker/client/git.rb

@@ -14,6 +14,7 @@ CI_BRANCH CI_COMMIT_ID https://documentation.codeship.com/pro/builds-and-configu
 bamboo.repository.git.branch https://confluence.atlassian.com/bamboo/bamboo-variables-289277087.html
 BITBUCKET_BRANCH BITBUCKET_COMMIT https://confluence.atlassian.com/bitbucket/variables-in-pipelines-794502608.html
 BUILD_SOURCEBRANCHNAME BUILD_SOURCEVERSION Azure
+CIRRUS_BRANCH CIRRUS_CHANGE_IN_REPO https://cirrus-ci.org/guide/writing-tasks/#environment-variables
 =end
 
 # Keep in sync with pact-provider-verifier/lib/pact/provider_verifier/git.rb
@@ -25,8 +26,8 @@ module PactBroker
       using PactBroker::Client::HashRefinements
 
       COMMAND = 'git rev-parse --abbrev-ref HEAD'.freeze
-      BRANCH_ENV_VAR_NAMES = %w{GITHUB_HEAD_REF GITHUB_REF BUILDKITE_BRANCH CIRCLE_BRANCH TRAVIS_BRANCH GIT_BRANCH GIT_LOCAL_BRANCH APPVEYOR_REPO_BRANCH CI_COMMIT_REF_NAME BITBUCKET_BRANCH BUILD_SOURCEBRANCHNAME}.freeze
-      COMMIT_ENV_VAR_NAMES = %w{GITHUB_SHA BUILDKITE_COMMIT CIRCLE_SHA1 TRAVIS_COMMIT GIT_COMMIT APPVEYOR_REPO_COMMIT CI_COMMIT_ID BITBUCKET_COMMIT BUILD_SOURCEVERSION}
+      BRANCH_ENV_VAR_NAMES = %w{GITHUB_HEAD_REF GITHUB_REF BUILDKITE_BRANCH CIRCLE_BRANCH TRAVIS_BRANCH GIT_BRANCH GIT_LOCAL_BRANCH APPVEYOR_REPO_BRANCH CI_COMMIT_REF_NAME BITBUCKET_BRANCH BUILD_SOURCEBRANCHNAME CIRRUS_BRANCH}.freeze
+      COMMIT_ENV_VAR_NAMES = %w{GITHUB_SHA BUILDKITE_COMMIT CIRCLE_SHA1 TRAVIS_COMMIT GIT_COMMIT APPVEYOR_REPO_COMMIT CI_COMMIT_ID BITBUCKET_COMMIT BUILD_SOURCEVERSION CIRRUS_CHANGE_IN_REPO}
       BUILD_URL_ENV_VAR_NAMES = %w{BUILDKITE_BUILD_URL CIRCLE_BUILD_URL TRAVIS_BUILD_WEB_URL BUILD_URL }
 
       def self.commit

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

@@ -43,6 +43,9 @@ module PactBroker
           if matrix_options[:to_tag]
             opts[:latest] = 'true'
             opts[:tag] = matrix_options[:to_tag]
+          elsif matrix_options[:with_main_branches]
+            opts[:latest] = 'true'
+            opts[:mainBranch] = 'true'
           elsif selectors.size == 1 && !matrix_options[:to_environment]
             opts[:latest] = 'true'
           end
@@ -59,11 +62,11 @@ module PactBroker
               hash[:latest] = 'true' if selector[:latest]
               hash[:tag] = selector[:tag] if selector[:tag]
               hash[:branch] = selector[:branch] if selector[:branch]
+              hash[:mainBranch] = 'true' if selector[:main_branch]
             end
           end
         end
 
-
         def result_message
           if json_output?
             response_entity.response.raw_body

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.67.0'
+    VERSION = '1.69.0'
   end
 end

data/spec/integration/can_i_merge_spec.rb

@@ -0,0 +1,43 @@
+require "pact_broker/client/cli/broker"
+
+module PactBroker
+  module Client
+    module CLI
+      describe Broker do
+        before do
+          subject.options = OpenStruct.new(minimum_valid_options)
+          allow($stdout).to receive(:puts)
+          allow($stderr).to receive(:puts)
+          allow(Retry).to receive(:sleep)
+
+          stub_const("ARGV", %w[--pacticipant Foo --version 1])
+          stub_request(:get, "http://pact-broker/matrix?latest=true&latestby=cvp&mainBranch=true&q%5B%5D%5Bpacticipant%5D=Foo&q%5B%5D%5Bversion%5D=1").
+            with(
+              headers: {
+              'Accept'=>'application/hal+json',
+              }).
+            to_return(status: 200, body: File.read("spec/support/matrix.json"), headers: { "Content-Type" => "application/hal+json" })
+        end
+
+        let(:minimum_valid_options) do
+          {
+            broker_base_url: 'http://pact-broker',
+            output: 'table',
+            verbose: 'verbose',
+            retry_while_unknown: 1,
+            retry_interval: 2,
+            limit: 1000,
+            dry_run: false
+          }
+        end
+
+        let(:invoke_can_i_merge) { subject.can_i_merge }
+
+        it "sends a matrix query" do
+          expect($stdout).to receive(:puts).with(/Computer says yes/)
+          invoke_can_i_merge
+        end
+      end
+    end
+  end
+end

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

@@ -27,6 +27,15 @@ module PactBroker::Client::CLI
       Delegate.call(options)
     end
 
+    desc '', ''
+    method_option :broker_base_url, required: true, aliases: "-b"
+    method_option :broker_username, aliases: "-u"
+    method_option :broker_password, aliases: "-p"
+    method_option :broker_token, aliases: "-k"
+    def test_pact_broker_client_options
+      Delegate.call(pact_broker_client_options)
+    end
+
     desc '', ''
     ignored_and_hidden_potential_options_from_environment_variables
     def test_without_parameters
@@ -74,17 +83,17 @@ module PactBroker::Client::CLI
 
     it "removes trailing slashes from the broker base url when passed as an arg" do
       expect(Delegate).to receive(:call) do | options |
-        expect(options.broker_base_url).to eq 'http://bar'
+        expect(options[:pact_broker_base_url]).to eq 'http://bar'
       end
-      TestThor.start(%w{test_using_env_vars --broker-base-url http://bar/})
+      TestThor.start(%w{test_pact_broker_client_options --broker-base-url http://bar/})
     end
 
     it "removes trailing slashes from the broker base url when passed as an env var" do
       ENV['PACT_BROKER_BASE_URL'] = 'http://bar/'
       expect(Delegate).to receive(:call) do | options |
-        expect(options.broker_base_url).to eq 'http://bar'
+        expect(options[:pact_broker_base_url]).to eq 'http://bar'
       end
-      TestThor.start(%w{test_using_env_vars})
+      TestThor.start(%w{test_pact_broker_client_options})
     end
 
     describe ".turn_muliple_tag_options_into_array" do

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

@@ -75,6 +75,12 @@ module PactBroker
           ],[
             ["--branch", "main"],
             [{ pacticipant: nil, branch: "main", latest: true }]
+          ],[
+            ["--pacticipant", "Foo", "--main-branch", "--pacticipant", "Bar", "--version", "1"],
+            [{ pacticipant: "Foo", main_branch: true, latest: true }, { pacticipant: "Bar", version: "1" }]
+          ],[
+            ["--main-branch"],
+            [{ pacticipant: nil, main_branch: true, latest: true }]
           ]
         ]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.67.0
+  version: 1.69.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -217,6 +217,7 @@ files:
 - ".github/workflows/release_gem.yml"
 - ".github/workflows/smartbear-issue-label-added.yml"
 - ".github/workflows/test.yml"
+- ".github/workflows/triage.yml"
 - ".github/workflows/trigger_pact_docs_update.yml"
 - ".gitignore"
 - ".rspec"
@@ -224,6 +225,7 @@ files:
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
+- LICENSE.txt
 - README.md
 - RELEASING.md
 - Rakefile
@@ -353,6 +355,7 @@ files:
 - spec/fixtures/approvals/list_environments.approved.txt
 - 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/lib/pact_broker/client/base_client_spec.rb
@@ -449,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: See description
@@ -462,6 +465,7 @@ test_files:
 - spec/fixtures/approvals/list_environments.approved.txt
 - 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/lib/pact_broker/client/base_client_spec.rb