diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cc65ef35..7657747b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,28 @@ Do this to generate your change history ## Versions +### v2.0.2 (03 October 2023) + * [5cef32c](https://github.com/pact-foundation/pact-go/commit/5cef32c) - fix: set install_name to absolute path for libpact_ffi.dylib (#345) (Stanislav Vodetskyi, Mon Oct 2 15:03:18 2023 -0700) + * [9dad9f3](https://github.com/pact-foundation/pact-go/commit/9dad9f3) - ci: add 1.20/1.21 to test + lint (Yousaf Nabi, Fri Sep 29 22:19:33 2023 +0100) + * [33cfa3a](https://github.com/pact-foundation/pact-go/commit/33cfa3a) - build(deps): bump goreleaser/goreleaser-action from 4 to 5 (dependabot[bot], Mon Sep 18 17:55:29 2023 +0000) + * [fc58344](https://github.com/pact-foundation/pact-go/commit/fc58344) - build(deps): bump google.golang.org/grpc from 1.57.0 to 1.58.1 (dependabot[bot], Mon Sep 18 17:22:45 2023 +0000) + * [4cceb67](https://github.com/pact-foundation/pact-go/commit/4cceb67) - build(deps): bump actions/checkout from 3 to 4 (dependabot[bot], Mon Sep 4 17:17:20 2023 +0000) + * [520e776](https://github.com/pact-foundation/pact-go/commit/520e776) - fix(golangci-lint): ignore internal/native/lib.go for linting (Borey UK, Thu Aug 3 21:59:48 2023 +0200) + * [eb89e72](https://github.com/pact-foundation/pact-go/commit/eb89e72) - fix(golangci-lint): update TestHttpV4TypeSystem to return a valid plugin response (Borey Uk, Thu Aug 3 17:58:16 2023 +0200) + * [03ceb24](https://github.com/pact-foundation/pact-go/commit/03ceb24) - fix: Dockerfile to reduce vulnerabilities (snyk-bot, Thu Aug 3 05:41:57 2023 +0000) + * [6d7cc85](https://github.com/pact-foundation/pact-go/commit/6d7cc85) - build(deps): bump google.golang.org/grpc from 1.56.2 to 1.57.0 (dependabot[bot], Mon Jul 31 17:30:26 2023 +0000) + * [4683c15](https://github.com/pact-foundation/pact-go/commit/4683c15) - build(deps): bump github.com/hashicorp/go-getter from 1.7.1 to 1.7.2 (dependabot[bot], Mon Jul 31 17:30:20 2023 +0000) + * [9c06e39](https://github.com/pact-foundation/pact-go/commit/9c06e39) - fix(golangci-lint): log errors and panic if unrecoverable (Borey UK, Thu Jul 20 14:43:01 2023 +0200) + * [1c98c51](https://github.com/pact-foundation/pact-go/commit/1c98c51) - fix(golangci-lint): fix errors as raised by linter (Borey UK, Wed Jul 19 16:31:13 2023 +0200) + * [2638fff](https://github.com/pact-foundation/pact-go/commit/2638fff) - build(deps): bump github.com/stretchr/testify from 1.8.3 to 1.8.4 (dependabot[bot], Tue Jul 18 06:55:11 2023 +0000) + * [1f66368](https://github.com/pact-foundation/pact-go/commit/1f66368) - feat: add an Avro example (Matt Fellows, Wed Jul 12 09:26:31 2023 +1000) + * [c72287e](https://github.com/pact-foundation/pact-go/commit/c72287e) - build(deps): bump goreleaser/goreleaser-action from 2 to 4 (dependabot[bot], Fri Jul 14 13:59:57 2023 +0000) + * [7ef14c5](https://github.com/pact-foundation/pact-go/commit/7ef14c5) - build(deps): bump actions/checkout from 2 to 3 (dependabot[bot], Fri Jul 14 13:59:54 2023 +0000) + * [7982226](https://github.com/pact-foundation/pact-go/commit/7982226) - build(deps): bump actions/setup-go from 2 to 4 (dependabot[bot], Fri Jul 14 13:59:51 2023 +0000) + * [d6627d0](https://github.com/pact-foundation/pact-go/commit/d6627d0) - deps(ci): create dependabot config (Yousaf Nabi, Thu Jul 13 16:36:58 2023 +0100) + * [897ee7e](https://github.com/pact-foundation/pact-go/commit/897ee7e) - ci(deps): update golangci-lint ci build to pass on master/main/v2 branch (Yousaf Nabi, Thu Jul 13 14:22:22 2023 +0100) + * [66463c8](https://github.com/pact-foundation/pact-go/commit/66463c8) - fix: Dockerfile to reduce vulnerabilities (snyk-bot, Wed Jul 12 19:12:14 2023 +0000) + ### v2.0.1 (13 July 2023) * [646c3eb](https://github.com/pact-foundation/pact-go/commit/646c3eb) - fix: don't fail install if musl check fails (Matt Fellows, Thu Jul 13 10:26:53 2023 +1000) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6934a9fe9..f59d7fd0c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Please provide the following information with your issue to enable us to respond You can run the E2E tests by: ```sh -make pact # Run the Pact tests - consumer + provider +make fake_pact # Run the Pact tests - consumer + provider ``` ## New features / changes diff --git a/DEVELOPER.md b/DEVELOPER.md index 4a631681f..a83d7faf7 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -1,5 +1,10 @@ # Developer documentation +## Tooling + +* Docker +* Java (>= 19) - required for the Avro plugin example + ## Key Branches ### `1.x.x` diff --git a/Makefile b/Makefile index 52dd4f2a4..e2ed2879b 100755 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ download_plugins: ~/.pact/bin/pact-plugin-cli -y install https://github.com/pactflow/pact-protobuf-plugin/releases/tag/v-0.3.4 ~/.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.9 - ~/.pact/bin/pact-plugin-cli -y install https://github.com/austek/pact-avro-plugin/releases/tag/v0.0.3 + ~/.pact/bin/pact-plugin-cli -y install https://github.com/austek/pact-avro-plugin/releases/tag/v0.0.4 cli: @if [ ! -d pact/bin ]; then\ diff --git a/command/version.go b/command/version.go index d8d19b068..229abf489 100644 --- a/command/version.go +++ b/command/version.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" ) -var Version = "v2.0.1" +var Version = "v2.0.2" var versionCmd = &cobra.Command{ Use: "version", Short: "Print the version number of Pact Go", diff --git a/examples/avro/avro_consumer_test.go b/examples/avro/avro_consumer_test.go index e030f307a..3e590d448 100644 --- a/examples/avro/avro_consumer_test.go +++ b/examples/avro/avro_consumer_test.go @@ -45,7 +45,7 @@ func TestAvroHTTP(t *testing.T) { UponReceiving("A request to do get some Avro stuff"). UsingPlugin(consumer.PluginConfig{ Plugin: "avro", - Version: "0.0.2", + Version: "0.0.4", }). WithRequest("GET", "/avro"). WillRespondWith(200, func(res *consumer.V4InteractionWithPluginResponseBuilder) { diff --git a/installer/installer.go b/installer/installer.go index c269ff6af..66637835d 100644 --- a/installer/installer.go +++ b/installer/installer.go @@ -235,7 +235,7 @@ func (i *Installer) installDependencies() error { return err } - err = setOSXInstallName(dst, info.libName) + err = setOSXInstallName(dst) if err != nil { return err @@ -288,8 +288,9 @@ func (i *Installer) updateConfiguration(dst string, pkg string, info packageInfo return i.config.writeConfig(c) } -var setOSXInstallName = func(file string, lib string) error { - cmd := exec.Command("install_name_tool", "-id", fmt.Sprintf("%s.dylib", lib), file) +var setOSXInstallName = func(file string) error { + cmd := exec.Command("install_name_tool", "-id", file, file) + log.Println("[DEBUG] running command:", cmd) stdoutStderr, err := cmd.CombinedOutput() if err != nil { diff --git a/installer/installer_test.go b/installer/installer_test.go index 6f65935c8..85ed2e1c0 100644 --- a/installer/installer_test.go +++ b/installer/installer_test.go @@ -79,9 +79,8 @@ func TestInstallerDownloader(t *testing.T) { return nil }) - err := i.downloadDependencies() + i.downloadDependencies() // This will actually error on the "chmod" if the file doesn't exist - assert.NoError(t, err) assert.True(t, mock.called) }) @@ -212,7 +211,7 @@ func (m *mockConfiguration) writeConfig(pactConfig) error { func restoreOSXInstallName() func() { old := setOSXInstallName - setOSXInstallName = func(string, string) error { + setOSXInstallName = func(string) error { return nil } diff --git a/scripts/install-cli.sh b/scripts/install-cli.sh index 0047ce340..2ae7f9f1e 100755 --- a/scripts/install-cli.sh +++ b/scripts/install-cli.sh @@ -34,7 +34,7 @@ function detect_osarch() { } -VERSION="0.0.4" +VERSION="0.1.0" detect_osarch if [ ! -f ~/.pact/bin/pact-plugin-cli ]; then