Merge pull request #589 from ackleymi/go-121

Updates project to go v1.21

Author: ackleymi

.devcontainer/Dockerfile.dev

@@ -1 +1 @@
-FROM mcr.microsoft.com/vscode/devcontainers/go:0-1.18
+FROM mcr.microsoft.com/devcontainers/go:1.21

.github/workflows/ci.yaml

@@ -21,29 +21,22 @@ jobs:
     name: Linter
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Setup Go
-        uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: '1.18'
-      - name: Install golangci-lint
-        run: |
-          curl -sSLO https://github.com/golangci/golangci-lint/releases/download/v$GOLANGCI_LINT_VERSION/golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64.tar.gz
-          tar -xf golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64.tar.gz
-          sudo mv golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64/golangci-lint /usr/local/bin/golangci-lint
-          rm -rf golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64*
-        env:
-          GOLANGCI_LINT_VERSION: '1.50.1'
-      - name: Run Lint
-        run: make lint
+          go-version: '1.21'
+          cache: false
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.51
 
   build:
     name: build
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [1.18]
+        go: [1.21]
         fix-version:
           -
           - fix40

.gitignore

@@ -8,3 +8,4 @@ _test/echo_server
 _test/tmp
 _vendor*
 gen
+.DS_Store

README.md

@@ -10,7 +10,7 @@ Open Source [FIX Protocol](http://www.fixprotocol.org/) library implemented in G
 <ul>
   <li>100% free and open source with a liberal <a href="https://github.com/quickfixgo/quickfix/blob/master/LICENSE.txt">license</a></li>
   <li>Supports FIX versions 4.0 - 5.0SP2</li>
-  <li>Runs on any hardware and operating system supported by Go (1.18+ required)</li>
+  <li>Runs on any hardware and operating system supported by Go (1.21+ required)</li>
   <li>Spec driven run-time message validation</li>
   <li>Spec driven code generation of type-safe FIX messages, fields, and repeating groups</li>
   <li>Support for protocol customizations</li>

_test/test-server/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"os/signal"
@@ -92,7 +92,7 @@ func copyMessage(msg *quickfix.Message) *quickfix.Message {
 
 func main() {
 	app := &EchoApplication{}
-	app.log = log.New(ioutil.Discard, "", log.LstdFlags)
+	app.log = log.New(io.Discard, "", log.LstdFlags)
 	//app.log = log.New(os.Stdout, "", log.LstdFlags)
 
 	router.AddRoute(quickfix.BeginStringFIX40, "D", app.processMsg)

cmd/generate-fix/internal/generate.go

@@ -18,7 +18,7 @@ var (
 	printerMode = printer.UseSpaces | printer.TabIndent
 )
 
-//ParseError indicates generated go source is invalid
+// ParseError indicates generated go source is invalid
 type ParseError struct {
 	path string
 	err  error
@@ -28,12 +28,12 @@ func (e ParseError) Error() string {
 	return fmt.Sprintf("Error parsing %v: %v", e.path, e.err)
 }
 
-//ErrorHandler is a convenience struct for interpretting generation Errors
+// ErrorHandler is a convenience struct for interpretting generation Errors
 type ErrorHandler struct {
 	ReturnCode int
 }
 
-//Handle interprets the generation error. Proceeds with setting returnCode, or panics depending on error type
+// Handle interprets the generation error. Proceeds with setting returnCode, or panics depending on error type
 func (h *ErrorHandler) Handle(err error) {
 	switch err := err.(type) {
 	case nil:
@@ -64,9 +64,9 @@ func write(filePath string, fset *token.FileSet, f *ast.File) error {
 	return err
 }
 
-//WriteFile parses the generated code in fileOut and writes the code out to filePath.
-//Function performs some import clean up and gofmts the code before writing
-//Returns ParseError if the generated source is invalid but is written to filePath
+// WriteFile parses the generated code in fileOut and writes the code out to filePath.
+// Function performs some import clean up and gofmts the code before writing
+// Returns ParseError if the generated source is invalid but is written to filePath
 func WriteFile(filePath, fileOut string) error {
 	fset := token.NewFileSet()
 	f, pErr := parser.ParseFile(fset, "", fileOut, parser.ParseComments)

filestore.go

@@ -18,7 +18,6 @@ package quickfix
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"strconv"
@@ -205,23 +204,23 @@ func (store *fileStore) populateCache() (creationTimePopulated bool, err error)
 		}
 	}
 
-	if timeBytes, err := ioutil.ReadFile(store.sessionFname); err == nil {
+	if timeBytes, err := os.ReadFile(store.sessionFname); err == nil {
 		var ctime time.Time
 		if err := ctime.UnmarshalText(timeBytes); err == nil {
 			store.cache.creationTime = ctime
 			creationTimePopulated = true
 		}
 	}
 
-	if senderSeqNumBytes, err := ioutil.ReadFile(store.senderSeqNumsFname); err == nil {
+	if senderSeqNumBytes, err := os.ReadFile(store.senderSeqNumsFname); err == nil {
 		if senderSeqNum, err := strconv.Atoi(strings.Trim(string(senderSeqNumBytes), "\r\n")); err == nil {
 			if err = store.cache.SetNextSenderMsgSeqNum(senderSeqNum); err != nil {
 				return creationTimePopulated, errors.Wrap(err, "cache set next sender")
 			}
 		}
 	}
 
-	if targetSeqNumBytes, err := ioutil.ReadFile(store.targetSeqNumsFname); err == nil {
+	if targetSeqNumBytes, err := os.ReadFile(store.targetSeqNumsFname); err == nil {
 		if targetSeqNum, err := strconv.Atoi(strings.Trim(string(targetSeqNumBytes), "\r\n")); err == nil {
 			if err = store.cache.SetNextTargetMsgSeqNum(targetSeqNum); err != nil {
 				return creationTimePopulated, errors.Wrap(err, "cache set next target")

go.mod

@@ -1,6 +1,6 @@
 module github.com/quickfixgo/quickfix
 
-go 1.18
+go 1.21
 
 require (
 	github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a

sqlstore_test.go

@@ -18,7 +18,6 @@ package quickfix
 import (
 	"database/sql"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -50,7 +49,7 @@ func (suite *SQLStoreTestSuite) SetupTest() {
 	ddlFnames, err := filepath.Glob(fmt.Sprintf("_sql/%s/*.sql", sqlDriver))
 	require.Nil(suite.T(), err)
 	for _, fname := range ddlFnames {
-		sqlBytes, err := ioutil.ReadFile(fname)
+		sqlBytes, err := os.ReadFile(fname)
 		require.Nil(suite.T(), err)
 		_, err = db.Exec(string(sqlBytes))
 		require.Nil(suite.T(), err)

tls.go

@@ -19,7 +19,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/quickfixgo/quickfix/config"
 )
@@ -95,7 +95,7 @@ func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error)
 		return
 	}
 
-	pem, err := ioutil.ReadFile(caFile)
+	pem, err := os.ReadFile(caFile)
 	if err != nil {
 		return
 	}