pact_broker-client 1.76.1 → 1.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba8a36ef12a731a17e237202de9fa3dc360f61799b395450f0ba02ecc1189ef
-  data.tar.gz: d2885db7e9aff85730cf0756bb53529f6f4643b0ae4ea818ad1b6226262227ff
+  metadata.gz: c967e70badf0e2634f5ca4013fa85fb4f079a14b8862c79186c7ec2785c3ca64
+  data.tar.gz: 37caa5d0ec3b19a0a6cf26c9fc6bef0b5a220c2484353fd71ad9320c17e65281
 SHA512:
-  metadata.gz: 95f96215e9736915c0f8eff7444612d9ae8172dfcbb8eff3c567b91837153590376506357bc29d7d78d6c235bb40f21b5643ea08de87dfd6a2227ecc2b4601a2
-  data.tar.gz: 2131968ab5b1f6efe8e3940457b353b023d5f817627f757b6ecbc3e67bbc3fbee45c7bef08cba9dc08bde25c147d416269c5eb1626f81caf2e566094170fd21e
+  metadata.gz: 8790b48db58649026ea18338a0b7e09965199ddfddb66c1f57ae5069d575d905972458710035c5419af265b0652905e7fba89ccdeb7a65f75cab9bc444e27541
+  data.tar.gz: a6d2bd3713df1b097e82befffa4b2e13e7cc9c3a13170aec55e339734187b7b2bf9157521eb426c2530a6dffdc19b164552dfc9dcbbccd4d34310b304a68180f

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="v1.77.0"></a>
+### v1.77.0 (2024-10-08)
+
+#### Features
+
+* support --ignore flag in can-i-merge command	 ([1349bd0](/../../commit/1349bd0))
+
+<a name="v1.76.2"></a>
+### v1.76.2 (2024-10-13)
+
+#### Bug Fixes
+
+* Add dependency of ostruct to gem, to fix warning ostruct was loaded	 ([eb61c27](/../../commit/eb61c27))
+* Dockerfile to reduce vulnerabilities (#172)	 ([79482c2](/../../commit/79482c2))
+
 <a name="v1.76.1"></a>
 ### v1.76.1 (2024-08-21)
 

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2-alpine
+FROM ruby:3.3.5-alpine
 
 RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing hub
 RUN apk add --update --no-cache git openssh bash

data/README.md

@@ -66,7 +66,7 @@ Options:
               # The consumer application version
   -h, [--branch=BRANCH]
               # Repository branch of the consumer version
-  -r, [--auto-detect-version-properties], [--no-auto-detect-version-properties]
+  -r, [--auto-detect-version-properties], [--no-auto-detect-version-properties], [--skip-auto-detect-version-properties]
               # Automatically detect the repository commit, branch and build
                 URL from known CI environment variables or git CLI. Supports
                 Buildkite, Circle CI, Travis CI, GitHub Actions, Jenkins,
@@ -75,7 +75,7 @@ Options:
   -t, [--tag=TAG]
               # Tag name for consumer version. Can be specified multiple
                 times.
-  -g, [--tag-with-git-branch], [--no-tag-with-git-branch]
+  -g, [--tag-with-git-branch], [--no-tag-with-git-branch], [--skip-tag-with-git-branch]
               # Tag consumer version with the name of the current git branch.
                 Supports Buildkite, Circle CI, Travis CI, GitHub Actions,
                 Jenkins, Hudson, AppVeyor, GitLab, CodeShip, Bitbucket and
@@ -83,7 +83,7 @@ Options:
               # Default: false
       [--build-url=BUILD_URL]
               # The build URL that created the pact
-      [--merge], [--no-merge]
+      [--merge], [--no-merge], [--skip-merge]
               # If a pact already exists for this consumer version and
                 provider, merge the contents. Useful when running Pact tests
                 concurrently on different build nodes.
@@ -99,7 +99,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -121,7 +121,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
   -o, [--output=OUTPUT]
@@ -145,7 +145,7 @@ Options:
                 deployment code
       [--display-name=DISPLAY_NAME]
               # The display name of the environment
-      [--production], [--no-production]
+      [--production], [--no-production], [--skip-production]
               # Whether or not this environment is a production environment.
                 This is currently informational only.
               # Default: false
@@ -165,7 +165,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -186,7 +186,7 @@ Options:
                 deployment code
       [--display-name=DISPLAY_NAME]
               # The display name of the environment
-      [--production], [--no-production]
+      [--production], [--no-production], [--skip-production]
               # Whether or not this environment is a production environment.
                 This is currently informational only.
               # Default: false
@@ -206,7 +206,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -233,7 +233,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -260,7 +260,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -285,7 +285,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -327,7 +327,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -368,7 +368,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -405,7 +405,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -436,7 +436,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -471,7 +471,7 @@ Options:
       [--branch=BRANCH]
               # The branch of the version for which you want to check the
                 verification results.
-      [--main-branch], [--no-main-branch]
+      [--main-branch], [--no-main-branch], [--skip-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
@@ -495,7 +495,7 @@ Options:
               # The time between retries in seconds. Use in conjuction with
                 --retry-while-unknown
               # Default: 10
-      [--dry-run], [--no-dry-run]
+      [--dry-run], [--no-dry-run], [--skip-dry-run]
               # 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_DEPLOY_DRY_RUN=true. This mode is useful when
@@ -514,7 +514,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -572,6 +572,13 @@ Options:
   -e, [--version=VERSION]
               # The pacticipant version. Must be entered after the
                 --pacticipant that it relates to.
+      [--ignore=PACTICIPANT]
+              # 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_MERGE_IGNORE may also be
+                used to specify a pacticipant name to ignore, with commas to
+                separate multiple pacticipant names if necessary.
   -o, [--output=OUTPUT]
               # json or table
               # Default: table
@@ -584,7 +591,7 @@ Options:
               # The time between retries in seconds. Use in conjuction with
                 --retry-while-unknown
               # Default: 10
-      [--dry-run], [--no-dry-run]
+      [--dry-run], [--no-dry-run], [--skip-dry-run]
               # 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
@@ -603,7 +610,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -639,7 +646,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -666,7 +673,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -691,7 +698,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -727,20 +734,20 @@ Options:
               # Provider label, mutually exclusive with provider name
       [--description=DESCRIPTION]
               # Webhook description
-      [--contract-content-changed], [--no-contract-content-changed]
+      [--contract-content-changed], [--no-contract-content-changed], [--skip-contract-content-changed]
               # Trigger this webhook when the pact content changes
-      [--contract-published], [--no-contract-published]
+      [--contract-published], [--no-contract-published], [--skip-contract-published]
               # Trigger this webhook when a pact is published
-      [--provider-verification-published], [--no-provider-verification-published]
+      [--provider-verification-published], [--no-provider-verification-published], [--skip-provider-verification-published]
               # Trigger this webhook when a provider verification result is
                 published
-      [--provider-verification-failed], [--no-provider-verification-failed]
+      [--provider-verification-failed], [--no-provider-verification-failed], [--skip-provider-verification-failed]
               # Trigger this webhook when a failed provider verification
                 result is published
-      [--provider-verification-succeeded], [--no-provider-verification-succeeded]
+      [--provider-verification-succeeded], [--no-provider-verification-succeeded], [--skip-provider-verification-succeeded]
               # Trigger this webhook when a successful provider verification
                 result is published
-      [--contract-requiring-verification-published], [--no-contract-requiring-verification-published]
+      [--contract-requiring-verification-published], [--no-contract-requiring-verification-published], [--skip-contract-requiring-verification-published]
               # Trigger this webhook when a contract is published that
                 requires verification
       [--team-uuid=UUID]
@@ -754,7 +761,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -793,20 +800,20 @@ Options:
               # Provider label, mutually exclusive with provider name
       [--description=DESCRIPTION]
               # Webhook description
-      [--contract-content-changed], [--no-contract-content-changed]
+      [--contract-content-changed], [--no-contract-content-changed], [--skip-contract-content-changed]
               # Trigger this webhook when the pact content changes
-      [--contract-published], [--no-contract-published]
+      [--contract-published], [--no-contract-published], [--skip-contract-published]
               # Trigger this webhook when a pact is published
-      [--provider-verification-published], [--no-provider-verification-published]
+      [--provider-verification-published], [--no-provider-verification-published], [--skip-provider-verification-published]
               # Trigger this webhook when a provider verification result is
                 published
-      [--provider-verification-failed], [--no-provider-verification-failed]
+      [--provider-verification-failed], [--no-provider-verification-failed], [--skip-provider-verification-failed]
               # Trigger this webhook when a failed provider verification
                 result is published
-      [--provider-verification-succeeded], [--no-provider-verification-succeeded]
+      [--provider-verification-succeeded], [--no-provider-verification-succeeded], [--skip-provider-verification-succeeded]
               # Trigger this webhook when a successful provider verification
                 result is published
-      [--contract-requiring-verification-published], [--no-contract-requiring-verification-published]
+      [--contract-requiring-verification-published], [--no-contract-requiring-verification-published], [--skip-contract-requiring-verification-published]
               # Trigger this webhook when a contract is published that
                 requires verification
       [--team-uuid=UUID]
@@ -820,7 +827,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
       --uuid=UUID
@@ -852,7 +859,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -872,7 +879,7 @@ Options:
               # The name of the pacticipant that the branch belongs to.
       --branch=BRANCH
               # The pacticipant branch name.
-      [--error-when-not-found], [--no-error-when-not-found]
+      [--error-when-not-found], [--no-error-when-not-found], [--skip-error-when-not-found]
               # Raise an error if the branch that is to be deleted is not
                 found.
               # Default: true
@@ -884,7 +891,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -907,11 +914,11 @@ Options:
   -t, [--tag=TAG]
               # Tag name for pacticipant version. Can be specified multiple
                 times.
-      [--auto-create-version], [--no-auto-create-version]
+      [--auto-create-version], [--no-auto-create-version], [--skip-auto-create-version]
               # Automatically create the pacticipant version if it does not
                 exist.
               # Default: false
-  -g, [--tag-with-git-branch], [--no-tag-with-git-branch]
+  -g, [--tag-with-git-branch], [--no-tag-with-git-branch], [--skip-tag-with-git-branch]
               # Tag pacticipant version with the name of the current git
                 branch.
               # Default: false
@@ -923,7 +930,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -957,7 +964,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```
@@ -988,7 +995,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
   -o, [--output=OUTPUT]
@@ -1034,7 +1041,7 @@ Options:
               # Default: oas
       [--content-type=CONTENT_TYPE]
               # The content type. eg. application/yml
-      [--verification-success], [--no-verification-success]
+      [--verification-success], [--no-verification-success], [--skip-verification-success]
               # Whether or not the self verification passed successfully.
       [--verification-exit-code=N]
               # The exit code of the verification process. Can be used instead
@@ -1065,7 +1072,7 @@ Options:
               # Pact Broker basic auth password
   -k, [--broker-token=BROKER_TOKEN]
               # Pact Broker bearer token
-  -v, [--verbose], [--no-verbose]
+  -v, [--verbose], [--no-verbose], [--skip-verbose]
               # Verbose output.
               # Default: false
 ```

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

@@ -48,6 +48,7 @@ module PactBroker
             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 :ignore, required: false, banner: "PACTICIPANT", 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_MERGE_IGNORE may also be used to specify a pacticipant name to ignore, with commas to separate multiple pacticipant names if necessary."
             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"
@@ -59,11 +60,12 @@ module PactBroker
               require "pact_broker/client/can_i_deploy"
 
               validate_credentials
-              selectors = VersionSelectorOptionsParser.call(ARGV)
+              selectors = VersionSelectorOptionsParser.call(ARGV).select { |s| !s[:ignore] }
+              ignore_selectors = VersionSelectorOptionsParser.call(ARGV).select { |s| s[:ignore] } + ignore_merge_selectors_from_environment_variable
               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)
+              result = CanIDeploy.call(selectors, { with_main_branches: true, ignore_selectors: ignore_selectors}, can_i_merge_options, pact_broker_client_options)
               $stdout.puts result.message
               $stdout.flush
               exit(1) unless result.success
@@ -121,6 +123,9 @@ module PactBroker
               def ignore_selectors_from_environment_variable
                 ENV.fetch("PACT_BROKER_CAN_I_DEPLOY_IGNORE", "").split(",").collect(&:strip).collect{ |i| { pacticipant: i } }
               end
+              def ignore_merge_selectors_from_environment_variable
+                ENV.fetch("PACT_BROKER_CAN_I_MERGE_IGNORE", "").split(",").collect(&:strip).collect{ |i| { pacticipant: i } }
+              end
             end
           end
         end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.76.1'
+    VERSION = '1.77.0'
   end
 end

data/pact-broker-client.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'rake', '~> 13.0' #For FileList
   gem.add_runtime_dependency 'dig_rb', '~> 1.0'
   gem.add_runtime_dependency 'base64', '~> 0.2'
+  gem.add_runtime_dependency 'ostruct'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.76.1
+  version: 1.77.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -120,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client for the Pact Broker. Publish, retrieve and query pacts and verification
   results. Manage webhooks and environments.
 email:
@@ -147,7 +161,7 @@ files:
 - ci.sh
 - doc/CAN_I_DEPLOY_USAGE_WITH_TAGS.md
 - doc/pacts/markdown/Pact Broker Client - Pact Broker.md
-- doc/pacts/markdown/Pact Broker Client - Pactflow.md
+- doc/pacts/markdown/Pact Broker Client - PactFlow.md
 - doc/pacts/markdown/README.md
 - example/scripts/README.md
 - example/scripts/deploy-consumer.sh
@@ -287,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: See description