Fix non-cluster tag cleanup after resource-events username lookup

Tagging can resolve owners via get_username_from_resource_events while
teardown still used CloudTrail-only lookup, leaving partial tags that
caused validate_existing_tag to skip re-applying Budget and LaunchTime.
Align removal with tagging and require input tags in validation.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: pragya811

cloud_governance/policy/policy_operations/aws/tag_non_cluster/non_cluster_operations.py

@@ -249,7 +249,9 @@ def validate_existing_tag(self, tags: list):
         @param tags:
         @return:
         """
-        check_tags = ['User', 'Project', 'Manager', 'Owner', 'Email']
+        check_tags = ['User', 'Project', 'Manager', 'Owner', 'Email', 'LaunchTime']
+        if self.input_tags:
+            check_tags.extend(key for key in self.input_tags if key not in check_tags)
         tag_count = 0
         if tags:
             for tag in tags:

cloud_governance/policy/policy_operations/aws/tag_non_cluster/remove_non_cluster_tags.py

@@ -17,7 +17,11 @@ def __get_instance_tags(self, launch_time: datetime, instance_id: str, tags: lis
         @param tags:
         @return:
         """
-        username = self._get_username_from_cloudtrail(start_time=launch_time, resource_id=instance_id, resource_type='AWS::EC2::Instance')
+        username = self.ec2_operations.get_tag_value_from_tags(tags=tags or [], tag_name='User')
+        if not username or username == self.NA_VALUE:
+            username = self.get_username(
+                start_time=launch_time, resource_id=instance_id,
+                resource_type='AWS::EC2::Instance', tags=tags or [])
         search_tags = []
         user_tags = self.iam_client.get_user_tags(username=username)
         if not username:

tests/unittest/cloud_governance/aws/tag_non_cluster/test_non_cluster_operations.py

@@ -51,3 +51,32 @@ def test_resource_events_fallback_excludes_automation_user(self):
         assert result == CLUSTER_OWNER
         call_kwargs = ops.cloudtrail.get_username_from_resource_events.call_args.kwargs
         assert call_kwargs['exclude_users'] == {AUTOMATION_USER}
+
+
+class TestNonClusterOperationsValidateExistingTag:
+    def test_returns_false_when_budget_tag_missing(self):
+        ops = NonClusterOperations.__new__(NonClusterOperations)
+        ops.input_tags = {'Budget': 'PERF-DEPT'}
+        tags = [
+            {'Key': 'User', 'Value': 'cluster-owner'},
+            {'Key': 'Project', 'Value': 'test'},
+            {'Key': 'Manager', 'Value': 'manager'},
+            {'Key': 'Owner', 'Value': 'owner'},
+            {'Key': 'Email', 'Value': 'cluster-owner@redhat.com'},
+            {'Key': 'LaunchTime', 'Value': '2026/06/30 14:00:00'},
+        ]
+        assert ops.validate_existing_tag(tags=tags) is False
+
+    def test_returns_true_when_all_required_tags_present(self):
+        ops = NonClusterOperations.__new__(NonClusterOperations)
+        ops.input_tags = {'Budget': 'PERF-DEPT'}
+        tags = [
+            {'Key': 'User', 'Value': 'cluster-owner'},
+            {'Key': 'Project', 'Value': 'test'},
+            {'Key': 'Manager', 'Value': 'manager'},
+            {'Key': 'Owner', 'Value': 'owner'},
+            {'Key': 'Email', 'Value': 'cluster-owner@redhat.com'},
+            {'Key': 'LaunchTime', 'Value': '2026/06/30 14:00:00'},
+            {'Key': 'Budget', 'Value': 'PERF-DEPT'},
+        ]
+        assert ops.validate_existing_tag(tags=tags) is True