From 1a98c4f14a95526e49514a7814b2a4ce64430a3f Mon Sep 17 00:00:00 2001
From: Brian Pandola <bpandola@hsdp.io>
Date: Fri, 8 Jan 2021 00:05:44 -0800
Subject: [PATCH] Fix: handling of boolean value `privateDnsEnabled` in
 ec2:VpcEndpoint (#3566)

* Properly coerce `privateDnsEnabled` to boolean value when parsing requests.
* Per AWS spec, default `privateDnsEnabled` request value to `True`.
* Properly serialize `privateDnsEnabled` as boolean value in responses.
* Add test coverage.

Ref: #3540
---
 moto/ec2/responses/vpcs.py  | 5 +++--
 tests/test_ec2/test_vpcs.py | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/moto/ec2/responses/vpcs.py b/moto/ec2/responses/vpcs.py
index 076901bb3..28cff316c 100644
--- a/moto/ec2/responses/vpcs.py
+++ b/moto/ec2/responses/vpcs.py
@@ -178,7 +178,7 @@ class VPCs(BaseResponse):
         policy_document = self._get_param("PolicyDocument")
         client_token = self._get_param("ClientToken")
         tag_specifications = self._get_param("TagSpecifications")
-        private_dns_enabled = self._get_param("PrivateDNSEnabled")
+        private_dns_enabled = self._get_bool_param("PrivateDNSEnabled", if_none=True)
         security_group = self._get_param("SecurityGroup")
 
         vpc_end_point = self.ec2_backend.create_vpc_endpoint(
@@ -456,6 +456,7 @@ CREATE_VPC_END_POINT = """ <CreateVpcEndpointResponse xmlns="http://monitoring.a
                 <item>{{ subnetId }}</item>
             {% endfor %}
         </subnetIdSet>
+        <privateDnsEnabled>{{ 'true' if vpc_end_point.private_dns_enabled else 'false' }}</privateDnsEnabled>
         <dnsEntrySet>
         {% if vpc_end_point.dns_entries  %}
             {% for entry in vpc_end_point.dns_entries %}
@@ -511,7 +512,7 @@ DESCRIBE_VPC_ENDPOINT_RESPONSE = """<DescribeVpcEndpointsResponse xmlns="http://
                     <policyDocument>{{ vpc_end_point.policy_document }}</policyDocument>
                 {% endif %}
                 <state>available</state>
-                <privateDnsEnabled>{{ vpc_end_point.private_dns_enabled }}</privateDnsEnabled>
+                <privateDnsEnabled>{{ 'true' if vpc_end_point.private_dns_enabled else 'false' }}</privateDnsEnabled>
                 <serviceName>{{ vpc_end_point.service_name }}</serviceName>
                 <vpcId>{{ vpc_end_point.vpc_id }}</vpcId>
                 <vpcEndpointId>{{ vpc_end_point.id }}</vpcEndpointId>
diff --git a/tests/test_ec2/test_vpcs.py b/tests/test_ec2/test_vpcs.py
index fe9278ec2..657b0f863 100644
--- a/tests/test_ec2/test_vpcs.py
+++ b/tests/test_ec2/test_vpcs.py
@@ -885,6 +885,11 @@ def test_describe_vpc_end_points():
     )
 
     vpc_endpoints = ec2.describe_vpc_endpoints()
+    assert (
+        vpc_endpoints.get("VpcEndpoints")[0].get("PrivateDnsEnabled")
+        is vpc_end_point.get("VpcEndpoint").get("PrivateDnsEnabled")
+        is True
+    )
     assert vpc_endpoints.get("VpcEndpoints")[0].get(
         "VpcEndpointId"
     ) == vpc_end_point.get("VpcEndpoint").get("VpcEndpointId")