From a052e6bd8d6a4987601b46b0a4420d8fa57a5207 Mon Sep 17 00:00:00 2001 From: donghui <977675308@qq.com> Date: Fri, 12 Aug 2022 18:17:47 +0800 Subject: [PATCH 1/2] fix docker_api_version of repo --- dohq_artifactory/admin.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dohq_artifactory/admin.py b/dohq_artifactory/admin.py index b9ffae8..16e88e2 100644 --- a/dohq_artifactory/admin.py +++ b/dohq_artifactory/admin.py @@ -805,6 +805,7 @@ def _read_response(self, response): self.package_type = response.get("packageType") self.repo_layout_ref = response.get("repoLayoutRef") self.archive_browsing_enabled = response.get("archiveBrowsingEnabled") + self.docker_api_version = response.get("dockerApiVersion") class RepositoryVirtual(GenericRepository): @@ -888,6 +889,7 @@ def _read_response(self, response): self.description = response.get("description") self.package_type = response.get("packageType") self._repositories = response.get("repositories") + self.docker_api_version = response.get("dockerApiVersion") def add_repository(self, *repos): for value in repos: @@ -1006,6 +1008,7 @@ def _read_response(self, response): self.repo_layout_ref = response.get("repoLayoutRef") self.archive_browsing_enabled = response.get("archiveBrowsingEnabled") self.url = response.get("url") + self.docker_api_version = response.get("dockerApiVersion") class PermissionTarget(AdminObject): From 797cd5d377c4eb42040ed0a526a0ee435f3237ef Mon Sep 17 00:00:00 2001 From: donghui <977675308@qq.com> Date: Fri, 12 Aug 2022 22:40:37 +0800 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Maksim Beliaev --- dohq_artifactory/admin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dohq_artifactory/admin.py b/dohq_artifactory/admin.py index 16e88e2..d46191c 100644 --- a/dohq_artifactory/admin.py +++ b/dohq_artifactory/admin.py @@ -805,7 +805,7 @@ def _read_response(self, response): self.package_type = response.get("packageType") self.repo_layout_ref = response.get("repoLayoutRef") self.archive_browsing_enabled = response.get("archiveBrowsingEnabled") - self.docker_api_version = response.get("dockerApiVersion") + self.docker_api_version = response.get("dockerApiVersion", None) class RepositoryVirtual(GenericRepository): @@ -889,7 +889,7 @@ def _read_response(self, response): self.description = response.get("description") self.package_type = response.get("packageType") self._repositories = response.get("repositories") - self.docker_api_version = response.get("dockerApiVersion") + self.docker_api_version = response.get("dockerApiVersion", None) def add_repository(self, *repos): for value in repos: @@ -1008,7 +1008,7 @@ def _read_response(self, response): self.repo_layout_ref = response.get("repoLayoutRef") self.archive_browsing_enabled = response.get("archiveBrowsingEnabled") self.url = response.get("url") - self.docker_api_version = response.get("dockerApiVersion") + self.docker_api_version = response.get("dockerApiVersion", None) class PermissionTarget(AdminObject):