feat(client-ec2): Add support for i4g.large, i4g.xlarge, i4g.2xlarge,…

… i4g.4xlarge, i4g.8xlarge and i4g.16xlarge instances powered by AWS Graviton2 processors that deliver up to 15% better compute performance than our other storage-optimized instances.

clients/client-ec2/src/commands/DescribeImportImageTasksCommand.ts

@@ -14,7 +14,11 @@ import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@s
 import { SerdeContext as __SerdeContext } from "@smithy/types";
 
 import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
-import { DescribeImportImageTasksRequest, DescribeImportImageTasksResult } from "../models/models_3";
+import {
+  DescribeImportImageTasksRequest,
+  DescribeImportImageTasksResult,
+  DescribeImportImageTasksResultFilterSensitiveLog,
+} from "../models/models_3";
 import { de_DescribeImportImageTasksCommand, se_DescribeImportImageTasksCommand } from "../protocols/Aws_ec2";
 
 /**
@@ -168,7 +172,7 @@ export class DescribeImportImageTasksCommand extends $Command<
       clientName,
       commandName,
       inputFilterSensitiveLog: (_: any) => _,
-      outputFilterSensitiveLog: (_: any) => _,
+      outputFilterSensitiveLog: DescribeImportImageTasksResultFilterSensitiveLog,
     };
     const { requestHandler } = configuration;
     return stack.resolve(

clients/client-ec2/src/commands/DescribeImportSnapshotTasksCommand.ts

@@ -14,7 +14,11 @@ import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@s
 import { SerdeContext as __SerdeContext } from "@smithy/types";
 
 import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
-import { DescribeImportSnapshotTasksRequest, DescribeImportSnapshotTasksResult } from "../models/models_3";
+import {
+  DescribeImportSnapshotTasksRequest,
+  DescribeImportSnapshotTasksResult,
+  DescribeImportSnapshotTasksResultFilterSensitiveLog,
+} from "../models/models_3";
 import { de_DescribeImportSnapshotTasksCommand, se_DescribeImportSnapshotTasksCommand } from "../protocols/Aws_ec2";
 
 /**
@@ -150,7 +154,7 @@ export class DescribeImportSnapshotTasksCommand extends $Command<
       clientName,
       commandName,
       inputFilterSensitiveLog: (_: any) => _,
-      outputFilterSensitiveLog: (_: any) => _,
+      outputFilterSensitiveLog: DescribeImportSnapshotTasksResultFilterSensitiveLog,
     };
     const { requestHandler } = configuration;
     return stack.resolve(

clients/client-ec2/src/commands/ImportImageCommand.ts

@@ -14,7 +14,12 @@ import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@s
 import { SerdeContext as __SerdeContext } from "@smithy/types";
 
 import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
-import { ImportImageRequest, ImportImageResult } from "../models/models_5";
+import {
+  ImportImageRequest,
+  ImportImageRequestFilterSensitiveLog,
+  ImportImageResult,
+  ImportImageResultFilterSensitiveLog,
+} from "../models/models_5";
 import { de_ImportImageCommand, se_ImportImageCommand } from "../protocols/Aws_ec2";
 
 /**
@@ -207,8 +212,8 @@ export class ImportImageCommand extends $Command<
       logger,
       clientName,
       commandName,
-      inputFilterSensitiveLog: (_: any) => _,
-      outputFilterSensitiveLog: (_: any) => _,
+      inputFilterSensitiveLog: ImportImageRequestFilterSensitiveLog,
+      outputFilterSensitiveLog: ImportImageResultFilterSensitiveLog,
     };
     const { requestHandler } = configuration;
     return stack.resolve(

clients/client-ec2/src/commands/ImportSnapshotCommand.ts

@@ -14,7 +14,12 @@ import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@s
 import { SerdeContext as __SerdeContext } from "@smithy/types";
 
 import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
-import { ImportSnapshotRequest, ImportSnapshotResult } from "../models/models_6";
+import {
+  ImportSnapshotRequest,
+  ImportSnapshotRequestFilterSensitiveLog,
+  ImportSnapshotResult,
+  ImportSnapshotResultFilterSensitiveLog,
+} from "../models/models_6";
 import { de_ImportSnapshotCommand, se_ImportSnapshotCommand } from "../protocols/Aws_ec2";
 
 /**
@@ -164,8 +169,8 @@ export class ImportSnapshotCommand extends $Command<
       logger,
       clientName,
       commandName,
-      inputFilterSensitiveLog: (_: any) => _,
-      outputFilterSensitiveLog: (_: any) => _,
+      inputFilterSensitiveLog: ImportSnapshotRequestFilterSensitiveLog,
+      outputFilterSensitiveLog: ImportSnapshotResultFilterSensitiveLog,
     };
     const { requestHandler } = configuration;
     return stack.resolve(

clients/client-ec2/src/models/models_0.ts

@@ -7684,6 +7684,12 @@ export const _InstanceType = {
   i3en_large: "i3en.large",
   i3en_metal: "i3en.metal",
   i3en_xlarge: "i3en.xlarge",
+  i4g_16xlarge: "i4g.16xlarge",
+  i4g_2xlarge: "i4g.2xlarge",
+  i4g_4xlarge: "i4g.4xlarge",
+  i4g_8xlarge: "i4g.8xlarge",
+  i4g_large: "i4g.large",
+  i4g_xlarge: "i4g.xlarge",
   i4i_16xlarge: "i4i.16xlarge",
   i4i_2xlarge: "i4i.2xlarge",
   i4i_32xlarge: "i4i.32xlarge",

clients/client-ec2/src/models/models_1.ts

@@ -9775,22 +9775,27 @@ export const KeyPairFilterSensitiveLog = (obj: KeyPair): any => ({
  */
 export const RequestLaunchTemplateDataFilterSensitiveLog = (obj: RequestLaunchTemplateData): any => ({
   ...obj,
+  ...(obj.UserData && { UserData: SENSITIVE_STRING }),
 });
 
 /**
  * @internal
  */
 export const CreateLaunchTemplateRequestFilterSensitiveLog = (obj: CreateLaunchTemplateRequest): any => ({
   ...obj,
-  ...(obj.LaunchTemplateData && { LaunchTemplateData: SENSITIVE_STRING }),
+  ...(obj.LaunchTemplateData && {
+    LaunchTemplateData: RequestLaunchTemplateDataFilterSensitiveLog(obj.LaunchTemplateData),
+  }),
 });
 
 /**
  * @internal
  */
 export const CreateLaunchTemplateVersionRequestFilterSensitiveLog = (obj: CreateLaunchTemplateVersionRequest): any => ({
   ...obj,
-  ...(obj.LaunchTemplateData && { LaunchTemplateData: SENSITIVE_STRING }),
+  ...(obj.LaunchTemplateData && {
+    LaunchTemplateData: RequestLaunchTemplateDataFilterSensitiveLog(obj.LaunchTemplateData),
+  }),
 });
 
 /**

clients/client-ec2/src/models/models_3.ts

@@ -9211,3 +9211,54 @@ export const DescribeConversionTasksResultFilterSensitiveLog = (obj: DescribeCon
     ConversionTasks: obj.ConversionTasks.map((item) => ConversionTaskFilterSensitiveLog(item)),
   }),
 });
+
+/**
+ * @internal
+ */
+export const SnapshotDetailFilterSensitiveLog = (obj: SnapshotDetail): any => ({
+  ...obj,
+  ...(obj.Url && { Url: SENSITIVE_STRING }),
+});
+
+/**
+ * @internal
+ */
+export const ImportImageTaskFilterSensitiveLog = (obj: ImportImageTask): any => ({
+  ...obj,
+  ...(obj.SnapshotDetails && {
+    SnapshotDetails: obj.SnapshotDetails.map((item) => SnapshotDetailFilterSensitiveLog(item)),
+  }),
+});
+
+/**
+ * @internal
+ */
+export const DescribeImportImageTasksResultFilterSensitiveLog = (obj: DescribeImportImageTasksResult): any => ({
+  ...obj,
+});
+
+/**
+ * @internal
+ */
+export const SnapshotTaskDetailFilterSensitiveLog = (obj: SnapshotTaskDetail): any => ({
+  ...obj,
+  ...(obj.Url && { Url: SENSITIVE_STRING }),
+});
+
+/**
+ * @internal
+ */
+export const ImportSnapshotTaskFilterSensitiveLog = (obj: ImportSnapshotTask): any => ({
+  ...obj,
+  ...(obj.SnapshotTaskDetail && { SnapshotTaskDetail: SnapshotTaskDetailFilterSensitiveLog(obj.SnapshotTaskDetail) }),
+});
+
+/**
+ * @internal
+ */
+export const DescribeImportSnapshotTasksResultFilterSensitiveLog = (obj: DescribeImportSnapshotTasksResult): any => ({
+  ...obj,
+  ...(obj.ImportSnapshotTasks && {
+    ImportSnapshotTasks: obj.ImportSnapshotTasks.map((item) => ImportSnapshotTaskFilterSensitiveLog(item)),
+  }),
+});

clients/client-ec2/src/models/models_5.ts

@@ -83,6 +83,7 @@ import {
   PeriodType,
   ProductCode,
   SnapshotDetail,
+  SnapshotDetailFilterSensitiveLog,
   StatisticType,
   VirtualizationType,
 } from "./models_3";
@@ -7870,6 +7871,34 @@ export const GetVpnConnectionDeviceSampleConfigurationResultFilterSensitiveLog =
   ...(obj.VpnConnectionDeviceSampleConfiguration && { VpnConnectionDeviceSampleConfiguration: SENSITIVE_STRING }),
 });
 
+/**
+ * @internal
+ */
+export const ImageDiskContainerFilterSensitiveLog = (obj: ImageDiskContainer): any => ({
+  ...obj,
+  ...(obj.Url && { Url: SENSITIVE_STRING }),
+});
+
+/**
+ * @internal
+ */
+export const ImportImageRequestFilterSensitiveLog = (obj: ImportImageRequest): any => ({
+  ...obj,
+  ...(obj.DiskContainers && {
+    DiskContainers: obj.DiskContainers.map((item) => ImageDiskContainerFilterSensitiveLog(item)),
+  }),
+});
+
+/**
+ * @internal
+ */
+export const ImportImageResultFilterSensitiveLog = (obj: ImportImageResult): any => ({
+  ...obj,
+  ...(obj.SnapshotDetails && {
+    SnapshotDetails: obj.SnapshotDetails.map((item) => SnapshotDetailFilterSensitiveLog(item)),
+  }),
+});
+
 /**
  * @internal
  */

clients/client-ec2/src/models/models_6.ts

@@ -126,6 +126,7 @@ import {
   LaunchPermission,
   PermissionGroup,
   SnapshotTaskDetail,
+  SnapshotTaskDetailFilterSensitiveLog,
   TpmSupportValues,
 } from "./models_3";
 import {
@@ -8578,6 +8579,30 @@ export interface SearchTransitGatewayRoutesResult {
   AdditionalRoutesAvailable?: boolean;
 }
 
+/**
+ * @internal
+ */
+export const SnapshotDiskContainerFilterSensitiveLog = (obj: SnapshotDiskContainer): any => ({
+  ...obj,
+  ...(obj.Url && { Url: SENSITIVE_STRING }),
+});
+
+/**
+ * @internal
+ */
+export const ImportSnapshotRequestFilterSensitiveLog = (obj: ImportSnapshotRequest): any => ({
+  ...obj,
+  ...(obj.DiskContainer && { DiskContainer: SnapshotDiskContainerFilterSensitiveLog(obj.DiskContainer) }),
+});
+
+/**
+ * @internal
+ */
+export const ImportSnapshotResultFilterSensitiveLog = (obj: ImportSnapshotResult): any => ({
+  ...obj,
+  ...(obj.SnapshotTaskDetail && { SnapshotTaskDetail: SnapshotTaskDetailFilterSensitiveLog(obj.SnapshotTaskDetail) }),
+});
+
 /**
  * @internal
  */

codegen/sdk-codegen/aws-models/ec2.json

@@ -51292,7 +51292,7 @@
           }
         },
         "Url": {
-          "target": "com.amazonaws.ec2#String",
+          "target": "com.amazonaws.ec2#SensitiveUrl",
           "traits": {
             "smithy.api#documentation": "<p>The URL to the Amazon S3-based disk image being imported. The URL can either be a https URL (https://..) or an\n   Amazon S3 URL (s3://..)</p>"
           }
@@ -59865,6 +59865,42 @@
           "traits": {
             "smithy.api#enumValue": "trn1n.32xlarge"
           }
+        },
+        "i4g_large": {
+          "target": "smithy.api#Unit",
+          "traits": {
+            "smithy.api#enumValue": "i4g.large"
+          }
+        },
+        "i4g_xlarge": {
+          "target": "smithy.api#Unit",
+          "traits": {
+            "smithy.api#enumValue": "i4g.xlarge"
+          }
+        },
+        "i4g_2xlarge": {
+          "target": "smithy.api#Unit",
+          "traits": {
+            "smithy.api#enumValue": "i4g.2xlarge"
+          }
+        },
+        "i4g_4xlarge": {
+          "target": "smithy.api#Unit",
+          "traits": {
+            "smithy.api#enumValue": "i4g.4xlarge"
+          }
+        },
+        "i4g_8xlarge": {
+          "target": "smithy.api#Unit",
+          "traits": {
+            "smithy.api#enumValue": "i4g.8xlarge"
+          }
+        },
+        "i4g_16xlarge": {
+          "target": "smithy.api#Unit",
+          "traits": {
+            "smithy.api#enumValue": "i4g.16xlarge"
+          }
         }
       }
     },
@@ -80195,7 +80231,7 @@
           }
         },
         "UserData": {
-          "target": "com.amazonaws.ec2#String",
+          "target": "com.amazonaws.ec2#SensitiveUserData",
           "traits": {
             "smithy.api#documentation": "<p>The user data to make available to the instance. You must provide base64-encoded text.\n            User data is limited to 16 KB. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html\">Run commands on your Linux instance at\n                launch</a> (Linux) or <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/instancedata-add-user-data.html\">Work with instance\n                user data</a> (Windows) in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>\n         <p>If you are creating the launch template for use with Batch, the user\n            data must be provided in the <a href=\"https://cloudinit.readthedocs.io/en/latest/topics/format.html#mime-multi-part-archive\"> MIME multi-part archive format</a>. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/launch-templates.html\">Amazon EC2 user data in launch templates</a> in the <i>Batch User Guide</i>.</p>"
           }
@@ -80312,8 +80348,7 @@
         }
       },
       "traits": {
-        "smithy.api#documentation": "<p>The information to include in the launch template.</p>\n         <note>\n            <p>You must specify at least one parameter for the launch template data.</p>\n         </note>",
-        "smithy.api#sensitive": {}
+        "smithy.api#documentation": "<p>The information to include in the launch template.</p>\n         <note>\n            <p>You must specify at least one parameter for the launch template data.</p>\n         </note>"
       }
     },
     "com.amazonaws.ec2#RequestSpotFleet": {
@@ -86142,6 +86177,12 @@
         "smithy.api#input": {}
       }
     },
+    "com.amazonaws.ec2#SensitiveUrl": {
+      "type": "string",
+      "traits": {
+        "smithy.api#sensitive": {}
+      }
+    },
     "com.amazonaws.ec2#SensitiveUserData": {
       "type": "string",
       "traits": {
@@ -86828,7 +86869,7 @@
           }
         },
         "Url": {
-          "target": "com.amazonaws.ec2#String",
+          "target": "com.amazonaws.ec2#SensitiveUrl",
           "traits": {
             "aws.protocols#ec2QueryName": "Url",
             "smithy.api#documentation": "<p>The URL used to access the disk image.</p>",
@@ -86873,7 +86914,7 @@
           }
         },
         "Url": {
-          "target": "com.amazonaws.ec2#String",
+          "target": "com.amazonaws.ec2#SensitiveUrl",
           "traits": {
             "smithy.api#documentation": "<p>The URL to the Amazon S3-based disk image being imported. It can either be a https URL (https://..) or an Amazon\n   S3 URL (s3://..).</p>"
           }
@@ -87191,7 +87232,7 @@
           }
         },
         "Url": {
-          "target": "com.amazonaws.ec2#String",
+          "target": "com.amazonaws.ec2#SensitiveUrl",
           "traits": {
             "aws.protocols#ec2QueryName": "Url",
             "smithy.api#documentation": "<p>The URL of the disk image from which the snapshot is created.</p>",