From 515faca8aa00dcba2a3a2285ea089d71509a86e5 Mon Sep 17 00:00:00 2001
From: Guilherme Martins Crocetti
 <24530683+gmcrocetti@users.noreply.github.com>
Date: Tue, 26 Jul 2022 20:39:32 -0300
Subject: [PATCH] Add extra keys to EC2 `describe-addresses` operation (#5306)

---
 moto/ec2/models/elastic_ip_addresses.py     |  2 +-
 moto/ec2/responses/elastic_ip_addresses.py  |  2 ++
 tests/test_ec2/test_elastic_ip_addresses.py | 30 +++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/moto/ec2/models/elastic_ip_addresses.py b/moto/ec2/models/elastic_ip_addresses.py
index 71c7b851d..85dacfa42 100644
--- a/moto/ec2/models/elastic_ip_addresses.py
+++ b/moto/ec2/models/elastic_ip_addresses.py
@@ -37,7 +37,7 @@ class ElasticAddress(TaggedEC2Resource, CloudFormationModel):
 
     @staticmethod
     def cloudformation_type():
-        # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eip.html
+        # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html
         return "AWS::EC2::EIP"
 
     @classmethod
diff --git a/moto/ec2/responses/elastic_ip_addresses.py b/moto/ec2/responses/elastic_ip_addresses.py
index f70a7a5a3..eea5e2f6e 100644
--- a/moto/ec2/responses/elastic_ip_addresses.py
+++ b/moto/ec2/responses/elastic_ip_addresses.py
@@ -145,6 +145,8 @@ DESCRIBE_ADDRESS_RESPONSE = """<DescribeAddressesResponse xmlns="http://ec2.amaz
           {% endif %}
           {% if address.eni %}
             <networkInterfaceId>{{ address.eni.id }}</networkInterfaceId>
+            <privateIpAddress>{{ address.eni.private_ip_address }}</privateIpAddress>
+            <networkInterfaceOwnerId>{{ address.eni.owner_id }}</networkInterfaceOwnerId>
           {% else %}
             <networkInterfaceId/>
           {% endif %}
diff --git a/tests/test_ec2/test_elastic_ip_addresses.py b/tests/test_ec2/test_elastic_ip_addresses.py
index 84335c850..585f08ac3 100644
--- a/tests/test_ec2/test_elastic_ip_addresses.py
+++ b/tests/test_ec2/test_elastic_ip_addresses.py
@@ -672,3 +672,33 @@ def test_describe_addresses_tags():
     assert addresses_with_tags.get("Addresses")[0].get("Tags") == [
         {"Key": "ManagedBy", "Value": "MyCode"}
     ]
+
+
+@mock_ec2
+def test_describe_addresses_with_vpc_associated_eni():
+    """Extra attributes for EIP associated with a ENI inside a VPC"""
+    client = boto3.client("ec2", region_name="us-east-1")
+    ec2 = boto3.resource("ec2", region_name="us-east-1")
+
+    vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
+    subnet = ec2.create_subnet(VpcId=vpc.id, CidrBlock="10.0.0.0/18")
+    eni = ec2.create_network_interface(SubnetId=subnet.id)
+
+    eip = client.allocate_address(Domain="vpc")
+    association_id = client.associate_address(
+        NetworkInterfaceId=eni.id, PublicIp=eip["PublicIp"]
+    )["AssociationId"]
+
+    result = client.describe_addresses(
+        Filters=[{"Name": "association-id", "Values": [association_id]}]
+    )
+
+    result["ResponseMetadata"]["HTTPStatusCode"].should.equal(200)
+    result["Addresses"].should.have.length_of(1)
+
+    address = result["Addresses"][0]
+
+    address["NetworkInterfaceId"].should.be.equal(eni.id)
+    address["PrivateIpAddress"].should.be.equal(eni.private_ip_address)
+    address["AssociationId"].should.be.equal(association_id)
+    address["NetworkInterfaceOwnerId"].should.be.equal(eni.owner_id)