Update Bootstrap service docker-compose.yml (absmach#700)

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
dborovcanin · Apr 9, 2019 · 96b5521 · 96b5521
1 parent df11a20
commit 96b5521
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/bootstrap/redis/producer/events.go b/bootstrap/redis/producer/events.go
@@ -51,14 +51,14 @@ type createConfigEvent struct {
 
 func (cce createConfigEvent) encode() map[string]interface{} {
 	return map[string]interface{}{
-		"id":         cce.mfThing,
-		"owner":      cce.owner,
-		"name":       cce.name,
-		"channels":   strings.Join(cce.mfChannels, ", "),
-		"externalID": cce.externalID,
-		"content":    cce.content,
-		"timestamp":  cce.timestamp.Unix(),
-		"operation":  configCreate,
+		"id":          cce.mfThing,
+		"owner":       cce.owner,
+		"name":        cce.name,
+		"channels":    strings.Join(cce.mfChannels, ", "),
+		"external_id": cce.externalID,
+		"content":     cce.content,
+		"timestamp":   cce.timestamp.Unix(),
+		"operation":   configCreate,
 	}
 }
 
@@ -100,7 +100,7 @@ type bootstrapEvent struct {
 
 func (be bootstrapEvent) encode() map[string]interface{} {
 	return map[string]interface{}{
-		"externalID":  be.externalID,
+		"external_id": be.externalID,
 		"successfull": be.successfull,
 		"timestamp":   be.timestamp.Unix(),
 		"operation":   thingBootstrap,

diff --git a/bootstrap/redis/producer/streams_test.go b/bootstrap/redis/producer/streams_test.go
@@ -119,14 +119,14 @@ func TestAdd(t *testing.T) {
 			key:    validToken,
 			err:    nil,
 			event: map[string]interface{}{
-				"id":         "1",
-				"owner":      email,
-				"name":       config.Name,
-				"channels":   strings.Join(channels, ", "),
-				"externalID": config.ExternalID,
-				"content":    config.Content,
-				"timestamp":  strconv.FormatInt(time.Now().Unix(), 10),
-				"operation":  configCreate,
+				"id":          "1",
+				"owner":       email,
+				"name":        config.Name,
+				"channels":    strings.Join(channels, ", "),
+				"external_id": config.ExternalID,
+				"content":     config.Content,
+				"timestamp":   strconv.FormatInt(time.Now().Unix(), 10),
+				"operation":   configCreate,
 			},
 		},
 		{
@@ -425,7 +425,7 @@ func TestBootstrap(t *testing.T) {
 			externalKey: saved.ExternalKey,
 			err:         nil,
 			event: map[string]interface{}{
-				"externalID":  saved.ExternalID,
+				"external_id": saved.ExternalID,
 				"successfull": "1",
 				"timestamp":   strconv.FormatInt(time.Now().Unix(), 10),
 				"operation":   thingBootstrap,
@@ -437,7 +437,7 @@ func TestBootstrap(t *testing.T) {
 			externalKey: "external",
 			err:         bootstrap.ErrNotFound,
 			event: map[string]interface{}{
-				"externalID":  saved.ExternalID,
+				"external_id": saved.ExternalID,
 				"successfull": "0",
 				"timestamp":   strconv.FormatInt(time.Now().Unix(), 10),
 				"operation":   thingBootstrap,