Adding checks to see if git org is null.

salesforce · Nov 8, 2021 · dc9f5bc · dc9f5bc
1 parent 8d806a7
commit dc9f5bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...image-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/All.java b/...image-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/All.java
@@ -51,7 +51,12 @@ public void execute(final Namespace ns, final DockerfileGitHubUtil dockerfileGit
         Integer gitApiSearchLimit = ns.get(Constants.GIT_API_SEARCH_LIMIT);
         List<IOException> exceptions = new ArrayList<>();
         Map<String, Boolean> orgsToIncludeInSearch = new HashMap<>();
-        orgsToIncludeInSearch.put(ns.get(Constants.GIT_ORG), true);
+        if (ns.get(Constants.GIT_ORG) != null) {
+            // If there is a Git org specified, that needs to be included in the search query. In
+            // the orgsToIncludeInSearch a true value associated with an org name ensures that
+            // the org gets included in the search query.
+            orgsToIncludeInSearch.put(ns.get(Constants.GIT_ORG), true);
+        }
         for (Map.Entry<String, JsonElement> imageToTag : imageToTagStore) {
             String image = imageToTag.getKey();
             log.info("Repositories with image {} being forked.", image);

diff --git a/...update/src/main/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtil.java b/...update/src/main/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtil.java
@@ -407,7 +407,12 @@ public Optional<List<PagedSearchIterable<GHContent>>> getGHContents(String org,
             throws IOException, InterruptedException {
         Optional<List<PagedSearchIterable<GHContent>>> contentsWithImage = Optional.empty();
         Map<String, Boolean> orgsToIncludeInSearch = new HashMap<>();
-        orgsToIncludeInSearch.put(org, true);
+        if (org != null) {
+            // If there is a Git org specified, that needs to be included in the search query. In
+            // the orgsToIncludeInSearch a true value associated with an org name ensures that
+            // the org gets included in the search query.
+            orgsToIncludeInSearch.put(org, true);
+        }
         for (int i = 0; i < 5; i++) {
             contentsWithImage = findFilesWithImage(img, orgsToIncludeInSearch, gitApiSearchLimit);
             if (contentsWithImage