From c59fee5d352e429309ddce7f8350ef70f2003593 Mon Sep 17 00:00:00 2001
From: Mario Nitchev <marionitchev@gmail.com>
Date: Fri, 1 Sep 2023 19:45:39 +0300
Subject: [PATCH] EC2: Add missing transitGatewayArn field for
 CreateTransitGatewayResponse (#6750)

---
 moto/ec2/models/transit_gateway.py     | 6 +++++-
 moto/ec2/responses/transit_gateways.py | 5 +++--
 tests/test_ec2/test_transit_gateway.py | 7 +++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/moto/ec2/models/transit_gateway.py b/moto/ec2/models/transit_gateway.py
index b6e6bfd2d..2805a0367 100644
--- a/moto/ec2/models/transit_gateway.py
+++ b/moto/ec2/models/transit_gateway.py
@@ -46,6 +46,10 @@ class TransitGateway(TaggedEC2Resource, CloudFormationModel):
     def owner_id(self) -> str:
         return self.ec2_backend.account_id
 
+    @property
+    def arn(self) -> str:
+        return f"arn:aws:ec2:{self.ec2_backend.region_name}:{self.ec2_backend.account_id}:transit-gateway/{self.id}"
+
     @staticmethod
     def cloudformation_name_type() -> str:
         return ""
@@ -62,7 +66,7 @@ class TransitGateway(TaggedEC2Resource, CloudFormationModel):
         cloudformation_json: Any,
         account_id: str,
         region_name: str,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> "TransitGateway":
         from ..models import ec2_backends
 
diff --git a/moto/ec2/responses/transit_gateways.py b/moto/ec2/responses/transit_gateways.py
index f86afaab3..013ab2528 100644
--- a/moto/ec2/responses/transit_gateways.py
+++ b/moto/ec2/responses/transit_gateways.py
@@ -64,6 +64,7 @@ CREATE_TRANSIT_GATEWAY_RESPONSE = """<CreateTransitGatewayResponse xmlns="http:/
     <requestId>151283df-f7dc-4317-89b4-01c9888b1d45</requestId>
     <transitGateway>
         <transitGatewayId>{{ transit_gateway.id }}</transitGatewayId>
+        <transitGatewayArn>{{ transit_gateway.arn }}</transitGatewayArn>
         <ownerId>{{ transit_gateway.owner_id }}</ownerId>
         <description>{{ transit_gateway.description or '' }}</description>
         <createTime>{{ transit_gateway.create_time }}</createTime>
@@ -122,7 +123,7 @@ DESCRIBE_TRANSIT_GATEWAY_RESPONSE = """<DescribeTransitGatewaysResponse xmlns="h
                     </item>
                 {% endfor %}
             </tagSet>
-            <transitGatewayArn>arn:aws:ec2:us-east-1:{{ transit_gateway.owner_id }}:transit-gateway/{{ transit_gateway.id }}</transitGatewayArn>
+            <transitGatewayArn>{{ transit_gateway.arn }}</transitGatewayArn>
             <transitGatewayId>{{ transit_gateway.id }}</transitGatewayId>
         </item>
     {% endfor %}
@@ -166,7 +167,7 @@ MODIFY_TRANSIT_GATEWAY_RESPONSE = """<ModifyTransitGatewaysResponse xmlns="http:
                 </item>
             {% endfor %}
         </tagSet>
-        <transitGatewayArn>arn:aws:ec2:us-east-1:{{ transit_gateway.owner_id }}:transit-gateway/{{ transit_gateway.id }}</transitGatewayArn>
+        <transitGatewayArn>{{ transit_gateway.arn }}</transitGatewayArn>
         <transitGatewayId>{{ transit_gateway.id }}</transitGatewayId>
     </item>
     </transitGatewaySet>
diff --git a/tests/test_ec2/test_transit_gateway.py b/tests/test_ec2/test_transit_gateway.py
index 352c6d72e..d65551e7a 100644
--- a/tests/test_ec2/test_transit_gateway.py
+++ b/tests/test_ec2/test_transit_gateway.py
@@ -23,6 +23,10 @@ def test_create_transit_gateway():
     )
     gateway = response["TransitGateway"]
     assert gateway["TransitGatewayId"].startswith("tgw-")
+    assert (
+        gateway["TransitGatewayArn"]
+        == f"arn:aws:ec2:us-west-1:{ACCOUNT_ID}:transit-gateway/{gateway['TransitGatewayId']}"
+    )
     assert gateway["State"] == "available"
     assert gateway["OwnerId"] == ACCOUNT_ID
     assert gateway["Description"] == "my first gateway"
@@ -50,14 +54,13 @@ def test_create_transit_gateway():
     assert "CreationTime" in gateways[0]
     assert (
         gateways[0]["TransitGatewayArn"]
-        == f"arn:aws:ec2:us-east-1:{ACCOUNT_ID}:transit-gateway/{gateway['TransitGatewayId']}"
+        == f"arn:aws:ec2:us-west-1:{ACCOUNT_ID}:transit-gateway/{gateway['TransitGatewayId']}"
     )
     assert (
         gateways[0]["Options"]["AssociationDefaultRouteTableId"]
         == gateways[0]["Options"]["PropagationDefaultRouteTableId"]
     )
     del gateways[0]["CreationTime"]
-    del gateways[0]["TransitGatewayArn"]
     del gateways[0]["Options"]["AssociationDefaultRouteTableId"]
     assert gateway == gateways[0]