pact-foundation · YOU54F · Sep 29, 2023 · Sep 29, 2023 · Sep 29, 2023 · Sep 29, 2023
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -0,0 +1,31 @@
+test: &TEST
+  test_script: make test
+
+linux_arm64_task:
+  env:
+    SKIP_PLUGIN_AVRO: "true"
+    matrix:
+      - VERSION: 1.19
+      - VERSION: 1.20
+      - VERSION: 1.21
+  # name: Tests (Go $VERSION)
+  arm_container:
+    image: golang:$VERSION
+  <<: *TEST
+
+macos_arm64_task:
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-ventura-base:latest
+  golang_pre_req_script: brew install go@$VERSION
+  cirrus_cli_pre_req_script: chmod +x scripts/*.sh
+  plugin_protobuf_pre_req_script: brew install protobuf
+  # plugin_avro_pre_req_script: brew install openjdk@17 && java --version
+  env:
+    PATH: "/opt/homebrew/opt/go@$VERSION/bin:$PATH" # Needed golang
+    # PATH: "/opt/homebrew/opt/openjdk@17/bin:$PATH" # Needed for Avro Plugin
+    SKIP_PLUGIN_AVRO: "true"
+    matrix:
+      - VERSION: 1.19
+      - VERSION: 1.20
+      - VERSION: 1.21
+  <<: *TEST
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -57,3 +57,25 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         parallel-finished: true
+
+  test-other-os:
+    strategy:
+      matrix:
+        go-version: [ # https://endoflife.date/go
+                    1.19.x, 
+                    1.20.x,
+                    1.21.x
+                    ]
+        os: [macos-latest,windows-latest]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
+      - run: make test
+        env:
+          SKIP_PLUGIN_AVRO: true
diff --git a/Makefile b/Makefile
@@ -5,6 +5,10 @@ TEST?=./...
 DOCKER_HOST_HTTP?="http://host.docker.internal"
 PACT_CLI="docker run --rm -v ${PWD}:${PWD} -e PACT_BROKER_BASE_URL=$(DOCKER_HOST_HTTP) -e PACT_BROKER_USERNAME -e PACT_BROKER_PASSWORD pactfoundation/pact-cli"
 
+ifeq ($(OS),Windows_NT)
+	EXT=.exe
+endif
+
 ci:: docker deps clean bin test pact
 
 # Run the ci target from a developer machine with the environment variables
@@ -41,12 +45,16 @@ deps: download_plugins
 	cd -
 
 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.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
+	if [ -z $$SKIP_PLUGINS ]; then\
+		echo "--- 🐿  Installing plugins";\
+		./scripts/install-cli.sh;\
+		$$HOME/.pact/bin/pact-plugin-cli$(EXT) -y install https://github.com/pactflow/pact-protobuf-plugin/releases/tag/v-0.3.4;\
+		$$HOME/.pact/bin/pact-plugin-cli$(EXT) -y install https://github.com/you54f/pact-plugins/releases/tag/csv-plugin-0.0.4;\
+		$$HOME/.pact/bin/pact-plugin-cli$(EXT) -y install https://github.com/mefellows/pact-matt-plugin/releases/tag/v0.0.9;\
+		if [ -z $$SKIP_PLUGIN_AVRO ]; then\
+			$$HOME/.pact/bin/pact-plugin-cli$(EXT) -y install https://github.com/austek/pact-avro-plugin/releases/tag/v0.0.3; \
+		fi \
+	fi
 
 cli:
 	@if [ ! -d pact/bin ]; then\

diff --git a/command/root.go b/command/root.go
@@ -3,7 +3,7 @@ package command
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 
@@ -50,6 +50,6 @@ func setLogLevel(verbose bool, level string) {
 	log.SetOutput(filter)
 
 	if !verbose {
-		log.SetOutput(ioutil.Discard)
+		log.SetOutput(io.Discard)
 	}
 }
diff --git a/command/root_test.go b/command/root_test.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"strings"
@@ -55,7 +55,7 @@ func captureOutput(action func()) string {
 	action()
 
 	w.Close()
-	out, _ := ioutil.ReadAll(r)
+	out, _ := io.ReadAll(r)
 	os.Stderr = rescueStderr
 
 	return strings.TrimSpace(string(out))

diff --git a/doc.go b/doc.go
@@ -207,7 +207,7 @@ An example route using the standard Go http package might look like this:
     // Retrieve the Provider State
     var state types.ProviderState
 
-    body, _ := ioutil.ReadAll(req.Body)
+    body, _ := io.ReadAll(req.Body)
     req.Body.Close()
     json.Unmarshal(body, &state)
 

diff --git a/examples/avro/avro_consumer_test.go b/examples/avro/avro_consumer_test.go
@@ -5,7 +5,7 @@ package avro
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
@@ -82,7 +82,7 @@ func callServiceHTTP(msc consumer.MockServerConfig) (*User, error) {
 		return nil, err
 	}
 
-	bytes, err := ioutil.ReadAll(res.Body)
+	bytes, err := io.ReadAll(res.Body)
 
 	if err != nil {
 		return nil, err

diff --git a/examples/avro/codec.go b/examples/avro/codec.go
@@ -1,13 +1,13 @@
 package avro
 
 import (
-	"io/ioutil"
-
+
+	"os"
 	"github.com/linkedin/goavro/v2"
 )
 
 func getCodec() *goavro.Codec {
-	schema, err := ioutil.ReadFile("user.avsc")
+	schema, err := os.ReadFile("user.avsc")
 	if err != nil {
 		panic(err)
 	}

diff --git a/examples/consumer_v2_test.go b/examples/consumer_v2_test.go
@@ -6,7 +6,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -188,7 +188,7 @@ var rawTest = func(query string) func(config consumer.MockServerConfig) error {
 				Path:     "/foobar",
 				RawQuery: query,
 			},
-			Body:   ioutil.NopCloser(strings.NewReader(`{"id": 27, "name":"billy", "lastName":"sampson", "datetime":"2021-01-01T08:00:45"}`)),
+			Body:   io.NopCloser(strings.NewReader(`{"id": 27, "name":"billy", "lastName":"sampson", "datetime":"2021-01-01T08:00:45"}`)),
 			Header: make(http.Header),
 		}
 

diff --git a/examples/grpc/routeguide/server/server.go b/examples/grpc/routeguide/server/server.go
@@ -28,7 +28,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 	"log"
 	"math"
 	"net"
@@ -155,7 +155,7 @@ func (s *routeGuideServer) loadFeatures(filePath string) {
 	var data []byte
 	if filePath != "" {
 		var err error
-		data, err = ioutil.ReadFile(filePath)
+		data, err = os.ReadFile(filePath)
 		if err != nil {
 			log.Fatalf("Failed to load default features: %v", err)
 		}

diff --git a/examples/pacts/AvroConsumer-AvroProvider.json b/examples/pacts/AvroConsumer-AvroProvider.json
@@ -0,0 +1,81 @@
+{
+  "consumer": {
+    "name": "AvroConsumer"
+  },
+  "interactions": [
+    {
+      "description": "A request to do get some Avro stuff",
+      "pending": false,
+      "pluginConfiguration": {
+        "avro": {
+          "record": "User",
+          "schemaKey": "1184dbf3292cee8bc7390762dd15fc52"
+        }
+      },
+      "request": {
+        "method": "GET",
+        "path": "/avro"
+      },
+      "response": {
+        "body": {
+          "content": "AghtYXR0",
+          "contentType": "avro/binary;record=User",
+          "contentTypeHint": "BINARY",
+          "encoded": "base64"
+        },
+        "headers": {
+          "content-type": [
+            "avro/binary"
+          ]
+        },
+        "matchingRules": {
+          "body": {
+            "$.id": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "number"
+                }
+              ]
+            },
+            "$.username": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "notEmpty"
+                }
+              ]
+            }
+          }
+        },
+        "status": 200
+      },
+      "transport": "http",
+      "type": "Synchronous/HTTP"
+    }
+  ],
+  "metadata": {
+    "pactRust": {
+      "ffi": "0.4.5",
+      "mockserver": "1.1.1",
+      "models": "1.1.2"
+    },
+    "pactSpecification": {
+      "version": "4.0"
+    },
+    "plugins": [
+      {
+        "configuration": {
+          "1184dbf3292cee8bc7390762dd15fc52": {
+            "avroSchema": "{\"type\":\"record\",\"name\":\"User\",\"namespace\":\"io.pact\",\"fields\":[{\"name\":\"id\",\"type\":\"long\"},{\"name\":\"username\",\"type\":\"string\"}]}"
+          }
+        },
+        "name": "avro",
+        "version": "0.0.4"
+      }
+    ]
+  },
+  "provider": {
+    "name": "AvroProvider"
+  }
+}
diff --git a/examples/pacts/MattConsumer-MattProvider.json b/examples/pacts/MattConsumer-MattProvider.json
@@ -5,7 +5,6 @@
   "interactions": [
     {
       "description": "A request to do a matt",
-      "key": "c544877c9301bb17",
       "pending": false,
       "request": {
         "body": {
@@ -42,9 +41,9 @@
   ],
   "metadata": {
     "pactRust": {
-      "ffi": "0.3.18",
-      "mockserver": "0.9.8",
-      "models": "1.0.2"
+      "ffi": "0.4.5",
+      "mockserver": "1.1.1",
+      "models": "1.1.2"
     },
     "pactSpecification": {
       "version": "4.0"
@@ -53,7 +52,7 @@
       {
         "configuration": {},
         "name": "matt",
-        "version": "0.0.7"
+        "version": "0.0.9"
       }
     ]
   },

diff --git a/examples/pacts/PactGoProductAPIConsumer-PactGoProductAPI.json b/examples/pacts/PactGoProductAPIConsumer-PactGoProductAPI.json
@@ -36,9 +36,9 @@
   ],
   "metadata": {
     "pactRust": {
-      "ffi": "0.3.18",
-      "mockserver": "0.9.8",
-      "models": "1.0.2"
+      "ffi": "0.4.5",
+      "mockserver": "1.1.1",
+      "models": "1.1.2"
     },
     "pactSpecification": {
       "version": "2.0.0"

diff --git a/examples/pacts/PactGoV2Consumer-V2Provider.json b/examples/pacts/PactGoV2Consumer-V2Provider.json
@@ -88,9 +88,9 @@
   ],
   "metadata": {
     "pactRust": {
-      "ffi": "0.3.18",
-      "mockserver": "0.9.8",
-      "models": "1.0.2"
+      "ffi": "0.4.5",
+      "mockserver": "1.1.1",
+      "models": "1.1.2"
     },
     "pactSpecification": {
       "version": "2.0.0"

diff --git a/examples/pacts/PactGoV2ConsumerAllInOne-V2Provider.json b/examples/pacts/PactGoV2ConsumerAllInOne-V2Provider.json
@@ -72,9 +72,9 @@
   ],
   "metadata": {
     "pactRust": {
-      "ffi": "0.3.18",
-      "mockserver": "0.9.8",
-      "models": "1.0.2"
+      "ffi": "0.4.5",
+      "mockserver": "1.1.1",
+      "models": "1.1.2"
     },
     "pactSpecification": {
       "version": "2.0.0"

diff --git a/examples/pacts/PactGoV2ConsumerMatch-V2ProviderMatch.json b/examples/pacts/PactGoV2ConsumerMatch-V2ProviderMatch.json
@@ -84,9 +84,9 @@
   ],
   "metadata": {
     "pactRust": {
-      "ffi": "0.3.18",
-      "mockserver": "0.9.8",
-      "models": "1.0.2"
+      "ffi": "0.4.5",
+      "mockserver": "1.1.1",
+      "models": "1.1.2"
     },
     "pactSpecification": {
       "version": "2.0.0"

diff --git a/examples/pacts/PactGoV3Consumer-V3Provider.json b/examples/pacts/PactGoV3Consumer-V3Provider.json
@@ -278,9 +278,9 @@
   ],
   "metadata": {
     "pactRust": {
-      "ffi": "0.3.18",
-      "mockserver": "0.9.8",
-      "models": "1.0.2"
+      "ffi": "0.4.5",
+      "mockserver": "1.1.1",
+      "models": "1.1.2"
     },
     "pactSpecification": {
       "version": "3.0.0"

diff --git a/examples/pacts/PactGoV3MessageConsumer-V3MessageProvider.json b/examples/pacts/PactGoV3MessageConsumer-V3MessageProvider.json
@@ -48,8 +48,8 @@
   ],
   "metadata": {
     "pactRust": {
-      "ffi": "0.3.18",
-      "models": "1.0.2"
+      "ffi": "0.4.5",
+      "models": "1.1.2"
     },
     "pactSpecification": {
       "version": "3.0.0"