moto 5.0.13.dev46__tar.gz → 5.0.13.dev48__tar.gz

{moto-5.0.13.dev46/moto.egg-info → moto-5.0.13.dev48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 5.0.13.dev46
+Version: 5.0.13.dev48
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: spulec@gmail.com

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/moto/__init__.py

@@ -1,4 +1,4 @@
 from moto.core.decorator import mock_aws as mock_aws
 
 __title__ = "moto"
-__version__ = "5.0.13.dev46"
+__version__ = "5.0.13.dev48"

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/moto/apigateway/responses.py

@@ -1,5 +1,5 @@
 import json
-from typing import Dict, List
+from typing import Any, Dict, List
 from urllib.parse import unquote
 
 from moto.core.responses import TYPE_RESPONSE, BaseResponse
@@ -121,6 +121,14 @@ class APIGatewayResponse(BaseResponse):
         rest_api = self.backend.get_rest_api(function_id)
         return 200, {}, json.dumps(rest_api.to_dict())
 
+    def get_rest_api_without_id(self, *args: Any) -> TYPE_RESPONSE:  # type: ignore[misc]
+        """
+        AWS is returning an empty response when restApiId is an empty string. This is slightly odd and it seems an
+        outlier, therefore it was decided we could have a custom handler for this particular use case instead of
+        trying to make it work with the existing url-matcher.
+        """
+        return 200, {}, "{}"
+
     def put_rest_api(self) -> TYPE_RESPONSE:
         function_id = self.path.replace("/restapis/", "", 1).split("/")[0]
         mode = self._get_param("mode", "merge")

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/moto/apigateway/urls.py

@@ -5,6 +5,7 @@ url_bases = [r"https?://apigateway\.(.+)\.amazonaws.com"]
 
 url_paths = {
     "{0}/restapis$": APIGatewayResponse.dispatch,
+    "{0}/restapis/$": APIGatewayResponse.get_rest_api_without_id,
     "{0}/restapis/(?P<function_id>[^/]+)/?$": APIGatewayResponse.dispatch,
     "{0}/restapis/(?P<function_id>[^/]+)/resources$": APIGatewayResponse.dispatch,
     "{0}/restapis/(?P<function_id>[^/]+)/authorizers$": APIGatewayResponse.dispatch,

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/moto/apigatewayv2/responses.py

@@ -1,6 +1,7 @@
 """Handles incoming apigatewayv2 requests, invokes methods, returns responses."""
 
 import json
+from typing import Any
 from urllib.parse import unquote
 
 from moto.core.responses import TYPE_RESPONSE, BaseResponse
@@ -61,6 +62,15 @@ class ApiGatewayV2Response(BaseResponse):
         api = self.apigatewayv2_backend.get_api(api_id=api_id)
         return 200, {}, json.dumps(api.to_json())
 
+    @staticmethod
+    def get_api_without_id(*args: Any) -> TYPE_RESPONSE:  # type: ignore[misc]
+        """
+        AWS is returning an empty response when apiId is an empty string. This is slightly odd and it seems an
+        outlier, therefore it was decided we could have a custom handler for this particular use case instead of
+        trying to make it work with the existing url-matcher.
+        """
+        return 200, {}, "{}"
+
     def get_apis(self) -> TYPE_RESPONSE:
         apis = self.apigatewayv2_backend.get_apis()
         return 200, {}, json.dumps({"items": [a.to_json() for a in apis]})

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/moto/apigatewayv2/urls.py

@@ -9,6 +9,7 @@ url_bases = [
 
 url_paths = {
     "{0}/v2/apis$": ApiGatewayV2Response.dispatch,
+    "{0}/v2/apis/$": ApiGatewayV2Response.get_api_without_id,
     "{0}/v2/apis/(?P<api_id>[^/]+)$": ApiGatewayV2Response.dispatch,
     "{0}/v2/apis/(?P<api_id>[^/]+)/authorizers$": ApiGatewayV2Response.dispatch,
     "{0}/v2/apis/(?P<api_id>[^/]+)/authorizers/(?P<authorizer_id>[^/]+)$": ApiGatewayV2Response.dispatch,

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/moto/batch/models.py

@@ -6,7 +6,7 @@ import time
 from itertools import cycle
 from sys import platform
 from time import sleep
-from typing import Any, Dict, List, Optional, Set, Tuple
+from typing import Any, Dict, List, Optional, Set, Tuple, Union
 
 import dateutil.parser
 
@@ -473,6 +473,7 @@ class Job(threading.Thread, BaseModel, DockerModel, ManagedState):
         log_backend: LogsBackend,
         container_overrides: Optional[Dict[str, Any]],
         depends_on: Optional[List[Dict[str, str]]],
+        parameters: Optional[Dict[str, str]],
         all_jobs: Dict[str, "Job"],
         timeout: Optional[Dict[str, int]],
         array_properties: Dict[str, Any],
@@ -498,6 +499,7 @@ class Job(threading.Thread, BaseModel, DockerModel, ManagedState):
         self.job_stopped = False
         self.job_stopped_reason: Optional[str] = None
         self.depends_on = depends_on
+        self.parameters = {**self.job_definition.parameters, **(parameters or {})}
         self.timeout = timeout
         self.all_jobs = all_jobs
         self.array_properties: Dict[str, Any] = array_properties
@@ -546,6 +548,7 @@ class Job(threading.Thread, BaseModel, DockerModel, ManagedState):
         result = self.describe_short()
         result["jobQueue"] = self.job_queue.arn
         result["dependsOn"] = self.depends_on or []
+        result["parameters"] = {**self.job_definition.parameters, **self.parameters}
         if self.job_definition.type == "container":
             result["container"] = self._container_details()
         elif self.job_definition.type == "multinode":
@@ -628,6 +631,20 @@ class Job(threading.Thread, BaseModel, DockerModel, ManagedState):
             return self.job_definition.timeout["attemptDurationSeconds"]
         return None
 
+    def _add_parameters_to_command(self, command: Union[str, List[str]]) -> List[str]:
+        if isinstance(command, str):
+            command = [command]
+
+        if not self.parameters:
+            return command
+
+        new_command = [
+            command_part.replace(f"${param}", value)
+            for command_part in command
+            for param, value in self.parameters.items()
+        ]
+        return new_command
+
     def run(self) -> None:
         """
         Run the container.
@@ -676,9 +693,11 @@ class Job(threading.Thread, BaseModel, DockerModel, ManagedState):
                         "privileged": self.job_definition.container_properties.get(
                             "privileged", False
                         ),
-                        "command": self._get_container_property(
-                            "command",
-                            '/bin/sh -c "for a in `seq 1 10`; do echo Hello World; sleep 1; done"',
+                        "command": self._add_parameters_to_command(
+                            self._get_container_property(
+                                "command",
+                                '/bin/sh -c "for a in `seq 1 10`; do echo Hello World; sleep 1; done"',
+                            )
                         ),
                         "environment": {
                             e["name"]: e["value"]
@@ -723,9 +742,11 @@ class Job(threading.Thread, BaseModel, DockerModel, ManagedState):
                         {
                             "image": spec.get("image", "alpine:latest"),
                             "privileged": spec.get("privileged", False),
-                            "command": spec.get(
-                                "command",
-                                '/bin/sh -c "for a in `seq 1 10`; do echo Hello World; sleep 1; done"',
+                            "command": self._add_parameters_to_command(
+                                spec.get(
+                                    "command",
+                                    '/bin/sh -c "for a in `seq 1 10`; do echo Hello World; sleep 1; done"',
+                                )
                             ),
                             "environment": {
                                 e["name"]: e["value"]
@@ -1729,6 +1750,7 @@ class BatchBackend(BaseBackend):
         depends_on: Optional[List[Dict[str, str]]] = None,
         container_overrides: Optional[Dict[str, Any]] = None,
         timeout: Optional[Dict[str, int]] = None,
+        parameters: Optional[Dict[str, str]] = None,
     ) -> Tuple[str, str, str]:
         """
         Parameters RetryStrategy and Parameters are not yet implemented.
@@ -1755,6 +1777,7 @@ class BatchBackend(BaseBackend):
             all_jobs=self._jobs,
             timeout=timeout,
             array_properties=array_properties or {},
+            parameters=parameters,
         )
         self._jobs[job.job_id] = job
 
@@ -1772,6 +1795,7 @@ class BatchBackend(BaseBackend):
                     all_jobs=self._jobs,
                     timeout=timeout,
                     array_properties={"statusSummary": {}, "index": array_index},
+                    parameters=parameters,
                     provided_job_id=provided_job_id,
                 )
                 child_jobs.append(child_job)

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/moto/batch/responses.py

@@ -189,6 +189,7 @@ class BatchResponse(BaseResponse):
         job_queue = self._get_param("jobQueue")
         timeout = self._get_param("timeout")
         array_properties = self._get_param("arrayProperties", {})
+        parameters = self._get_param("parameters")
 
         name, job_id, job_arn = self.batch_backend.submit_job(
             job_name,
@@ -198,6 +199,7 @@ class BatchResponse(BaseResponse):
             container_overrides=container_overrides,
             timeout=timeout,
             array_properties=array_properties,
+            parameters=parameters,
         )
 
         result = {"jobId": job_id, "jobName": name, "jobArn": job_arn}

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/moto/batch_simple/models.py

@@ -56,6 +56,7 @@ class BatchSimpleBackend(BatchBackend):
         depends_on: Optional[List[Dict[str, str]]] = None,
         container_overrides: Optional[Dict[str, Any]] = None,
         timeout: Optional[Dict[str, int]] = None,
+        parameters: Optional[Dict[str, str]] = None,
     ) -> Tuple[str, str, str]:
         # Look for job definition
         job_def = self.get_job_definition(job_def_id)
@@ -76,6 +77,7 @@ class BatchSimpleBackend(BatchBackend):
             all_jobs=self._jobs,
             timeout=timeout,
             array_properties=array_properties,
+            parameters=parameters,
         )
 
         if "size" in array_properties:
@@ -93,6 +95,7 @@ class BatchSimpleBackend(BatchBackend):
                     timeout=timeout,
                     array_properties={"statusSummary": {}, "index": array_index},
                     provided_job_id=provided_job_id,
+                    parameters=parameters,
                 )
                 self._mark_job_as_finished(include_start_attempt=True, job=child_job)
                 child_jobs.append(child_job)

{moto-5.0.13.dev46 → moto-5.0.13.dev48/moto.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 5.0.13.dev46
+Version: 5.0.13.dev48
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: spulec@gmail.com

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = moto
-version = 5.0.13.dev46
+version = 5.0.13.dev48
 long_description = file:README.md
 long_description_content_type = text/markdown
 author = Steve Pulec

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/tests/test_apigateway/test_apigateway.py

@@ -1926,6 +1926,17 @@ def test_get_api_key_unknown_apikey():
     assert err["Code"] == "NotFoundException"
 
 
+@mock_aws
+def test_get_rest_api_without_id():
+    client = boto3.client("apigateway", region_name="us-east-1")
+    resp = client.get_rest_api(restApiId="")
+
+    assert resp["ResponseMetadata"]["HTTPStatusCode"] == 200
+
+    del resp["ResponseMetadata"]
+    assert resp == {}
+
+
 @mock_aws
 def test_get_domain_name_unknown_domainname():
     client = boto3.client("apigateway", region_name="us-east-1")

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/tests/test_apigatewayv2/test_apigatewayv2.py

@@ -141,6 +141,17 @@ def test_get_api_unknown():
     assert err["Message"] == "Invalid API identifier specified unknown"
 
 
+@mock_aws
+def test_get_api_without_id():
+    client = boto3.client("apigatewayv2", region_name="ap-southeast-1")
+    resp = client.get_api(ApiId="")
+
+    assert resp["ResponseMetadata"]["HTTPStatusCode"] == 200
+
+    del resp["ResponseMetadata"]
+    assert resp == {}
+
+
 @mock_aws
 def test_get_api():
     client = boto3.client("apigatewayv2", region_name="ap-southeast-1")

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/tests/test_batch/__init__.py

@@ -1,3 +1,4 @@
+import json
 from typing import Any, Tuple
 from uuid import uuid4
 
@@ -34,8 +35,21 @@ def _setup(ec2_client: Any, iam_client: Any) -> Tuple[str, str, str, str]:
     sg_id = resp["GroupId"]
 
     role_name = f"{str(uuid4())[0:6]}"
+    assume_role_policy = json.dumps(
+        {
+            "Version": "2012-10-17",
+            "Statement": [
+                {
+                    "Effect": "Allow",
+                    "Principal": {"Service": "batch.amazonaws.com"},
+                    "Action": "sts:AssumeRole",
+                }
+            ],
+        }
+    )
+
     resp = iam_client.create_role(
-        RoleName=role_name, AssumeRolePolicyDocument="some_policy"
+        RoleName=role_name, AssumeRolePolicyDocument=assume_role_policy
     )
     iam_arn = resp["Role"]["Arn"]
     iam_client.create_instance_profile(InstanceProfileName=role_name)

{moto-5.0.13.dev46 → moto-5.0.13.dev48}/tests/test_batch/test_batch_jobs.py

@@ -1089,3 +1089,54 @@ def test_submit_job_invalid_name():
             jobName=too_long_job_name, jobQueue="arn", jobDefinition="job_def_name"
         )
     assert exc.match("ClientException")
+
+
+@mock_aws()
+def test_submit_job_with_parameters():
+    """
+    Test verifies that parameters will be used when submitting a Job
+    """
+
+    ec2_client, iam_client, _, _, batch_client = _get_clients()
+    _, _, _, iam_arn = _setup(ec2_client, iam_client)
+
+    compute_name = str(uuid4())
+    resp = batch_client.create_compute_environment(
+        computeEnvironmentName=compute_name,
+        type="UNMANAGED",
+        state="ENABLED",
+        serviceRole=iam_arn,
+    )
+    arn = resp["computeEnvironmentArn"]
+
+    resp = batch_client.create_job_queue(
+        jobQueueName=str(uuid4()),
+        state="ENABLED",
+        priority=123,
+        computeEnvironmentOrder=[{"order": 123, "computeEnvironment": arn}],
+    )
+    queue_arn = resp["jobQueueArn"]
+
+    job_definition_name = f"sleep_{str(uuid4())[0:6]}"
+
+    batch_client.register_job_definition(
+        jobDefinitionName=job_definition_name,
+        type="container",
+        containerProperties={
+            "image": "busybox",
+            "vcpus": 1,
+            "memory": 512,
+            "command": ["sleep", "$seconds"],
+        },
+        parameters={"seconds": "0"},
+    )
+
+    job_id = batch_client.submit_job(
+        jobName="test1",
+        jobQueue=queue_arn,
+        jobDefinition=job_definition_name,
+        parameters={"seconds": "0.1"},
+    )["jobId"]
+
+    job = batch_client.describe_jobs(jobs=[job_id])["jobs"][0]
+    assert job["parameters"] == {"seconds": "0.1"}