Merge pull request #326 from avimanyum/reset_exclude_list

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

Author: afalko

dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtil.java

@@ -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);
+        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);
         if (contentsForOrgWithMaximumHits.isPresent()) {
             allContentsWithImage.addAll(contentsForOrgWithMaximumHits.get());
         }

dockerfile-image-update/src/test/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtilTest.java

@@ -330,6 +330,8 @@ public void getSearchResultsExcludingOrgWithMostHits() throws Exception {
         Map<String, Boolean> orgsToIncludeOrExclude = new HashMap<>();
 
         assertEquals((dockerfileGitHubUtil.getSearchResultsExcludingOrgWithMostHits("image", contentsWithImage, orgsToIncludeOrExclude, 1000)).get().size(), 2);
+        //This check ensures that the parameter passed to the method is not modified. Instead, the method creates a local copy of the map and modifies that.
+        assertEquals(orgsToIncludeOrExclude.size(), 0);
     }
 
     @Test