Code review changes: tests improved and minor corrections

Author: skulpok-akamai

linodecli/configuration/config.py

@@ -260,7 +260,7 @@ def plugin_get_value(
             return cast(T, value_type(value))
         except (ValueError, TypeError):
             print(
-                "" f"Could not cast config value {value} to {value_type}.",
+                f"Could not cast config value {value} to {value_type}.",
                 file=sys.stderr,
             )
             return default

linodecli/plugins/obj/__init__.py

@@ -743,7 +743,7 @@ def extract_key_info(key: dict) -> Optional[dict]:
         if not match:
             return None
         created_timestamp = int(match.group(1))
-        is_stale = created_timestamp <= stale_threshold
+        is_stale = created_timestamp < stale_threshold
         needs_rotation = is_stale or created_timestamp <= rotation_threshold
         return {
             "id": key["id"],

tests/integration/obj/test_obj_plugin.py

@@ -397,7 +397,6 @@ def call_operation_side_effect(resource, action, *args, **kwargs):
                 "key-cleanup-batch-size": 10,
             }[k]
         )
-        mock_client.config.plugin_get_value.side_effect = lambda k: None
         mock_client.call_operation.side_effect = call_operation_side_effect
         mock_client.config.plugin_set_value.return_value = None
         mock_client.config.write_config.return_value = None
@@ -458,7 +457,6 @@ def call_operation_side_effect(resource, action, *args, **kwargs):
                 "key-cleanup-batch-size": 10,
             }[k]
         )
-        mock_client.config.plugin_get_value.side_effect = lambda k: None
         mock_client.call_operation.side_effect = call_operation_side_effect
         mock_client.config.plugin_set_value.return_value = None
         mock_client.config.write_config.return_value = None
@@ -522,12 +520,9 @@ def call_operation_side_effect(resource, action, *args, **kwargs):
                 "key-lifespan": "30d",
                 "key-rotation-period-days": "10d",
                 "key-cleanup-batch-size": 10,
+                "last-key-cleanup-timestamp": str(last_cleanup),
             }[k]
         )
-        # Return a recent last-key-cleanup-timestamp
-        mock_client.config.plugin_get_value.side_effect = lambda k: (
-            str(last_cleanup) if k == "last-key-cleanup-timestamp" else None
-        )
         mock_client.call_operation.side_effect = call_operation_side_effect
         mock_client.config.plugin_set_value.return_value = None
         mock_client.config.write_config.return_value = None
@@ -582,7 +577,6 @@ def call_operation_side_effect(resource, action, *args, **kwargs):
                 "key-cleanup-batch-size": 10,
             }[k]
         )
-        mock_client.config.plugin_get_value.side_effect = lambda k: None
         mock_client.config.plugin_set_value.return_value = None
         mock_client.config.write_config.return_value = None
         mock_client.call_operation.side_effect = call_operation_side_effect