Updated to support different branch name for different file type run

pchugh17 · pchugh17 · commit 87f8fcc78537 · 2023-01-23T19:14:54.000+05:30
diff --git a/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/model/GitForkBranch.java b/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/model/GitForkBranch.java
@@ -1,5 +1,8 @@
 package com.salesforce.dockerfileimageupdate.model;
 
+import com.salesforce.dockerfileimageupdate.utils.Constants;
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * Converts an imageName to a branchName. Primary conversion necessary is : to -
  * Also support backward compatible method of specifying a branch
@@ -9,11 +12,12 @@
  */
 public class GitForkBranch {
     private final String branchPrefix;
+    private final String branchSuffix;
     private final String imageName;
     private final String imageTag;
     private final boolean specifiedBranchOverride;
 
-    public GitForkBranch(String imageName, String imageTag, String specifiedBranch) {
+    public GitForkBranch(String imageName, String imageTag, String specifiedBranch, String filenamesSearchedFor) {
         this.imageTag = (imageTag == null || imageTag.trim().isEmpty()) ? "" : imageTag.trim();
         this.imageName = (imageName == null || imageName.trim().isEmpty()) ? "" : imageName.trim();
         if (specifiedBranch == null || specifiedBranch.trim().isEmpty()) {
@@ -22,9 +26,11 @@ public GitForkBranch(String imageName, String imageTag, String specifiedBranch)
             }
             this.branchPrefix = this.imageName.replace(":", "-").toLowerCase();
             this.specifiedBranchOverride = false;
+            this.branchSuffix = getBranchSuffix(StringUtils.isNotBlank(filenamesSearchedFor) ? filenamesSearchedFor.toLowerCase():filenamesSearchedFor);
         } else {
             this.branchPrefix = specifiedBranch;
             this.specifiedBranchOverride = true;
+            this.branchSuffix = "";
         }
     }
 
@@ -71,9 +77,9 @@ public boolean useSpecifiedBranchOverride() {
      */
     public String getBranchName() {
         if (this.imageTag == null || this.imageTag.trim().isEmpty()) {
-            return this.branchPrefix;
+            return this.branchPrefix + this.branchSuffix;
         } else {
-            return this.branchPrefix + "-" + this.imageTag;
+            return this.branchPrefix + "-" + this.imageTag + this.branchSuffix;
         }
     }
 
@@ -84,4 +90,18 @@ public String getImageName() {
     public String getImageTag() {
         return imageTag;
     }
+
+    private String getBranchSuffix(String filenamesSearchedFor) {
+        // To avoid branch with same imageName-tag getting overwritten in case multiple runs(with different file types)
+        // on same image tag store, adding suffix to branch name
+        if (StringUtils.isBlank(filenamesSearchedFor)) {
+            return "";
+        } else if (filenamesSearchedFor.contains(Constants.FILENAME_DOCKERFILE) && !filenamesSearchedFor.contains(Constants.FILENAME_DOCKER_COMPOSE)) {
+            return "_dockerfile";
+        } else if (filenamesSearchedFor.contains(Constants.FILENAME_DOCKER_COMPOSE) && !filenamesSearchedFor.contains(Constants.FILENAME_DOCKERFILE)) {
+            return "_dockercompose";
+        } else {
+            return "";
+        }
+    }
 }
diff --git a/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/process/GitHubPullRequestSender.java b/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/process/GitHubPullRequestSender.java
@@ -79,7 +79,7 @@ public Multimap<String, GitHubContentToProcess> forkRepositoriesFoundAndGetPathT
 
         log.info("Out of {} content search results processed, {} were deemed eligible for forking to yield {} repositories to fork.",
                 totalContentsFound, contentsShouldFork, pathToDockerfilesInParentRepo.keys().size());
-        log.info("Path to Dockerfiles in repos: {}", pathToDockerfilesInParentRepo);
+        log.info("Path to files in repos: {}", pathToDockerfilesInParentRepo);
 
         return pathToDockerfilesInParentRepo;
     }
diff --git a/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/search/GitHubImageSearchTermList.java b/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/search/GitHubImageSearchTermList.java
@@ -1,6 +1,7 @@
 package com.salesforce.dockerfileimageupdate.search;
 
 import com.google.common.collect.ImmutableList;
+import com.salesforce.dockerfileimageupdate.utils.Constants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -95,7 +96,7 @@ static ProcessingState processDomainPartOfImage(String domain, String filenames)
         if (domain == null || domain.trim().isEmpty()) {
             return state;
         } else {
-            if (filenames.equalsIgnoreCase("Dockerfile")) {
+            if (filenames.equalsIgnoreCase(Constants.FILENAME_DOCKERFILE)) {
                 state.addToCurrentTerm("FROM ");
             }
             if (domain.contains("-")) {
diff --git a/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/All.java b/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/All.java
@@ -83,7 +83,7 @@ protected Optional<Exception> processImageWithTag(String image, String tag, Name
             GitForkBranch gitForkBranch = getGitForkBranch(image, tag, ns);
             String filenamesToSearch = ns.get(Constants.FILE_NAMES_TO_SEARCH);
 
-            log.info("Finding Dockerfiles with the image name {}...", image);
+            log.info("Finding files:{} with the image name {}...", filenamesToSearch, image);
             Optional<List<PagedSearchIterable<GHContent>>> contentsWithImage =
                     this.dockerfileGitHubUtil.findFilesWithImage(image, orgsToIncludeInSearch, gitApiSearchLimit, filenamesToSearch);
             if (contentsWithImage.isPresent()) {
@@ -138,7 +138,7 @@ protected GitHubPullRequestSender getPullRequestSender(DockerfileGitHubUtil dock
     }
 
     protected GitForkBranch getGitForkBranch(String image, String tag, Namespace ns){
-        return new GitForkBranch(image, tag, ns.get(Constants.GIT_BRANCH));
+        return new GitForkBranch(image, tag, ns.get(Constants.GIT_BRANCH), ns.get(Constants.FILE_NAMES_TO_SEARCH));
     }
 
     protected PullRequests getPullRequests(){
diff --git a/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/Child.java b/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/Child.java
@@ -56,7 +56,7 @@ public void execute(final Namespace ns, final DockerfileGitHubUtil dockerfileGit
             return;
         }
 
-        GitForkBranch gitForkBranch = new GitForkBranch(img, forceTag, branch);
+        GitForkBranch gitForkBranch = new GitForkBranch(img, forceTag, branch, ns.get(Constants.FILE_NAMES_TO_SEARCH));
         PullRequestInfo pullRequestInfo =
                 new PullRequestInfo(ns.get(Constants.GIT_PR_TITLE),
                         gitForkBranch.getImageName(),
diff --git a/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/Parent.java b/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/subcommands/impl/Parent.java
@@ -89,7 +89,7 @@ protected PullRequests getPullRequests(){
     }
 
     protected GitForkBranch getGitForkBranch(Namespace ns){
-        return new GitForkBranch(ns.get(Constants.IMG), ns.get(Constants.TAG), ns.get(Constants.GIT_BRANCH));
+        return new GitForkBranch(ns.get(Constants.IMG), ns.get(Constants.TAG), ns.get(Constants.GIT_BRANCH), ns.get(Constants.FILE_NAMES_TO_SEARCH));
     }
 
     protected GitHubPullRequestSender getPullRequestSender(DockerfileGitHubUtil dockerfileGitHubUtil, Namespace ns){
diff --git a/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/utils/Constants.java b/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/utils/Constants.java
@@ -48,4 +48,6 @@ private Constants() {
     public static final Duration DEFAULT_RATE_LIMIT_DURATION = Duration.ofMinutes(DEFAULT_RATE_LIMIT);
     //token adding rate(here:a token added every 2 minutes in the bucket)
     public static final Duration DEFAULT_TOKEN_ADDING_RATE = Duration.ofMinutes(DEFAULT_CONSUMING_TOKEN_RATE);
+    public static final String FILENAME_DOCKERFILE = "dockerfile";
+    public static final String FILENAME_DOCKER_COMPOSE = "docker-compose";
 }
diff --git a/dockerfile-image-update/src/test/java/com/salesforce/dockerfileimageupdate/model/GitForkBranchTest.java b/dockerfile-image-update/src/test/java/com/salesforce/dockerfileimageupdate/model/GitForkBranchTest.java
@@ -19,7 +19,7 @@ public Object[][] imageNameAndExpectedBranch() {
 
     @Test(dataProvider = "imageNameAndExpectedBranch")
     public void testGetBranchNameForImageTagCombos(String imageName, String imageTag, String expectedResult) {
-        assertEquals(new GitForkBranch(imageName, imageTag, "").getBranchName(), expectedResult);
+        assertEquals(new GitForkBranch(imageName, imageTag, "", "Dockerfile,docker-compose").getBranchName(), expectedResult);
     }
 
     @DataProvider
@@ -35,7 +35,7 @@ public Object[][] imageNameAndSpecifiedBranches() {
 
     @Test(dataProvider = "imageNameAndSpecifiedBranches")
     public void testGetBranchNameForImageSpecifiedBranchCombos(String imageName, String imageTag, String specifiedBranch, String expectedResult) {
-        assertEquals(new GitForkBranch(imageName, imageTag, specifiedBranch).getBranchName(), expectedResult);
+        assertEquals(new GitForkBranch(imageName, imageTag, specifiedBranch, "Dockerfile,docker-compose").getBranchName(), expectedResult);
     }
 
     @DataProvider
@@ -61,11 +61,29 @@ public Object[][] sameBranchOrImageNamePrefix() {
 
     @Test(dataProvider = "sameBranchOrImageNamePrefix")
     public void testIsSameBranchOrHasImageNamePrefix(String imageName, String imageTag, String specifiedBranch, String inputBranch, boolean expectedResult) {
-        assertEquals(new GitForkBranch(imageName, imageTag, specifiedBranch).isSameBranchOrHasImageNamePrefix(inputBranch), expectedResult);
+        assertEquals(new GitForkBranch(imageName, imageTag, specifiedBranch, "Dockerfile,docker-compose").isSameBranchOrHasImageNamePrefix(inputBranch), expectedResult);
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class)
     public void testIsSameBranchOrHasImageNamePrefix() {
-        new GitForkBranch("", "1", "");
+        new GitForkBranch("", "1", "", null);
+    }
+
+    @DataProvider
+    public Object[][] imageNameSpecifiedBranchAndFilenameSearched() {
+        return new Object[][]{
+                /*{"docker.io/some/container",     "",     "blah", "dockerfile", "blah"},
+                {"127.0.0.1:443/some/container", "",     "test", "dockerfile,docker-compose", "test"},
+                {"docker.io/some/container",     "123",  "",     "dockerfile", "docker.io/some/container-123_dockerfile"},
+                {"docker.io/some/container",     "123",  "",     "dockerfile,docker-compose", "docker.io/some/container-123"},
+                {"docker.io/some/container",     "123",  "",     "docker-compose", "docker.io/some/container-123_dockercompose"},
+                {"docker.io/some/container",     "   ",  null,   "abcdef", "docker.io/some/container"},*/
+                {"docker.io/some/container",     null,   "",     "docker-compose", "docker.io/some/container_dockercompose"},
+        };
+    }
+
+    @Test(dataProvider = "imageNameSpecifiedBranchAndFilenameSearched")
+    public void testGetBranchNameForFileNamesSearched(String imageName, String imageTag, String specifiedBranch, String filenameSearchedFor, String expectedResult) {
+        assertEquals(new GitForkBranch(imageName, imageTag, specifiedBranch, filenameSearchedFor).getBranchName(), expectedResult);
     }
 }
diff --git a/dockerfile-image-update/src/test/java/com/salesforce/dockerfileimageupdate/process/ForkableRepoValidatorTest.java b/dockerfile-image-update/src/test/java/com/salesforce/dockerfileimageupdate/process/ForkableRepoValidatorTest.java
@@ -146,7 +146,7 @@ public void testContentHasChangesInDefaultBranch() throws InterruptedException,
         ForkableRepoValidator validator = new ForkableRepoValidator(dockerfileGitHubUtil);
         GHContent content = mock(GHContent.class);
         when(content.getPath()).thenReturn("/Dockerfile");
-        GitForkBranch gitForkBranch = new GitForkBranch("someImage", "someTag", null);
+        GitForkBranch gitForkBranch = new GitForkBranch("someImage", "someTag", null, "Dockerfile");
         when(dockerfileGitHubUtil.tryRetrievingContent(eq(repo), any(), any())).thenReturn(content);
         InputStream inputStream = new ByteArrayInputStream("FROM someImage".getBytes());
         when(content.read()).thenReturn(inputStream);
@@ -161,7 +161,7 @@ public void testInterruptedExceptionWhenRetrievingContentInDefaultBranch() throw
         ForkableRepoValidator validator = new ForkableRepoValidator(dockerfileGitHubUtil);
         GHContent content = mock(GHContent.class);
         when(content.getPath()).thenReturn("/Dockerfile");
-        GitForkBranch gitForkBranch = new GitForkBranch("someImage", "someTag", null);
+        GitForkBranch gitForkBranch = new GitForkBranch("someImage", "someTag", null, "Dockerfile");
         when(dockerfileGitHubUtil.tryRetrievingContent(eq(repo), any(), any())).thenThrow(new InterruptedException("some exception"));
 
         assertEquals(validator.contentHasChangesInDefaultBranch(repo, content, gitForkBranch), shouldForkResult());
@@ -176,7 +176,7 @@ public void testContentHasNoChangesInDefaultBranch() throws InterruptedException
         String searchContentPath = "/Dockerfile";
         when(content.getPath()).thenReturn(searchContentPath);
         String imageName = "someImage";
-        GitForkBranch gitForkBranch = new GitForkBranch(imageName, "someTag", null);
+        GitForkBranch gitForkBranch = new GitForkBranch(imageName, "someTag", null, "Dockerfile");
         when(dockerfileGitHubUtil.tryRetrievingContent(eq(repo), any(), any())).thenReturn(content);
         InputStream inputStream = new ByteArrayInputStream("nochanges".getBytes());
         when(content.read()).thenReturn(inputStream);
@@ -193,7 +193,7 @@ public void testCouldNotFindContentInDefaultBranch() throws InterruptedException
         GHContent content = mock(GHContent.class);
         String searchContentPath = "/Dockerfile";
         when(content.getPath()).thenReturn(searchContentPath);
-        GitForkBranch gitForkBranch = new GitForkBranch("someImage", "someTag", null);
+        GitForkBranch gitForkBranch = new GitForkBranch("someImage", "someTag", null, "Dockerfile,docker-compose");
         when(dockerfileGitHubUtil.tryRetrievingContent(eq(repo), any(), any())).thenReturn(null);
         InputStream inputStream = new ByteArrayInputStream("FROM someImage".getBytes());
 
@@ -223,7 +223,7 @@ public void testHasNoChanges(String contentText, String imageName, String imageT
         ForkableRepoValidator validator = new ForkableRepoValidator(dockerfileGitHubUtil);
         GHContent content = mock(GHContent.class);
         InputStream inputStream = new ByteArrayInputStream(contentText.getBytes());
-        GitForkBranch gitForkBranch = new GitForkBranch(imageName, imageTag, null);
+        GitForkBranch gitForkBranch = new GitForkBranch(imageName, imageTag, null,"docker-compose");
 
         when(content.read()).thenReturn(inputStream);
 
@@ -237,7 +237,7 @@ public void testHasNoChangesIfExceptionThrownDuringRead() throws IOException {
         GHRepository repo = mock(GHRepository.class);
         ForkableRepoValidator validator = new ForkableRepoValidator(dockerfileGitHubUtil);
         GHContent content = mock(GHContent.class);
-        GitForkBranch gitForkBranch = new GitForkBranch("name", "tag", null);
+        GitForkBranch gitForkBranch = new GitForkBranch("name", "tag", null, "");
 
         when(content.read()).thenThrow(new IOException("failed on IO"));
 
diff --git a/dockerfile-image-update/src/test/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtilTest.java b/dockerfile-image-update/src/test/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtilTest.java
@@ -118,8 +118,7 @@ public void testReturnPullRequestForBranch() {
         GHPullRequestQueryBuilder queryBuilder = getGHPullRequestQueryBuilder(imageName, Optional.of(ghPullRequest));
         GHRepository parent = mock(GHRepository.class);
         when(parent.queryPullRequests()).thenReturn(queryBuilder);
-        GitForkBranch gitForkBranch = new GitForkBranch(imageName, "", null);
-
+        GitForkBranch gitForkBranch = new GitForkBranch(imageName, "", null, "Dockerfile,docker-compose");
 
         gitHubUtil = mock(GitHubUtil.class);
         dockerfileGitHubUtil = new DockerfileGitHubUtil(gitHubUtil);
@@ -133,7 +132,7 @@ public void testNoPullRequestForBranch() {
         GHPullRequestQueryBuilder queryBuilder = getGHPullRequestQueryBuilder(imageName, Optional.empty());
         GHRepository parent = mock(GHRepository.class);
         when(parent.queryPullRequests()).thenReturn(queryBuilder);
-        GitForkBranch gitForkBranch = new GitForkBranch(imageName, "", null);
+        GitForkBranch gitForkBranch = new GitForkBranch(imageName, "", null, "Dockerfile,docker-compose");
 
 
         gitHubUtil = mock(GitHubUtil.class);
@@ -782,7 +781,7 @@ public void testCreateOrUpdateForkBranchToParentDefaultHasBranch() throws IOExce
         when(parentBranch.getSHA1()).thenReturn(sha);
         when(parent.getBranch(defaultBranch)).thenReturn(parentBranch);
         GHRepository fork = mock(GHRepository.class);
-        GitForkBranch gitForkBranch = new GitForkBranch("imageName", "imageTag", null);
+        GitForkBranch gitForkBranch = new GitForkBranch("imageName", "imageTag", null, "Dockerfile");
         when(gitHubUtil.repoHasBranch(fork, gitForkBranch.getBranchName())).thenReturn(true);
         GHRef returnedRef = mock(GHRef.class);
         when(fork.getRef(anyString())).thenReturn(returnedRef);
@@ -804,7 +803,7 @@ public void testCreateOrUpdateForkBranchToParentDefaultDoesNotHaveBranch() throw
         when(parentBranch.getSHA1()).thenReturn(sha);
         when(parent.getBranch(defaultBranch)).thenReturn(parentBranch);
         GHRepository fork = mock(GHRepository.class);
-        GitForkBranch gitForkBranch = new GitForkBranch("imageName", "imageTag", null);
+        GitForkBranch gitForkBranch = new GitForkBranch("imageName", "imageTag", null, "Dockerfile");
         when(gitHubUtil.repoHasBranch(fork, gitForkBranch.getBranchName())).thenReturn(false);
 
         dockerfileGitHubUtil.createOrUpdateForkBranchToParentDefault(parent, fork, gitForkBranch);
@@ -819,7 +818,7 @@ public void testOnePullRequestForMultipleDockerfilesInSameRepo() throws Exceptio
                 "tag", Constants.STORE,
                 "store");
         Namespace ns = new Namespace(nsMap);
-        GitForkBranch gitForkBranch = new GitForkBranch("image", "tag", null);
+        GitForkBranch gitForkBranch = new GitForkBranch("image", "tag", null, "");
         Multimap<String, GitHubContentToProcess> pathToDockerfilesInParentRepo = HashMultimap.create();
         pathToDockerfilesInParentRepo.put("repo1", new GitHubContentToProcess(null, null, "df11"));
         pathToDockerfilesInParentRepo.put("repo1", new GitHubContentToProcess(null, null, "df12"));

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public Multimap<String, GitHubContentToProcess> forkRepositoriesFoundAndGetPathT`
`79`	`79`
`80`	`80`	`log.info("Out of {} content search results processed, {} were deemed eligible for forking to yield {} repositories to fork.",`
`81`	`81`	`totalContentsFound, contentsShouldFork, pathToDockerfilesInParentRepo.keys().size());`
`82`		`- log.info("Path to Dockerfiles in repos: {}", pathToDockerfilesInParentRepo);`
	`82`	`+ log.info("Path to files in repos: {}", pathToDockerfilesInParentRepo);`
`83`	`83`
`84`	`84`	`return pathToDockerfilesInParentRepo;`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ protected Optional<Exception> processImageWithTag(String image, String tag, Name`
`83`	`83`	`GitForkBranch gitForkBranch = getGitForkBranch(image, tag, ns);`
`84`	`84`	`String filenamesToSearch = ns.get(Constants.FILE_NAMES_TO_SEARCH);`
`85`	`85`
`86`		`- log.info("Finding Dockerfiles with the image name {}...", image);`
	`86`	`+ log.info("Finding files:{} with the image name {}...", filenamesToSearch, image);`
`87`	`87`	`Optional<List<PagedSearchIterable<GHContent>>> contentsWithImage =`
`88`	`88`	`this.dockerfileGitHubUtil.findFilesWithImage(image, orgsToIncludeInSearch, gitApiSearchLimit, filenamesToSearch);`
`89`	`89`	`if (contentsWithImage.isPresent()) {`
`@@ -138,7 +138,7 @@ protected GitHubPullRequestSender getPullRequestSender(DockerfileGitHubUtil dock`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`protected GitForkBranch getGitForkBranch(String image, String tag, Namespace ns){`
`141`		`- return new GitForkBranch(image, tag, ns.get(Constants.GIT_BRANCH));`
	`141`	`+ return new GitForkBranch(image, tag, ns.get(Constants.GIT_BRANCH), ns.get(Constants.FILE_NAMES_TO_SEARCH));`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`protected PullRequests getPullRequests(){`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public void execute(final Namespace ns, final DockerfileGitHubUtil dockerfileGit`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`	`58`
`59`		`- GitForkBranch gitForkBranch = new GitForkBranch(img, forceTag, branch);`
	`59`	`+ GitForkBranch gitForkBranch = new GitForkBranch(img, forceTag, branch, ns.get(Constants.FILE_NAMES_TO_SEARCH));`
`60`	`60`	`PullRequestInfo pullRequestInfo =`
`61`	`61`	`new PullRequestInfo(ns.get(Constants.GIT_PR_TITLE),`
`62`	`62`	`gitForkBranch.getImageName(),`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected PullRequests getPullRequests(){`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`protected GitForkBranch getGitForkBranch(Namespace ns){`
`92`		`- return new GitForkBranch(ns.get(Constants.IMG), ns.get(Constants.TAG), ns.get(Constants.GIT_BRANCH));`
	`92`	`+ return new GitForkBranch(ns.get(Constants.IMG), ns.get(Constants.TAG), ns.get(Constants.GIT_BRANCH), ns.get(Constants.FILE_NAMES_TO_SEARCH));`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`protected GitHubPullRequestSender getPullRequestSender(DockerfileGitHubUtil dockerfileGitHubUtil, Namespace ns){`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,6 @@ private Constants() {`
`48`	`48`	`public static final Duration DEFAULT_RATE_LIMIT_DURATION = Duration.ofMinutes(DEFAULT_RATE_LIMIT);`
`49`	`49`	`//token adding rate(here:a token added every 2 minutes in the bucket)`
`50`	`50`	`public static final Duration DEFAULT_TOKEN_ADDING_RATE = Duration.ofMinutes(DEFAULT_CONSUMING_TOKEN_RATE);`
	`51`	`+ public static final String FILENAME_DOCKERFILE = "dockerfile";`
	`52`	`+ public static final String FILENAME_DOCKER_COMPOSE = "docker-compose";`
`51`	`53`	`}`