CFn: Parametrize Fn::GetAZs test across all regions

localstack/services/kinesis/resource_providers/aws_kinesis_stream.py

@@ -138,14 +138,24 @@ def delete(
  - kinesis:DeleteStream
  - kinesis:RemoveTagsFromStream
  """
- model = request.desired_state
- request.aws_client_factory.kinesis.delete_stream(
- StreamARN=model["Arn"], EnforceConsumerDeletion=True
- )
- return ProgressEvent(
- status=OperationStatus.SUCCESS,
- resource_model={},
- )
+ model = request.previous_state
+ client = request.aws_client_factory.kinesis
+
+ if not request.custom_context.get(REPEATED_INVOCATION):
+ client.delete_stream(StreamARN=model["Arn"], EnforceConsumerDeletion=True)
+ request.custom_context[REPEATED_INVOCATION] = True
+
+ try:
+ client.describe_stream(StreamARN=model["Arn"])
+ return ProgressEvent(
+ status=OperationStatus.IN_PROGRESS,
+ resource_model={},
+ )
+ except client.exceptions.ResourceNotFoundException:
+ return ProgressEvent(
+ status=OperationStatus.SUCCESS,
+ resource_model={},
+ )
 
  def update(
  self,

localstack/testing/pytest/fixtures.py

@@ -21,6 +21,7 @@
 from werkzeug import Request, Response
 
 from localstack import config
+from localstack.aws.connect import ServiceLevelClientFactory
 from localstack.constants import (
  AWS_REGION_US_EAST_1,
  SECONDARY_TEST_AWS_ACCOUNT_ID,
@@ -955,13 +956,9 @@ def format_event(event: dict) -> str:
 
 @pytest.fixture
 def deploy_cfn_template(
- cleanup_stacks,
- cleanup_changesets,
- is_change_set_created_and_available,
- is_change_set_finished,
- aws_client,
+ aws_client: ServiceLevelClientFactory,
 ):
- state = []
+ state: list[tuple[str, Callable]] = []
 
  def _deploy(
  *,
@@ -970,11 +967,12 @@ def _deploy(
  change_set_name: Optional[str] = None,
  template: Optional[str] = None,
  template_path: Optional[str | os.PathLike] = None,
- template_mapping: Optional[Dict[str, any]] = None,
+ template_mapping: Optional[Dict[str, Any]] = None,
  parameters: Optional[Dict[str, str]] = None,
  role_arn: Optional[str] = None,
  max_wait: Optional[int] = None,
  delay_between_polls: Optional[int] = 2,
+ custom_aws_client: Optional[ServiceLevelClientFactory] = None,
  ) -> DeployResult:
  if is_update:
  assert stack_name
@@ -1005,17 +1003,18 @@ def _deploy(
  if role_arn is not None:
  kwargs["RoleARN"] = role_arn
 
- response = aws_client.cloudformation.create_change_set(**kwargs)
+ cfn_aws_client = custom_aws_client if custom_aws_client is not None else aws_client
+
+ response = cfn_aws_client.cloudformation.create_change_set(**kwargs)
 
  change_set_id = response["Id"]
  stack_id = response["StackId"]
- state.append({"stack_id": stack_id, "change_set_id": change_set_id})
 
- aws_client.cloudformation.get_waiter(WAITER_CHANGE_SET_CREATE_COMPLETE).wait(
+ cfn_aws_client.cloudformation.get_waiter(WAITER_CHANGE_SET_CREATE_COMPLETE).wait(
  ChangeSetName=change_set_id
  )
- aws_client.cloudformation.execute_change_set(ChangeSetName=change_set_id)
- stack_waiter = aws_client.cloudformation.get_waiter(
+ cfn_aws_client.cloudformation.execute_change_set(ChangeSetName=change_set_id)
+ stack_waiter = cfn_aws_client.cloudformation.get_waiter(
  WAITER_STACK_UPDATE_COMPLETE if is_update else WAITER_STACK_CREATE_COMPLETE
  )
 
@@ -1029,28 +1028,30 @@ def _deploy(
  )
  except botocore.exceptions.WaiterError as e:
  raise StackDeployError(
- aws_client.cloudformation.describe_stacks(StackName=stack_id)["Stacks"][0],
- aws_client.cloudformation.describe_stack_events(StackName=stack_id)["StackEvents"],
+ cfn_aws_client.cloudformation.describe_stacks(StackName=stack_id)["Stacks"][0],
+ cfn_aws_client.cloudformation.describe_stack_events(StackName=stack_id)[
+ "StackEvents"
+ ],
  ) from e
 
- describe_stack_res = aws_client.cloudformation.describe_stacks(StackName=stack_id)[
+ describe_stack_res = cfn_aws_client.cloudformation.describe_stacks(StackName=stack_id)[
  "Stacks"
  ][0]
  outputs = describe_stack_res.get("Outputs", [])
 
  mapped_outputs = {o["OutputKey"]: o.get("OutputValue") for o in outputs}
 
  def _destroy_stack():
- aws_client.cloudformation.delete_stack(StackName=stack_id)
- aws_client.cloudformation.get_waiter(WAITER_STACK_DELETE_COMPLETE).wait(
+ cfn_aws_client.cloudformation.delete_stack(StackName=stack_id)
+ cfn_aws_client.cloudformation.get_waiter(WAITER_STACK_DELETE_COMPLETE).wait(
  StackName=stack_id,
  WaiterConfig={
  "Delay": delay_between_polls,
  "MaxAttempts": max_wait / delay_between_polls,
  },
  )
- # TODO: fix in localstack. stack should only be in DELETE_COMPLETE state after all resources have been deleted
-  time.sleep(2)
+
+ state.append((stack_id, _destroy_stack))
 
  return DeployResult(
  change_set_id, stack_id, stack_name, change_set_name, mapped_outputs, _destroy_stack
@@ -1059,20 +1060,11 @@ def _destroy_stack():
  yield _deploy
 
  # delete the stacks in the reverse order they were created in case of inter-stack dependencies
- for entry in state[::-1]:
- entry_stack_id = entry.get("stack_id")
+ for stack_id, teardown in state[::-1]:
  try:
- if entry_stack_id:
- aws_client.cloudformation.delete_stack(StackName=entry_stack_id)
- aws_client.cloudformation.get_waiter(WAITER_STACK_DELETE_COMPLETE).wait(
- StackName=entry_stack_id,
- WaiterConfig={
- "Delay": 2,
- "MaxAttempts": 120,
- },
- )
+ teardown()
  except Exception as e:
- LOG.debug(f"Failed cleaning up stack {entry_stack_id=}: {e}")
+ LOG.debug(f"Failed cleaning up stack {stack_id=}: {e}")
 
 
 @pytest.fixture

tests/aws/services/cloudformation/test_template_engine.py

@@ -8,7 +8,6 @@
 import yaml
 
 from localstack.aws.api.lambda_ import Runtime
-from localstack.constants import AWS_REGION_US_EAST_1
 from localstack.services.cloudformation.engine.yaml_parser import parse_yaml
 from localstack.testing.aws.cloudformation_utils import load_template_file, load_template_raw
 from localstack.testing.pytest import markers
@@ -234,24 +233,40 @@ def test_cidr_function(self, deploy_cfn_template):
 
  assert deployed.outputs["Address"] == "10.0.0.0/24"
 
+ @pytest.mark.parametrize(
+ "region",
+ [
+ "us-east-1",
+ "us-east-2",
+ "us-west-1",
+ "us-west-2",
+ "ap-southeast-2",
+ "ap-northeast-1",
+ "eu-central-1",
+ "eu-west-1",
+ ],
+ )
  @markers.aws.validated
- def test_get_azs_function(self, deploy_cfn_template, snapshot):
+ def test_get_azs_function(self, deploy_cfn_template, region, aws_client_factory, snapshot):
  """
  TODO parametrize this test.
  For that we need to be able to parametrize the client region. The docs show the we should be
  able to put any region in the parameters but it doesn't work. It only accepts the same region from the client config
  if you put anything else it just returns an empty list.
  """
+ snapshot.add_transformer(snapshot.transform.regex(region, "<region>"))
 
  template_path = os.path.join(
  os.path.dirname(__file__), "../../templates/functions_get_azs.yml"
  )
 
+ aws_client = aws_client_factory(region_name=region)
  deployed = deploy_cfn_template(
  template_path=template_path,
+ custom_aws_client=aws_client,
+ parameters={"DeployRegion": region},
  )
 
- snapshot.add_transformer(snapshot.transform.regex(AWS_REGION_US_EAST_1, "<region>"))
  snapshot.match("azs", deployed.outputs["Zones"].split(";"))
 
  @markers.aws.validated

tests/aws/services/cloudformation/test_template_engine.snapshot.json

@@ -600,8 +600,19 @@
  }
  }
  },
- "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function": {
- "recorded-date": "03-04-2024, 07:12:29",
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[us-west-2]": {
+ "recorded-date": "17-04-2024, 10:25:14",
+ "recorded-content": {
+ "azs": [
+ "<region>a",
+ "<region>b",
+ "<region>c",
+ "<region>d"
+ ]
+ }
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[us-east-1]": {
+ "recorded-date": "17-04-2024, 10:24:29",
  "recorded-content": {
  "azs": [
  "<region>a",
@@ -612,5 +623,64 @@
  "<region>f"
  ]
  }
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[us-east-2]": {
+ "recorded-date": "17-04-2024, 10:24:45",
+ "recorded-content": {
+ "azs": [
+ "<region>a",
+ "<region>b",
+ "<region>c"
+ ]
+ }
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[us-west-1]": {
+ "recorded-date": "17-04-2024, 10:24:59",
+ "recorded-content": {
+ "azs": [
+ "<region>b",
+ "<region>c"
+ ]
+ }
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[ap-southeast-2]": {
+ "recorded-date": "17-04-2024, 10:25:33",
+ "recorded-content": {
+ "azs": [
+ "<region>a",
+ "<region>b",
+ "<region>c"
+ ]
+ }
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[ap-northeast-1]": {
+ "recorded-date": "17-04-2024, 10:25:52",
+ "recorded-content": {
+ "azs": [
+ "<region>a",
+ "<region>c",
+ "<region>d"
+ ]
+ }
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[eu-central-1]": {
+ "recorded-date": "17-04-2024, 10:26:09",
+ "recorded-content": {
+ "azs": [
+ "<region>a",
+ "<region>b",
+ "<region>c"
+ ]
+ }
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[eu-west-1]": {
+ "recorded-date": "17-04-2024, 10:26:24",
+ "recorded-content": {
+ "azs": [
+ "<region>a",
+ "<region>b",
+ "<region>c"
+ ]
+ }
  }
 }

tests/aws/services/cloudformation/test_template_engine.validation.json

@@ -2,6 +2,30 @@
  "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function": {
  "last_validated_date": "2024-04-03T07:12:29+00:00"
  },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[ap-northeast-1]": {
+ "last_validated_date": "2024-04-17T10:25:52+00:00"
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[ap-southeast-2]": {
+ "last_validated_date": "2024-04-17T10:25:33+00:00"
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[eu-central-1]": {
+ "last_validated_date": "2024-04-17T10:26:09+00:00"
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[eu-west-1]": {
+ "last_validated_date": "2024-04-17T10:26:24+00:00"
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[us-east-1]": {
+ "last_validated_date": "2024-04-17T10:24:29+00:00"
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[us-east-2]": {
+ "last_validated_date": "2024-04-17T10:24:45+00:00"
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[us-west-1]": {
+ "last_validated_date": "2024-04-17T10:24:59+00:00"
+ },
+ "tests/aws/services/cloudformation/test_template_engine.py::TestIntrinsicFunctions::test_get_azs_function[us-west-2]": {
+ "last_validated_date": "2024-04-17T10:25:14+00:00"
+ },
  "tests/aws/services/cloudformation/test_template_engine.py::TestMacros::test_capabilities_requirements": {
  "last_validated_date": "2023-01-30T19:15:46+00:00"
  },

tests/aws/templates/functions_get_azs.yml

@@ -1,18 +1,10 @@
 Parameters:
  DeployRegion:
  Type: String
- Default: us-east-1
-
-Conditions:
- DeployInUSEast1:
- Fn::Equals:
- - !Ref DeployRegion
- - us-east-1
 
 Resources:
  SsmParameter:
  Type: AWS::SSM::Parameter
- Condition: DeployInUSEast1
  Properties:
  Type: String
  Value: