Skip to content

Minor bug fixes #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2022
Merged

Minor bug fixes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
722e4c7
update expected results
Oct 10, 2022
860ef50
adding workaround for all-zero commit
Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/self-test-and-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
if: steps.iam-role.outcome == 'success'
shell: bash
env:
EXPECTED: 102
EXPECTED: 103
run: |
[[ $(jq -r '.runs[0].results[].ruleId' code-guru/recommendations.sarif.json | wc -l) -eq $EXPECTED ]] || { echo "Expected $EXPECTED recommendations but got $(jq -r '.runs[0].results[].ruleId' code-guru/recommendations.sarif.json | wc -l)"; exit 1; }

Expand Down
13 changes: 10 additions & 3 deletions src/main/java/com/amazonaws/gurureviewercli/adapter/GitAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
*/
public final class GitAdapter {

private static final String GITHUB_UNKNOWN_COMMIT = "0000000000000000000000000000000000000000";
// this is the sha for an empty commit, so any diff against this will return the full repo content.
private static final String GITHUB_EMPTY_COMMIT_SHA = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";

@Nonnull
public static GitMetaData getGitMetaData(final Configuration config, final Path pathToRepo) throws IOException {
val gitDir = pathToRepo.toRealPath().resolve(".git");
Expand Down Expand Up @@ -122,20 +126,23 @@ private static Collection<Path> getChangedFiles(final Repository repository) thr

private static boolean validateCommits(final Configuration config, final Repository repo)
throws GitAPIException {
String beforeCommitSha = config.getBeforeCommit();
if (GITHUB_UNKNOWN_COMMIT.equals(config.getBeforeCommit())) {
beforeCommitSha = GITHUB_EMPTY_COMMIT_SHA;
}

val beforeTreeIter = treeForCommitId(repo, config.getBeforeCommit());
val beforeTreeIter = treeForCommitId(repo, beforeCommitSha);
val afterTreeIter = treeForCommitId(repo, config.getAfterCommit());

// Resolve git constants, such as HEAD^^ to the actual commit hash
config.setBeforeCommit(resolveSha(repo, config.getBeforeCommit()));
config.setBeforeCommit(resolveSha(repo, beforeCommitSha));
config.setAfterCommit(resolveSha(repo, config.getAfterCommit()));

val diffEntries = new Git(repo).diff().setOldTree(beforeTreeIter).setNewTree(afterTreeIter).call();
if (diffEntries.isEmpty()) {
throw new GuruCliException(ErrorCodes.GIT_EMPTY_DIFF, String.format("No difference between {} and {}",
beforeTreeIter, afterTreeIter));
}

return true;
}

Expand Down