Handle select errors

simonrw · simonrw · commit 6bd0ec494f76 · 2025-08-19T17:23:35.000+01:00
diff --git a/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_describer.py b/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_describer.py
@@ -115,22 +115,23 @@ def visit_node_intrinsic_function_fn_join(
     def visit_node_intrinsic_function_fn_select(
         self, node_intrinsic_function: NodeIntrinsicFunction
     ):
+        # TODO: should this not _ALWAYS_ return CHANGESET_KNOWN_AFTER_APPLY?
         arguments_delta = self.visit(node_intrinsic_function.arguments)
         delta = PreprocEntityDelta()
         if not is_nothing(arguments_delta.before):
             idx = arguments_delta.before[0]
             arr = arguments_delta.before[1]
             try:
-                delta.before = arr[idx]
-            except IndexError:
+                delta.before = arr[int(idx)]
+            except Exception:
                 delta.before = CHANGESET_KNOWN_AFTER_APPLY
 
         if not is_nothing(arguments_delta.after):
             idx = arguments_delta.after[0]
             arr = arguments_delta.after[1]
             try:
-                delta.after = arr[idx]
-            except IndexError:
+                delta.after = arr[int(idx)]
+            except Exception:
                 delta.after = CHANGESET_KNOWN_AFTER_APPLY
 
         return delta
diff --git a/tests/aws/services/cloudformation/resources/test_stepfunctions.py b/tests/aws/services/cloudformation/resources/test_stepfunctions.py
@@ -4,7 +4,6 @@
 
 import pytest
 from localstack_snapshot.snapshots.transformer import JsonpathTransformer
-from tests.aws.services.cloudformation.conftest import skip_if_v2_provider
 
 from localstack import config
 from localstack.testing.pytest import markers
@@ -47,10 +46,6 @@ def _is_executed():
     assert "hello from statemachine" in execution_desc["output"]
 
 
-@skip_if_v2_provider(
-    "Engine",
-    reason="During change set describe the a Ref to a not yet deployed resource returns null which is an invalid input for Fn::Split",
-)
 @markers.aws.validated
 def test_nested_statemachine_with_sync2(deploy_cfn_template, aws_client):
     stack = deploy_cfn_template(
