Add Nitro TPM support on DescribeInstanceTypes

aws-sdk-dotnet-automation · aws-sdk-dotnet-automation · commit fc63624cd038 · 2023-07-17T11:36:39.000-07:00
diff --git a/generator/ServiceModels/ec2/ec2-2016-11-15.api.json b/generator/ServiceModels/ec2/ec2-2016-11-15.api.json
@@ -6150,7 +6150,7 @@
       "type":"string",
       "max":30,
       "min":1,
-      "pattern":"[a-zA-Z0-9\\.\\*]+"
+      "pattern":"[a-zA-Z0-9\\.\\*\\-]+"
     },
     "AllowedInstanceTypeSet":{
       "type":"list",
@@ -20884,7 +20884,7 @@
       "type":"string",
       "max":30,
       "min":1,
-      "pattern":"[a-zA-Z0-9\\.\\*]+"
+      "pattern":"[a-zA-Z0-9\\.\\*\\-]+"
     },
     "ExcludedInstanceTypeSet":{
       "type":"list",
@@ -27404,6 +27404,14 @@
         "NitroEnclavesSupport":{
           "shape":"NitroEnclavesSupport",
           "locationName":"nitroEnclavesSupport"
+        },
+        "NitroTpmSupport":{
+          "shape":"NitroTpmSupport",
+          "locationName":"nitroTpmSupport"
+        },
+        "NitroTpmInfo":{
+          "shape":"NitroTpmInfo",
+          "locationName":"nitroTpmInfo"
         }
       }
     },
@@ -33538,6 +33546,30 @@
         "supported"
       ]
     },
+    "NitroTpmInfo":{
+      "type":"structure",
+      "members":{
+        "SupportedVersions":{
+          "shape":"NitroTpmSupportedVersionsList",
+          "locationName":"supportedVersions"
+        }
+      }
+    },
+    "NitroTpmSupport":{
+      "type":"string",
+      "enum":[
+        "unsupported",
+        "supported"
+      ]
+    },
+    "NitroTpmSupportedVersionType":{"type":"string"},
+    "NitroTpmSupportedVersionsList":{
+      "type":"list",
+      "member":{
+        "shape":"NitroTpmSupportedVersionType",
+        "locationName":"item"
+      }
+    },
     "OccurrenceDayRequestSet":{
       "type":"list",
       "member":{
diff --git a/generator/ServiceModels/ec2/ec2-2016-11-15.docs.json b/generator/ServiceModels/ec2/ec2-2016-11-15.docs.json
@@ -15198,6 +15198,30 @@
         "InstanceTypeInfo$NitroEnclavesSupport": "<p>Indicates whether Nitro Enclaves is supported.</p>"
       }
     },
+    "NitroTpmInfo": {
+      "base": "<p>Describes the supported NitroTPM versions for the instance type.</p>",
+      "refs": {
+        "InstanceTypeInfo$NitroTpmInfo": "<p>Describes the supported NitroTPM versions for the instance type.</p>"
+      }
+    },
+    "NitroTpmSupport": {
+      "base": null,
+      "refs": {
+        "InstanceTypeInfo$NitroTpmSupport": "<p>Indicates whether NitroTPM is supported.</p>"
+      }
+    },
+    "NitroTpmSupportedVersionType": {
+      "base": null,
+      "refs": {
+        "NitroTpmSupportedVersionsList$member": null
+      }
+    },
+    "NitroTpmSupportedVersionsList": {
+      "base": null,
+      "refs": {
+        "NitroTpmInfo$SupportedVersions": "<p>Indicates the supported NitroTPM versions.</p>"
+      }
+    },
     "OccurrenceDayRequestSet": {
       "base": null,
       "refs": {
diff --git a/generator/ServiceModels/ec2/ec2-2016-11-15.normal.json b/generator/ServiceModels/ec2/ec2-2016-11-15.normal.json
@@ -6971,7 +6971,7 @@
       "type":"string",
       "max":30,
       "min":1,
-      "pattern":"[a-zA-Z0-9\\.\\*]+"
+      "pattern":"[a-zA-Z0-9\\.\\*\\-]+"
     },
     "AllowedInstanceTypeSet":{
       "type":"list",
@@ -27167,7 +27167,7 @@
       "type":"string",
       "max":30,
       "min":1,
-      "pattern":"[a-zA-Z0-9\\.\\*]+"
+      "pattern":"[a-zA-Z0-9\\.\\*\\-]+"
     },
     "ExcludedInstanceTypeSet":{
       "type":"list",
@@ -35422,6 +35422,16 @@
           "shape":"NitroEnclavesSupport",
           "documentation":"<p>Indicates whether Nitro Enclaves is supported.</p>",
           "locationName":"nitroEnclavesSupport"
+        },
+        "NitroTpmSupport":{
+          "shape":"NitroTpmSupport",
+          "documentation":"<p>Indicates whether NitroTPM is supported.</p>",
+          "locationName":"nitroTpmSupport"
+        },
+        "NitroTpmInfo":{
+          "shape":"NitroTpmInfo",
+          "documentation":"<p>Describes the supported NitroTPM versions for the instance type.</p>",
+          "locationName":"nitroTpmInfo"
         }
       },
       "documentation":"<p>Describes the instance type.</p>"
@@ -43666,6 +43676,32 @@
         "supported"
       ]
     },
+    "NitroTpmInfo":{
+      "type":"structure",
+      "members":{
+        "SupportedVersions":{
+          "shape":"NitroTpmSupportedVersionsList",
+          "documentation":"<p>Indicates the supported NitroTPM versions.</p>",
+          "locationName":"supportedVersions"
+        }
+      },
+      "documentation":"<p>Describes the supported NitroTPM versions for the instance type.</p>"
+    },
+    "NitroTpmSupport":{
+      "type":"string",
+      "enum":[
+        "unsupported",
+        "supported"
+      ]
+    },
+    "NitroTpmSupportedVersionType":{"type":"string"},
+    "NitroTpmSupportedVersionsList":{
+      "type":"list",
+      "member":{
+        "shape":"NitroTpmSupportedVersionType",
+        "locationName":"item"
+      }
+    },
     "OccurrenceDayRequestSet":{
       "type":"list",
       "member":{
diff --git a/sdk/src/Services/EC2/Generated/Model/InstanceTypeInfo.cs b/sdk/src/Services/EC2/Generated/Model/InstanceTypeInfo.cs
@@ -51,6 +51,8 @@ public partial class InstanceTypeInfo
         private MemoryInfo _memoryInfo;
         private NetworkInfo _networkInfo;
         private NitroEnclavesSupport _nitroEnclavesSupport;
+        private NitroTpmInfo _nitroTpmInfo;
+        private NitroTpmSupport _nitroTpmSupport;
         private PlacementGroupInfo _placementGroupInfo;
         private ProcessorInfo _processorInfo;
         private List<string> _supportedBootModes = new List<string>();
@@ -384,6 +386,42 @@ internal bool IsSetNitroEnclavesSupport()
             return this._nitroEnclavesSupport != null;
         }
 
+        /// <summary>
+        /// Gets and sets the property NitroTpmInfo. 
+        /// <para>
+        /// Describes the supported NitroTPM versions for the instance type.
+        /// </para>
+        /// </summary>
+        public NitroTpmInfo NitroTpmInfo
+        {
+            get { return this._nitroTpmInfo; }
+            set { this._nitroTpmInfo = value; }
+        }
+
+        // Check to see if NitroTpmInfo property is set
+        internal bool IsSetNitroTpmInfo()
+        {
+            return this._nitroTpmInfo != null;
+        }
+
+        /// <summary>
+        /// Gets and sets the property NitroTpmSupport. 
+        /// <para>
+        /// Indicates whether NitroTPM is supported.
+        /// </para>
+        /// </summary>
+        public NitroTpmSupport NitroTpmSupport
+        {
+            get { return this._nitroTpmSupport; }
+            set { this._nitroTpmSupport = value; }
+        }
+
+        // Check to see if NitroTpmSupport property is set
+        internal bool IsSetNitroTpmSupport()
+        {
+            return this._nitroTpmSupport != null;
+        }
+
         /// <summary>
         /// Gets and sets the property PlacementGroupInfo. 
         /// <para>
diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/InstanceTypeInfoUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/InstanceTypeInfoUnmarshaller.cs
@@ -162,6 +162,18 @@ public InstanceTypeInfo Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.NitroEnclavesSupport = unmarshaller.Unmarshall(context);
                         continue;
                     }
+                    if (context.TestExpression("nitroTpmInfo", targetDepth))
+                    {
+                        var unmarshaller = NitroTpmInfoUnmarshaller.Instance;
+                        unmarshalledObject.NitroTpmInfo = unmarshaller.Unmarshall(context);
+                        continue;
+                    }
+                    if (context.TestExpression("nitroTpmSupport", targetDepth))
+                    {
+                        var unmarshaller = StringUnmarshaller.Instance;
+                        unmarshalledObject.NitroTpmSupport = unmarshaller.Unmarshall(context);
+                        continue;
+                    }
                     if (context.TestExpression("placementGroupInfo", targetDepth))
                     {
                         var unmarshaller = PlacementGroupInfoUnmarshaller.Instance;
diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/NitroTpmInfoUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/NitroTpmInfoUnmarshaller.cs
@@ -0,0 +1,98 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ * 
+ *  http://aws.amazon.com/apache2.0
+ * 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/*
+ * Do not modify this file. This file is generated from the ec2-2016-11-15.normal.json service model.
+ */
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Xml.Serialization;
+
+using Amazon.EC2.Model;
+using Amazon.Runtime;
+using Amazon.Runtime.Internal;
+using Amazon.Runtime.Internal.Transform;
+using Amazon.Runtime.Internal.Util;
+namespace Amazon.EC2.Model.Internal.MarshallTransformations
+{
+    /// <summary>
+    /// Response Unmarshaller for NitroTpmInfo Object
+    /// </summary>  
+    public class NitroTpmInfoUnmarshaller : IUnmarshaller<NitroTpmInfo, XmlUnmarshallerContext>, IUnmarshaller<NitroTpmInfo, JsonUnmarshallerContext>
+    {
+        /// <summary>
+        /// Unmarshaller the response from the service to the response class.
+        /// </summary>  
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public NitroTpmInfo Unmarshall(XmlUnmarshallerContext context)
+        {
+            NitroTpmInfo unmarshalledObject = new NitroTpmInfo();
+            int originalDepth = context.CurrentDepth;
+            int targetDepth = originalDepth + 1;
+            
+            if (context.IsStartOfDocument) 
+               targetDepth += 2;
+            
+            while (context.ReadAtDepth(originalDepth))
+            {
+                if (context.IsStartElement || context.IsAttribute)
+                {
+                    if (context.TestExpression("supportedVersions/item", targetDepth))
+                    {
+                        var unmarshaller = StringUnmarshaller.Instance;
+                        var item = unmarshaller.Unmarshall(context);
+                        unmarshalledObject.SupportedVersions.Add(item);
+                        continue;
+                    }
+                }
+                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
+                {
+                    return unmarshalledObject;
+                }
+            }
+
+            return unmarshalledObject;
+        }
+
+        /// <summary>
+        /// Unmarshaller error response to exception.
+        /// </summary>  
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public NitroTpmInfo Unmarshall(JsonUnmarshallerContext context)
+        {
+            return null;
+        }
+
+
+        private static NitroTpmInfoUnmarshaller _instance = new NitroTpmInfoUnmarshaller();        
+
+        /// <summary>
+        /// Gets the singleton.
+        /// </summary>  
+        public static NitroTpmInfoUnmarshaller Instance
+        {
+            get
+            {
+                return _instance;
+            }
+        }
+    }
+}
diff --git a/sdk/src/Services/EC2/Generated/Model/NitroTpmInfo.cs b/sdk/src/Services/EC2/Generated/Model/NitroTpmInfo.cs
@@ -0,0 +1,57 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ * 
+ *  http://aws.amazon.com/apache2.0
+ * 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/*
+ * Do not modify this file. This file is generated from the ec2-2016-11-15.normal.json service model.
+ */
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using System.Text;
+using System.IO;
+using System.Net;
+
+using Amazon.Runtime;
+using Amazon.Runtime.Internal;
+
+namespace Amazon.EC2.Model
+{
+    /// <summary>
+    /// Describes the supported NitroTPM versions for the instance type.
+    /// </summary>
+    public partial class NitroTpmInfo
+    {
+        private List<string> _supportedVersions = new List<string>();
+
+        /// <summary>
+        /// Gets and sets the property SupportedVersions. 
+        /// <para>
+        /// Indicates the supported NitroTPM versions.
+        /// </para>
+        /// </summary>
+        public List<string> SupportedVersions
+        {
+            get { return this._supportedVersions; }
+            set { this._supportedVersions = value; }
+        }
+
+        // Check to see if SupportedVersions property is set
+        internal bool IsSetSupportedVersions()
+        {
+            return this._supportedVersions != null && this._supportedVersions.Count > 0; 
+        }
+
+    }
+}
diff --git a/sdk/src/Services/EC2/Generated/ServiceEnumerations.cs b/sdk/src/Services/EC2/Generated/ServiceEnumerations.cs
