From 7a9cdd4fd24978ba127e0c41a558d2ef740e0975 Mon Sep 17 00:00:00 2001
From: usmankb <usman@krazybee.com>
Date: Sat, 11 Apr 2020 08:37:00 +0530
Subject: [PATCH] Adding missing Param zoneId in the describe-availability-zone

---
 moto/ec2/responses/availability_zones_and_regions.py |  1 +
 .../test_ec2/test_availability_zones_and_regions.py  | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/moto/ec2/responses/availability_zones_and_regions.py b/moto/ec2/responses/availability_zones_and_regions.py
index d63e2f4ad..28cc3a495 100644
--- a/moto/ec2/responses/availability_zones_and_regions.py
+++ b/moto/ec2/responses/availability_zones_and_regions.py
@@ -35,6 +35,7 @@ DESCRIBE_ZONES_RESPONSE = """<DescribeAvailabilityZonesResponse xmlns="http://ec
           <zoneName>{{ zone.name }}</zoneName>
           <zoneState>available</zoneState>
           <regionName>{{ zone.region_name }}</regionName>
+          <zoneId>{{ zone.zone_id }}</zoneId>
           <messageSet/>
        </item>
    {% endfor %}
diff --git a/tests/test_ec2/test_availability_zones_and_regions.py b/tests/test_ec2/test_availability_zones_and_regions.py
index d5355f3b1..bec9459e8 100644
--- a/tests/test_ec2/test_availability_zones_and_regions.py
+++ b/tests/test_ec2/test_availability_zones_and_regions.py
@@ -52,3 +52,15 @@ def test_boto3_availability_zones():
         resp = conn.describe_availability_zones()
         for rec in resp["AvailabilityZones"]:
             rec["ZoneName"].should.contain(region)
+
+
+@mock_ec2
+def test_boto3_zoneId_in_availability_zones():
+    conn = boto3.client("ec2", "us-east-1")
+    resp = conn.describe_availability_zones()
+    for rec in resp["AvailabilityZones"]:
+        rec.get("ZoneId").should.contain("use1")
+    conn = boto3.client("ec2", "us-west-1")
+    resp = conn.describe_availability_zones()
+    for rec in resp["AvailabilityZones"]:
+        rec.get("ZoneId").should.contain("usw1")