From 827f5d607d265515300f99f84a7cecc013aac4bc Mon Sep 17 00:00:00 2001
From: mj006648 <uckdekf@gmail.com>
Date: Tue, 4 Aug 2026 02:18:24 +0000
Subject: [PATCH] Simplify CLI property lookup

---
 pyiceberg/cli/console.py  | 30 ++++++++++++++++--------------
 tests/cli/test_console.py | 11 +++++++++++
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/pyiceberg/cli/console.py b/pyiceberg/cli/console.py
index 940a9f0282..1261a63f10 100644
--- a/pyiceberg/cli/console.py
+++ b/pyiceberg/cli/console.py
@@ -326,14 +326,15 @@ def get_namespace(ctx: Context, identifier: str, property_name: str) -> None:
 
     namespace_properties = catalog.load_namespace_properties(identifier_tuple)
 
-    if property_name:
-        property_value = namespace_properties.get(property_name)
-        if property_value is not None:
-            output.text(property_value)
-        else:
-            raise NoSuchPropertyException(f"Could not find property {property_name} on namespace {identifier}")
-    else:
+    if not property_name:
         output.describe_properties(namespace_properties)
+        return
+
+    property_value = namespace_properties.get(property_name)
+    if property_value is None:
+        raise NoSuchPropertyException(f"Could not find property {property_name} on namespace {identifier}")
+
+    output.text(property_value)
 
 
 @get.command("table")
@@ -348,14 +349,15 @@ def get_table(ctx: Context, identifier: str, property_name: str) -> None:
 
     metadata = catalog.load_table(identifier_tuple).metadata
 
-    if property_name:
-        property_value = metadata.properties.get(property_name)
-        if property_value is not None:
-            output.text(property_value)
-        else:
-            raise NoSuchPropertyException(f"Could not find property {property_name} on table {identifier}")
-    else:
+    if not property_name:
         output.describe_properties(metadata.properties)
+        return
+
+    property_value = metadata.properties.get(property_name)
+    if property_value is None:
+        raise NoSuchPropertyException(f"Could not find property {property_name} on table {identifier}")
+
+    output.text(property_value)
 
 
 @properties.group()
diff --git a/tests/cli/test_console.py b/tests/cli/test_console.py
index 408e369f73..e3e7ac7dc5 100644
--- a/tests/cli/test_console.py
+++ b/tests/cli/test_console.py
@@ -506,6 +506,17 @@ def test_properties_get_namespace_specific_empty_property(catalog: InMemoryCatal
     assert result.output == "\n"
 
 
+def test_properties_get_namespace_specific_property_that_doesnt_exist(
+    catalog: InMemoryCatalog, namespace_properties: Properties
+) -> None:
+    catalog.create_namespace(TEST_TABLE_NAMESPACE, namespace_properties)
+
+    runner = CliRunner()
+    result = runner.invoke(run, ["properties", "get", "namespace", "default", "doesnotexist"])
+    assert result.exit_code == 1
+    assert result.output == "Could not find property doesnotexist on namespace default\n"
+
+
 def test_properties_get_namespace_does_not_exist(catalog: InMemoryCatalog, namespace_properties: Properties) -> None:
     catalog.create_namespace(TEST_TABLE_NAMESPACE, namespace_properties)