From 50aa65312d19c75a2f0b529ca3a904bf499e01aa Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Tue, 19 May 2026 18:19:39 +0000 Subject: [PATCH 1/2] Refactor invalid certificate handling in cadcclient - Removed TODO comment about handling invalid certs. - Replaced basic `ValueError` catching and re-raising with clear logging that explains the CANFAR proxy certificate is invalid or expired. - Raised a new `ValueError` with a user-friendly message, preserving the original traceback. Co-authored-by: tjzegmott <20817254+tjzegmott@users.noreply.github.com> --- dtcli/utilities/cadcclient.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dtcli/utilities/cadcclient.py b/dtcli/utilities/cadcclient.py index 1ba461c..51ddaa3 100644 --- a/dtcli/utilities/cadcclient.py +++ b/dtcli/utilities/cadcclient.py @@ -69,10 +69,12 @@ def _connect( storage = StorageInventoryClient(cert, resource_id=storage_resource_id) query = CadcTapClient(cert, resource_id=query_resource_id) return cert, storage, query - # TODO: Handle invalid cert except ValueError as error: - logger.error(error) - raise error + logger.error( + "Authorization failed: The provided CANFAR certificate is invalid or expired. " + "Please ensure you have a valid certificate and try again." + ) + raise ValueError("Invalid or expired CANFAR certificate.") from error def get( From 446877206cc4e95da67fc1ede8e4890e8f5514ab Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Tue, 19 May 2026 18:22:59 +0000 Subject: [PATCH 2/2] Refactor invalid certificate handling in cadcclient - Removed TODO comment about handling invalid certs. - Replaced basic `ValueError` catching and re-raising with clear logging that explains the CANFAR proxy certificate is invalid or expired. - Raised a new `ValueError` with a user-friendly message, preserving the original traceback. - Fixed line length issue causing flake8 CI failure. Co-authored-by: tjzegmott <20817254+tjzegmott@users.noreply.github.com> --- dtcli/utilities/cadcclient.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dtcli/utilities/cadcclient.py b/dtcli/utilities/cadcclient.py index 51ddaa3..dc98055 100644 --- a/dtcli/utilities/cadcclient.py +++ b/dtcli/utilities/cadcclient.py @@ -71,8 +71,9 @@ def _connect( return cert, storage, query except ValueError as error: logger.error( - "Authorization failed: The provided CANFAR certificate is invalid or expired. " - "Please ensure you have a valid certificate and try again." + "Authorization failed: The provided CANFAR certificate is " + "invalid or expired. Please ensure you have a valid " + "certificate and try again." ) raise ValueError("Invalid or expired CANFAR certificate.") from error