From 212a16afc219e675320254494abe45b6283d5a05 Mon Sep 17 00:00:00 2001 From: Tom Johnes Date: Wed, 24 Jan 2024 12:54:35 +0000 Subject: [PATCH] Pass region_name to boto3 --- tests/ut/conftest.py | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/tests/ut/conftest.py b/tests/ut/conftest.py index f8cc4f0..876296f 100644 --- a/tests/ut/conftest.py +++ b/tests/ut/conftest.py @@ -14,6 +14,10 @@ logger = logging.getLogger(__name__) +def pytest_addoption(parser: pytest.Parser) -> None: + parser.addoption("--region", default="us-east-1") + + def pytest_configure(config: pytest.Config) -> None: # Avoid overly verbose logging. logging.getLogger("boto3").setLevel(logging.INFO) @@ -38,13 +42,25 @@ def moto_server() -> MotoServer: @pytest.fixture(scope="session") -def ec2(moto_server: MotoServer) -> EC2ServiceResource: - return boto3.resource("ec2", endpoint_url=moto_server.endpoint) +def ec2( + request: pytest.FixtureRequest, moto_server: MotoServer, +) -> EC2ServiceResource: + return boto3.resource( + "ec2", + endpoint_url=moto_server.endpoint, + region_name=request.config.getoption("--region"), + ) @pytest.fixture(scope="session") -def iam(moto_server: MotoServer) -> IAMServiceResource: - return boto3.resource("iam", endpoint_url=moto_server.endpoint) +def iam( + request: pytest.FixtureRequest, moto_server: MotoServer, +) -> IAMServiceResource: + return boto3.resource( + "iam", + endpoint_url=moto_server.endpoint, + region_name=request.config.getoption("--region"), + ) @pytest.fixture(scope="session") @@ -53,5 +69,11 @@ def this_dir() -> Path: @pytest.fixture(scope="module") -def eks_client(moto_server: MotoServer) -> EKSClient: - return boto3.client("eks", endpoint_url=moto_server.endpoint) +def eks_client( + request: pytest.FixtureRequest, moto_server: MotoServer, +) -> EKSClient: + return boto3.client( + "eks", + endpoint_url=moto_server.endpoint, + region_name=request.config.getoption("--region"), + )