Fixes #63 - Upgrade dependencies and go version (#66)

* Fixes #63 - Upgrade dependencies and go version

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Fix CVE-2022-27191

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

Author: ricardozanini

.github/workflows/Go-SDK-PR-Check.yaml

@@ -23,29 +23,30 @@ on:
     branches:
       - main
 env:
-  GO_VERSION: 1.14
-  GOLANGLINT_CI_VERSION: v1.45.2
+  GO_VERSION: 1.19
 jobs:
   basic_checks:
     name: Basic Checks
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
         id: go
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
-          path: ~/go/pkg/mod/cache
-          key: ${{ runner.os }}-go-cache-${{ hashFiles('**/go.sum') }}
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-cache-
+            ${{ runner.os }}-go-
       - name: Cache tools
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-tools-${{ hashFiles('**/tools.sum') }}
@@ -62,9 +63,9 @@ jobs:
           changed_files=$(git status -s | grep -v 'go.mod\|go.sum\|tools.mod\|tools.sum' || :)
           [[ -z "$changed_files" ]] ||  (printf "Some files are not formatted properly: \n$changed_files\n Did you run 'make test' before sending the PR?" && exit 1)
       - name: Check lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: ${{ env.GOLANGLINT_CI_VERSION }}
+          version: latest
       - name: Install cover
         run: go get -modfile=tools.mod golang.org/x/tools/cmd/cover
       - name: Validate codcov yaml file

Makefile

@@ -7,7 +7,6 @@ fmt:
 	@go fmt ./...
 
 lint:
-	@command -v golint > /dev/null || go install -modfile=tools.mod -v golang.org/x/lint/golint
 	@command -v golangci-lint > /dev/null || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "${GOPATH}/bin"
 	make addheaders
 	make fmt

go.mod

@@ -1,11 +1,28 @@
 module github.com/serverlessworkflow/sdk-go/v2
 
-go 1.15
+go 1.19
 
 require (
-	github.com/stretchr/testify v1.6.1
-	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
-	gopkg.in/go-playground/validator.v8 v8.18.2
-	k8s.io/apimachinery v0.21.0
-	sigs.k8s.io/yaml v1.2.0
+	github.com/go-playground/validator/v10 v10.11.0
+	github.com/stretchr/testify v1.7.0
+	k8s.io/apimachinery v0.25.0
+	sigs.k8s.io/yaml v1.3.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-playground/locales v0.14.0 // indirect
+	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.70.1 // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 )

go.sum

@@ -13,11 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-golint ./... | tee -a golint_errors
-if [ -s golint_errors ]  ; then
-    code=1
-fi
-rm -f golint_errors
-golangci-lint run ./... --enable golint --timeout 2m0s
-
-exit ${code:0}
+golangci-lint run ./... --timeout 2m0s

hack/go-lint.sh

@@ -17,25 +17,26 @@ package model
 import (
 	"encoding/json"
 	"fmt"
-	val "github.com/serverlessworkflow/sdk-go/v2/validator"
-	"gopkg.in/go-playground/validator.v8"
 	"reflect"
+
+	validator "github.com/go-playground/validator/v10"
+	val "github.com/serverlessworkflow/sdk-go/v2/validator"
 )
 
 func init() {
 	val.GetValidator().RegisterStructValidation(AuthDefinitionsStructLevelValidation, AuthDefinitions{})
 }
 
 // AuthDefinitionsStructLevelValidation custom validator for unique name of the auth methods
-func AuthDefinitionsStructLevelValidation(v *validator.Validate, structLevel *validator.StructLevel) {
-	authDefs := structLevel.CurrentStruct.Interface().(AuthDefinitions)
+func AuthDefinitionsStructLevelValidation(structLevel validator.StructLevel) {
+	authDefs := structLevel.Current().Interface().(AuthDefinitions)
 	dict := map[string]bool{}
 	if authDefs.Defs != nil && len(authDefs.Defs) > 1 {
 		for _, a := range authDefs.Defs {
 			if !dict[a.Name] {
 				dict[a.Name] = true
 			} else {
-				structLevel.ReportError(reflect.ValueOf(a.Name), "Name", "name", "reqnameunique")
+				structLevel.ReportError(reflect.ValueOf(a.Name), "Name", "name", "reqnameunique", "")
 			}
 		}
 	}

model/auth.go

@@ -17,8 +17,8 @@ package model
 import (
 	"reflect"
 
+	validator "github.com/go-playground/validator/v10"
 	val "github.com/serverlessworkflow/sdk-go/v2/validator"
-	"gopkg.in/go-playground/validator.v8"
 )
 
 const (
@@ -33,11 +33,11 @@ func init() {
 }
 
 // EventStructLevelValidation custom validator for event kind consumed
-func EventStructLevelValidation(v *validator.Validate, structLevel *validator.StructLevel) {
-	event := structLevel.CurrentStruct.Interface().(Event)
+func EventStructLevelValidation(structLevel validator.StructLevel) {
+	event := structLevel.Current().Interface().(Event)
 
 	if event.Kind == EventKindConsumed && len(event.Type) == 0 {
-		structLevel.ReportError(reflect.ValueOf(event.Type), "Type", "type", "reqtypeconsumed")
+		structLevel.ReportError(reflect.ValueOf(event.Type), "Type", "type", "reqtypeconsumed", "")
 	}
 }
 

model/event.go

@@ -17,8 +17,8 @@ package model
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
 	"net/http"
+	"os"
 	"path/filepath"
 	"strings"
 )
@@ -46,7 +46,7 @@ func getBytesFromFile(s string) (b []byte, err error) {
 	} else if s, err = filepath.Abs(s); err != nil {
 		return nil, err
 	}
-	if b, err = ioutil.ReadFile(filepath.Clean(s)); err != nil {
+	if b, err = os.ReadFile(filepath.Clean(s)); err != nil {
 		return nil, err
 	}
 	return b, nil

model/util.go

@@ -17,12 +17,12 @@ package parser
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/serverlessworkflow/sdk-go/v2/validator"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/serverlessworkflow/sdk-go/v2/validator"
+
 	"github.com/serverlessworkflow/sdk-go/v2/model"
 	"sigs.k8s.io/yaml"
 )
@@ -61,7 +61,7 @@ func FromFile(path string) (*model.Workflow, error) {
 	if err := checkFilePath(path); err != nil {
 		return nil, err
 	}
-	fileBytes, err := ioutil.ReadFile(filepath.Clean(path))
+	fileBytes, err := os.ReadFile(filepath.Clean(path))
 	if err != nil {
 		return nil, err
 	}

parser/parser.go

@@ -15,7 +15,7 @@
 package parser
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -25,7 +25,7 @@ import (
 
 func TestBasicValidation(t *testing.T) {
 	rootPath := "./testdata/workflows"
-	files, err := ioutil.ReadDir(rootPath)
+	files, err := os.ReadDir(rootPath)
 	assert.NoError(t, err)
 	for _, file := range files {
 		if !file.IsDir() {
@@ -37,9 +37,10 @@ func TestBasicValidation(t *testing.T) {
 		}
 	}
 }
+
 func TestCustomValidators(t *testing.T) {
 	rootPath := "./testdata/workflows/witherrors"
-	files, err := ioutil.ReadDir(rootPath)
+	files, err := os.ReadDir(rootPath)
 	assert.NoError(t, err)
 	for _, file := range files {
 		if !file.IsDir() {

parser/parser_test.go

@@ -14,14 +14,16 @@
 
 package validator
 
-import "gopkg.in/go-playground/validator.v8"
+import (
+	validator "github.com/go-playground/validator/v10"
+)
 
 // TODO: expose a better validation message. See: https://pkg.go.dev/gopkg.in/go-playground/validator.v8#section-documentation
 
 var validate *validator.Validate
 
 func init() {
-	validate = validator.New(&validator.Config{TagName: "validate"})
+	validate = validator.New()
 }
 
 // GetValidator gets the default validator.Validate reference