Issue 7037 - [XTM Integration] Make REST API url customizable

cms/translations/xtm/cli.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 15 matching lines @@
 )
 import cms.translations.xtm.constants as const
 from cms.translations.xtm.projects_handler import (
     create_project, upload_files, download_files,
 )
 from cms.translations.xtm.utils import input_fn, read_token, get_api_url
 from cms.sources import create_source
 
 
 def handle_projects(args):
-    token = read_token()

[Vasily Kuznetsov, 2019/01/10 17:45:23]

Wouldn't it be better to keep this inside of try/except so that the exception
would be reported nicely?

[Tudor Avram, 2019/09/17 12:25:02]

Done.

-    with create_source(args.source_dir, cached=True) as fs:
-        try:
+    try:
+        token = read_token()
+        with create_source(args.source_dir, cached=True) as fs:
             api = XTMCloudAPI(token, get_api_url(args, fs))
-        except Exception as err:
-            sys.exit(err)
-        args.projects_func(args, api, fs)
+            args.projects_func(args, api, fs)
+    except Exception as err:
+        sys.exit(err)
 
 
 def generate_token(args):
     """Generate an API token from username and password."""
-    username = input_fn('Username: ')
+    username = input_fn('Client name: ')
     user_id = input_fn('User ID: ')
     password = getpass.getpass(prompt='Password: ')
 
     logging.info(const.InfoMessages.GENERATING_TOKEN.format(username, user_id))
     try:
         token = get_token(username, password, int(user_id),
                           get_api_url(args, None))
         logging.info(const.InfoMessages.TOKEN_GENERATED.format(token))
 
         cmd = const.Token.SAVE_COMMAND.format(const.Token.ENV_VAR, token)
@@ skipping 34 matching lines @@
     project_create_parser.add_argument(
         '--name', required=True,
         help=const.ArgumentsHelp.ProjectCreate.NAME,
     )
     project_create_parser.add_argument(
         '--desc', required=True,
         help=const.ArgumentsHelp.ProjectCreate.DESC,
     )
 
     project_create_parser.add_argument(
-        '--client-id', required=True, type=int,
-        help=const.ArgumentsHelp.ProjectCreate.CLIENT_ID,
+        '--customer-id', required=True, type=int,
+        help=const.ArgumentsHelp.ProjectCreate.CUSTOMER_ID,
     )
     project_create_parser.add_argument(
         '--ref-id', required=True,
         help=const.ArgumentsHelp.ProjectCreate.REF_ID,
     )
     project_create_parser.add_argument(
         '--workflow-id', type=int,
         help=const.ArgumentsHelp.ProjectCreate.WORKFLOW_ID,
     )
     project_create_parser.add_argument(
@@ skipping 39 matching lines @@
     )
 
     return parser.parse_args()
 
 
 def main():
     """Run XTM integration script."""
     args = parse_args()
 
     if args.verbose:
-        logging.basicConfig(level=logging.INFO)
+        logging.basicConfig(level=logging.INFO, stream=sys.stderr)
 
     args.func(args)
 
 
 if __name__ == '__main__':
     main()