pact_broker-client 1.50.0 → 1.52.0

data/lib/pact_broker/client/publish_pacts_the_old_way.rb

@@ -25,14 +25,13 @@ module PactBroker
         @branch = consumer_version_params[:branch]
         @build_url = consumer_version_params[:build_url]
         @tags = consumer_version_params[:tags] ? consumer_version_params[:tags].collect{ |tag| tag.respond_to?(:strip) ? tag.strip : tag } : []
-        @version_required = consumer_version_params[:version_required]
         @pact_broker_client_options = pact_broker_client_options
       end
 
       def call
         validate
         $stdout.puts("")
-        result = create_consumer_versions && apply_tags && publish_pacts
+        result = apply_tags && publish_pacts
         $stdout.puts("")
         if result
           PactBroker::Client::CommandResult.new(true)
@@ -59,10 +58,6 @@ module PactBroker
         end
       end
 
-      def can_create_version_with_branch?
-        @can_create_version_with_branch ||= index_resource.can?('pb:pacticipant-version')
-      end
-
       def merge_on_server?
         pact_broker_client_options[:write] == :merge
       end
@@ -96,49 +91,6 @@ module PactBroker
         end
       end
 
-      def create_consumer_versions
-        if create_versions?
-          consumer_names.collect do | consumer_name |
-            create_version(index_resource, consumer_name)
-          end
-          true
-        else
-          true
-        end
-      end
-
-      def create_versions?
-        if version_required
-          if can_create_version_with_branch?
-            true
-          else
-            raise PactBroker::Client::Error.new("This version of the Pact Broker does not support versions with branches or build URLs. Please upgrade your broker to 2.76.2 or later.")
-          end
-        elsif (branch || build_url) && can_create_version_with_branch?
-          true
-        else
-          false
-        end
-      end
-
-      def create_version(index_resource, consumer_name)
-        Retry.while_error do
-          version_resource = index_resource._link('pb:pacticipant-version').expand(version: consumer_version_number, pacticipant: consumer_name).put(version_body).assert_success!
-          message = if version_resource.response.status == 200
-            "Replaced version #{consumer_version_number} of #{consumer_name}"
-          else
-            "Created version #{consumer_version_number} of #{consumer_name}"
-          end
-
-          message = message + " (branch #{branch})" if branch
-          $stdout.puts message
-          if version_resource.response.status == 200
-            $stdout.puts ::Term::ANSIColor.yellow("Replacing the version resource is not recommended under normal circumstances and may indicate that you have not configured your Pact pipeline correctly (unless you are just re-running a build for a particular commit). For more information see https://docs.pact.io/versioning")
-          end
-          true
-        end
-      end
-
       def version_body
         {
           branch: branch,
@@ -185,6 +137,9 @@ module PactBroker
       end
 
       def validate
+        if branch || build_url
+          $stdout.puts ::Term::ANSIColor.yellow("WARN: This version of the Pact Broker does not support versions with branches or build URLs. Please upgrade your broker to 2.86.0 or later.")
+        end
         raise PactBroker::Client::Error.new("Please specify the consumer_version_number") unless (consumer_version_number && consumer_version_number.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)
         raise PactBroker::Client::Error.new("No pact files found") unless (pact_file_paths && pact_file_paths.any?)

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.50.0'
+    VERSION = '1.52.0'
   end
 end

data/pact-broker-client.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'httparty', '~>0.18'
+  gem.add_runtime_dependency 'httparty', '~>0.18.1' # https://github.com/jnunemaker/httparty/issues/733
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.7'
   gem.add_runtime_dependency 'table_print', '~> 1.5'
   gem.add_runtime_dependency 'thor', '>= 0.20', '< 2.0'

data/script/publish-pact.sh

@@ -28,7 +28,7 @@ bundle exec bin/pact-broker create-or-update-webhook http://localhost:9393 \
 #   --contract-published
 
 
-PACT_BROKER_FEATURES=publish_contracts bundle exec bin/pact-broker publish spec/pacts/pact_broker_client-pact_broker.json \
+bundle exec bin/pact-broker publish spec/pacts/pact_broker_client-pact_broker.json \
   --consumer-app-version 1.2.26 \
   --broker-base-url http://localhost:9292 \
    --broker-token localhost \

data/script/record-deployments-and-releases.sh

@@ -8,9 +8,20 @@ bundle exec bin/pact-broker record-deployment --pacticipant Foo --version 2 --en
 bundle exec bin/pact-broker record-deployment --pacticipant Foo --version 2 --environment test --target customer-1
 bundle exec bin/pact-broker record-deployment --pacticipant Foo --version 2 --environment test --target customer-1
 
+bundle exec bin/pact-broker record-undeployment --pacticipant Foo --environment test --target customer-2
 bundle exec bin/pact-broker record-undeployment --pacticipant Foo --environment test
 bundle exec bin/pact-broker record-undeployment --pacticipant Foo --environment test
 bundle exec bin/pact-broker record-undeployment --pacticipant Foo --environment test --target customer-1
 
 bundle exec bin/pact-broker record-release --pacticipant Foo --version 2 --environment test
-bundle exec bin/pact-broker record-support-ended --pacticipant Foo --version 2 --environment test
+bundle exec bin/pact-broker record-support-ended --pacticipant Foo --version 2 --environment test
+
+
+bundle exec bin/pact-broker record-deployment --pacticipant Foo --version 2 --environment test
+bundle exec bin/pact-broker record-deployment --pacticipant Foo --version 2 --environment test --application-instance customer-1
+bundle exec bin/pact-broker record-deployment --pacticipant Foo --version 2 --environment test --application-instance customer-1
+
+bundle exec bin/pact-broker record-undeployment --pacticipant Foo --environment test --application-instance customer-2
+bundle exec bin/pact-broker record-undeployment --pacticipant Foo --environment test
+bundle exec bin/pact-broker record-undeployment --pacticipant Foo --environment test
+bundle exec bin/pact-broker record-undeployment --pacticipant Foo --environment test --application-instance customer-1

data/spec/lib/pact_broker/client/deployments/record_deployment_spec.rb

@@ -61,14 +61,14 @@ module PactBroker
               to_return(status: 200, body: record_deployment_body_hash.to_json , headers: {})
           end
 
-          let(:target) { "blue" }
+          let(:application_instance) { "blue" }
 
           let(:params) do
             {
               pacticipant_name: "Foo",
               version_number: "1",
               environment_name: "test",
-              target: target
+              application_instance: application_instance
             }
           end
 
@@ -186,13 +186,13 @@ module PactBroker
             end
 
             it "indicates the API was Pactflow" do
-              expect(subject.message).to include "Recorded deployment of Foo version 1 to test environment (target blue) in Pactflow"
+              expect(subject.message).to include "Recorded deployment of Foo version 1 to test environment (application instance blue) in Pactflow"
             end
 
-            context "when target is nil" do
-              let(:target) { nil }
+            context "when application_instance is nil" do
+              let(:application_instance) { nil }
 
-              it "does not include the target in the result message" do
+              it "does not include the application_instance in the result message" do
                 expect(subject.message).to include "Recorded deployment of Foo version 1 to test environment in"
               end
             end

data/spec/lib/pact_broker/client/deployments/record_undeployment_spec.rb

@@ -7,11 +7,11 @@ module PactBroker
         let(:params) do
           {
             pacticipant_name: "Foo",
-            target: target,
+            application_instance: application_instance,
             environment_name: "test"
           }
         end
-        let(:target) { "customer-1" }
+        let(:application_instance) { "customer-1" }
         let(:output) { "text" }
         let(:options) { { output: output, verbose: true } }
         let(:pact_broker_base_url) { "http://broker" }
@@ -131,7 +131,7 @@ module PactBroker
         subject { RecordUndeployment.call(params, options, pact_broker_client_options) }
 
         its(:success) { is_expected.to eq true }
-        its(:message) { is_expected.to include "Recorded undeployment of Foo version 2 from test environment (target customer-1) in the Pact Broker" }
+        its(:message) { is_expected.to include "Recorded undeployment of Foo version 2 from test environment (application instance customer-1) in the Pact Broker" }
 
         context "when there is no pb:environments relation in the index" do
           let(:index_body_hash) do
@@ -173,8 +173,8 @@ module PactBroker
         end
 
         context "when a target is provided and there is no deployed version with a matching target" do
-          let(:target) { "wrong" }
-          let(:expected_message) { "Foo is not currently deployed to target 'wrong' in test environment. Please specify one of the following targets to record the undeployment from: customer-1, <no target>" }
+          let(:application_instance) { "wrong" }
+          let(:expected_message) { "Foo is not currently deployed to application instance 'wrong' in test environment. Please omit the application instance to undeploy from the anonymous instance or specify one of the following application instances to record the undeployment from: customer-1." }
 
           its(:success) { is_expected.to be false }
           its(:message) { is_expected.to include expected_message }
@@ -186,12 +186,20 @@ module PactBroker
           end
         end
 
+        context "when a target is provided and there is no deployed version with a matching target and all the application instances are set" do
+          let(:application_instance) { "wrong" }
+          let(:returned_target_2) { "customer-2" }
+          let(:expected_message) { "Foo is not currently deployed to application instance 'wrong' in test environment. Please specify one of the following application instances to record the undeployment from: customer-1, customer-2." }
+
+          its(:message) { is_expected.to include expected_message }
+        end
+
         context "when a target is not provided and there is no deployed verison without a target" do
-          let(:target) { nil }
+          let(:application_instance) { nil }
           let(:returned_target_2) { "customer-2" }
 
           its(:success) { is_expected.to be false }
-          its(:message) { is_expected.to include "Please specify one of the following targets to record the undeployment from: customer-1, customer-2" }
+          its(:message) { is_expected.to include "Please specify one of the following application instances to record the undeployment from: customer-1, customer-2" }
         end
 
         context "when there are no deployed versions for the pacticipant" do

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

@@ -263,80 +263,9 @@ module PactBroker
         context "when the broker does not support creation of a version with a branch but a branch is specified" do
           let(:branch) { "main" }
 
-          context "when version_required is true" do
-            let(:version_required) { true }
-
-            it "raises an error" do
-              expect { subject.call }.to raise_error PactBroker::Client::Error
-            end
-          end
-        end
-
-        context "when the broker supports creation of a version with a branch" do
-          before do
-            allow(version_link).to receive(:expand).and_return(version_link)
-            allow(version_resource).to receive(:assert_success!).and_return(version_resource)
-            allow(version_resource).to receive_message_chain(:response, :status).and_return(version_creation_response_status)
-          end
-          let(:can_create_version) { true }
-          let(:version_link) { instance_double("PactBroker::Client::Hal::Link", put: version_resource) }
-          let(:version_resource) { instance_double("PactBroker::Client::Hal::Entity") }
-          let(:version_creation_response_status) { 201 }
-
-          before do
-            allow(index_resource).to receive(:_link).and_return(version_link)
-          end
-
-          context "when there is a branch, build_url or tags specified" do
-            let(:tags) { ["dev"] }
-            let(:branch) { ["main"] }
-            let(:build_url) { "build_url" }
-
-            it "creates a version with the branch, build_url and tags" do
-              expect(index_resource).to receive(:_link)
-              expect(version_link).to receive(:expand).with(pacticipant: "Consumer", version: "1.2.3")
-              expect(version_link).to receive(:put).with(branch: branch, buildUrl: build_url)
-              subject.call
-            end
-
-            context "when there is a branch but no tags" do
-              let(:tags) { [] }
-
-              it "does not set the tags, as this would overwrite the existing ones - not sure about this implementation" do
-                expect(version_link).to receive(:put).with(branch: branch, buildUrl: build_url)
-                subject.call
-              end
-            end
-
-            context "when the version response status is 201" do
-              it "puts a message indicating the version was created" do
-                expect($stdout).to receive(:puts).with(/Created/)
-                subject.call
-              end
-            end
-
-            context "when the version response status is 200" do
-              let(:version_creation_response_status) { 200 }
-
-              it "puts a message indicating the version was replaced" do
-                expect($stdout).to receive(:puts).with(/Replaced/)
-                subject.call
-              end
-            end
-          end
-
-          context "when there is no branch, tags or build_url specified" do
-            before do
-              allow(Retry).to receive(:while_error) { |&block| block.call }
-            end
-            let(:tags) { [] }
-            let(:branch) { nil }
-            let(:build_url) { nil }
-
-            it "does not create a version resource" do
-              expect(index_resource).to_not receive(:_link)
-              subject.call
-            end
+          it "logs a warning" do
+            expect($stdout).to receive(:puts).with(/WARN: This version/)
+            subject.call
           end
         end
       end

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -186,110 +186,6 @@
         }
       }
     },
-    {
-      "description": "a request for the index resource",
-      "providerState": "the pb:pacticipant-version relation exists in the index resource",
-      "request": {
-        "method": "get",
-        "path": "/",
-        "headers": {
-          "Accept": "application/hal+json"
-        }
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "Content-Type": "application/hal+json;charset=utf-8"
-        },
-        "body": {
-          "_links": {
-            "pb:pacticipant-version": {
-              "href": "http://localhost:1234/HAL-REL-PLACEHOLDER-INDEX-PB-PACTICIPANT-VERSION-{pacticipant}-{version}"
-            }
-          }
-        },
-        "matchingRules": {
-          "$.body._links.pb:pacticipant-version.href": {
-            "match": "regex",
-            "regex": "http:\\/\\/.*{pacticipant}.*{version}"
-          }
-        }
-      }
-    },
-    {
-      "description": "a request to create a pacticipant version",
-      "providerState": "version 26f353580936ad3b9baddb17b00e84f33c69e7cb of pacticipant Foo does not exist",
-      "request": {
-        "method": "put",
-        "path": "/HAL-REL-PLACEHOLDER-INDEX-PB-PACTICIPANT-VERSION-Foo-26f353580936ad3b9baddb17b00e84f33c69e7cb",
-        "headers": {
-          "Content-Type": "application/json",
-          "Accept": "application/hal+json"
-        },
-        "body": {
-          "branch": "main",
-          "buildUrl": "http://my-ci/builds/1"
-        }
-      },
-      "response": {
-        "status": 201,
-        "headers": {
-          "Content-Type": "application/hal+json;charset=utf-8"
-        },
-        "body": {
-          "number": "26f353580936ad3b9baddb17b00e84f33c69e7cb",
-          "buildUrl": "http://my-ci/builds/1",
-          "_links": {
-            "self": {
-              "href": "http://localhost:1234/some-url"
-            }
-          }
-        },
-        "matchingRules": {
-          "$.body._links.self.href": {
-            "match": "regex",
-            "regex": "http:\\/\\/.*"
-          }
-        }
-      }
-    },
-    {
-      "description": "a request to create a pacticipant version",
-      "providerState": "version 26f353580936ad3b9baddb17b00e84f33c69e7cb of pacticipant Foo does exist",
-      "request": {
-        "method": "put",
-        "path": "/HAL-REL-PLACEHOLDER-INDEX-PB-PACTICIPANT-VERSION-Foo-26f353580936ad3b9baddb17b00e84f33c69e7cb",
-        "headers": {
-          "Content-Type": "application/json",
-          "Accept": "application/hal+json"
-        },
-        "body": {
-          "branch": "main",
-          "buildUrl": "http://my-ci/builds/1"
-        }
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "Content-Type": "application/hal+json;charset=utf-8"
-        },
-        "body": {
-          "number": "26f353580936ad3b9baddb17b00e84f33c69e7cb",
-          "buildUrl": "http://my-ci/builds/1",
-          "_links": {
-            "self": {
-              "href": "http://localhost:1234/some-url"
-            }
-          }
-        },
-        "matchingRules": {
-          "$.body._links.self.href": {
-            "match": "regex",
-            "regex": "http:\\/\\/.*"
-          }
-        }
-      }
-    },
     {
       "description": "a request to determine if Bar can be deployed with all Foo tagged prod, ignoring the verification for Foo version 3.4.5",
       "providerState": "provider Bar version 4.5.6 has a successful verification for Foo version 1.2.3 tagged prod and a failed verification for version 3.4.5 tagged prod",
@@ -1636,6 +1532,112 @@
         }
       }
     },
+    {
+      "description": "a request for the index resource",
+      "providerState": "the pb:publish-contracts relations exists in the index resource",
+      "request": {
+        "method": "GET",
+        "path": "/",
+        "headers": {
+          "Accept": "application/hal+json"
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "Content-Type": "application/hal+json;charset=utf-8"
+        },
+        "body": {
+          "_links": {
+            "pb:publish-contracts": {
+              "href": "http://localhost:1234/HAL-REL-PLACEHOLDER-PB-PUBLISH-CONTRACTS"
+            }
+          }
+        },
+        "matchingRules": {
+          "$.body._links.pb:publish-contracts.href": {
+            "match": "regex",
+            "regex": "http:\\/\\/.*"
+          }
+        }
+      }
+    },
+    {
+      "description": "a request to publish contracts",
+      "request": {
+        "method": "POST",
+        "path": "/HAL-REL-PLACEHOLDER-PB-PUBLISH-CONTRACTS",
+        "headers": {
+          "Content-Type": "application/json",
+          "Accept": "application/hal+json"
+        },
+        "body": {
+          "pacticipantName": "Foo",
+          "pacticipantVersionNumber": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30",
+          "branch": "main",
+          "tags": [
+            "dev"
+          ],
+          "buildUrl": "http://build",
+          "contracts": [
+            {
+              "consumerName": "Foo",
+              "providerName": "Bar",
+              "specification": "pact",
+              "contentType": "application/json",
+              "content": "eyJjb25zdW1lciI6eyJuYW1lIjoiRm9vIn0sInByb3ZpZGVyIjp7Im5hbWUiOiJCYXIifSwiaW50ZXJhY3Rpb25zIjpbeyJkZXNjcmlwdGlvbiI6ImFuIGV4YW1wbGUgcmVxdWVzdCIsInByb3ZpZGVyU3RhdGUiOiJhIHByb3ZpZGVyIHN0YXRlIiwicmVxdWVzdCI6eyJtZXRob2QiOiJHRVQiLCJwYXRoIjoiLyIsImhlYWRlcnMiOnt9fSwicmVzcG9uc2UiOnsic3RhdHVzIjoyMDAsImhlYWRlcnMiOnsiQ29udGVudC1UeXBlIjoiYXBwbGljYXRpb24vaGFsK2pzb24ifX19XSwibWV0YWRhdGEiOnsicGFjdFNwZWNpZmljYXRpb24iOnsidmVyc2lvbiI6IjIuMC4wIn19fQ==",
+              "onConflict": "merge"
+            }
+          ]
+        }
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "Content-Type": "application/hal+json;charset=utf-8"
+        },
+        "body": {
+          "_embedded": {
+            "pacticipant": {
+              "name": "Foo"
+            },
+            "version": {
+              "number": "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30",
+              "buildUrl": "http://build"
+            }
+          },
+          "logs": [
+            {
+              "level": "info",
+              "message": "some message"
+            }
+          ],
+          "_links": {
+            "pb:pacticipant-version-tags": [
+              {
+                "name": "dev"
+              }
+            ],
+            "pb:contracts": [
+              {
+                "href": "http://some-pact"
+              }
+            ]
+          }
+        },
+        "matchingRules": {
+          "$.body.logs": {
+            "min": 1
+          },
+          "$.body.logs[*].*": {
+            "match": "type"
+          },
+          "$.body._links.pb:contracts[0].href": {
+            "match": "type"
+          }
+        }
+      }
+    },
     {
       "description": "a request for the index resource",
       "providerState": "the pb:pacticipant-version and pb:environments relations exist in the index resource",
@@ -1717,6 +1719,7 @@
           "Accept": "application/hal+json"
         },
         "body": {
+          "applicationInstance": "blue",
           "target": "blue"
         }
       },

data/spec/service_providers/publish_pacts_spec.rb

@@ -1,9 +1,7 @@
 require 'pact_broker/client/publish_pacts'
 require 'service_providers/pact_helper'
 
-publish_contracts_feature_on = ENV.fetch('PACT_BROKER_FEATURES', '').include?("publish_contracts")
-
-RSpec.describe "publishing contracts", pact: true, skip: !publish_contracts_feature_on do
+RSpec.describe "publishing contracts", 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)
@@ -27,7 +25,7 @@ RSpec.describe "publishing contracts", pact: true, skip: !publish_contracts_feat
   end
   let(:pact_file_path_1) { "spec/fixtures/foo-bar.json" }
   let(:pact_file_paths) { [pact_file_path_1] }
-  let(:options) { {} }
+  let(:options) { { merge: true } }
   let(:pact_broker_client_options) { {} }
   let(:expected_content) { Base64.strict_encode64(JSON.parse(File.read(pact_file_path_1)).to_json) }
   let(:request_body) do
@@ -44,8 +42,7 @@ RSpec.describe "publishing contracts", pact: true, skip: !publish_contracts_feat
           specification: "pact",
           contentType: "application/json",
           content: expected_content,
-          writeMode: "overwrite",
-          onConflict: "overwrite"
+          onConflict: "merge"
         }
       ]
     }

data/spec/service_providers/record_deployment_spec.rb

@@ -9,13 +9,13 @@ RSpec.describe "recording a deployment", pact: true do
   let(:version_number) { "5556b8149bf8bac76bc30f50a8a2dd4c22c85f30" }
   let(:environment_name) { "test" }
   let(:output) { "text" }
-  let(:target) { "blue" }
+  let(:application_instance) { "blue" }
   let(:params) do
     {
       pacticipant_name: pacticipant_name,
       version_number: version_number,
       environment_name: environment_name,
-      target: target
+      application_instance: application_instance
     }
   end
   let(:options) do
@@ -139,14 +139,15 @@ RSpec.describe "recording a deployment", pact: true do
         path: "/HAL-REL-PLACEHOLDER-PB-RECORD-DEPLOYMENT-FOO-5556B8149BF8BAC76BC30F50A8A2DD4C22C85F30-TEST",
         headers: post_request_headers,
         body: {
-          target: target
+          applicationInstance: application_instance,
+          target: application_instance
         }
       )
       .will_respond_with(
         status: 201,
         headers: pact_broker_response_headers,
         body: {
-          target: target
+          target: application_instance
         }
       )
   end
@@ -160,14 +161,14 @@ RSpec.describe "recording a deployment", pact: true do
 
     it "returns a success message" do
       expect(subject.success).to be true
-      expect(subject.message).to include "Recorded deployment of Foo version 5556b8149bf8bac76bc30f50a8a2dd4c22c85f30 to test environment (target blue) in the Pact Broker."
+      expect(subject.message).to include "Recorded deployment of Foo version 5556b8149bf8bac76bc30f50a8a2dd4c22c85f30 to test environment (application instance blue) in the Pact Broker."
     end
 
     context "when the output is json" do
       let(:output) { "json" }
 
       it "returns the JSON payload" do
-        expect(JSON.parse(subject.message)).to eq "target" => target
+        expect(JSON.parse(subject.message)).to eq "target" => application_instance
       end
     end
   end

data/spec/service_providers/record_undeployment_spec.rb

@@ -8,12 +8,12 @@ RSpec.describe "recording an undeployment", pact: true do
   let(:pacticipant_name) { "Foo" }
   let(:environment_name) { "test" }
   let(:output) { "text" }
-  let(:target) { "customer-1" }
+  let(:application_instance) { "customer-1" }
   let(:params) do
     {
       pacticipant_name: pacticipant_name,
       environment_name: environment_name,
-      target: target
+      application_instance: application_instance
     }
   end
   let(:options) do
@@ -100,7 +100,7 @@ RSpec.describe "recording an undeployment", pact: true do
           _embedded: {
             deployedVersions: [
               {
-                target: target,
+                target: application_instance,
                 _links: {
                   self: {
                     href: Pact.term(pact_broker.mock_service_base_url + deployed_version_placeholder_path, /^http/)
@@ -150,7 +150,7 @@ RSpec.describe "recording an undeployment", pact: true do
 
     it "returns a success message" do
       expect(subject.success).to be true
-      expect(subject.message).to include "Recorded undeployment of Foo version 2 from test environment (target customer-1) in the Pact Broker"
+      expect(subject.message).to include "Recorded undeployment of Foo version 2 from test environment (application instance customer-1) in the Pact Broker"
     end
 
     context "when the output is json" do