Skip to content
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

Resetting the list of orgs to include or exclude in the search for each image #326

Merged
merged 7 commits into from
Mar 10, 2022
Merged

Resetting the list of orgs to include or exclude in the search for each image #326

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9f36c2
Resetting the list for each image
avimanyum Mar 8, 2022
325364c
Making local copy of map
avimanyum Mar 10, 2022
1c2b568
Merge branch 'master' into reset_exclude_list
avimanyum Mar 10, 2022
5b9fe73
Removing unnecessary change
avimanyum Mar 10, 2022
6db0772
Merge branch 'reset_exclude_list' of github.com:avimanyum/dockerfile-…
avimanyum Mar 10, 2022
b91477f
Adding tests
avimanyum Mar 10, 2022
9ea7bc8
Addressing PR comments
avimanyum Mar 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
7 changes: 4 additions & 3 deletions ...update/src/main/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,11 @@ protected Optional<List<PagedSearchIterable<GHContent>>> getSearchResultsExcludi
Optional<List<PagedSearchIterable<GHContent>>> contentsForOrgWithMaximumHits;
contentsForOrgWithMaximumHits = findFilesWithImage(image, orgsToInclude, gitApiSearchLimit);

orgsToExclude.put(orgWithMaximumHits, false);
log.info("Running search by excluding the orgs {}.", orgsToExclude.keySet().toString());
final Map<String, Boolean> orgsToExcludeFromSearch = new HashMap(orgsToExclude);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll want to use new HashMap<>(orgsToExclude) otherwise you'll get type warnings during compilation.

orgsToExcludeFromSearch.put(orgWithMaximumHits, false);
log.info("Running search by excluding the orgs {}.", orgsToExcludeFromSearch.keySet());
Optional<List<PagedSearchIterable<GHContent>>> contentsExcludingOrgWithMaximumHits;
contentsExcludingOrgWithMaximumHits = findFilesWithImage(image, orgsToExclude, gitApiSearchLimit);
contentsExcludingOrgWithMaximumHits = findFilesWithImage(image, orgsToExcludeFromSearch, gitApiSearchLimit);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is longer than 100 characters (found 116).

if (contentsForOrgWithMaximumHits.isPresent()) {
allContentsWithImage.addAll(contentsForOrgWithMaximumHits.get());
}
Expand Down
1 change: 1 addition & 0 deletions ...te/src/test/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ public void getSearchResultsExcludingOrgWithMostHits() throws Exception {
Map<String, Boolean> orgsToIncludeOrExclude = new HashMap<>();

assertEquals((dockerfileGitHubUtil.getSearchResultsExcludingOrgWithMostHits("image", contentsWithImage, orgsToIncludeOrExclude, 1000)).get().size(), 2);
assertEquals(orgsToIncludeOrExclude.size(), 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: We might want to add a small comment as to why we are checking for this condition.

}

@Test
Expand Down