Describes the supported NitroTPM versions for the instance type.
+ */ +export interface NitroTpmInfo { + /** + *Indicates the supported NitroTPM versions.
+ */ + 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 { *Indicates whether Nitro Enclaves is supported.
*/ NitroEnclavesSupport?: NitroEnclavesSupport | string; + + /** + *Indicates whether NitroTPM is supported.
+ */ + NitroTpmSupport?: NitroTpmSupport | string; + + /** + *Describes the supported NitroTPM versions for the instance type.
+ */ + NitroTpmInfo?: NitroTpmInfo; } /** @@ -11102,58 +11137,6 @@ export interface VerifiedAccessLogCloudWatchLogsDestination { LogGroup?: string; } -/** - * @public - *Options for Kinesis as a logging destination.
- */ -export interface VerifiedAccessLogKinesisDataFirehoseDestination { - /** - *Indicates whether logging is enabled.
- */ - Enabled?: boolean; - - /** - *The delivery status.
- */ - DeliveryStatus?: VerifiedAccessLogDeliveryStatus; - - /** - *The ID of the delivery stream.
- */ - DeliveryStream?: string; -} - -/** - * @public - *Options for Amazon S3 as a logging destination.
- */ -export interface VerifiedAccessLogS3Destination { - /** - *Indicates whether logging is enabled.
- */ - Enabled?: boolean; - - /** - *The delivery status.
- */ - DeliveryStatus?: VerifiedAccessLogDeliveryStatus; - - /** - *The bucket name.
- */ - BucketName?: string; - - /** - *The bucket prefix.
- */ - Prefix?: string; - - /** - *The Amazon Web Services account number that owns the bucket.
- */ - BucketOwner?: string; -} - /** * @internal */ diff --git a/clients/client-ec2/src/models/models_5.ts b/clients/client-ec2/src/models/models_5.ts index 233c8382f3d2..b95864443e9d 100644 --- 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 + *Options for Kinesis as a logging destination.
+ */ +export interface VerifiedAccessLogKinesisDataFirehoseDestination { + /** + *Indicates whether logging is enabled.
+ */ + Enabled?: boolean; + + /** + *The delivery status.
+ */ + DeliveryStatus?: VerifiedAccessLogDeliveryStatus; + + /** + *The ID of the delivery stream.
+ */ + DeliveryStream?: string; +} + +/** + * @public + *Options for Amazon S3 as a logging destination.
+ */ +export interface VerifiedAccessLogS3Destination { + /** + *Indicates whether logging is enabled.
+ */ + Enabled?: boolean; + + /** + *The delivery status.
+ */ + DeliveryStatus?: VerifiedAccessLogDeliveryStatus; + + /** + *The bucket name.
+ */ + BucketName?: string; + + /** + *The bucket prefix.
+ */ + Prefix?: string; + + /** + *The Amazon Web Services account number that owns the bucket.
+ */ + BucketOwner?: string; +} + /** * @public *Describes the options for Verified Access logs.
@@ -7599,56 +7650,6 @@ export interface UserBucket { S3Key?: string; } -/** - * @public - *Describes the disk container object for an import image task.
- */ -export interface ImageDiskContainer { - /** - *The description of the disk image.
- */ - Description?: string; - - /** - *The block device mapping for the disk.
- */ - DeviceName?: string; - - /** - *The format of the disk image being imported.
- *Valid values: OVA | VHD | VHDX | VMDK | RAW
- *
The ID of the EBS snapshot to be used for importing the snapshot.
- */ - SnapshotId?: string; - - /** - *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://..)
- */ - Url?: string; - - /** - *The S3 bucket for the disk image.
- */ - UserBucket?: UserBucket; -} - -/** - * @public - *The request information of license configurations.
- */ -export interface ImportImageLicenseConfigurationRequest { - /** - *The ARN of a license configuration.
- */ - 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 }), -}); diff --git a/clients/client-ec2/src/models/models_6.ts b/clients/client-ec2/src/models/models_6.ts index 5b05ad3e9ce0..f6da21f0d1b6 100644 --- a/clients/client-ec2/src/models/models_6.ts +++ b/clients/client-ec2/src/models/models_6.ts @@ -153,9 +153,6 @@ import { } from "./models_4"; import { ClientData, - ImageDiskContainer, - ImageDiskContainerFilterSensitiveLog, - ImportImageLicenseConfigurationRequest, InstanceFamilyCreditSpecification, IpamResourceCidr, Purchase, @@ -165,6 +162,56 @@ import { VolumeModification, } from "./models_5"; +/** + * @public + *Describes the disk container object for an import image task.
+ */ +export interface ImageDiskContainer { + /** + *The description of the disk image.
+ */ + Description?: string; + + /** + *The block device mapping for the disk.
+ */ + DeviceName?: string; + + /** + *The format of the disk image being imported.
+ *Valid values: OVA | VHD | VHDX | VMDK | RAW
+ *
The ID of the EBS snapshot to be used for importing the snapshot.
+ */ + SnapshotId?: string; + + /** + *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://..)
+ */ + Url?: string; + + /** + *The S3 bucket for the disk image.
+ */ + UserBucket?: UserBucket; +} + +/** + * @public + *The request information of license configurations.
+ */ +export interface ImportImageLicenseConfigurationRequest { + /** + *The ARN of a license configuration.
+ */ + LicenseConfigurationArn?: string; +} + /** * @public */ @@ -8536,120 +8583,12 @@ export interface ScheduledInstancesPlacement { } /** - * @public - *Describes the launch specification for a Scheduled Instance.
- *If you are launching the Scheduled Instance in EC2-VPC, you must specify the ID of the subnet.
- * You can specify the subnet using either SubnetId or NetworkInterface.
The block device mapping entries.
- */ - BlockDeviceMappings?: ScheduledInstancesBlockDeviceMapping[]; - - /** - *Indicates whether the instances are optimized for EBS I/O. This optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal EBS I/O performance. This optimization isn't available with all instance types. Additional usage charges apply when using an EBS-optimized instance.
- *Default: false
- *
The IAM instance profile.
- */ - IamInstanceProfile?: ScheduledInstancesIamInstanceProfile; - - /** - *The ID of the Amazon Machine Image (AMI).
- */ - ImageId: string | undefined; - - /** - *The instance type.
- */ - InstanceType?: string; - - /** - *The ID of the kernel.
- */ - KernelId?: string; - - /** - *The name of the key pair.
- */ - KeyName?: string; - - /** - *Enable or disable monitoring for the instances.
- */ - Monitoring?: ScheduledInstancesMonitoring; - - /** - *The network interfaces.
- */ - NetworkInterfaces?: ScheduledInstancesNetworkInterface[]; - - /** - *The placement information.
- */ - Placement?: ScheduledInstancesPlacement; - - /** - *The ID of the RAM disk.
- */ - RamdiskId?: string; - - /** - *The IDs of the security groups.
- */ - SecurityGroupIds?: string[]; - - /** - *The ID of the subnet in which to launch the instances.
- */ - SubnetId?: string; - - /** - *The base64-encoded MIME user data.
- */ - UserData?: string; -} - -/** - * @public - *Contains the parameters for RunScheduledInstances.
+ * @internal */ -export interface RunScheduledInstancesRequest { - /** - *Unique, case-sensitive identifier that ensures the idempotency of the request. - * For more information, see Ensuring Idempotency.
- */ - ClientToken?: string; - - /** - *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 DryRunOperation.
- * Otherwise, it is UnauthorizedOperation.
The number of instances.
- *Default: 1
- */ - InstanceCount?: number; - - /** - *The launch specification. You must match the instance type, Availability Zone, - * network, and platform of the schedule that you purchased.
- */ - LaunchSpecification: ScheduledInstancesLaunchSpecification | undefined; - - /** - *The Scheduled Instance ID.
- */ - ScheduledInstanceId: string | undefined; -} +export const ImageDiskContainerFilterSensitiveLog = (obj: ImageDiskContainer): any => ({ + ...obj, + ...(obj.Url && { Url: SENSITIVE_STRING }), +}); /** * @internal @@ -8890,20 +8829,3 @@ export const RunInstancesRequestFilterSensitiveLog = (obj: RunInstancesRequest): ...obj, ...(obj.UserData && { UserData: SENSITIVE_STRING }), }); - -/** - * @internal - */ -export const ScheduledInstancesLaunchSpecificationFilterSensitiveLog = ( - obj: ScheduledInstancesLaunchSpecification -): any => ({ - ...obj, -}); - -/** - * @internal - */ -export const RunScheduledInstancesRequestFilterSensitiveLog = (obj: RunScheduledInstancesRequest): any => ({ - ...obj, - ...(obj.LaunchSpecification && { LaunchSpecification: SENSITIVE_STRING }), -}); diff --git a/clients/client-ec2/src/models/models_7.ts b/clients/client-ec2/src/models/models_7.ts index f115e3fa3c89..64ffbba84d1f 100644 --- a/clients/client-ec2/src/models/models_7.ts +++ b/clients/client-ec2/src/models/models_7.ts @@ -1,4 +1,6 @@ // smithy-typescript generated code +import { SENSITIVE_STRING } from "@smithy/smithy-client"; + import { ByoipCidr, IpPermission, @@ -10,7 +12,130 @@ import { LocalGatewayRoute } from "./models_1"; import { TransitGatewayRoute } from "./models_2"; import { ClientVpnConnectionStatus, Filter } from "./models_3"; import { InstanceState, NetworkInsightsAccessScopeAnalysis, NetworkInsightsAnalysis } from "./models_4"; -import { InstanceMonitoring } from "./models_6"; +import { + InstanceMonitoring, + ScheduledInstancesBlockDeviceMapping, + ScheduledInstancesIamInstanceProfile, + ScheduledInstancesMonitoring, + ScheduledInstancesNetworkInterface, + ScheduledInstancesPlacement, +} from "./models_6"; + +/** + * @public + *Describes the launch specification for a Scheduled Instance.
+ *If you are launching the Scheduled Instance in EC2-VPC, you must specify the ID of the subnet.
+ * You can specify the subnet using either SubnetId or NetworkInterface.
The block device mapping entries.
+ */ + BlockDeviceMappings?: ScheduledInstancesBlockDeviceMapping[]; + + /** + *Indicates whether the instances are optimized for EBS I/O. This optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal EBS I/O performance. This optimization isn't available with all instance types. Additional usage charges apply when using an EBS-optimized instance.
+ *Default: false
+ *
The IAM instance profile.
+ */ + IamInstanceProfile?: ScheduledInstancesIamInstanceProfile; + + /** + *The ID of the Amazon Machine Image (AMI).
+ */ + ImageId: string | undefined; + + /** + *The instance type.
+ */ + InstanceType?: string; + + /** + *The ID of the kernel.
+ */ + KernelId?: string; + + /** + *The name of the key pair.
+ */ + KeyName?: string; + + /** + *Enable or disable monitoring for the instances.
+ */ + Monitoring?: ScheduledInstancesMonitoring; + + /** + *The network interfaces.
+ */ + NetworkInterfaces?: ScheduledInstancesNetworkInterface[]; + + /** + *The placement information.
+ */ + Placement?: ScheduledInstancesPlacement; + + /** + *The ID of the RAM disk.
+ */ + RamdiskId?: string; + + /** + *The IDs of the security groups.
+ */ + SecurityGroupIds?: string[]; + + /** + *The ID of the subnet in which to launch the instances.
+ */ + SubnetId?: string; + + /** + *The base64-encoded MIME user data.
+ */ + UserData?: string; +} + +/** + * @public + *Contains the parameters for RunScheduledInstances.
+ */ +export interface RunScheduledInstancesRequest { + /** + *Unique, case-sensitive identifier that ensures the idempotency of the request. + * For more information, see Ensuring Idempotency.
+ */ + ClientToken?: string; + + /** + *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 DryRunOperation.
+ * Otherwise, it is UnauthorizedOperation.
The number of instances.
+ *Default: 1
+ */ + InstanceCount?: number; + + /** + *The launch specification. You must match the instance type, Availability Zone, + * network, and platform of the schedule that you purchased.
+ */ + LaunchSpecification: ScheduledInstancesLaunchSpecification | undefined; + + /** + *The Scheduled Instance ID.
+ */ + ScheduledInstanceId: string | undefined; +} /** * @public @@ -946,3 +1071,20 @@ export interface WithdrawByoipCidrResult { */ ByoipCidr?: ByoipCidr; } + +/** + * @internal + */ +export const ScheduledInstancesLaunchSpecificationFilterSensitiveLog = ( + obj: ScheduledInstancesLaunchSpecification +): any => ({ + ...obj, +}); + +/** + * @internal + */ +export const RunScheduledInstancesRequestFilterSensitiveLog = (obj: RunScheduledInstancesRequest): any => ({ + ...obj, + ...(obj.LaunchSpecification && { LaunchSpecification: SENSITIVE_STRING }), +}); diff --git a/clients/client-ec2/src/protocols/Aws_ec2.ts b/clients/client-ec2/src/protocols/Aws_ec2.ts index 163bd56bc90e..803284b80745 100644 --- a/clients/client-ec2/src/protocols/Aws_ec2.ts +++ b/clients/client-ec2/src/protocols/Aws_ec2.ts @@ -3226,6 +3226,7 @@ import { NetworkInfo, NetworkInsightsAccessScopeAnalysis, NetworkInsightsAnalysis, + NitroTpmInfo, PlacementGroupInfo, PlacementGroupStrategy, PoolCidrBlock, @@ -3280,8 +3281,6 @@ import { VCpuInfo, VerifiedAccessLogCloudWatchLogsDestination, VerifiedAccessLogDeliveryStatus, - VerifiedAccessLogKinesisDataFirehoseDestination, - VerifiedAccessLogS3Destination, } from "../models/models_4"; import { AssociatedRole, @@ -3520,10 +3519,8 @@ import { GetVpnConnectionDeviceTypesResult, GetVpnTunnelReplacementStatusRequest, GetVpnTunnelReplacementStatusResult, - ImageDiskContainer, ImportClientVpnClientCertificateRevocationListRequest, ImportClientVpnClientCertificateRevocationListResult, - ImportImageLicenseConfigurationRequest, InstanceEventWindowDisassociationRequest, InstanceFamilyCreditSpecification, InstanceRequirementsWithMetadataRequest, @@ -3558,7 +3555,9 @@ import { TransitGatewayRouteTablePropagation, UserBucket, VerifiedAccessInstanceLoggingConfiguration, + VerifiedAccessLogKinesisDataFirehoseDestination, VerifiedAccessLogs, + VerifiedAccessLogS3Destination, VolumeModification, VolumeStatusAction, VolumeStatusAttachmentStatus, @@ -3583,7 +3582,9 @@ import { ElasticInferenceAccelerator, EnclaveOptionsRequest, HibernationOptionsRequest, + ImageDiskContainer, ImageRecycleBinInfo, + ImportImageLicenseConfigurationRequest, ImportImageRequest, ImportImageResult, ImportInstanceLaunchSpecification, @@ -3833,12 +3834,10 @@ import { RevokeSecurityGroupIngressRequest, RevokeSecurityGroupIngressResult, RunInstancesRequest, - RunScheduledInstancesRequest, ScheduledInstancesBlockDeviceMapping, ScheduledInstancesEbs, ScheduledInstancesIamInstanceProfile, ScheduledInstancesIpv6Address, - ScheduledInstancesLaunchSpecification, ScheduledInstancesMonitoring, ScheduledInstancesNetworkInterface, ScheduledInstancesPlacement, @@ -3864,7 +3863,9 @@ import { } from "../models/models_6"; import { InstanceStateChange, + RunScheduledInstancesRequest, RunScheduledInstancesResult, + ScheduledInstancesLaunchSpecification, SearchLocalGatewayRoutesRequest, SearchLocalGatewayRoutesResult, SearchTransitGatewayMulticastGroupsRequest, @@ -80229,6 +80230,12 @@ const de_InstanceTypeInfo = (output: any, context: __SerdeContext): InstanceType if (output["nitroEnclavesSupport"] !== undefined) { contents.NitroEnclavesSupport = __expectString(output["nitroEnclavesSupport"]); } + if (output["nitroTpmSupport"] !== undefined) { + contents.NitroTpmSupport = __expectString(output["nitroTpmSupport"]); + } + if (output["nitroTpmInfo"] !== undefined) { + contents.NitroTpmInfo = de_NitroTpmInfo(output["nitroTpmInfo"], context); + } return contents; }; @@ -84637,6 +84644,33 @@ const de_NetworkInterfacePrivateIpAddressList = ( }); }; +/** + * deserializeAws_ec2NitroTpmInfo + */ +const de_NitroTpmInfo = (output: any, context: __SerdeContext): NitroTpmInfo => { + const contents: any = {}; + if (output.supportedVersions === "") { + contents.SupportedVersions = []; + } else if (output["supportedVersions"] !== undefined && output["supportedVersions"]["item"] !== undefined) { + contents.SupportedVersions = de_NitroTpmSupportedVersionsList( + __getArrayIfSingleItem(output["supportedVersions"]["item"]), + context + ); + } + return contents; +}; + +/** + * deserializeAws_ec2NitroTpmSupportedVersionsList + */ +const de_NitroTpmSupportedVersionsList = (output: any, context: __SerdeContext): string[] => { + return (output || []) + .filter((e: any) => e != null) + .map((entry: any) => { + return __expectString(entry) as any; + }); +}; + /** * deserializeAws_ec2OccurrenceDaySet */ diff --git a/codegen/sdk-codegen/aws-models/ec2.json b/codegen/sdk-codegen/aws-models/ec2.json index 17747d5653da..ac0dec010c51 100644 --- a/codegen/sdk-codegen/aws-models/ec2.json +++ b/codegen/sdk-codegen/aws-models/ec2.json @@ -1993,7 +1993,7 @@ "min": 1, "max": 30 }, - "smithy.api#pattern": "^[a-zA-Z0-9\\.\\*]+$" + "smithy.api#pattern": "^[a-zA-Z0-9\\.\\*\\-]+$" } }, "com.amazonaws.ec2#AllowedInstanceTypeSet": { @@ -44459,7 +44459,7 @@ "min": 1, "max": 30 }, - "smithy.api#pattern": "^[a-zA-Z0-9\\.\\*]+$" + "smithy.api#pattern": "^[a-zA-Z0-9\\.\\*\\-]+$" } }, "com.amazonaws.ec2#ExcludedInstanceTypeSet": { @@ -61815,6 +61815,22 @@ "smithy.api#documentation": "Indicates whether Nitro Enclaves is supported.
", "smithy.api#xmlName": "nitroEnclavesSupport" } + }, + "NitroTpmSupport": { + "target": "com.amazonaws.ec2#NitroTpmSupport", + "traits": { + "aws.protocols#ec2QueryName": "NitroTpmSupport", + "smithy.api#documentation": "Indicates whether NitroTPM is supported.
", + "smithy.api#xmlName": "nitroTpmSupport" + } + }, + "NitroTpmInfo": { + "target": "com.amazonaws.ec2#NitroTpmInfo", + "traits": { + "aws.protocols#ec2QueryName": "NitroTpmInfo", + "smithy.api#documentation": "Describes the supported NitroTPM versions for the instance type.
", + "smithy.api#xmlName": "nitroTpmInfo" + } } }, "traits": { @@ -76533,6 +76549,51 @@ } } }, + "com.amazonaws.ec2#NitroTpmInfo": { + "type": "structure", + "members": { + "SupportedVersions": { + "target": "com.amazonaws.ec2#NitroTpmSupportedVersionsList", + "traits": { + "aws.protocols#ec2QueryName": "SupportedVersions", + "smithy.api#documentation": "Indicates the supported NitroTPM versions.
", + "smithy.api#xmlName": "supportedVersions" + } + } + }, + "traits": { + "smithy.api#documentation": "Describes the supported NitroTPM versions for the instance type.
" + } + }, + "com.amazonaws.ec2#NitroTpmSupport": { + "type": "enum", + "members": { + "UNSUPPORTED": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "unsupported" + } + }, + "SUPPORTED": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "supported" + } + } + } + }, + "com.amazonaws.ec2#NitroTpmSupportedVersionType": { + "type": "string" + }, + "com.amazonaws.ec2#NitroTpmSupportedVersionsList": { + "type": "list", + "member": { + "target": "com.amazonaws.ec2#NitroTpmSupportedVersionType", + "traits": { + "smithy.api#xmlName": "item" + } + } + }, "com.amazonaws.ec2#OccurrenceDayRequestSet": { "type": "list", "member": {