[dagster-aws] Update tests to moto>=5 (#21673)

## Summary & Motivation

Update the existing dagster-aws tests to use moto>=5 instead of moto<5.
This matches the moto version in other packages.

## Test Plan

Existing test suite

Internal-RevId: 1d2b9befcbf5e143293c2a0aae9e58f777f638b6

Author: smackesey

pyright/master/requirements-pinned.txt

@@ -409,7 +409,7 @@ mlflow-tracing==3.9.0
 mmh3==5.2.0
 more-itertools==10.8.0
 morefs==0.2.2
-moto==4.2.14
+moto==5.1.22
 mpmath==1.3.0
 msal==1.34.0
 msal-extensions==1.3.1

python_modules/libraries/dagster-aws/dagster_aws_tests/athena_tests/test_resources.py

@@ -1,6 +1,6 @@
 import boto3
 import pytest
-from moto import mock_athena
+from moto import mock_aws
 
 from dagster_aws.athena.resources import (
     AthenaError,
@@ -23,7 +23,7 @@ def get_client(self) -> FakeAthenaClient:
 
 @pytest.fixture
 def mock_athena_client(mock_s3_resource):
-    with mock_athena():
+    with mock_aws():
         yield boto3.client("athena", region_name="us-east-1")
 
 

python_modules/libraries/dagster-aws/dagster_aws_tests/cloudwatch_tests/test_loggers.py

@@ -3,7 +3,7 @@
 import boto3
 import pytest
 from dagster import job, op
-from moto import mock_logs
+from moto import mock_aws
 
 from dagster_aws.cloudwatch import cloudwatch_logger
 
@@ -26,7 +26,7 @@ def region():
 
 @pytest.fixture
 def cloudwatch_client(region):
-    with mock_logs():
+    with mock_aws():
         yield boto3.client("logs", region_name=region)
 
 

python_modules/libraries/dagster-aws/dagster_aws_tests/conftest.py

@@ -1,6 +1,6 @@
 import boto3
 import pytest
-from moto import mock_rds, mock_rdsdata, mock_s3, mock_secretsmanager, mock_ssm
+from moto import mock_aws
 
 
 # Make sure unit tests never connect to real AWS
@@ -13,7 +13,7 @@ def fake_aws_credentials(monkeypatch):
 
 @pytest.fixture
 def mock_s3_resource():
-    with mock_s3():
+    with mock_aws():
         yield boto3.resource("s3", region_name="us-east-1")
 
 
@@ -24,23 +24,23 @@ def mock_s3_bucket(mock_s3_resource):
 
 @pytest.fixture
 def mock_secretsmanager_resource():
-    with mock_secretsmanager():
+    with mock_aws():
         yield boto3.client("secretsmanager")
 
 
 @pytest.fixture
 def mock_ssm_client():
-    with mock_ssm():
+    with mock_aws():
         yield boto3.client("ssm")
 
 
 @pytest.fixture
 def mock_rds_client():
-    with mock_rds():
+    with mock_aws():
         yield boto3.client("rds")
 
 
 @pytest.fixture
 def mock_rds_data_client():
-    with mock_rdsdata():
+    with mock_aws():
         yield boto3.client("rds-data")

python_modules/libraries/dagster-aws/dagster_aws_tests/defs_state_storage_tests/test_defs_state_storage.py

@@ -5,7 +5,7 @@
 from dagster._core.storage.defs_state.blob_storage_state_storage import UPathDefsStateStorage
 from dagster._core.test_utils import ensure_dagster_tests_import
 from dagster_shared import check
-from moto.moto_server.threaded_moto_server import ThreadedMotoServer
+from moto.server import ThreadedMotoServer  # type: ignore  # (no type stubs)
 
 ensure_dagster_tests_import()
 from dagster_tests.storage_tests.utils.defs_state_storage import TestDefsStateStorage

python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/conftest.py

@@ -1,6 +1,6 @@
 import boto3
-import moto
 import pytest
+from moto import mock_aws
 
 from dagster_aws_tests.ecs_tests.stubbed_ecs import ThreadsafeStubbedEcs
 
@@ -17,7 +17,7 @@ def ecs(region):
 
 @pytest.fixture
 def ec2(region):
-    with moto.mock_ec2():
+    with mock_aws():
         yield boto3.resource("ec2", region_name=region)
 
 
@@ -38,5 +38,5 @@ def security_group(vpc):
 
 @pytest.fixture
 def secrets_manager(region):
-    with moto.mock_secretsmanager():
+    with mock_aws():
         yield boto3.client("secretsmanager", region_name=region)

python_modules/libraries/dagster-aws/dagster_aws_tests/ecs_tests/launcher_tests/conftest.py

@@ -5,7 +5,6 @@
 from typing import Any, Callable, ContextManager  # noqa: UP035
 
 import boto3
-import moto
 import pytest
 from dagster._core.definitions.job_definition import JobDefinition
 from dagster._core.instance import DagsterInstance
@@ -15,6 +14,7 @@
 from dagster._core.types.loadable_target_origin import LoadableTargetOrigin
 from dagster._core.workspace.context import WorkspaceRequestContext
 from dagster._utils.warnings import disable_dagster_warnings
+from moto import mock_aws
 
 from dagster_aws_tests.ecs_tests.launcher_tests import repo
 
@@ -29,7 +29,7 @@ def ignore_dagster_warnings() -> Iterator[None]:
 
 @pytest.fixture
 def cloudwatch_client(region: str):
-    with moto.mock_logs():
+    with mock_aws():
         yield boto3.client("logs", region_name=region)
 
 

python_modules/libraries/dagster-aws/dagster_aws_tests/emr_tests/test_emr.py

@@ -7,23 +7,23 @@
 
 import pytest
 from dagster._utils.test import create_test_pipeline_execution_context
-from moto import mock_emr
+from moto import mock_aws
 
 from dagster_aws.emr import EmrClusterState, EmrError, EmrJobRunner
 from dagster_aws.utils.mrjob.utils import _boto3_now
 
 REGION = "us-west-1"
 
 
-@mock_emr
+@mock_aws
 def test_emr_create_cluster(emr_cluster_config):
     context = create_test_pipeline_execution_context()
     cluster = EmrJobRunner(region=REGION)
     cluster_id = cluster.run_job_flow(context.log, emr_cluster_config)
     assert cluster_id.startswith("j-")
 
 
-@mock_emr
+@mock_aws
 def test_emr_add_tags_and_describe_cluster(emr_cluster_config):
     context = create_test_pipeline_execution_context()
     emr = EmrJobRunner(region=REGION)
@@ -38,7 +38,7 @@ def test_emr_add_tags_and_describe_cluster(emr_cluster_config):
     assert {"Key": "foobar", "Value": "v1"} in tags
 
 
-@mock_emr
+@mock_aws
 def test_emr_describe_cluster(emr_cluster_config):
     context = create_test_pipeline_execution_context()
     cluster = EmrJobRunner(region=REGION)
@@ -48,7 +48,7 @@ def test_emr_describe_cluster(emr_cluster_config):
     assert EmrClusterState(cluster_info["Status"]["State"]) == EmrClusterState.Waiting
 
 
-@mock_emr
+@mock_aws
 def test_emr_id_from_name(emr_cluster_config):
     context = create_test_pipeline_execution_context()
     cluster = EmrJobRunner(region=REGION)
@@ -79,7 +79,7 @@ def test_emr_construct_step_dict():
     }
 
 
-@mock_emr
+@mock_aws
 def test_emr_log_location_for_cluster(emr_cluster_config, mock_s3_bucket):
     context = create_test_pipeline_execution_context()
     emr = EmrJobRunner(region=REGION)
@@ -96,7 +96,7 @@ def test_emr_log_location_for_cluster(emr_cluster_config, mock_s3_bucket):
     assert "Log URI not specified, cannot retrieve step execution logs" in str(exc_info.value)
 
 
-@mock_emr
+@mock_aws
 def test_emr_retrieve_logs(emr_cluster_config, mock_s3_bucket):
     context = create_test_pipeline_execution_context()
     emr = EmrJobRunner(region=REGION)
@@ -160,7 +160,7 @@ def create_log():
     assert "EMR log file did not appear on S3 after waiting" in str(exc_info.value)
 
 
-@mock_emr
+@mock_aws
 def test_is_emr_step_complete(emr_cluster_config):
     context = create_test_pipeline_execution_context()
     emr = EmrJobRunner(region=REGION, check_cluster_every=1)

python_modules/libraries/dagster-aws/dagster_aws_tests/emr_tests/test_pyspark.py

@@ -17,7 +17,7 @@
 from dagster._utils.merger import deep_merge_dicts
 from dagster._utils.test import create_test_pipeline_execution_context
 from dagster_pyspark import DataFrame, pyspark_resource
-from moto import mock_emr
+from moto import mock_aws
 from pyspark.sql import Row
 from pyspark.sql.types import IntegerType, StringType, StructField, StructType
 
@@ -116,7 +116,7 @@ def test_local():
     assert result.success
 
 
-@mock_emr
+@mock_aws
 @mock.patch("dagster_aws.emr.pyspark_step_launcher.EmrPySparkStepLauncher.read_events")
 @mock.patch("dagster_aws.emr.emr.EmrJobRunner.is_emr_step_complete")
 @pytest.mark.skipif(sys.version_info >= (3, 11), reason="no pyspark support on 3.11")

python_modules/libraries/dagster-aws/dagster_aws_tests/pipes_tests/conftest.py

@@ -3,7 +3,7 @@
 
 import boto3
 import pytest
-from moto.server import ThreadedMotoServer  # type: ignore  # (pyright bug)
+from moto.server import ThreadedMotoServer  # type: ignore  # (no type stubs)
 
 from dagster_aws_tests.pipes_tests.utils import (
     _MOTO_SERVER_PORT,