Merge pull request #442 from xmidt-org/normalize-deviceid

Normalize the deviceid before it is put into the logs for ease of sea…

transaction/transactor.go

@@ -31,6 +31,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/xmidt-org/candlelight"
 	"github.com/xmidt-org/sallust"
+	"github.com/xmidt-org/wrp-go/v3"
 	"go.uber.org/zap"
 )
 
@@ -222,6 +223,12 @@ func getDeviceId(r *http.Request) string {
 	if id == "" {
 		id = "mac:000000000000"
 	}
-
+
+	normalized, err := wrp.ParseDeviceID(id)
+	if err != nil {
+		id = "invalid:" + id
+	} else {
+		id = string(normalized)
+	}
 	return id
 }

transaction/transactor_test.go

@@ -288,10 +288,10 @@ func TestGetDeviceId(t *testing.T) {
 			desc: "Request has id",
 			req: func() (r *http.Request) {
 				r = httptest.NewRequest(http.MethodGet, "http://localhost:6100/api/v2/device/", nil)
-				r = mux.SetURLVars(r, map[string]string{"deviceid": "mac:112233445577"})
+				r = mux.SetURLVars(r, map[string]string{"deviceid": "mac:11:22:33:44:55:Aa"})
 				return
 			},
-			expected: "mac:112233445577",
+			expected: "mac:1122334455aa",
 		},
 		{
 			desc: "no id",
@@ -301,6 +301,15 @@ func TestGetDeviceId(t *testing.T) {
 			},
 			expected: "mac:000000000000",
 		},
+		{
+			desc: "invalid id",
+			req: func() (r *http.Request) {
+				r = httptest.NewRequest(http.MethodGet, "http://localhost:6100/api/v2/device/", nil)
+				r = mux.SetURLVars(r, map[string]string{"deviceid": "unsupported:frog"})
+				return
+			},
+			expected: "invalid:unsupported:frog",
+		},
 	}
 	for _, tc := range tests {
 		t.Run(tc.desc, func(t *testing.T) {