feat(client-ec2): Add Nitro TPM support on DescribeInstanceTypes

aws · Jul 17, 2023 · 001f5d7 · 001f5d7
1 parent c12cffb
commit 001f5d7
Show file tree

Hide file tree

Showing 8 changed files with 400 additions and 256 deletions.
diff --git a/clients/client-ec2/src/commands/DescribeInstanceTypesCommand.ts b/clients/client-ec2/src/commands/DescribeInstanceTypesCommand.ts
@@ -199,6 +199,12 @@ export interface DescribeInstanceTypesCommandOutput extends DescribeInstanceType
  * //         "legacy-bios" || "uefi",
  * //       ],
  * //       NitroEnclavesSupport: "unsupported" || "supported",
+ * //       NitroTpmSupport: "unsupported" || "supported",
+ * //       NitroTpmInfo: { // NitroTpmInfo
+ * //         SupportedVersions: [ // NitroTpmSupportedVersionsList
+ * //           "STRING_VALUE",
+ * //         ],
+ * //       },
  * //     },
  * //   ],
  * //   NextToken: "STRING_VALUE",

diff --git a/clients/client-ec2/src/commands/RunScheduledInstancesCommand.ts b/clients/client-ec2/src/commands/RunScheduledInstancesCommand.ts
@@ -14,8 +14,11 @@ import {
 } from "@smithy/types";
 
 import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
-import { RunScheduledInstancesRequest, RunScheduledInstancesRequestFilterSensitiveLog } from "../models/models_6";
-import { RunScheduledInstancesResult } from "../models/models_7";
+import {
+  RunScheduledInstancesRequest,
+  RunScheduledInstancesRequestFilterSensitiveLog,
+  RunScheduledInstancesResult,
+} from "../models/models_7";
 import { de_RunScheduledInstancesCommand, se_RunScheduledInstancesCommand } from "../protocols/Aws_ec2";
 
 /**

diff --git a/clients/client-ec2/src/models/models_4.ts b/clients/client-ec2/src/models/models_4.ts
@@ -2181,6 +2181,31 @@ export const NitroEnclavesSupport = {
  */
 export type NitroEnclavesSupport = (typeof NitroEnclavesSupport)[keyof typeof NitroEnclavesSupport];
 
+/**
+ * @public
+ * <p>Describes the supported NitroTPM versions for the instance type.</p>
+ */
+export interface NitroTpmInfo {
+  /**
+   * <p>Indicates the supported NitroTPM versions.</p>
+   */
+  SupportedVersions?: string[];
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const NitroTpmSupport = {
+  SUPPORTED: "supported",
+  UNSUPPORTED: "unsupported",
+} as const;
+
+/**
+ * @public
+ */
+export type NitroTpmSupport = (typeof NitroTpmSupport)[keyof typeof NitroTpmSupport];
+
 /**
  * @public
  * @enum
@@ -2465,6 +2490,16 @@ export interface InstanceTypeInfo {
    * <p>Indicates whether Nitro Enclaves is supported.</p>
    */
   NitroEnclavesSupport?: NitroEnclavesSupport | string;
+
+  /**
+   * <p>Indicates whether NitroTPM is supported.</p>
+   */
+  NitroTpmSupport?: NitroTpmSupport | string;
+
+  /**
+   * <p>Describes the supported NitroTPM versions for the instance type.</p>
+   */
+  NitroTpmInfo?: NitroTpmInfo;
 }
 
 /**
@@ -11102,58 +11137,6 @@ export interface VerifiedAccessLogCloudWatchLogsDestination {
   LogGroup?: string;
 }
 
-/**
- * @public
- * <p>Options for Kinesis as a logging destination.</p>
- */
-export interface VerifiedAccessLogKinesisDataFirehoseDestination {
-  /**
-   * <p>Indicates whether logging is enabled.</p>
-   */
-  Enabled?: boolean;
-
-  /**
-   * <p>The delivery status.</p>
-   */
-  DeliveryStatus?: VerifiedAccessLogDeliveryStatus;
-
-  /**
-   * <p>The ID of the delivery stream.</p>
-   */
-  DeliveryStream?: string;
-}
-
-/**
- * @public
- * <p>Options for Amazon S3 as a logging destination.</p>
- */
-export interface VerifiedAccessLogS3Destination {
-  /**
-   * <p>Indicates whether logging is enabled.</p>
-   */
-  Enabled?: boolean;
-
-  /**
-   * <p>The delivery status.</p>
-   */
-  DeliveryStatus?: VerifiedAccessLogDeliveryStatus;
-
-  /**
-   * <p>The bucket name.</p>
-   */
-  BucketName?: string;
-
-  /**
-   * <p>The bucket prefix.</p>
-   */
-  Prefix?: string;
-
-  /**
-   * <p>The Amazon Web Services account number that owns the bucket.</p>
-   */
-  BucketOwner?: string;
-}
-
 /**
  * @internal
  */

diff --git a/clients/client-ec2/src/models/models_5.ts b/clients/client-ec2/src/models/models_5.ts
@@ -81,10 +81,61 @@ import {
   AnalysisStatus,
   ArchitectureType,
   VerifiedAccessLogCloudWatchLogsDestination,
-  VerifiedAccessLogKinesisDataFirehoseDestination,
-  VerifiedAccessLogS3Destination,
+  VerifiedAccessLogDeliveryStatus,
 } from "./models_4";
 
+/**
+ * @public
+ * <p>Options for Kinesis as a logging destination.</p>
+ */
+export interface VerifiedAccessLogKinesisDataFirehoseDestination {
+  /**
+   * <p>Indicates whether logging is enabled.</p>
+   */
+  Enabled?: boolean;
+
+  /**
+   * <p>The delivery status.</p>
+   */
+  DeliveryStatus?: VerifiedAccessLogDeliveryStatus;
+
+  /**
+   * <p>The ID of the delivery stream.</p>
+   */
+  DeliveryStream?: string;
+}
+
+/**
+ * @public
+ * <p>Options for Amazon S3 as a logging destination.</p>
+ */
+export interface VerifiedAccessLogS3Destination {
+  /**
+   * <p>Indicates whether logging is enabled.</p>
+   */
+  Enabled?: boolean;
+
+  /**
+   * <p>The delivery status.</p>
+   */
+  DeliveryStatus?: VerifiedAccessLogDeliveryStatus;
+
+  /**
+   * <p>The bucket name.</p>
+   */
+  BucketName?: string;
+
+  /**
+   * <p>The bucket prefix.</p>
+   */
+  Prefix?: string;
+
+  /**
+   * <p>The Amazon Web Services account number that owns the bucket.</p>
+   */
+  BucketOwner?: string;
+}
+
 /**
  * @public
  * <p>Describes the options for Verified Access logs.</p>
@@ -7599,56 +7650,6 @@ export interface UserBucket {
   S3Key?: string;
 }
 
-/**
- * @public
- * <p>Describes the disk container object for an import image task.</p>
- */
-export interface ImageDiskContainer {
-  /**
-   * <p>The description of the disk image.</p>
-   */
-  Description?: string;
-
-  /**
-   * <p>The block device mapping for the disk.</p>
-   */
-  DeviceName?: string;
-
-  /**
-   * <p>The format of the disk image being imported.</p>
-   *          <p>Valid values: <code>OVA</code> | <code>VHD</code> | <code>VHDX</code> | <code>VMDK</code> | <code>RAW</code>
-   *          </p>
-   */
-  Format?: string;
-
-  /**
-   * <p>The ID of the EBS snapshot to be used for importing the snapshot.</p>
-   */
-  SnapshotId?: string;
-
-  /**
-   * <p>The URL to the Amazon S3-based disk image being imported. The URL can either be a https URL (https://..) or an
-   *    Amazon S3 URL (s3://..)</p>
-   */
-  Url?: string;
-
-  /**
-   * <p>The S3 bucket for the disk image.</p>
-   */
-  UserBucket?: UserBucket;
-}
-
-/**
- * @public
- * <p>The request information of license configurations.</p>
- */
-export interface ImportImageLicenseConfigurationRequest {
-  /**
-   * <p>The ARN of a license configuration.</p>
-   */
-  LicenseConfigurationArn?: string;
-}
-
 /**
  * @internal
  */
@@ -7704,11 +7705,3 @@ export const GetVpnConnectionDeviceSampleConfigurationResultFilterSensitiveLog =
   ...obj,
   ...(obj.VpnConnectionDeviceSampleConfiguration && { VpnConnectionDeviceSampleConfiguration: SENSITIVE_STRING }),
 });
-
-/**
- * @internal
- */
-export const ImageDiskContainerFilterSensitiveLog = (obj: ImageDiskContainer): any => ({
-  ...obj,
-  ...(obj.Url && { Url: SENSITIVE_STRING }),
-});