add option to specify other log destinations in AP #1147
Merged
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
rafwegv
added
the
enhancement
pleshakov
reviewed
Sep 18, 2020
| @@ -55,14 +55,22 @@ func ValidateAppProtectLogConf(logConf *unstructured.Unstructured) error { | |||
| return nil | |||
| } | |||
|
|
|||
| var logDstEx = regexp.MustCompile(`syslog:server=((?:\d{1,3}\.){3}\d{1,3}|localhost):\d{1,5}`) | |||
| var logDstEx = regexp.MustCompile(`(?:syslog:server=((?:\d{1,3}\.){3}\d{1,3}|localhost):\d{1,5})|stderr|(?:\/[\S]+)+`) | |||
| var logDstFileEx = regexp.MustCompile(`(?:\/[\S]+)+`) | |||
|
|
|||
| // ValidateAppProtectLogDestinationAnnotation validates annotation for log destination configuration | |||
| func ValidateAppProtectLogDestinationAnnotation(dstAntn string) error { | |||
There was a problem hiding this comment.
Could you possibly add a unit test for this function? It be great to test for each of the possible types of valid values as well as invalid values (a case per eachreturn fmt.Errorf)
There was a problem hiding this comment.
added tests, also removed one return fmt.Errorf since i found it is not reachable.
pleshakov
approved these changes
Sep 21, 2020
There was a problem hiding this comment.
the test looks good.
One comment though - for maintainability, we usually don't put the test input into global variables - we put them into the test function. could you make posDstAntns and negDstAntns local variables of ValidateAppProtectLogDestinationAnnotation ?
Dean-Coakley
approved these changes
Sep 21, 2020
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.
Proposed changes
This change allows for configuring additional values as log destinations, when setting remote logging via apLogConf
Checklist
Before creating a PR, run through this checklist and mark each as complete.