Merge branch 'main' into templates

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

CHANGELOG.md

@@ -1,3 +1,27 @@
+## 0.8.1 (October 27, 2023)
+
+BUG FIXES
+
+* Remove initiator wait [GH 587]
+* for xml charset and bug of "Incorrect NumInGroup" [GH 368, 363, 365, 366]
+* Allow time.Duration or int for timeouts [GH 477]
+* Trim extra non-ascii characters that can arise from manually editing [GH 463, 464]
+
+## 0.8.0 (October 25, 2023)
+
+ENHANCEMENTS
+
+* Remove tag from field map [GH 544]
+* Add message.Bytes() to avoid string conversion [GH 546]
+* Check RejectInvalidMessage on FIXT validation [GH 572]
+
+BUG FIXES
+
+* Fix repeating group read tags lost [GH 462]
+* Acceptance test result must be predictable [GH 578]
+* Makes event timer stop idempotent [GH 580, 581]
+* Added WaitGroup Wait in Initiator [GH 584]
+
 ## 0.7.0 (January 2, 2023)
 
 FEATURES

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/ReflectorClient.rb

@@ -67,11 +67,15 @@ def @reflector.waitConnectAction(cid)
     end
 
     def @reflector.waitDisconnectAction(cid)
-      socket = @sockets[cid]
-      if IO.select([socket], nil, nil, 10) == nil then 
-	    raise "Connection hangs after ten seconds."
-      elsif !socket.eof? then
-	    raise "Expected disconnection, got data"
+      begin
+        socket = @sockets[cid]
+        if IO.select([socket], nil, nil, 10) == nil then
+        raise "Connection hangs after ten seconds."
+        elsif !socket.eof? then
+        raise "Expected disconnection, got data"
+        end
+      rescue Errno::ECONNRESET
+        # Ignore, server has already disconnected the socket
       end
     end
 

_test/ReflectorServer.rb

@@ -58,10 +58,14 @@ def @reflector.waitConnectAction(cid)
     end
 
     def @reflector.waitDisconnectAction(cid)
-      if IO.select([@socket], nil, nil, 10) == nil then 
-	raise "Connection hangs after five seconds."
-      elsif !@socket.eof? then
-	raise "Expected disconnection, got data"
+      begin
+        if IO.select([@socket], nil, nil, 10) == nil then
+          raise "Connection hangs after five seconds."
+        elsif !@socket.eof? then
+          raise "Expected disconnection, got data"
+        end
+      rescue Errno::ECONNRESET
+        # Ignore, client has already disconnected the socket
       end
     end
 

_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)

datadictionary/datadictionary.go

@@ -315,6 +315,10 @@ func Parse(path string) (*DataDictionary, error) {
 func ParseSrc(xmlSrc io.Reader) (*DataDictionary, error) {
 	doc := new(XMLDoc)
 	decoder := xml.NewDecoder(xmlSrc)
+	decoder.CharsetReader = func(encoding string, input io.Reader) (io.Reader, error) {
+		return input, nil
+	}
+
 	if err := decoder.Decode(doc); err != nil {
 		return nil, errors.Wrapf(err, "problem parsing XML file")
 	}