assignUser commented on code in PR #13283: URL: https://github.com/apache/arrow/pull/13283#discussion_r887846975
########## dev/README.md: ########## @@ -54,12 +54,13 @@ have to install Python dependencies yourself and then run `dev/merge_arrow_pr.py directly) The merge script uses the GitHub REST API. You must set a -`ARROW_GITHUB_API_TOKEN` environment variable to use a Personal Access -Token. You need to add `workflow` scope to the Personal Access Token. +`ARROW_GITHUB_API_TOKEN` environment variable to use a +[Personal Access Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). +You need to add `workflow` scope to the Personal Access Token. -You can specify the username and the password of your JIRA account in -`APACHE_JIRA_USERNAME` and `APACHE_JIRA_PASSWORD` environment variables. -If these aren't supplied, the script will ask you the values of them. +You can specify the [Personal Access Token](https://confluence.atlassian.com/enterprise/using-personal-access-tokens-1026032365.html) of your JIRA account in the +`APACHE_JIRA_TOKEN` environment variable. Review Comment: Not really because we can't put a newline into the link without breaking it, I'll put the links on their own line. ########## dev/merge_arrow_pr.py: ########## @@ -492,47 +491,27 @@ def load_configuration(): def get_credentials(cmd): - username, password = None, None + token = None config = load_configuration() if "jira" in config.sections(): - username = config["jira"].get("username") - password = config["jira"].get("password") + token = config["jira"].get("token") # Fallback to environment variables - if not username: - username = os.environ.get("APACHE_JIRA_USERNAME") - - if not password: - password = os.environ.get("APACHE_JIRA_PASSWORD") + if not token: + token = os.environ.get("APACHE_JIRA_TOKEN") # Fallback to user tty prompt - if not username: - username = cmd.prompt("Env APACHE_JIRA_USERNAME not set, " - "please enter your JIRA username:") - - if not password: - password = cmd.getpass("Env APACHE_JIRA_PASSWORD not set, " - "please enter your JIRA password:") + if not token: + token = cmd.prompt("Env APACHE_JIRA_TOKEN not set, " + "please enter your JIRA PAT:") Review Comment: I used the same format as the github token prompt to keep things uniform 👍 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
