services/git:bugfix - error git diff breaking parse and invalid filepath #838
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
nathanmartinszup
force-pushed
the
bugfix/commit-author
branch
3 times, most recently
from
259fe2b to
311c7ca
Compare
nathanmartinszup
requested review from
iancardosozup,
lucasbrunozup,
matheusalcantarazup and
wiliansilvazup
as code owners
matheusalcantarazup
suggested changes
Dec 3, 2021
nathanmartinszup
force-pushed
the
bugfix/commit-author
branch
from
311c7ca to
073cde2
Compare
Done! |
iancardosozup
approved these changes
Dec 3, 2021
Signed-off-by: Nathan Martins <nathan.martins@zup.com.br>
nathanmartinszup
force-pushed
the
bugfix/commit-author
branch
from
073cde2 to
a650257
Compare
nathanmartinszup
commented
Dec 3, 2021
Comment on lines
-147
to
-154
| func (g *Git) getCleanOutput(output []byte) []byte { | ||
| // Output from git log contains the diff changes | ||
| // so we need to extract only the json output data. | ||
| if idx := bytes.LastIndex(output, []byte("}")); idx >= 0 { | ||
| return bytes.ReplaceAll(output[:idx+1], []byte("^^^^^"), []byte(`"`)) | ||
| } | ||
| logger.LogWarn(fmt.Sprintf("Could not to clean git blame output: %s", output)) | ||
| return []byte("") |
There was a problem hiding this comment.
I took a closer look at the code and saw this function with some unnecessary stuff. Changed to just relace the carets.
matheusalcantarazup
approved these changes
Dec 3, 2021
nathanmartinszup
added a commit
that referenced
this pull request
Dec 3, 2021
…ath (#838) Signed-off-by: Nathan Martins <nathan.martins@zup.com.br>
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.
Signed-off-by: Nathan Martins nathan.martins@zup.com.br
- What I did
Changing function that removes default src/ horusec folder from filepath to prevent it being reported as
/hcl/example1/main.tf, which will be looked up from root and break git blame function. Now it will return the correted pathlike this
hcl/example1/main.tfAdded flag
--no-patchinto git blame function to avoid diff info. Without it, in some cases will return extra information and break the json parse. Following the example of the output that results in error.- How to verify it
- Description for the changelog