feat: add CloudFormation stack events and outputs sub-resources

derrike · derrike · commit 5599362a9b27 · 2026-04-29T15:24:48.000-05:00
- Add Events sub-resource (shortcut 'e') showing stack event timeline
- Add Outputs sub-resource (shortcut 'o') showing stack output key/values
- Add CFN-specific state colors (CREATE_COMPLETE, UPDATE_FAILED, etc.)
- Add preserve_order field to skip alphabetical sorting for time-ordered data
- Save/restore selection and filters when navigating into sub-resources
diff --git a/src/app.rs b/src/app.rs
@@ -54,6 +54,8 @@ pub struct ParentContext {
     pub item: Value,
     /// Display name for breadcrumb
     pub display_name: String,
+    /// Saved selection index to restore when navigating back
+    pub saved_selected: usize,
 }
 
 /// AWS API Filters for server-side filtering
@@ -1303,6 +1305,7 @@ impl App {
             resource_key: self.current_resource_key.clone(),
             item: selected_item,
             display_name: display,
+            saved_selected: self.selected,
         });
 
         // Navigate
@@ -1326,7 +1329,7 @@ impl App {
 
             // Navigate to parent resource
             self.current_resource_key = parent.resource_key;
-            self.selected = 0;
+            self.selected = parent.saved_selected;
             self.filter_text.clear();
             self.filter_active = false;
 
diff --git a/src/resource/fetcher.rs b/src/resource/fetcher.rs
@@ -131,12 +131,15 @@ pub async fn fetch_resources_paginated(
     let mut items = extract_items(&response, &resource_def.response_path)?;
 
     // 5. Sort items by name_field (or id_field) for consistent ordering
-    let sort_field = &resource_def.name_field;
-    items.sort_by(|a, b| {
-        let a_val = a.get(sort_field).and_then(|v| v.as_str()).unwrap_or("");
-        let b_val = b.get(sort_field).and_then(|v| v.as_str()).unwrap_or("");
-        a_val.cmp(b_val)
-    });
+    //    Skip sorting if the resource wants to preserve API order (e.g., events sorted by time)
+    if !resource_def.preserve_order {
+        let sort_field = &resource_def.name_field;
+        items.sort_by(|a, b| {
+            let a_val = a.get(sort_field).and_then(|v| v.as_str()).unwrap_or("");
+            let b_val = b.get(sort_field).and_then(|v| v.as_str()).unwrap_or("");
+            a_val.cmp(b_val)
+        });
+    }
 
     // 6. Extract next_token from response (if present)
     let next_token = response
diff --git a/src/resource/registry.rs b/src/resource/registry.rs
@@ -211,6 +211,10 @@ pub struct ResourceDef {
     /// Used for sub-resources like Log Streams that need a Log Group
     #[serde(default)]
     pub requires_parent: bool,
+
+    /// If true, preserve the order returned by the API instead of sorting alphabetically
+    #[serde(default)]
+    pub preserve_order: bool,
 }
 
 impl ResourceDef {
@@ -642,4 +646,63 @@ mod tests {
             "get_parameter should use 'x' shortcut"
         );
     }
+
+    #[test]
+    fn test_cloudformation_stacks_has_sub_resources() {
+        let resource = get_resource("cloudformation-stacks").unwrap();
+        assert_eq!(resource.display_name, "CloudFormation Stacks");
+
+        let events_sub = resource
+            .sub_resources
+            .iter()
+            .find(|s| s.resource_key == "cloudformation-events");
+        assert!(events_sub.is_some(), "Stacks should have events sub-resource");
+        assert_eq!(events_sub.unwrap().shortcut, "e");
+
+        let outputs_sub = resource
+            .sub_resources
+            .iter()
+            .find(|s| s.resource_key == "cloudformation-outputs");
+        assert!(outputs_sub.is_some(), "Stacks should have outputs sub-resource");
+        assert_eq!(outputs_sub.unwrap().shortcut, "o");
+    }
+
+    #[test]
+    fn test_cloudformation_events_resource() {
+        let resource = get_resource("cloudformation-events").unwrap();
+        assert_eq!(resource.display_name, "Stack Events");
+        assert!(resource.requires_parent, "Events should require a parent stack");
+        assert!(resource.preserve_order, "Events should preserve API order (chronological)");
+
+        let col_headers: Vec<&str> = resource.columns.iter().map(|c| c.header.as_str()).collect();
+        assert!(col_headers.contains(&"TIMESTAMP"));
+        assert!(col_headers.contains(&"STATUS"));
+        assert!(col_headers.contains(&"LOGICAL ID"));
+    }
+
+    #[test]
+    fn test_cloudformation_outputs_resource() {
+        let resource = get_resource("cloudformation-outputs").unwrap();
+        assert_eq!(resource.display_name, "Stack Outputs");
+        assert!(resource.requires_parent, "Outputs should require a parent stack");
+
+        let col_headers: Vec<&str> = resource.columns.iter().map(|c| c.header.as_str()).collect();
+        assert!(col_headers.contains(&"KEY"));
+        assert!(col_headers.contains(&"VALUE"));
+    }
+
+    #[test]
+    fn test_cfn_state_colors_exist() {
+        let create_complete = get_color_for_value("state", "CREATE_COMPLETE");
+        assert_eq!(create_complete, Some([0, 255, 0]));
+
+        let create_failed = get_color_for_value("state", "CREATE_FAILED");
+        assert_eq!(create_failed, Some([255, 0, 0]));
+
+        let create_in_progress = get_color_for_value("state", "CREATE_IN_PROGRESS");
+        assert_eq!(create_in_progress, Some([255, 255, 0]));
+
+        let delete_complete = get_color_for_value("state", "DELETE_COMPLETE");
+        assert_eq!(delete_complete, Some([128, 128, 128]));
+    }
 }
diff --git a/src/resources/cloudformation.json b/src/resources/cloudformation.json
@@ -15,7 +15,22 @@
         { "header": "CREATED", "json_path": "CreationTime", "width": 25 },
         { "header": "UPDATED", "json_path": "LastUpdatedTime", "width": 25 }
       ],
-      "sub_resources": [],
+      "sub_resources": [
+        {
+          "shortcut": "e",
+          "display_name": "Events",
+          "resource_key": "cloudformation-events",
+          "parent_id_field": "StackName",
+          "filter_param": "stack_name"
+        },
+        {
+          "shortcut": "o",
+          "display_name": "Outputs",
+          "resource_key": "cloudformation-outputs",
+          "parent_id_field": "StackName",
+          "filter_param": "stack_name"
+        }
+      ],
       "actions": [
         { "key": "ctrl+d", "display_name": "Delete Stack", "shortcut": "ctrl+d", "sdk_method": "delete_stack", "confirm": { "message": "Delete CloudFormation stack", "default_yes": false, "destructive": true } }
       ],
@@ -40,6 +55,76 @@
           "id_param": "StackName"
         }
       }
+    },
+    "cloudformation-events": {
+      "display_name": "Stack Events",
+      "service": "cloudformation",
+      "sdk_method": "describe_stack_events",
+      "sdk_method_params": {},
+      "response_path": "events",
+      "id_field": "EventId",
+      "name_field": "LogicalResourceId",
+      "is_global": false,
+      "requires_parent": true,
+      "preserve_order": true,
+      "columns": [
+        { "header": "TIMESTAMP", "json_path": "Timestamp", "width": 22 },
+        { "header": "LOGICAL ID", "json_path": "LogicalResourceId", "width": 28 },
+        { "header": "STATUS", "json_path": "ResourceStatus", "width": 28, "color_map": "state" },
+        { "header": "TYPE", "json_path": "ResourceType", "width": 30 },
+        { "header": "REASON", "json_path": "ResourceStatusReason", "width": 40 }
+      ],
+      "sub_resources": [],
+      "actions": [],
+      "api_config": {
+        "protocol": "query",
+        "action": "DescribeStackEvents",
+        "response_root": "/DescribeStackEventsResponse/DescribeStackEventsResult/StackEvents/member",
+        "param_mapping": {
+          "stack_name": "StackName"
+        }
+      },
+      "field_mappings": {
+        "EventId": { "source": "/EventId", "default": "-" },
+        "StackName": { "source": "/StackName", "default": "-" },
+        "LogicalResourceId": { "source": "/LogicalResourceId", "default": "-" },
+        "PhysicalResourceId": { "source": "/PhysicalResourceId", "default": "-" },
+        "ResourceType": { "source": "/ResourceType", "default": "-" },
+        "ResourceStatus": { "source": "/ResourceStatus", "default": "-" },
+        "ResourceStatusReason": { "source": "/ResourceStatusReason", "default": "-" },
+        "Timestamp": { "source": "/Timestamp", "default": "-" }
+      }
+    },
+    "cloudformation-outputs": {
+      "display_name": "Stack Outputs",
+      "service": "cloudformation",
+      "sdk_method": "describe_stacks",
+      "sdk_method_params": {},
+      "response_path": "outputs",
+      "id_field": "OutputKey",
+      "name_field": "OutputKey",
+      "is_global": false,
+      "requires_parent": true,
+      "columns": [
+        { "header": "KEY", "json_path": "OutputKey", "width": 50 },
+        { "header": "VALUE", "json_path": "OutputValue", "width": 50 }
+      ],
+      "sub_resources": [],
+      "actions": [],
+      "api_config": {
+        "protocol": "query",
+        "action": "DescribeStacks",
+        "response_root": "/DescribeStacksResponse/DescribeStacksResult/Stacks/member/Outputs/member",
+        "param_mapping": {
+          "stack_name": "StackName"
+        }
+      },
+      "field_mappings": {
+        "OutputKey": { "source": "/OutputKey", "default": "-" },
+        "OutputValue": { "source": "/OutputValue", "default": "-" },
+        "Description": { "source": "/Description", "default": "-" },
+        "ExportName": { "source": "/ExportName", "default": "-" }
+      }
     }
   }
 }
diff --git a/src/resources/common.json b/src/resources/common.json
@@ -24,7 +24,29 @@
       { "value": "terminating", "color": [255, 255, 0] },
       { "value": "in-progress", "color": [255, 255, 0] },
       { "value": "initializing", "color": [255, 255, 0] },
-      { "value": "rebooting", "color": [255, 255, 0] }
+      { "value": "rebooting", "color": [255, 255, 0] },
+      { "value": "CREATE_COMPLETE", "color": [0, 255, 0] },
+      { "value": "UPDATE_COMPLETE", "color": [0, 255, 0] },
+      { "value": "IMPORT_COMPLETE", "color": [0, 255, 0] },
+      { "value": "DELETE_COMPLETE", "color": [128, 128, 128] },
+      { "value": "ROLLBACK_COMPLETE", "color": [255, 0, 0] },
+      { "value": "CREATE_FAILED", "color": [255, 0, 0] },
+      { "value": "UPDATE_FAILED", "color": [255, 0, 0] },
+      { "value": "DELETE_FAILED", "color": [255, 0, 0] },
+      { "value": "IMPORT_ROLLBACK_COMPLETE", "color": [255, 0, 0] },
+      { "value": "UPDATE_ROLLBACK_COMPLETE", "color": [255, 0, 0] },
+      { "value": "UPDATE_ROLLBACK_FAILED", "color": [255, 0, 0] },
+      { "value": "ROLLBACK_FAILED", "color": [255, 0, 0] },
+      { "value": "CREATE_IN_PROGRESS", "color": [255, 255, 0] },
+      { "value": "UPDATE_IN_PROGRESS", "color": [255, 255, 0] },
+      { "value": "DELETE_IN_PROGRESS", "color": [255, 255, 0] },
+      { "value": "ROLLBACK_IN_PROGRESS", "color": [255, 255, 0] },
+      { "value": "UPDATE_COMPLETE_CLEANUP_IN_PROGRESS", "color": [255, 255, 0] },
+      { "value": "UPDATE_ROLLBACK_IN_PROGRESS", "color": [255, 255, 0] },
+      { "value": "UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS", "color": [255, 255, 0] },
+      { "value": "IMPORT_IN_PROGRESS", "color": [255, 255, 0] },
+      { "value": "IMPORT_ROLLBACK_IN_PROGRESS", "color": [255, 255, 0] },
+      { "value": "REVIEW_IN_PROGRESS", "color": [255, 255, 0] }
     ],
     "bool": [
       { "value": "true", "color": [0, 255, 255] },
