This release adds support for Private IP VPNs, a new feature allowing…

… S2S VPN connections to use private ip addresses as the tunnel outside ip address over Direct Connect as transport.
aws · Jun 21, 2022 · a5f36fd · a5f36fd
1 parent d7908cf
commit a5f36fd
Show file tree

Hide file tree

Showing 17 changed files with 242 additions and 76 deletions.
diff --git a/generator/ServiceModels/ec2/ec2-2016-11-15.api.json b/generator/ServiceModels/ec2/ec2-2016-11-15.api.json
@@ -8833,17 +8833,15 @@
       ],
       "members":{
         "BgpAsn":{"shape":"Integer"},
-        "PublicIp":{
-          "shape":"String",
-          "locationName":"IpAddress"
-        },
+        "PublicIp":{"shape":"String"},
         "CertificateArn":{"shape":"String"},
         "Type":{"shape":"GatewayType"},
         "TagSpecifications":{
           "shape":"TagSpecificationList",
           "locationName":"TagSpecification"
         },
         "DeviceName":{"shape":"String"},
+        "IpAddress":{"shape":"String"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -39790,6 +39788,14 @@
           "shape":"String",
           "locationName":"remoteIpv6NetworkCidr"
         },
+        "OutsideIpAddressType":{
+          "shape":"String",
+          "locationName":"outsideIpAddressType"
+        },
+        "TransportTransitGatewayAttachmentId":{
+          "shape":"String",
+          "locationName":"transportTransitGatewayAttachmentId"
+        },
         "TunnelInsideIpVersion":{
           "shape":"TunnelInsideIpVersion",
           "locationName":"tunnelInsideIpVersion"
@@ -39813,7 +39819,9 @@
         "LocalIpv4NetworkCidr":{"shape":"String"},
         "RemoteIpv4NetworkCidr":{"shape":"String"},
         "LocalIpv6NetworkCidr":{"shape":"String"},
-        "RemoteIpv6NetworkCidr":{"shape":"String"}
+        "RemoteIpv6NetworkCidr":{"shape":"String"},
+        "OutsideIpAddressType":{"shape":"String"},
+        "TransportTransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"}
       }
     },
     "VpnEcmpSupportValue":{

diff --git a/generator/ServiceModels/ec2/ec2-2016-11-15.docs.json b/generator/ServiceModels/ec2/ec2-2016-11-15.docs.json
diff --git a/generator/ServiceModels/ec2/ec2-2016-11-15.normal.json b/generator/ServiceModels/ec2/ec2-2016-11-15.normal.json
@@ -536,7 +536,7 @@
       },
       "input":{"shape":"CreateCustomerGatewayRequest"},
       "output":{"shape":"CreateCustomerGatewayResult"},
-      "documentation":"<p>Provides information to Amazon Web Services about your VPN customer gateway device. The customer gateway is the appliance at your end of the VPN connection. (The device on the Amazon Web Services side of the VPN connection is the virtual private gateway.) You must provide the internet-routable IP address of the customer gateway's external interface. The IP address must be static and can be behind a device performing network address translation (NAT).</p> <p>For devices that use Border Gateway Protocol (BGP), you can also provide the device's BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your network. If you don't have an ASN already, you can use a private ASN. For more information, see <a href=\"https://docs.aws.amazon.com/vpn/latest/s2svpn/cgw-options.html\">Customer gateway options for your Site-to-Site VPN connection</a> in the <i>Amazon Web Services Site-to-Site VPN User Guide</i>.</p> <p>To create more than one customer gateway with the same VPN type, IP address, and BGP ASN, specify a unique device name for each customer gateway. An identical request returns information about the existing customer gateway; it doesn't create a new customer gateway.</p>"
+      "documentation":"<p>Provides information to Amazon Web Services about your customer gateway device. The customer gateway device is the appliance at your end of the VPN connection. You must provide the IP address of the customer gateway device’s external interface. The IP address must be static and can be behind a device performing network address translation (NAT).</p> <p>For devices that use Border Gateway Protocol (BGP), you can also provide the device's BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your network. If you don't have an ASN already, you can use a private ASN. For more information, see <a href=\"https://docs.aws.amazon.com/vpn/latest/s2svpn/cgw-options.html\">Customer gateway options for your Site-to-Site VPN connection</a> in the <i>Amazon Web Services Site-to-Site VPN User Guide</i>.</p> <p>To create more than one customer gateway with the same VPN type, IP address, and BGP ASN, specify a unique device name for each customer gateway. An identical request returns information about the existing customer gateway; it doesn't create a new customer gateway.</p>"
     },
     "CreateDefaultSubnet":{
       "name":"CreateDefaultSubnet",
@@ -10553,8 +10553,7 @@
         },
         "PublicIp":{
           "shape":"String",
-          "documentation":"<p>The Internet-routable IP address for the customer gateway's outside interface. The address must be static.</p>",
-          "locationName":"IpAddress"
+          "documentation":"<p> <i>This member has been deprecated.</i> The Internet-routable IP address for the customer gateway's outside interface. The address must be static.</p>"
         },
         "CertificateArn":{
           "shape":"String",
@@ -10573,6 +10572,10 @@
           "shape":"String",
           "documentation":"<p>A name for the customer gateway device.</p> <p>Length Constraints: Up to 255 characters.</p>"
         },
+        "IpAddress":{
+          "shape":"String",
+          "documentation":"<p> IPv4 address for the customer gateway device's outside interface. The address must be static. </p>"
+        },
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
@@ -13738,7 +13741,7 @@
         },
         "IpAddress":{
           "shape":"String",
-          "documentation":"<p>The Internet-routable IP address of the customer gateway's outside interface.</p>",
+          "documentation":"<p>The IP address of the customer gateway device's outside interface.</p>",
           "locationName":"ipAddress"
         },
         "CertificateArn":{
@@ -16404,7 +16407,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>bgp-asn</code> - The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number (ASN).</p> </li> <li> <p> <code>customer-gateway-id</code> - The ID of the customer gateway.</p> </li> <li> <p> <code>ip-address</code> - The IP address of the customer gateway's Internet-routable external interface.</p> </li> <li> <p> <code>state</code> - The state of the customer gateway (<code>pending</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code>).</p> </li> <li> <p> <code>type</code> - The type of customer gateway. Currently, the only supported type is <code>ipsec.1</code>.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>bgp-asn</code> - The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number (ASN).</p> </li> <li> <p> <code>customer-gateway-id</code> - The ID of the customer gateway.</p> </li> <li> <p> <code>ip-address</code> - The IP address of the customer gateway device's external interface.</p> </li> <li> <p> <code>state</code> - The state of the customer gateway (<code>pending</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code>).</p> </li> <li> <p> <code>type</code> - The type of customer gateway. Currently, the only supported type is <code>ipsec.1</code>.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "DryRun":{
@@ -51138,6 +51141,16 @@
           "documentation":"<p>The IPv6 CIDR on the Amazon Web Services side of the VPN connection.</p>",
           "locationName":"remoteIpv6NetworkCidr"
         },
+        "OutsideIpAddressType":{
+          "shape":"String",
+          "documentation":"<p>The type of IPv4 address assigned to the outside interface of the customer gateway.</p> <p>Valid values: <code>PrivateIpv4</code> | <code>PublicIpv4</code> </p> <p>Default: <code>PublicIpv4</code> </p>",
+          "locationName":"outsideIpAddressType"
+        },
+        "TransportTransitGatewayAttachmentId":{
+          "shape":"String",
+          "documentation":"<p>The transit gateway attachment ID in use for the VPN tunnel.</p>",
+          "locationName":"transportTransitGatewayAttachmentId"
+        },
         "TunnelInsideIpVersion":{
           "shape":"TunnelInsideIpVersion",
           "documentation":"<p>Indicates whether the VPN tunnels process IPv4 or IPv6 traffic.</p>",
@@ -51186,6 +51199,14 @@
         "RemoteIpv6NetworkCidr":{
           "shape":"String",
           "documentation":"<p>The IPv6 CIDR on the Amazon Web Services side of the VPN connection.</p> <p>Default: <code>::/0</code> </p>"
+        },
+        "OutsideIpAddressType":{
+          "shape":"String",
+          "documentation":"<p>The type of IPv4 address assigned to the outside interface of the customer gateway device.</p> <p>Valid values: <code>PrivateIpv4</code> | <code>PublicIpv4</code> </p> <p>Default: <code>PublicIpv4</code> </p>"
+        },
+        "TransportTransitGatewayAttachmentId":{
+          "shape":"TransitGatewayAttachmentId",
+          "documentation":"<p>The transit gateway attachment ID to use for the VPN tunnel.</p> <p>Required if <code>OutsideIpAddressType</code> is set to <code>PrivateIpv4</code>.</p>"
         }
       },
       "documentation":"<p>Describes VPN connection options.</p>"

diff --git a/sdk/src/Services/EC2/Generated/Model/CreateCustomerGatewayRequest.cs b/sdk/src/Services/EC2/Generated/Model/CreateCustomerGatewayRequest.cs
@@ -30,12 +30,11 @@ namespace Amazon.EC2.Model
 {
     /// <summary>
     /// Container for the parameters to the CreateCustomerGateway operation.
-    /// Provides information to Amazon Web Services about your VPN customer gateway device.
-    /// The customer gateway is the appliance at your end of the VPN connection. (The device
-    /// on the Amazon Web Services side of the VPN connection is the virtual private gateway.)
-    /// You must provide the internet-routable IP address of the customer gateway's external
-    /// interface. The IP address must be static and can be behind a device performing network
-    /// address translation (NAT).
+    /// Provides information to Amazon Web Services about your customer gateway device. The
+    /// customer gateway device is the appliance at your end of the VPN connection. You must
+    /// provide the IP address of the customer gateway device’s external interface. The IP
+    /// address must be static and can be behind a device performing network address translation
+    /// (NAT).
     /// 
     ///  
     /// <para>
@@ -59,6 +58,7 @@ public partial class CreateCustomerGatewayRequest : AmazonEC2Request
         private int? _bgpAsn;
         private string _certificateArn;
         private string _deviceName;
+        private string _ipAddress;
         private string _publicIp;
         private List<TagSpecification> _tagSpecifications = new List<TagSpecification>();
         private GatewayType _type;
@@ -72,7 +72,7 @@ public CreateCustomerGatewayRequest() { }
         /// Instantiates CreateCustomerGatewayRequest with the parameterized properties
         /// </summary>
         /// <param name="type">The type of VPN connection that this customer gateway supports (<code>ipsec.1</code>).</param>
-        /// <param name="publicIp">The Internet-routable IP address for the customer gateway's outside interface. The address must be static.</param>
+        /// <param name="publicIp"> <i>This member has been deprecated.</i> The Internet-routable IP address for the customer gateway's outside interface. The address must be static.</param>
         /// <param name="bgpAsn">For devices that support BGP, the customer gateway's BGP ASN. Default: 65000</param>
         public CreateCustomerGatewayRequest(GatewayType type, string publicIp, int bgpAsn)
         {
@@ -144,11 +144,30 @@ internal bool IsSetDeviceName()
             return this._deviceName != null;
         }
 
+        /// <summary>
+        /// Gets and sets the property IpAddress. 
+        /// <para>
+        ///  IPv4 address for the customer gateway device's outside interface. The address must
+        /// be static. 
+        /// </para>
+        /// </summary>
+        public string IpAddress
+        {
+            get { return this._ipAddress; }
+            set { this._ipAddress = value; }
+        }
+
+        // Check to see if IpAddress property is set
+        internal bool IsSetIpAddress()
+        {
+            return this._ipAddress != null;
+        }
+
         /// <summary>
         /// Gets and sets the property PublicIp. 
         /// <para>
-        /// The Internet-routable IP address for the customer gateway's outside interface. The
-        /// address must be static.
+        ///  <i>This member has been deprecated.</i> The Internet-routable IP address for the
+        /// customer gateway's outside interface. The address must be static.
         /// </para>
         /// </summary>
         public string PublicIp

diff --git a/sdk/src/Services/EC2/Generated/Model/CustomerGateway.cs b/sdk/src/Services/EC2/Generated/Model/CustomerGateway.cs
@@ -117,7 +117,7 @@ internal bool IsSetDeviceName()
         /// <summary>
         /// Gets and sets the property IpAddress. 
         /// <para>
-        /// The Internet-routable IP address of the customer gateway's outside interface.
+        /// The IP address of the customer gateway device's outside interface.
         /// </para>
         /// </summary>
         public string IpAddress

diff --git a/sdk/src/Services/EC2/Generated/Model/DescribeCustomerGatewaysRequest.cs b/sdk/src/Services/EC2/Generated/Model/DescribeCustomerGatewaysRequest.cs
@@ -82,8 +82,8 @@ internal bool IsSetCustomerGatewayIds()
         /// </para>
         ///  </li> <li> 
         /// <para>
-        ///  <code>ip-address</code> - The IP address of the customer gateway's Internet-routable
-        /// external interface.
+        ///  <code>ip-address</code> - The IP address of the customer gateway device's external
+        /// interface.
         /// </para>
         ///  </li> <li> 
         /// <para>

diff --git a/...enerated/Model/Internal/MarshallTransformations/CreateCustomerGatewayRequestMarshaller.cs b/...enerated/Model/Internal/MarshallTransformations/CreateCustomerGatewayRequestMarshaller.cs
@@ -70,9 +70,13 @@ public IRequest Marshall(CreateCustomerGatewayRequest publicRequest)
                 {
                     request.Parameters.Add("DeviceName", StringUtils.FromString(publicRequest.DeviceName));
                 }
+                if(publicRequest.IsSetIpAddress())
+                {
+                    request.Parameters.Add("IpAddress", StringUtils.FromString(publicRequest.IpAddress));
+                }
                 if(publicRequest.IsSetPublicIp())
                 {
-                    request.Parameters.Add("IpAddress", StringUtils.FromString(publicRequest.PublicIp));
+                    request.Parameters.Add("PublicIp", StringUtils.FromString(publicRequest.PublicIp));
                 }
                 if(publicRequest.IsSetTagSpecifications())
                 {

diff --git a/.../Generated/Model/Internal/MarshallTransformations/CreateVpnConnectionRequestMarshaller.cs b/.../Generated/Model/Internal/MarshallTransformations/CreateVpnConnectionRequestMarshaller.cs
@@ -76,6 +76,10 @@ public IRequest Marshall(CreateVpnConnectionRequest publicRequest)
                     {
                         request.Parameters.Add("Options" + "." + "LocalIpv6NetworkCidr", StringUtils.FromString(publicRequest.Options.LocalIpv6NetworkCidr));
                     }
+                    if(publicRequest.Options.IsSetOutsideIpAddressType())
+                    {
+                        request.Parameters.Add("Options" + "." + "OutsideIpAddressType", StringUtils.FromString(publicRequest.Options.OutsideIpAddressType));
+                    }
                     if(publicRequest.Options.IsSetRemoteIpv4NetworkCidr())
                     {
                         request.Parameters.Add("Options" + "." + "RemoteIpv4NetworkCidr", StringUtils.FromString(publicRequest.Options.RemoteIpv4NetworkCidr));
@@ -88,6 +92,10 @@ public IRequest Marshall(CreateVpnConnectionRequest publicRequest)
                     {
                         request.Parameters.Add("Options" + "." + "StaticRoutesOnly", StringUtils.FromBool(publicRequest.Options.StaticRoutesOnly));
                     }
+                    if(publicRequest.Options.IsSetTransportTransitGatewayAttachmentId())
+                    {
+                        request.Parameters.Add("Options" + "." + "TransportTransitGatewayAttachmentId", StringUtils.FromString(publicRequest.Options.TransportTransitGatewayAttachmentId));
+                    }
                     if(publicRequest.Options.IsSetTunnelInsideIpVersion())
                     {
                         request.Parameters.Add("Options" + "." + "TunnelInsideIpVersion", StringUtils.FromString(publicRequest.Options.TunnelInsideIpVersion));

diff --git a/.../EC2/Generated/Model/Internal/MarshallTransformations/VpnConnectionOptionsUnmarshaller.cs b/.../EC2/Generated/Model/Internal/MarshallTransformations/VpnConnectionOptionsUnmarshaller.cs
@@ -72,6 +72,12 @@ public VpnConnectionOptions Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.LocalIpv6NetworkCidr = unmarshaller.Unmarshall(context);
                         continue;
                     }
+                    if (context.TestExpression("outsideIpAddressType", targetDepth))
+                    {
+                        var unmarshaller = StringUnmarshaller.Instance;
+                        unmarshalledObject.OutsideIpAddressType = unmarshaller.Unmarshall(context);
+                        continue;
+                    }
                     if (context.TestExpression("remoteIpv4NetworkCidr", targetDepth))
                     {
                         var unmarshaller = StringUnmarshaller.Instance;
@@ -90,6 +96,12 @@ public VpnConnectionOptions Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.StaticRoutesOnly = unmarshaller.Unmarshall(context);
                         continue;
                     }
+                    if (context.TestExpression("transportTransitGatewayAttachmentId", targetDepth))
+                    {
+                        var unmarshaller = StringUnmarshaller.Instance;
+                        unmarshalledObject.TransportTransitGatewayAttachmentId = unmarshaller.Unmarshall(context);
+                        continue;
+                    }
                     if (context.TestExpression("tunnelInsideIpVersion", targetDepth))
                     {
                         var unmarshaller = StringUnmarshaller.Instance;