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 10 matching lines @@
 import getpass
 import os
 
 from cms.translations.xtm.xtm_api import (
     XTMCloudException, get_token, XTMCloudAPI,
 )
 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
+from cms.translations.xtm.utils import input_fn, read_token, get_api_url
 from cms.sources import create_source
 
 
 def handle_projects(args):
-    try:
-        api = XTMCloudAPI(read_token())
-    except Exception as err:
-        sys.exit(err)
+    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:
+            api = XTMCloudAPI(token, get_api_url(args, fs))
+        except Exception as err:
+            sys.exit(err)
         args.projects_func(args, api, fs)
 
 
 def generate_token(args):
     """Generate an API token from username and password."""
     username = input_fn('Username: ')
     user_id = input_fn('User ID: ')
-    password = getpass.getpass(prompt='Pasword: ')
+    password = getpass.getpass(prompt='Password: ')
 
     logging.info(const.InfoMessages.GENERATING_TOKEN.format(username, user_id))
     try:
-        token = get_token(username, password, int(user_id))
+        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)
         sys.stdout.write(const.InfoMessages.TOKEN_SAVE_TO_ENV_VAR.format(cmd))
     except XTMCloudException as err:
         sys.exit(err)
     except Exception as err:
         sys.exit(err)
 
 
 def parse_args():
     parser = argparse.ArgumentParser()
     subparsers = parser.add_subparsers()
 
     #  Universal arguments
     parser.add_argument('-v', '--verbose', action='store_true',
                         help=const.ArgumentsHelp.VERBOSE)
+    parser.add_argument('--api-url', help=const.ArgumentsHelp.API_URL)
 
     #  Subparser for generating token
     token_parser = subparsers.add_parser('login',
                                          help=const.ArgumentsHelp.LOGIN)
     token_parser.set_defaults(func=generate_token)
 
     #  Subparser for project creation.
     project_create_parser = subparsers.add_parser(
         'create',
         help=const.ArgumentsHelp.ProjectCreate.MAIN,
@@ skipping 77 matching lines @@
     args = parse_args()
 
     if args.verbose:
         logging.basicConfig(level=logging.INFO)
 
     args.func(args)
 
 
 if __name__ == '__main__':
     main()