From 7a801a888e2b083c326803062ed8dcb0acbb06e2 Mon Sep 17 00:00:00 2001
From: Ninh Khong <ninh@1on1english.vn>
Date: Sat, 4 Jul 2020 01:09:31 +0700
Subject: [PATCH 1/3] Add region information for requesterVpcInfo and
 accepterVpcInfo

---
 moto/ec2/responses/vpc_peering_connections.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/moto/ec2/responses/vpc_peering_connections.py b/moto/ec2/responses/vpc_peering_connections.py
index 3bf86af8a..84dbf2bf5 100644
--- a/moto/ec2/responses/vpc_peering_connections.py
+++ b/moto/ec2/responses/vpc_peering_connections.py
@@ -86,6 +86,7 @@ DESCRIBE_VPC_PEERING_CONNECTIONS_RESPONSE = (
      <ownerId>777788889999</ownerId>
      <vpcId>{{ vpc_pcx.vpc.id }}</vpcId>
      <cidrBlock>{{ vpc_pcx.vpc.cidr_block }}</cidrBlock>
+     <region>{{ vpc_pcx.vpc.ec2_backend.region_name }}</region>
     </requesterVpcInfo>
     <accepterVpcInfo>
      <ownerId>"""
@@ -98,6 +99,7 @@ DESCRIBE_VPC_PEERING_CONNECTIONS_RESPONSE = (
         <allowEgressFromLocalVpcToRemoteClassicLink>true</allowEgressFromLocalVpcToRemoteClassicLink>
         <allowDnsResolutionFromRemoteVpc>false</allowDnsResolutionFromRemoteVpc>
      </peeringOptions>
+     <region>{{ vpc_pcx.peer_vpc.ec2_backend.region_name }}</region>
     </accepterVpcInfo>
      <status>
       <code>{{ vpc_pcx._status.code }}</code>
@@ -128,6 +130,7 @@ ACCEPT_VPC_PEERING_CONNECTION_RESPONSE = (
       <ownerId>777788889999</ownerId>
       <vpcId>{{ vpc_pcx.vpc.id }}</vpcId>
       <cidrBlock>{{ vpc_pcx.vpc.cidr_block }}</cidrBlock>
+      <region>{{ vpc_pcx.vpc.ec2_backend.region_name }}</region>
     </requesterVpcInfo>
     <accepterVpcInfo>
       <ownerId>"""
@@ -140,6 +143,7 @@ ACCEPT_VPC_PEERING_CONNECTION_RESPONSE = (
         <allowEgressFromLocalVpcToRemoteClassicLink>false</allowEgressFromLocalVpcToRemoteClassicLink>
         <allowDnsResolutionFromRemoteVpc>false</allowDnsResolutionFromRemoteVpc>
       </peeringOptions>
+      <region>{{ vpc_pcx.peer_vpc.ec2_backend.region_name }}</region>
     </accepterVpcInfo>
     <status>
       <code>{{ vpc_pcx._status.code }}</code>

From 87eb8a21d6a472880484e3531144635aee4ff29b Mon Sep 17 00:00:00 2001
From: Ninh Khong <ninh@1on1english.vn>
Date: Sun, 5 Jul 2020 22:09:57 +0700
Subject: [PATCH 2/3] Update unittest checking region response in
 accept_vpc_peering_connection and describe_vpc_peering_connects functions

---
 tests/test_ec2/test_vpc_peering.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/test_ec2/test_vpc_peering.py b/tests/test_ec2/test_vpc_peering.py
index fc1646961..ce1c1e30f 100644
--- a/tests/test_ec2/test_vpc_peering.py
+++ b/tests/test_ec2/test_vpc_peering.py
@@ -160,8 +160,14 @@ def test_vpc_peering_connections_cross_region_accept():
         VpcPeeringConnectionIds=[vpc_pcx_usw1.id]
     )
     acp_pcx_apn1["VpcPeeringConnection"]["Status"]["Code"].should.equal("active")
+    acp_pcx_apn1["VpcPeeringConnection"]["AccepterVpcInfo"]["Region"].should.equal("ap-northeast-1")
+    acp_pcx_apn1["VpcPeeringConnection"]["RequesterVpcInfo"]["Region"].should.equal("us-west-1")
     des_pcx_apn1["VpcPeeringConnections"][0]["Status"]["Code"].should.equal("active")
+    des_pcx_apn1["VpcPeeringConnections"][0]["AccepterVpcInfo"]["Region"].should.equal("ap-northeast-1")
+    des_pcx_apn1["VpcPeeringConnections"][0]["RequesterVpcInfo"]["Region"].should.equal("us-west-1")
     des_pcx_usw1["VpcPeeringConnections"][0]["Status"]["Code"].should.equal("active")
+    des_pcx_usw1["VpcPeeringConnections"][0]["AccepterVpcInfo"]["Region"].should.equal("ap-northeast-1")
+    des_pcx_usw1["VpcPeeringConnections"][0]["RequesterVpcInfo"]["Region"].should.equal("us-west-1")
 
 
 @mock_ec2

From b7671819df08b8faadb8fdb36240862a25204cab Mon Sep 17 00:00:00 2001
From: Ninh Khong <ninh@1on1english.vn>
Date: Sun, 5 Jul 2020 23:04:34 +0700
Subject: [PATCH 3/3] Update code lint

---
 tests/test_ec2/test_vpc_peering.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/tests/test_ec2/test_vpc_peering.py b/tests/test_ec2/test_vpc_peering.py
index ce1c1e30f..b535518de 100644
--- a/tests/test_ec2/test_vpc_peering.py
+++ b/tests/test_ec2/test_vpc_peering.py
@@ -160,14 +160,26 @@ def test_vpc_peering_connections_cross_region_accept():
         VpcPeeringConnectionIds=[vpc_pcx_usw1.id]
     )
     acp_pcx_apn1["VpcPeeringConnection"]["Status"]["Code"].should.equal("active")
-    acp_pcx_apn1["VpcPeeringConnection"]["AccepterVpcInfo"]["Region"].should.equal("ap-northeast-1")
-    acp_pcx_apn1["VpcPeeringConnection"]["RequesterVpcInfo"]["Region"].should.equal("us-west-1")
+    acp_pcx_apn1["VpcPeeringConnection"]["AccepterVpcInfo"]["Region"].should.equal(
+        "ap-northeast-1"
+    )
+    acp_pcx_apn1["VpcPeeringConnection"]["RequesterVpcInfo"]["Region"].should.equal(
+        "us-west-1"
+    )
     des_pcx_apn1["VpcPeeringConnections"][0]["Status"]["Code"].should.equal("active")
-    des_pcx_apn1["VpcPeeringConnections"][0]["AccepterVpcInfo"]["Region"].should.equal("ap-northeast-1")
-    des_pcx_apn1["VpcPeeringConnections"][0]["RequesterVpcInfo"]["Region"].should.equal("us-west-1")
+    des_pcx_apn1["VpcPeeringConnections"][0]["AccepterVpcInfo"]["Region"].should.equal(
+        "ap-northeast-1"
+    )
+    des_pcx_apn1["VpcPeeringConnections"][0]["RequesterVpcInfo"]["Region"].should.equal(
+        "us-west-1"
+    )
     des_pcx_usw1["VpcPeeringConnections"][0]["Status"]["Code"].should.equal("active")
-    des_pcx_usw1["VpcPeeringConnections"][0]["AccepterVpcInfo"]["Region"].should.equal("ap-northeast-1")
-    des_pcx_usw1["VpcPeeringConnections"][0]["RequesterVpcInfo"]["Region"].should.equal("us-west-1")
+    des_pcx_usw1["VpcPeeringConnections"][0]["AccepterVpcInfo"]["Region"].should.equal(
+        "ap-northeast-1"
+    )
+    des_pcx_usw1["VpcPeeringConnections"][0]["RequesterVpcInfo"]["Region"].should.equal(
+        "us-west-1"
+    )
 
 
 @mock_ec2