-
-
Notifications
You must be signed in to change notification settings - Fork 400
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1971 from dubek/exporters-secadvisor-encode-as-js…
…on-object contrib/exporters/secadvisor: Encode flows in a JSON object
- Loading branch information
Showing
9 changed files
with
187 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/* | ||
* Copyright (C) 2019 IBM, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy ofthe License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specificlanguage governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
|
||
package mod | ||
|
||
import ( | ||
"github.com/spf13/viper" | ||
|
||
"github.com/skydive-project/skydive/contrib/exporters/core" | ||
) | ||
|
||
type encode struct { | ||
*core.EncodeJSON | ||
} | ||
|
||
type topLevelObject struct { | ||
Data []interface{} `json:"data"` | ||
} | ||
|
||
// Encode the incoming flows array as a JSON object with key "data" whose value | ||
// holds the array | ||
func (e *encode) Encode(in interface{}) ([]byte, error) { | ||
return e.EncodeJSON.Encode(topLevelObject{Data: in.([]interface{})}) | ||
} | ||
|
||
// NewEncode creates an encode object for Secadvisor format | ||
func NewEncode(cfg *viper.Viper) (interface{}, error) { | ||
jsonEncoder, err := core.NewEncodeJSON(cfg) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &encode{jsonEncoder.(*core.EncodeJSON)}, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
/* | ||
* Copyright (C) 2019 IBM, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy ofthe License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specificlanguage governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
|
||
package mod | ||
|
||
import ( | ||
"encoding/json" | ||
"reflect" | ||
"testing" | ||
|
||
"github.com/spf13/viper" | ||
|
||
"github.com/skydive-project/skydive/contrib/exporters/core" | ||
) | ||
|
||
func areEqualJSON(buf1, buf2 []byte) (bool, error) { | ||
var o1 interface{} | ||
var o2 interface{} | ||
|
||
var err error | ||
err = json.Unmarshal(buf1, &o1) | ||
if err != nil { | ||
return false, err | ||
} | ||
err = json.Unmarshal(buf2, &o2) | ||
if err != nil { | ||
return false, err | ||
} | ||
return reflect.DeepEqual(o1, o2), nil | ||
} | ||
|
||
func getEncoder(t *testing.T) core.Encoder { | ||
cfg := viper.New() | ||
encoder, err := NewEncode(cfg) | ||
if err != nil { | ||
t.Fatalf("NewEncode returned unexpected error: %v", err) | ||
} | ||
return encoder.(core.Encoder) | ||
} | ||
|
||
func Test_Encode_empty_flows_array(t *testing.T) { | ||
in := make([]interface{}, 0) | ||
result, err := getEncoder(t).Encode(in) | ||
if err != nil { | ||
t.Fatalf("Encode returned unexpected error: %v", err) | ||
} | ||
expected := []byte( | ||
`{ | ||
"data": [] | ||
}`) | ||
equal, err := areEqualJSON(expected, result) | ||
if err != nil { | ||
t.Fatalf("Error parsing JSON: %v", err) | ||
} | ||
if !equal { | ||
t.Fatalf("Objects not identical") | ||
} | ||
} | ||
|
||
func Test_Encode_flows_array_with_objects(t *testing.T) { | ||
in := []interface{}{ | ||
&SecurityAdvisorFlow{ | ||
Status: "STARTED", | ||
Start: 1234, | ||
}, | ||
&SecurityAdvisorFlow{ | ||
Status: "ENDED", | ||
Last: 5678, | ||
}, | ||
} | ||
result, err := getEncoder(t).Encode(in) | ||
if err != nil { | ||
t.Fatalf("Encode returned unexpected error: %v", err) | ||
} | ||
expected := []byte( | ||
`{ | ||
"data": [ | ||
{ | ||
"Status": "STARTED", | ||
"Start": 1234, | ||
"Last": 0, | ||
"UpdateCount": 0 | ||
}, | ||
{ | ||
"Status": "ENDED", | ||
"Start": 0, | ||
"Last": 5678, | ||
"UpdateCount": 0 | ||
} | ||
] | ||
}`) | ||
equal, err := areEqualJSON(expected, result) | ||
if err != nil { | ||
t.Fatalf("Error parsing JSON: %v", err) | ||
} | ||
if !equal { | ||
t.Fatalf("Objects not identical") | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters