From e5531fc77b5bdb1ccc0741e388df2d8d25ba6ade Mon Sep 17 00:00:00 2001 From: Jon Lockwood Date: Sat, 15 Jan 2022 13:08:52 +0930 Subject: [PATCH] feat(commit.py): throw an error if no token was supplied. i.e. empty variable. A check is done on the supplied token, if 'None', throws an error that can be viewed in the output log and in the job output. fixes #11 !12 --- conventional_commits/.gitlab-ci.yml | 5 +---- conventional_commits/scripts/commit.py | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conventional_commits/.gitlab-ci.yml b/conventional_commits/.gitlab-ci.yml index d59ac0e..e8b2f7a 100644 --- a/conventional_commits/.gitlab-ci.yml +++ b/conventional_commits/.gitlab-ci.yml @@ -55,10 +55,7 @@ MR Title: extends: - .conventional_commit script: - - - $ROOT_DIR/conventional_commits/scripts/commit.py --token "$MR_ACCESS_TOKEN" --project $PROJECT_ID --title --branch $CI_COMMIT_BRANCH - - + - echo "[DEBUG] Merge Request Title[$($ROOT_DIR/conventional_commits/scripts/commit.py --token "$MR_ACCESS_TOKEN" --project $PROJECT_ID --title --branch $CI_COMMIT_BRANCH)]" - cz_exit=0 && cz check --message "$($ROOT_DIR/conventional_commits/scripts/commit.py --token "$MR_ACCESS_TOKEN" --project $PROJECT_ID --title --branch $CI_COMMIT_BRANCH)" > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/cz_output.log" 2>&1 || cz_exit=$? - . $ROOT_DIR/conventional_commits/scripts/cz_junit.sh > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests/$CI_JOB_NAME-cz.junit.xml" diff --git a/conventional_commits/scripts/commit.py b/conventional_commits/scripts/commit.py index 8818719..0adb4b6 100755 --- a/conventional_commits/scripts/commit.py +++ b/conventional_commits/scripts/commit.py @@ -26,6 +26,8 @@ for opt, arg in opts: print('[commit.py] -i -o ') sys.exit() elif opt in ("-t", "--token"): + if arg is None: + raise ValueError('Token switch was specified, however no token was supplied.') ci_job_token = arg elif opt in ("-ti", "--title"): get_mr_title = True