Adds a workload to a component. Each component can have at most five workloads.
" + }, "CreateApplication":{ "name":"CreateApplication", "http":{ @@ -231,6 +247,21 @@ ], "documentation":"Describes the anomalies or errors associated with the problem.
" }, + "DescribeWorkload":{ + "name":"DescribeWorkload", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"DescribeWorkloadRequest"}, + "output":{"shape":"DescribeWorkloadResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"} + ], + "documentation":"Describes a workload and its configuration.
" + }, "ListApplications":{ "name":"ListApplications", "http":{ @@ -334,6 +365,36 @@ ], "documentation":"Retrieve a list of the tags (keys and values) that are associated with a specified application. A tag is a label that you optionally define and associate with an application. Each tag consists of a required tag key and an optional associated tag value. A tag key is a general label that acts as a category for more specific tag values. A tag value acts as a descriptor within a tag key.
" }, + "ListWorkloads":{ + "name":"ListWorkloads", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"ListWorkloadsRequest"}, + "output":{"shape":"ListWorkloadsResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"} + ], + "documentation":"Lists the workloads that are configured on a given component.
" + }, + "RemoveWorkload":{ + "name":"RemoveWorkload", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"RemoveWorkloadRequest"}, + "output":{"shape":"RemoveWorkloadResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"} + ], + "documentation":"Remove workload from a component.
" + }, "TagResource":{ "name":"TagResource", "http":{ @@ -424,6 +485,36 @@ {"shape":"InternalServerException"} ], "documentation":"Adds a log pattern to a LogPatternSet.
Updates the visibility of the problem or specifies the problem as RESOLVED.
Adds a workload to a component. Each component can have at most five workloads.
" } }, "shapes":{ @@ -435,6 +526,47 @@ "documentation":"User does not have permissions to perform this action.
", "exception":true }, + "AccountId":{ + "type":"string", + "max":12, + "min":12, + "pattern":"^\\d{12}$" + }, + "AddWorkloadRequest":{ + "type":"structure", + "required":[ + "ResourceGroupName", + "ComponentName", + "WorkloadConfiguration" + ], + "members":{ + "ResourceGroupName":{ + "shape":"ResourceGroupName", + "documentation":"The name of the resource group.
" + }, + "ComponentName":{ + "shape":"ComponentName", + "documentation":"The name of the component.
" + }, + "WorkloadConfiguration":{ + "shape":"WorkloadConfiguration", + "documentation":"The configuration settings of the workload. The value is the escaped JSON of the configuration.
" + } + } + }, + "AddWorkloadResponse":{ + "type":"structure", + "members":{ + "WorkloadId":{ + "shape":"WorkloadId", + "documentation":"The ID of the workload.
" + }, + "WorkloadConfiguration":{ + "shape":"WorkloadConfiguration", + "documentation":"The configuration settings of the workload. The value is the escaped JSON of the configuration.
" + } + } + }, "AffectedResource":{"type":"string"}, "AmazonResourceName":{ "type":"string", @@ -483,6 +615,10 @@ "ApplicationInfo":{ "type":"structure", "members":{ + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the owner of the application.
" + }, "ResourceGroupName":{ "shape":"ResourceGroupName", "documentation":"The name of the resource group used for the application.
" @@ -564,6 +700,14 @@ "ConfigurationEvent":{ "type":"structure", "members":{ + "ResourceGroupName":{ + "shape":"ResourceGroupName", + "documentation":"The name of the resource group of the application to which the configuration event belongs.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the owner of the application to which the configuration event belongs.
" + }, "MonitoredResourceARN":{ "shape":"ConfigurationEventMonitoredResourceARN", "documentation":"The resource monitored by Application Insights.
" @@ -811,6 +955,10 @@ "ResourceGroupName":{ "shape":"ResourceGroupName", "documentation":"The name of the resource group.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -842,6 +990,10 @@ "Tier":{ "shape":"Tier", "documentation":"The tier of the application component.
" + }, + "RecommendationType":{ + "shape":"RecommendationType", + "documentation":"The recommended configuration type.
" } } }, @@ -868,6 +1020,10 @@ "ComponentName":{ "shape":"ComponentName", "documentation":"The name of the component.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -902,6 +1058,10 @@ "ComponentName":{ "shape":"ComponentName", "documentation":"The name of the component.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -934,6 +1094,10 @@ "PatternName":{ "shape":"LogPatternName", "documentation":"The name of the log pattern.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -944,6 +1108,10 @@ "shape":"ResourceGroupName", "documentation":"The name of the resource group.
" }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" + }, "LogPattern":{ "shape":"LogPattern", "documentation":"The successfully created log pattern.
" @@ -957,6 +1125,10 @@ "ObservationId":{ "shape":"ObservationId", "documentation":"The ID of the observation.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -976,6 +1148,10 @@ "ProblemId":{ "shape":"ProblemId", "documentation":"The ID of the problem.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -995,6 +1171,10 @@ "ProblemId":{ "shape":"ProblemId", "documentation":"The ID of the problem.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the owner of the resource group affected by the problem.
" } } }, @@ -1007,6 +1187,49 @@ } } }, + "DescribeWorkloadRequest":{ + "type":"structure", + "required":[ + "ResourceGroupName", + "ComponentName", + "WorkloadId" + ], + "members":{ + "ResourceGroupName":{ + "shape":"ResourceGroupName", + "documentation":"The name of the resource group.
" + }, + "ComponentName":{ + "shape":"ComponentName", + "documentation":"The name of the component.
" + }, + "WorkloadId":{ + "shape":"WorkloadId", + "documentation":"The ID of the workload.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the workload owner.
" + } + } + }, + "DescribeWorkloadResponse":{ + "type":"structure", + "members":{ + "WorkloadId":{ + "shape":"WorkloadId", + "documentation":"The ID of the workload.
" + }, + "WorkloadRemarks":{ + "shape":"Remarks", + "documentation":"If logging is supported for the resource type, shows whether the component has configured logs to be monitored.
" + }, + "WorkloadConfiguration":{ + "shape":"WorkloadConfiguration", + "documentation":"The configuration settings of the workload. The value is the escaped JSON of the configuration.
" + } + } + }, "DetectedWorkload":{ "type":"map", "key":{"shape":"Tier"}, @@ -1076,6 +1299,10 @@ "NextToken":{ "shape":"PaginationToken", "documentation":"The token to request the next page of results.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -1107,6 +1334,10 @@ "NextToken":{ "shape":"PaginationToken", "documentation":"The token to request the next page of results.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -1149,6 +1380,10 @@ "NextToken":{ "shape":"PaginationToken", "documentation":"The NextToken value returned from a previous paginated ListConfigurationHistory request where MaxResults was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the NextToken value. This value is null when there are no more results to return.
The AWS account ID for the resource group owner.
" } } }, @@ -1180,6 +1415,10 @@ "NextToken":{ "shape":"PaginationToken", "documentation":"The token to request the next page of results.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -1190,6 +1429,10 @@ "shape":"ResourceGroupName", "documentation":"The name of the resource group.
" }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" + }, "LogPatternSets":{ "shape":"LogPatternSetList", "documentation":"The list of log pattern sets.
" @@ -1219,6 +1462,10 @@ "NextToken":{ "shape":"PaginationToken", "documentation":"The token to request the next page of results.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -1229,6 +1476,10 @@ "shape":"ResourceGroupName", "documentation":"The name of the resource group.
" }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" + }, "LogPatterns":{ "shape":"LogPatternList", "documentation":"The list of log patterns.
" @@ -1242,6 +1493,10 @@ "ListProblemsRequest":{ "type":"structure", "members":{ + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" + }, "ResourceGroupName":{ "shape":"ResourceGroupName", "documentation":"The name of the resource group.
" @@ -1265,6 +1520,10 @@ "ComponentName":{ "shape":"ComponentName", "documentation":"The name of the component.
" + }, + "Visibility":{ + "shape":"Visibility", + "documentation":"Specifies whether or not you can view the problem. If not specified, visible and ignored problems are returned.
" } } }, @@ -1282,6 +1541,10 @@ "ResourceGroupName":{ "shape":"ResourceGroupName", "documentation":"The name of the resource group.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the resource group owner.
" } } }, @@ -1304,6 +1567,48 @@ } } }, + "ListWorkloadsRequest":{ + "type":"structure", + "required":[ + "ResourceGroupName", + "ComponentName" + ], + "members":{ + "ResourceGroupName":{ + "shape":"ResourceGroupName", + "documentation":"The name of the resource group.
" + }, + "ComponentName":{ + "shape":"ComponentName", + "documentation":"The name of the component.
" + }, + "MaxResults":{ + "shape":"MaxEntities", + "documentation":"The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned NextToken value.
The token to request the next page of results.
" + }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID of the owner of the workload.
" + } + } + }, + "ListWorkloadsResponse":{ + "type":"structure", + "members":{ + "WorkloadList":{ + "shape":"WorkloadList", + "documentation":"The list of workloads.
" + }, + "NextToken":{ + "shape":"PaginationToken", + "documentation":"The token to request the next page of results.
" + } + } + }, "LogFilter":{ "type":"string", "enum":[ @@ -1624,6 +1929,10 @@ "shape":"SeverityLevel", "documentation":"A measure of the level of impact of the problem.
" }, + "AccountId":{ + "shape":"AccountId", + "documentation":"The AWS account ID for the owner of the resource group affected by the problem.
" + }, "ResourceGroupName":{ "shape":"ResourceGroupName", "documentation":"The name of the resource group affected by the problem.
" @@ -1639,6 +1948,14 @@ "LastRecurrenceTime":{ "shape":"LastRecurrenceTime", "documentation":"The last time that the problem reoccurred after its last resolution.
" + }, + "Visibility":{ + "shape":"Visibility", + "documentation":"Specifies whether or not you can view the problem. Updates to ignored problems do not generate notifications.
" + }, + "ResolutionMethod":{ + "shape":"ResolutionMethod", + "documentation":"Specifies how the problem was resolved. If the value is AUTOMATIC, the system resolved the problem. If the value is MANUAL, the user resolved the problem. If the value is UNRESOLVED, then the problem is not resolved.
Describes a problem that is detected by correlating observations.
" @@ -1655,6 +1972,14 @@ }, "RdsEventCategories":{"type":"string"}, "RdsEventMessage":{"type":"string"}, + "RecommendationType":{ + "type":"string", + "enum":[ + "INFRA_ONLY", + "WORKLOAD_ONLY", + "ALL" + ] + }, "RecurringCount":{"type":"long"}, "RelatedObservations":{ "type":"structure", @@ -1668,6 +1993,41 @@ }, "Remarks":{"type":"string"}, "RemoveSNSTopic":{"type":"boolean"}, + "RemoveWorkloadRequest":{ + "type":"structure", + "required":[ + "ResourceGroupName", + "ComponentName", + "WorkloadId" + ], + "members":{ + "ResourceGroupName":{ + "shape":"ResourceGroupName", + "documentation":"The name of the resource group.
" + }, + "ComponentName":{ + "shape":"ComponentName", + "documentation":"The name of the component.
" + }, + "WorkloadId":{ + "shape":"WorkloadId", + "documentation":"The ID of the workload.
" + } + } + }, + "RemoveWorkloadResponse":{ + "type":"structure", + "members":{ + } + }, + "ResolutionMethod":{ + "type":"string", + "enum":[ + "MANUAL", + "AUTOMATIC", + "UNRESOLVED" + ] + }, "ResourceARN":{ "type":"string", "max":1011, @@ -1729,7 +2089,8 @@ "IGNORE", "RESOLVED", "PENDING", - "RECURRING" + "RECURRING", + "RECOVERING" ] }, "Tag":{ @@ -1824,7 +2185,10 @@ "SAP_HANA_HIGH_AVAILABILITY", "SQL_SERVER_FAILOVER_CLUSTER_INSTANCE", "SHAREPOINT", - "ACTIVE_DIRECTORY" + "ACTIVE_DIRECTORY", + "SAP_NETWEAVER_STANDARD", + "SAP_NETWEAVER_DISTRIBUTED", + "SAP_NETWEAVER_HIGH_AVAILABILITY" ], "max":50, "min":1 @@ -2015,6 +2379,72 @@ } } }, + "UpdateProblemRequest":{ + "type":"structure", + "required":["ProblemId"], + "members":{ + "ProblemId":{ + "shape":"ProblemId", + "documentation":"The ID of the problem.
" + }, + "UpdateStatus":{ + "shape":"UpdateStatus", + "documentation":"The status of the problem. Arguments can be passed for only problems that show a status of RECOVERING.
The visibility of a problem. When you pass a value of IGNORED, the problem is removed from the default view, and all notifications for the problem are suspended. When VISIBLE is passed, the IGNORED action is reversed.
The name of the resource group.
" + }, + "ComponentName":{ + "shape":"ComponentName", + "documentation":"The name of the component.
" + }, + "WorkloadId":{ + "shape":"WorkloadId", + "documentation":"The ID of the workload.
" + }, + "WorkloadConfiguration":{ + "shape":"WorkloadConfiguration", + "documentation":"The configuration settings of the workload. The value is the escaped JSON of the configuration.
" + } + } + }, + "UpdateWorkloadResponse":{ + "type":"structure", + "members":{ + "WorkloadId":{ + "shape":"WorkloadId", + "documentation":"The ID of the workload.
" + }, + "WorkloadConfiguration":{ + "shape":"WorkloadConfiguration", + "documentation":"The configuration settings of the workload. The value is the escaped JSON of the configuration.
" + } + } + }, "ValidationException":{ "type":"structure", "members":{ @@ -2024,11 +2454,78 @@ "exception":true }, "Value":{"type":"double"}, + "Visibility":{ + "type":"string", + "enum":[ + "IGNORED", + "VISIBLE" + ] + }, + "Workload":{ + "type":"structure", + "members":{ + "WorkloadId":{ + "shape":"WorkloadId", + "documentation":"The ID of the workload.
" + }, + "ComponentName":{ + "shape":"ComponentName", + "documentation":"The name of the component.
" + }, + "WorkloadName":{ + "shape":"WorkloadName", + "documentation":"The name of the workload.
" + }, + "Tier":{ + "shape":"Tier", + "documentation":"The tier of the workload.
" + }, + "WorkloadRemarks":{ + "shape":"Remarks", + "documentation":"If logging is supported for the resource type, shows whether the component has configured logs to be monitored.
" + } + }, + "documentation":"Describes the workloads on a component.
" + }, + "WorkloadConfiguration":{ + "type":"structure", + "members":{ + "WorkloadName":{ + "shape":"WorkloadName", + "documentation":"The name of the workload.
" + }, + "Tier":{ + "shape":"Tier", + "documentation":"The configuration of the workload tier.
" + }, + "Configuration":{ + "shape":"ComponentConfiguration", + "documentation":"The configuration settings of the workload.
" + } + }, + "documentation":"The configuration of the workload.
" + }, + "WorkloadId":{ + "type":"string", + "max":38, + "min":38, + "pattern":"w-[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{12}" + }, + "WorkloadList":{ + "type":"list", + "member":{"shape":"Workload"} + }, "WorkloadMetaData":{ "type":"map", "key":{"shape":"MetaDataKey"}, "value":{"shape":"MetaDataValue"} }, + "WorkloadName":{ + "type":"string", + "max":8, + "min":1, + "pattern":"[a-zA-Z0-9\\.\\-_]*" + }, "XRayErrorPercent":{"type":"integer"}, "XRayFaultPercent":{"type":"integer"}, "XRayNodeName":{"type":"string"}, diff --git a/botocore/data/cloudformation/2010-05-15/endpoint-rule-set-1.json b/botocore/data/cloudformation/2010-05-15/endpoint-rule-set-1.json index 9cbca10387..226c1811dd 100644 --- a/botocore/data/cloudformation/2010-05-15/endpoint-rule-set-1.json +++ b/botocore/data/cloudformation/2010-05-15/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,92 +140,83 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] }, { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudformation-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + "endpoint": { + "url": "https://cloudformation-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] } ], @@ -221,155 +225,115 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "stringEquals", "argv": [ - true, + "aws-us-gov", { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "supportsFIPS" + "name" ] } ] } ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - "aws-us-gov", - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "name" - ] - } - ] - } - ], - "endpoint": { - "url": "https://cloudformation.{Region}.amazonaws.com", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - }, - { - "conditions": [], - "endpoint": { - "url": "https://cloudformation-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - } - ] + "endpoint": { + "url": "https://cloudformation.{Region}.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" }, { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://cloudformation-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudformation.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } - ] - }, - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [], "endpoint": { - "url": "https://cloudformation.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://cloudformation.{Region}.{PartitionResult#dualStackDnsSuffix}", "properties": {}, "headers": {} }, "type": "endpoint" } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://cloudformation.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/cloudformation/2010-05-15/service-2.json b/botocore/data/cloudformation/2010-05-15/service-2.json index 1fc35f8e0e..7fe1b64932 100644 --- a/botocore/data/cloudformation/2010-05-15/service-2.json +++ b/botocore/data/cloudformation/2010-05-15/service-2.json @@ -1353,7 +1353,10 @@ "CFNRegistryException":{ "type":"structure", "members":{ - "Message":{"shape":"ErrorMessage"} + "Message":{ + "shape":"ErrorMessage", + "documentation":"An message with details about the error that occurred.
" + } }, "documentation":"An error occurred during a CloudFormation registry operation.
", "error":{ @@ -1856,6 +1859,10 @@ "EnableTerminationProtection":{ "shape":"EnableTerminationProtection", "documentation":"Whether to enable termination protection on the specified stack. If a user attempts to delete a stack with termination protection enabled, the operation fails and the stack remains unchanged. For more information, see Protecting a Stack From Being Deleted in the CloudFormation User Guide. Termination protection is deactivated on stacks by default.
For nested stacks, termination protection is set on the root stack and can't be changed directly on the nested stack.
" + }, + "RetainExceptOnCreate":{ + "shape":"RetainExceptOnCreate", + "documentation":"This deletion policy deletes newly created resources, but retains existing resources, when a stack operation is rolled back. This ensures new, empty, and unused resources are deleted, while critical resources and their data are retained. RetainExceptOnCreate can be specified for any resource that supports the DeletionPolicy attribute.
The input for CreateStack action.
" @@ -3070,6 +3077,10 @@ "DisableRollback":{ "shape":"DisableRollback", "documentation":"Preserves the state of previously provisioned resources when an operation fails. This parameter can't be specified when the OnStackFailure parameter to the CreateChangeSet API operation was specified.
True - if the stack creation fails, do nothing. This is equivalent to specifying DO_NOTHING for the OnStackFailure parameter to the CreateChangeSet API operation.
False - if the stack creation fails, roll back the stack. This is equivalent to specifying ROLLBACK for the OnStackFailure parameter to the CreateChangeSet API operation.
Default: True
This deletion policy deletes newly created resources, but retains existing resources, when a stack operation is rolled back. This ensures new, empty, and unused resources are deleted, while critical resources and their data are retained. RetainExceptOnCreate can be specified for any resource that supports the DeletionPolicy attribute.
The input for the ExecuteChangeSet action.
" @@ -4863,6 +4874,7 @@ "type":"list", "member":{"shape":"ResourceToSkip"} }, + "RetainExceptOnCreate":{"type":"boolean"}, "RetainResources":{ "type":"list", "member":{"shape":"LogicalResourceId"} @@ -4910,6 +4922,10 @@ "ClientRequestToken":{ "shape":"ClientRequestToken", "documentation":"A unique identifier for this RollbackStack request.
This deletion policy deletes newly created resources, but retains existing resources, when a stack operation is rolled back. This ensures new, empty, and unused resources are deleted, while critical resources and their data are retained. RetainExceptOnCreate can be specified for any resource that supports the DeletionPolicy attribute.
Information about whether a stack's actual configuration differs, or has drifted, from its expected configuration, as defined in the stack template and any values specified as template parameters. For more information, see Detecting Unregulated Configuration Changes to Stacks and Resources.
" + }, + "RetainExceptOnCreate":{ + "shape":"RetainExceptOnCreate", + "documentation":"This deletion policy deletes newly created resources, but retains existing resources, when a stack operation is rolled back. This ensures new, empty, and unused resources are deleted, while critical resources and their data are retained. RetainExceptOnCreate can be specified for any resource that supports the DeletionPolicy attribute.
The Stack data type.
" @@ -6941,6 +6961,10 @@ "ClientRequestToken":{ "shape":"ClientRequestToken", "documentation":"A unique identifier for this UpdateStack request. Specify this token if you plan to retry requests so that CloudFormation knows that you're not attempting to update a stack with the same name. You might retry UpdateStack requests to ensure that CloudFormation successfully received them.
All events triggered by a given stack operation are assigned the same client request token, which you can use to track operations. For example, if you execute a CreateStack operation with the token token1, then all the StackEvents generated by that operation will have ClientRequestToken set as token1.
In the console, stack operations display the client request token on the Events tab. Stack operations that are initiated from the console use the token format Console-StackOperation-ID, which helps you easily identify the stack operation . For example, if you create a stack using the console, each stack event would be assigned the same token in the following format: Console-CreateStack-7f59c3cf-00d2-40c7-b2ff-e75db0987002.
This deletion policy deletes newly created resources, but retains existing resources, when a stack operation is rolled back. This ensures new, empty, and unused resources are deleted, while critical resources and their data are retained. RetainExceptOnCreate can be specified for any resource that supports the DeletionPolicy attribute.
The input for an UpdateStack action.
" diff --git a/botocore/data/cloudfront/2020-05-31/endpoint-rule-set-1.json b/botocore/data/cloudfront/2020-05-31/endpoint-rule-set-1.json index 2d908ad292..07a287ff6f 100644 --- a/botocore/data/cloudfront/2020-05-31/endpoint-rule-set-1.json +++ b/botocore/data/cloudfront/2020-05-31/endpoint-rule-set-1.json @@ -138,216 +138,91 @@ }, "aws" ] - } - ], - "type": "tree", - "rules": [ + }, { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] + "ref": "UseFIPS" }, + false + ] + }, + { + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront-fips.{Region}.api.aws", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "ref": "UseDualStack" }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + false + ] + } + ], + "endpoint": { + "url": "https://cloudfront.amazonaws.com", + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "cloudfront", + "signingRegion": "us-east-1" } ] }, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [ { - "conditions": [ + "fn": "stringEquals", + "argv": [ { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ { - "ref": "UseFIPS" + "ref": "PartitionResult" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront-fips.amazonaws.com", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "cloudfront", - "signingRegion": "us-east-1" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - } + "name" ] }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } + "aws" ] }, { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ + "fn": "booleanEquals", + "argv": [ { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront.{Region}.api.aws", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "ref": "UseFIPS" }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" - } + true ] }, { - "conditions": [], - "endpoint": { - "url": "https://cloudfront.amazonaws.com", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "cloudfront", - "signingRegion": "us-east-1" - } - ] + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" }, - "headers": {} - }, - "type": "endpoint" + false + ] } - ] + ], + "endpoint": { + "url": "https://cloudfront-fips.amazonaws.com", + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "cloudfront", + "signingRegion": "us-east-1" + } + ] + }, + "headers": {} + }, + "type": "endpoint" }, { "conditions": [ @@ -365,208 +240,40 @@ }, "aws-cn" ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront-fips.{Region}.api.amazonwebservices.com.cn", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] }, { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ + "fn": "booleanEquals", + "argv": [ { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront-fips.{Region}.amazonaws.com.cn", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "ref": "UseFIPS" }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } + false ] }, { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ + "fn": "booleanEquals", + "argv": [ { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront.{Region}.api.amazonwebservices.com.cn", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "ref": "UseDualStack" }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" + false + ] + } + ], + "endpoint": { + "url": "https://cloudfront.cn-northwest-1.amazonaws.com.cn", + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "cloudfront", + "signingRegion": "cn-northwest-1" } ] }, - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront.cn-northwest-1.amazonaws.com.cn", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "cloudfront", - "signingRegion": "cn-northwest-1" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - } - ] + "headers": {} + }, + "type": "endpoint" }, { "conditions": [ @@ -688,33 +395,6 @@ "conditions": [], "type": "tree", "rules": [ - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - { - "ref": "Region" - }, - "aws-global" - ] - } - ], - "endpoint": { - "url": "https://cloudfront-fips.amazonaws.com", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "cloudfront", - "signingRegion": "us-east-1" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - }, { "conditions": [], "endpoint": { @@ -797,60 +477,6 @@ "conditions": [], "type": "tree", "rules": [ - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - { - "ref": "Region" - }, - "aws-global" - ] - } - ], - "endpoint": { - "url": "https://cloudfront.amazonaws.com", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "cloudfront", - "signingRegion": "us-east-1" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - }, - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - { - "ref": "Region" - }, - "aws-cn-global" - ] - } - ], - "endpoint": { - "url": "https://cloudfront.cn-northwest-1.amazonaws.com.cn", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "cloudfront", - "signingRegion": "cn-northwest-1" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - }, { "conditions": [], "endpoint": { diff --git a/botocore/data/cloudfront/2020-05-31/service-2.json b/botocore/data/cloudfront/2020-05-31/service-2.json index 1ea9d33492..e2300702ae 100644 --- a/botocore/data/cloudfront/2020-05-31/service-2.json +++ b/botocore/data/cloudfront/2020-05-31/service-2.json @@ -97,6 +97,7 @@ {"shape":"TooManyDistributionsAssociatedToFieldLevelEncryptionConfig"}, {"shape":"NoSuchCachePolicy"}, {"shape":"TooManyDistributionsAssociatedToCachePolicy"}, + {"shape":"TooManyDistributionsAssociatedToOriginAccessControl"}, {"shape":"NoSuchResponseHeadersPolicy"}, {"shape":"TooManyDistributionsAssociatedToResponseHeadersPolicy"}, {"shape":"NoSuchOriginRequestPolicy"}, @@ -107,7 +108,7 @@ {"shape":"NoSuchRealtimeLogConfig"}, {"shape":"RealtimeLogConfigOwnerMismatch"} ], - "documentation":"Creates a staging distribution using the configuration of the provided primary distribution. A staging distribution is a copy of an existing distribution (called the primary distribution) that you can use in a continuous deployment workflow.
After you create a staging distribution, you can use UpdateDistribution to modify the staging distribution's configuration. Then you can use CreateContinuousDeploymentPolicy to incrementally move traffic to the staging distribution.
Creates a staging distribution using the configuration of the provided primary distribution. A staging distribution is a copy of an existing distribution (called the primary distribution) that you can use in a continuous deployment workflow.
After you create a staging distribution, you can use UpdateDistribution to modify the staging distribution's configuration. Then you can use CreateContinuousDeploymentPolicy to incrementally move traffic to the staging distribution.
This API operation requires the following IAM permissions:
" }, "CreateCachePolicy":{ "name":"CreateCachePolicy2020_05_31", @@ -260,6 +261,7 @@ {"shape":"InvalidOrigin"}, {"shape":"InvalidOriginAccessIdentity"}, {"shape":"InvalidOriginAccessControl"}, + {"shape":"IllegalOriginAccessConfiguration"}, {"shape":"AccessDenied"}, {"shape":"TooManyTrustedSigners"}, {"shape":"TrustedSignerDoesNotExist"}, @@ -307,6 +309,7 @@ {"shape":"TooManyDistributionsAssociatedToFieldLevelEncryptionConfig"}, {"shape":"NoSuchCachePolicy"}, {"shape":"TooManyDistributionsAssociatedToCachePolicy"}, + {"shape":"TooManyDistributionsAssociatedToOriginAccessControl"}, {"shape":"NoSuchResponseHeadersPolicy"}, {"shape":"TooManyDistributionsAssociatedToResponseHeadersPolicy"}, {"shape":"NoSuchOriginRequestPolicy"}, @@ -320,7 +323,7 @@ {"shape":"NoSuchContinuousDeploymentPolicy"}, {"shape":"InvalidDomainNameForOriginAccessControl"} ], - "documentation":"Create a new distribution with tags.
" + "documentation":"Create a new distribution with tags. This API operation requires the following IAM permissions:
" }, "CreateFieldLevelEncryptionConfig":{ "name":"CreateFieldLevelEncryptionConfig2020_05_31", @@ -1780,6 +1783,7 @@ {"shape":"TooManyDistributionsAssociatedToFieldLevelEncryptionConfig"}, {"shape":"NoSuchCachePolicy"}, {"shape":"TooManyDistributionsAssociatedToCachePolicy"}, + {"shape":"TooManyDistributionsAssociatedToOriginAccessControl"}, {"shape":"NoSuchResponseHeadersPolicy"}, {"shape":"TooManyDistributionsAssociatedToResponseHeadersPolicy"}, {"shape":"NoSuchOriginRequestPolicy"}, @@ -1857,6 +1861,7 @@ {"shape":"TooManyDistributionsAssociatedToFieldLevelEncryptionConfig"}, {"shape":"NoSuchCachePolicy"}, {"shape":"TooManyDistributionsAssociatedToCachePolicy"}, + {"shape":"TooManyDistributionsAssociatedToOriginAccessControl"}, {"shape":"NoSuchResponseHeadersPolicy"}, {"shape":"TooManyDistributionsAssociatedToResponseHeadersPolicy"}, {"shape":"NoSuchOriginRequestPolicy"}, @@ -1867,7 +1872,7 @@ {"shape":"NoSuchRealtimeLogConfig"}, {"shape":"RealtimeLogConfigOwnerMismatch"} ], - "documentation":"Copies the staging distribution's configuration to its corresponding primary distribution. The primary distribution retains its Aliases (also known as alternate domain names or CNAMEs) and ContinuousDeploymentPolicyId value, but otherwise its configuration is overwritten to match the staging distribution.
You can use this operation in a continuous deployment workflow after you have tested configuration changes on the staging distribution. After using a continuous deployment policy to move a portion of your domain name's traffic to the staging distribution and verifying that it works as intended, you can use this operation to copy the staging distribution's configuration to the primary distribution. This action will disable the continuous deployment policy and move your domain's traffic back to the primary distribution.
" + "documentation":"Copies the staging distribution's configuration to its corresponding primary distribution. The primary distribution retains its Aliases (also known as alternate domain names or CNAMEs) and ContinuousDeploymentPolicyId value, but otherwise its configuration is overwritten to match the staging distribution.
You can use this operation in a continuous deployment workflow after you have tested configuration changes on the staging distribution. After using a continuous deployment policy to move a portion of your domain name's traffic to the staging distribution and verifying that it works as intended, you can use this operation to copy the staging distribution's configuration to the primary distribution. This action will disable the continuous deployment policy and move your domain's traffic back to the primary distribution.
This API operation requires the following IAM permissions:
" }, "UpdateFieldLevelEncryptionConfig":{ "name":"UpdateFieldLevelEncryptionConfig2020_05_31", @@ -2155,7 +2160,7 @@ "members":{ "Enabled":{ "shape":"boolean", - "documentation":"This field is true if any of the Amazon Web Services accounts in the list have active CloudFront key pairs that CloudFront can use to verify the signatures of signed URLs and signed cookies. If not, this field is false.
This field is true if any of the Amazon Web Services accounts in the list are configured as trusted signers. If not, this field is false.
A value that uniquely identifies a request to create a resource. This helps to prevent CloudFront from creating a duplicate resource if you accidentally resubmit an identical request.
" + }, + "Enabled":{ + "shape":"boolean", + "documentation":"A Boolean flag to specify the state of the staging distribution when it's created. When you set this value to True, the staging distribution is enabled. When you set this value to False, the staging distribution is disabled.
If you omit this field, the default value is True.
The function's runtime environment. The only valid value is cloudfront-js-1.0.
The function's runtime environment verion.
" } }, "documentation":"Contains configuration information about a CloudFront function.
" @@ -5156,7 +5165,10 @@ }, "FunctionRuntime":{ "type":"string", - "enum":["cloudfront-js-1.0"] + "enum":[ + "cloudfront-js-1.0", + "cloudfront-js-2.0" + ] }, "FunctionSizeLimitExceeded":{ "type":"structure", @@ -10342,7 +10354,7 @@ "members":{ "Enabled":{ "shape":"boolean", - "documentation":"This field is true if any of the Amazon Web Services accounts have public keys that CloudFront can use to verify the signatures of signed URLs and signed cookies. If not, this field is false.
This field is true if any of the Amazon Web Services accounts in the list are configured as trusted signers. If not, this field is false.
Returns a description of the cluster operation specified by the ARN.
\n " }, + "DescribeClusterOperationV2" : { + "name" : "DescribeClusterOperationV2", + "http" : { + "method" : "GET", + "requestUri" : "/api/v2/operations/{clusterOperationArn}", + "responseCode" : 200 + }, + "input" : { + "shape" : "DescribeClusterOperationV2Request" + }, + "output" : { + "shape" : "DescribeClusterOperationV2Response", + "documentation" : "\nHTTP Status Code 200: OK.
" + }, + "errors" : [ { + "shape" : "BadRequestException", + "documentation" : "\nHTTP Status Code 400: Bad request due to incorrect input. Correct your request and then retry it.
" + }, { + "shape" : "UnauthorizedException", + "documentation" : "\nHTTP Status Code 401: Unauthorized request. The provided credentials couldn't be validated.
" + }, { + "shape" : "InternalServerErrorException", + "documentation" : "\nHTTP Status Code 500: Unexpected internal server error. Retrying your request might resolve the issue.
" + }, { + "shape" : "ForbiddenException", + "documentation" : "\nHTTP Status Code 403: Access forbidden. Correct your credentials and then retry your request.
" + }, { + "shape" : "NotFoundException", + "documentation" : "\nHTTP Status Code 404: Resource not found due to incorrect input. Correct your request and then retry it.
" + }, { + "shape" : "ServiceUnavailableException", + "documentation" : "\nHTTP Status Code 503: Service Unavailable. Retrying your request in some time might resolve the issue.
" + }, { + "shape" : "TooManyRequestsException", + "documentation" : "\nHTTP Status Code 429: Limit exceeded. Resource limit reached.
" + } ], + "documentation" : "\nReturns a description of the cluster operation specified by the ARN.
\n" + }, "DescribeConfiguration": { "name": "DescribeConfiguration", "http": { @@ -795,6 +833,44 @@ ], "documentation": "\nReturns a list of all the operations that have been performed on the specified MSK cluster.
\n " }, + "ListClusterOperationsV2" : { + "name" : "ListClusterOperationsV2", + "http" : { + "method" : "GET", + "requestUri" : "/api/v2/clusters/{clusterArn}/operations", + "responseCode" : 200 + }, + "input" : { + "shape" : "ListClusterOperationsV2Request" + }, + "output" : { + "shape" : "ListClusterOperationsV2Response", + "documentation" : "\nHTTP Status Code 200: OK.
" + }, + "errors" : [ { + "shape" : "BadRequestException", + "documentation" : "\nHTTP Status Code 400: Bad request due to incorrect input. Correct your request and then retry it.
" + }, { + "shape" : "UnauthorizedException", + "documentation" : "\nHTTP Status Code 401: Unauthorized request. The provided credentials couldn't be validated.
" + }, { + "shape" : "InternalServerErrorException", + "documentation" : "\nHTTP Status Code 500: Unexpected internal server error. Retrying your request might resolve the issue.
" + }, { + "shape" : "ForbiddenException", + "documentation" : "\nHTTP Status Code 403: Access forbidden. Correct your credentials and then retry your request.
" + }, { + "shape" : "NotFoundException", + "documentation" : "\nHTTP Status Code 404: Resource not found due to incorrect input. Correct your request and then retry it.
" + }, { + "shape" : "ServiceUnavailableException", + "documentation" : "\nHTTP Status Code 503: Service Unavailable. Retrying your request in some time might resolve the issue.
" + }, { + "shape" : "TooManyRequestsException", + "documentation" : "\nHTTP Status Code 429: Limit exceeded. Resource limit reached.
" + } ], + "documentation" : "\nReturns a list of all the operations that have been performed on the specified MSK cluster.
\n " + }, "ListClusters": { "name": "ListClusters", "http": { @@ -2977,6 +3053,140 @@ } } }, + "ClusterOperationV2" : { + "type" : "structure", + "members" : { + "ClusterArn" : { + "shape" : "__string", + "locationName" : "clusterArn", + "documentation" : "\nARN of the cluster.
" + }, + "ClusterType" : { + "shape" : "ClusterType", + "locationName" : "clusterType", + "documentation" : "\nType of the backend cluster.
" + }, + "StartTime" : { + "shape" : "__timestampIso8601", + "locationName" : "startTime", + "documentation" : "\nThe time at which operation was started.
" + }, + "EndTime" : { + "shape" : "__timestampIso8601", + "locationName" : "endTime", + "documentation" : "\nThe time at which the operation finished.
" + }, + "ErrorInfo" : { + "shape" : "ErrorInfo", + "locationName" : "errorInfo", + "documentation" : "\nIf cluster operation failed from an error, it describes the error.
" + }, + "OperationArn" : { + "shape" : "__string", + "locationName" : "operationArn", + "documentation" : "\nARN of the cluster operation.
" + }, + "OperationState" : { + "shape" : "__string", + "locationName" : "operationState", + "documentation" : "\nState of the cluster operation.
" + }, + "OperationType" : { + "shape" : "__string", + "locationName" : "operationType", + "documentation" : "\nType of the cluster operation.
" + }, + "Provisioned" : { + "shape" : "ClusterOperationV2Provisioned", + "locationName" : "provisioned", + "documentation" : "\nProperties of a provisioned cluster.
" + }, + "Serverless" : { + "shape" : "ClusterOperationV2Serverless", + "locationName" : "serverless", + "documentation" : "\nProperties of a serverless cluster.
" + } + }, + "documentation" : "\nReturns information about a cluster operation.
" + }, + "ClusterOperationV2Provisioned" : { + "type" : "structure", + "members" : { + "OperationSteps" : { + "shape" : "__listOfClusterOperationStep", + "locationName" : "operationSteps", + "documentation" : "\nSteps completed during the operation.
" + }, + "SourceClusterInfo" : { + "shape" : "MutableClusterInfo", + "locationName" : "sourceClusterInfo", + "documentation" : "\nInformation about cluster attributes before a cluster is updated.
" + }, + "TargetClusterInfo" : { + "shape" : "MutableClusterInfo", + "locationName" : "targetClusterInfo", + "documentation" : "\nInformation about cluster attributes after a cluster is updated.
" + }, + "VpcConnectionInfo" : { + "shape" : "VpcConnectionInfo", + "locationName" : "vpcConnectionInfo", + "documentation" : "\nDescription of the VPC connection for CreateVpcConnection and DeleteVpcConnection operations.
" + } + }, + "documentation" : "\nReturns information about a provisioned cluster operation.
" + }, + "ClusterOperationV2Serverless" : { + "type" : "structure", + "members" : { + "VpcConnectionInfo" : { + "shape" : "VpcConnectionInfoServerless", + "locationName" : "vpcConnectionInfo", + "documentation" : "\nDescription of the VPC connection for CreateVpcConnection and DeleteVpcConnection operations.
" + } + }, + "documentation" : "\nReturns information about a serverless cluster operation.
" + }, + "ClusterOperationV2Summary" : { + "type" : "structure", + "members" : { + "ClusterArn" : { + "shape" : "__string", + "locationName" : "clusterArn", + "documentation" : "\nARN of the cluster.
" + }, + "ClusterType" : { + "shape" : "ClusterType", + "locationName" : "clusterType", + "documentation" : "\nType of the backend cluster.
" + }, + "StartTime" : { + "shape" : "__timestampIso8601", + "locationName" : "startTime", + "documentation" : "\nThe time at which operation was started.
" + }, + "EndTime" : { + "shape" : "__timestampIso8601", + "locationName" : "endTime", + "documentation" : "\nThe time at which the operation finished.
" + }, + "OperationArn" : { + "shape" : "__string", + "locationName" : "operationArn", + "documentation" : "\nARN of the cluster operation.
" + }, + "OperationState" : { + "shape" : "__string", + "locationName" : "operationState", + "documentation" : "\nState of the cluster operation.
" + }, + "OperationType" : { + "shape" : "__string", + "locationName" : "operationType", + "documentation" : "\nType of the cluster operation.
" + } + }, + "documentation" : "\nReturns information about a cluster operation.
" + }, "DeleteClusterRequest": { "type": "structure", "members": { @@ -3103,6 +3313,18 @@ "ClusterOperationArn" ] }, + "DescribeClusterOperationV2Request" : { + "type" : "structure", + "members" : { + "ClusterOperationArn" : { + "shape" : "__string", + "location" : "uri", + "locationName" : "clusterOperationArn", + "documentation" : "ARN of the cluster operation to describe." + } + }, + "required" : [ "ClusterOperationArn" ] + }, "DescribeClusterOperationResponse": { "type": "structure", "members": { @@ -3113,6 +3335,16 @@ } } }, + "DescribeClusterOperationV2Response" : { + "type" : "structure", + "members" : { + "ClusterOperationInfo" : { + "shape" : "ClusterOperationV2", + "locationName" : "clusterOperationInfo", + "documentation" : "\nCluster operation information
" + } + } + }, "DescribeClusterRequest": { "type": "structure", "members": { @@ -3690,6 +3922,30 @@ "ClusterArn" ] }, + "ListClusterOperationsV2Request" : { + "type" : "structure", + "members" : { + "ClusterArn" : { + "shape" : "__string", + "location" : "uri", + "locationName" : "clusterArn", + "documentation" : "The arn of the cluster whose operations are being requested." + }, + "MaxResults" : { + "shape" : "MaxResults", + "location" : "querystring", + "locationName" : "maxResults", + "documentation" : "The maxResults of the query." + }, + "NextToken" : { + "shape" : "__string", + "location" : "querystring", + "locationName" : "nextToken", + "documentation" : "The nextToken of the query." + } + }, + "required" : [ "ClusterArn" ] + }, "ListClusterOperationsResponse": { "type": "structure", "members": { @@ -3705,6 +3961,21 @@ } } }, + "ListClusterOperationsV2Response" : { + "type" : "structure", + "members" : { + "ClusterOperationInfoList" : { + "shape" : "__listOfClusterOperationV2Summary", + "locationName" : "clusterOperationInfoList", + "documentation" : "\nAn array of cluster operation information objects.
" + }, + "NextToken" : { + "shape" : "__string", + "locationName" : "nextToken", + "documentation" : "\nIf the response of ListClusterOperationsV2 is truncated, it returns a NextToken in the response. This NextToken should be sent in the subsequent request to ListClusterOperationsV2.
" + } + } + }, "ListClustersRequest": { "type": "structure", "members": { @@ -5195,6 +5466,32 @@ }, "documentation": "\nDescription of the VPC connection.
\n " }, + "VpcConnectionInfoServerless" : { + "type" : "structure", + "members" : { + "CreationTime" : { + "shape" : "__timestampIso8601", + "locationName" : "creationTime", + "documentation" : "\nThe time when Amazon MSK creates the VPC Connnection.
" + }, + "Owner" : { + "shape" : "__string", + "locationName" : "owner", + "documentation" : "\nThe owner of the VPC Connection.
" + }, + "UserIdentity" : { + "shape" : "UserIdentity", + "locationName" : "userIdentity", + "documentation" : "\nDescription of the requester that calls the API operation.
" + }, + "VpcConnectionArn" : { + "shape" : "__string", + "locationName" : "vpcConnectionArn", + "documentation" : "\nThe Amazon Resource Name (ARN) of the VPC connection.
" + } + }, + "documentation" : "Description of the VPC connection." + }, "VpcConnectionState": { "type": "string", "documentation": "\nThe state of a VPC connection.
\n ", @@ -5297,6 +5594,12 @@ "shape": "ClusterOperationInfo" } }, + "__listOfClusterOperationV2Summary" : { + "type" : "list", + "member" : { + "shape" : "ClusterOperationV2Summary" + } + }, "__listOfClusterOperationStep" : { "type" : "list", "member" : { diff --git a/botocore/data/pinpoint/2016-12-01/service-2.json b/botocore/data/pinpoint/2016-12-01/service-2.json index a68d749ee5..d37440fc33 100644 --- a/botocore/data/pinpoint/2016-12-01/service-2.json +++ b/botocore/data/pinpoint/2016-12-01/service-2.json @@ -5438,52 +5438,52 @@ } ], "documentation": "Updates an existing message template for messages that are sent through the voice channel.
" - }, - "VerifyOTPMessage": { - "name": "VerifyOTPMessage", - "http": { - "method": "POST", - "requestUri": "/v1/apps/{application-id}/verify-otp", - "responseCode": 200 - }, - "input": { - "shape": "VerifyOTPMessageRequest" - }, - "output": { - "shape": "VerifyOTPMessageResponse", - "documentation": "200 response
" - }, - "errors": [ - { - "shape": "BadRequestException", - "documentation": "400 response
" - }, - { - "shape": "InternalServerErrorException", - "documentation": "500 response
" - }, - { - "shape": "PayloadTooLargeException", - "documentation": "413 response
" - }, - { - "shape": "ForbiddenException", - "documentation": "403 response
" - }, - { - "shape": "NotFoundException", - "documentation": "404 response
" - }, - { - "shape": "MethodNotAllowedException", - "documentation": "405 response
" - }, - { - "shape": "TooManyRequestsException", - "documentation": "429 response
" - } - ], - "documentation": "Verify an OTP
" + }, + "VerifyOTPMessage": { + "name": "VerifyOTPMessage", + "http": { + "method": "POST", + "requestUri": "/v1/apps/{application-id}/verify-otp", + "responseCode": 200 + }, + "input": { + "shape": "VerifyOTPMessageRequest" + }, + "output": { + "shape": "VerifyOTPMessageResponse", + "documentation": "200 response
" + }, + "errors": [ + { + "shape": "BadRequestException", + "documentation": "400 response
" + }, + { + "shape": "InternalServerErrorException", + "documentation": "500 response
" + }, + { + "shape": "PayloadTooLargeException", + "documentation": "413 response
" + }, + { + "shape": "ForbiddenException", + "documentation": "403 response
" + }, + { + "shape": "NotFoundException", + "documentation": "404 response
" + }, + { + "shape": "MethodNotAllowedException", + "documentation": "405 response
" + }, + { + "shape": "TooManyRequestsException", + "documentation": "429 response
" + } + ], + "documentation": "Verify an OTP
" } }, "shapes": { @@ -6411,6 +6411,24 @@ "Name" ] }, + "ApplicationSettingsJourneyLimits": { + "type": "structure", + "members": { + "DailyCap": { + "shape": "__integer", + "documentation": "The daily number of messages that an endpoint can receive from all journeys. The maximum value is 100. If set to 0, this limit will not apply.
" + }, + "TimeframeCap": { + "shape": "JourneyTimeframeCap", + "documentation": "The default maximum number of messages that can be sent to an endpoint during the specified timeframe for all journeys.
" + }, + "TotalCap": { + "shape": "__integer", + "documentation": "The default maximum number of messages that a single journey can sent to a single endpoint. The maximum value is 100. If set to 0, this limit will not apply.
" + } + }, + "documentation": "The default sending limits for journeys in the application. To override these limits and define custom limits for a specific journey, use the Journey resource.
" + }, "ApplicationSettingsResource": { "type": "structure", "members": { @@ -6433,6 +6451,10 @@ "QuietTime": { "shape": "QuietTime", "documentation": "The default quiet time for campaigns in the application. Quiet time is a specific time range when messages aren't sent to endpoints, if all the following conditions are met:
The EndpointDemographic.Timezone property of the endpoint is set to a valid value.
The current time in the endpoint's time zone is later than or equal to the time specified by the QuietTime.Start property for the application (or a campaign or journey that has custom quiet time settings).
The current time in the endpoint's time zone is earlier than or equal to the time specified by the QuietTime.End property for the application (or a campaign or journey that has custom quiet time settings).
If any of the preceding conditions isn't met, the endpoint will receive messages from a campaign or journey, even if quiet time is enabled.
" + }, + "JourneyLimits": { + "shape": "ApplicationSettingsJourneyLimits", + "documentation": "The default sending limits for journeys in the application. These limits apply to each journey for the application but can be overridden, on a per journey basis, with the JourneyLimits resource.
" } }, "documentation": "Provides information about an application, including the default settings for an application.
", @@ -9484,15 +9506,20 @@ "shape": "__string", "documentation": "The Web API Key, also referred to as an API_KEY or server key, that you received from Google to communicate with Google services.
" }, + "DefaultAuthenticationMethod": { + "shape": "__string", + "documentation": "The default authentication method used for GCM. Values are either \"TOKEN\" or \"KEY\". Defaults to \"KEY\".
" + }, "Enabled": { "shape": "__boolean", "documentation": "Specifies whether to enable the GCM channel for the application.
" + }, + "ServiceJson": { + "shape": "__string", + "documentation": "The contents of the JSON file provided by Google during registration in order to generate an access token for authentication. For more information see Migrate from legacy FCM APIs to HTTP v1.
" } }, - "documentation": "Specifies the status and settings of the GCM channel for an application. This channel enables Amazon Pinpoint to send push notifications through the Firebase Cloud Messaging (FCM), formerly Google Cloud Messaging (GCM), service.
", - "required": [ - "ApiKey" - ] + "documentation": "Specifies the status and settings of the GCM channel for an application. This channel enables Amazon Pinpoint to send push notifications through the Firebase Cloud Messaging (FCM), formerly Google Cloud Messaging (GCM), service.
" }, "GCMChannelResponse": { "type": "structure", @@ -9509,6 +9536,10 @@ "shape": "__string", "documentation": "The Web API Key, also referred to as an API_KEY or server key, that you received from Google to communicate with Google services.
" }, + "DefaultAuthenticationMethod": { + "shape": "__string", + "documentation": "The default authentication method used for GCM. Values are either \"TOKEN\" or \"KEY\". Defaults to \"KEY\".
" + }, "Enabled": { "shape": "__boolean", "documentation": "Specifies whether the GCM channel is enabled for the application.
" @@ -9517,6 +9548,10 @@ "shape": "__boolean", "documentation": "(Not used) This property is retained only for backward compatibility.
" }, + "HasFcmServiceCredentials": { + "shape": "__boolean", + "documentation": "Returns true if the JSON file provided by Google during registration process was used in the ServiceJson field of the request.
" + }, "Id": { "shape": "__string", "documentation": "(Deprecated) An identifier for the GCM channel. This property is retained only for backward compatibility.
" @@ -9544,7 +9579,6 @@ }, "documentation": "Provides information about the status and settings of the GCM channel for an application. The GCM channel enables Amazon Pinpoint to send push notifications through the Firebase Cloud Messaging (FCM), formerly Google Cloud Messaging (GCM), service.
", "required": [ - "Credential", "Platform" ] }, @@ -9579,9 +9613,13 @@ "shape": "__string", "documentation": "The URL of an image to display in the push notification.
" }, + "PreferredAuthenticationMethod": { + "shape": "__string", + "documentation": "The preferred authentication method, with valid values \"KEY\" or \"TOKEN\". If a value isn't provided then the DefaultAuthenticationMethod is used.
" + }, "Priority": { "shape": "__string", - "documentation": "para>normal - The notification might be delayed. Delivery is optimized for battery usage on the recipient's device. Use this value unless immediate delivery is required.
/listitem>high - The notification is sent immediately and might wake a sleeping device.
Amazon Pinpoint specifies this value in the FCM priority parameter when it sends the notification message to FCM.
The equivalent values for Apple Push Notification service (APNs) are 5, for normal, and 10, for high. If you specify an APNs value for this property, Amazon Pinpoint accepts and converts the value to the corresponding FCM value.
" + "documentation": "para>normal – The notification might be delayed. Delivery is optimized for battery usage on the recipient's device. Use this value unless immediate delivery is required.
/listitem>high – The notification is sent immediately and might wake a sleeping device.
Amazon Pinpoint specifies this value in the FCM priority parameter when it sends the notification message to FCM.
The equivalent values for Apple Push Notification service (APNs) are 5, for normal, and 10, for high. If you specify an APNs value for this property, Amazon Pinpoint accepts and converts the value to the corresponding FCM value.
" }, "RawContent": { "shape": "__string", @@ -12074,8 +12112,16 @@ "documentation": "The maximum number of messages that the journey can send each second.
" }, "EndpointReentryInterval": { - "shape": "__string", - "documentation": "Minimum time that must pass before an endpoint can re-enter a given journey. The duration should use an ISO 8601 format, such as PT1H.
" + "shape": "__string", + "documentation": "Minimum time that must pass before an endpoint can re-enter a given journey. The duration should use an ISO 8601 format, such as PT1H.
" + }, + "TimeframeCap": { + "shape": "JourneyTimeframeCap", + "documentation": "The number of messages that an endpoint can receive during the specified timeframe.
" + }, + "TotalCap": { + "shape": "__integer", + "documentation": "The maximum number of messages a journey can sent to a single endpoint. The maximum value is 100. If set to 0, this limit will not apply.
" } }, "documentation": "Specifies limits on the messages that a journey can send and the number of times participants can enter a journey.
" @@ -12092,16 +12138,16 @@ }, "JourneyChannelSettings": { "type": "structure", - "members": { - "ConnectCampaignArn": { - "shape": "__string", - "documentation": "Amazon Resource Name (ARN) of the Connect Campaign.
" - }, - "ConnectCampaignExecutionRoleArn": { - "shape": "__string", - "documentation": "IAM role ARN to be assumed when invoking Connect campaign execution APIs for dialing.
" - } + "members": { + "ConnectCampaignArn": { + "shape": "__string", + "documentation": "Amazon Resource Name (ARN) of the Connect Campaign.
" }, + "ConnectCampaignExecutionRoleArn": { + "shape": "__string", + "documentation": "IAM role ARN to be assumed when invoking Connect campaign execution APIs for dialing.
" + } + }, "documentation": "The channel-specific configurations for the journey.
" }, "JourneyResponse": { @@ -12181,16 +12227,16 @@ "documentation": "The channel-specific configurations for the journey.
" }, "SendingSchedule": { - "shape": "__boolean", - "documentation": "Indicates if journey has Advance Quiet Time enabled. This flag should be set to true in order to allow using OpenHours and ClosedDays.
" + "shape": "__boolean", + "documentation": "Indicates if journey has Advance Quiet Time enabled. This flag should be set to true in order to allow using OpenHours and ClosedDays.
" }, "OpenHours": { - "shape": "OpenHours", - "documentation": "The time when a journey can send messages. QuietTime should be configured first and SendingSchedule should be set to true.
" + "shape": "OpenHours", + "documentation": "The time when a journey can send messages. QuietTime should be configured first and SendingSchedule should be set to true.
" }, "ClosedDays": { - "shape": "ClosedDays", - "documentation": "The time when a journey will not send messages. QuietTime should be configured first and SendingSchedule should be set to true.
" + "shape": "ClosedDays", + "documentation": "The time when a journey will not send messages. QuietTime should be configured first and SendingSchedule should be set to true.
" }, "TimezoneEstimationMethods": { "shape": "ListOf__TimezoneEstimationMethodsElement", @@ -12388,6 +12434,20 @@ }, "documentation": "Changes the status of a journey.
" }, + "JourneyTimeframeCap": { + "type": "structure", + "members": { + "Cap": { + "shape": "__integer", + "documentation": "The maximum number of messages that all journeys can send to an endpoint during the specified timeframe. The maximum value is 100. If set to 0, this limit will not apply.
" + }, + "Days": { + "shape": "__integer", + "documentation": "The length of the timeframe in days. The maximum value is 30. If set to 0, this limit will not apply.
" + } + }, + "documentation": "The number of messages that can be sent to an endpoint during the specified timeframe for all journeys.
" + }, "JourneysResponse": { "type": "structure", "members": { @@ -14436,6 +14496,10 @@ "VoiceTemplate": { "shape": "Template", "documentation": "The voice template to use for the message. This object isn't supported for campaigns.
" + }, + "InAppTemplate": { + "shape": "Template", + "documentation": "The InApp template to use for the message. The InApp template object is not supported for SendMessages.
" } }, "documentation": "Specifies the message template to use for the message, for each type of channel.
" @@ -14492,7 +14556,7 @@ }, "TemplateType": { "shape": "TemplateType", - "documentation": "The type of channel that the message template is designed for. Possible values are: EMAIL, PUSH, SMS, and VOICE.
" + "documentation": "The type of channel that the message template is designed for. Possible values are: EMAIL, PUSH, SMS, INAPP, and VOICE.
" }, "Version": { "shape": "__string", @@ -14542,7 +14606,7 @@ }, "TemplateType": { "shape": "__string", - "documentation": "The type of channel that the message template is designed for. Possible values are: EMAIL, PUSH, SMS, and VOICE.
" + "documentation": "The type of channel that the message template is designed for. Possible values are: EMAIL, PUSH, SMS, INAPP, and VOICE.
" }, "Version": { "shape": "__string", @@ -15884,6 +15948,10 @@ "QuietTime": { "shape": "QuietTime", "documentation": "The default quiet time for campaigns in the application. Quiet time is a specific time range when messages aren't sent to endpoints, if all the following conditions are met:
The EndpointDemographic.Timezone property of the endpoint is set to a valid value.
The current time in the endpoint's time zone is later than or equal to the time specified by the QuietTime.Start property for the application (or a campaign or journey that has custom quiet time settings).
The current time in the endpoint's time zone is earlier than or equal to the time specified by the QuietTime.End property for the application (or a campaign or journey that has custom quiet time settings).
If any of the preceding conditions isn't met, the endpoint will receive messages from a campaign or journey, even if quiet time is enabled.
To override the default quiet time settings for a specific campaign or journey, use the Campaign resource or the Journey resource to define a custom quiet time for the campaign or journey.
" + }, + "JourneyLimits": { + "shape": "ApplicationSettingsJourneyLimits", + "documentation": "The default sending limits for journeys in the application. These limits apply to each journey for the application but can be overridden, on a per journey basis, with the JourneyLimits resource.
" } }, "documentation": "Specifies the default settings for an application.
" @@ -16033,28 +16101,28 @@ "documentation": "The status of the journey. Valid values are:
DRAFT - Saves the journey and doesn't publish it.
ACTIVE - Saves and publishes the journey. Depending on the journey's schedule, the journey starts running immediately or at the scheduled start time. If a journey's status is ACTIVE, you can't add, change, or remove activities from it.
PAUSED, CANCELLED, COMPLETED, and CLOSED states are not supported in requests to create or update a journey. To cancel, pause, or resume a journey, use the Journey State resource.
" }, "WaitForQuietTime": { - "shape": "__boolean", - "documentation": "Specifies whether endpoints in quiet hours should enter a wait till the end of their quiet hours.
" + "shape": "__boolean", + "documentation": "Specifies whether endpoints in quiet hours should enter a wait till the end of their quiet hours.
" }, "RefreshOnSegmentUpdate": { - "shape": "__boolean", - "documentation": "Indicates whether the journey participants should be refreshed when a segment is updated.
" + "shape": "__boolean", + "documentation": "Indicates whether the journey participants should be refreshed when a segment is updated.
" }, "JourneyChannelSettings": { - "shape": "JourneyChannelSettings", - "documentation": "The channel-specific configurations for the journey.
" + "shape": "JourneyChannelSettings", + "documentation": "The channel-specific configurations for the journey.
" }, "SendingSchedule": { - "shape": "__boolean", - "documentation": "Indicates if journey has Advance Quiet Time enabled. This flag should be set to true in order to allow using OpenHours and ClosedDays.
" + "shape": "__boolean", + "documentation": "Indicates if journey has Advance Quiet Time enabled. This flag should be set to true in order to allow using OpenHours and ClosedDays.
" }, "OpenHours": { - "shape": "OpenHours", - "documentation": "The time when journey allow to send messages. QuietTime should be configured first and SendingSchedule should be set to true.
" + "shape": "OpenHours", + "documentation": "The time when journey allow to send messages. QuietTime should be configured first and SendingSchedule should be set to true.
" }, "ClosedDays": { - "shape": "ClosedDays", - "documentation": "The time when journey will stop sending messages. QuietTime should be configured first and SendingSchedule should be set to true.
" + "shape": "ClosedDays", + "documentation": "The time when journey will stop sending messages. QuietTime should be configured first and SendingSchedule should be set to true.
" }, "TimezoneEstimationMethods": { "shape": "ListOf__TimezoneEstimationMethodsElement", @@ -16496,124 +16564,124 @@ "timestampFormat": "unixTimestamp" }, "DayOfWeek": { - "type": "string", - "enum": [ - "MONDAY", - "TUESDAY", - "WEDNESDAY", - "THURSDAY", - "FRIDAY", - "SATURDAY", - "SUNDAY" - ] + "type": "string", + "enum": [ + "MONDAY", + "TUESDAY", + "WEDNESDAY", + "THURSDAY", + "FRIDAY", + "SATURDAY", + "SUNDAY" + ] }, "OpenHoursRule": { - "type": "structure", - "documentation": "Specifies the start and end time for OpenHours.
", - "members": { - "StartTime": { - "shape": "__string", - "documentation": "The start of the scheduled time, in ISO 8601 format, when the channel can send messages.
" - }, - "EndTime": { - "shape": "__string", - "documentation": "The end of the scheduled time, in ISO 8601 format, when the channel can't send messages.
" - } + "type": "structure", + "documentation": "Specifies the start and end time for OpenHours.
", + "members": { + "StartTime": { + "shape": "__string", + "documentation": "The start of the scheduled time, in ISO 8601 format, when the channel can send messages.
" + }, + "EndTime": { + "shape": "__string", + "documentation": "The end of the scheduled time, in ISO 8601 format, when the channel can't send messages.
" + } } }, "ListOfOpenHoursRules": { - "type": "list", - "member": { - "shape": "OpenHoursRule", - "documentation": "Open Hour Rule Details.
" - } + "type": "list", + "member": { + "shape": "OpenHoursRule", + "documentation": "Open Hour Rule Details.
" + } }, "MapOfListOfOpenHoursRules": { - "type": "map", - "key": { - "shape": "DayOfWeek", - "documentation": "Day of a week when the rule will be applied. Valid values are [MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY]
" - }, - "value": { - "shape": "ListOfOpenHoursRules", - "documentation": "Open Hour Rules.
" - } + "type": "map", + "key": { + "shape": "DayOfWeek", + "documentation": "Day of a week when the rule will be applied. Valid values are [MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY]
" + }, + "value": { + "shape": "ListOfOpenHoursRules", + "documentation": "Open Hour Rules.
" + } }, "OpenHours": { - "type": "structure", - "documentation": "Specifies the times when message are allowed to be sent to endpoints.
", - "members": { - "EMAIL": { - "shape": "MapOfListOfOpenHoursRules", - "documentation": "Specifies the schedule settings for the email channel.
" - }, - "SMS": { - "shape": "MapOfListOfOpenHoursRules", - "documentation": "Specifies the schedule settings for the SMS channel.
" - }, - "PUSH": { - "shape": "MapOfListOfOpenHoursRules", - "documentation": "Specifies the schedule settings for the push channel.
" - }, - "VOICE": { - "shape": "MapOfListOfOpenHoursRules", - "documentation": "Specifies the schedule settings for the voice channel.
" - }, - "CUSTOM": { - "shape": "MapOfListOfOpenHoursRules", - "documentation": "Specifies the schedule settings for the custom channel.
" - } + "type": "structure", + "documentation": "Specifies the times when message are allowed to be sent to endpoints.
", + "members": { + "EMAIL": { + "shape": "MapOfListOfOpenHoursRules", + "documentation": "Specifies the schedule settings for the email channel.
" + }, + "SMS": { + "shape": "MapOfListOfOpenHoursRules", + "documentation": "Specifies the schedule settings for the SMS channel.
" + }, + "PUSH": { + "shape": "MapOfListOfOpenHoursRules", + "documentation": "Specifies the schedule settings for the push channel.
" + }, + "VOICE": { + "shape": "MapOfListOfOpenHoursRules", + "documentation": "Specifies the schedule settings for the voice channel.
" + }, + "CUSTOM": { + "shape": "MapOfListOfOpenHoursRules", + "documentation": "Specifies the schedule settings for the custom channel.
" + } } }, "ClosedDaysRule": { - "type": "structure", - "documentation": "Specifies the rule settings for when messages can't be sent.
", - "members": { - "Name": { - "shape": "__string", - "documentation": "The name of the closed day rule.
" - }, - "StartDateTime": { - "shape": "__string", - "documentation": "Start DateTime ISO 8601 format
" - }, - "EndDateTime": { - "shape": "__string", - "documentation": "End DateTime ISO 8601 format
" - } + "type": "structure", + "documentation": "Specifies the rule settings for when messages can't be sent.
", + "members": { + "Name": { + "shape": "__string", + "documentation": "The name of the closed day rule.
" + }, + "StartDateTime": { + "shape": "__string", + "documentation": "Start DateTime ISO 8601 format
" + }, + "EndDateTime": { + "shape": "__string", + "documentation": "End DateTime ISO 8601 format
" + } } }, "ListOfClosedDaysRules": { - "type": "list", - "member": { - "shape": "ClosedDaysRule", - "documentation": "ClosedDays rule details.
" - } + "type": "list", + "member": { + "shape": "ClosedDaysRule", + "documentation": "ClosedDays rule details.
" + } }, "ClosedDays": { - "type": "structure", - "documentation": "The time when a journey will not send messages. QuietTime should be configured first and SendingSchedule should be set to true.
", - "members": { - "EMAIL": { - "shape": "ListOfClosedDaysRules", - "documentation": "Rules for the Email channel.
" - }, - "SMS": { - "shape": "ListOfClosedDaysRules", - "documentation": "Rules for the SMS channel.
" - }, - "PUSH": { - "shape": "ListOfClosedDaysRules", - "documentation": "Rules for the Push channel.
" - }, - "VOICE": { - "shape": "ListOfClosedDaysRules", - "documentation": "Rules for the Voice channel.
" - }, - "CUSTOM": { - "shape": "ListOfClosedDaysRules", - "documentation": "Rules for the Custom channel.
" - } + "type": "structure", + "documentation": "The time when a journey will not send messages. QuietTime should be configured first and SendingSchedule should be set to true.
", + "members": { + "EMAIL": { + "shape": "ListOfClosedDaysRules", + "documentation": "Rules for the Email channel.
" + }, + "SMS": { + "shape": "ListOfClosedDaysRules", + "documentation": "Rules for the SMS channel.
" + }, + "PUSH": { + "shape": "ListOfClosedDaysRules", + "documentation": "Rules for the Push channel.
" + }, + "VOICE": { + "shape": "ListOfClosedDaysRules", + "documentation": "Rules for the Voice channel.
" + }, + "CUSTOM": { + "shape": "ListOfClosedDaysRules", + "documentation": "Rules for the Custom channel.
" + } } } } diff --git a/docs/source/conf.py b/docs/source/conf.py index 96bdafd3f2..2e365772f7 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '1.31.' # The full version, including alpha/beta/rc tags. -release = '1.31.14' +release = '1.31.15' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tests/functional/endpoint-rules/application-insights/endpoint-tests-1.json b/tests/functional/endpoint-rules/application-insights/endpoint-tests-1.json index 2b0535fdb4..af6b8c47b2 100644 --- a/tests/functional/endpoint-rules/application-insights/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/application-insights/endpoint-tests-1.json @@ -1,770 +1,29 @@ { "testCases": [ { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.ap-south-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.ap-south-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-south-1.api.aws" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-south-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-south-1.api.aws" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-south-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.us-gov-east-1.api.aws" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.us-gov-east-1.amazonaws.com" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.us-gov-east-1.api.aws" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.us-gov-east-1.amazonaws.com" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.ca-central-1.api.aws" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.ca-central-1.amazonaws.com" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.ca-central-1.api.aws" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.ca-central-1.amazonaws.com" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-central-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-central-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.us-west-1.amazonaws.com" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.us-west-1.amazonaws.com" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.us-west-2.amazonaws.com" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.us-west-2.amazonaws.com" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.af-south-1.api.aws" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.af-south-1.amazonaws.com" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.af-south-1.api.aws" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.af-south-1.amazonaws.com" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-north-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-north-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-west-3.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-west-3.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-west-2.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-west-2.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.eu-west-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.eu-west-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.ap-northeast-3.api.aws" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.ap-northeast-3.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.ap-northeast-3.api.aws" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.ap-northeast-3.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.ap-northeast-2.api.aws" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.ap-northeast-2.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.ap-northeast-2.api.aws" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights.ap-northeast-2.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.ap-northeast-1.api.aws" - } - }, - "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.ap-northeast-1.amazonaws.com" + "url": "https://applicationinsights.af-south-1.amazonaws.com" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "af-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.ap-northeast-1.api.aws" + "url": "https://applicationinsights.ap-east-1.amazonaws.com" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "ap-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -776,541 +35,533 @@ }, "params": { "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.me-south-1.api.aws" + "url": "https://applicationinsights.ap-northeast-2.amazonaws.com" } }, "params": { - "Region": "me-south-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.me-south-1.amazonaws.com" + "url": "https://applicationinsights.ap-northeast-3.amazonaws.com" } }, "params": { - "Region": "me-south-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "ap-northeast-3", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.me-south-1.api.aws" + "url": "https://applicationinsights.ap-south-1.amazonaws.com" } }, "params": { - "Region": "me-south-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "ap-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.me-south-1.amazonaws.com" + "url": "https://applicationinsights.ap-southeast-1.amazonaws.com" } }, "params": { - "Region": "me-south-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.sa-east-1.api.aws" + "url": "https://applicationinsights.ap-southeast-2.amazonaws.com" } }, "params": { - "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.sa-east-1.amazonaws.com" + "url": "https://applicationinsights.ca-central-1.amazonaws.com" } }, "params": { - "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.sa-east-1.api.aws" + "url": "https://applicationinsights.eu-central-1.amazonaws.com" } }, "params": { - "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "eu-central-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.sa-east-1.amazonaws.com" + "url": "https://applicationinsights.eu-north-1.amazonaws.com" } }, "params": { - "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "eu-north-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.ap-east-1.api.aws" + "url": "https://applicationinsights.eu-south-1.amazonaws.com" } }, "params": { - "Region": "ap-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "eu-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.ap-east-1.amazonaws.com" + "url": "https://applicationinsights.eu-west-1.amazonaws.com" } }, "params": { - "Region": "ap-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.ap-east-1.api.aws" + "url": "https://applicationinsights.eu-west-2.amazonaws.com" } }, "params": { - "Region": "ap-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.ap-east-1.amazonaws.com" + "url": "https://applicationinsights.eu-west-3.amazonaws.com" } }, "params": { - "Region": "ap-east-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "eu-west-3", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://applicationinsights.me-south-1.amazonaws.com" } }, "params": { - "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "me-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.cn-north-1.amazonaws.com.cn" + "url": "https://applicationinsights.sa-east-1.amazonaws.com" } }, "params": { - "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "sa-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://applicationinsights.us-east-1.amazonaws.com" } }, "params": { - "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.cn-north-1.amazonaws.com.cn" + "url": "https://applicationinsights.us-east-2.amazonaws.com" } }, "params": { - "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.us-gov-west-1.api.aws" + "url": "https://applicationinsights.us-west-1.amazonaws.com" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.us-gov-west-1.amazonaws.com" + "url": "https://applicationinsights.us-west-2.amazonaws.com" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://applicationinsights.us-gov-west-1.api.aws" + "url": "https://applicationinsights-fips.us-east-1.api.aws" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.us-gov-west-1.amazonaws.com" + "url": "https://applicationinsights-fips.us-east-1.amazonaws.com" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.ap-southeast-1.api.aws" + "url": "https://applicationinsights.us-east-1.api.aws" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.ap-southeast-1.amazonaws.com" + "url": "https://applicationinsights.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.ap-southeast-1.api.aws" + "url": "https://applicationinsights.cn-northwest-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "cn-northwest-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://applicationinsights.ap-southeast-1.amazonaws.com" + "url": "https://applicationinsights-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.ap-southeast-2.api.aws" + "url": "https://applicationinsights-fips.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.ap-southeast-2.amazonaws.com" + "url": "https://applicationinsights.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.ap-southeast-2.api.aws" + "url": "https://applicationinsights.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.ap-southeast-2.amazonaws.com" + "url": "https://applicationinsights.us-gov-west-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-gov-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.us-east-1.api.aws" + "url": "https://applicationinsights-fips.us-gov-east-1.api.aws" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-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://applicationinsights-fips.us-east-1.amazonaws.com" + "url": "https://applicationinsights-fips.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://applicationinsights.us-east-1.api.aws" + "url": "https://applicationinsights.us-gov-east-1.api.aws" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-gov-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 enabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://applicationinsights.us-east-1.amazonaws.com" - } + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.us-east-2.api.aws" + "url": "https://applicationinsights-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.us-east-2.amazonaws.com" - } + "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.us-east-2.api.aws" + "url": "https://applicationinsights.us-iso-east-1.c2s.ic.gov" } }, "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://applicationinsights.us-east-2.amazonaws.com" - } + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights-fips.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://applicationinsights-fips.us-isob-east-1.sc2s.sgov.gov" } }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://applicationinsights-fips.cn-northwest-1.amazonaws.com.cn" - } + "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://applicationinsights.us-isob-east-1.sc2s.sgov.gov" } }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { - "url": "https://applicationinsights.cn-northwest-1.amazonaws.com.cn" + "url": "https://example.com" } }, "params": { - "Region": "cn-northwest-1", + "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": false, - "UseFIPS": false + "Endpoint": "https://example.com" } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1321,8 +572,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1333,10 +584,16 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0" diff --git a/tests/functional/endpoint-rules/cloudformation/endpoint-tests-1.json b/tests/functional/endpoint-rules/cloudformation/endpoint-tests-1.json index dcd0159a38..b20e6d8f1e 100644 --- a/tests/functional/endpoint-rules/cloudformation/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/cloudformation/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "af-south-1", "UseFIPS": false, - "Region": "af-south-1" + "UseDualStack": false } }, { @@ -21,9 +21,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-east-1", "UseFIPS": false, - "Region": "ap-east-1" + "UseDualStack": false } }, { @@ -34,9 +34,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-northeast-1", "UseFIPS": false, - "Region": "ap-northeast-1" + "UseDualStack": false } }, { @@ -47,9 +47,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-northeast-2", "UseFIPS": false, - "Region": "ap-northeast-2" + "UseDualStack": false } }, { @@ -60,9 +60,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-northeast-3", "UseFIPS": false, - "Region": "ap-northeast-3" + "UseDualStack": false } }, { @@ -73,9 +73,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-south-1", "UseFIPS": false, - "Region": "ap-south-1" + "UseDualStack": false } }, { @@ -86,9 +86,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-southeast-1", "UseFIPS": false, - "Region": "ap-southeast-1" + "UseDualStack": false } }, { @@ -99,9 +99,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-southeast-2", "UseFIPS": false, - "Region": "ap-southeast-2" + "UseDualStack": false } }, { @@ -112,9 +112,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-southeast-3", "UseFIPS": false, - "Region": "ap-southeast-3" + "UseDualStack": false } }, { @@ -125,9 +125,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ca-central-1", "UseFIPS": false, - "Region": "ca-central-1" + "UseDualStack": false } }, { @@ -138,9 +138,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "eu-central-1", "UseFIPS": false, - "Region": "eu-central-1" + "UseDualStack": false } }, { @@ -151,9 +151,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "eu-north-1", "UseFIPS": false, - "Region": "eu-north-1" + "UseDualStack": false } }, { @@ -164,9 +164,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "eu-south-1", "UseFIPS": false, - "Region": "eu-south-1" + "UseDualStack": false } }, { @@ -177,9 +177,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "eu-west-1", "UseFIPS": false, - "Region": "eu-west-1" + "UseDualStack": false } }, { @@ -190,9 +190,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "eu-west-2", "UseFIPS": false, - "Region": "eu-west-2" + "UseDualStack": false } }, { @@ -203,9 +203,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "eu-west-3", "UseFIPS": false, - "Region": "eu-west-3" + "UseDualStack": false } }, { @@ -216,9 +216,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "me-south-1", "UseFIPS": false, - "Region": "me-south-1" + "UseDualStack": false } }, { @@ -229,9 +229,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "sa-east-1", "UseFIPS": false, - "Region": "sa-east-1" + "UseDualStack": false } }, { @@ -242,9 +242,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-east-1", "UseFIPS": false, - "Region": "us-east-1" + "UseDualStack": false } }, { @@ -255,9 +255,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-east-1", "UseFIPS": true, - "Region": "us-east-1" + "UseDualStack": false } }, { @@ -268,9 +268,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-east-2", "UseFIPS": false, - "Region": "us-east-2" + "UseDualStack": false } }, { @@ -281,9 +281,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-east-2", "UseFIPS": true, - "Region": "us-east-2" + "UseDualStack": false } }, { @@ -294,9 +294,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-west-1", "UseFIPS": false, - "Region": "us-west-1" + "UseDualStack": false } }, { @@ -307,9 +307,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-west-1", "UseFIPS": true, - "Region": "us-west-1" + "UseDualStack": false } }, { @@ -320,9 +320,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-west-2", "UseFIPS": false, - "Region": "us-west-2" + "UseDualStack": false } }, { @@ -333,9 +333,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-west-2", "UseFIPS": true, - "Region": "us-west-2" + "UseDualStack": false } }, { @@ -346,9 +346,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "us-east-1", "UseFIPS": true, - "Region": "us-east-1" + "UseDualStack": true } }, { @@ -359,9 +359,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "us-east-1", "UseFIPS": false, - "Region": "us-east-1" + "UseDualStack": true } }, { @@ -372,9 +372,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "cn-north-1", "UseFIPS": false, - "Region": "cn-north-1" + "UseDualStack": false } }, { @@ -385,9 +385,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "cn-northwest-1", "UseFIPS": false, - "Region": "cn-northwest-1" + "UseDualStack": false } }, { @@ -398,9 +398,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "cn-north-1", "UseFIPS": true, - "Region": "cn-north-1" + "UseDualStack": true } }, { @@ -411,9 +411,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "cn-north-1", "UseFIPS": true, - "Region": "cn-north-1" + "UseDualStack": false } }, { @@ -424,9 +424,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "cn-north-1", "UseFIPS": false, - "Region": "cn-north-1" + "UseDualStack": true } }, { @@ -437,9 +437,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-gov-east-1", "UseFIPS": false, - "Region": "us-gov-east-1" + "UseDualStack": false } }, { @@ -450,9 +450,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-gov-east-1", "UseFIPS": true, - "Region": "us-gov-east-1" + "UseDualStack": false } }, { @@ -463,9 +463,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-gov-west-1", "UseFIPS": false, - "Region": "us-gov-west-1" + "UseDualStack": false } }, { @@ -476,9 +476,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-gov-west-1", "UseFIPS": true, - "Region": "us-gov-west-1" + "UseDualStack": false } }, { @@ -489,9 +489,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "us-gov-east-1", "UseFIPS": true, - "Region": "us-gov-east-1" + "UseDualStack": true } }, { @@ -502,9 +502,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "us-gov-east-1", "UseFIPS": false, - "Region": "us-gov-east-1" + "UseDualStack": true } }, { @@ -515,9 +515,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-iso-east-1", "UseFIPS": false, - "Region": "us-iso-east-1" + "UseDualStack": false } }, { @@ -528,9 +528,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-iso-west-1", "UseFIPS": false, - "Region": "us-iso-west-1" + "UseDualStack": false } }, { @@ -539,9 +539,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseDualStack": true, + "Region": "us-iso-east-1", "UseFIPS": true, - "Region": "us-iso-east-1" + "UseDualStack": true } }, { @@ -552,9 +552,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-iso-east-1", "UseFIPS": true, - "Region": "us-iso-east-1" + "UseDualStack": false } }, { @@ -563,9 +563,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseDualStack": true, + "Region": "us-iso-east-1", "UseFIPS": false, - "Region": "us-iso-east-1" + "UseDualStack": true } }, { @@ -576,9 +576,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-isob-east-1", "UseFIPS": false, - "Region": "us-isob-east-1" + "UseDualStack": false } }, { @@ -587,9 +587,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, - "Region": "us-isob-east-1" + "UseDualStack": true } }, { @@ -600,9 +600,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-isob-east-1", "UseFIPS": true, - "Region": "us-isob-east-1" + "UseDualStack": false } }, { @@ -611,9 +611,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseDualStack": true, + "Region": "us-isob-east-1", "UseFIPS": false, - "Region": "us-isob-east-1" + "UseDualStack": true } }, { @@ -624,9 +624,9 @@ } }, "params": { - "UseDualStack": false, - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -638,8 +638,8 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -649,9 +649,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseDualStack": false, - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -661,9 +661,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseDualStack": true, - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } }, diff --git a/tests/functional/endpoint-rules/cloudfront/endpoint-tests-1.json b/tests/functional/endpoint-rules/cloudfront/endpoint-tests-1.json index 736cf87722..0f37f3195b 100644 --- a/tests/functional/endpoint-rules/cloudfront/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/cloudfront/endpoint-tests-1.json @@ -18,8 +18,8 @@ }, "params": { "Region": "aws-global", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -40,8 +40,8 @@ }, "params": { "Region": "aws-global", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -53,8 +53,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -75,8 +75,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -88,8 +88,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -110,8 +110,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -132,8 +132,8 @@ }, "params": { "Region": "aws-cn-global", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -145,8 +145,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -158,8 +158,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -171,8 +171,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -193,8 +193,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -206,8 +206,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -219,8 +219,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -232,8 +232,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -245,8 +245,19 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { @@ -258,8 +269,19 @@ }, "params": { "Region": "us-iso-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { @@ -271,8 +293,19 @@ }, "params": { "Region": "us-iso-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { @@ -284,8 +317,19 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { @@ -297,8 +341,8 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -310,8 +354,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -323,8 +367,8 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -335,8 +379,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -347,10 +391,16 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0"