Remove unneeded args (#42)

Author: joachimprinzbach

doc/commands/add-pr-comment.md

@@ -2,17 +2,14 @@
 
 # add-pr-comment
 ```
-usage: gitopscli add-pr-comment [-h] [-b BRANCH] [-u USERNAME] [-p PASSWORD]
-                                [-j GIT_USER] [-e GIT_EMAIL] [-c [CREATE_PR]]
-                                [-a [AUTO_MERGE]] -o ORGANISATION -n
-                                REPOSITORY_NAME [-s GIT_PROVIDER]
+usage: gitopscli add-pr-comment [-h] [-u USERNAME] [-p PASSWORD]
+                                [-j GIT_USER] [-e GIT_EMAIL]
+                                -o ORGANISATION -n REPOSITORY_NAME [-s GIT_PROVIDER]
                                 [-w GIT_PROVIDER_URL] -i PR_ID [-x PARENT_ID]
                                 -t TEXT
 
 optional arguments:
   -h, --help            show this help message and exit
-  -b BRANCH, --branch BRANCH
-                        Branch to push the changes to
   -u USERNAME, --username USERNAME
                         Git username if Basic Auth should be used
   -p PASSWORD, --password PASSWORD
@@ -21,12 +18,6 @@ optional arguments:
                         Git Username
   -e GIT_EMAIL, --git-email GIT_EMAIL
                         Git User Email
-  -c [CREATE_PR], --create-pr [CREATE_PR]
-                        Creates a Pull Request (only when --branch is not
-                        master/default branch)
-  -a [AUTO_MERGE], --auto-merge [AUTO_MERGE]
-                        Automatically merge the created PR (only valid with
-                        --create-pr)
   -o ORGANISATION, --organisation ORGANISATION
                         Apps Git organisation/projectKey
   -n REPOSITORY_NAME, --repository-name REPOSITORY_NAME

doc/commands/sync-apps.md

@@ -2,17 +2,14 @@
 
 # sync-apps
 ```
-usage: gitopscli sync-apps [-h] [-b BRANCH] [-u USERNAME] [-p PASSWORD]
-                           [-j GIT_USER] [-e GIT_EMAIL] [-c [CREATE_PR]]
-                           [-a [AUTO_MERGE]] -o ORGANISATION -n
-                           REPOSITORY_NAME [-s GIT_PROVIDER]
+usage: gitopscli sync-apps [-h] [-u USERNAME] [-p PASSWORD]
+                           [-j GIT_USER] [-e GIT_EMAIL]
+                           -o ORGANISATION -n REPOSITORY_NAME [-s GIT_PROVIDER]
                            [-w GIT_PROVIDER_URL] -i ROOT_ORGANISATION -r
                            ROOT_REPOSITORY_NAME
 
 optional arguments:
   -h, --help            show this help message and exit
-  -b BRANCH, --branch BRANCH
-                        Branch to push the changes to
   -u USERNAME, --username USERNAME
                         Git username if Basic Auth should be used
   -p PASSWORD, --password PASSWORD
@@ -21,12 +18,6 @@ optional arguments:
                         Git Username
   -e GIT_EMAIL, --git-email GIT_EMAIL
                         Git User Email
-  -c [CREATE_PR], --create-pr [CREATE_PR]
-                        Creates a Pull Request (only when --branch is not
-                        master/default branch)
-  -a [AUTO_MERGE], --auto-merge [AUTO_MERGE]
-                        Automatically merge the created PR (only valid with
-                        --create-pr)
   -o ORGANISATION, --organisation ORGANISATION
                         Apps Git organisation/projectKey
   -n REPOSITORY_NAME, --repository-name REPOSITORY_NAME

gitopscli/cliparser.py

@@ -44,6 +44,7 @@ def __add_deploy_command_parser(subparsers):
     )
 
     __add_git_parser_args(deploy_p)
+    __add_branch_pr_parser_args(deploy_p)
 
 
 def __add_sync_apps_command_parser(subparsers):
@@ -65,15 +66,27 @@ def __add_pr_comment_command_parser(subparsers):
 def __add_create_preview_command_parser(subparsers):
     add_create_preview_p = subparsers.add_parser("create-preview", help="Create a preview environment")
     __add_git_parser_args(add_create_preview_p)
+    __add_branch_pr_parser_args(add_create_preview_p)
     __add_create_prid_parser(add_create_preview_p)
 
 
 def __add_git_parser_args(deploy_p):
-    deploy_p.add_argument("-b", "--branch", help="Branch to push the changes to", default="master")
     deploy_p.add_argument("-u", "--username", help="Git username if Basic Auth should be used")
     deploy_p.add_argument("-p", "--password", help="Git password if Basic Auth should be used")
     deploy_p.add_argument("-j", "--git-user", help="Git Username", default="GitOpsCLI")
     deploy_p.add_argument("-e", "--git-email", help="Git User Email", default="gitopscli@baloise.dev")
+    deploy_p.add_argument("-o", "--organisation", help="Apps Git organisation/projectKey", required=True)
+    deploy_p.add_argument(
+        "-n", "--repository-name", help="Git repository name (not the URL, e.g. my-repo)", required=True
+    )
+    deploy_p.add_argument("-s", "--git-provider", help="Git server provider", default="bitbucket-server")
+    deploy_p.add_argument(
+        "-w", "--git-provider-url", help="Git provider base API URL (e.g. https://bitbucket.example.tld)"
+    )
+
+
+def __add_branch_pr_parser_args(deploy_p):
+    deploy_p.add_argument("-b", "--branch", help="Branch to push the changes to", default="master")
     deploy_p.add_argument(
         "-c",
         "--create-pr",
@@ -92,14 +105,6 @@ def __add_git_parser_args(deploy_p):
         const=True,
         default=False,
     )
-    deploy_p.add_argument("-o", "--organisation", help="Apps Git organisation/projectKey", required=True)
-    deploy_p.add_argument(
-        "-n", "--repository-name", help="Git repository name (not the URL, e.g. my-repo)", required=True
-    )
-    deploy_p.add_argument("-s", "--git-provider", help="Git server provider", default="bitbucket-server")
-    deploy_p.add_argument(
-        "-w", "--git-provider-url", help="Git provider base API URL (e.g. https://bitbucket.example.tld)"
-    )
 
 
 def __add_create_prid_parser(subparsers):