Skip to content
Snippets Groups Projects
Commit 2d2deb30 authored by ko_oler's avatar ko_oler
Browse files

Merge remote-tracking branch 'origin/feature/PRXS-951-2109-TagsFix' into...

Merge remote-tracking branch 'origin/feature/PRXS-951-2109-TagsFix' into feature/PRXS-951-2109-TagsFix
parents 6a69e042 1dc6c54f
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,7 @@ func (l Level) String() string {
}
type Entry struct {
ID string `json:"_id" bson:"_id" mapstructure:"_id"`
ID string `json:"id" bson:"_id" mapstructure:"id"`
Timestamp time.Time `json:"timestamp,omitempty" bson:"timestamp,omitempty" mapstructure:"timestamp,omitempty"`
Level Level `json:"level,omitempty" bson:"level,omitempty" mapstructure:"level,omitempty"`
Message string `json:"message,omitempty" bson:"message,omitempty" mapstructure:"message,omitempty"`
......
......@@ -42,7 +42,7 @@ func TestEntry_ToMap(t *testing.T) {
nil,
nil,
},
map[string]interface{}{"caller": map[string]interface{}{"type": "user", "user_id": "<user_id>"}, "caller_id": "/users/<user_id>", "category": "", "component": "", "event": "", "id": "1", "level": Level(0), "message": "message", "object": map[string]interface{}{"env_id": "<env_id>", "space_id": "<space_id>", "type": "environment"}, "object_id": "/spaces/<space_id>/envs/<env_id>", "timestamp": time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)},
map[string]interface{}{"caller": map[string]interface{}{"type": "user", "user_id": "<user_id>"}, "caller_id": "/users/<user_id>", "category": "", "component": "", "event": "", "_id": "1", "level": Level(0), "message": "message", "object": map[string]interface{}{"env_id": "<env_id>", "space_id": "<space_id>", "type": "environment"}, "object_id": "/spaces/<space_id>/envs/<env_id>", "timestamp": time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)},
},
}
for _, tt := range tests {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment