Merge pull request #11 from ehelms/ensure-json

Forwarded JSOn should have lowercase keys

.github/workflows/test.yml

@@ -0,0 +1,45 @@
+name: Go
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    name: "Build"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: ['1.15', '1.16', '1.17']
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+
+      - name: Go build (source)
+        run: make
+
+      - name: Go build (tests)
+        run: make test
+
+      - name: Go lint
+        run: |
+          if [ $(gofmt -l src/* | wc -l) -gt 0 ]; then
+            gofmt -d src/*
+            exit 1
+          fi
+
+      - name: Go vet
+        run: make vet
+
+  lint-code:
+    name: Lint code
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Run golangci-lint
+        uses: golangci/[email protected]

Makefile

@@ -25,3 +25,9 @@ distribution-tarball:
 		--transform s/^\./$(PKGNAME)-$(VERSION)/ \
 		. && mv /tmp/$(PKGNAME)-$(VERSION).tar.gz .
 	rm -rf ./vendor
+
+test:
+	go test *.go
+
+vet:
+	go vet *.go

server.go

@@ -24,10 +24,10 @@ type forwarderServer struct {
 }
 
 type httpMessage struct {
-	ResponseTo string
-	Metadata   map[string]string
-	Content    []byte
-	Directive  string
+	ResponseTo string            `json:"response_to"`
+	Metadata   map[string]string `json:"metadata"`
+	Content    []byte            `json:"content"`
+	Directive  string            `json:"directive"`
 }
 
 // Send implements the "Send" method of the Worker gRPC service.
@@ -42,18 +42,7 @@ func (s *forwarderServer) Send(ctx context.Context, d *pb.Data) (*pb.Receipt, er
 		}
 		defer conn.Close()
 
-		// Create a data message to send back to the dispatcher.
-		data := httpMessage{
-			ResponseTo: d.GetMessageId(),
-			Metadata:   d.GetMetadata(),
-			Content:    d.GetContent(),
-			Directive:  d.GetDirective(),
-		}
-
-		dataJson, error := json.Marshal(data)
-		if error != nil {
-			log.Fatal(error)
-		}
+		dataJson := jsonData(d)
 		log.Infof("sending %v", dataJson)
 
 		// Call http post
@@ -78,3 +67,20 @@ func (s *forwarderServer) Send(ctx context.Context, d *pb.Data) (*pb.Receipt, er
 	// Respond to the start request that the work was accepted.
 	return &pb.Receipt{}, nil
 }
+
+func jsonData(d *pb.Data) []byte {
+	// Create a data message to send back to the dispatcher.
+	data := httpMessage{
+		ResponseTo: d.GetMessageId(),
+		Metadata:   d.GetMetadata(),
+		Content:    d.GetContent(),
+		Directive:  d.GetDirective(),
+	}
+
+	dataJson, error := json.Marshal(data)
+	if error != nil {
+		log.Fatal(error)
+	}
+
+	return dataJson;
+}

server_test.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	pb "github.com/redhatinsights/yggdrasil/protocol"
+	"testing"
+)
+
+func TestDispatch(t *testing.T) {
+	input := &pb.Data{}
+
+	got := jsonData(input)
+	want := "{\"response_to\":\"\",\"metadata\":null,\"content\":null,\"directive\":\"\"}"
+
+	if string(got) != want {
+		t.Fatalf(`Got: %q, Wanted: %q`, string(got), want)
+	}
+}