Skip to content
This repository was archived by the owner on Feb 19, 2020. It is now read-only.

Option to use token as argument #35

Merged
merged 1 commit into from
Nov 14, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/codacy/reporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
logging.basicConfig(level=logging.INFO,
format='%(asctime)s - %(levelname)s - %(message)s')

CODACY_PROJECT_TOKEN = os.getenv('CODACY_PROJECT_TOKEN')
CODACY_BASE_API_URL = os.getenv('CODACY_API_BASE_URL', 'https://api.codacy.com')
URL = CODACY_BASE_API_URL + '/2.0/coverage/{commit}/python'
DEFAULT_REPORT_FILE = 'coverage.xml'
Expand Down Expand Up @@ -180,6 +179,7 @@ def run():
default=[], type=str,
action='append')
parser.add_argument("-c", "--commit", type=str, help="git commit hash")
parser.add_argument("-t", "--token", type=str, help="Codacy project token")
parser.add_argument("-d", "--directory", type=str, help="git top level directory")
parser.add_argument("-v", "--verbose", help="show debug information", action="store_true")

Expand All @@ -188,9 +188,13 @@ def run():
if args.verbose:
logging.Logger.setLevel(logging.getLogger(), logging.DEBUG)

if not CODACY_PROJECT_TOKEN:
logging.error("environment variable CODACY_PROJECT_TOKEN is not defined.")
exit(1)
if args.token:
codacy_project_token = args.token
else:
codacy_project_token = os.getenv('CODACY_PROJECT_TOKEN')
if not codacy_project_token:
logging.error("environment variable CODACY_PROJECT_TOKEN is not defined.")
exit(1)

if not args.commit:
args.commit = get_git_revision_hash()
Expand All @@ -212,4 +216,4 @@ def run():
report = merge_and_round_reports(reports)

logging.info("Uploading report...")
upload_report(report, CODACY_PROJECT_TOKEN, args.commit)
upload_report(report, codacy_project_token, args.commit)