Release to support Elastic VMware Service (Amazon EVS) Subnet and Amazon EVS Network Interface Types.

aws-sdk-dotnet-automation · aws-sdk-dotnet-automation · commit 8282e7be62f7 · 2025-06-09T18:19:13.000Z
diff --git a/generator/ServiceModels/ec2/ec2-2016-11-15.api.json b/generator/ServiceModels/ec2/ec2-2016-11-15.api.json
@@ -6759,6 +6759,10 @@
           "shape":"String",
           "locationName":"carrierIp"
         },
+        "SubnetId":{
+          "shape":"String",
+          "locationName":"subnetId"
+        },
         "ServiceManaged":{
           "shape":"ServiceManaged",
           "locationName":"serviceManaged"
@@ -8174,6 +8178,13 @@
         "locationName":"item"
       }
     },
+    "AssociatedSubnetList":{
+      "type":"list",
+      "member":{
+        "shape":"SubnetId",
+        "locationName":"item"
+      }
+    },
     "AssociatedTargetNetwork":{
       "type":"structure",
       "members":{
@@ -36993,6 +37004,10 @@
         "EnablePrimaryIpv6":{"shape":"Boolean"},
         "ConnectionTrackingSpecification":{"shape":"ConnectionTrackingSpecificationRequest"},
         "AssociatePublicIpAddress":{"shape":"Boolean"},
+        "AssociatedSubnetIds":{
+          "shape":"SubnetIdList",
+          "locationName":"AssociatedSubnetId"
+        },
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -39101,6 +39116,10 @@
         "Operator":{
           "shape":"OperatorResponse",
           "locationName":"operator"
+        },
+        "AssociatedSubnets":{
+          "shape":"AssociatedSubnetList",
+          "locationName":"associatedSubnetSet"
         }
       }
     },
@@ -47310,6 +47329,10 @@
           "shape":"BlockPublicAccessStates",
           "locationName":"blockPublicAccessStates"
         },
+        "Type":{
+          "shape":"String",
+          "locationName":"type"
+        },
         "SubnetId":{
           "shape":"String",
           "locationName":"subnetId"
@@ -47453,6 +47476,13 @@
       }
     },
     "SubnetId":{"type":"string"},
+    "SubnetIdList":{
+      "type":"list",
+      "member":{
+        "shape":"SubnetId",
+        "locationName":"AssociatedSubnetId"
+      }
+    },
     "SubnetIdStringList":{
       "type":"list",
       "member":{
@@ -47524,7 +47554,9 @@
       "enum":[
         "pending",
         "available",
-        "unavailable"
+        "unavailable",
+        "failed",
+        "failed-insufficient-capacity"
       ]
     },
     "Subscription":{
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
diff --git a/sdk/src/Services/EC2/Generated/Model/Address.cs b/sdk/src/Services/EC2/Generated/Model/Address.cs
@@ -48,6 +48,7 @@ public partial class Address
         private string _publicIp;
         private string _publicIpv4Pool;
         private ServiceManaged _serviceManaged;
+        private string _subnetId;
         private List<Tag> _tags = AWSConfigs.InitializeCollections ? new List<Tag>() : null;
 
         /// <summary>
@@ -309,6 +310,24 @@ internal bool IsSetServiceManaged()
             return this._serviceManaged != null;
         }
 
+        /// <summary>
+        /// Gets and sets the property SubnetId. 
+        /// <para>
+        /// The ID of the subnet where the IP address is allocated.
+        /// </para>
+        /// </summary>
+        public string SubnetId
+        {
+            get { return this._subnetId; }
+            set { this._subnetId = value; }
+        }
+
+        // Check to see if SubnetId property is set
+        internal bool IsSetSubnetId()
+        {
+            return this._subnetId != null;
+        }
+
         /// <summary>
         /// Gets and sets the property Tags. 
         /// <para>
diff --git a/sdk/src/Services/EC2/Generated/Model/AttachVolumeRequest.cs b/sdk/src/Services/EC2/Generated/Model/AttachVolumeRequest.cs
@@ -31,18 +31,20 @@ namespace Amazon.EC2.Model
 {
     /// <summary>
     /// Container for the parameters to the AttachVolume operation.
-    /// Attaches an EBS volume to a running or stopped instance and exposes it to the instance
-    /// with the specified device name.
+    /// Attaches an Amazon EBS volume to a <c>running</c> or <c>stopped</c> instance, and
+    /// exposes it to the instance with the specified device name.
     /// 
-    ///  
+    ///  <note> 
     /// <para>
-    /// Encrypted EBS volumes must be attached to instances that support Amazon EBS encryption.
-    /// For more information, see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption.html">Amazon
-    /// EBS encryption</a> in the <i>Amazon EBS User Guide</i>.
+    /// The maximum number of Amazon EBS volumes that you can attach to an instance depends
+    /// on the instance type. If you exceed the volume attachment limit for an instance type,
+    /// the attachment request fails with the <c>AttachmentLimitExceeded</c> error. For more
+    /// information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/volume_limits.html">Instance
+    /// volume limits</a>.
     /// </para>
-    ///  
+    ///  </note> 
     /// <para>
-    /// After you attach an EBS volume, you must make it available. For more information,
+    /// After you attach an EBS volume, you must make it available for use. For more information,
     /// see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-using-volumes.html">Make
     /// an EBS volume available for use</a>.
     /// </para>
diff --git a/sdk/src/Services/EC2/Generated/Model/DescribeNetworkInterfacesRequest.cs b/sdk/src/Services/EC2/Generated/Model/DescribeNetworkInterfacesRequest.cs
@@ -179,10 +179,11 @@ internal bool IsSetDryRun()
         /// <para>
         ///  <c>interface-type</c> - The type of network interface (<c>api_gateway_managed</c>
         /// | <c>aws_codestar_connections_managed</c> | <c>branch</c> | <c>ec2_instance_connect_endpoint</c>
-        /// | <c>efa</c> | <c>efa-only</c> | <c>efs</c> | <c>gateway_load_balancer</c> | <c>gateway_load_balancer_endpoint</c>
-        /// | <c>global_accelerator_managed</c> | <c>interface</c> | <c>iot_rules_managed</c>
-        /// | <c>lambda</c> | <c>load_balancer</c> | <c>nat_gateway</c> | <c>network_load_balancer</c>
-        /// | <c>quicksight</c> | <c>transit_gateway</c> | <c>trunk</c> | <c>vpc_endpoint</c>).
+        /// | <c>efa</c> | <c>efa-only</c> | <c>efs</c> | <c>evs</c> | <c>gateway_load_balancer</c>
+        /// | <c>gateway_load_balancer_endpoint</c> | <c>global_accelerator_managed</c> | <c>interface</c>
+        /// | <c>iot_rules_managed</c> | <c>lambda</c> | <c>load_balancer</c> | <c>nat_gateway</c>
+        /// | <c>network_load_balancer</c> | <c>quicksight</c> | <c>transit_gateway</c> | <c>trunk</c>
+        /// | <c>vpc_endpoint</c>).
         /// </para>
         ///  </li> <li> 
         /// <para>
diff --git a/sdk/src/Services/EC2/Generated/Model/InstanceNetworkInterface.cs b/sdk/src/Services/EC2/Generated/Model/InstanceNetworkInterface.cs
@@ -155,7 +155,8 @@ internal bool IsSetGroups()
         /// </para>
         ///  
         /// <para>
-        /// Valid values: <c>interface</c> | <c>efa</c> | <c>efa-only</c> | <c>trunk</c> 
+        /// Valid values: <c>interface</c> | <c>efa</c> | <c>efa-only</c> | <c>evs</c> | <c>trunk</c>
+        /// 
         /// </para>
         /// </summary>
         public string InterfaceType
diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AddressUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/AddressUnmarshaller.cs
@@ -139,6 +139,12 @@ public Address Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.ServiceManaged = unmarshaller.Unmarshall(context);
                         continue;
                     }
+                    if (context.TestExpression("subnetId", targetDepth))
+                    {
+                        var unmarshaller = StringUnmarshaller.Instance;
+                        unmarshalledObject.SubnetId = unmarshaller.Unmarshall(context);
+                        continue;
+                    }
                     if (context.TestExpression("tagSet/item", targetDepth))
                     {
                         var unmarshaller = TagUnmarshaller.Instance;
diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ModifyNetworkInterfaceAttributeRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ModifyNetworkInterfaceAttributeRequestMarshaller.cs
@@ -59,6 +59,20 @@ public IRequest Marshall(ModifyNetworkInterfaceAttributeRequest publicRequest)
 
             if(publicRequest != null)
             {
+                if(publicRequest.IsSetAssociatedSubnetIds())
+                {
+                    if (publicRequest.AssociatedSubnetIds.Count == 0)
+                        request.Parameters.Add("AssociatedSubnetId", "");
+                    else
+                    {
+                         int publicRequestlistValueIndex = 1;
+                         foreach(var publicRequestlistValue in publicRequest.AssociatedSubnetIds)
+                         {
+                             request.Parameters.Add("AssociatedSubnetId" + "." + publicRequestlistValueIndex, StringUtils.FromString(publicRequestlistValue));
+                             publicRequestlistValueIndex++;
+                         }
+                    }
+                }
                 if(publicRequest.IsSetAssociatePublicIpAddress())
                 {
                     request.Parameters.Add("AssociatePublicIpAddress", StringUtils.FromBool(publicRequest.AssociatePublicIpAddress));
diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/NetworkInterfaceUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/NetworkInterfaceUnmarshaller.cs
@@ -55,6 +55,17 @@ public NetworkInterface Unmarshall(XmlUnmarshallerContext context)
             {
                 if (context.IsStartElement || context.IsAttribute)
                 {
+                    if (context.TestExpression("associatedSubnetSet/item", targetDepth))
+                    {
+                        var unmarshaller = StringUnmarshaller.Instance;
+                        if (unmarshalledObject.AssociatedSubnets == null)
+                        {
+                            unmarshalledObject.AssociatedSubnets = new List<string>();
+                        }
+                        var item = unmarshaller.Unmarshall(context);
+                        unmarshalledObject.AssociatedSubnets.Add(item);
+                        continue;
+                    }
                     if (context.TestExpression("association", targetDepth))
                     {
                         var unmarshaller = NetworkInterfaceAssociationUnmarshaller.Instance;
diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/SubnetUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/SubnetUnmarshaller.cs
@@ -191,6 +191,12 @@ public Subnet Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.Tags.Add(item);
                         continue;
                     }
+                    if (context.TestExpression("type", targetDepth))
+                    {
+                        var unmarshaller = StringUnmarshaller.Instance;
+                        unmarshalledObject.Type = unmarshaller.Unmarshall(context);
+                        continue;
+                    }
                     if (context.TestExpression("vpcId", targetDepth))
                     {
                         var unmarshaller = StringUnmarshaller.Instance;
diff --git a/sdk/src/Services/EC2/Generated/Model/ModifyNetworkInterfaceAttributeRequest.cs b/sdk/src/Services/EC2/Generated/Model/ModifyNetworkInterfaceAttributeRequest.cs
@@ -37,6 +37,7 @@ namespace Amazon.EC2.Model
     /// </summary>
     public partial class ModifyNetworkInterfaceAttributeRequest : AmazonEC2Request
     {
+        private List<string> _associatedSubnetIds = AWSConfigs.InitializeCollections ? new List<string>() : null;
         private bool? _associatePublicIpAddress;
         private NetworkInterfaceAttachmentChanges _attachment;
         private ConnectionTrackingSpecificationRequest _connectionTrackingSpecification;
@@ -48,6 +49,24 @@ public partial class ModifyNetworkInterfaceAttributeRequest : AmazonEC2Request
         private string _networkInterfaceId;
         private bool? _sourceDestCheck;
 
+        /// <summary>
+        /// Gets and sets the property AssociatedSubnetIds. 
+        /// <para>
+        /// A list of subnet IDs to associate with the network interface.
+        /// </para>
+        /// </summary>
+        public List<string> AssociatedSubnetIds
+        {
+            get { return this._associatedSubnetIds; }
+            set { this._associatedSubnetIds = value; }
+        }
+
+        // Check to see if AssociatedSubnetIds property is set
+        internal bool IsSetAssociatedSubnetIds()
+        {
+            return this._associatedSubnetIds != null && (this._associatedSubnetIds.Count > 0 || !AWSConfigs.InitializeCollections); 
+        }
+
         /// <summary>
         /// Gets and sets the property AssociatePublicIpAddress. 
         /// <para>
diff --git a/sdk/src/Services/EC2/Generated/Model/NetworkInterface.cs b/sdk/src/Services/EC2/Generated/Model/NetworkInterface.cs
@@ -34,6 +34,7 @@ namespace Amazon.EC2.Model
     /// </summary>
     public partial class NetworkInterface
     {
+        private List<string> _associatedSubnets = AWSConfigs.InitializeCollections ? new List<string>() : null;
         private NetworkInterfaceAssociation _association;
         private NetworkInterfaceAttachment _attachment;
         private string _availabilityZone;
@@ -65,6 +66,24 @@ public partial class NetworkInterface
         private List<Tag> _tagSet = AWSConfigs.InitializeCollections ? new List<Tag>() : null;
         private string _vpcId;
 
+        /// <summary>
+        /// Gets and sets the property AssociatedSubnets. 
+        /// <para>
+        /// The subnets associated with this network interface.
+        /// </para>
+        /// </summary>
+        public List<string> AssociatedSubnets
+        {
+            get { return this._associatedSubnets; }
+            set { this._associatedSubnets = value; }
+        }
+
+        // Check to see if AssociatedSubnets property is set
+        internal bool IsSetAssociatedSubnets()
+        {
+            return this._associatedSubnets != null && (this._associatedSubnets.Count > 0 || !AWSConfigs.InitializeCollections); 
+        }
+
         /// <summary>
         /// Gets and sets the property Association. 
         /// <para>
diff --git a/sdk/src/Services/EC2/Generated/Model/Subnet.cs b/sdk/src/Services/EC2/Generated/Model/Subnet.cs
@@ -55,6 +55,7 @@ public partial class Subnet
         private string _subnetArn;
         private string _subnetId;
         private List<Tag> _tags = AWSConfigs.InitializeCollections ? new List<Tag>() : null;
+        private string _type;
         private string _vpcId;
 
         /// <summary>
@@ -382,6 +383,17 @@ internal bool IsSetPrivateDnsNameOptionsOnLaunch()
         /// <para>
         /// The current state of the subnet.
         /// </para>
+        ///  <ul> <li> 
+        /// <para>
+        ///  <c>failed</c>: The underlying infrastructure to support the subnet failed to provision
+        /// as expected.
+        /// </para>
+        ///  </li> <li> 
+        /// <para>
+        ///  <c>failed-insufficient-capacity</c>: The underlying infrastructure to support the
+        /// subnet failed to provision due to a shortage of EC2 instance capacity.
+        /// </para>
+        ///  </li> </ul>
         /// </summary>
         public SubnetState State
         {
@@ -449,6 +461,27 @@ internal bool IsSetTags()
             return this._tags != null && (this._tags.Count > 0 || !AWSConfigs.InitializeCollections); 
         }
 
+        /// <summary>
+        /// Gets and sets the property Type. 
+        /// <para>
+        /// Indicates if this is a subnet used with Amazon Elastic VMware Service (EVS). Possible
+        /// values are <c>Elastic VMware Service</c> or no value. For more information about Amazon
+        /// EVS, see <a href="https://docs.aws.amazon.com/evs/latest/APIReference/Welcome.html">
+        /// <i>Amazon Elastic VMware Service API Reference</i> </a>.
+        /// </para>
+        /// </summary>
+        public string Type
+        {
+            get { return this._type; }
+            set { this._type = value; }
+        }
+
+        // Check to see if Type property is set
+        internal bool IsSetType()
+        {
+            return this._type != null;
+        }
+
         /// <summary>
         /// Gets and sets the property VpcId. 
         /// <para>
diff --git a/sdk/src/Services/EC2/Generated/ServiceEnumerations.cs b/sdk/src/Services/EC2/Generated/ServiceEnumerations.cs
@@ -21715,6 +21715,14 @@ public class SubnetState : ConstantClass
         /// </summary>
         public static readonly SubnetState Available = new SubnetState("available");
         /// <summary>
+        /// Constant Failed for SubnetState
+        /// </summary>
+        public static readonly SubnetState Failed = new SubnetState("failed");
+        /// <summary>
+        /// Constant FailedInsufficientCapacity for SubnetState
+        /// </summary>
+        public static readonly SubnetState FailedInsufficientCapacity = new SubnetState("failed-insufficient-capacity");
+        /// <summary>
         /// Constant Pending for SubnetState
         /// </summary>
         public static readonly SubnetState Pending = new SubnetState("pending");
diff --git a/sdk/src/Services/EC2/Generated/_bcl/AmazonEC2Client.cs b/sdk/src/Services/EC2/Generated/_bcl/AmazonEC2Client.cs
diff --git a/sdk/src/Services/EC2/Generated/_bcl/IAmazonEC2.cs b/sdk/src/Services/EC2/Generated/_bcl/IAmazonEC2.cs
diff --git a/sdk/src/Services/EC2/Generated/_netstandard/AmazonEC2Client.cs b/sdk/src/Services/EC2/Generated/_netstandard/AmazonEC2Client.cs
diff --git a/sdk/src/Services/EC2/Generated/_netstandard/IAmazonEC2.cs b/sdk/src/Services/EC2/Generated/_netstandard/IAmazonEC2.cs

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,12 @@ public Address Unmarshall(XmlUnmarshallerContext context)`
`139`	`139`	`unmarshalledObject.ServiceManaged = unmarshaller.Unmarshall(context);`
`140`	`140`	`continue;`
`141`	`141`	`}`
	`142`	`+ if (context.TestExpression("subnetId", targetDepth))`
	`143`	`+ {`
	`144`	`+ var unmarshaller = StringUnmarshaller.Instance;`
	`145`	`+ unmarshalledObject.SubnetId = unmarshaller.Unmarshall(context);`
	`146`	`+ continue;`
	`147`	`+ }`
`142`	`148`	`if (context.TestExpression("tagSet/item", targetDepth))`
`143`	`149`	`{`
`144`	`150`	`var unmarshaller = TagUnmarshaller.Instance;`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,17 @@ public NetworkInterface Unmarshall(XmlUnmarshallerContext context)`
`55`	`55`	`{`
`56`	`56`	`if (context.IsStartElement \|\| context.IsAttribute)`
`57`	`57`	`{`
	`58`	`+ if (context.TestExpression("associatedSubnetSet/item", targetDepth))`
	`59`	`+ {`
	`60`	`+ var unmarshaller = StringUnmarshaller.Instance;`
	`61`	`+ if (unmarshalledObject.AssociatedSubnets == null)`
	`62`	`+ {`
	`63`	`+ unmarshalledObject.AssociatedSubnets = new List<string>();`
	`64`	`+ }`
	`65`	`+ var item = unmarshaller.Unmarshall(context);`
	`66`	`+ unmarshalledObject.AssociatedSubnets.Add(item);`
	`67`	`+ continue;`
	`68`	`+ }`
`58`	`69`	`if (context.TestExpression("association", targetDepth))`
`59`	`70`	`{`
`60`	`71`	`var unmarshaller = NetworkInterfaceAssociationUnmarshaller.Instance;`