Merge branch 'vishmegh88-bugFix/argumentsNotUsed'

salesforce · Jul 26, 2018 · 9e7909a · 9e7909a
2 parents 5304960 + 3953302
commit 9e7909a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/CommandLine.java b/dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/CommandLine.java
@@ -56,10 +56,10 @@ static ArgumentParser getArgumentParser() {
         ArgumentParser parser = ArgumentParsers.newArgumentParser("dockerfile-image-update", true)
                 .description("Image Updates through Pull Request Automator");
 
-        parser.addArgument("-o", "--org")
+        parser.addArgument("-o", "--" + Constants.GIT_ORG)
                 .help("search within specific organization (default: all of github)");
         /* Currently, because of argument passing reasons, you can only specify one branch. */
-        parser.addArgument("-b", "--branch")
+        parser.addArgument("-b", "--" + Constants.GIT_BRANCH)
                 .help("make pull requests for given branch name (default: master)");
         parser.addArgument("-g", "--" + Constants.GIT_API)
                 .help("link to github api; overrides environment variable");

diff --git a/...file-image-update/src/main/java/com/salesforce/dockerfileimageupdate/utils/Constants.java b/...file-image-update/src/main/java/com/salesforce/dockerfileimageupdate/utils/Constants.java
@@ -26,11 +26,11 @@ private Constants () { }
     public static final String TAG = "<TAG>";
     public static final String FORCE_TAG = "<FORCE_TAG>";
     public static final String GIT_API = "ghapi";
+    public static final String GIT_ORG = "org";
+    public static final String GIT_BRANCH = "branch";
     public static final String BASE_IMAGE_INST = "FROM";
     public static final String PULL_REQ_ID = "f9ed6ea5-6e74-4338-a629-50c5c6807a6b";
     public static final String STORE_JSON_FILE = "store.json";
-    public static final String GIT_ORG = "o";
-    public static final String GIT_BRANCH = "b";
     public static final String GIT_AUTO_MERGE = "f";
     public static final String GIT_PR_TITLE = "m";
     public static final String GIT_ADDITIONAL_COMMIT_MESSAGE = "c";