The type of the custom line item that indicates whether the charge is a fee or credit.
" + }, + "LineItemFilters":{ + "shape":"LineItemFiltersList", + "documentation":"A representation of the line item filter.
" } }, "documentation":"The charge details of a custom line item. It should contain only one of Flat or Percentage.
The attribute of the line item filter. This specifies what attribute that you can filter on.
" + }, + "MatchOption":{ + "shape":"MatchOption", + "documentation":"The match criteria of the line item filter. This parameter specifies whether not to include the resource value from the billing group total cost.
" + }, + "Values":{ + "shape":"LineItemFilterValuesList", + "documentation":"The values of the line item filter. This specifies the values to filter on. Currently, you can only exclude Savings Plan discounts.
" + } + }, + "documentation":"A representation of the line item filter for your custom line item. You can use line item filters to include or exclude specific resource values from the billing group's total cost. For example, if you create a custom line item and you want to filter out a value, such as Savings Plan discounts, you can update LineItemFilter to exclude it.
The type of the custom line item that indicates whether the charge is a fee or credit.
A representation of the line item filter.
" } }, "documentation":"A representation of the charge details of a custom line item.
" @@ -2297,6 +2348,10 @@ }, "Margin":{"type":"string"}, "MarginPercentage":{"type":"string"}, + "MatchOption":{ + "type":"string", + "enum":["NOT_EQUAL"] + }, "MaxBillingGroupResults":{ "type":"integer", "box":true, @@ -2797,6 +2852,10 @@ "Percentage":{ "shape":"UpdateCustomLineItemPercentageChargeDetails", "documentation":" An UpdateCustomLineItemPercentageChargeDetails that describes the new charge details of a percentage custom line item.
A representation of the line item filter.
" } }, "documentation":" A representation of the new charge details of a custom line item. This should contain only one of Flat or Percentage.
The identifier for the Amazon Machine Image (AMI) that's used to create the EC2 instance. To choose an AMI for the instance, you must specify a valid AMI alias or a valid Amazon EC2 Systems Manager (SSM) path.
The default Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a value in the request. Because Amazon Linux AMI has ended standard support as of December 31, 2020, we recommend you choose Amazon Linux 2, which includes long term support through 2023.
From December 31, 2023, the parameter for Amazon Linux will no longer be available when you specify an AMI for your instance. Amazon Linux 2 will then become the default AMI, which is used to launch your instance if no parameter is explicitly defined.
AMI aliases
Amazon Linux (default): amazonlinux-1-x86_64
Amazon Linux 2: amazonlinux-2-x86_64
Ubuntu 18.04: ubuntu-18.04-x86_64
SSM paths
Amazon Linux (default): resolve:ssm:/aws/service/cloud9/amis/amazonlinux-1-x86_64
Amazon Linux 2: resolve:ssm:/aws/service/cloud9/amis/amazonlinux-2-x86_64
Ubuntu 18.04: resolve:ssm:/aws/service/cloud9/amis/ubuntu-18.04-x86_64
The identifier for the Amazon Machine Image (AMI) that's used to create the EC2 instance. To choose an AMI for the instance, you must specify a valid AMI alias or a valid Amazon EC2 Systems Manager (SSM) path.
The default Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a value in the request. Because Amazon Linux AMI has ended standard support as of December 31, 2020, we recommend you choose Amazon Linux 2, which includes long term support through 2023.
From December 31, 2023, the parameter for Amazon Linux will no longer be available when you specify an AMI for your instance. Amazon Linux 2 will then become the default AMI, which is used to launch your instance if no parameter is explicitly defined.
AMI aliases
Amazon Linux (default): amazonlinux-1-x86_64
Amazon Linux 2: amazonlinux-2-x86_64
Ubuntu 18.04: ubuntu-18.04-x86_64
Ubuntu 22.04: ubuntu-22.04-x86_64
SSM paths
Amazon Linux (default): resolve:ssm:/aws/service/cloud9/amis/amazonlinux-1-x86_64
Amazon Linux 2: resolve:ssm:/aws/service/cloud9/amis/amazonlinux-2-x86_64
Ubuntu 18.04: resolve:ssm:/aws/service/cloud9/amis/ubuntu-18.04-x86_64
Ubuntu 22.04: resolve:ssm:/aws/service/cloud9/amis/ubuntu-22.04-x86_64
The applications that might be running on the instances in the Auto Scaling group as inferred by Compute Optimizer.
Compute Optimizer can infer if one of the following applications might be running on the instances:
AmazonEmr - Infers that Amazon EMR might be running on the instances.
ApacheCassandra - Infers that Apache Cassandra might be running on the instances.
ApacheHadoop - Infers that Apache Hadoop might be running on the instances.
Memcached - Infers that Memcached might be running on the instances.
NGINX - Infers that NGINX might be running on the instances.
PostgreSql - Infers that PostgreSQL might be running on the instances.
Redis - Infers that Redis might be running on the instances.
Kafka - Infers that Kafka might be running on the instance.
SQLServer - Infers that SQLServer might be running on the instance.
Describes the GPU accelerator settings for the current instance type of the Auto Scaling group.
" } }, "documentation":"Describes an Auto Scaling group recommendation.
" @@ -623,6 +627,10 @@ "migrationEffort":{ "shape":"MigrationEffort", "documentation":"The level of effort required to migrate from the current instance type to the recommended instance type.
For example, the migration effort is Low if Amazon EMR is the inferred workload type and an Amazon Web Services Graviton instance type is recommended. The migration effort is Medium if a workload type couldn't be inferred but an Amazon Web Services Graviton instance type is recommended. The migration effort is VeryLow if both the current and recommended instance types are of the same CPU architecture.
Describes the GPU accelerator settings for the recommended instance type of the Auto Scaling group.
" } }, "documentation":"Describes a recommendation option for an Auto Scaling group.
" @@ -1479,7 +1487,13 @@ "EffectiveRecommendationPreferencesEnhancedInfrastructureMetrics", "EffectiveRecommendationPreferencesInferredWorkloadTypes", "InferredWorkloadTypes", - "RecommendationOptionsMigrationEffort" + "RecommendationOptionsMigrationEffort", + "CurrentInstanceGpuInfo", + "RecommendationOptionsInstanceGpuInfo", + "UtilizationMetricsGpuPercentageMaximum", + "UtilizationMetricsGpuMemoryPercentageMaximum", + "RecommendationOptionsProjectedUtilizationMetricsGpuPercentageMaximum", + "RecommendationOptionsProjectedUtilizationMetricsGpuMemoryPercentageMaximum" ] }, "ExportableAutoScalingGroupFields":{ @@ -1578,7 +1592,14 @@ "InstanceState", "Tags", "ExternalMetricStatusCode", - "ExternalMetricStatusReason" + "ExternalMetricStatusReason", + "CurrentInstanceGpuInfo", + "RecommendationOptionsInstanceGpuInfo", + "UtilizationMetricsGpuPercentageMaximum", + "UtilizationMetricsGpuMemoryPercentageMaximum", + "RecommendationOptionsProjectedUtilizationMetricsGpuPercentageMaximum", + "RecommendationOptionsProjectedUtilizationMetricsGpuMemoryPercentageMaximum", + "Idle" ] }, "ExportableInstanceFields":{ @@ -1683,7 +1704,8 @@ "RecommendationOptionsEstimatedMonthlySavingsCurrency", "RecommendationOptionsEstimatedMonthlySavingsValue", "RootVolume", - "Tags" + "Tags", + "CurrentConfigurationRootVolume" ] }, "ExportableVolumeFields":{ @@ -2310,6 +2332,36 @@ } } }, + "Gpu":{ + "type":"structure", + "members":{ + "gpuCount":{ + "shape":"GpuCount", + "documentation":"The number of GPUs for the instance type.
" + }, + "gpuMemorySizeInMiB":{ + "shape":"GpuMemorySizeInMiB", + "documentation":"The total size of the memory for the GPU accelerators for the instance type, in MiB.
" + } + }, + "documentation":"Describes the GPU accelerators for the instance type.
" + }, + "GpuCount":{"type":"integer"}, + "GpuInfo":{ + "type":"structure", + "members":{ + "gpus":{ + "shape":"Gpus", + "documentation":"Describes the GPU accelerators for the instance type.
" + } + }, + "documentation":"Describes the GPU accelerator settings for the instance type.
" + }, + "GpuMemorySizeInMiB":{"type":"integer"}, + "Gpus":{ + "type":"list", + "member":{"shape":"Gpu"} + }, "High":{"type":"long"}, "Identifier":{"type":"string"}, "IncludeMemberAccounts":{"type":"boolean"}, @@ -2361,6 +2413,13 @@ "type":"list", "member":{"shape":"InstanceArn"} }, + "InstanceIdle":{ + "type":"string", + "enum":[ + "True", + "False" + ] + }, "InstanceName":{"type":"string"}, "InstanceRecommendation":{ "type":"structure", @@ -2432,6 +2491,14 @@ "externalMetricStatus":{ "shape":"ExternalMetricStatus", "documentation":"An object that describes Compute Optimizer's integration status with your external metrics provider.
" + }, + "currentInstanceGpuInfo":{ + "shape":"GpuInfo", + "documentation":"Describes the GPU accelerator settings for the current instance type.
" + }, + "idle":{ + "shape":"InstanceIdle", + "documentation":"Describes if an Amazon EC2 instance is idle.
" } }, "documentation":"Describes an Amazon EC2 instance recommendation.
" @@ -2454,7 +2521,11 @@ "DiskIOPSOverprovisioned", "DiskIOPSUnderprovisioned", "DiskThroughputOverprovisioned", - "DiskThroughputUnderprovisioned" + "DiskThroughputUnderprovisioned", + "GPUUnderprovisioned", + "GPUOverprovisioned", + "GPUMemoryUnderprovisioned", + "GPUMemoryOverprovisioned" ] }, "InstanceRecommendationFindingReasonCodes":{ @@ -2491,6 +2562,10 @@ "migrationEffort":{ "shape":"MigrationEffort", "documentation":"The level of effort required to migrate from the current instance type to the recommended instance type.
For example, the migration effort is Low if Amazon EMR is the inferred workload type and an Amazon Web Services Graviton instance type is recommended. The migration effort is Medium if a workload type couldn't be inferred but an Amazon Web Services Graviton instance type is recommended. The migration effort is VeryLow if both the current and recommended instance types are of the same CPU architecture.
Describes the GPU accelerator settings for the recommended instance type.
" } }, "documentation":"Describes a recommendation option for an Amazon EC2 instance.
" @@ -3007,7 +3082,9 @@ "NETWORK_IN_BYTES_PER_SECOND", "NETWORK_OUT_BYTES_PER_SECOND", "NETWORK_PACKETS_IN_PER_SECOND", - "NETWORK_PACKETS_OUT_PER_SECOND" + "NETWORK_PACKETS_OUT_PER_SECOND", + "GPU_PERCENTAGE", + "GPU_MEMORY_PERCENTAGE" ] }, "MetricProviderArn":{"type":"string"}, @@ -3107,7 +3184,7 @@ "members":{ "name":{ "shape":"MetricName", - "documentation":"The name of the projected utilization metric.
The following projected utilization metrics are returned:
Cpu - The projected percentage of allocated EC2 compute units that would be in use on the recommendation option had you used that resource during the analyzed period. This metric identifies the processing power required to run an application on the recommendation option.
Depending on the instance type, tools in your operating system can show a lower percentage than CloudWatch when the instance is not allocated a full processor core.
Units: Percent
Memory - The percentage of memory that would be in use on the recommendation option had you used that resource during the analyzed period. This metric identifies the amount of memory required to run an application on the recommendation option.
Units: Percent
The Memory metric is returned only for resources that have the unified CloudWatch agent installed on them. For more information, see Enabling Memory Utilization with the CloudWatch Agent.
The name of the projected utilization metric.
The following projected utilization metrics are returned:
Cpu - The projected percentage of allocated EC2 compute units that would be in use on the recommendation option had you used that resource during the analyzed period. This metric identifies the processing power required to run an application on the recommendation option.
Depending on the instance type, tools in your operating system can show a lower percentage than CloudWatch when the instance is not allocated a full processor core.
Memory - The percentage of memory that would be in use on the recommendation option had you used that resource during the analyzed period. This metric identifies the amount of memory required to run an application on the recommendation option.
Units: Percent
The Memory metric is only returned for resources with the unified CloudWatch agent installed on them. For more information, see Enabling Memory Utilization with the CloudWatch Agent.
GPU - The projected percentage of allocated GPUs if you adjust your configurations to Compute Optimizer's recommendation option.
GPU_MEMORY - The projected percentage of total GPU memory if you adjust your configurations to Compute Optimizer's recommendation option.
The GPU and GPU_MEMORY metrics are only returned for resources with the unified CloudWatch Agent installed on them. For more information, see Enabling NVIDIA GPU utilization with the CloudWatch Agent.
The values of the projected utilization metrics.
" } }, - "documentation":"Describes a projected utilization metric of a recommendation option, such as an Amazon EC2 instance. This represents the projected utilization of a recommendation option had you used that resource during the analyzed period.
Compare the utilization metric data of your resource against its projected utilization metric data to determine the performance difference between your current resource and the recommended option.
The Cpu and Memory metrics are the only projected utilization metrics returned when you run the GetEC2RecommendationProjectedMetrics action. Additionally, the Memory metric is returned only for resources that have the unified CloudWatch agent installed on them. For more information, see Enabling Memory Utilization with the CloudWatch Agent.
Describes a projected utilization metric of a recommendation option, such as an Amazon EC2 instance. This represents the projected utilization of a recommendation option had you used that resource during the analyzed period.
Compare the utilization metric data of your resource against its projected utilization metric data to determine the performance difference between your current resource and the recommended option.
The Cpu, Memory, GPU, and GPU_MEMORY metrics are the only projected utilization metrics returned when you run the GetEC2RecommendationProjectedMetrics action. Additionally, these metrics are only returned for resources with the unified CloudWatch agent installed on them. For more information, see Enabling Memory Utilization with the CloudWatch Agent and Enabling NVIDIA GPU utilization with the CloudWatch Agent.
An array of objects that describes the estimated monthly saving amounts for the instances running on the specified inferredWorkloadTypes. The array contains the top three savings opportunites for the instances running inferred workload types.
An array of objects that describes the estimated monthly saving amounts for the instances running on the specified inferredWorkloadTypes. The array contains the top five savings opportunites for the instances that run inferred workload types.
A summary of a recommendation.
" @@ -3598,7 +3675,7 @@ "members":{ "name":{ "shape":"MetricName", - "documentation":"The name of the utilization metric.
The following utilization metrics are available:
Cpu - The percentage of allocated EC2 compute units that are currently in use on the instance. This metric identifies the processing power required to run an application on the instance.
Depending on the instance type, tools in your operating system can show a lower percentage than CloudWatch when the instance is not allocated a full processor core.
Units: Percent
Memory - The percentage of memory that is currently in use on the instance. This metric identifies the amount of memory required to run an application on the instance.
Units: Percent
The Memory metric is returned only for resources that have the unified CloudWatch agent installed on them. For more information, see Enabling Memory Utilization with the CloudWatch Agent.
EBS_READ_OPS_PER_SECOND - The completed read operations from all EBS volumes attached to the instance in a specified period of time.
Unit: Count
EBS_WRITE_OPS_PER_SECOND - The completed write operations to all EBS volumes attached to the instance in a specified period of time.
Unit: Count
EBS_READ_BYTES_PER_SECOND - The bytes read from all EBS volumes attached to the instance in a specified period of time.
Unit: Bytes
EBS_WRITE_BYTES_PER_SECOND - The bytes written to all EBS volumes attached to the instance in a specified period of time.
Unit: Bytes
DISK_READ_OPS_PER_SECOND - The completed read operations from all instance store volumes available to the instance in a specified period of time.
If there are no instance store volumes, either the value is 0 or the metric is not reported.
DISK_WRITE_OPS_PER_SECOND - The completed write operations from all instance store volumes available to the instance in a specified period of time.
If there are no instance store volumes, either the value is 0 or the metric is not reported.
DISK_READ_BYTES_PER_SECOND - The bytes read from all instance store volumes available to the instance. This metric is used to determine the volume of the data the application reads from the disk of the instance. This can be used to determine the speed of the application.
If there are no instance store volumes, either the value is 0 or the metric is not reported.
DISK_WRITE_BYTES_PER_SECOND - The bytes written to all instance store volumes available to the instance. This metric is used to determine the volume of the data the application writes onto the disk of the instance. This can be used to determine the speed of the application.
If there are no instance store volumes, either the value is 0 or the metric is not reported.
NETWORK_IN_BYTES_PER_SECOND - The number of bytes received by the instance on all network interfaces. This metric identifies the volume of incoming network traffic to a single instance.
NETWORK_OUT_BYTES_PER_SECOND - The number of bytes sent out by the instance on all network interfaces. This metric identifies the volume of outgoing network traffic from a single instance.
NETWORK_PACKETS_IN_PER_SECOND - The number of packets received by the instance on all network interfaces. This metric identifies the volume of incoming traffic in terms of the number of packets on a single instance.
NETWORK_PACKETS_OUT_PER_SECOND - The number of packets sent out by the instance on all network interfaces. This metric identifies the volume of outgoing traffic in terms of the number of packets on a single instance.
The name of the utilization metric.
The following utilization metrics are available:
Cpu - The percentage of allocated EC2 compute units that are currently in use on the instance. This metric identifies the processing power required to run an application on the instance.
Depending on the instance type, tools in your operating system can show a lower percentage than CloudWatch when the instance is not allocated a full processor core.
Units: Percent
Memory - The percentage of memory that is currently in use on the instance. This metric identifies the amount of memory required to run an application on the instance.
Units: Percent
The Memory metric is returned only for resources that have the unified CloudWatch agent installed on them. For more information, see Enabling Memory Utilization with the CloudWatch Agent.
GPU - The percentage of allocated GPUs that currently run on the instance.
GPU_MEMORY - The percentage of total GPU memory that currently runs on the instance.
The GPU and GPU_MEMORY metrics are only returned for resources with the unified CloudWatch Agent installed on them. For more information, see Enabling NVIDIA GPU utilization with the CloudWatch Agent.
EBS_READ_OPS_PER_SECOND - The completed read operations from all EBS volumes attached to the instance in a specified period of time.
Unit: Count
EBS_WRITE_OPS_PER_SECOND - The completed write operations to all EBS volumes attached to the instance in a specified period of time.
Unit: Count
EBS_READ_BYTES_PER_SECOND - The bytes read from all EBS volumes attached to the instance in a specified period of time.
Unit: Bytes
EBS_WRITE_BYTES_PER_SECOND - The bytes written to all EBS volumes attached to the instance in a specified period of time.
Unit: Bytes
DISK_READ_OPS_PER_SECOND - The completed read operations from all instance store volumes available to the instance in a specified period of time.
If there are no instance store volumes, either the value is 0 or the metric is not reported.
DISK_WRITE_OPS_PER_SECOND - The completed write operations from all instance store volumes available to the instance in a specified period of time.
If there are no instance store volumes, either the value is 0 or the metric is not reported.
DISK_READ_BYTES_PER_SECOND - The bytes read from all instance store volumes available to the instance. This metric is used to determine the volume of the data the application reads from the disk of the instance. This can be used to determine the speed of the application.
If there are no instance store volumes, either the value is 0 or the metric is not reported.
DISK_WRITE_BYTES_PER_SECOND - The bytes written to all instance store volumes available to the instance. This metric is used to determine the volume of the data the application writes onto the disk of the instance. This can be used to determine the speed of the application.
If there are no instance store volumes, either the value is 0 or the metric is not reported.
NETWORK_IN_BYTES_PER_SECOND - The number of bytes received by the instance on all network interfaces. This metric identifies the volume of incoming network traffic to a single instance.
NETWORK_OUT_BYTES_PER_SECOND - The number of bytes sent out by the instance on all network interfaces. This metric identifies the volume of outgoing network traffic from a single instance.
NETWORK_PACKETS_IN_PER_SECOND - The number of packets received by the instance on all network interfaces. This metric identifies the volume of incoming traffic in terms of the number of packets on a single instance.
NETWORK_PACKETS_OUT_PER_SECOND - The number of packets sent out by the instance on all network interfaces. This metric identifies the volume of outgoing traffic in terms of the number of packets on a single instance.
The account setting value for the specified principal ARN. Accepted values are enabled, disabled, on, and off.
When you specify fargateTaskRetirementWaitPeriod for the name, the following are the valid values:
0 - immediately retire the tasks and patch Fargate
There is no advanced notification. Your tasks are retired immediately, and Fargate is patched without any notification.
7 -wait 7 calendar days to retire the tasks and patch Fargate
14 - wait 14 calendar days to retire the tasks and patch Fargate
The account setting value for the specified principal ARN. Accepted values are enabled, disabled, on, and off.
When you specify fargateTaskRetirementWaitPeriod for the name, the following are the valid values:
0 - Amazon Web Services sends the notification, and immediately retires the affected tasks.
7 - Amazon Web Services sends the notification, and waits 7 calendar days to retire the tasks.
14 - Amazon Web Services sends the notification, and waits 14 calendar days to retire the tasks.
The account setting value for the specified principal ARN. Accepted values are enabled, disabled, on, and off.
When you specify fargateTaskRetirementWaitPeriod for the name, the following are the valid values:
0 - immediately retire the tasks and patch Fargate
There is no advanced notification. Your tasks are retired immediately, and Fargate is patched without any notification.
7 -wait 7 calendar days to retire the tasks and patch Fargate
14 - wait 14 calendar days to retire the tasks and patch Fargate
The account setting value for the specified principal ARN. Accepted values are enabled, disabled, on, and off.
When you specify fargateTaskRetirementWaitPeriod for the name, the following are the valid values:
0 - Amazon Web Services sends the notification, and immediately retires the affected tasks.
7 - Amazon Web Services sends the notification, and waits 7 calendar days to retire the tasks.
14 - Amazon Web Services sends the notification, and waits 14 calendar days to retire the tasks.
Specifies whether an Aurora DB cluster has in-cluster write forwarding enabled, not enabled, requested, or is in the process of enabling it.
" + }, + "AwsBackupRecoveryPointArn":{ + "shape":"String", + "documentation":"The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.
" } }, "documentation":"Contains the details of an Amazon Aurora DB cluster or Multi-AZ DB cluster.
For an Amazon Aurora DB cluster, this data type is used as a response element in the operations CreateDBCluster, DeleteDBCluster, DescribeDBClusters, FailoverDBCluster, ModifyDBCluster, PromoteReadReplicaDBCluster, RestoreDBClusterFromS3, RestoreDBClusterFromSnapshot, RestoreDBClusterToPointInTime, StartDBCluster, and StopDBCluster.
For a Multi-AZ DB cluster, this data type is used as a response element in the operations CreateDBCluster, DeleteDBCluster, DescribeDBClusters, FailoverDBCluster, ModifyDBCluster, RebootDBCluster, RestoreDBClusterFromSnapshot, and RestoreDBClusterToPointInTime.
For more information on Amazon Aurora DB clusters, see What is Amazon Aurora? in the Amazon Aurora User Guide.
For more information on Multi-AZ DB clusters, see Multi-AZ deployments with two readable standby DB instances in the Amazon RDS User Guide.
", @@ -5252,6 +5257,10 @@ "Iops":{ "shape":"IntegerOptional", "documentation":"The IOPS (I/O operations per second) value for the automated backup.
This setting is only for non-Aurora Multi-AZ DB clusters.
" + }, + "AwsBackupRecoveryPointArn":{ + "shape":"String", + "documentation":"The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.
" } }, "documentation":"An automated backup of a DB cluster. It consists of system backups, transaction logs, and the database cluster properties that existed at the time you deleted the source cluster.
", @@ -6529,6 +6538,10 @@ "StorageThroughput":{ "shape":"IntegerOptional", "documentation":"Specifies the storage throughput for the automated backup.
" + }, + "AwsBackupRecoveryPointArn":{ + "shape":"String", + "documentation":"The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.
" } }, "documentation":"An automated backup of a DB instance. It consists of system backups, transaction logs, and the database instance properties that existed at the time you deleted the source instance.
", @@ -10834,6 +10847,10 @@ "EnableLocalWriteForwarding":{ "shape":"BooleanOptional", "documentation":"Specifies whether read replicas can forward write operations to the writer DB instance in the DB cluster. By default, write operations aren't allowed on reader DB instances.
Valid for: Aurora DB clusters only
" + }, + "AwsBackupRecoveryPointArn":{ + "shape":"AwsBackupRecoveryPointArn", + "documentation":"The Amazon Resource Name (ARN) of the recovery point in Amazon Web Services Backup.
" } }, "documentation":"" diff --git a/botocore/data/sagemaker/2017-07-24/service-2.json b/botocore/data/sagemaker/2017-07-24/service-2.json index 61e390ac51..08d9efc114 100644 --- a/botocore/data/sagemaker/2017-07-24/service-2.json +++ b/botocore/data/sagemaker/2017-07-24/service-2.json @@ -10852,6 +10852,16 @@ } } }, + "DerivedInformation":{ + "type":"structure", + "members":{ + "DerivedDataInputConfig":{ + "shape":"DataInputConfig", + "documentation":"The data input configuration that SageMaker Neo automatically derived for the model. When SageMaker Neo derives this information, you don't need to specify the data input configuration when you create a compilation job.
" + } + }, + "documentation":"Information that SageMaker Neo automatically derived about the model.
" + }, "DescribeActionRequest":{ "type":"structure", "required":["ActionName"], @@ -11500,6 +11510,10 @@ "VpcConfig":{ "shape":"NeoVpcConfig", "documentation":"A VpcConfig object that specifies the VPC that you want your compilation job to connect to. Control access to your models by configuring the VPC. For more information, see Protect Compilation Jobs by Using an Amazon Virtual Private Cloud.
" + }, + "DerivedInformation":{ + "shape":"DerivedInformation", + "documentation":"Information that SageMaker Neo automatically derived about the model.
" } } }, @@ -19173,7 +19187,6 @@ "type":"structure", "required":[ "S3Uri", - "DataInputConfig", "Framework" ], "members":{ @@ -24767,7 +24780,7 @@ "members":{ "Percentile":{ "shape":"String64", - "documentation":"The model latency percentile threshold. For custom load tests, specify the value as P95.
The model latency percentile threshold. Acceptable values are P95 and P99. For custom load tests, specify the value as P95.
Associates a VPC with a service network. When you associate a VPC with the service network, it enables all the resources within that VPC to be clients and communicate with other services in the service network. For more information, see Manage VPC associations in the Amazon VPC Lattice User Guide.
You can't use this operation if there is a disassociation in progress. If the association fails, retry by deleting the association and recreating it.
As a result of this operation, the association gets created in the service network account and the VPC owner account.
If you add a security group to the service network and VPC association, the association must continue to always have at least one security group. You can add or edit security groups at any time. However, to remove all security groups, you must first delete the association and recreate it without security groups.
", + "documentation":"Associates a VPC with a service network. When you associate a VPC with the service network, it enables all the resources within that VPC to be clients and communicate with other services in the service network. For more information, see Manage VPC associations in the Amazon VPC Lattice User Guide.
You can't use this operation if there is a disassociation in progress. If the association fails, retry by deleting the association and recreating it.
As a result of this operation, the association gets created in the service network account and the VPC owner account.
Once a security group is added to the VPC association it cannot be removed. You can add or update the security groups being used for the VPC association once a security group is attached. To remove all security groups you must reassociate the VPC.
", "idempotent":true }, "CreateTargetGroup":{ @@ -233,7 +234,7 @@ {"shape":"ResourceNotFoundException"}, {"shape":"InternalServerException"} ], - "documentation":"Deletes the specified auth policy. If an auth is set to AWS_IAM and the auth policy is deleted, all requests will be denied by default. If you are trying to remove the auth policy completely, you must set the auth_type to NONE. If auth is enabled on the resource, but no auth policy is set, all requests will be denied.
Deletes the specified auth policy. If an auth is set to Amazon Web Services_IAM and the auth policy is deleted, all requests will be denied by default. If you are trying to remove the auth policy completely, you must set the auth_type to NONE. If auth is enabled on the resource, but no auth policy is set, all requests will be denied.
Retrieves information about the resource policy. The resource policy is an IAM policy created on behalf of the resource owner when they share a resource.
" + "documentation":"Retrieves information about the resource policy. The resource policy is an IAM policy created by AWS RAM on behalf of the resource owner when they share a resource.
" }, "GetRule":{ "name":"GetRule", @@ -587,6 +588,7 @@ "output":{"shape":"GetTargetGroupResponse"}, "errors":[ {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, {"shape":"ThrottlingException"}, {"shape":"ResourceNotFoundException"}, {"shape":"InternalServerException"} @@ -604,6 +606,7 @@ "output":{"shape":"ListAccessLogSubscriptionsResponse"}, "errors":[ {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, {"shape":"ThrottlingException"}, {"shape":"InternalServerException"} ], @@ -724,6 +727,7 @@ "output":{"shape":"ListTagsForResourceResponse"}, "errors":[ {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, {"shape":"ResourceNotFoundException"}, {"shape":"InternalServerException"} ], @@ -780,7 +784,7 @@ {"shape":"ResourceNotFoundException"}, {"shape":"InternalServerException"} ], - "documentation":"Creates or updates the auth policy. The policy string in JSON must not contain newlines or blank lines.
" + "documentation":"Creates or updates the auth policy.
" }, "PutResourcePolicy":{ "name":"PutResourcePolicy", @@ -850,6 +854,7 @@ "output":{"shape":"UntagResourceResponse"}, "errors":[ {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, {"shape":"ResourceNotFoundException"}, {"shape":"InternalServerException"} ], @@ -972,7 +977,7 @@ {"shape":"ConflictException"}, {"shape":"InternalServerException"} ], - "documentation":"Updates the service network and VPC association. If you add a security group to the service network and VPC association, the association must continue to always have at least one security group. You can add or edit security groups at any time. However, to remove all security groups, you must first delete the association and recreate it without security groups.
", + "documentation":"Updates the service network and VPC association. Once you add a security group, it cannot be removed.
", "idempotent":true }, "UpdateTargetGroup":{ @@ -986,6 +991,7 @@ "output":{"shape":"UpdateTargetGroupResponse"}, "errors":[ {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, {"shape":"ThrottlingException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ConflictException"}, @@ -1102,8 +1108,7 @@ "AuthPolicyString":{ "type":"string", "max":10000, - "min":0, - "pattern":"^.*\\S.*$" + "min":0 }, "AuthType":{ "type":"string", @@ -2101,7 +2106,7 @@ }, "state":{ "shape":"AuthPolicyState", - "documentation":"The state of the auth policy. The auth policy is only active when the auth type is set to AWS_IAM. If you provide a policy, then authentication and authorization decisions are made based on this policy and the client's IAM policy. If the auth type is NONE, then any auth policy you provide will remain inactive. For more information, see Create a service network in the Amazon VPC Lattice User Guide.
The state of the auth policy. The auth policy is only active when the auth type is set to Amazon Web Services_IAM. If you provide a policy, then authentication and authorization decisions are made based on this policy and the client's IAM policy. If the auth type is NONE, then any auth policy you provide will remain inactive. For more information, see Create a service network in the Amazon VPC Lattice User Guide.
The Amazon Resource Name (ARN) of the service network or service.
", + "documentation":"An IAM policy.
", "location":"uri", "locationName":"resourceArn" } @@ -2188,7 +2193,7 @@ "members":{ "policy":{ "shape":"PolicyString", - "documentation":"An IAM policy.
" + "documentation":"The Amazon Resource Name (ARN) of the service network or service.
" } } }, @@ -2796,6 +2801,13 @@ "IPV6" ] }, + "LambdaEventStructureVersion":{ + "type":"string", + "enum":[ + "V1", + "V2" + ] + }, "ListAccessLogSubscriptionsRequest":{ "type":"structure", "required":["resourceIdentifier"], @@ -3335,7 +3347,7 @@ "members":{ "policy":{ "shape":"AuthPolicyString", - "documentation":"The auth policy. The policy string in JSON must not contain newlines or blank lines.
" + "documentation":"The auth policy.
" }, "resourceIdentifier":{ "shape":"ResourceIdentifier", @@ -3350,11 +3362,11 @@ "members":{ "policy":{ "shape":"AuthPolicyString", - "documentation":"The auth policy. The policy string in JSON must not contain newlines or blank lines.
" + "documentation":"The auth policy.
" }, "state":{ "shape":"AuthPolicyState", - "documentation":"The state of the auth policy. The auth policy is only active when the auth type is set to AWS_IAM. If you provide a policy, then authentication and authorization decisions are made based on this policy and the client's IAM policy. If the Auth type is NONE, then, any auth policy you provide will remain inactive. For more information, see Create a service network in the Amazon VPC Lattice User Guide.
The state of the auth policy. The auth policy is only active when the auth type is set to Amazon Web Services_IAM. If you provide a policy, then authentication and authorization decisions are made based on this policy and the client's IAM policy. If the Auth type is NONE, then, any auth policy you provide will remain inactive. For more information, see Create a service network in the Amazon VPC Lattice User Guide.
An IAM policy. The policy string in JSON must not contain newlines or blank lines.
" + "documentation":"An IAM policy.
" }, "resourceArn":{ "shape":"ResourceArn", @@ -3703,7 +3715,7 @@ "type":"string", "max":32, "min":32, - "pattern":"^servicenetwork-[0-9a-z]{17}$" + "pattern":"^sn-[0-9a-z]{17}$" }, "ServiceNetworkIdentifier":{ "type":"string", @@ -3719,7 +3731,7 @@ "type":"string", "max":63, "min":3, - "pattern":"^(?!servicenetwork-)(?![-])(?!.*[-]$)(?!.*[-]{2})[a-z0-9-]+$" + "pattern":"^(?![-])(?!.*[-]$)(?!.*[-]{2})[a-z0-9-]+$" }, "ServiceNetworkServiceAssociationArn":{ "type":"string", @@ -4104,11 +4116,6 @@ }, "TargetGroupConfig":{ "type":"structure", - "required":[ - "port", - "protocol", - "vpcIdentifier" - ], "members":{ "healthCheck":{ "shape":"HealthCheckConfig", @@ -4118,6 +4125,10 @@ "shape":"IpAddressType", "documentation":"The type of IP address used for the target group. The possible values are ipv4 and ipv6. This is an optional parameter. If not specified, the IP address type defaults to ipv4.
Lambda event structure version
" + }, "port":{ "shape":"Port", "documentation":"The port on which the targets are listening. For HTTP, the default is 80. For HTTPS, the default is 443
The type of IP address used for the target group. The possible values are ipv4 and ipv6. This is an optional parameter. If not specified, the IP address type defaults to ipv4.
Lambda event structure version
" + }, "lastUpdatedAt":{ "shape":"Timestamp", "documentation":"The date and time that the target group was last updated, specified in ISO-8601 format.
" @@ -4599,7 +4614,7 @@ "members":{ "securityGroupIds":{ "shape":"UpdateServiceNetworkVpcAssociationRequestSecurityGroupIdsList", - "documentation":"The IDs of the security groups.
" + "documentation":"The IDs of the security groups. Once you add a security group, it cannot be removed.
" }, "serviceNetworkVpcAssociationIdentifier":{ "shape":"ServiceNetworkVpcAssociationIdentifier", diff --git a/tests/functional/endpoint-rules/events/endpoint-tests-1.json b/tests/functional/endpoint-rules/events/endpoint-tests-1.json index 6a5080439f..3655193a0a 100644 --- a/tests/functional/endpoint-rules/events/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/events/endpoint-tests-1.json @@ -8,8 +8,8 @@ } }, "params": { - "UseFIPS": false, "Region": "af-south-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -21,8 +21,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -34,8 +34,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-northeast-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -47,8 +47,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-northeast-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -60,8 +60,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-northeast-3", + "UseFIPS": false, "UseDualStack": false } }, @@ -73,8 +73,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-south-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -86,8 +86,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-southeast-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -99,8 +99,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-southeast-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -112,8 +112,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-southeast-3", + "UseFIPS": false, "UseDualStack": false } }, @@ -125,8 +125,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ca-central-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -138,8 +138,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-central-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -151,8 +151,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-north-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -164,8 +164,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-south-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -177,8 +177,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-west-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -190,8 +190,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-west-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -203,8 +203,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-west-3", + "UseFIPS": false, "UseDualStack": false } }, @@ -216,8 +216,8 @@ } }, "params": { - "UseFIPS": false, "Region": "me-south-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -229,8 +229,8 @@ } }, "params": { - "UseFIPS": false, "Region": "sa-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -242,8 +242,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -255,8 +255,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -268,8 +268,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-east-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -281,8 +281,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-east-2", + "UseFIPS": true, "UseDualStack": false } }, @@ -294,8 +294,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-west-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -307,8 +307,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-west-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -320,8 +320,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-west-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -333,8 +333,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-west-2", + "UseFIPS": true, "UseDualStack": false } }, @@ -346,8 +346,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -359,8 +359,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -372,8 +372,8 @@ } }, "params": { - "UseFIPS": false, "Region": "cn-north-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -385,8 +385,8 @@ } }, "params": { - "UseFIPS": false, "Region": "cn-northwest-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -398,8 +398,8 @@ } }, "params": { - "UseFIPS": true, "Region": "cn-north-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -411,8 +411,8 @@ } }, "params": { - "UseFIPS": true, "Region": "cn-north-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -424,8 +424,8 @@ } }, "params": { - "UseFIPS": false, "Region": "cn-north-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -437,8 +437,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-gov-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -450,8 +450,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-gov-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -463,8 +463,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-gov-west-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -476,8 +476,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-gov-west-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -489,8 +489,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-gov-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -502,8 +502,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-gov-east-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -515,8 +515,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-iso-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -528,8 +528,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-iso-west-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -539,8 +539,8 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseFIPS": true, "Region": "us-iso-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -552,8 +552,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-iso-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -563,8 +563,8 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseFIPS": false, "Region": "us-iso-east-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -576,8 +576,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-isob-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -587,8 +587,8 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseFIPS": true, "Region": "us-isob-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -600,8 +600,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-isob-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -611,8 +611,8 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseFIPS": false, "Region": "us-isob-east-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -624,8 +624,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": false, "Endpoint": "https://example.com" } @@ -649,8 +649,8 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": false, "Endpoint": "https://example.com" } @@ -661,8 +661,8 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": true, "Endpoint": "https://example.com" } @@ -814,6 +814,18 @@ "Region": "us-east-1", "Endpoint": "https://example.com" } + }, + { + "documentation": "Valid EndpointId with DualStack enabled and partition does not support DualStack", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "EndpointId": "abc123.456def", + "UseDualStack": true, + "UseFIPS": false, + "Region": "us-isob-east-1" + } } ], "version": "1.0" diff --git a/tests/functional/endpoint-rules/vpc-lattice/endpoint-tests-1.json b/tests/functional/endpoint-rules/vpc-lattice/endpoint-tests-1.json index 79667cf0d6..62c8ea06bb 100644 --- a/tests/functional/endpoint-rules/vpc-lattice/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/vpc-lattice/endpoint-tests-1.json @@ -1,55 +1,55 @@ { "testCases": [ { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://vpc-lattice-fips.us-gov-east-1.api.aws" + "url": "https://vpc-lattice-fips.us-east-1.api.aws" } }, "params": { - "UseDualStack": true, - "Region": "us-gov-east-1", - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://vpc-lattice-fips.us-gov-east-1.amazonaws.com" + "url": "https://vpc-lattice-fips.us-east-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "Region": "us-gov-east-1", - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://vpc-lattice.us-gov-east-1.api.aws" + "url": "https://vpc-lattice.us-east-1.api.aws" } }, "params": { - "UseDualStack": true, - "Region": "us-gov-east-1", - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://vpc-lattice.us-gov-east-1.amazonaws.com" + "url": "https://vpc-lattice.us-east-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "Region": "us-gov-east-1", - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -60,9 +60,9 @@ } }, "params": { - "UseDualStack": true, "Region": "cn-north-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -73,9 +73,9 @@ } }, "params": { - "UseDualStack": false, "Region": "cn-north-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -86,9 +86,9 @@ } }, "params": { - "UseDualStack": true, "Region": "cn-north-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -99,109 +99,109 @@ } }, "params": { - "UseDualStack": false, "Region": "cn-north-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + "endpoint": { + "url": "https://vpc-lattice-fips.us-gov-east-1.api.aws" + } }, "params": { - "UseDualStack": true, - "Region": "us-iso-east-1", - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://vpc-lattice-fips.us-iso-east-1.c2s.ic.gov" + "url": "https://vpc-lattice-fips.us-gov-east-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "Region": "us-iso-east-1", - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" + "endpoint": { + "url": "https://vpc-lattice.us-gov-east-1.api.aws" + } }, "params": { - "UseDualStack": true, - "Region": "us-iso-east-1", - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://vpc-lattice.us-iso-east-1.c2s.ic.gov" + "url": "https://vpc-lattice.us-gov-east-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "Region": "us-iso-east-1", - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://vpc-lattice-fips.us-east-1.api.aws" - } + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseDualStack": true, - "Region": "us-east-1", - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://vpc-lattice-fips.us-east-1.amazonaws.com" + "url": "https://vpc-lattice-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { - "UseDualStack": false, - "Region": "us-east-1", - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://vpc-lattice.us-east-1.api.aws" - } + "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseDualStack": true, - "Region": "us-east-1", - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://vpc-lattice.us-east-1.amazonaws.com" + "url": "https://vpc-lattice.us-iso-east-1.c2s.ic.gov" } }, "params": { - "UseDualStack": false, - "Region": "us-east-1", - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -210,9 +210,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseDualStack": true, "Region": "us-isob-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -223,9 +223,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-isob-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -234,9 +234,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseDualStack": true, "Region": "us-isob-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -247,22 +247,35 @@ } }, "params": { - "UseDualStack": false, "Region": "us-isob-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" } }, "params": { - "UseDualStack": false, "Region": "us-east-1", "UseFIPS": false, + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -272,9 +285,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseDualStack": false, "Region": "us-east-1", "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -284,11 +297,17 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseDualStack": true, "Region": "us-east-1", "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0"