chore: upgrade to Go 1.19 (#3382)

Update some tests due to changes of new 1.19 SDK Signed-off-by: Abdulbois <[email protected]> Signed-off-by: Abdulbois <[email protected]> Co-authored-by: Troy Ronda <[email protected]>
hyperledger-archives · Sep 27, 2022 · 3045fc6 · 3045fc6
1 parent 52cdf1a
commit 3045fc6
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 55 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,10 +19,10 @@ jobs:
         os: [ubuntu-18.04, macOS-10.15]
     steps:
 
-    - name: Setup Go 1.17
+    - name: Setup Go 1.19
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.19
       id: go
 
     - uses: actions/checkout@v3
@@ -49,10 +49,10 @@ jobs:
       image: ghcr.io/hyperledger/ursa-wrapper-go/uwg-build # a container with libursa installed
     timeout-minutes: 15
     steps:
-      - name: Setup Go 1.17
+      - name: Setup Go 1.19
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.19
         id: go
 
       - uses: actions/checkout@v3
@@ -67,10 +67,10 @@ jobs:
     timeout-minutes: 15
     steps:
 
-      - name: Setup Go 1.17
+      - name: Setup Go 1.19
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.19
         id: go
 
       - uses: actions/checkout@v3
@@ -85,10 +85,10 @@ jobs:
     timeout-minutes: 10
     steps:
 
-      - name: Setup Go 1.17
+      - name: Setup Go 1.19
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.19
         id: go
 
       - uses: actions/checkout@v3
@@ -103,10 +103,10 @@ jobs:
     timeout-minutes: 45
     steps:
 
-      - name: Setup Go 1.17
+      - name: Setup Go 1.19
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.19
         id: go
 
       - name: Setup Node.js
@@ -142,10 +142,10 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-18.04
     steps:
-      - name: Setup Go 1.17
+      - name: Setup Go 1.19
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.19
 
       - uses: actions/checkout@v3
 
@@ -160,10 +160,10 @@ jobs:
     runs-on: ubuntu-18.04
     timeout-minutes: 10
     steps:
-      - name: Setup Go 1.17
+      - name: Setup Go 1.19
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.19
         id: go
 
       - name: Setup Node.js

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -26,10 +26,10 @@ jobs:
     timeout-minutes: 10
     steps:
 
-    - name: Setup Go 1.17
+    - name: Setup Go 1.19
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.19
       id: go
 
     - name: Setup node

diff --git a/cmd/aries-agent-mobile/go.mod b/cmd/aries-agent-mobile/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/hyperledger/aries-framework-go/cmd/aries-agent-mobile
 
-go 1.17
+go 1.19
 
 require (
 	github.com/google/uuid v1.3.0

diff --git a/cmd/aries-agent-rest/go.mod b/cmd/aries-agent-rest/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/hyperledger/aries-framework-go/cmd/aries-agent-rest
 
-go 1.17
+go 1.19
 
 require (
 	github.com/cenkalti/backoff/v4 v4.1.2

diff --git a/cmd/aries-js-worker/go.mod b/cmd/aries-js-worker/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/hyperledger/aries-framework-go/cmd/aries-js-worker
 
-go 1.17
+go 1.19
 
 require (
 	github.com/google/uuid v1.3.0

diff --git a/component/storage/edv/go.mod b/component/storage/edv/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/hyperledger/aries-framework-go/component/storage/edv
 
-go 1.17
+go 1.19
 
 require (
 	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce

diff --git a/component/storage/indexeddb/go.mod b/component/storage/indexeddb/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/hyperledger/aries-framework-go/component/storage/indexeddb
 
-go 1.17
+go 1.19
 
 require (
 	github.com/google/uuid v1.1.2

diff --git a/component/storage/leveldb/go.mod b/component/storage/leveldb/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/hyperledger/aries-framework-go/component/storage/leveldb
 
-go 1.17
+go 1.19
 
 require (
 	github.com/google/uuid v1.1.2

diff --git a/component/storageutil/go.mod b/component/storageutil/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/hyperledger/aries-framework-go/component/storageutil
 
-go 1.17
+go 1.19
 
 require (
 	github.com/google/uuid v1.1.2

diff --git a/go.mod b/go.mod
@@ -64,4 +64,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-go 1.17
+go 1.19
diff --git a/pkg/crypto/webkms/remotecrypto_test.go b/pkg/crypto/webkms/remotecrypto_test.go
@@ -19,6 +19,7 @@ import (
 	"net"
 	"net/http"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -84,8 +85,8 @@ func TestEncryptDecrypt(t *testing.T) {
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		_, _, err = tmpCrypto.Encrypt(plaintext, aad, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting Encrypt plaintext failed [%s, Post \"%s\": x509: "+
-			"certificate signed by unknown authority", defaultKeyURL+encryptURI, defaultKeyURL+encryptURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting Encrypt plaintext failed [%s, Post \"%s\": %s",
+			defaultKeyURL+encryptURI, defaultKeyURL+encryptURI, getCertsErrorSubText()))
 
 		badURL := "``#$%"
 		_, _, err = tmpCrypto.Encrypt(plaintext, aad, badURL)
@@ -99,8 +100,8 @@ func TestEncryptDecrypt(t *testing.T) {
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		_, err = tmpCrypto.Decrypt(nil, aad, nil, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting Decrypt ciphertext failed [%s, Post \"%s\": x509: "+
-			"certificate signed by unknown authority", defaultKeyURL+decryptURI, defaultKeyURL+decryptURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting Decrypt ciphertext failed [%s, Post \"%s\": %s",
+			defaultKeyURL+decryptURI, defaultKeyURL+decryptURI, getCertsErrorSubText()))
 	})
 
 	t.Run("Encrypt json marshal failure", func(t *testing.T) {
@@ -299,17 +300,17 @@ func TestSignVerify(t *testing.T) {
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		_, err = tmpCrypto.Sign(nil, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting Sign message failed [%s, Post \"%s\": x509: "+
-			"certificate signed by unknown authority", defaultKeyURL+signURI, defaultKeyURL+signURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting Sign message failed [%s, Post \"%s\": %s",
+			defaultKeyURL+signURI, defaultKeyURL+signURI, getCertsErrorSubText()))
 	})
 
 	t.Run("Verify Post request failure", func(t *testing.T) {
 		blankClient := &http.Client{}
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		err = tmpCrypto.Verify(nil, nil, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting Verify signature failed [%s, Post \"%s\": x509: "+
-			"certificate signed by unknown authority", defaultKeyURL+verifyURI, defaultKeyURL+verifyURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting Verify signature failed [%s, Post \"%s\": %s",
+			defaultKeyURL+verifyURI, defaultKeyURL+verifyURI, getCertsErrorSubText()))
 	})
 
 	t.Run("Sign json marshal failure", func(t *testing.T) {
@@ -472,17 +473,17 @@ func TestComputeVerifyMAC(t *testing.T) {
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		_, err = tmpCrypto.ComputeMAC(nil, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting ComputeMAC request failed [%s, Post \"%s\": x509: certificate"+
-			" signed by unknown authority", defaultKeyURL+computeMACURI, defaultKeyURL+computeMACURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting ComputeMAC request failed [%s, Post \"%s\": %s",
+			defaultKeyURL+computeMACURI, defaultKeyURL+computeMACURI, getCertsErrorSubText()))
 	})
 
 	t.Run("VerifyMAC Post request failure", func(t *testing.T) {
 		blankClient := &http.Client{}
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		err = tmpCrypto.VerifyMAC(nil, nil, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting VerifyMAC request failed [%s, Post \"%s\": x509: "+
-			"certificate signed by unknown authority", defaultKeyURL+verifyMACURI, defaultKeyURL+verifyMACURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting VerifyMAC request failed [%s, Post \"%s\": %s",
+			defaultKeyURL+verifyMACURI, defaultKeyURL+verifyMACURI, getCertsErrorSubText()))
 	})
 
 	t.Run("ComputeMAC json marshal failure", func(t *testing.T) {
@@ -645,17 +646,17 @@ func TestWrapUnWrapKey(t *testing.T) {
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		_, err = tmpCrypto.WrapKey(cek, apu, apv, recipentPubKey)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting WrapKey failed [%s, Post \"%s\": x509: certificate"+
-			" signed by unknown authority", defaultKeystoreURL+wrapURI, defaultKeystoreURL+wrapURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting WrapKey failed [%s, Post \"%s\": %s",
+			defaultKeystoreURL+wrapURI, defaultKeystoreURL+wrapURI, getCertsErrorSubText()))
 	})
 
 	t.Run("UnwrapKey Post request failure", func(t *testing.T) {
 		blankClient := &http.Client{}
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		_, err = tmpCrypto.UnwrapKey(wKey, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting UnwrapKey failed [%s, Post \"%s\": x509: "+
-			"certificate signed by unknown authority", defaultKeyURL+unwrapURI, defaultKeyURL+unwrapURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting UnwrapKey failed [%s, Post \"%s\": %s",
+			defaultKeyURL+unwrapURI, defaultKeyURL+unwrapURI, getCertsErrorSubText()))
 	})
 
 	t.Run("WrapKey json marshal failure", func(t *testing.T) {
@@ -1000,37 +1001,35 @@ func TestBBSSignVerify_DeriveProofVerifyProof(t *testing.T) {
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		_, err = tmpCrypto.SignMulti(nil, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting BBS+ Sign message failed [%s, Post \"%s\": x509: "+
-			"certificate signed by unknown authority", defaultKeyURL+signMultiURI, defaultKeyURL+signMultiURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting BBS+ Sign message failed [%s, Post \"%s\": %s",
+			defaultKeyURL+signMultiURI, defaultKeyURL+signMultiURI, getCertsErrorSubText()))
 	})
 
 	t.Run("BBS+ Verify Post request failure", func(t *testing.T) {
 		blankClient := &http.Client{}
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		err = tmpCrypto.VerifyMulti(nil, nil, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting BBS+ Verify signature failed [%s, Post \"%s\": x509: "+
-			"certificate signed by unknown authority", defaultKeyURL+verifyMultiURI, defaultKeyURL+verifyMultiURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting BBS+ Verify signature failed [%s, Post \"%s\": %s",
+			defaultKeyURL+verifyMultiURI, defaultKeyURL+verifyMultiURI, getCertsErrorSubText()))
 	})
 
 	t.Run("BBS+ Derive Proof Post request failure", func(t *testing.T) {
 		blankClient := &http.Client{}
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		_, err = tmpCrypto.DeriveProof(nil, nil, nil, nil, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting BBS+ Derive proof message failed [%s, Post \"%s\": "+
-			"x509: certificate signed by unknown authority", defaultKeyURL+deriveProofURI,
-			defaultKeyURL+deriveProofURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting BBS+ Derive proof message failed [%s, Post \"%s\": %s",
+			defaultKeyURL+deriveProofURI, defaultKeyURL+deriveProofURI, getCertsErrorSubText()))
 	})
 
 	t.Run("BBS+ Verify Proof Post request failure", func(t *testing.T) {
 		blankClient := &http.Client{}
 		tmpCrypto := New(defaultKeystoreURL, blankClient)
 
 		err = tmpCrypto.VerifyProof(nil, nil, nil, defaultKeyURL)
-		require.Contains(t, err.Error(), fmt.Sprintf("posting BBS+ Verify proof failed [%s, Post \"%s\": "+
-			"x509: certificate signed by unknown authority", defaultKeyURL+verifyProofURI,
-			defaultKeyURL+verifyProofURI))
+		require.Contains(t, err.Error(), fmt.Sprintf("posting BBS+ Verify proof failed [%s, Post \"%s\": %s",
+			defaultKeyURL+verifyProofURI, defaultKeyURL+verifyProofURI, getCertsErrorSubText()))
 	})
 
 	t.Run("BBS+ Sign json marshal failure", func(t *testing.T) {
@@ -1593,3 +1592,11 @@ func mockAddHeadersFuncError(_ *http.Request) (*http.Header, error) {
 func matchPath(r *http.Request, uri string) bool {
 	return strings.LastIndex(r.URL.Path, uri) == len(r.URL.Path)-len(uri)
 }
+
+func getCertsErrorSubText() string {
+	if runtime.GOOS == "darwin" {
+		return "x509: “*.example.com” certificate is not trusted"
+	}
+
+	return "x509: certificate signed by unknown authority"
+}
diff --git a/pkg/doc/verifiable/credential_test.go b/pkg/doc/verifiable/credential_test.go
@@ -1078,7 +1078,7 @@ func TestDownloadCustomSchema(t *testing.T) {
 
 		customSchema, err := getJSONSchema(testServer.URL, noCacheOpts)
 		require.Error(t, err)
-		require.Contains(t, err.Error(), "load credential schema")
+		require.Contains(t, err.Error(), "credential schema endpoint HTTP failure")
 		require.Nil(t, customSchema)
 	})
 

diff --git a/pkg/vdr/httpbinding/resolver_test.go b/pkg/vdr/httpbinding/resolver_test.go
@@ -285,7 +285,7 @@ func TestRead_HTTPGetFailed(t *testing.T) {
 	require.NoError(t, err)
 	_, err = resolver.Read("did:example:334455")
 	require.Error(t, err)
-	require.Contains(t, err.Error(), "HTTP Get request failed")
+	require.Contains(t, err.Error(), "unsupported response from DID resolver")
 }
 
 func TestDIDResolver_Accept(t *testing.T) {

diff --git a/spi/go.mod b/spi/go.mod
@@ -4,4 +4,4 @@
 
 module github.com/hyperledger/aries-framework-go/spi
 
-go 1.17
+go 1.19
diff --git a/test/bdd/go.mod b/test/bdd/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/hyperledger/aries-framework-go/test/bdd
 
-go 1.17
+go 1.19
 
 require (
 	github.com/btcsuite/btcd v0.22.0-beta

diff --git a/test/component/go.mod b/test/component/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/hyperledger/aries-framework-go/test/component
 
-go 1.17
+go 1.19
 
 require (
 	github.com/google/uuid v1.1.2
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     module github.com/hyperledger/aries-framework-go/cmd/aries-agent-mobile
-    go 1.17
+    go 1.19
     require (
     	github.com/google/uuid v1.3.0
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		module github.com/hyperledger/aries-framework-go/spi

		go 1.17
		go 1.19