Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Batch: improve parameter validation (#7505)

Browse Source
This commit is contained in:
rafcio19 2024-03-21 21:23:26 +01:00 committed by GitHub
parent 3edc0c751c
commit 59ce86c5c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/batch/models.py
View File

@ -1219,6 +1219,12 @@ class BatchBackend(BaseBackend):
f"A compute environment already exists with the name {compute_environment_name}" f"A compute environment already exists with the name {compute_environment_name}"
) )
if not service_role:
raise ClientException(
f"Error executing request, Exception : ServiceRole is required.,"
f" RequestId: {mock_random.uuid4()}"
)
# Look for IAM role # Look for IAM role
try: try:
self.iam_backend.get_role_by_arn(service_role) self.iam_backend.get_role_by_arn(service_role)

19
tests/test_batch/test_batch_compute_envs.py
View File

@ -374,9 +374,11 @@ def test_create_ec2_managed_compute_environment__without_required_params():
ec2_client, iam_client, _, _, batch_client = _get_clients() ec2_client, iam_client, _, _, batch_client = _get_clients()
_, subnet_id, _, iam_arn = _setup(ec2_client, iam_client) _, subnet_id, _, iam_arn = _setup(ec2_client, iam_client)
env_name = "ec2-env"
with pytest.raises(ClientError) as exc: with pytest.raises(ClientError) as exc:
batch_client.create_compute_environment( batch_client.create_compute_environment(
computeEnvironmentName="ec2-env", computeEnvironmentName=env_name,
type="MANAGED", type="MANAGED",
state="ENABLED", state="ENABLED",
computeResources={"type": "EC2", "maxvCpus": 1, "subnets": [subnet_id]}, computeResources={"type": "EC2", "maxvCpus": 1, "subnets": [subnet_id]},
@ -391,7 +393,7 @@ def test_create_ec2_managed_compute_environment__without_required_params():
with pytest.raises(ClientError) as exc: with pytest.raises(ClientError) as exc:
batch_client.create_compute_environment( batch_client.create_compute_environment(
computeEnvironmentName="ec2-env", computeEnvironmentName=env_name,
type="MANAGED", type="MANAGED",
state="ENABLED", state="ENABLED",
computeResources={ computeResources={
@ -408,3 +410,16 @@ def test_create_ec2_managed_compute_environment__without_required_params():
"Error executing request, Exception : Resource minvCpus is required." "Error executing request, Exception : Resource minvCpus is required."
in err["Message"] in err["Message"]
) )
with pytest.raises(ClientError) as exc:
batch_client.create_compute_environment(
computeEnvironmentName=env_name,
type="UNMANGED",
state="ENABLED",
)
err = exc.value.response["Error"]
assert err["Code"] == "ClientException"
assert (
"Error executing request, Exception : ServiceRole is required.,"
in err["Message"]
)