Skip to content

Commit

Permalink
Merge pull request #293 from pact-foundation/fix/upgrade-grpc-plugin
Browse files Browse the repository at this point in the history
* fix: upgrade to latest grpc plugin to fix issue with key matching
* fix: upgrade to latest ffi 0.4.5
* fix: upgrade to latest grpc/protobuf plugin 0.3.1
* chore: update to temporarily patched matt plugin
  • Loading branch information
mefellows authored Jun 5, 2023
2 parents f3a50e6 + e1c5e62 commit 765149f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ 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
~/.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\
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc/grpc_consumer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/consumer_plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/provider_plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
2 changes: 1 addition & 1 deletion installer/installer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}
Expand Down

0 comments on commit 765149f

Please sign in to comment.