pact_broker-client 1.75.0 → 1.75.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5089c183a535af491e824cdb9d198cb06150cb44d77014b09957564b9a47be7
-  data.tar.gz: 4d86ae219d734f0d4266214d1adca636f4557691104e75a720e8860d4103f831
+  metadata.gz: d1182bbb55b2f96fd7be7619d813cd4d144b5f3ed2d0b39c96bf26f50ebe3f49
+  data.tar.gz: 6f191eb22fa4764e41d59f5be90310637162fc7ac769b00820ab2703e24069a1
 SHA512:
-  metadata.gz: 4f7e075d702ae824e91835cfbf14068c8c2938877cc0a156f7d99e8f9a577bd41d4b4507f06f714897c8f911e7c85f647f94898d4eb0ebf1ea938b270d004708
-  data.tar.gz: e7f787f092e10fec2166328a1bca16c7517a5a1c65179f92e4b9b71f6a97caaf0633a0ecc71f03cc0b9baaf303a86d26567a11399ff8fcd9a00d1de54685f856
+  metadata.gz: 57e26c965b62b16ec547f0892efed4006e78c22f4b26ad64b0968953d4d03a3c01c5fac4f9dfd806438df623d1992a8bea575ed85b222b767b8cad43ef487611
+  data.tar.gz: 1564437e9b96f362b82f0e12cbf7c2ec90f26ca73f0a7792c11b5b622e8e4e50a7121dd2c94544a14c359311f03eb69b3b68d17affd4f5a2c95e4e561f9f9aee

data/.github/workflows/delete_branch_in_pactflow.yml

@@ -0,0 +1,24 @@
+name: Delete application branch in Pactflow
+
+on:
+  delete:
+    branches:
+      - "*"
+
+jobs:
+  delete-branch-in-pactflow:
+    name: delete
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      # Requires Ruby to encode the URL path correctly - could use any other scripting language here
+      - uses: ruby/setup-ruby@v1
+
+      - name: Delete branch in Pactflow
+        run: script/ci/delete-branch-in-pactflow.sh
+        env:
+          GIT_BRANCH: ${{ github.event.ref }}
+          PACTICIPANT: "Pact Broker Client"
+          PACT_BROKER_TOKEN: ${{ secrets.PACT_BROKER_TOKEN_PACT_FOUNDATION }}
+          PACT_BROKER_BASE_URL: "https://pact-foundation.pactflow.io"

data/.github/workflows/release_gem.yml

@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Notify ${{ matrix.repository }} of gem release
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.GHTOKENFORPACTCLIRELEASE }}
           repository: ${{ matrix.repository }}

data/.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby_version: ["2.7", "3.0", "3.1", "3.2"]
+        ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3"]
         os: ["ubuntu-latest","windows-latest","macos-latest"]
     steps:
       - uses: actions/checkout@v4
@@ -34,13 +34,12 @@ jobs:
           ruby-version: "3.2"
       - run: "bundle install"
       # Publish to old and new account until we can disable the old account
-      - run: |
+      - name: Generate and publish pacts
+        run: |
           rm -rf spec/pacts/*
           bundle exec rspec spec/service_providers/
-          VERBOSE=true bundle exec rake pact:publish:pactflow_oss
-          VERBOSE=true bundle exec rake pact:publish:pactflow_pact_foundation
+          bundle exec rake pact:publish:pactflow_pact_foundation
         env:
-          PACT_BROKER_TOKEN: ${{ secrets.PACTFLOW_PACT_OSS_TOKEN }}
           PACT_BROKER_TOKEN_PACT_FOUNDATION: ${{ secrets.PACT_BROKER_TOKEN_PACT_FOUNDATION }}
           PACT_BROKER_FEATURES: ${{ matrix.feature }}
           TEST_FEATURE: ${{ matrix.feature }}

data/.github/workflows/trigger_pact_docs_update.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger docs.pact.io update workflow
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.GHTOKENFORTRIGGERINGPACTDOCSUPDATE }}
           repository: pact-foundation/docs.pact.io

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="v1.75.2"></a>
+### v1.75.2 (2024-05-13)
+
+#### Bug Fixes
+
+* explicitly require openstruct	 ([fdb70cf](/../../commit/fdb70cf))
+
+<a name="v1.75.1"></a>
+### v1.75.1 (2023-11-23)
+
+#### Bug Fixes
+
+* verification-required command invalid arg number	 ([fa3b1ca](/../../commit/fa3b1ca))
+
 <a name="v1.75.0"></a>
 ### v1.75.0 (2023-11-11)
 

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

@@ -90,7 +90,7 @@
 
 * [A request to list the latest pacts](#a_request_to_list_the_latest_pacts_given_a_pact_between_Condor_and_the_Pricing_Service_exists) given a pact between Condor and the Pricing Service exists
 
-* [A request to list the versions deployed to an environment for a pacticipant name and target](#a_request_to_list_the_versions_deployed_to_an_environment_for_a_pacticipant_name_and_target_given_an_version_is_deployed_to_environment_with_UUID_16926ef3-590f-4e3f-838e-719717aa88c9_with_target_customer-1) given an version is deployed to environment with UUID 16926ef3-590f-4e3f-838e-719717aa88c9 with target customer-1
+* [A request to list the versions deployed to an environment for a pacticipant name and application instance](#a_request_to_list_the_versions_deployed_to_an_environment_for_a_pacticipant_name_and_application_instance_given_an_version_is_deployed_to_environment_with_UUID_16926ef3-590f-4e3f-838e-719717aa88c9_with_target_customer-1) given an version is deployed to environment with UUID 16926ef3-590f-4e3f-838e-719717aa88c9 with target customer-1
 
 * [A request to mark a deployed version as not currently deploye](#a_request_to_mark_a_deployed_version_as_not_currently_deploye_given_a_currently_deployed_version_exists) given a currently deployed version exists
 
@@ -2052,8 +2052,8 @@ Pact Broker will respond with:
   }
 }
 ```
-<a name="a_request_to_list_the_versions_deployed_to_an_environment_for_a_pacticipant_name_and_target_given_an_version_is_deployed_to_environment_with_UUID_16926ef3-590f-4e3f-838e-719717aa88c9_with_target_customer-1"></a>
-Given **an version is deployed to environment with UUID 16926ef3-590f-4e3f-838e-719717aa88c9 with target customer-1**, upon receiving **a request to list the versions deployed to an environment for a pacticipant name and target** from Pact Broker Client, with
+<a name="a_request_to_list_the_versions_deployed_to_an_environment_for_a_pacticipant_name_and_application_instance_given_an_version_is_deployed_to_environment_with_UUID_16926ef3-590f-4e3f-838e-719717aa88c9_with_target_customer-1"></a>
+Given **an version is deployed to environment with UUID 16926ef3-590f-4e3f-838e-719717aa88c9 with target customer-1**, upon receiving **a request to list the versions deployed to an environment for a pacticipant name and application instance** from Pact Broker Client, with
 ```json
 {
   "method": "GET",
@@ -2075,7 +2075,7 @@ Pact Broker will respond with:
     "_embedded": {
       "deployedVersions": [
         {
-          "target": "customer-1",
+          "applicationInstance": "customer-1",
           "_links": {
             "self": {
               "href": "http://localhost:1234/PLACEHOLDER-DEPLOYED-VERSION-ff3adecf-cfc5-4653-a4e3-f1861092f8e0"

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

@@ -88,7 +88,7 @@ module PactBroker
                 selectors = VersionSelectorOptionsParser.call(ARGV)
                 validate_can_i_deploy_selectors(selectors)
                 verification_required_options = { output: options.output, verbose: options.verbose, retry_while_unknown: 0 }
-                result = VerificationRequired.call(options.broker_base_url, selectors, { to_tag: options.to, to_environment: options.in_environment, ignore_selectors: [] }, verification_required_options, pact_broker_client_options)
+                result = VerificationRequired.call(selectors, { to_tag: options.to, to_environment: options.in_environment, ignore_selectors: [] }, verification_required_options, pact_broker_client_options)
                 $stdout.puts result.message
                 $stdout.flush
                 exit(1) unless result.success

data/lib/pact_broker/client/pacts/list_latest_versions.rb

@@ -1,6 +1,7 @@
 require 'pact_broker/client/hal'
 require 'pact_broker/client/command_result'
 require 'pact_broker/client/hal_client_methods'
+require 'ostruct'
 
 module PactBroker
   module Client

data/lib/pact_broker/client/publish_pacts.rb

@@ -4,6 +4,7 @@ require 'base64'
 require 'pact_broker/client/publish_pacts_the_old_way'
 require 'pact_broker/client/colorize_notices'
 require 'pact_broker/client/hash_refinements'
+require 'ostruct'
 
 module PactBroker
   module Client

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.75.0'
+    VERSION = '1.75.2'
   end
 end

data/lib/pact_broker/client/webhooks/create.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'pact_broker/client/command_result'
 require "pact_broker/client/backports"
 require "pact_broker/client/hash_refinements"
+require 'ostruct'
 
 module PactBroker
   module Client

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

@@ -2,6 +2,7 @@ require "base64"
 require "pact_broker/client/base_command"
 require "pact_broker/client/colorize_notices"
 require "pactflow/client/provider_contracts/publish_the_old_way"
+require 'ostruct'
 
 module Pactflow
   module Client

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

@@ -2,6 +2,7 @@ require "pact_broker/client/base_command"
 require "pact_broker/client/versions/create"
 require 'pact_broker/client/colorize_notices'
 require "base64"
+require 'ostruct'
 
 module Pactflow
   module Client

data/script/ci/delete-branch-in-pactflow.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+echo "Deleting branch ${GIT_BRANCH} for ${PACTICIPANT} in Pactflow..."
+ENCODED_GIT_BRANCH=$(echo "$GIT_BRANCH" | ruby -e "require 'erb'; puts ERB::Util.url_encode(ARGF.read.chomp)")
+ENCODED_PACTICIPANT=$(echo "$PACTICIPANT" | ruby -e "require 'erb'; puts ERB::Util.url_encode(ARGF.read.chomp)")
+BRANCH_URL="${PACT_BROKER_BASE_URL}/pacticipants/${ENCODED_PACTICIPANT}/branches/${ENCODED_GIT_BRANCH}"
+
+output_file=$(mktemp)
+
+status=$(curl -v -X DELETE "${BRANCH_URL}" -H "Authorization: Bearer ${PACT_BROKER_TOKEN}" 2>&1 | tee "${output_file}" | awk '/^< HTTP/{print $3}')
+
+if [ "$status" = "404" ]; then
+  echo "Branch ${GIT_BRANCH} for ${PACTICIPANT} does not exist in Pactflow"
+elif [ $status -ge 400 ]; then
+  cat "${output_file}"
+  echo "Error deleting branch in Pactflow"
+  exit 1
+else
+  echo "Deleted branch ${GIT_BRANCH} for ${PACTICIPANT} in Pactflow"
+fi

data/spec/integration/can_i_merge_spec.rb

@@ -1,4 +1,5 @@
 require "pact_broker/client/cli/broker"
+require 'ostruct'
 
 module PactBroker
   module Client

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

@@ -1,6 +1,7 @@
 require 'pact_broker/client/cli/broker'
 require 'pact_broker/client/cli/version_selector_options_parser'
 require 'pact_broker/client/can_i_deploy'
+require 'ostruct'
 
 module PactBroker
   module Client

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

@@ -1,6 +1,7 @@
 require 'pact_broker/client/cli/broker'
 require 'pact_broker/client/publish_pacts'
 require 'pact_broker/client/git'
+require 'ostruct'
 
 module PactBroker::Client::CLI
   describe Broker do

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

@@ -1,5 +1,6 @@
 require 'pact_broker/client/cli/broker'
 require 'pact_broker/client/webhooks/create'
+require 'ostruct'
 
 module PactBroker
   module Client

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

@@ -1,4 +1,5 @@
 require "pactflow/client/provider_contracts/publish"
+require 'ostruct'
 
 module Pactflow
   module Client

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -1928,7 +1928,7 @@
       }
     },
     {
-      "description": "a request to list the versions deployed to an environment for a pacticipant name and target",
+      "description": "a request to list the versions deployed to an environment for a pacticipant name and application instance",
       "providerState": "an version is deployed to environment with UUID 16926ef3-590f-4e3f-838e-719717aa88c9 with target customer-1",
       "request": {
         "method": "GET",
@@ -1947,7 +1947,7 @@
           "_embedded": {
             "deployedVersions": [
               {
-                "target": "customer-1",
+                "applicationInstance": "customer-1",
                 "_links": {
                   "self": {
                     "href": "http://localhost:1234/PLACEHOLDER-DEPLOYED-VERSION-ff3adecf-cfc5-4653-a4e3-f1861092f8e0"

data/spec/service_providers/record_undeployment_spec.rb

@@ -86,7 +86,7 @@ RSpec.describe "recording an undeployment", pact: true do
   def mock_deployed_versions_search_results
     pact_broker
       .given("an version is deployed to environment with UUID 16926ef3-590f-4e3f-838e-719717aa88c9 with target customer-1")
-      .upon_receiving("a request to list the versions deployed to an environment for a pacticipant name and target")
+      .upon_receiving("a request to list the versions deployed to an environment for a pacticipant name and application instance")
       .with(
         method: "GET",
         path: currently_deployed_versions_placeholder_path,
@@ -100,7 +100,7 @@ RSpec.describe "recording an undeployment", pact: true do
           _embedded: {
             deployedVersions: [
               {
-                target: application_instance,
+                applicationInstance: application_instance,
                 _links: {
                   self: {
                     href: Pact.term(pact_broker.mock_service_base_url + deployed_version_placeholder_path, /^http/)

data/tasks/pact.rake

@@ -18,26 +18,6 @@ PactBroker::Client::PublicationTask.new(:remote) do | task |
   task.pact_broker_basic_auth = { username: ENV.fetch("PACT_BROKER_USERNAME"), password: ENV.fetch("PACT_BROKER_PASSWORD") }
 end
 
-PactBroker::Client::PublicationTask.new(:pactflow_oss) do | task |
-  version = ENV.fetch("GITHUB_SHA")
-  branch = ENV.fetch("GITHUB_REF").gsub("refs/heads/", "")
-  feature = ENV.fetch("TEST_FEATURE", "")
-  tag = branch
-
-  if feature != ''
-    version = "#{version}+#{feature}"
-    tag = "#{tag}+#{feature}"
-  end
-
-  require "pact_broker/client/version"
-  task.auto_detect_version_properties = false
-  task.tags = [tag]
-  task.branch = nil
-  task.consumer_version = version
-  task.pact_broker_base_url = "https://pact-oss.pactflow.io"
-  task.pact_broker_token = ENV['PACT_BROKER_TOKEN']
-  task.build_url = PactBroker::Client::Git.build_url
-end
 
 PactBroker::Client::PublicationTask.new(:pactflow_pact_foundation) do | task |
   version = ENV.fetch("GITHUB_SHA")
@@ -53,7 +33,7 @@ PactBroker::Client::PublicationTask.new(:pactflow_pact_foundation) do | task |
   require "pact_broker/client/version"
   task.auto_detect_version_properties = false
   task.tags = [tag]
-  task.branch = nil
+  task.branch = branch
   task.consumer_version = version
   task.pact_broker_base_url = "https://pact-foundation.pactflow.io"
   task.pact_broker_token = ENV["PACT_BROKER_TOKEN_PACT_FOUNDATION"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.75.0
+  version: 1.75.2
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/delete_branch_in_pactflow.yml"
 - ".github/workflows/release_gem.yml"
 - ".github/workflows/smartbear-issue-label-added.yml"
 - ".github/workflows/test.yml"
@@ -244,6 +245,7 @@ files:
 - pact-broker-client.gemspec
 - script/approve-all.sh
 - script/can-i-deploy.sh
+- script/ci/delete-branch-in-pactflow.sh
 - script/ci/record-release.sh
 - script/create-pacticipant.sh
 - script/foo-bar.json
@@ -381,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: See description