From eb166cefdcab5e779a5657781365ad80ebe6b5fc Mon Sep 17 00:00:00 2001 From: Guo Zhang Date: Tue, 5 Jul 2022 16:10:08 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8DOpenAPI=20`describe?= =?UTF-8?q?=5Fgit=5Freleases=5Fby=5Fname`=E5=86=85=E9=83=A8=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coding_devops_sdk/openapi/client.py | 2 ++ coding_devops_sdk/openapi/depot.py | 5 ++--- coding_devops_sdk/settings.toml | 3 +++ pyproject.toml | 2 +- tests/test_openapi_depot.py | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/coding_devops_sdk/openapi/client.py b/coding_devops_sdk/openapi/client.py index 529e0fa..c77d922 100644 --- a/coding_devops_sdk/openapi/client.py +++ b/coding_devops_sdk/openapi/client.py @@ -19,6 +19,8 @@ def __init__(self, team=None, token=None): """ self.team = team or settings.TEAM self.token = token or settings.AUTH_TOKEN + if not self.token: + raise ValueError("鉴权令牌不可为空，请设置token参数或传入AUTH_TOKEN配置项。") def request_api(self, action, **kwargs): data = {'Action': action} diff --git a/coding_devops_sdk/openapi/depot.py b/coding_devops_sdk/openapi/depot.py index 9835c85..41aefa1 100644 --- a/coding_devops_sdk/openapi/depot.py +++ b/coding_devops_sdk/openapi/depot.py @@ -54,9 +54,8 @@ def describe_project_depot_info_list_by_name(self, project_name: str) -> list: def get_depot_id_by_name(self, depot_name, project_name=settings.DEFAULT_PROJECT_NAME): """ - - :param project_name: :param depot_name: + :param project_name: :return: """ if not project_name: @@ -86,5 +85,5 @@ class IntegratedReleaseAPIMixin(object): def describe_git_releases_by_name(self, depot_name, project_name=settings.DEFAULT_PROJECT_NAME, **kwargs): if not project_name: raise ValueError("project name should be not empty, please set project_name either directly or on project settings") - depot_id = self.get_depot_id_by_name(project_name, depot_name) + depot_id = self.get_depot_id_by_name(depot_name=depot_name, project_name=project_name) return self.describe_git_releases(depot_id) diff --git a/coding_devops_sdk/settings.toml b/coding_devops_sdk/settings.toml index 92df043..77456f2 100644 --- a/coding_devops_sdk/settings.toml +++ b/coding_devops_sdk/settings.toml @@ -1,2 +1,5 @@ +[default] +# 默认项目 DEFAULT_PROJECT_NAME = "@none None" +# 默认仓库 DEFAULT_DEPOT_NAME = "@none None" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 60de446..9dcb6c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "coding-devops-sdk-py" -version = "0.1.0" +version = "0.1.1-beta.1" authors = [ {name = "QuantTide Inc.", email = "opensource@quanttide.com"} ] diff --git a/tests/test_openapi_depot.py b/tests/test_openapi_depot.py index acaf9d3..553fa7d 100644 --- a/tests/test_openapi_depot.py +++ b/tests/test_openapi_depot.py @@ -17,8 +17,8 @@ def test_describe_project_depot_info_list_by_name(self): def test_get_depot_id_by_name(self): depot_id = coding_openapi_client.get_depot_id_by_name( - project_name=settings.TEST_PROJECT_NAME, depot_name=settings.TEST_DEPOT_NAME, + project_name=settings.TEST_PROJECT_NAME, ) self.assertEqual(settings.TEST_DEPOT_ID, depot_id)