localstack-core 4.7.1.dev139__py3-none-any.whl → 4.10.1.dev42__py3-none-any.whl

localstack/services/cloudformation/v2/entities.py

@@ -25,7 +25,7 @@ from localstack.aws.api.cloudformation import (
     Parameter as ApiParameter,
 )
 from localstack.services.cloudformation.engine.entities import (
-    StackIdentifier,
+    StackIdentifierV2,
 )
 from localstack.services.cloudformation.engine.v2.change_set_model import (
     ChangeType,
@@ -41,6 +41,7 @@ class Stack:
     description: str | None
     parameters: list[ApiParameter]
     change_set_id: str | None
+    change_set_ids: set[str]
     status: StackStatus
     status_reason: StackStatusReason | None
     stack_id: str
@@ -49,6 +50,7 @@ class Stack:
     events: list[StackEvent]
     capabilities: list[Capability]
     enable_termination_protection: bool
+    template: dict | None
     processed_template: dict | None
     template_body: str | None
     tags: list[Tag]
@@ -72,11 +74,12 @@ class Stack:
         self.region_name = region_name
         self.status = initial_status
         self.status_reason = None
-        self.change_set_ids = []
+        self.change_set_ids = set()
         self.creation_time = datetime.now(tz=UTC)
         self.deletion_time = None
         self.change_set_id = None
         self.enable_termination_protection = False
+        self.template = None
         self.processed_template = None
         self.template_body = None
         self.tags = tags or []
@@ -85,7 +88,7 @@ class Stack:
         self.parameters = request_payload.get("Parameters", [])
         self.stack_id = arns.cloudformation_stack_arn(
             self.stack_name,
-            stack_id=StackIdentifier(
+            stack_id=StackIdentifierV2(
                 account_id=self.account_id, region=self.region_name, stack_name=self.stack_name
             ).generate(tags=request_payload.get("Tags")),
             account_id=self.account_id,

localstack/services/cloudformation/v2/provider.py

@@ -15,6 +15,7 @@ from localstack.aws.api.cloudformation import (
     ChangeSetNameOrId,
     ChangeSetNotFoundException,
     ChangeSetStatus,
+    ChangeSetSummary,
     ChangeSetType,
     ClientRequestToken,
     CreateChangeSetInput,
@@ -46,6 +47,7 @@ from localstack.aws.api.cloudformation import (
     IncludePropertyValues,
     InsufficientCapabilitiesException,
     InvalidChangeSetStatusException,
+    ListChangeSetsOutput,
     ListExportsOutput,
     ListStackResourcesOutput,
     ListStacksOutput,
@@ -118,9 +120,10 @@ from localstack.services.cloudformation.v2.entities import (
     StackInstance,
     StackSet,
 )
-from localstack.services.cloudformation.v2.types import EngineParameter
+from localstack.services.cloudformation.v2.types import EngineParameter, engine_parameter_value
 from localstack.services.plugins import ServiceLifecycleHook
 from localstack.utils.collections import select_attributes
+from localstack.utils.numbers import is_number
 from localstack.utils.strings import short_uid
 from localstack.utils.threads import start_worker_thread
 
@@ -132,15 +135,15 @@ SSM_PARAMETER_TYPE_RE = re.compile(
 
 
 def is_stack_arn(stack_name_or_id: str) -> bool:
-    return ARN_STACK_REGEX.match(stack_name_or_id) is not None
+    return stack_name_or_id and ARN_STACK_REGEX.match(stack_name_or_id) is not None
 
 
 def is_changeset_arn(change_set_name_or_id: str) -> bool:
-    return ARN_CHANGESET_REGEX.match(change_set_name_or_id) is not None
+    return change_set_name_or_id and ARN_CHANGESET_REGEX.match(change_set_name_or_id) is not None
 
 
 def is_stack_set_arn(stack_set_name_or_id: str) -> bool:
-    return ARN_STACK_SET_REGEX.match(stack_set_name_or_id) is not None
+    return stack_set_name_or_id and ARN_STACK_SET_REGEX.match(stack_set_name_or_id) is not None
 
 
 class StackNotFoundError(ValidationError):
@@ -234,14 +237,18 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
         issue_url = "?".join([base, urlencode(query_args)])
         LOG.info(
             "You have opted in to the new CloudFormation deployment engine. "
-            "You can opt in to using the old engine by setting PROVIDER_OVERRIDE_CLOUDFORMATION=legacy. "
+            "You can opt in to using the old engine by setting PROVIDER_OVERRIDE_CLOUDFORMATION=engine-legacy. "
             "If you experience issues, please submit a bug report at this URL: %s",
             issue_url,
         )
 
     @staticmethod
     def _resolve_parameters(
-        template: dict | None, parameters: dict | None, account_id: str, region_name: str
+        template: dict | None,
+        parameters: dict | None,
+        account_id: str,
+        region_name: str,
+        before_parameters: dict | None,
     ) -> dict[str, EngineParameter]:
         template_parameters = template.get("Parameters", {})
         resolved_parameters = {}
@@ -256,6 +263,12 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
                 no_echo=parameter.get("NoEcho"),
             )
 
+            # validate the type
+            if parameter["Type"] == "Number" and not is_number(
+                engine_parameter_value(resolved_parameter)
+            ):
+                raise ValidationError(f"Parameter '{name}' must be a number.")
+
             # TODO: support other parameter types
             if match := SSM_PARAMETER_TYPE_RE.match(parameter["Type"]):
                 inner_type = match.group("innertype")
@@ -276,10 +289,25 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
                         resolved_parameter["resolved_value"] = resolve_ssm_parameter(
                             account_id, region_name, given_value or default_value
                         )
-                    except Exception:
-                        raise ValidationError(
-                            f"Parameter {name} should either have input value or default value"
-                        )
+                    except Exception as e:
+                        # we could not find the parameter however CDK provides the resolved value rather than the
+                        # parameter name again so try to look up the value in the previous parameters
+                        if (
+                            before_parameters
+                            and (before_param := before_parameters.get(name))
+                            and isinstance(before_param, dict)
+                            and (resolved_value := before_param.get("resolved_value"))
+                        ):
+                            LOG.debug(
+                                "Parameter %s could not be resolved, using previous value of %s",
+                                name,
+                                resolved_value,
+                            )
+                            resolved_parameter["resolved_value"] = resolved_value
+                        else:
+                            raise ValidationError(
+                                f"Parameter {name} should either have input value or default value"
+                            ) from e
             elif given_value is None and default_value is None:
                 invalid_parameters.append(name)
                 continue
@@ -318,6 +346,7 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
                 after_parameters,
                 change_set.stack.account_id,
                 change_set.stack.region_name,
+                before_parameters,
             )
 
         change_set.resolved_parameters = resolved_parameters
@@ -435,6 +464,7 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
             stack = state.stacks_v2.get(stack_name)
             if not stack:
                 raise ValidationError(f"Stack '{stack_name}' does not exist.")
+            stack.capabilities = request.get("Capabilities") or []
         else:
             # stack name specified, so fetch the stack by name
             stack_candidates: list[Stack] = [
@@ -455,6 +485,8 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
                 if not active_stack_candidates:
                     raise ValidationError(f"Stack '{stack_name}' does not exist.")
                 stack = active_stack_candidates[0]
+                # propagate capabilities from create change set request
+                stack.capabilities = request.get("Capabilities") or []
 
         # TODO: test if rollback status is allowed as well
         if (
@@ -465,6 +497,14 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
                 f"Stack [{stack_name}] already exists and cannot be created again with the changeSet [{change_set_name}]."
             )
 
+        if change_set_type == ChangeSetType.UPDATE and (
+            stack.status == StackStatus.DELETE_COMPLETE
+            or stack.status == StackStatus.DELETE_IN_PROGRESS
+        ):
+            raise ValidationError(
+                f"Stack:{stack.stack_id} is in {stack.status} state and can not be updated."
+            )
+
         before_parameters: dict[str, Parameter] | None = None
         match change_set_type:
             case ChangeSetType.UPDATE:
@@ -525,21 +565,21 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
             after_parameters=after_parameters,
             previous_update_model=previous_update_model,
         )
-
-        # TODO: handle the empty change set case
-        if not change_set.has_changes():
-            change_set.set_change_set_status(ChangeSetStatus.FAILED)
+        if change_set.status == ChangeSetStatus.FAILED:
             change_set.set_execution_status(ExecutionStatus.UNAVAILABLE)
-            change_set.status_reason = "The submitted information didn't contain changes. Submit different information to create a change set."
         else:
-            if stack.status not in [StackStatus.CREATE_COMPLETE, StackStatus.UPDATE_COMPLETE]:
-                stack.set_stack_status(StackStatus.REVIEW_IN_PROGRESS, "User Initiated")
+            if not change_set.has_changes():
+                change_set.set_change_set_status(ChangeSetStatus.FAILED)
+                change_set.set_execution_status(ExecutionStatus.UNAVAILABLE)
+                change_set.status_reason = "The submitted information didn't contain changes. Submit different information to create a change set."
+            else:
+                if stack.status not in [StackStatus.CREATE_COMPLETE, StackStatus.UPDATE_COMPLETE]:
+                    stack.set_stack_status(StackStatus.REVIEW_IN_PROGRESS, "User Initiated")
 
-            change_set.set_change_set_status(ChangeSetStatus.CREATE_COMPLETE)
+                change_set.set_change_set_status(ChangeSetStatus.CREATE_COMPLETE)
 
-        stack.change_set_ids.append(change_set.change_set_id)
+        stack.change_set_ids.add(change_set.change_set_id)
         state.change_sets[change_set.change_set_id] = change_set
-
         return CreateChangeSetOutput(StackId=stack.stack_id, Id=change_set.change_set_id)
 
     @handler("ExecuteChangeSet")
@@ -592,6 +632,11 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
             result = change_set_executor.execute()
             change_set.stack.resolved_parameters = change_set.resolved_parameters
             change_set.stack.resolved_resources = result.resources
+            change_set.stack.template = change_set.template
+            change_set.stack.processed_template = change_set.processed_template
+            change_set.stack.template_body = change_set.template_body
+            change_set.stack.description = change_set.template.get("Description")
+
             if not result.failure_message:
                 new_stack_status = StackStatus.UPDATE_COMPLETE
                 if change_set.change_set_type == ChangeSetType.CREATE:
@@ -606,14 +651,6 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
                         change_set.stack.resolved_exports[export_name] = output["OutputValue"]
 
                 change_set.stack.change_set_id = change_set.change_set_id
-                change_set.stack.change_set_ids.append(change_set.change_set_id)
-
-                # if the deployment succeeded, update the stack's template representation to that
-                # which was just deployed
-                change_set.stack.template = change_set.template
-                change_set.stack.description = change_set.template.get("Description")
-                change_set.stack.processed_template = change_set.processed_template
-                change_set.stack.template_body = change_set.template_body
             else:
                 LOG.error(
                     "Execute change set failed: %s",
@@ -667,6 +704,27 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
         if not change_set:
             raise ChangeSetNotFoundException(f"ChangeSet [{change_set_name}] does not exist")
 
+        # if the change set failed to create, then we can return a blank response
+        if change_set.status == ChangeSetStatus.FAILED:
+            return DescribeChangeSetOutput(
+                Status=change_set.status,
+                ChangeSetId=change_set.change_set_id,
+                ChangeSetName=change_set.change_set_name,
+                ExecutionStatus=change_set.execution_status,
+                RollbackConfiguration=RollbackConfiguration(),
+                StackId=change_set.stack.stack_id,
+                StackName=change_set.stack.stack_name,
+                CreationTime=change_set.creation_time,
+                Changes=[],
+                Capabilities=change_set.stack.capabilities,
+                StatusReason=change_set.status_reason,
+                Description=change_set.description,
+                # TODO: static information
+                IncludeNestedStacks=False,
+                NotificationARNs=[],
+                Tags=change_set.tags or None,
+            )
+
         # TODO: The ChangeSetModelDescriber currently matches AWS behavior by listing
         #       resource changes in the order they appear in the template. However, when
         #       a resource change is triggered indirectly (e.g., via Ref or GetAtt), the
@@ -701,6 +759,44 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
             result["Parameters"] = self._render_resolved_parameters(change_set.resolved_parameters)
         return result
 
+    @handler("ListChangeSets")
+    def list_change_sets(
+        self,
+        context: RequestContext,
+        stack_name: StackNameOrId,
+        next_token: NextToken = None,
+        **kwargs,
+    ) -> ListChangeSetsOutput:
+        store = get_cloudformation_store(account_id=context.account_id, region_name=context.region)
+        stack = find_stack_v2(store, stack_name)
+        if not stack:
+            raise StackNotFoundError(stack_name)
+        summaries = []
+        for change_set_id in stack.change_set_ids:
+            change_set = store.change_sets[change_set_id]
+            if (
+                change_set.status != ChangeSetStatus.CREATE_COMPLETE
+                or change_set.execution_status != ExecutionStatus.AVAILABLE
+            ):
+                continue
+
+            summaries.append(
+                ChangeSetSummary(
+                    StackId=change_set.stack.stack_id,
+                    StackName=change_set.stack.stack_name,
+                    ChangeSetId=change_set_id,
+                    ChangeSetName=change_set.change_set_name,
+                    ExecutionStatus=change_set.execution_status,
+                    Status=change_set.status,
+                    StatusReason=change_set.status_reason,
+                    CreationTime=change_set.creation_time,
+                    # mocked information
+                    IncludeNestedStacks=False,
+                )
+            )
+
+        return ListChangeSetsOutput(Summaries=summaries)
+
     @handler("DeleteChangeSet")
     def delete_change_set(
         self,
@@ -714,8 +810,22 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
         if not change_set:
             return DeleteChangeSetOutput()
 
-        change_set.stack.change_set_ids.remove(change_set.change_set_id)
-        state.change_sets.pop(change_set.change_set_id)
+        try:
+            change_set.stack.change_set_ids.remove(change_set.change_set_id)
+        except KeyError:
+            LOG.warning(
+                "Could not disassociatei change set '%s' from stack '%s', it does not seem to be associated",
+                change_set.change_set_id,
+                change_set.stack.stack_id,
+            )
+        try:
+            state.change_sets.pop(change_set.change_set_id)
+        except KeyError:
+            # This _should_ never fail since if we cannot find the change set in the store (using
+            # `find_change_set_v2`) then we early return from this function
+            LOG.warning(
+                "Could not delete change set '%s', it does not exist", change_set.change_set_id
+            )
 
         return DeleteChangeSetOutput()
 
@@ -999,6 +1109,12 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
 
         try:
             resource = stack.resolved_resources[logical_resource_id]
+            if resource.get("ResourceStatus") not in [
+                StackStatus.CREATE_COMPLETE,
+                StackStatus.UPDATE_COMPLETE,
+                StackStatus.ROLLBACK_COMPLETE,
+            ]:
+                raise KeyError
         except KeyError:
             raise ValidationError(
                 f"Resource {logical_resource_id} does not exist for stack {stack_name}"
@@ -1233,8 +1349,8 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
     def describe_stack_events(
         self,
         context: RequestContext,
-        stack_name: StackName = None,
-        next_token: NextToken = None,
+        stack_name: StackName,
+        next_token: NextToken | None = None,
         **kwargs,
     ) -> DescribeStackEventsOutput:
         if not stack_name:
@@ -1258,12 +1374,21 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
     ) -> GetTemplateOutput:
         state = get_cloudformation_store(context.account_id, context.region)
         if change_set_name:
+            if not is_changeset_arn(change_set_name) and not stack_name:
+                raise ValidationError("StackName is a required parameter.")
+
             change_set = find_change_set_v2(state, change_set_name, stack_name=stack_name)
+            if not change_set:
+                raise ChangeSetNotFoundException(f"ChangeSet [{change_set_name}] does not exist")
             stack = change_set.stack
         elif stack_name:
             stack = find_stack_v2(state, stack_name)
+            if not stack:
+                raise StackNotFoundError(
+                    stack_name, message_override=f"Stack with id {stack_name} does not exist"
+                )
         else:
-            raise StackNotFoundError(stack_name)
+            raise ValidationError("StackName is required if ChangeSetName is not specified.")
 
         if template_stage == TemplateStage.Processed and "Transform" in stack.template_body:
             template_body = json.dumps(stack.processed_template)
@@ -1288,6 +1413,12 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
             stack = find_stack_v2(state, stack_name)
             if not stack:
                 raise StackNotFoundError(stack_name)
+
+            if stack.status == StackStatus.REVIEW_IN_PROGRESS:
+                raise ValidationError(
+                    "GetTemplateSummary cannot be called on REVIEW_IN_PROGRESS stacks."
+                )
+
             template = stack.template
         else:
             template_body = request.get("TemplateBody")
@@ -1309,6 +1440,11 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
             template = template_preparer.parse_template(template_body)
 
         id_summaries = defaultdict(list)
+        if "Resources" not in template:
+            raise ValidationError(
+                "Template format error: At least one Resources member must be defined."
+            )
+
         for resource_id, resource in template["Resources"].items():
             res_type = resource["Type"]
             id_summaries[res_type].append(resource_id)
@@ -1412,6 +1548,14 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
                 raise RuntimeError("Multiple stacks matched, update matching logic")
             stack = active_stack_candidates[0]
 
+        if (
+            stack.status == StackStatus.DELETE_COMPLETE
+            or stack.status == StackStatus.DELETE_IN_PROGRESS
+        ):
+            raise ValidationError(
+                f"Stack:{stack.stack_id} is in {stack.status} state and can not be updated."
+            )
+
         # TODO: proper status modeling
         before_parameters = stack.resolved_parameters
         # TODO: reconsider the way parameters are modelled in the update graph process.
@@ -1559,6 +1703,7 @@ class CloudformationProviderV2(CloudformationProvider, ServiceLifecycleHook):
                 stack.set_stack_status(StackStatus.DELETE_FAILED)
 
         start_worker_thread(_run)
+        return ExecuteChangeSetOutput()
 
     @handler("ListExports")
     def list_exports(

localstack/services/cloudformation/v2/types.py

@@ -17,11 +17,15 @@ class EngineParameter(TypedDict):
 
 
 def engine_parameter_value(parameter: EngineParameter) -> str:
-    value = parameter.get("given_value") or parameter.get("default_value")
-    if value is None:
-        raise RuntimeError("Parameter value is None")
+    given_value = parameter.get("given_value")
+    if given_value is not None:
+        return given_value
 
-    return value
+    default_value = parameter.get("default_value")
+    if default_value is not None:
+        return default_value
+
+    raise RuntimeError("Parameter value is None")
 
 
 class ResolvedResource(TypedDict):

localstack/services/cloudwatch/provider_v2.py

@@ -15,6 +15,7 @@ from localstack.aws.api.cloudwatch import (
     AlarmTypes,
     AmazonResourceName,
     CloudwatchApi,
+    ContributorId,
     DashboardBody,
     DashboardName,
     DashboardNamePrefix,
@@ -107,17 +108,11 @@ _STORE_LOCK = threading.RLock()
 AWS_MAX_DATAPOINTS_ACCEPTED: int = 1440
 
 
-class ValidationError(CommonServiceException):
-    # TODO: check this error against AWS (doesn't exist in the API)
+class ValidationException(CommonServiceException):
     def __init__(self, message: str):
         super().__init__("ValidationError", message, 400, True)
 
 
-class InvalidParameterCombination(CommonServiceException):
-    def __init__(self, message: str):
-        super().__init__("InvalidParameterCombination", message, 400, True)
-
-
 def _validate_parameters_for_put_metric_data(metric_data: MetricData) -> None:
     for index, metric_item in enumerate(metric_data):
         indexplusone = index + 1
@@ -245,7 +240,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         results: list[MetricDataResult] = []
         limit = max_datapoints or 100_800
         messages: MetricDataResultMessages = []
-        nxt = None
+        nxt: str | None = None
         label_additions = []
 
         for diff in LABEL_DIFFERENTIATORS:
@@ -279,14 +274,14 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
             timestamp_value_dicts = [
                 {
                     "Timestamp": timestamp,
-                    "Value": value,
+                    "Value": float(value),
                 }
                 for timestamp, value in zip(timestamps, values, strict=False)
             ]
 
             pagination = PaginatedList(timestamp_value_dicts)
             timestamp_page, nxt = pagination.get_page(
-                lambda item: item.get("Timestamp"),
+                lambda item: str(item.get("Timestamp")),
                 next_token=next_token,
                 page_size=limit,
             )
@@ -314,6 +309,11 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         state_reason_data: StateReasonData = None,
         **kwargs,
     ) -> None:
+        if state_value not in ("OK", "ALARM", "INSUFFICIENT_DATA"):
+            raise ValidationException(
+                f"1 validation error detected: Value '{state_value}' at 'stateValue' failed to satisfy constraint: Member must satisfy enum value set: [INSUFFICIENT_DATA, ALARM, OK]"
+            )
+
         try:
             if state_reason_data:
                 state_reason_data = json.loads(state_reason_data)
@@ -332,10 +332,6 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
                 raise ResourceNotFound()
 
             old_state = alarm.alarm["StateValue"]
-            if state_value not in ("OK", "ALARM", "INSUFFICIENT_DATA"):
-                raise ValidationError(
-                    f"1 validation error detected: Value '{state_value}' at 'stateValue' failed to satisfy constraint: Member must satisfy enum value set: [INSUFFICIENT_DATA, ALARM, OK]"
-                )
 
             old_state_reason = alarm.alarm["StateReason"]
             old_state_update_timestamp = alarm.alarm["StateUpdatedTimestamp"]
@@ -415,7 +411,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
             "ignore",
             "missing",
         ]:
-            raise ValidationError(
+            raise ValidationException(
                 f"The value {request['TreatMissingData']} is not supported for TreatMissingData parameter. Supported values are [breaching, notBreaching, ignore, missing]."
             )
             # do some sanity checks:
@@ -424,7 +420,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
             value = request.get("Period")
             if value not in (10, 30):
                 if value % 60 != 0:
-                    raise ValidationError("Period must be 10, 30 or a multiple of 60")
+                    raise ValidationException("Period must be 10, 30 or a multiple of 60")
         if request.get("Statistic"):
             if request.get("Statistic") not in [
                 "SampleCount",
@@ -433,7 +429,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
                 "Minimum",
                 "Maximum",
             ]:
-                raise ValidationError(
+                raise ValidationException(
                     f"Value '{request.get('Statistic')}' at 'statistic' failed to satisfy constraint: Member must satisfy enum value set: [Maximum, SampleCount, Sum, Minimum, Average]"
                 )
 
@@ -447,7 +443,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
             "evaluate",
             "ignore",
         ):
-            raise ValidationError(
+            raise ValidationException(
                 f"Option {evaluate_low_sample_count_percentile} is not supported. "
                 "Supported options for parameter EvaluateLowSampleCountPercentile are evaluate and ignore."
             )
@@ -690,7 +686,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
         expected_datapoints = (end_time_unix - start_time_unix) / period
 
         if expected_datapoints > AWS_MAX_DATAPOINTS_ACCEPTED:
-            raise InvalidParameterCombination(
+            raise InvalidParameterCombinationException(
                 f"You have requested up to {int(expected_datapoints)} datapoints, which exceeds the limit of {AWS_MAX_DATAPOINTS_ACCEPTED}. "
                 f"You may reduce the datapoints requested by increasing Period, or decreasing the time range."
             )
@@ -737,7 +733,7 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
                 for i, timestamp in enumerate(timestamps):
                     stat_datapoints.setdefault(selected_unit, {})
                     stat_datapoints[selected_unit].setdefault(timestamp, {})
-                    stat_datapoints[selected_unit][timestamp][stat] = values[i]
+                    stat_datapoints[selected_unit][timestamp][stat] = float(values[i])
                     stat_datapoints[selected_unit][timestamp]["Unit"] = selected_unit
 
         datapoints: list[Datapoint] = []
@@ -822,14 +818,15 @@ class CloudwatchProvider(CloudwatchApi, ServiceLifecycleHook):
     def describe_alarm_history(
         self,
         context: RequestContext,
-        alarm_name: AlarmName = None,
-        alarm_types: AlarmTypes = None,
-        history_item_type: HistoryItemType = None,
-        start_date: Timestamp = None,
-        end_date: Timestamp = None,
-        max_records: MaxRecords = None,
-        next_token: NextToken = None,
-        scan_by: ScanBy = None,
+        alarm_name: AlarmName | None = None,
+        alarm_contributor_id: ContributorId | None = None,
+        alarm_types: AlarmTypes | None = None,
+        history_item_type: HistoryItemType | None = None,
+        start_date: Timestamp | None = None,
+        end_date: Timestamp | None = None,
+        max_records: MaxRecords | None = None,
+        next_token: NextToken | None = None,
+        scan_by: ScanBy | None = None,
         **kwargs,
     ) -> DescribeAlarmHistoryOutput:
         store = self.get_store(context.account_id, context.region)

localstack/services/dynamodb/packages.py

@@ -17,7 +17,8 @@ from localstack.utils.run import run
 DDB_AGENT_JAR_URL = f"{ARTIFACTS_REPO}/raw/e4e8c8e294b1fcda90c678ff6af5d5ebe1f091eb/dynamodb-local-patch/target/ddb-local-loader-0.2.jar"
 JAVASSIST_JAR_URL = f"{MAVEN_REPO_URL}/org/javassist/javassist/3.30.2-GA/javassist-3.30.2-GA.jar"
 
-DDBLOCAL_URL = "https://d1ni2b6xgvw0s0.cloudfront.net/v3.x/dynamodb_local_latest.zip"
+# URL points to 2.x here - however the latest 3.x builds are available under this URL
+DDBLOCAL_URL = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_latest.zip"
 
 
 class DynamoDBLocalPackage(Package):