Allow setting custom-entries-file in formats #7
Conversation
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
liornoy
force-pushed
the
allow-setting-different-formats
branch
from
4e87c4a
to
5cabd78
Compare
| @@ -34,7 +37,7 @@ const ( | |||
| // Custom entries from a JSON file can be added to the matrix by setting `customEntriesPath`. | |||
| // Returns a pointer to ComMatrix and error. Entries include traffic direction, protocol, | |||
| // port number, namespace, service name, pod, container, node role, and flow optionality for OpenShift. | |||
| func New(kubeconfigPath string, customEntriesPath string, e Env, d Deployment) (*types.ComMatrix, error) { | |||
| func New(kubeconfigPath string, customEntriesPath string, customEntriesFormat string, e Env, d Deployment) (*types.ComMatrix, error) { | |||
There was a problem hiding this comment.
customEntriesFormat should be an enum
There was a problem hiding this comment.
done, the flag still accepts string, but internally it's validated as an enum
commatrix/commatrix.go
Outdated
| @@ -61,7 +64,10 @@ func New(kubeconfigPath string, customEntriesPath string, e Env, d Deployment) ( | |||
| res = append(res, staticEntries...) | |||
|
|
|||
| if customEntriesPath != "" { | |||
| customComDetails, err := addFromFile(customEntriesPath) | |||
| if customEntriesFormat == "" { | |||
There was a problem hiding this comment.
Should be validated in main
| @@ -51,7 +51,7 @@ func ToCSV(m ComMatrix) ([]byte, error) { | |||
| } | |||
|
|
|||
| func ToJSON(m ComMatrix) ([]byte, error) { | |||
| out, err := json.Marshal(m.Matrix) | |||
| out, err := json.MarshalIndent(m.Matrix, "", " ") | |||
There was a problem hiding this comment.
This makes the output more readable with tabs and newlines instead of one long string
liornoy
force-pushed
the
allow-setting-different-formats
branch
from
5cabd78
to
cf44110
Compare
liornoy
force-pushed
the
allow-setting-different-formats
branch
from
cf44110
to
763423e
Compare
liornoy
force-pushed
the
allow-setting-different-formats
branch
from
763423e
to
ec1657b
Compare
This commit adds the the flag customEntriesFormat that sets the custom entries file format (json/yaml/csv). We also include 3 example files to help the user to create his own custom file, and they'll be used in the integration test. Signed-off-by: Lior Noy <[email protected]>
liornoy
force-pushed
the
allow-setting-different-formats
branch
from
ec1657b
to
fa17b99
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit adds the the flag customEntriesFormat that sets the custom entries file format (json/yaml/csv).
We also include 3 example files to help the user to create his own custom file, and they'll be used in the integration test.