From ce864c0dda9939abdc49abf2ae8ae9090977c414 Mon Sep 17 00:00:00 2001 From: Matt Fellows Date: Mon, 5 Jun 2023 21:54:27 +1000 Subject: [PATCH 1/4] fix: upgrade to latest grpc plugin to fix issue with key matching --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b7a6d5d09..81f9b5bd8 100755 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ deps: download_plugins download_plugins: @echo "--- 🐿 Installing plugins"; \ ./scripts/install-cli.sh - ~/.pact/bin/pact-plugin-cli -y install https://github.com/pactflow/pact-protobuf-plugin/releases/tag/v-0.3.0 + ~/.pact/bin/pact-plugin-cli -y install https://github.com/pactflow/pact-protobuf-plugin/releases/tag/v-0.3.1 ~/.pact/bin/pact-plugin-cli -y install https://github.com/pact-foundation/pact-plugins/releases/tag/csv-plugin-0.0.1 ~/.pact/bin/pact-plugin-cli -y install https://github.com/mefellows/pact-matt-plugin/releases/tag/v0.0.7 From 2b3206fd1eb7365d92f9e9cc788e274880b56c20 Mon Sep 17 00:00:00 2001 From: Matt Fellows Date: Mon, 5 Jun 2023 21:54:40 +1000 Subject: [PATCH 2/4] fix: upgrade to latest ffi 0.4.5 --- installer/installer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/installer.go b/installer/installer.go index c1dd8c302..97b995c21 100644 --- a/installer/installer.go +++ b/installer/installer.go @@ -377,7 +377,7 @@ const ( var packages = map[string]packageInfo{ FFIPackage: { libName: "libpact_ffi", - version: "0.4.4", + version: "0.4.5", semverRange: ">= 0.4.0, < 1.0.0", }, } From 981b5292e6057708c3c578c7f46e937bf0cceb47 Mon Sep 17 00:00:00 2001 From: Matt Fellows Date: Mon, 5 Jun 2023 22:40:29 +1000 Subject: [PATCH 3/4] fix: upgrade to latest grpc/protobuf plugin 0.3.1 --- examples/grpc/grpc_consumer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/grpc/grpc_consumer_test.go b/examples/grpc/grpc_consumer_test.go index 4b5faf2d9..0e8ed36d2 100644 --- a/examples/grpc/grpc_consumer_test.go +++ b/examples/grpc/grpc_consumer_test.go @@ -53,7 +53,7 @@ func TestGrpcInteraction(t *testing.T) { Given("feature 'Big Tree' exists"). UsingPlugin(message.PluginConfig{ Plugin: "protobuf", - Version: "0.3.0", + Version: "0.3.1", }). WithContents(grpcInteraction, "application/protobuf"). StartTransport("grpc", "127.0.0.1", nil). // For plugin tests, we can't assume if a transport is needed, so this is optional From e1c5e62373e4196707098193375b004987a1c8e6 Mon Sep 17 00:00:00 2001 From: Matt Fellows Date: Mon, 5 Jun 2023 22:40:48 +1000 Subject: [PATCH 4/4] chore: update to temporarily patched matt plugin --- Makefile | 2 +- examples/plugin/consumer_plugin_test.go | 4 ++-- examples/plugin/provider_plugin_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 81f9b5bd8..1fecdca2e 100755 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ download_plugins: ./scripts/install-cli.sh ~/.pact/bin/pact-plugin-cli -y install https://github.com/pactflow/pact-protobuf-plugin/releases/tag/v-0.3.1 ~/.pact/bin/pact-plugin-cli -y install https://github.com/pact-foundation/pact-plugins/releases/tag/csv-plugin-0.0.1 - ~/.pact/bin/pact-plugin-cli -y install https://github.com/mefellows/pact-matt-plugin/releases/tag/v0.0.7 + ~/.pact/bin/pact-plugin-cli -y install https://github.com/mefellows/pact-matt-plugin/releases/tag/v0.0.9 cli: @if [ ! -d pact/bin ]; then\ diff --git a/examples/plugin/consumer_plugin_test.go b/examples/plugin/consumer_plugin_test.go index dddf5b695..303172d9a 100644 --- a/examples/plugin/consumer_plugin_test.go +++ b/examples/plugin/consumer_plugin_test.go @@ -42,7 +42,7 @@ func TestHTTPPlugin(t *testing.T) { UponReceiving("A request to do a matt"). UsingPlugin(consumer.PluginConfig{ Plugin: "matt", - Version: "0.0.1", + Version: "0.0.9", }). WithRequest("POST", "/matt", func(req *consumer.V4InteractionWithPluginRequestBuilder) { req.PluginContents("application/matt", mattRequest) @@ -74,7 +74,7 @@ func TestTCPPlugin(t *testing.T) { Given("the world exists"). UsingPlugin(message.PluginConfig{ Plugin: "matt", - Version: "0.0.1", + Version: "0.0.9", }). WithContents(mattMessage, "application/matt"). StartTransport("matt", "127.0.0.1", nil). // For plugin tests, we can't assume if a transport is needed, so this is optional diff --git a/examples/plugin/provider_plugin_test.go b/examples/plugin/provider_plugin_test.go index 680a7c15d..c7f17d737 100644 --- a/examples/plugin/provider_plugin_test.go +++ b/examples/plugin/provider_plugin_test.go @@ -38,7 +38,7 @@ func TestPluginProvider(t *testing.T) { // Verify the Provider with local Pact Files err := verifier.VerifyProvider(t, provider.VerifyRequest{ ProviderBaseURL: fmt.Sprintf("http://127.0.0.1:%d", httpPort), - Provider: "provider", + // Provider: "provider", PactFiles: []string{ filepath.ToSlash(fmt.Sprintf("%s/MattConsumer-MattProvider.json", pactDir)), filepath.ToSlash(fmt.Sprintf("%s/matttcpconsumer-matttcpprovider.json", pactDir)),