fix(1082): [6] add regex validation of commit branch filter. #247
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
yokawara
reviewed
Jun 4, 2018
config/regex.js
Outdated
| @@ -49,6 +49,8 @@ module.exports = { | |||
| // Can be ~pr, ~commit, or ~commit:branchName, or ~sd@123:component | |||
| // Note: if you modify this regex, you must modify `sdJoi` definition in the `config/job.js` | |||
| TRIGGER: /^~(sd@\d+:[\w-]+|pr|commit(:(.+))?)$/, | |||
| // Can be ~commit or ~commit:master | |||
There was a problem hiding this comment.
~commit:branchName is better.
There was a problem hiding this comment.
Thanks I will fix this comment too
tk3fftk
reviewed
Jun 4, 2018
config/job.js
Outdated
| name: 'commitBranch', | ||
| validate(params, value, state, options) { | ||
| const matched = Regex.TRIGGER.exec(value); | ||
| const brFilter = matched[3]; |
…into commit-br-regex
tk3fftk
reviewed
Jun 5, 2018
config/job.js
Outdated
| validate(params, value, state, options) { | ||
| const regexPos = 3; | ||
| const matched = Regex.TRIGGER.exec(value); | ||
| const brFilter = matched[regexPos]; |
There was a problem hiding this comment.
I think we should also add comments to these parsing.
There was a problem hiding this comment.
Sorry my variable name is not good I will fix the name regexPos to specificBranchPos.
After this correction and see the Regex.TRIGGER, maybe this code give you a sense.
Is this OK?
catto
changed the title
…into commit-br-regex
tkyi
reviewed
Jun 8, 2018
config/job.js
Outdated
| { | ||
| name: 'commitBranch', | ||
| validate(params, value, state, options) { | ||
| const specificBranchPos = 3; |
There was a problem hiding this comment.
I think it's more clear this is a constant/hardcoded value if you put it in all caps like https://github.com/screwdriver-cd/executor-k8s-vm/blob/master/index.js#L14
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.
Context
SCM Branch-specific jobs
Objective
This PR adds regex validation of commit branch filter (e.g.
/^user-.*$/).References