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

validate containerProperties as strings (#4809)

Browse Source
This commit is contained in:
Adam Faulconbridge 2022-01-29 12:07:10 +00:00 committed by GitHub
parent ed86df6bae
commit 3dfda9c1c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
moto/batch/models.py
View File

@ -266,18 +266,20 @@ class JobDefinition(CloudFormationModel):
) )
if required_resource: if required_resource:
return required_resource[0]["value"] if req_type == "vcpus":
return float(required_resource[0]["value"])
elif req_type == "memory":
return int(required_resource[0]["value"])
else:
return required_resource[0]["value"]
else: else:
return self.container_properties.get(req_type, default) return self.container_properties.get(req_type, default)
def _validate(self): def _validate(self):
# For future use when containers arnt the only thing in batch
if self.type not in ("container",): if self.type not in ("container",):
raise ClientException('type must be one of "container"') raise ClientException('type must be one of "container"')
# For future use when containers arnt the only thing in batch
if self.type != "container":
raise NotImplementedError()
if not isinstance(self.parameters, dict): if not isinstance(self.parameters, dict):
raise ClientException("parameters must be a string to string map") raise ClientException("parameters must be a string to string map")
@ -293,7 +295,7 @@ class JobDefinition(CloudFormationModel):
vcpus = self._get_resource_requirement("vcpus") vcpus = self._get_resource_requirement("vcpus")
if vcpus is None: if vcpus is None:
raise ClientException("containerProperties must contain vcpus") raise ClientException("containerProperties must contain vcpus")
if vcpus < 1: if vcpus <= 0:
raise ClientException("container vcpus limit must be greater than 0") raise ClientException("container vcpus limit must be greater than 0")
def update( def update(

13
tests/test_batch/test_batch_task_definition.py
View File

@ -195,25 +195,20 @@ def register_job_def(batch_client, definition_name="sleep10", use_resource_reqs=
container_properties.update( container_properties.update(
{ {
"resourceRequirements": [ "resourceRequirements": [
{"value": "1", "type": "VCPU"}, {"value": "0.25", "type": "VCPU"},
{"value": str(random.randint(4, 128)), "type": "MEMORY"}, {"value": "512", "type": "MEMORY"},
] ]
} }
) )
else: else:
container_properties.update( container_properties.update(
{"memory": random.randint(4, 128), "vcpus": 1,} {"memory": 128, "vcpus": 1,}
) )
return batch_client.register_job_definition( return batch_client.register_job_definition(
jobDefinitionName=definition_name, jobDefinitionName=definition_name,
type="container", type="container",
containerProperties={ containerProperties=container_properties,
"image": "busybox",
"vcpus": 1,
"memory": random.randint(4, 128),
"command": ["sleep", "10"],
},
) )