diff --git a/.changes/next-release/feature-AmazonElasticComputeCloud-75d7283.json b/.changes/next-release/feature-AmazonElasticComputeCloud-75d7283.json
new file mode 100644
index 000000000000..cb31e4b20d0d
--- /dev/null
+++ b/.changes/next-release/feature-AmazonElasticComputeCloud-75d7283.json
@@ -0,0 +1,6 @@
+{
+ "type": "feature",
+ "category": "Amazon Elastic Compute Cloud",
+ "contributor": "",
+ "description": "This release adds support for a new boot mode for EC2 instances called 'UEFI Preferred'."
+}
diff --git a/services/ec2/src/main/resources/codegen-resources/endpoint-tests.json b/services/ec2/src/main/resources/codegen-resources/endpoint-tests.json
index f438a23ab831..49ea940f100b 100644
--- a/services/ec2/src/main/resources/codegen-resources/endpoint-tests.json
+++ b/services/ec2/src/main/resources/codegen-resources/endpoint-tests.json
@@ -8,9 +8,9 @@
}
},
"params": {
- "Region": "af-south-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "af-south-1"
}
},
{
@@ -21,9 +21,9 @@
}
},
"params": {
- "Region": "ap-east-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ap-east-1"
}
},
{
@@ -34,9 +34,9 @@
}
},
"params": {
- "Region": "ap-northeast-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ap-northeast-1"
}
},
{
@@ -47,9 +47,9 @@
}
},
"params": {
- "Region": "ap-northeast-2",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ap-northeast-2"
}
},
{
@@ -60,9 +60,9 @@
}
},
"params": {
- "Region": "ap-northeast-3",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ap-northeast-3"
}
},
{
@@ -73,9 +73,9 @@
}
},
"params": {
- "Region": "ap-south-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ap-south-1"
}
},
{
@@ -86,9 +86,9 @@
}
},
"params": {
- "Region": "ap-south-1",
"UseFIPS": false,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "ap-south-1"
}
},
{
@@ -99,9 +99,9 @@
}
},
"params": {
- "Region": "ap-southeast-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ap-southeast-1"
}
},
{
@@ -112,9 +112,9 @@
}
},
"params": {
- "Region": "ap-southeast-2",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ap-southeast-2"
}
},
{
@@ -125,9 +125,9 @@
}
},
"params": {
- "Region": "ap-southeast-3",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ap-southeast-3"
}
},
{
@@ -138,9 +138,9 @@
}
},
"params": {
- "Region": "ca-central-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ca-central-1"
}
},
{
@@ -151,9 +151,9 @@
}
},
"params": {
- "Region": "ca-central-1",
"UseFIPS": true,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "ca-central-1"
}
},
{
@@ -164,9 +164,9 @@
}
},
"params": {
- "Region": "eu-central-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "eu-central-1"
}
},
{
@@ -177,9 +177,9 @@
}
},
"params": {
- "Region": "eu-north-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "eu-north-1"
}
},
{
@@ -190,9 +190,9 @@
}
},
"params": {
- "Region": "eu-south-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "eu-south-1"
}
},
{
@@ -203,9 +203,9 @@
}
},
"params": {
- "Region": "eu-west-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "eu-west-1"
}
},
{
@@ -216,9 +216,9 @@
}
},
"params": {
- "Region": "eu-west-1",
"UseFIPS": false,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "eu-west-1"
}
},
{
@@ -229,9 +229,9 @@
}
},
"params": {
- "Region": "eu-west-2",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "eu-west-2"
}
},
{
@@ -242,9 +242,9 @@
}
},
"params": {
- "Region": "eu-west-3",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "eu-west-3"
}
},
{
@@ -255,9 +255,9 @@
}
},
"params": {
- "Region": "me-south-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "me-south-1"
}
},
{
@@ -268,9 +268,9 @@
}
},
"params": {
- "Region": "sa-east-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "sa-east-1"
}
},
{
@@ -281,9 +281,9 @@
}
},
"params": {
- "Region": "sa-east-1",
"UseFIPS": false,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "sa-east-1"
}
},
{
@@ -294,9 +294,9 @@
}
},
"params": {
- "Region": "us-east-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-east-1"
}
},
{
@@ -307,9 +307,9 @@
}
},
"params": {
- "Region": "us-east-1",
"UseFIPS": true,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-east-1"
}
},
{
@@ -320,9 +320,9 @@
}
},
"params": {
- "Region": "us-east-1",
"UseFIPS": false,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "us-east-1"
}
},
{
@@ -333,9 +333,9 @@
}
},
"params": {
- "Region": "us-east-2",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-east-2"
}
},
{
@@ -346,9 +346,9 @@
}
},
"params": {
- "Region": "us-east-2",
"UseFIPS": true,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-east-2"
}
},
{
@@ -359,9 +359,9 @@
}
},
"params": {
- "Region": "us-east-2",
"UseFIPS": false,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "us-east-2"
}
},
{
@@ -372,9 +372,9 @@
}
},
"params": {
- "Region": "us-west-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-west-1"
}
},
{
@@ -385,9 +385,9 @@
}
},
"params": {
- "Region": "us-west-1",
"UseFIPS": true,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-west-1"
}
},
{
@@ -398,9 +398,9 @@
}
},
"params": {
- "Region": "us-west-2",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-west-2"
}
},
{
@@ -411,9 +411,9 @@
}
},
"params": {
- "Region": "us-west-2",
"UseFIPS": true,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-west-2"
}
},
{
@@ -424,9 +424,9 @@
}
},
"params": {
- "Region": "us-west-2",
"UseFIPS": false,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "us-west-2"
}
},
{
@@ -437,9 +437,9 @@
}
},
"params": {
- "Region": "us-east-1",
"UseFIPS": true,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "us-east-1"
}
},
{
@@ -450,9 +450,9 @@
}
},
"params": {
- "Region": "cn-north-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "cn-north-1"
}
},
{
@@ -463,9 +463,9 @@
}
},
"params": {
- "Region": "cn-northwest-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "cn-northwest-1"
}
},
{
@@ -476,9 +476,9 @@
}
},
"params": {
- "Region": "cn-north-1",
"UseFIPS": true,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "cn-north-1"
}
},
{
@@ -489,9 +489,9 @@
}
},
"params": {
- "Region": "cn-north-1",
"UseFIPS": true,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "cn-north-1"
}
},
{
@@ -502,9 +502,9 @@
}
},
"params": {
- "Region": "cn-north-1",
"UseFIPS": false,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "cn-north-1"
}
},
{
@@ -515,9 +515,9 @@
}
},
"params": {
- "Region": "us-gov-east-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-gov-east-1"
}
},
{
@@ -528,9 +528,9 @@
}
},
"params": {
- "Region": "us-gov-west-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-gov-west-1"
}
},
{
@@ -541,9 +541,9 @@
}
},
"params": {
- "Region": "us-gov-east-1",
"UseFIPS": true,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "us-gov-east-1"
}
},
{
@@ -554,9 +554,9 @@
}
},
"params": {
- "Region": "us-gov-east-1",
"UseFIPS": true,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-gov-east-1"
}
},
{
@@ -567,9 +567,9 @@
}
},
"params": {
- "Region": "us-gov-east-1",
"UseFIPS": false,
- "UseDualStack": true
+ "UseDualStack": true,
+ "Region": "us-gov-east-1"
}
},
{
@@ -580,9 +580,9 @@
}
},
"params": {
- "Region": "us-iso-east-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-iso-east-1"
}
},
{
@@ -593,9 +593,9 @@
}
},
"params": {
- "Region": "us-iso-west-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-iso-west-1"
}
},
{
@@ -606,9 +606,9 @@
}
},
"params": {
- "Region": "us-iso-east-1",
"UseFIPS": true,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-iso-east-1"
}
},
{
@@ -619,9 +619,9 @@
}
},
"params": {
- "Region": "us-isob-east-1",
"UseFIPS": false,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-isob-east-1"
}
},
{
@@ -632,9 +632,9 @@
}
},
"params": {
- "Region": "us-isob-east-1",
"UseFIPS": true,
- "UseDualStack": false
+ "UseDualStack": false,
+ "Region": "us-isob-east-1"
}
},
{
@@ -645,9 +645,9 @@
}
},
"params": {
- "Region": "us-east-1",
"UseFIPS": false,
"UseDualStack": false,
+ "Region": "us-east-1",
"Endpoint": "https://example.com"
}
},
@@ -670,9 +670,9 @@
"error": "Invalid Configuration: FIPS and custom endpoint are not supported"
},
"params": {
- "Region": "us-east-1",
"UseFIPS": true,
"UseDualStack": false,
+ "Region": "us-east-1",
"Endpoint": "https://example.com"
}
},
@@ -682,9 +682,9 @@
"error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
},
"params": {
- "Region": "us-east-1",
"UseFIPS": false,
"UseDualStack": true,
+ "Region": "us-east-1",
"Endpoint": "https://example.com"
}
}
diff --git a/services/ec2/src/main/resources/codegen-resources/service-2.json b/services/ec2/src/main/resources/codegen-resources/service-2.json
index 3c7e06427aa8..7c546af0326f 100644
--- a/services/ec2/src/main/resources/codegen-resources/service-2.json
+++ b/services/ec2/src/main/resources/codegen-resources/service-2.json
@@ -8967,7 +8967,8 @@
"type":"string",
"enum":[
"legacy-bios",
- "uefi"
+ "uefi",
+ "uefi-preferred"
]
},
"BoxedDouble":{"type":"double"},
@@ -11789,10 +11790,7 @@
},
"CreateCustomerGatewayRequest":{
"type":"structure",
- "required":[
- "BgpAsn",
- "Type"
- ],
+ "required":["Type"],
"members":{
"BgpAsn":{
"shape":"Integer",
@@ -32390,7 +32388,7 @@
},
"BootMode":{
"shape":"BootModeValues",
- "documentation":"The boot mode of the instance. For more information, see Boot modes in the Amazon EC2 User Guide.
",
+ "documentation":"The boot mode that was specified by the AMI. If the value is uefi-preferred, the AMI supports both UEFI and Legacy BIOS. The currentInstanceBootMode parameter is the boot mode that is used to boot the instance at launch or start.
The operating system contained in the AMI must be configured to support the specified boot mode.
For more information, see Boot modes in the Amazon EC2 User Guide.
",
"locationName":"bootMode"
},
"PlatformDetails":{
@@ -32427,6 +32425,11 @@
"shape":"InstanceMaintenanceOptions",
"documentation":"Provides information on the recovery and maintenance options of your instance.
",
"locationName":"maintenanceOptions"
+ },
+ "CurrentInstanceBootMode":{
+ "shape":"InstanceBootModeValues",
+ "documentation":"The boot mode that is used to boot the instance at launch or start. For more information, see Boot modes in the Amazon EC2 User Guide.
",
+ "locationName":"currentInstanceBootMode"
}
},
"documentation":"Describes an instance.
"
@@ -32606,6 +32609,13 @@
"locationName":"item"
}
},
+ "InstanceBootModeValues":{
+ "type":"string",
+ "enum":[
+ "legacy-bios",
+ "uefi"
+ ]
+ },
"InstanceCapacity":{
"type":"structure",
"members":{
@@ -45137,7 +45147,7 @@
},
"BootMode":{
"shape":"BootModeValues",
- "documentation":"The boot mode of the AMI. For more information, see Boot modes in the Amazon EC2 User Guide.
"
+ "documentation":"The boot mode of the AMI. A value of uefi-preferred indicates that the AMI supports both UEFI and Legacy BIOS.
The operating system contained in the AMI must be configured to support the specified boot mode.
For more information, see Boot modes in the Amazon EC2 User Guide.
"
},
"TpmSupport":{
"shape":"TpmSupportValues",