Skip to content

Commit

Permalink
Pass region_name to boto3
Browse files Browse the repository at this point in the history
  • Loading branch information
tjohnes committed Jan 24, 2024
1 parent 28c0c18 commit 212a16a
Showing 1 changed file with 28 additions and 6 deletions.
34 changes: 28 additions & 6 deletions tests/ut/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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")
Expand All @@ -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"),
)

0 comments on commit 212a16a

Please sign in to comment.