From d78a77c525a6d6873e9bdfd9bb001e1b70a03afb Mon Sep 17 00:00:00 2001 From: Dana Date: Fri, 3 Feb 2023 12:06:40 +0200 Subject: [PATCH] add all ci provider names to the choices of --auto-load-from option + cleaning code --- codecov_cli/helpers/ci_adapters/appveyor_ci.py | 3 +++ codecov_cli/helpers/ci_adapters/azure_pipelines.py | 3 +++ codecov_cli/helpers/ci_adapters/bitbucket_ci.py | 3 +++ codecov_cli/helpers/ci_adapters/bitrise_ci.py | 3 +++ codecov_cli/helpers/ci_adapters/buildkite.py | 3 +++ codecov_cli/helpers/ci_adapters/circleci.py | 3 +++ codecov_cli/helpers/ci_adapters/cirrus_ci.py | 3 +++ codecov_cli/helpers/ci_adapters/droneci.py | 3 +++ codecov_cli/helpers/ci_adapters/github_actions.py | 3 +++ codecov_cli/helpers/ci_adapters/gitlab_ci.py | 3 +++ codecov_cli/helpers/ci_adapters/heroku.py | 3 +++ codecov_cli/helpers/ci_adapters/jenkins.py | 3 +++ codecov_cli/helpers/ci_adapters/local.py | 3 +++ codecov_cli/helpers/ci_adapters/teamcity.py | 3 +++ codecov_cli/helpers/ci_adapters/woodpeckerci.py | 3 +++ codecov_cli/main.py | 7 +++++-- 16 files changed, 50 insertions(+), 2 deletions(-) diff --git a/codecov_cli/helpers/ci_adapters/appveyor_ci.py b/codecov_cli/helpers/ci_adapters/appveyor_ci.py index 9bb46aff5..0e1d57a30 100644 --- a/codecov_cli/helpers/ci_adapters/appveyor_ci.py +++ b/codecov_cli/helpers/ci_adapters/appveyor_ci.py @@ -49,3 +49,6 @@ def _get_branch(self): def _get_service(self): return "appveyor" + + def get_service_name(self): + return "AppVeyor" diff --git a/codecov_cli/helpers/ci_adapters/azure_pipelines.py b/codecov_cli/helpers/ci_adapters/azure_pipelines.py index 9f149545d..f444ecb1c 100644 --- a/codecov_cli/helpers/ci_adapters/azure_pipelines.py +++ b/codecov_cli/helpers/ci_adapters/azure_pipelines.py @@ -37,3 +37,6 @@ def _get_branch(self): def _get_service(self): return "azure_pipelines" + + def get_service_name(self): + return "AzurePipelines" diff --git a/codecov_cli/helpers/ci_adapters/bitbucket_ci.py b/codecov_cli/helpers/ci_adapters/bitbucket_ci.py index 42a71d753..c2d23302d 100644 --- a/codecov_cli/helpers/ci_adapters/bitbucket_ci.py +++ b/codecov_cli/helpers/ci_adapters/bitbucket_ci.py @@ -37,3 +37,6 @@ def _get_branch(self): def _get_service(self): return "bitbucket" + + def get_service_name(self): + return "Bitbucket" diff --git a/codecov_cli/helpers/ci_adapters/bitrise_ci.py b/codecov_cli/helpers/ci_adapters/bitrise_ci.py index 37f13f718..c815efb6d 100644 --- a/codecov_cli/helpers/ci_adapters/bitrise_ci.py +++ b/codecov_cli/helpers/ci_adapters/bitrise_ci.py @@ -32,3 +32,6 @@ def _get_branch(self): def _get_service(self): return "bitrise" + + def get_service_name(self): + return "Bitrise" diff --git a/codecov_cli/helpers/ci_adapters/buildkite.py b/codecov_cli/helpers/ci_adapters/buildkite.py index a3d1100e0..7b0412cfb 100644 --- a/codecov_cli/helpers/ci_adapters/buildkite.py +++ b/codecov_cli/helpers/ci_adapters/buildkite.py @@ -40,3 +40,6 @@ def _get_pull_request_number(self): def _get_job_code(self): return os.getenv("BUILDKITE_JOB_ID") + + def get_service_name(self): + return "BuildKite" diff --git a/codecov_cli/helpers/ci_adapters/circleci.py b/codecov_cli/helpers/ci_adapters/circleci.py index 394c04c7c..c5e45b33c 100644 --- a/codecov_cli/helpers/ci_adapters/circleci.py +++ b/codecov_cli/helpers/ci_adapters/circleci.py @@ -42,3 +42,6 @@ def _get_branch(self): def _get_service(self): return "circleci" + + def get_service_name(self): + return "CircleCI" diff --git a/codecov_cli/helpers/ci_adapters/cirrus_ci.py b/codecov_cli/helpers/ci_adapters/cirrus_ci.py index f72db65e3..89ff01be1 100644 --- a/codecov_cli/helpers/ci_adapters/cirrus_ci.py +++ b/codecov_cli/helpers/ci_adapters/cirrus_ci.py @@ -31,3 +31,6 @@ def _get_pull_request_number(self): def _get_job_code(self): return os.getenv("CIRRUS_TASK_ID") + + def get_service_name(self): + return "CirrusCI" diff --git a/codecov_cli/helpers/ci_adapters/droneci.py b/codecov_cli/helpers/ci_adapters/droneci.py index 7b28cda4e..d2dca81a2 100644 --- a/codecov_cli/helpers/ci_adapters/droneci.py +++ b/codecov_cli/helpers/ci_adapters/droneci.py @@ -31,3 +31,6 @@ def _get_pull_request_number(self): def _get_job_code(self): return None + + def get_service_name(self): + return "DroneCI" diff --git a/codecov_cli/helpers/ci_adapters/github_actions.py b/codecov_cli/helpers/ci_adapters/github_actions.py index 2cabb88aa..f12d21056 100644 --- a/codecov_cli/helpers/ci_adapters/github_actions.py +++ b/codecov_cli/helpers/ci_adapters/github_actions.py @@ -85,3 +85,6 @@ def _get_branch(self): def _get_service(self): return "github-actions" + + def get_service_name(self): + return "GithubActions" diff --git a/codecov_cli/helpers/ci_adapters/gitlab_ci.py b/codecov_cli/helpers/ci_adapters/gitlab_ci.py index 634e5fa7a..0ce119a79 100644 --- a/codecov_cli/helpers/ci_adapters/gitlab_ci.py +++ b/codecov_cli/helpers/ci_adapters/gitlab_ci.py @@ -51,3 +51,6 @@ def _get_branch(self): def _get_service(self): return "gitlab" + + def get_service_name(self): + return "GitlabCI" diff --git a/codecov_cli/helpers/ci_adapters/heroku.py b/codecov_cli/helpers/ci_adapters/heroku.py index 736c4dc31..cf65d5937 100644 --- a/codecov_cli/helpers/ci_adapters/heroku.py +++ b/codecov_cli/helpers/ci_adapters/heroku.py @@ -31,3 +31,6 @@ def _get_job_code(self): def _get_pull_request_number(self): return None + + def get_service_name(self): + return "Heroku" diff --git a/codecov_cli/helpers/ci_adapters/jenkins.py b/codecov_cli/helpers/ci_adapters/jenkins.py index eab7ec161..0e5de7c40 100644 --- a/codecov_cli/helpers/ci_adapters/jenkins.py +++ b/codecov_cli/helpers/ci_adapters/jenkins.py @@ -33,3 +33,6 @@ def _get_branch(self): def _get_service(self): return "jenkins" + + def get_service_name(self): + return "Jenkins" diff --git a/codecov_cli/helpers/ci_adapters/local.py b/codecov_cli/helpers/ci_adapters/local.py index 63e54630d..9c436aab1 100644 --- a/codecov_cli/helpers/ci_adapters/local.py +++ b/codecov_cli/helpers/ci_adapters/local.py @@ -34,3 +34,6 @@ def _get_pull_request_number(self): def _get_job_code(self): return None + + def get_service_name(self): + return "Local" diff --git a/codecov_cli/helpers/ci_adapters/teamcity.py b/codecov_cli/helpers/ci_adapters/teamcity.py index 14e678083..6097db28b 100644 --- a/codecov_cli/helpers/ci_adapters/teamcity.py +++ b/codecov_cli/helpers/ci_adapters/teamcity.py @@ -32,3 +32,6 @@ def _get_pull_request_number(self): def _get_job_code(self): return None + + def get_service_name(self): + return "Teamcity" diff --git a/codecov_cli/helpers/ci_adapters/woodpeckerci.py b/codecov_cli/helpers/ci_adapters/woodpeckerci.py index 79012b9d3..78bf064a8 100644 --- a/codecov_cli/helpers/ci_adapters/woodpeckerci.py +++ b/codecov_cli/helpers/ci_adapters/woodpeckerci.py @@ -31,3 +31,6 @@ def _get_pull_request_number(self): def _get_job_code(self): return os.getenv("CI_JOB_NUMBER") + + def get_service_name(self): + return "Woodpecker" diff --git a/codecov_cli/main.py b/codecov_cli/main.py index b4594bc34..a40ca2989 100644 --- a/codecov_cli/main.py +++ b/codecov_cli/main.py @@ -10,7 +10,7 @@ from codecov_cli.commands.get_report_results import get_report_results from codecov_cli.commands.report import create_report from codecov_cli.commands.upload import do_upload -from codecov_cli.helpers.ci_adapters import get_ci_adapter +from codecov_cli.helpers.ci_adapters import get_ci_adapter, get_ci_providers_list from codecov_cli.helpers.logging_utils import configure_logger from codecov_cli.helpers.versioning_systems import get_versioning_system @@ -20,7 +20,10 @@ @click.group() @click.option( "--auto-load-params-from", - type=click.Choice(["circleci", "githubactions"], case_sensitive=False), + type=click.Choice( + [provider.get_service_name() for provider in get_ci_providers_list()], + case_sensitive=False, + ), ) @click.option( "--codecov-yml-path",