From 9805a279c7077c74a34b4017e2938ef354c07998 Mon Sep 17 00:00:00 2001
From: Terry Cain <terry@terrys-home.co.uk>
Date: Fri, 20 Oct 2017 01:06:30 +0100
Subject: [PATCH] Added JobQueue to cloudformation

---
 moto/batch/models.py                    | 29 +++++++++++
 tests/test_batch/test_cloudformation.py | 66 +++++++++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/moto/batch/models.py b/moto/batch/models.py
index 0fe3016ca..14572dd78 100644
--- a/moto/batch/models.py
+++ b/moto/batch/models.py
@@ -121,6 +121,35 @@ class JobQueue(BaseModel):
 
         return result
 
+    @property
+    def physical_resource_id(self):
+        return self.arn
+
+    @classmethod
+    def create_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name):
+        backend = batch_backends[region_name]
+        properties = cloudformation_json['Properties']
+
+        # Need to deal with difference case from cloudformation compute_resources, e.g. instanceRole vs InstanceRole
+        # Hacky fix to normalise keys, is making me think I want to start spamming cAsEiNsEnSiTiVe dictionaries
+        compute_envs = []
+        for compute_env in properties['ComputeEnvironmentOrder']:
+            tmp_compute_env_order = {}
+            for key, value in compute_env.items():
+                new_key = key[0].lower() + key[1:]
+                tmp_compute_env_order[new_key] = value
+            compute_envs.append(tmp_compute_env_order)
+
+        queue = backend.create_job_queue(
+            queue_name=resource_name,
+            priority=properties['Priority'],
+            state=properties.get('State', 'ENABLED'),
+            compute_env_order=compute_envs
+        )
+        arn = queue[1]
+
+        return backend.get_job_queue_by_arn(arn)
+
 
 class JobDefinition(BaseModel):
     def __init__(self, name, parameters, _type, container_properties, region_name, revision=0, retry_strategy=0):
diff --git a/tests/test_batch/test_cloudformation.py b/tests/test_batch/test_cloudformation.py
index b0203af93..bc9bd53e4 100644
--- a/tests/test_batch/test_cloudformation.py
+++ b/tests/test_batch/test_cloudformation.py
@@ -94,5 +94,71 @@ def test_create_env_cf():
     stack_resources = cf_conn.list_stack_resources(StackName=stack_id)
 
     stack_resources['StackResourceSummaries'][0]['ResourceStatus'].should.equal('CREATE_COMPLETE')
+    # Spot checks on the ARN
     stack_resources['StackResourceSummaries'][0]['PhysicalResourceId'].startswith('arn:aws:batch:')
     stack_resources['StackResourceSummaries'][0]['PhysicalResourceId'].should.contain('test_stack')
+
+
+@mock_cloudformation()
+@mock_ec2
+@mock_ecs
+@mock_iam
+@mock_batch
+def test_create_job_queue_cf():
+    ec2_client, iam_client, ecs_client, logs_client, batch_client = _get_clients()
+    vpc_id, subnet_id, sg_id, iam_arn = _setup(ec2_client, iam_client)
+
+    create_environment_template = {
+        'Resources': {
+            "ComputeEnvironment": {
+                "Type": "AWS::Batch::ComputeEnvironment",
+                "Properties": {
+                    "Type": "MANAGED",
+                    "ComputeResources": {
+                        "Type": "EC2",
+                        "MinvCpus": 0,
+                        "DesiredvCpus": 0,
+                        "MaxvCpus": 64,
+                        "InstanceTypes": [
+                            "optimal"
+                        ],
+                        "Subnets": [subnet_id],
+                        "SecurityGroupIds": [sg_id],
+                        "InstanceRole": iam_arn
+                    },
+                    "ServiceRole": iam_arn
+                }
+            },
+
+            "JobQueue": {
+                "Type": "AWS::Batch::JobQueue",
+                "Properties": {
+                    "Priority": 1,
+                    "ComputeEnvironmentOrder": [
+                        {
+                            "Order": 1,
+                            "ComputeEnvironment": {"Ref": "ComputeEnvironment"}
+                        }
+                    ]
+                }
+            },
+        }
+    }
+    cf_json = json.dumps(create_environment_template)
+
+    cf_conn = boto3.client('cloudformation', DEFAULT_REGION)
+    stack_id = cf_conn.create_stack(
+        StackName='test_stack',
+        TemplateBody=cf_json,
+    )['StackId']
+
+    stack_resources = cf_conn.list_stack_resources(StackName=stack_id)
+    len(stack_resources['StackResourceSummaries']).should.equal(2)
+
+    job_queue_resource = list(filter(lambda item: item['ResourceType'] == 'AWS::Batch::JobQueue', stack_resources['StackResourceSummaries']))[0]
+
+    job_queue_resource['ResourceStatus'].should.equal('CREATE_COMPLETE')
+    # Spot checks on the ARN
+    job_queue_resource['PhysicalResourceId'].startswith('arn:aws:batch:')
+    job_queue_resource['PhysicalResourceId'].should.contain('test_stack')
+    job_queue_resource['PhysicalResourceId'].should.contain('job-queue/')