Merge pull request #527 from quickfixgo/fix-ci

Upgrades mongo driver, resolves broken ci config, adds dynamic session fix

Author: ackleymi

.devcontainer/Dockerfile renamed to .devcontainer/Dockerfile.dev

@@ -1,13 +1,17 @@
 {
-	"name": "Go & Mongo DB",
+	"name": "Quickfix/Go Development",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "app",
 	"workspaceFolder": "/workspace",
+	"shutdownAction": "stopCompose",
 	"runArgs": [
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",
 		"seccomp=unconfined"
 	],
+	"features": {
+    "ruby": "latest"
+	},
 	"customizations": {
 		"vscode": {
 			"settings": {

.devcontainer/devcontainer.json

@@ -4,10 +4,10 @@ services:
   app:
     build: 
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.dev
     volumes:
       - ..:/workspace:cached
-
+      - /var/run/docker.sock:/var/run/docker.sock
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
@@ -25,7 +25,8 @@ services:
     restart: unless-stopped
     volumes:
       - mongodb-data:/data/db
-
+    ports:
+       - 27017:27017
     # Uncomment to change startup options
     # environment:
     #  MONGO_INITDB_ROOT_USERNAME: root

.devcontainer/docker-compose.yml

@@ -47,26 +47,31 @@ jobs:
       matrix:
         go: [1.18]
         fix-version:
-          - FIX_TEST=
-          - FIX_TEST=fix40
-          - FIX_TEST=fix41
-          - FIX_TEST=fix42
-          - FIX_TEST=fix43
-          - FIX_TEST=fix44
-          - FIX_TEST=fix50
-          - FIX_TEST=fix50sp1
-          - FIX_TEST=fix50sp2
+          -
+          - fix40
+          - fix41
+          - fix42
+          - fix43
+          - fix44
+          - fix50
+          - fix50sp1
+          - fix50sp2
     steps:
       - name: Setup
         uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go }}
       - name: Check out source
         uses: actions/checkout@v2
-      - name: Run Mongo
-        run: docker run -d -p 27017:27017 mongo
+      - name: Start MongoDB
+        uses: supercharge/[email protected]
+      - name: Install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
       - name: Test
         env:
-          GO111MODULE: "on"
-          MONGODB_TEST_CXN: "localhost"
-        run: make generate; if [ -z "$FIX_TEST" ]; then make build; make; else make build_accept; make $FIX_TEST; fi
+          GO111MODULE: on
+          MONGODB_TEST_CXN: mongodb://localhost:27017
+          FIX_TEST: ${{ matrix.fix-version }}
+        run: if [ -z $FIX_TEST ]; then make build-src && make test-ci; else make generate-ci && make build && make $FIX_TEST; fi

.github/workflows/ci.yaml

@@ -27,8 +27,7 @@ clean:
 	rm -rf gen
 
 generate: clean
-	mkdir -p gen; cd gen; go run ../cmd/generate-fix/generate-fix.go ../spec/*.xml
-	go get -u all 
+	mkdir -p gen; cd gen; go run ../cmd/generate-fix/generate-fix.go -pkg-root=github.com/quickfixgo/quickfix/gen ../spec/*.xml
 
 generate-dist:
 	cd ..; go run quickfix/cmd/generate-fix/generate-fix.go quickfix/spec/*.xml
@@ -47,15 +46,21 @@ vet:
 	go vet `go list ./... | grep -v quickfix/gen`
 
 test: 
-	MONGODB_TEST_CXN=localhost go test -v -cover . ./datadictionary ./internal
+	MONGODB_TEST_CXN=mongodb://db:27017 go test -v -cover . ./datadictionary ./internal
 
-_build_all: 
+build-src: 
 	go build -v `go list ./...`
 
-build_accept: 
-	cd _test; go build -o echo_server
+build-test-srv: 
+	cd _test; go build -o echo_server ./test-server/
 
-build: _build_all build_accept
+build: build-src build-test-srv
+
+test-ci: 
+	go test -v -cover . ./datadictionary ./internal
+
+generate-ci: clean
+	mkdir -p gen; cd gen; go run ../cmd/generate-fix/generate-fix.go -pkg-root=github.com/quickfixgo/quickfix/gen ../spec/$(shell echo $(FIX_TEST) | tr  '[:lower:]' '[:upper:]').xml; 
 
 fix40:
 	cd _test; ./runat.sh $@.cfg 5001 "definitions/server/$@/*.def"

Makefile

@@ -100,7 +100,7 @@ To run acceptance tests,
         make generate
 
 		# build acceptance test rig
-		make build_accept
+		make build-test-srv
 
 		# run acceptance tests
 		make accept

README.md

@@ -1,15 +1,16 @@
 package main
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
 	"os/signal"
 
 	"github.com/quickfixgo/quickfix"
-	"github.com/quickfixgo/quickfix/gen/field"
-	"github.com/quickfixgo/quickfix/gen/tag"
+	field "github.com/quickfixgo/quickfix/gen/field"
+	tag "github.com/quickfixgo/quickfix/gen/tag"
 )
 
 var router *quickfix.MessageRouter = quickfix.NewMessageRouter()
@@ -57,7 +58,8 @@ func (e *EchoApplication) processMsg(msg *quickfix.Message, sessionID quickfix.S
 		}
 
 		sessionOrderID := sessionID.String() + orderID.String()
-		if possResend.FIXBoolean {
+
+		if bytes.Equal(possResend.Write(), []byte("Y")) {
 			if e.OrderIds[sessionOrderID] {
 				return nil
 			}
@@ -67,7 +69,7 @@ func (e *EchoApplication) processMsg(msg *quickfix.Message, sessionID quickfix.S
 	}
 
 	reply := copyMessage(msg)
-	if possResend.FIXBoolean {
+	if bytes.Equal(possResend.Write(), []byte("Y")) {
 		reply.Header.Set(possResend)
 	}
 
@@ -109,6 +111,7 @@ func main() {
 	router.AddRoute(quickfix.ApplVerIDFIX50SP1, "d", app.processMsg)
 	router.AddRoute(quickfix.ApplVerIDFIX50SP2, "d", app.processMsg)
 
+	fmt.Println("starting test server")
 	cfg, err := os.Open(os.Args[1])
 	if err != nil {
 		fmt.Printf("Error opening %v, %v\n", os.Args[1], err)
@@ -139,9 +142,10 @@ func main() {
 		return
 	}
 
-	interrupt := make(chan os.Signal)
-	signal.Notify(interrupt)
-	<-interrupt
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt)
+	<-c
+	fmt.Println("stopping test server")
 
 	acceptor.Stop()
 }

_test/echo_server.go renamed to _test/test-server/main.go

@@ -290,7 +290,7 @@ func (a *Acceptor) handleConnection(netConn net.Conn) {
 	}
 
 	localConnectionPort := netConn.LocalAddr().(*net.TCPAddr).Port
-	if expectedPort, ok := a.sessionHostPort[sessID]; !ok || expectedPort != localConnectionPort {
+	if expectedPort, ok := a.sessionHostPort[sessID]; ok && expectedPort != localConnectionPort {
 		a.globalLog.OnEventf("Session %v not found for incoming message: %s", sessID, msgBytes)
 		return
 	}

acceptor.go

@@ -122,13 +122,26 @@ func main() {
 		usage()
 	}
 
-	specs := make([]*datadictionary.DataDictionary, flag.NArg())
-	for i, dataDictPath := range flag.Args() {
-		var err error
-		specs[i], err = datadictionary.Parse(dataDictPath)
+
+	args := flag.Args()
+	if len(args) == 1 {
+		dictpath := args[0]
+		if strings.Contains(dictpath, "FIX50SP1") {
+			args = append(args, strings.Replace(dictpath, "FIX50SP1", "FIXT11", -1))
+		} else if strings.Contains(dictpath, "FIX50SP2") {
+			args = append(args, strings.Replace(dictpath, "FIX50SP2", "FIXT11", -1))
+		} else if strings.Contains(dictpath, "FIX50") {
+			args = append(args, strings.Replace(dictpath, "FIX50", "FIXT11", -1))
+		}
+	}
+	specs := []*datadictionary.DataDictionary{}
+
+	for _, dataDictPath := range args {
+		spec, err := datadictionary.Parse(dataDictPath)
 		if err != nil {
 			log.Fatalf("Error Parsing %v: %v", dataDictPath, err)
 		}
+		specs = append(specs, spec)
 	}
 
 	internal.BuildGlobalFieldTypes(specs)

cmd/generate-fix/generate-fix.go

@@ -22,6 +22,27 @@ func checkIfDecimalImportRequiredForFields(fTypes []*datadictionary.FieldType) (
 	return
 }
 
+func checkIfTimeImportRequiredForFields(fTypes []*datadictionary.FieldType) (ok bool, err error) {
+	var t string
+	for _, fType := range fTypes {
+		t, err = quickfixType(fType)
+		if err != nil {
+			return
+		}
+
+		var vt string
+		if vt, err = quickfixValueType(t); err != nil {
+			return
+		}
+	
+		if vt == "time.Time" {
+			return true, nil
+		}
+	}
+
+	return
+}
+
 func checkFieldDecimalRequired(f *datadictionary.FieldDef) (required bool, err error) {
 	var globalType *datadictionary.FieldType
 	if globalType, err = getGlobalFieldType(f); err != nil {