Merge pull request #47 from salesforce/log-if-skipping-archived-repo

Log if skipping an archived repo with Dockerfiles
salesforce · Jan 30, 2019 · c05b1bb · c05b1bb
2 parents 904c630 + aec6f40
commit c05b1bb
Show file tree

Hide file tree

Showing 4 changed files with 8 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
@@ -188,6 +188,9 @@ protected void changeDockerfiles(Namespace ns,
         GHRepository parent = forkedRepo.getParent();
 
         if (parent == null || !pathToDockerfilesInParentRepo.containsKey(parent.getFullName()) || parent.isArchived()) {
+            if (parent != null && parent.isArchived()) {
+                log.info("Skipping archived repo: {}", parent.getFullName());
+            }
             return;
         }
 

diff --git a/...ge-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/Parent.java b/...ge-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/Parent.java
@@ -175,6 +175,9 @@ protected void changeDockerfiles(Namespace ns,
         GHRepository parent = forkedRepo.getParent();
 
         if (parent == null || !pathToDockerfilesInParentRepo.containsKey(parent.getFullName()) || parent.isArchived()) {
+            if (parent != null && parent.isArchived()) {
+                log.info("Skipping archived repo: {}", parent.getFullName());
+            }
             return;
         }
         log.info("Fixing Dockerfiles in {}", forkedRepo.getFullName());

diff --git a/...e-update/src/test/java/com/salesforce/dockerfileimageupdate/subcommands/impl/AllTest.java b/...e-update/src/test/java/com/salesforce/dockerfileimageupdate/subcommands/impl/AllTest.java
@@ -395,6 +395,6 @@ public void checkPullRequestNotMadeForArchived() throws Exception {
         Mockito.verify(dockerfileGitHubUtil, Mockito.never())
                 .createPullReq(Mockito.any(), anyString(), Mockito.any(), anyString());
         //Make sure we at least check if its archived
-        Mockito.verify(parentRepo, Mockito.times(1)).isArchived();
+        Mockito.verify(parentRepo, Mockito.times(2)).isArchived();
     }
 }
diff --git a/...pdate/src/test/java/com/salesforce/dockerfileimageupdate/subcommands/impl/ParentTest.java b/...pdate/src/test/java/com/salesforce/dockerfileimageupdate/subcommands/impl/ParentTest.java
@@ -406,6 +406,6 @@ public void checkPullRequestNotMadeForArchived() throws Exception {
         Mockito.verify(dockerfileGitHubUtil, Mockito.never())
                 .createPullReq(Mockito.any(), anyString(), Mockito.any(), anyString());
         //Make sure we at least call the isArchived.
-        Mockito.verify(parentRepo, Mockito.times(1)).isArchived();
+        Mockito.verify(parentRepo, Mockito.times(2)).isArchived();
     }
 }