Deletes a trail. This operation must be called from the region in which the trail was created. DeleteTrail cannot be called on the shadow trails (replicated trails in other regions) of a trail that is enabled in all regions.
Returns metadata about a query, including query run time in milliseconds, number of events scanned and matched, and query status. You must specify an ARN for EventDataStore, and a value for QueryID.
Retrieves settings for one or more trails associated with the current region for your account.
", + "GetChannel": "Returns the specified CloudTrail service-linked channel. Amazon Web Services services create service-linked channels to view CloudTrail events.
", "GetEventDataStore": "Returns information about an event data store specified as either an ARN or the ID portion of the ARN.
", "GetEventSelectors": "Describes the settings for the event selectors that you configured for your trail. The information returned for your event selectors includes the following:
If your event selector includes read-only events, write-only events, or all events. This applies to both management events and data events.
If your event selector includes management events.
If your event selector includes data events, the resources on which you are logging data events.
For more information, see Logging Data and Management Events for Trails in the CloudTrail User Guide.
", "GetInsightSelectors": "Describes the settings for the Insights event selectors that you configured for your trail. GetInsightSelectors shows if CloudTrail Insights event logging is enabled on the trail, and if it is, which insight types are enabled. If you run GetInsightSelectors on a trail that does not have Insights events enabled, the operation throws the exception InsightNotEnabledException
For more information, see Logging CloudTrail Insights Events for Trails in the CloudTrail User Guide.
", "GetQueryResults": "Gets event data results of a query. You must specify the QueryID value returned by the StartQuery operation, and an ARN for EventDataStore.
Returns settings information for a specified trail.
", "GetTrailStatus": "Returns a JSON-formatted list of information about the specified trail. Fields include information on delivery errors, Amazon SNS and Amazon S3 errors, and start and stop logging times for each trail. This operation returns trail status from a single region. To return trail status from all regions, you must call the operation on each region.
", + "ListChannels": "Returns all CloudTrail channels.
", "ListEventDataStores": "Returns information about all event data stores in the account, in the current region.
", "ListPublicKeys": "Returns all public keys whose private keys were used to sign the digest files within the specified time range. The public key is needed to validate digest files that were signed with its corresponding private key.
CloudTrail uses different private and public key pairs per region. Each digest file is signed with a private key unique to its region. When you validate a digest file from a specific region, you must look in the same region for its corresponding public key.
Returns a list of queries and query statuses for the past seven days. You must specify an ARN value for EventDataStore. Optionally, to shorten the list of results, you can specify a time range, formatted as timestamps, by adding StartTime and EndTime parameters, and a QueryStatus value. Valid values for QueryStatus include QUEUED, RUNNING, FINISHED, FAILED, TIMED_OUT, or CANCELLED.
Starts the recording of Amazon Web Services API calls and log file delivery for a trail. For a trail that is enabled in all regions, this operation must be called from the region in which the trail was created. This operation cannot be called on the shadow trails (replicated trails in other regions) of a trail that is enabled in all regions.
", "StartQuery": "Starts a CloudTrail Lake query. The required QueryStatement parameter provides your SQL query, enclosed in single quotation marks.
Suspends the recording of Amazon Web Services API calls and log file delivery for the specified trail. Under most circumstances, there is no need to use this action. You can update a trail without stopping it first. This action is the only way to stop recording. For a trail enabled in all regions, this operation must be called from the region in which the trail was created, or an InvalidHomeRegionException will occur. This operation cannot be called on the shadow trails (replicated trails in other regions) of a trail enabled in all regions.
Updates an event data store. The required EventDataStore value is an ARN or the ID portion of the ARN. Other parameters are optional, but at least one optional parameter must be specified, or CloudTrail throws an error. RetentionPeriod is in days, and valid values are integers between 90 and 2555. By default, TerminationProtection is enabled. AdvancedEventSelectors includes or excludes management and data events in your event data store; for more information about AdvancedEventSelectors, see PutEventSelectorsRequest$AdvancedEventSelectors.
Updates an event data store. The required EventDataStore value is an ARN or the ID portion of the ARN. Other parameters are optional, but at least one optional parameter must be specified, or CloudTrail throws an error. RetentionPeriod is in days, and valid values are integers between 90 and 2557. By default, TerminationProtection is enabled. AdvancedEventSelectors includes or excludes management and data events in your event data store; for more information about AdvancedEventSelectors, see PutEventSelectorsRequest$AdvancedEventSelectors.
Updates trail settings that control what events you are logging, and how to handle log files. Changes to a trail do not require stopping the CloudTrail service. Use this action to designate an existing bucket for log delivery. If the existing bucket has previously been a target for CloudTrail log files, an IAM policy exists for the bucket. UpdateTrail must be called from the region in which the trail was created; otherwise, an InvalidHomeRegionException is thrown.
Specifies the settings for advanced event selectors. You can add advanced event selectors, and conditions for your advanced event selectors, up to a maximum of 500 values for all conditions and selectors on a trail. You can use either AdvancedEventSelectors or EventSelectors, but not both. If you apply AdvancedEventSelectors to a trail, any existing EventSelectors are overwritten. For more information about advanced event selectors, see Logging data events for trails in the CloudTrail User Guide.
Specifies the advanced event selectors configured for your trail.
", "RestoreEventDataStoreResponse$AdvancedEventSelectors": "The advanced event selectors that were used to select events.
", + "SourceConfig$AdvancedEventSelectors": "The advanced event selectors configured for the service-linked channel.
", "UpdateEventDataStoreRequest$AdvancedEventSelectors": "The advanced event selectors used to select events for the event data store.
", "UpdateEventDataStoreResponse$AdvancedEventSelectors": "The advanced event selectors that are applied to the event data store.
" } @@ -100,6 +103,7 @@ "GetTrailStatusResponse$IsLogging": "Whether the CloudTrail trail is currently logging Amazon Web Services API calls.
", "RestoreEventDataStoreResponse$MultiRegionEnabled": "Indicates whether the event data store is collecting events from all regions, or only from the region in which the event data store was created.
", "RestoreEventDataStoreResponse$OrganizationEnabled": "Indicates whether an event data store is collecting logged events for an organization in Organizations.
", + "SourceConfig$ApplyToAllRegions": "Specifies whether the service-linked channel applies to one region or all regions.
", "Trail$IncludeGlobalServiceEvents": "Set to True to include Amazon Web Services API calls from Amazon Web Services global services such as IAM. Otherwise, False.
", "Trail$IsMultiRegionTrail": "Specifies whether the trail exists only in one region or exists in all regions.
", "Trail$LogFileValidationEnabled": "Specifies whether log file validation is enabled.
", @@ -136,6 +140,43 @@ "refs": { } }, + "Channel": { + "base": "Contains information about a returned CloudTrail channel.
", + "refs": { + "Channels$member": null + } + }, + "ChannelARNInvalidException": { + "base": "The specified channel ARN is not valid or does not map to a channel in your account.
", + "refs": { + } + }, + "ChannelArn": { + "base": null, + "refs": { + "Channel$ChannelArn": "The Amazon Resource Name (ARN) of the channel.
", + "GetChannelRequest$Channel": "The Amazon Resource Name (ARN) of the CloudTrail service-linked channel.
", + "GetChannelResponse$ChannelArn": "The ARN of the CloudTrail service-linked channel.
" + } + }, + "ChannelName": { + "base": null, + "refs": { + "Channel$Name": " The name of the CloudTrail channel. For service-linked channels, the name is aws-service-channel/service-name/custom-suffix where service-name represents the name of the Amazon Web Services service that created the channel and custom-suffix represents the suffix created by the Amazon Web Services service.
The name of the CloudTrail service-linked channel. For service-linked channels, the value is aws-service-channel/service-name/custom-suffix where service-name represents the name of the Amazon Web Services service that created the channel and custom-suffix represents the suffix generated by the Amazon Web Services service.
The specified channel was not found.
", + "refs": { + } + }, + "Channels": { + "base": null, + "refs": { + "ListChannelsResponse$Channels": "The list of CloudTrail channels.
" + } + }, "CloudTrailARNInvalidException": { "base": "This exception is thrown when an operation is called with a trail ARN that is not valid. The following is the format of a trail ARN.
arn:aws:cloudtrail:us-east-2:123456789012:trail/MyTrail
Contains information about the service where CloudTrail delivers events.
", + "refs": { + "Destinations$member": null + } + }, + "DestinationType": { + "base": null, + "refs": { + "Destination$Type": " The type of service. For service-linked channels, the value is AWS_SERVICE.
The Amazon Web Services service that created the CloudTrail service-linked channel.
" + } + }, "ErrorMessage": { "base": null, "refs": { @@ -291,7 +350,7 @@ } }, "EventDataStore": { - "base": "A storage lake of event data against which you can run complex SQL-based queries. An event data store can include events that you have logged on your account from the last 90 to 2555 days (about three months to up to seven years). To select events for an event data store, use advanced event selectors.
", + "base": "A storage lake of event data against which you can run complex SQL-based queries. An event data store can include events that you have logged on your account from the last 90 to 2557 days (about three months to up to seven years). To select events for an event data store, use advanced event selectors.
", "refs": { "EventDataStores$member": null } @@ -393,6 +452,16 @@ "EventSelector$ExcludeManagementEventSources": "An optional list of service event sources from which you do not want management events to be logged on your trail. In this release, the list can be empty (disables the filter), or it can filter out Key Management Service or Amazon RDS Data API events by containing kms.amazonaws.com or rdsdata.amazonaws.com. By default, ExcludeManagementEventSources is empty, and KMS and Amazon RDS Data API events are logged to your trail. You can exclude management event sources only in regions that support the event source.
The maximum number of CloudTrail channels to display on a single page.
" + } + }, + "ListChannelsRequest": { + "base": null, + "refs": { + } + }, + "ListChannelsResponse": { + "base": null, + "refs": { + } + }, "ListEventDataStoresMaxResultsCount": { "base": null, "refs": { @@ -708,6 +793,12 @@ "refs": { } }, + "Location": { + "base": null, + "refs": { + "Destination$Location": "The location of the service. For service-linked channels, this is the name of the Amazon Web Services service.
" + } + }, "Long": { "base": null, "refs": { @@ -770,7 +861,7 @@ "NextToken": { "base": null, "refs": { - "LookupEventsRequest$NextToken": "The token to use to get the next page of results after a previous API call. This token must be passed in with the same parameters that were specified in the the original call. For example, if the original call specified an AttributeKey of 'Username' with a value of 'root', the call with NextToken should include those same parameters.
", + "LookupEventsRequest$NextToken": "The token to use to get the next page of results after a previous API call. This token must be passed in with the same parameters that were specified in the original call. For example, if the original call specified an AttributeKey of 'Username' with a value of 'root', the call with NextToken should include those same parameters.
", "LookupEventsResponse$NextToken": "The token to use to get the next page of results after a previous API call. If the token does not appear, there are no more results to return. The token must be passed in with the same parameters as the previous call. For example, if the original call specified an AttributeKey of 'Username' with a value of 'root', the call with NextToken should include those same parameters.
" } }, @@ -816,6 +907,8 @@ "refs": { "GetQueryResultsRequest$NextToken": "A token you can use to get the next page of query results.
", "GetQueryResultsResponse$NextToken": "A token you can use to get the next page of query results.
", + "ListChannelsRequest$NextToken": "A token you can use to get the next page of results.
", + "ListChannelsResponse$NextToken": "A token used to get the next page of results.
", "ListEventDataStoresRequest$NextToken": "A token you can use to get the next page of event data store results.
", "ListEventDataStoresResponse$NextToken": "A token you can use to get the next page of results.
", "ListQueriesRequest$NextToken": "A token you can use to get the next page of results.
", @@ -999,7 +1092,7 @@ "RetentionPeriod": { "base": null, "refs": { - "CreateEventDataStoreRequest$RetentionPeriod": "The retention period of the event data store, in days. You can set a retention period of up to 2555 days, the equivalent of seven years.
", + "CreateEventDataStoreRequest$RetentionPeriod": "The retention period of the event data store, in days. You can set a retention period of up to 2557 days, the equivalent of seven years.
", "CreateEventDataStoreResponse$RetentionPeriod": "The retention period of an event data store, in days.
", "EventDataStore$RetentionPeriod": "This field is being deprecated. The retention period, in days.
", "GetEventDataStoreResponse$RetentionPeriod": "The retention period of the event data store, in days.
", @@ -1016,7 +1109,7 @@ "SelectorField": { "base": null, "refs": { - "AdvancedFieldSelector$Field": " A field in an event record on which to filter events to be logged. Supported fields include readOnly, eventCategory, eventSource (for management events), eventName, resources.type, and resources.ARN.
readOnly - Optional. Can be set to Equals a value of true or false. If you do not add this field, CloudTrail logs both both read and write events. A value of true logs only read events. A value of false logs only write events.
eventSource - For filtering management events only. This can be set only to NotEquals kms.amazonaws.com.
eventName - Can use any operator. You can use it to filter in or filter out any data event logged to CloudTrail, such as PutBucket or GetSnapshotBlock. You can have multiple values for this field, separated by commas.
eventCategory - This is required. It must be set to Equals, and the value must be Management or Data.
resources.type - This field is required. resources.type can only use the Equals operator, and the value can be one of the following:
AWS::S3::Object
AWS::Lambda::Function
AWS::DynamoDB::Table
AWS::S3Outposts::Object
AWS::ManagedBlockchain::Node
AWS::S3ObjectLambda::AccessPoint
AWS::EC2::Snapshot
AWS::S3::AccessPoint
AWS::DynamoDB::Stream
AWS::Glue::Table
You can have only one resources.type field per selector. To log data events on more than one resource type, add another selector.
resources.ARN - You can use any operator with resources.ARN, but if you use Equals or NotEquals, the value must exactly match the ARN of a valid resource of the type you've specified in the template as the value of resources.type. For example, if resources.type equals AWS::S3::Object, the ARN must be in one of the following formats. To log all data events for all objects in a specific S3 bucket, use the StartsWith operator, and include only the bucket ARN as the matching value.
The trailing slash is intentional; do not exclude it. Replace the text between less than and greater than symbols (<>) with resource-specific information.
arn:<partition>:s3:::<bucket_name>/
arn:<partition>:s3:::<bucket_name>/<object_path>/
When resources.type equals AWS::S3::AccessPoint, and the operator is set to Equals or NotEquals, the ARN must be in one of the following formats. To log events on all objects in an S3 access point, we recommend that you use only the access point ARN, don’t include the object path, and use the StartsWith or NotStartsWith operators.
arn:<partition>:s3:<region>:<account_ID>:accesspoint/<access_point_name>
arn:<partition>:s3:<region>:<account_ID>:accesspoint/<access_point_name>/object/<object_path>
When resources.type equals AWS::Lambda::Function, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:lambda:<region>:<account_ID>:function:<function_name>
When resources.type equals AWS::DynamoDB::Table, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:dynamodb:<region>:<account_ID>:table/<table_name>
When resources.type equals AWS::S3Outposts::Object, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:s3-outposts:<region>:<account_ID>:<object_path>
When resources.type equals AWS::ManagedBlockchain::Node, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:managedblockchain:<region>:<account_ID>:nodes/<node_ID>
When resources.type equals AWS::S3ObjectLambda::AccessPoint, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:s3-object-lambda:<region>:<account_ID>:accesspoint/<access_point_name>
When resources.type equals AWS::EC2::Snapshot, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:ec2:<region>::snapshot/<snapshot_ID>
When resources.type equals AWS::DynamoDB::Stream, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:dynamodb:<region>:<account_ID>:table/<table_name>/stream/<date_time>
When resources.type equals AWS::Glue::Table, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:glue:<region>:<account_ID>:table/<database_name>/<table_name>
A field in an event record on which to filter events to be logged. Supported fields include readOnly, eventCategory, eventSource (for management events), eventName, resources.type, and resources.ARN.
readOnly - Optional. Can be set to Equals a value of true or false. If you do not add this field, CloudTrail logs both read and write events. A value of true logs only read events. A value of false logs only write events.
eventSource - For filtering management events only. This can be set only to NotEquals kms.amazonaws.com.
eventName - Can use any operator. You can use it to filter in or filter out any data event logged to CloudTrail, such as PutBucket or GetSnapshotBlock. You can have multiple values for this field, separated by commas.
eventCategory - This is required. It must be set to Equals, and the value must be Management or Data.
resources.type - This field is required. resources.type can only use the Equals operator, and the value can be one of the following:
AWS::S3::Object
AWS::Lambda::Function
AWS::DynamoDB::Table
AWS::S3Outposts::Object
AWS::ManagedBlockchain::Node
AWS::S3ObjectLambda::AccessPoint
AWS::EC2::Snapshot
AWS::S3::AccessPoint
AWS::DynamoDB::Stream
AWS::Glue::Table
You can have only one resources.type field per selector. To log data events on more than one resource type, add another selector.
resources.ARN - You can use any operator with resources.ARN, but if you use Equals or NotEquals, the value must exactly match the ARN of a valid resource of the type you've specified in the template as the value of resources.type. For example, if resources.type equals AWS::S3::Object, the ARN must be in one of the following formats. To log all data events for all objects in a specific S3 bucket, use the StartsWith operator, and include only the bucket ARN as the matching value.
The trailing slash is intentional; do not exclude it. Replace the text between less than and greater than symbols (<>) with resource-specific information.
arn:<partition>:s3:::<bucket_name>/
arn:<partition>:s3:::<bucket_name>/<object_path>/
When resources.type equals AWS::S3::AccessPoint, and the operator is set to Equals or NotEquals, the ARN must be in one of the following formats. To log events on all objects in an S3 access point, we recommend that you use only the access point ARN, don’t include the object path, and use the StartsWith or NotStartsWith operators.
arn:<partition>:s3:<region>:<account_ID>:accesspoint/<access_point_name>
arn:<partition>:s3:<region>:<account_ID>:accesspoint/<access_point_name>/object/<object_path>
When resources.type equals AWS::Lambda::Function, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:lambda:<region>:<account_ID>:function:<function_name>
When resources.type equals AWS::DynamoDB::Table, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:dynamodb:<region>:<account_ID>:table/<table_name>
When resources.type equals AWS::S3Outposts::Object, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:s3-outposts:<region>:<account_ID>:<object_path>
When resources.type equals AWS::ManagedBlockchain::Node, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:managedblockchain:<region>:<account_ID>:nodes/<node_ID>
When resources.type equals AWS::S3ObjectLambda::AccessPoint, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:s3-object-lambda:<region>:<account_ID>:accesspoint/<access_point_name>
When resources.type equals AWS::EC2::Snapshot, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:ec2:<region>::snapshot/<snapshot_ID>
When resources.type equals AWS::DynamoDB::Stream, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:dynamodb:<region>:<account_ID>:table/<table_name>/stream/<date_time>
When resources.type equals AWS::Glue::Table, and the operator is set to Equals or NotEquals, the ARN must be in the following format:
arn:<partition>:glue:<region>:<account_ID>:table/<database_name>/<table_name>
An optional, descriptive name for an advanced event selector, such as \"Log data events for only two S3 buckets\".
" } }, + "Source": { + "base": null, + "refs": { + "GetChannelResponse$Source": "The trail or event data store for the CloudTrail service-linked channel.
" + } + }, + "SourceConfig": { + "base": "Contains configuration information about the service-linked channel.
", + "refs": { + "GetChannelResponse$SourceConfig": "Provides information about the advanced event selectors configured for the service-linked channel, and whether the service-linked channel applies to all regions or one region.
" + } + }, "StartLoggingRequest": { "base": "The request to CloudTrail to start logging Amazon Web Services API calls for an account.
", "refs": { @@ -1106,7 +1211,7 @@ "ListPublicKeysResponse$NextToken": "Reserved for future use.
", "ListTagsRequest$NextToken": "Reserved for future use.
", "ListTagsResponse$NextToken": "Reserved for future use.
", - "ListTrailsRequest$NextToken": "The token to use to get the next page of results after a previous API call. This token must be passed in with the same parameters that were specified in the the original call. For example, if the original call specified an AttributeKey of 'Username' with a value of 'root', the call with NextToken should include those same parameters.
", + "ListTrailsRequest$NextToken": "The token to use to get the next page of results after a previous API call. This token must be passed in with the same parameters that were specified in the original call. For example, if the original call specified an AttributeKey of 'Username' with a value of 'root', the call with NextToken should include those same parameters.
", "ListTrailsResponse$NextToken": "The token to use to get the next page of results after a previous API call. If the token does not appear, there are no more results to return. The token must be passed in with the same parameters as the previous call. For example, if the original call specified an AttributeKey of 'Username' with a value of 'root', the call with NextToken should include those same parameters.
", "LookupAttribute$AttributeValue": "Specifies a value for the specified AttributeKey.
", "PublicKey$Fingerprint": "The fingerprint of the public key.
", diff --git a/models/apis/cloudtrail/2013-11-01/paginators-1.json b/models/apis/cloudtrail/2013-11-01/paginators-1.json index e0bceb2e403..0d8bec0bb21 100644 --- a/models/apis/cloudtrail/2013-11-01/paginators-1.json +++ b/models/apis/cloudtrail/2013-11-01/paginators-1.json @@ -7,6 +7,11 @@ "input_token": "NextToken", "output_token": "NextToken" }, + "ListChannels": { + "input_token": "NextToken", + "limit_key": "MaxResults", + "output_token": "NextToken" + }, "ListEventDataStores": { "input_token": "NextToken", "limit_key": "MaxResults", diff --git a/models/apis/models.lex.v2/2020-08-07/api-2.json b/models/apis/models.lex.v2/2020-08-07/api-2.json index 84743741093..8e92a93b76b 100644 --- a/models/apis/models.lex.v2/2020-08-07/api-2.json +++ b/models/apis/models.lex.v2/2020-08-07/api-2.json @@ -1837,6 +1837,12 @@ "lambdaCodeHook":{"shape":"LambdaCodeHook"} } }, + "CompositeSlotTypeSetting":{ + "type":"structure", + "members":{ + "subSlots":{"shape":"SubSlotTypeList"} + } + }, "Condition":{ "type":"structure", "required":["expressionString"], @@ -2251,7 +2257,8 @@ "location":"uri", "locationName":"intentId" }, - "multipleValuesSetting":{"shape":"MultipleValuesSetting"} + "multipleValuesSetting":{"shape":"MultipleValuesSetting"}, + "subSlotSetting":{"shape":"SubSlotSetting"} } }, "CreateSlotResponse":{ @@ -2268,7 +2275,8 @@ "localeId":{"shape":"LocaleId"}, "intentId":{"shape":"Id"}, "creationDateTime":{"shape":"Timestamp"}, - "multipleValuesSetting":{"shape":"MultipleValuesSetting"} + "multipleValuesSetting":{"shape":"MultipleValuesSetting"}, + "subSlotSetting":{"shape":"SubSlotSetting"} } }, "CreateSlotTypeRequest":{ @@ -2300,7 +2308,8 @@ "location":"uri", "locationName":"localeId" }, - "externalSourceSetting":{"shape":"ExternalSourceSetting"} + "externalSourceSetting":{"shape":"ExternalSourceSetting"}, + "compositeSlotTypeSetting":{"shape":"CompositeSlotTypeSetting"} } }, "CreateSlotTypeResponse":{ @@ -2316,7 +2325,8 @@ "botVersion":{"shape":"DraftBotVersion"}, "localeId":{"shape":"LocaleId"}, "creationDateTime":{"shape":"Timestamp"}, - "externalSourceSetting":{"shape":"ExternalSourceSetting"} + "externalSourceSetting":{"shape":"ExternalSourceSetting"}, + "compositeSlotTypeSetting":{"shape":"CompositeSlotTypeSetting"} } }, "CreateUploadUrlRequest":{ @@ -3178,7 +3188,8 @@ "intentId":{"shape":"Id"}, "creationDateTime":{"shape":"Timestamp"}, "lastUpdatedDateTime":{"shape":"Timestamp"}, - "multipleValuesSetting":{"shape":"MultipleValuesSetting"} + "multipleValuesSetting":{"shape":"MultipleValuesSetting"}, + "subSlotSetting":{"shape":"SubSlotSetting"} } }, "DescribeSlotTypeRequest":{ @@ -3226,7 +3237,8 @@ "localeId":{"shape":"LocaleId"}, "creationDateTime":{"shape":"Timestamp"}, "lastUpdatedDateTime":{"shape":"Timestamp"}, - "externalSourceSetting":{"shape":"ExternalSourceSetting"} + "externalSourceSetting":{"shape":"ExternalSourceSetting"}, + "compositeSlotTypeSetting":{"shape":"CompositeSlotTypeSetting"} } }, "Description":{ @@ -4852,7 +4864,8 @@ "enum":[ "Custom", "Extended", - "ExternalGrammar" + "ExternalGrammar", + "Composite" ] }, "SlotTypeFilter":{ @@ -4983,7 +4996,8 @@ "type":"string", "enum":[ "OriginalValue", - "TopResolution" + "TopResolution", + "Concatenation" ] }, "SlotValueSelectionSetting":{ @@ -5006,6 +5020,17 @@ "Descending" ] }, + "Specifications":{ + "type":"structure", + "required":[ + "slotTypeId", + "valueElicitationSetting" + ], + "members":{ + "slotTypeId":{"shape":"BuiltInOrCustomSlotTypeId"}, + "valueElicitationSetting":{"shape":"SubSlotValueElicitationSetting"} + } + }, "StartBotRecommendationRequest":{ "type":"structure", "required":[ @@ -5142,6 +5167,53 @@ "key":{"shape":"NonEmptyString"}, "value":{"shape":"String"} }, + "SubSlotExpression":{ + "type":"string", + "max":640, + "min":0, + "pattern":"[0-9A-Za-z_\\s\\(\\)]+" + }, + "SubSlotSetting":{ + "type":"structure", + "members":{ + "expression":{"shape":"SubSlotExpression"}, + "slotSpecifications":{"shape":"SubSlotSpecificationMap"} + } + }, + "SubSlotSpecificationMap":{ + "type":"map", + "key":{"shape":"Name"}, + "value":{"shape":"Specifications"}, + "max":6, + "min":0 + }, + "SubSlotTypeComposition":{ + "type":"structure", + "required":[ + "name", + "slotTypeId" + ], + "members":{ + "name":{"shape":"Name"}, + "slotTypeId":{"shape":"BuiltInOrCustomSlotTypeId"} + } + }, + "SubSlotTypeList":{ + "type":"list", + "member":{"shape":"SubSlotTypeComposition"}, + "max":6, + "min":0 + }, + "SubSlotValueElicitationSetting":{ + "type":"structure", + "required":["promptSpecification"], + "members":{ + "defaultValueSpecification":{"shape":"SlotDefaultValueSpecification"}, + "promptSpecification":{"shape":"PromptSpecification"}, + "sampleUtterances":{"shape":"SampleUtterancesList"}, + "waitAndContinueSpecification":{"shape":"WaitAndContinueSpecification"} + } + }, "SynonymList":{ "type":"list", "member":{"shape":"SampleValue"}, @@ -5620,7 +5692,8 @@ "location":"uri", "locationName":"intentId" }, - "multipleValuesSetting":{"shape":"MultipleValuesSetting"} + "multipleValuesSetting":{"shape":"MultipleValuesSetting"}, + "subSlotSetting":{"shape":"SubSlotSetting"} } }, "UpdateSlotResponse":{ @@ -5638,7 +5711,8 @@ "intentId":{"shape":"Id"}, "creationDateTime":{"shape":"Timestamp"}, "lastUpdatedDateTime":{"shape":"Timestamp"}, - "multipleValuesSetting":{"shape":"MultipleValuesSetting"} + "multipleValuesSetting":{"shape":"MultipleValuesSetting"}, + "subSlotSetting":{"shape":"SubSlotSetting"} } }, "UpdateSlotTypeRequest":{ @@ -5676,7 +5750,8 @@ "location":"uri", "locationName":"localeId" }, - "externalSourceSetting":{"shape":"ExternalSourceSetting"} + "externalSourceSetting":{"shape":"ExternalSourceSetting"}, + "compositeSlotTypeSetting":{"shape":"CompositeSlotTypeSetting"} } }, "UpdateSlotTypeResponse":{ @@ -5693,7 +5768,8 @@ "localeId":{"shape":"LocaleId"}, "creationDateTime":{"shape":"Timestamp"}, "lastUpdatedDateTime":{"shape":"Timestamp"}, - "externalSourceSetting":{"shape":"ExternalSourceSetting"} + "externalSourceSetting":{"shape":"ExternalSourceSetting"}, + "compositeSlotTypeSetting":{"shape":"CompositeSlotTypeSetting"} } }, "Utterance":{"type":"string"}, diff --git a/models/apis/models.lex.v2/2020-08-07/docs-2.json b/models/apis/models.lex.v2/2020-08-07/docs-2.json index 07e2f222bf8..8e563207138 100644 --- a/models/apis/models.lex.v2/2020-08-07/docs-2.json +++ b/models/apis/models.lex.v2/2020-08-07/docs-2.json @@ -624,6 +624,8 @@ "CreateSlotResponse$slotTypeId": "The unique identifier of the slot type associated with this slot.
", "DescribeSlotResponse$slotTypeId": "The identifier of the slot type that determines the values entered into the slot.
", "SlotSummary$slotTypeId": "The unique identifier for the slot type that defines the values for the slot.
", + "Specifications$slotTypeId": "The unique identifier assigned to the slot type.
", + "SubSlotTypeComposition$slotTypeId": "The unique identifier assigned to a slot type. This refers to either a built-in slot type or the unique slotTypeId of a custom slot type.
", "UpdateSlotRequest$slotTypeId": "The unique identifier of the new slot type to associate with this slot.
", "UpdateSlotResponse$slotTypeId": "The updated identifier of the slot type that provides values for the slot.
" } @@ -713,6 +715,16 @@ "BotAliasLocaleSettings$codeHookSpecification": "Specifies the Lambda function that should be used in the locale.
" } }, + "CompositeSlotTypeSetting": { + "base": "A composite slot is a combination of two or more slots that capture multiple pieces of information in a single user input.
", + "refs": { + "CreateSlotTypeRequest$compositeSlotTypeSetting": "Specifications for a composite slot type.
", + "CreateSlotTypeResponse$compositeSlotTypeSetting": "Specifications for a composite slot type.
", + "DescribeSlotTypeResponse$compositeSlotTypeSetting": "Specifications for a composite slot type.
", + "UpdateSlotTypeRequest$compositeSlotTypeSetting": "Specifications for a composite slot type.
", + "UpdateSlotTypeResponse$compositeSlotTypeSetting": "Specifications for a composite slot type.
" + } + }, "Condition": { "base": "Provides an expression that evaluates to true or false.
", "refs": { @@ -2386,6 +2398,8 @@ "SlotSummary$slotName": "The name given to the slot.
", "SlotTypeSummary$slotTypeName": "The name of the slot type.
", "SlotValueOverrideMap$key": null, + "SubSlotSpecificationMap$key": null, + "SubSlotTypeComposition$name": "Name of a constituent sub slot inside a composite slot.
", "UpdateBotAliasRequest$botAliasName": "The new name to assign to the bot alias.
", "UpdateBotAliasResponse$botAliasName": "The updated name of the bot alias.
", "UpdateBotRequest$botName": "The new name of the bot. The name must be unique in the account that creates the bot.
", @@ -2602,7 +2616,8 @@ "refs": { "IntentConfirmationSetting$promptSpecification": "Prompts the user to confirm the intent. This question should have a yes or no answer.
Amazon Lex uses this prompt to ensure that the user acknowledges that the intent is ready for fulfillment. For example, with the OrderPizza intent, you might want to confirm that the order is correct before placing it. For other intents, such as intents that simply respond to user questions, you might not need to ask the user for confirmation before providing the information.
Prompts that are sent to the user to elicit a value for the slot.
", - "SlotValueElicitationSetting$promptSpecification": "The prompt that Amazon Lex uses to elicit the slot value from the user.
" + "SlotValueElicitationSetting$promptSpecification": "The prompt that Amazon Lex uses to elicit the slot value from the user.
", + "SubSlotValueElicitationSetting$promptSpecification": null } }, "QueryFilterString": { @@ -2777,6 +2792,7 @@ "CreateIntentResponse$sampleUtterances": "The sample utterances specified for the intent.
", "DescribeIntentResponse$sampleUtterances": "User utterances that trigger this intent.
", "SlotValueElicitationSetting$sampleUtterances": "If you know a specific pattern that users might respond to an Amazon Lex request for a slot value, you can provide those utterances to improve accuracy. This is optional. In most cases, Amazon Lex is capable of understanding user utterances.
", + "SubSlotValueElicitationSetting$sampleUtterances": "If you know a specific pattern that users might respond to an Amazon Lex request for a sub slot value, you can provide those utterances to improve accuracy. This is optional. In most cases Amazon Lex is capable of understanding user utterances. This is similar to SampleUtterances for slots.
New utterances used to invoke the intent.
", "UpdateIntentResponse$sampleUtterances": "The updated list of sample utterances for the intent.
" } @@ -2880,7 +2896,8 @@ "SlotDefaultValueSpecification": { "base": "Defines a list of values that Amazon Lex should use as the default value for a slot.
", "refs": { - "SlotValueElicitationSetting$defaultValueSpecification": "A list of default values for a slot. Default values are used when Amazon Lex hasn't determined a value for a slot. You can specify default values from context variables, session attributes, and defined values.
" + "SlotValueElicitationSetting$defaultValueSpecification": "A list of default values for a slot. Default values are used when Amazon Lex hasn't determined a value for a slot. You can specify default values from context variables, session attributes, and defined values.
", + "SubSlotValueElicitationSetting$defaultValueSpecification": null } }, "SlotDefaultValueString": { @@ -3052,7 +3069,7 @@ } }, "SlotValueElicitationSetting": { - "base": "Settings that you can use for eliciting a slot value.
", + "base": "Specifies the elicitation setting details for constituent sub slots of a composite slot.
", "refs": { "CreateSlotRequest$valueElicitationSetting": "Specifies prompts that Amazon Lex sends to the user to elicit a response that provides the value for the slot.
", "CreateSlotResponse$valueElicitationSetting": "The value elicitation settings specified for the slot.
", @@ -3118,6 +3135,12 @@ "SlotTypeSortBy$order": "The order to sort the list. You can say ascending or descending.
" } }, + "Specifications": { + "base": "Subslot specifications.
", + "refs": { + "SubSlotSpecificationMap$value": null + } + }, "StartBotRecommendationRequest": { "base": null, "refs": { @@ -3178,6 +3201,46 @@ "DialogState$sessionAttributes": "Map of key/value pairs representing session-specific context information. It contains application information passed between Amazon Lex and a client application.
" } }, + "SubSlotExpression": { + "base": null, + "refs": { + "SubSlotSetting$expression": "The expression text for defining the constituent sub slots in the composite slot using logical AND and OR operators.
" + } + }, + "SubSlotSetting": { + "base": "Specifications for the constituent sub slots and the expression for the composite slot.
", + "refs": { + "CreateSlotRequest$subSlotSetting": "Specifications for the constituent sub slots and the expression for the composite slot.
", + "CreateSlotResponse$subSlotSetting": "Specifications for the constituent sub slots and the expression for the composite slot.
", + "DescribeSlotResponse$subSlotSetting": "Specifications for the constituent sub slots and the expression for the composite slot.
", + "UpdateSlotRequest$subSlotSetting": "Specifications for the constituent sub slots and the expression for the composite slot.
", + "UpdateSlotResponse$subSlotSetting": "Specifications for the constituent sub slots and the expression for the composite slot.
" + } + }, + "SubSlotSpecificationMap": { + "base": null, + "refs": { + "SubSlotSetting$slotSpecifications": "Specifications for the constituent sub slots of a composite slot.
" + } + }, + "SubSlotTypeComposition": { + "base": "Subslot type composition.
", + "refs": { + "SubSlotTypeList$member": null + } + }, + "SubSlotTypeList": { + "base": null, + "refs": { + "CompositeSlotTypeSetting$subSlots": "Subslots in the composite slot.
" + } + }, + "SubSlotValueElicitationSetting": { + "base": "Subslot elicitation settings.
DefaultValueSpecification is a list of default values for a constituent sub slot in a composite slot. Default values are used when Amazon Lex hasn't determined a value for a slot. You can specify default values from context variables, session attributes, and defined values. This is similar to DefaultValueSpecification for slots.
PromptSpecification is the prompt that Amazon Lex uses to elicit the sub slot value from the user. This is similar to PromptSpecification for slots.
Specifies the elicitation setting details for constituent sub slots of a composite slot.
" + } + }, "SynonymList": { "base": null, "refs": { @@ -3520,7 +3583,8 @@ "WaitAndContinueSpecification": { "base": "Specifies the prompts that Amazon Lex uses while a bot is waiting for customer input.
", "refs": { - "SlotValueElicitationSetting$waitAndContinueSpecification": null + "SlotValueElicitationSetting$waitAndContinueSpecification": null, + "SubSlotValueElicitationSetting$waitAndContinueSpecification": null } } } diff --git a/models/apis/pi/2018-02-27/api-2.json b/models/apis/pi/2018-02-27/api-2.json index bfe4e2c04b4..27979280242 100644 --- a/models/apis/pi/2018-02-27/api-2.json +++ b/models/apis/pi/2018-02-27/api-2.json @@ -359,7 +359,7 @@ }, "Limit":{ "type":"integer", - "max":10, + "max":25, "min":1 }, "ListAvailableResourceDimensionsRequest":{ @@ -408,7 +408,7 @@ }, "MaxResults":{ "type":"integer", - "max":20, + "max":25, "min":0 }, "MetricDimensionGroups":{ diff --git a/models/apis/redshift/2012-12-01/docs-2.json b/models/apis/redshift/2012-12-01/docs-2.json index 27a2835fc02..988f35274b0 100644 --- a/models/apis/redshift/2012-12-01/docs-2.json +++ b/models/apis/redshift/2012-12-01/docs-2.json @@ -91,7 +91,7 @@ "GetClusterCredentialsWithIAM": "Returns a database user name and temporary password with temporary authorization to log in to an Amazon Redshift database. The database user is mapped 1:1 to the source Identity and Access Management (IAM) identity. For more information about IAM identities, see IAM Identities (users, user groups, and roles) in the Amazon Web Services Identity and Access Management User Guide.
The Identity and Access Management (IAM) identity that runs this operation must have an IAM policy attached that allows access to all necessary actions and resources. For more information about permissions, see Using identity-based policies (IAM policies) in the Amazon Redshift Cluster Management Guide.
", "GetReservedNodeExchangeConfigurationOptions": "Gets the configuration options for the reserved-node exchange. These options include information about the source reserved node and target reserved node offering. Details include the node type, the price, the node count, and the offering type.
", "GetReservedNodeExchangeOfferings": "Returns an array of DC2 ReservedNodeOfferings that matches the payment type, term, and usage price of the given DC1 reserved node.
", - "ModifyAquaConfiguration": "Modifies whether a cluster can use AQUA (Advanced Query Accelerator).
", + "ModifyAquaConfiguration": "This operation is retired. Calling this operation does not change AQUA configuration. Amazon Redshift automatically determines whether to use AQUA (Advanced Query Accelerator).
", "ModifyAuthenticationProfile": "Modifies an authentication profile.
", "ModifyCluster": "Modifies the settings for a cluster.
You can also change node type and the number of nodes to scale up or down the cluster. When resizing a cluster, you must specify both the number of nodes and the node type even if one of the parameters does not change.
You can add another security or parameter group, or change the admin user password. Resetting a cluster password or modifying the security groups associated with a cluster do not need a reboot. However, modifying a parameter group requires a reboot for parameters to take effect. For more information about managing clusters, go to Amazon Redshift Clusters in the Amazon Redshift Cluster Management Guide.
", "ModifyClusterDbRevision": "Modifies the database revision of a cluster. The database revision is a unique revision of the database running in a cluster.
", @@ -173,25 +173,25 @@ } }, "AquaConfiguration": { - "base": "The AQUA (Advanced Query Accelerator) configuration of the cluster.
", + "base": "The operation that uses this structure is retired. Amazon Redshift automatically determines whether to use AQUA (Advanced Query Accelerator).
", "refs": { - "Cluster$AquaConfiguration": "The AQUA (Advanced Query Accelerator) configuration of the cluster.
", - "ModifyAquaOutputMessage$AquaConfiguration": "The updated AQUA configuration of the cluster.
" + "Cluster$AquaConfiguration": "This field is retired. Amazon Redshift automatically determines whether to use AQUA (Advanced Query Accelerator).
", + "ModifyAquaOutputMessage$AquaConfiguration": "This parameter is retired. Amazon Redshift automatically determines whether to use AQUA (Advanced Query Accelerator).
" } }, "AquaConfigurationStatus": { "base": null, "refs": { - "AquaConfiguration$AquaConfigurationStatus": "The value represents how the cluster is configured to use AQUA. Possible values include the following.
enabled - Use AQUA if it is available for the current Amazon Web Services Region and Amazon Redshift node type.
disabled - Don't use AQUA.
auto - Amazon Redshift determines whether to use AQUA.
The value represents how the cluster is configured to use AQUA (Advanced Query Accelerator) when it is created. Possible values include the following.
enabled - Use AQUA if it is available for the current Amazon Web Services Region and Amazon Redshift node type.
disabled - Don't use AQUA.
auto - Amazon Redshift determines whether to use AQUA.
The new value of AQUA configuration status. Possible values include the following.
enabled - Use AQUA if it is available for the current Amazon Web Services Region and Amazon Redshift node type.
disabled - Don't use AQUA.
auto - Amazon Redshift determines whether to use AQUA.
The value represents how the cluster is configured to use AQUA (Advanced Query Accelerator) after the cluster is restored. Possible values include the following.
enabled - Use AQUA if it is available for the current Amazon Web Services Region and Amazon Redshift node type.
disabled - Don't use AQUA.
auto - Amazon Redshift determines whether to use AQUA.
This field is retired. Amazon Redshift automatically determines whether to use AQUA (Advanced Query Accelerator).
", + "CreateClusterMessage$AquaConfigurationStatus": "This parameter is retired. It does not set the AQUA configuration status. Amazon Redshift automatically determines whether to use AQUA (Advanced Query Accelerator).
", + "ModifyAquaInputMessage$AquaConfigurationStatus": "This parameter is retired. Amazon Redshift automatically determines whether to use AQUA (Advanced Query Accelerator).
", + "RestoreFromClusterSnapshotMessage$AquaConfigurationStatus": "This parameter is retired. It does not set the AQUA configuration status. Amazon Redshift automatically determines whether to use AQUA (Advanced Query Accelerator).
" } }, "AquaStatus": { "base": null, "refs": { - "AquaConfiguration$AquaStatus": "The value indicates the status of AQUA on the cluster. Possible values include the following.
enabled - AQUA is enabled.
disabled - AQUA is not enabled.
applying - AQUA status is being applied.
This field is retired. Amazon Redshift automatically determines whether to use AQUA (Advanced Query Accelerator).
" } }, "AssociateDataShareConsumerMessage": { @@ -3023,7 +3023,7 @@ "CreateClusterMessage$ClusterVersion": "The version of the Amazon Redshift engine software that you want to deploy on the cluster.
The version selected runs on all the nodes in the cluster.
Constraints: Only version 1.0 is currently available.
Example: 1.0
Specifies the name of the HSM client certificate the Amazon Redshift cluster uses to retrieve the data encryption keys stored in an HSM.
", "CreateClusterMessage$HsmConfigurationIdentifier": "Specifies the name of the HSM configuration that contains the information the Amazon Redshift cluster can use to retrieve and store keys in an HSM.
", - "CreateClusterMessage$ElasticIp": "The Elastic IP (EIP) address for the cluster. You don't have to specify the EIP for a publicly accessible cluster with AvailabilityZoneRelocation turned on.
Constraints: The cluster must be provisioned in EC2-VPC and publicly-accessible through an Internet gateway. For more information about provisioning clusters in EC2-VPC, go to Supported Platforms to Launch Your Cluster in the Amazon Redshift Cluster Management Guide.
", + "CreateClusterMessage$ElasticIp": "The Elastic IP (EIP) address for the cluster.
Constraints: The cluster must be provisioned in EC2-VPC and publicly-accessible through an Internet gateway. For more information about provisioning clusters in EC2-VPC, go to Supported Platforms to Launch Your Cluster in the Amazon Redshift Cluster Management Guide.
", "CreateClusterMessage$KmsKeyId": "The Key Management Service (KMS) key ID of the encryption key that you want to use to encrypt data in the cluster.
", "CreateClusterMessage$AdditionalInfo": "Reserved.
", "CreateClusterMessage$MaintenanceTrackName": "An optional parameter for the name of the maintenance track for the cluster. If you don't provide a maintenance track name, the cluster is assigned to the current track.
The event severity specified in the Amazon Redshift event notification subscription.
Values: ERROR, INFO
", "EventSubscriptionsMessage$Marker": "A value that indicates the starting point for the next set of response records in a subsequent request. If a value is returned in a response, you can retrieve the next set of records by providing this returned marker value in the Marker parameter and retrying the command. If the Marker field is empty, all response records have been retrieved for the request.
A value that indicates the starting point for the next set of response records in a subsequent request. If a value is returned in a response, you can retrieve the next set of records by providing this returned marker value in the Marker parameter and retrying the command. If the Marker field is empty, all response records have been retrieved for the request.
The name of a database user. If a user name matching DbUser exists in the database, the temporary user credentials have the same permissions as the existing user. If DbUser doesn't exist in the database and Autocreate is True, a new user is created using the value for DbUser with PUBLIC permissions. If a database user matching the value for DbUser doesn't exist and Autocreate is False, then the command succeeds but the connection attempt will fail because the user doesn't exist in the database.
For more information, see CREATE USER in the Amazon Redshift Database Developer Guide.
Constraints:
Must be 1 to 64 alphanumeric characters or hyphens. The user name can't be PUBLIC.
Must contain only lowercase letters, numbers, underscore, plus sign, period (dot), at symbol (@), or hyphen.
First character must be a letter.
Must not contain a colon ( : ) or slash ( / ).
Cannot be a reserved word. A list of reserved words can be found in Reserved Words in the Amazon Redshift Database Developer Guide.
The name of a database that DbUser is authorized to log on to. If DbName is not specified, DbUser can log on to any existing database.
Constraints:
Must be 1 to 64 alphanumeric characters or hyphens
Must contain only lowercase letters, numbers, underscore, plus sign, period (dot), at symbol (@), or hyphen.
First character must be a letter.
Must not contain a colon ( : ) or slash ( / ).
Cannot be a reserved word. A list of reserved words can be found in Reserved Words in the Amazon Redshift Database Developer Guide.
The name of a database user. If a user name matching DbUser exists in the database, the temporary user credentials have the same permissions as the existing user. If DbUser doesn't exist in the database and Autocreate is True, a new user is created using the value for DbUser with PUBLIC permissions. If a database user matching the value for DbUser doesn't exist and Autocreate is False, then the command succeeds but the connection attempt will fail because the user doesn't exist in the database.
For more information, see CREATE USER in the Amazon Redshift Database Developer Guide.
Constraints:
Must be 1 to 64 alphanumeric characters or hyphens. The user name can't be PUBLIC.
Must contain uppercase or lowercase letters, numbers, underscore, plus sign, period (dot), at symbol (@), or hyphen.
First character must be a letter.
Must not contain a colon ( : ) or slash ( / ).
Cannot be a reserved word. A list of reserved words can be found in Reserved Words in the Amazon Redshift Database Developer Guide.
The name of a database that DbUser is authorized to log on to. If DbName is not specified, DbUser can log on to any existing database.
Constraints:
Must be 1 to 64 alphanumeric characters or hyphens
Must contain uppercase or lowercase letters, numbers, underscore, plus sign, period (dot), at symbol (@), or hyphen.
First character must be a letter.
Must not contain a colon ( : ) or slash ( / ).
Cannot be a reserved word. A list of reserved words can be found in Reserved Words in the Amazon Redshift Database Developer Guide.
The unique identifier of the cluster that contains the database for which you are requesting credentials. This parameter is case sensitive.
", "GetClusterCredentialsWithIAMMessage$DbName": "The name of the database for which you are requesting credentials. If the database name is specified, the IAM policy must allow access to the resource dbname for the specified database name. If the database name is not specified, access to all databases is allowed.
The unique identifier of the cluster that contains the database for which you are requesting credentials.
", @@ -3363,15 +3363,15 @@ "ResizeProgressMessage$TargetEncryptionType": "The type of encryption for the cluster after the resize is complete.
Possible values are KMS and None.
The identifier of the cluster that will be created from restoring the snapshot.
Constraints:
Must contain from 1 to 63 alphanumeric characters or hyphens.
Alphabetic characters must be lowercase.
First character must be a letter.
Cannot end with a hyphen or contain two consecutive hyphens.
Must be unique for all clusters within an Amazon Web Services account.
The name of the snapshot from which to create the new cluster. This parameter isn't case sensitive.
Example: my-snapshot-id
The Amazon Resource Name (ARN) of the snapshot associated with the message to restore from a cluster.
", + "RestoreFromClusterSnapshotMessage$SnapshotIdentifier": "The name of the snapshot from which to create the new cluster. This parameter isn't case sensitive. You can specify this parameter or snapshotArn, but not both.
Example: my-snapshot-id
The Amazon Resource Name (ARN) of the snapshot associated with the message to restore from a cluster. You can specify this parameter or snapshotIdentifier, but not both.
The name of the cluster the source snapshot was created from. This parameter is required if your IAM user has a policy containing a snapshot resource element that specifies anything other than * for the cluster name.
", "RestoreFromClusterSnapshotMessage$AvailabilityZone": "The Amazon EC2 Availability Zone in which to restore the cluster.
Default: A random, system-chosen Availability Zone.
Example: us-east-2a
The name of the subnet group where you want to cluster restored.
A snapshot of cluster in VPC can be restored only in VPC. Therefore, you must provide subnet group name where you want the cluster restored.
", "RestoreFromClusterSnapshotMessage$OwnerAccount": "The Amazon Web Services account used to create or copy the snapshot. Required if you are restoring a snapshot you do not own, optional if you own the snapshot.
", "RestoreFromClusterSnapshotMessage$HsmClientCertificateIdentifier": "Specifies the name of the HSM client certificate the Amazon Redshift cluster uses to retrieve the data encryption keys stored in an HSM.
", "RestoreFromClusterSnapshotMessage$HsmConfigurationIdentifier": "Specifies the name of the HSM configuration that contains the information the Amazon Redshift cluster can use to retrieve and store keys in an HSM.
", - "RestoreFromClusterSnapshotMessage$ElasticIp": "The elastic IP (EIP) address for the cluster. You don't have to specify the EIP for a publicly accessible cluster with AvailabilityZoneRelocation turned on.
", + "RestoreFromClusterSnapshotMessage$ElasticIp": "The elastic IP (EIP) address for the cluster.
", "RestoreFromClusterSnapshotMessage$ClusterParameterGroupName": "The name of the parameter group to be associated with this cluster.
Default: The default Amazon Redshift cluster parameter group. For information about the default parameter group, go to Working with Amazon Redshift Parameter Groups.
Constraints:
Must be 1 to 255 alphanumeric characters or hyphens.
First character must be a letter.
Cannot end with a hyphen or contain two consecutive hyphens.
The weekly time range (in UTC) during which automated cluster maintenance can occur.
Format: ddd:hh24:mi-ddd:hh24:mi
Default: The value selected for the cluster from which the snapshot was taken. For more information about the time blocks for each region, see Maintenance Windows in Amazon Redshift Cluster Management Guide.
Valid Days: Mon | Tue | Wed | Thu | Fri | Sat | Sun
Constraints: Minimum 30-minute window.
", "RestoreFromClusterSnapshotMessage$KmsKeyId": "The Key Management Service (KMS) key ID of the encryption key that encrypts data in the cluster restored from a shared snapshot. You can also provide the key ID when you restore from an unencrypted snapshot to an encrypted cluster in the same account. Additionally, you can specify a new KMS key ID when you restore from an encrypted snapshot in the same account in order to change it. In that case, the restored cluster is encrypted with the new KMS key ID.
", diff --git a/models/apis/runtime.lex.v2/2020-08-07/api-2.json b/models/apis/runtime.lex.v2/2020-08-07/api-2.json index 3af9dd76226..400ede39443 100644 --- a/models/apis/runtime.lex.v2/2020-08-07/api-2.json +++ b/models/apis/runtime.lex.v2/2020-08-07/api-2.json @@ -379,7 +379,8 @@ "members":{ "type":{"shape":"DialogActionType"}, "slotToElicit":{"shape":"NonEmptyString"}, - "slotElicitationStyle":{"shape":"StyleType"} + "slotElicitationStyle":{"shape":"StyleType"}, + "subSlotToElicit":{"shape":"ElicitSubSlot"} } }, "DialogActionType":{ @@ -402,6 +403,14 @@ "event":true }, "Double":{"type":"double"}, + "ElicitSubSlot":{ + "type":"structure", + "required":["name"], + "members":{ + "name":{"shape":"NonEmptyString"}, + "subSlotToElicit":{"shape":"ElicitSubSlot"} + } + }, "EpochMillis":{"type":"long"}, "EventId":{ "type":"string", @@ -826,9 +835,9 @@ }, "RuntimeHintDetails":{ "type":"structure", - "required":["runtimeHintValues"], "members":{ - "runtimeHintValues":{"shape":"RuntimeHintValuesList"} + "runtimeHintValues":{"shape":"RuntimeHintValuesList"}, + "subSlotHints":{"shape":"SlotHintsSlotMap"} } }, "RuntimeHintPhrase":{ @@ -905,7 +914,8 @@ "type":"string", "enum":[ "Scalar", - "List" + "List", + "Composite" ] }, "Slot":{ @@ -913,7 +923,8 @@ "members":{ "value":{"shape":"Value"}, "shape":{"shape":"Shape"}, - "values":{"shape":"Values"} + "values":{"shape":"Values"}, + "subSlots":{"shape":"Slots"} } }, "SlotHintsIntentMap":{ diff --git a/models/apis/runtime.lex.v2/2020-08-07/docs-2.json b/models/apis/runtime.lex.v2/2020-08-07/docs-2.json index e4e503b6816..20e98beb1b7 100644 --- a/models/apis/runtime.lex.v2/2020-08-07/docs-2.json +++ b/models/apis/runtime.lex.v2/2020-08-07/docs-2.json @@ -225,7 +225,7 @@ "DialogActionType": { "base": null, "refs": { - "DialogAction$type": "The next action that the bot should take in its interaction with the user. The possible values are:
Close - Indicates that there will not be a response from the user. For example, the statement \"Your order has been placed\" does not require a response.
ConfirmIntent - The next action is asking the user if the intent is complete and ready to be fulfilled. This is a yes/no question such as \"Place the order?\"
Delegate - The next action is determined by Amazon Lex V2.
ElicitSlot - The next action is to elicit a slot value from the user.
The next action that the bot should take in its interaction with the user. The possible values are:
Close - Indicates that there will not be a response from the user. For example, the statement \"Your order has been placed\" does not require a response.
ConfirmIntent - The next action is asking the user if the intent is complete and ready to be fulfilled. This is a yes/no question such as \"Place the order?\"
Delegate - The next action is determined by Amazon Lex V2.
ElicitIntent - The next action is to elicit an intent from the user.
ElicitSlot - The next action is to elicit a slot value from the user.
The level of confidence that Amazon Comprehend has in the accuracy of its detection of the MIXED sentiment.
The specific constituent sub slot of the composite slot to elicit in dialog action.
", + "refs": { + "DialogAction$subSlotToElicit": "The name of the constituent sub slot of the composite slot specified in slotToElicit that should be elicited from the user.
", + "ElicitSubSlot$subSlotToElicit": "The field is not supported.
" + } + }, "EpochMillis": { "base": null, "refs": { @@ -367,7 +374,7 @@ "Messages": { "base": null, "refs": { - "ConfigurationEvent$welcomeMessages": "A list of messages to send to the user.
", + "ConfigurationEvent$welcomeMessages": "A list of messages to send to the user.
If you set the welcomeMessage field, you must also set the DialogAction structure's type field.
A list of messages that were last sent to the user. The messages are ordered based on the order that your returned the messages from your Lambda function or the order that messages are defined in the bot.
", "PutSessionRequest$messages": "A list of messages to send to the user. Messages are sent in the order that they are defined in the list.
", "RecognizeTextResponse$messages": "A list of messages last sent to the user. The messages are ordered based on the order that you returned the messages from your Lambda function or the order that the messages are defined in the bot.
", @@ -388,6 +395,7 @@ "AudioResponseEvent$contentType": "The encoding of the audio chunk. This is the same as the encoding configure in the contentType field of the ConfigurationEvent.
The message that Amazon Lex V2 returns in the response can be either text or speech based on the responseContentType value.
If the value is text/plain;charset=utf-8, Amazon Lex V2 returns text in the response.
If the value begins with audio/, Amazon Lex V2 returns speech in the response. Amazon Lex V2 uses Amazon Polly to generate the speech using the configuration that you specified in the requestContentType parameter. For example, if you specify audio/mpeg as the value, Amazon Lex V2 returns speech in the MPEG format.
If the value is audio/pcm, the speech returned is audio/pcm in 16-bit, little-endian format.
The following are the accepted values:
audio/mpeg
audio/ogg
audio/pcm
audio/* (defaults to mpeg)
text/plain; charset=utf-8
The name of the slot that should be elicited from the user.
", + "ElicitSubSlot$name": "The name of the slot that should be elicited from the user.
", "GetSessionResponse$sessionId": "The identifier of the returned session.
", "Intent$name": "The name of the intent.
", "PutSessionRequest$responseContentType": "The message that Amazon Lex V2 returns in the response can be either text or speech depending on the value of this parameter.
If the value is text/plain; charset=utf-8, Amazon Lex V2 returns text in the response.
You can provide Amazon Lex V2 with hints to the phrases that a customer is likely to use for a slot. When a slot with hints is resolved, the phrases in the runtime hints are preferred in the resolution. You can provide hints for a maximum of 100 intents. You can provide a maximum of 100 slots.
Before you can use runtime hints with an existing bot, you must first rebuild the bot.
For more information, see Using hints to improve accuracy.
", + "base": "You can provide Amazon Lex V2 with hints to the phrases that a customer is likely to use for a slot. When a slot with hints is resolved, the phrases in the runtime hints are preferred in the resolution. You can provide hints for a maximum of 100 intents. You can provide a maximum of 100 slots.
Before you can use runtime hints with an existing bot, you must first rebuild the bot.
For more information, see Using runtime hints to improve recognition of slot values.
", "refs": { "SessionState$runtimeHints": "Hints for phrases that a customer is likely to use for a slot. Amazon Lex V2 uses the hints to help determine the correct value of a slot.
" } @@ -570,19 +578,21 @@ "SlotHintsIntentMap": { "base": null, "refs": { - "RuntimeHints$slotHints": "A list of the slots in the intent that should have runtime hints added, and the phrases that should be added for each slot.
The first level of the slotHints map is the name of the intent. The second level is the name of the slot within the intent. For more information, see Using hints to improve accuracy.
The intent name and slot name must exist.
" + "RuntimeHints$slotHints": "A list of the slots in the intent that should have runtime hints added, and the phrases that should be added for each slot.
The first level of the slotHints map is the name of the intent. The second level is the name of the slot within the intent. For more information, see Using hints to improve accuracy.
The intent name and slot name must exist.
" } }, "SlotHintsSlotMap": { "base": null, "refs": { + "RuntimeHintDetails$subSlotHints": "A map of constituent sub slot names inside a composite slot in the intent and the phrases that should be added for each sub slot. Inside each composite slot hints, this structure provides a mechanism to add granular sub slot phrases. Only sub slot hints are supported for composite slots. The intent name, composite slot name and the constituent sub slot names must exist.
", "SlotHintsIntentMap$value": null } }, "Slots": { "base": null, "refs": { - "Intent$slots": "A map of all of the slots for the intent. The name of the slot maps to the value of the slot. If a slot has not been filled, the value is null.
" + "Intent$slots": "A map of all of the slots for the intent. The name of the slot maps to the value of the slot. If a slot has not been filled, the value is null.
", + "Slot$subSlots": "The constituent sub slots of a composite slot.
" } }, "StartConversationRequest": { diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index eaf7ec19e98..d2e3571106b 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -3796,11 +3796,16 @@ }, "endpoints" : { "ap-northeast-1" : { }, + "ap-northeast-2" : { }, + "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, + "ca-central-1" : { }, "eu-central-1" : { }, "eu-north-1" : { }, "eu-west-1" : { }, + "eu-west-2" : { }, + "eu-west-3" : { }, "fips-us-east-1" : { "credentialScope" : { "region" : "us-east-1" @@ -3822,6 +3827,7 @@ "deprecated" : true, "hostname" : "devops-guru-fips.us-west-2.amazonaws.com" }, + "sa-east-1" : { }, "us-east-1" : { "variants" : [ { "hostname" : "devops-guru-fips.us-east-1.amazonaws.com", @@ -3834,6 +3840,7 @@ "tags" : [ "fips" ] } ] }, + "us-west-1" : { }, "us-west-2" : { "variants" : [ { "hostname" : "devops-guru-fips.us-west-2.amazonaws.com", diff --git a/service/cloudtrail/api.go b/service/cloudtrail/api.go index 5c7c9154cae..c9f37ccfb96 100644 --- a/service/cloudtrail/api.go +++ b/service/cloudtrail/api.go @@ -1047,6 +1047,96 @@ func (c *CloudTrail) DescribeTrailsWithContext(ctx aws.Context, input *DescribeT return out, req.Send() } +const opGetChannel = "GetChannel" + +// GetChannelRequest generates a "aws/request.Request" representing the +// client's request for the GetChannel operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See GetChannel for more information on using the GetChannel +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the GetChannelRequest method. +// req, resp := client.GetChannelRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudtrail-2013-11-01/GetChannel +func (c *CloudTrail) GetChannelRequest(input *GetChannelInput) (req *request.Request, output *GetChannelOutput) { + op := &request.Operation{ + Name: opGetChannel, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetChannelInput{} + } + + output = &GetChannelOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetChannel API operation for AWS CloudTrail. +// +// Returns the specified CloudTrail service-linked channel. Amazon Web Services +// services create service-linked channels to view CloudTrail events. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS CloudTrail's +// API operation GetChannel for usage and error information. +// +// Returned Error Types: +// +// - ChannelARNInvalidException +// The specified channel ARN is not valid or does not map to a channel in your +// account. +// +// - ChannelNotFoundException +// The specified channel was not found. +// +// - OperationNotPermittedException +// This exception is thrown when the requested operation is not permitted. +// +// - UnsupportedOperationException +// This exception is thrown when the requested operation is not supported. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudtrail-2013-11-01/GetChannel +func (c *CloudTrail) GetChannel(input *GetChannelInput) (*GetChannelOutput, error) { + req, out := c.GetChannelRequest(input) + return out, req.Send() +} + +// GetChannelWithContext is the same as GetChannel with the addition of +// the ability to pass a context and additional request options. +// +// See GetChannel for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *CloudTrail) GetChannelWithContext(ctx aws.Context, input *GetChannelInput, opts ...request.Option) (*GetChannelOutput, error) { + req, out := c.GetChannelRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetEventDataStore = "GetEventDataStore" // GetEventDataStoreRequest generates a "aws/request.Request" representing the @@ -1734,6 +1824,149 @@ func (c *CloudTrail) GetTrailStatusWithContext(ctx aws.Context, input *GetTrailS return out, req.Send() } +const opListChannels = "ListChannels" + +// ListChannelsRequest generates a "aws/request.Request" representing the +// client's request for the ListChannels operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListChannels for more information on using the ListChannels +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the ListChannelsRequest method. +// req, resp := client.ListChannelsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudtrail-2013-11-01/ListChannels +func (c *CloudTrail) ListChannelsRequest(input *ListChannelsInput) (req *request.Request, output *ListChannelsOutput) { + op := &request.Operation{ + Name: opListChannels, + HTTPMethod: "POST", + HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListChannelsInput{} + } + + output = &ListChannelsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListChannels API operation for AWS CloudTrail. +// +// Returns all CloudTrail channels. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS CloudTrail's +// API operation ListChannels for usage and error information. +// +// Returned Error Types: +// +// - InvalidNextTokenException +// A token that is not valid, or a token that was previously used in a request +// with different parameters. This exception is thrown if the token is not valid. +// +// - OperationNotPermittedException +// This exception is thrown when the requested operation is not permitted. +// +// - UnsupportedOperationException +// This exception is thrown when the requested operation is not supported. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudtrail-2013-11-01/ListChannels +func (c *CloudTrail) ListChannels(input *ListChannelsInput) (*ListChannelsOutput, error) { + req, out := c.ListChannelsRequest(input) + return out, req.Send() +} + +// ListChannelsWithContext is the same as ListChannels with the addition of +// the ability to pass a context and additional request options. +// +// See ListChannels for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *CloudTrail) ListChannelsWithContext(ctx aws.Context, input *ListChannelsInput, opts ...request.Option) (*ListChannelsOutput, error) { + req, out := c.ListChannelsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListChannelsPages iterates over the pages of a ListChannels operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListChannels method for more information on how to use this operation. +// +// Note: This operation can generate multiple requests to a service. +// +// // Example iterating over at most 3 pages of a ListChannels operation. +// pageNum := 0 +// err := client.ListChannelsPages(params, +// func(page *cloudtrail.ListChannelsOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +func (c *CloudTrail) ListChannelsPages(input *ListChannelsInput, fn func(*ListChannelsOutput, bool) bool) error { + return c.ListChannelsPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListChannelsPagesWithContext same as ListChannelsPages except +// it takes a Context and allows setting request options on the pages. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *CloudTrail) ListChannelsPagesWithContext(ctx aws.Context, input *ListChannelsInput, fn func(*ListChannelsOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListChannelsInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListChannelsRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListChannelsOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + const opListEventDataStores = "ListEventDataStores" // ListEventDataStoresRequest generates a "aws/request.Request" representing the @@ -3692,7 +3925,7 @@ func (c *CloudTrail) UpdateEventDataStoreRequest(input *UpdateEventDataStoreInpu // or the ID portion of the ARN. Other parameters are optional, but at least // one optional parameter must be specified, or CloudTrail throws an error. // RetentionPeriod is in days, and valid values are integers between 90 and -// 2555. By default, TerminationProtection is enabled. AdvancedEventSelectors +// 2557. By default, TerminationProtection is enabled. AdvancedEventSelectors // includes or excludes management and data events in your event data store; // for more information about AdvancedEventSelectors, see PutEventSelectorsRequest$AdvancedEventSelectors. // @@ -4336,9 +4569,9 @@ type AdvancedFieldSelector struct { // eventName, resources.type, and resources.ARN. // // * readOnly - Optional. Can be set to Equals a value of true or false. - // If you do not add this field, CloudTrail logs both both read and write - // events. A value of true logs only read events. A value of false logs only - // write events. + // If you do not add this field, CloudTrail logs both read and write events. + // A value of true logs only read events. A value of false logs only write + // events. // // * eventSource - For filtering management events only. This can be set // only to NotEquals kms.amazonaws.com. @@ -4590,34 +4823,207 @@ type CancelQueryOutput struct { QueryStatus *string `type:"string" required:"true" enum:"QueryStatus"` } -// String returns the string representation. -// -// API parameter values that are decorated as "sensitive" in the API will not -// be included in the string output. The member name will be present, but the -// value will be replaced with "sensitive". -func (s CancelQueryOutput) String() string { - return awsutil.Prettify(s) +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s CancelQueryOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s CancelQueryOutput) GoString() string { + return s.String() +} + +// SetQueryId sets the QueryId field's value. +func (s *CancelQueryOutput) SetQueryId(v string) *CancelQueryOutput { + s.QueryId = &v + return s +} + +// SetQueryStatus sets the QueryStatus field's value. +func (s *CancelQueryOutput) SetQueryStatus(v string) *CancelQueryOutput { + s.QueryStatus = &v + return s +} + +// Contains information about a returned CloudTrail channel. +type Channel struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the channel. + ChannelArn *string `min:"3" type:"string"` + + // The name of the CloudTrail channel. For service-linked channels, the name + // is aws-service-channel/service-name/custom-suffix where service-name represents + // the name of the Amazon Web Services service that created the channel and + // custom-suffix represents the suffix created by the Amazon Web Services service. + Name *string `min:"3" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s Channel) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s Channel) GoString() string { + return s.String() +} + +// SetChannelArn sets the ChannelArn field's value. +func (s *Channel) SetChannelArn(v string) *Channel { + s.ChannelArn = &v + return s +} + +// SetName sets the Name field's value. +func (s *Channel) SetName(v string) *Channel { + s.Name = &v + return s +} + +// The specified channel ARN is not valid or does not map to a channel in your +// account. +type ChannelARNInvalidException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ChannelARNInvalidException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ChannelARNInvalidException) GoString() string { + return s.String() +} + +func newErrorChannelARNInvalidException(v protocol.ResponseMetadata) error { + return &ChannelARNInvalidException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *ChannelARNInvalidException) Code() string { + return "ChannelARNInvalidException" +} + +// Message returns the exception's message. +func (s *ChannelARNInvalidException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *ChannelARNInvalidException) OrigErr() error { + return nil +} + +func (s *ChannelARNInvalidException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *ChannelARNInvalidException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *ChannelARNInvalidException) RequestID() string { + return s.RespMetadata.RequestID +} + +// The specified channel was not found. +type ChannelNotFoundException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ChannelNotFoundException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ChannelNotFoundException) GoString() string { + return s.String() +} + +func newErrorChannelNotFoundException(v protocol.ResponseMetadata) error { + return &ChannelNotFoundException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *ChannelNotFoundException) Code() string { + return "ChannelNotFoundException" +} + +// Message returns the exception's message. +func (s *ChannelNotFoundException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *ChannelNotFoundException) OrigErr() error { + return nil } -// GoString returns the string representation. -// -// API parameter values that are decorated as "sensitive" in the API will not -// be included in the string output. The member name will be present, but the -// value will be replaced with "sensitive". -func (s CancelQueryOutput) GoString() string { - return s.String() +func (s *ChannelNotFoundException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) } -// SetQueryId sets the QueryId field's value. -func (s *CancelQueryOutput) SetQueryId(v string) *CancelQueryOutput { - s.QueryId = &v - return s +// Status code returns the HTTP status code for the request's response error. +func (s *ChannelNotFoundException) StatusCode() int { + return s.RespMetadata.StatusCode } -// SetQueryStatus sets the QueryStatus field's value. -func (s *CancelQueryOutput) SetQueryStatus(v string) *CancelQueryOutput { - s.QueryStatus = &v - return s +// RequestID returns the service's response RequestID for request. +func (s *ChannelNotFoundException) RequestID() string { + return s.RespMetadata.RequestID } // This exception is thrown when a call results in the InvalidClientTokenId @@ -4841,7 +5247,7 @@ type CreateEventDataStoreInput struct { OrganizationEnabled *bool `type:"boolean"` // The retention period of the event data store, in days. You can set a retention - // period of up to 2555 days, the equivalent of seven years. + // period of up to 2557 days, the equivalent of seven years. RetentionPeriod *int64 `min:"7" type:"integer"` // A list of tags. @@ -5976,6 +6382,52 @@ func (s *DescribeTrailsOutput) SetTrailList(v []*Trail) *DescribeTrailsOutput { return s } +// Contains information about the service where CloudTrail delivers events. +type Destination struct { + _ struct{} `type:"structure"` + + // The location of the service. For service-linked channels, this is the name + // of the Amazon Web Services service. + // + // Location is a required field + Location *string `min:"3" type:"string" required:"true"` + + // The type of service. For service-linked channels, the value is AWS_SERVICE. + // + // Type is a required field + Type *string `type:"string" required:"true" enum:"DestinationType"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s Destination) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s Destination) GoString() string { + return s.String() +} + +// SetLocation sets the Location field's value. +func (s *Destination) SetLocation(v string) *Destination { + s.Location = &v + return s +} + +// SetType sets the Type field's value. +func (s *Destination) SetType(v string) *Destination { + s.Type = &v + return s +} + // Contains information about an event that was returned by a lookup request. // The result includes a representation of a CloudTrail event. type Event struct { @@ -6086,7 +6538,7 @@ func (s *Event) SetUsername(v string) *Event { // A storage lake of event data against which you can run complex SQL-based // queries. An event data store can include events that you have logged on your -// account from the last 90 to 2555 days (about three months to up to seven +// account from the last 90 to 2557 days (about three months to up to seven // years). To select events for an event data store, use advanced event selectors // (https://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-data-events-with-cloudtrail.html#creating-data-event-selectors-advanced). type EventDataStore struct { @@ -6644,6 +7096,129 @@ func (s *EventSelector) SetReadWriteType(v string) *EventSelector { return s } +type GetChannelInput struct { + _ struct{} `type:"structure"` + + // The Amazon Resource Name (ARN) of the CloudTrail service-linked channel. + // + // Channel is a required field + Channel *string `min:"3" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GetChannelInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GetChannelInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetChannelInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetChannelInput"} + if s.Channel == nil { + invalidParams.Add(request.NewErrParamRequired("Channel")) + } + if s.Channel != nil && len(*s.Channel) < 3 { + invalidParams.Add(request.NewErrParamMinLen("Channel", 3)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetChannel sets the Channel field's value. +func (s *GetChannelInput) SetChannel(v string) *GetChannelInput { + s.Channel = &v + return s +} + +type GetChannelOutput struct { + _ struct{} `type:"structure"` + + // The ARN of the CloudTrail service-linked channel. + ChannelArn *string `min:"3" type:"string"` + + // The Amazon Web Services service that created the CloudTrail service-linked + // channel. + Destinations []*Destination `min:"1" type:"list"` + + // The name of the CloudTrail service-linked channel. For service-linked channels, + // the value is aws-service-channel/service-name/custom-suffix where service-name + // represents the name of the Amazon Web Services service that created the channel + // and custom-suffix represents the suffix generated by the Amazon Web Services + // service. + Name *string `min:"3" type:"string"` + + // The trail or event data store for the CloudTrail service-linked channel. + Source *string `min:"1" type:"string"` + + // Provides information about the advanced event selectors configured for the + // service-linked channel, and whether the service-linked channel applies to + // all regions or one region. + SourceConfig *SourceConfig `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GetChannelOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GetChannelOutput) GoString() string { + return s.String() +} + +// SetChannelArn sets the ChannelArn field's value. +func (s *GetChannelOutput) SetChannelArn(v string) *GetChannelOutput { + s.ChannelArn = &v + return s +} + +// SetDestinations sets the Destinations field's value. +func (s *GetChannelOutput) SetDestinations(v []*Destination) *GetChannelOutput { + s.Destinations = v + return s +} + +// SetName sets the Name field's value. +func (s *GetChannelOutput) SetName(v string) *GetChannelOutput { + s.Name = &v + return s +} + +// SetSource sets the Source field's value. +func (s *GetChannelOutput) SetSource(v string) *GetChannelOutput { + s.Source = &v + return s +} + +// SetSourceConfig sets the SourceConfig field's value. +func (s *GetChannelOutput) SetSourceConfig(v *SourceConfig) *GetChannelOutput { + s.SourceConfig = v + return s +} + type GetEventDataStoreInput struct { _ struct{} `type:"structure"` @@ -9726,6 +10301,102 @@ func (s *KmsKeyNotFoundException) RequestID() string { return s.RespMetadata.RequestID } +type ListChannelsInput struct { + _ struct{} `type:"structure"` + + // The maximum number of CloudTrail channels to display on a single page. + MaxResults *int64 `min:"1" type:"integer"` + + // A token you can use to get the next page of results. + NextToken *string `min:"4" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListChannelsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListChannelsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListChannelsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListChannelsInput"} + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + if s.NextToken != nil && len(*s.NextToken) < 4 { + invalidParams.Add(request.NewErrParamMinLen("NextToken", 4)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListChannelsInput) SetMaxResults(v int64) *ListChannelsInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListChannelsInput) SetNextToken(v string) *ListChannelsInput { + s.NextToken = &v + return s +} + +type ListChannelsOutput struct { + _ struct{} `type:"structure"` + + // The list of CloudTrail channels. + Channels []*Channel `type:"list"` + + // A token used to get the next page of results. + NextToken *string `min:"4" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListChannelsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListChannelsOutput) GoString() string { + return s.String() +} + +// SetChannels sets the Channels field's value. +func (s *ListChannelsOutput) SetChannels(v []*Channel) *ListChannelsOutput { + s.Channels = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListChannelsOutput) SetNextToken(v string) *ListChannelsOutput { + s.NextToken = &v + return s +} + type ListEventDataStoresInput struct { _ struct{} `type:"structure"` @@ -10169,9 +10840,9 @@ type ListTrailsInput struct { // The token to use to get the next page of results after a previous API call. // This token must be passed in with the same parameters that were specified - // in the the original call. For example, if the original call specified an - // AttributeKey of 'Username' with a value of 'root', the call with NextToken - // should include those same parameters. + // in the original call. For example, if the original call specified an AttributeKey + // of 'Username' with a value of 'root', the call with NextToken should include + // those same parameters. NextToken *string `type:"string"` } @@ -10329,9 +11000,9 @@ type LookupEventsInput struct { // The token to use to get the next page of results after a previous API call. // This token must be passed in with the same parameters that were specified - // in the the original call. For example, if the original call specified an - // AttributeKey of 'Username' with a value of 'root', the call with NextToken - // should include those same parameters. + // in the original call. For example, if the original call specified an AttributeKey + // of 'Username' with a value of 'root', the call with NextToken should include + // those same parameters. NextToken *string `type:"string"` // Specifies that only events that occur after or at the specified time are @@ -11965,6 +12636,48 @@ func (s *S3BucketDoesNotExistException) RequestID() string { return s.RespMetadata.RequestID } +// Contains configuration information about the service-linked channel. +type SourceConfig struct { + _ struct{} `type:"structure"` + + // The advanced event selectors configured for the service-linked channel. + AdvancedEventSelectors []*AdvancedEventSelector `type:"list"` + + // Specifies whether the service-linked channel applies to one region or all + // regions. + ApplyToAllRegions *bool `type:"boolean"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SourceConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SourceConfig) GoString() string { + return s.String() +} + +// SetAdvancedEventSelectors sets the AdvancedEventSelectors field's value. +func (s *SourceConfig) SetAdvancedEventSelectors(v []*AdvancedEventSelector) *SourceConfig { + s.AdvancedEventSelectors = v + return s +} + +// SetApplyToAllRegions sets the ApplyToAllRegions field's value. +func (s *SourceConfig) SetApplyToAllRegions(v bool) *SourceConfig { + s.ApplyToAllRegions = &v + return s +} + // The request to CloudTrail to start logging Amazon Web Services API calls // for an account. type StartLoggingInput struct { @@ -13416,6 +14129,22 @@ func (s *UpdateTrailOutput) SetTrailARN(v string) *UpdateTrailOutput { return s } +const ( + // DestinationTypeEventDataStore is a DestinationType enum value + DestinationTypeEventDataStore = "EVENT_DATA_STORE" + + // DestinationTypeAwsService is a DestinationType enum value + DestinationTypeAwsService = "AWS_SERVICE" +) + +// DestinationType_Values returns all elements of the DestinationType enum +func DestinationType_Values() []string { + return []string{ + DestinationTypeEventDataStore, + DestinationTypeAwsService, + } +} + const ( // EventCategoryInsight is a EventCategory enum value EventCategoryInsight = "insight" diff --git a/service/cloudtrail/cloudtrailiface/interface.go b/service/cloudtrail/cloudtrailiface/interface.go index fdaec00def8..ed888b466ea 100644 --- a/service/cloudtrail/cloudtrailiface/interface.go +++ b/service/cloudtrail/cloudtrailiface/interface.go @@ -92,6 +92,10 @@ type CloudTrailAPI interface { DescribeTrailsWithContext(aws.Context, *cloudtrail.DescribeTrailsInput, ...request.Option) (*cloudtrail.DescribeTrailsOutput, error) DescribeTrailsRequest(*cloudtrail.DescribeTrailsInput) (*request.Request, *cloudtrail.DescribeTrailsOutput) + GetChannel(*cloudtrail.GetChannelInput) (*cloudtrail.GetChannelOutput, error) + GetChannelWithContext(aws.Context, *cloudtrail.GetChannelInput, ...request.Option) (*cloudtrail.GetChannelOutput, error) + GetChannelRequest(*cloudtrail.GetChannelInput) (*request.Request, *cloudtrail.GetChannelOutput) + GetEventDataStore(*cloudtrail.GetEventDataStoreInput) (*cloudtrail.GetEventDataStoreOutput, error) GetEventDataStoreWithContext(aws.Context, *cloudtrail.GetEventDataStoreInput, ...request.Option) (*cloudtrail.GetEventDataStoreOutput, error) GetEventDataStoreRequest(*cloudtrail.GetEventDataStoreInput) (*request.Request, *cloudtrail.GetEventDataStoreOutput) @@ -119,6 +123,13 @@ type CloudTrailAPI interface { GetTrailStatusWithContext(aws.Context, *cloudtrail.GetTrailStatusInput, ...request.Option) (*cloudtrail.GetTrailStatusOutput, error) GetTrailStatusRequest(*cloudtrail.GetTrailStatusInput) (*request.Request, *cloudtrail.GetTrailStatusOutput) + ListChannels(*cloudtrail.ListChannelsInput) (*cloudtrail.ListChannelsOutput, error) + ListChannelsWithContext(aws.Context, *cloudtrail.ListChannelsInput, ...request.Option) (*cloudtrail.ListChannelsOutput, error) + ListChannelsRequest(*cloudtrail.ListChannelsInput) (*request.Request, *cloudtrail.ListChannelsOutput) + + ListChannelsPages(*cloudtrail.ListChannelsInput, func(*cloudtrail.ListChannelsOutput, bool) bool) error + ListChannelsPagesWithContext(aws.Context, *cloudtrail.ListChannelsInput, func(*cloudtrail.ListChannelsOutput, bool) bool, ...request.Option) error + ListEventDataStores(*cloudtrail.ListEventDataStoresInput) (*cloudtrail.ListEventDataStoresOutput, error) ListEventDataStoresWithContext(aws.Context, *cloudtrail.ListEventDataStoresInput, ...request.Option) (*cloudtrail.ListEventDataStoresOutput, error) ListEventDataStoresRequest(*cloudtrail.ListEventDataStoresInput) (*request.Request, *cloudtrail.ListEventDataStoresOutput) diff --git a/service/cloudtrail/errors.go b/service/cloudtrail/errors.go index 062bc4ad3e4..5a91c5d8a5a 100644 --- a/service/cloudtrail/errors.go +++ b/service/cloudtrail/errors.go @@ -26,6 +26,19 @@ const ( // and Prepare For Creating a Trail For Your Organization (https://docs.aws.amazon.com/awscloudtrail/latest/userguide/creating-an-organizational-trail-prepare.html). ErrCodeAccessNotEnabledException = "CloudTrailAccessNotEnabledException" + // ErrCodeChannelARNInvalidException for service response error code + // "ChannelARNInvalidException". + // + // The specified channel ARN is not valid or does not map to a channel in your + // account. + ErrCodeChannelARNInvalidException = "ChannelARNInvalidException" + + // ErrCodeChannelNotFoundException for service response error code + // "ChannelNotFoundException". + // + // The specified channel was not found. + ErrCodeChannelNotFoundException = "ChannelNotFoundException" + // ErrCodeCloudTrailInvalidClientTokenIdException for service response error code // "CloudTrailInvalidClientTokenIdException". // @@ -444,6 +457,8 @@ const ( var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "CloudTrailARNInvalidException": newErrorARNInvalidException, "CloudTrailAccessNotEnabledException": newErrorAccessNotEnabledException, + "ChannelARNInvalidException": newErrorChannelARNInvalidException, + "ChannelNotFoundException": newErrorChannelNotFoundException, "CloudTrailInvalidClientTokenIdException": newErrorCloudTrailInvalidClientTokenIdException, "CloudWatchLogsDeliveryUnavailableException": newErrorCloudWatchLogsDeliveryUnavailableException, "ConflictException": newErrorConflictException, diff --git a/service/lexmodelsv2/api.go b/service/lexmodelsv2/api.go index c89e3e22762..076e6622300 100644 --- a/service/lexmodelsv2/api.go +++ b/service/lexmodelsv2/api.go @@ -9773,6 +9773,59 @@ func (s *CodeHookSpecification) SetLambdaCodeHook(v *LambdaCodeHook) *CodeHookSp return s } +// A composite slot is a combination of two or more slots that capture multiple +// pieces of information in a single user input. +type CompositeSlotTypeSetting struct { + _ struct{} `type:"structure"` + + // Subslots in the composite slot. + SubSlots []*SubSlotTypeComposition `locationName:"subSlots" type:"list"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s CompositeSlotTypeSetting) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s CompositeSlotTypeSetting) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *CompositeSlotTypeSetting) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CompositeSlotTypeSetting"} + if s.SubSlots != nil { + for i, v := range s.SubSlots { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SubSlots", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetSubSlots sets the SubSlots field's value. +func (s *CompositeSlotTypeSetting) SetSubSlots(v []*SubSlotTypeComposition) *CompositeSlotTypeSetting { + s.SubSlots = v + return s +} + // Provides an expression that evaluates to true or false. type Condition struct { _ struct{} `type:"structure"` @@ -12144,6 +12197,10 @@ type CreateSlotInput struct { // type determines the values that can be entered into the slot. SlotTypeId *string `locationName:"slotTypeId" min:"1" type:"string"` + // Specifications for the constituent sub slots and the expression for the composite + // slot. + SubSlotSetting *SubSlotSetting `locationName:"subSlotSetting" type:"structure"` + // Specifies prompts that Amazon Lex sends to the user to elicit a response // that provides the value for the slot. // @@ -12213,6 +12270,11 @@ func (s *CreateSlotInput) Validate() error { invalidParams.AddNested("ObfuscationSetting", err.(request.ErrInvalidParams)) } } + if s.SubSlotSetting != nil { + if err := s.SubSlotSetting.Validate(); err != nil { + invalidParams.AddNested("SubSlotSetting", err.(request.ErrInvalidParams)) + } + } if s.ValueElicitationSetting != nil { if err := s.ValueElicitationSetting.Validate(); err != nil { invalidParams.AddNested("ValueElicitationSetting", err.(request.ErrInvalidParams)) @@ -12279,6 +12341,12 @@ func (s *CreateSlotInput) SetSlotTypeId(v string) *CreateSlotInput { return s } +// SetSubSlotSetting sets the SubSlotSetting field's value. +func (s *CreateSlotInput) SetSubSlotSetting(v *SubSlotSetting) *CreateSlotInput { + s.SubSlotSetting = v + return s +} + // SetValueElicitationSetting sets the ValueElicitationSetting field's value. func (s *CreateSlotInput) SetValueElicitationSetting(v *SlotValueElicitationSetting) *CreateSlotInput { s.ValueElicitationSetting = v @@ -12323,6 +12391,10 @@ type CreateSlotOutput struct { // The unique identifier of the slot type associated with this slot. SlotTypeId *string `locationName:"slotTypeId" min:"1" type:"string"` + // Specifications for the constituent sub slots and the expression for the composite + // slot. + SubSlotSetting *SubSlotSetting `locationName:"subSlotSetting" type:"structure"` + // The value elicitation settings specified for the slot. ValueElicitationSetting *SlotValueElicitationSetting `locationName:"valueElicitationSetting" type:"structure"` } @@ -12411,6 +12483,12 @@ func (s *CreateSlotOutput) SetSlotTypeId(v string) *CreateSlotOutput { return s } +// SetSubSlotSetting sets the SubSlotSetting field's value. +func (s *CreateSlotOutput) SetSubSlotSetting(v *SubSlotSetting) *CreateSlotOutput { + s.SubSlotSetting = v + return s +} + // SetValueElicitationSetting sets the ValueElicitationSetting field's value. func (s *CreateSlotOutput) SetValueElicitationSetting(v *SlotValueElicitationSetting) *CreateSlotOutput { s.ValueElicitationSetting = v @@ -12430,6 +12508,9 @@ type CreateSlotTypeInput struct { // BotVersion is a required field BotVersion *string `location:"uri" locationName:"botVersion" min:"5" type:"string" required:"true"` + // Specifications for a composite slot type. + CompositeSlotTypeSetting *CompositeSlotTypeSetting `locationName:"compositeSlotTypeSetting" type:"structure"` + // A description of the slot type. Use the description to help identify the // slot type in lists. Description *string `locationName:"description" type:"string"` @@ -12526,6 +12607,11 @@ func (s *CreateSlotTypeInput) Validate() error { if s.SlotTypeValues != nil && len(s.SlotTypeValues) < 1 { invalidParams.Add(request.NewErrParamMinLen("SlotTypeValues", 1)) } + if s.CompositeSlotTypeSetting != nil { + if err := s.CompositeSlotTypeSetting.Validate(); err != nil { + invalidParams.AddNested("CompositeSlotTypeSetting", err.(request.ErrInvalidParams)) + } + } if s.ExternalSourceSetting != nil { if err := s.ExternalSourceSetting.Validate(); err != nil { invalidParams.AddNested("ExternalSourceSetting", err.(request.ErrInvalidParams)) @@ -12565,6 +12651,12 @@ func (s *CreateSlotTypeInput) SetBotVersion(v string) *CreateSlotTypeInput { return s } +// SetCompositeSlotTypeSetting sets the CompositeSlotTypeSetting field's value. +func (s *CreateSlotTypeInput) SetCompositeSlotTypeSetting(v *CompositeSlotTypeSetting) *CreateSlotTypeInput { + s.CompositeSlotTypeSetting = v + return s +} + // SetDescription sets the Description field's value. func (s *CreateSlotTypeInput) SetDescription(v string) *CreateSlotTypeInput { s.Description = &v @@ -12616,6 +12708,9 @@ type CreateSlotTypeOutput struct { // The version of the bot associated with the slot type. BotVersion *string `locationName:"botVersion" min:"5" type:"string"` + // Specifications for a composite slot type. + CompositeSlotTypeSetting *CompositeSlotTypeSetting `locationName:"compositeSlotTypeSetting" type:"structure"` + // A timestamp of the date and time that the slot type was created. CreationDateTime *time.Time `locationName:"creationDateTime" type:"timestamp"` @@ -12676,6 +12771,12 @@ func (s *CreateSlotTypeOutput) SetBotVersion(v string) *CreateSlotTypeOutput { return s } +// SetCompositeSlotTypeSetting sets the CompositeSlotTypeSetting field's value. +func (s *CreateSlotTypeOutput) SetCompositeSlotTypeSetting(v *CompositeSlotTypeSetting) *CreateSlotTypeOutput { + s.CompositeSlotTypeSetting = v + return s +} + // SetCreationDateTime sets the CreationDateTime field's value. func (s *CreateSlotTypeOutput) SetCreationDateTime(v time.Time) *CreateSlotTypeOutput { s.CreationDateTime = &v @@ -16814,6 +16915,10 @@ type DescribeSlotOutput struct { // slot. SlotTypeId *string `locationName:"slotTypeId" min:"1" type:"string"` + // Specifications for the constituent sub slots and the expression for the composite + // slot. + SubSlotSetting *SubSlotSetting `locationName:"subSlotSetting" type:"structure"` + // Prompts that Amazon Lex uses to elicit a value for the slot. ValueElicitationSetting *SlotValueElicitationSetting `locationName:"valueElicitationSetting" type:"structure"` } @@ -16908,6 +17013,12 @@ func (s *DescribeSlotOutput) SetSlotTypeId(v string) *DescribeSlotOutput { return s } +// SetSubSlotSetting sets the SubSlotSetting field's value. +func (s *DescribeSlotOutput) SetSubSlotSetting(v *SubSlotSetting) *DescribeSlotOutput { + s.SubSlotSetting = v + return s +} + // SetValueElicitationSetting sets the ValueElicitationSetting field's value. func (s *DescribeSlotOutput) SetValueElicitationSetting(v *SlotValueElicitationSetting) *DescribeSlotOutput { s.ValueElicitationSetting = v @@ -17025,6 +17136,9 @@ type DescribeSlotTypeOutput struct { // The version of the bot associated with the slot type. BotVersion *string `locationName:"botVersion" min:"1" type:"string"` + // Specifications for a composite slot type. + CompositeSlotTypeSetting *CompositeSlotTypeSetting `locationName:"compositeSlotTypeSetting" type:"structure"` + // A timestamp of the date and time that the slot type was created. CreationDateTime *time.Time `locationName:"creationDateTime" type:"timestamp"` @@ -17088,6 +17202,12 @@ func (s *DescribeSlotTypeOutput) SetBotVersion(v string) *DescribeSlotTypeOutput return s } +// SetCompositeSlotTypeSetting sets the CompositeSlotTypeSetting field's value. +func (s *DescribeSlotTypeOutput) SetCompositeSlotTypeSetting(v *CompositeSlotTypeSetting) *DescribeSlotTypeOutput { + s.CompositeSlotTypeSetting = v + return s +} + // SetCreationDateTime sets the CreationDateTime field's value. func (s *DescribeSlotTypeOutput) SetCreationDateTime(v time.Time) *DescribeSlotTypeOutput { s.CreationDateTime = &v @@ -25601,7 +25721,8 @@ func (s *SlotValue) SetInterpretedValue(v string) *SlotValue { return s } -// Settings that you can use for eliciting a slot value. +// Specifies the elicitation setting details for constituent sub slots of a +// composite slot. type SlotValueElicitationSetting struct { _ struct{} `type:"structure"` @@ -25957,6 +26078,76 @@ func (s *SlotValueSelectionSetting) SetResolutionStrategy(v string) *SlotValueSe return s } +// Subslot specifications. +type Specifications struct { + _ struct{} `type:"structure"` + + // The unique identifier assigned to the slot type. + // + // SlotTypeId is a required field + SlotTypeId *string `locationName:"slotTypeId" min:"1" type:"string" required:"true"` + + // Specifies the elicitation setting details for constituent sub slots of a + // composite slot. + // + // ValueElicitationSetting is a required field + ValueElicitationSetting *SubSlotValueElicitationSetting `locationName:"valueElicitationSetting" type:"structure" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s Specifications) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s Specifications) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *Specifications) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Specifications"} + if s.SlotTypeId == nil { + invalidParams.Add(request.NewErrParamRequired("SlotTypeId")) + } + if s.SlotTypeId != nil && len(*s.SlotTypeId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SlotTypeId", 1)) + } + if s.ValueElicitationSetting == nil { + invalidParams.Add(request.NewErrParamRequired("ValueElicitationSetting")) + } + if s.ValueElicitationSetting != nil { + if err := s.ValueElicitationSetting.Validate(); err != nil { + invalidParams.AddNested("ValueElicitationSetting", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetSlotTypeId sets the SlotTypeId field's value. +func (s *Specifications) SetSlotTypeId(v string) *Specifications { + s.SlotTypeId = &v + return s +} + +// SetValueElicitationSetting sets the ValueElicitationSetting field's value. +func (s *Specifications) SetValueElicitationSetting(v *SubSlotValueElicitationSetting) *Specifications { + s.ValueElicitationSetting = v + return s +} + type StartBotRecommendationInput struct { _ struct{} `type:"structure"` @@ -26636,6 +26827,251 @@ func (s *StopBotRecommendationOutput) SetLocaleId(v string) *StopBotRecommendati return s } +// Specifications for the constituent sub slots and the expression for the composite +// slot. +type SubSlotSetting struct { + _ struct{} `type:"structure"` + + // The expression text for defining the constituent sub slots in the composite + // slot using logical AND and OR operators. + Expression *string `locationName:"expression" type:"string"` + + // Specifications for the constituent sub slots of a composite slot. + SlotSpecifications map[string]*Specifications `locationName:"slotSpecifications" type:"map"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SubSlotSetting) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SubSlotSetting) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *SubSlotSetting) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "SubSlotSetting"} + if s.SlotSpecifications != nil { + for i, v := range s.SlotSpecifications { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SlotSpecifications", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetExpression sets the Expression field's value. +func (s *SubSlotSetting) SetExpression(v string) *SubSlotSetting { + s.Expression = &v + return s +} + +// SetSlotSpecifications sets the SlotSpecifications field's value. +func (s *SubSlotSetting) SetSlotSpecifications(v map[string]*Specifications) *SubSlotSetting { + s.SlotSpecifications = v + return s +} + +// Subslot type composition. +type SubSlotTypeComposition struct { + _ struct{} `type:"structure"` + + // Name of a constituent sub slot inside a composite slot. + // + // Name is a required field + Name *string `locationName:"name" min:"1" type:"string" required:"true"` + + // The unique identifier assigned to a slot type. This refers to either a built-in + // slot type or the unique slotTypeId of a custom slot type. + // + // SlotTypeId is a required field + SlotTypeId *string `locationName:"slotTypeId" min:"1" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SubSlotTypeComposition) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SubSlotTypeComposition) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *SubSlotTypeComposition) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "SubSlotTypeComposition"} + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + if s.Name != nil && len(*s.Name) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Name", 1)) + } + if s.SlotTypeId == nil { + invalidParams.Add(request.NewErrParamRequired("SlotTypeId")) + } + if s.SlotTypeId != nil && len(*s.SlotTypeId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SlotTypeId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetName sets the Name field's value. +func (s *SubSlotTypeComposition) SetName(v string) *SubSlotTypeComposition { + s.Name = &v + return s +} + +// SetSlotTypeId sets the SlotTypeId field's value. +func (s *SubSlotTypeComposition) SetSlotTypeId(v string) *SubSlotTypeComposition { + s.SlotTypeId = &v + return s +} + +// Subslot elicitation settings. +// +// DefaultValueSpecification is a list of default values for a constituent sub +// slot in a composite slot. Default values are used when Amazon Lex hasn't +// determined a value for a slot. You can specify default values from context +// variables, session attributes, and defined values. This is similar to DefaultValueSpecification +// for slots. +// +// PromptSpecification is the prompt that Amazon Lex uses to elicit the sub +// slot value from the user. This is similar to PromptSpecification for slots. +type SubSlotValueElicitationSetting struct { + _ struct{} `type:"structure"` + + // Defines a list of values that Amazon Lex should use as the default value + // for a slot. + DefaultValueSpecification *SlotDefaultValueSpecification `locationName:"defaultValueSpecification" type:"structure"` + + // Specifies a list of message groups that Amazon Lex sends to a user to elicit + // a response. + // + // PromptSpecification is a required field + PromptSpecification *PromptSpecification `locationName:"promptSpecification" type:"structure" required:"true"` + + // If you know a specific pattern that users might respond to an Amazon Lex + // request for a sub slot value, you can provide those utterances to improve + // accuracy. This is optional. In most cases Amazon Lex is capable of understanding + // user utterances. This is similar to SampleUtterances for slots. + SampleUtterances []*SampleUtterance `locationName:"sampleUtterances" type:"list"` + + // Specifies the prompts that Amazon Lex uses while a bot is waiting for customer + // input. + WaitAndContinueSpecification *WaitAndContinueSpecification `locationName:"waitAndContinueSpecification" type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SubSlotValueElicitationSetting) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SubSlotValueElicitationSetting) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *SubSlotValueElicitationSetting) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "SubSlotValueElicitationSetting"} + if s.PromptSpecification == nil { + invalidParams.Add(request.NewErrParamRequired("PromptSpecification")) + } + if s.DefaultValueSpecification != nil { + if err := s.DefaultValueSpecification.Validate(); err != nil { + invalidParams.AddNested("DefaultValueSpecification", err.(request.ErrInvalidParams)) + } + } + if s.PromptSpecification != nil { + if err := s.PromptSpecification.Validate(); err != nil { + invalidParams.AddNested("PromptSpecification", err.(request.ErrInvalidParams)) + } + } + if s.SampleUtterances != nil { + for i, v := range s.SampleUtterances { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "SampleUtterances", i), err.(request.ErrInvalidParams)) + } + } + } + if s.WaitAndContinueSpecification != nil { + if err := s.WaitAndContinueSpecification.Validate(); err != nil { + invalidParams.AddNested("WaitAndContinueSpecification", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDefaultValueSpecification sets the DefaultValueSpecification field's value. +func (s *SubSlotValueElicitationSetting) SetDefaultValueSpecification(v *SlotDefaultValueSpecification) *SubSlotValueElicitationSetting { + s.DefaultValueSpecification = v + return s +} + +// SetPromptSpecification sets the PromptSpecification field's value. +func (s *SubSlotValueElicitationSetting) SetPromptSpecification(v *PromptSpecification) *SubSlotValueElicitationSetting { + s.PromptSpecification = v + return s +} + +// SetSampleUtterances sets the SampleUtterances field's value. +func (s *SubSlotValueElicitationSetting) SetSampleUtterances(v []*SampleUtterance) *SubSlotValueElicitationSetting { + s.SampleUtterances = v + return s +} + +// SetWaitAndContinueSpecification sets the WaitAndContinueSpecification field's value. +func (s *SubSlotValueElicitationSetting) SetWaitAndContinueSpecification(v *WaitAndContinueSpecification) *SubSlotValueElicitationSetting { + s.WaitAndContinueSpecification = v + return s +} + type TagResourceInput struct { _ struct{} `type:"structure"` @@ -28943,6 +29379,10 @@ type UpdateSlotInput struct { // The unique identifier of the new slot type to associate with this slot. SlotTypeId *string `locationName:"slotTypeId" min:"1" type:"string"` + // Specifications for the constituent sub slots and the expression for the composite + // slot. + SubSlotSetting *SubSlotSetting `locationName:"subSlotSetting" type:"structure"` + // A new set of prompts that Amazon Lex sends to the user to elicit a response // the provides a value for the slot. // @@ -29018,6 +29458,11 @@ func (s *UpdateSlotInput) Validate() error { invalidParams.AddNested("ObfuscationSetting", err.(request.ErrInvalidParams)) } } + if s.SubSlotSetting != nil { + if err := s.SubSlotSetting.Validate(); err != nil { + invalidParams.AddNested("SubSlotSetting", err.(request.ErrInvalidParams)) + } + } if s.ValueElicitationSetting != nil { if err := s.ValueElicitationSetting.Validate(); err != nil { invalidParams.AddNested("ValueElicitationSetting", err.(request.ErrInvalidParams)) @@ -29090,6 +29535,12 @@ func (s *UpdateSlotInput) SetSlotTypeId(v string) *UpdateSlotInput { return s } +// SetSubSlotSetting sets the SubSlotSetting field's value. +func (s *UpdateSlotInput) SetSubSlotSetting(v *SubSlotSetting) *UpdateSlotInput { + s.SubSlotSetting = v + return s +} + // SetValueElicitationSetting sets the ValueElicitationSetting field's value. func (s *UpdateSlotInput) SetValueElicitationSetting(v *SlotValueElicitationSetting) *UpdateSlotInput { s.ValueElicitationSetting = v @@ -29137,6 +29588,10 @@ type UpdateSlotOutput struct { // The updated identifier of the slot type that provides values for the slot. SlotTypeId *string `locationName:"slotTypeId" min:"1" type:"string"` + // Specifications for the constituent sub slots and the expression for the composite + // slot. + SubSlotSetting *SubSlotSetting `locationName:"subSlotSetting" type:"structure"` + // The updated prompts that Amazon Lex sends to the user to elicit a response // that provides a value for the slot. ValueElicitationSetting *SlotValueElicitationSetting `locationName:"valueElicitationSetting" type:"structure"` @@ -29232,6 +29687,12 @@ func (s *UpdateSlotOutput) SetSlotTypeId(v string) *UpdateSlotOutput { return s } +// SetSubSlotSetting sets the SubSlotSetting field's value. +func (s *UpdateSlotOutput) SetSubSlotSetting(v *SubSlotSetting) *UpdateSlotOutput { + s.SubSlotSetting = v + return s +} + // SetValueElicitationSetting sets the ValueElicitationSetting field's value. func (s *UpdateSlotOutput) SetValueElicitationSetting(v *SlotValueElicitationSetting) *UpdateSlotOutput { s.ValueElicitationSetting = v @@ -29251,6 +29712,9 @@ type UpdateSlotTypeInput struct { // BotVersion is a required field BotVersion *string `location:"uri" locationName:"botVersion" min:"5" type:"string" required:"true"` + // Specifications for a composite slot type. + CompositeSlotTypeSetting *CompositeSlotTypeSetting `locationName:"compositeSlotTypeSetting" type:"structure"` + // The new description of the slot type. Description *string `locationName:"description" type:"string"` @@ -29341,6 +29805,11 @@ func (s *UpdateSlotTypeInput) Validate() error { if s.SlotTypeValues != nil && len(s.SlotTypeValues) < 1 { invalidParams.Add(request.NewErrParamMinLen("SlotTypeValues", 1)) } + if s.CompositeSlotTypeSetting != nil { + if err := s.CompositeSlotTypeSetting.Validate(); err != nil { + invalidParams.AddNested("CompositeSlotTypeSetting", err.(request.ErrInvalidParams)) + } + } if s.ExternalSourceSetting != nil { if err := s.ExternalSourceSetting.Validate(); err != nil { invalidParams.AddNested("ExternalSourceSetting", err.(request.ErrInvalidParams)) @@ -29380,6 +29849,12 @@ func (s *UpdateSlotTypeInput) SetBotVersion(v string) *UpdateSlotTypeInput { return s } +// SetCompositeSlotTypeSetting sets the CompositeSlotTypeSetting field's value. +func (s *UpdateSlotTypeInput) SetCompositeSlotTypeSetting(v *CompositeSlotTypeSetting) *UpdateSlotTypeInput { + s.CompositeSlotTypeSetting = v + return s +} + // SetDescription sets the Description field's value. func (s *UpdateSlotTypeInput) SetDescription(v string) *UpdateSlotTypeInput { s.Description = &v @@ -29437,6 +29912,9 @@ type UpdateSlotTypeOutput struct { // The version of the bot that contains the slot type. This is always DRAFT. BotVersion *string `locationName:"botVersion" min:"5" type:"string"` + // Specifications for a composite slot type. + CompositeSlotTypeSetting *CompositeSlotTypeSetting `locationName:"compositeSlotTypeSetting" type:"structure"` + // The timestamp of the date and time that the slot type was created. CreationDateTime *time.Time `locationName:"creationDateTime" type:"timestamp"` @@ -29500,6 +29978,12 @@ func (s *UpdateSlotTypeOutput) SetBotVersion(v string) *UpdateSlotTypeOutput { return s } +// SetCompositeSlotTypeSetting sets the CompositeSlotTypeSetting field's value. +func (s *UpdateSlotTypeOutput) SetCompositeSlotTypeSetting(v *CompositeSlotTypeSetting) *UpdateSlotTypeOutput { + s.CompositeSlotTypeSetting = v + return s +} + // SetCreationDateTime sets the CreationDateTime field's value. func (s *UpdateSlotTypeOutput) SetCreationDateTime(v time.Time) *UpdateSlotTypeOutput { s.CreationDateTime = &v @@ -30624,6 +31108,9 @@ const ( // SlotTypeCategoryExternalGrammar is a SlotTypeCategory enum value SlotTypeCategoryExternalGrammar = "ExternalGrammar" + + // SlotTypeCategoryComposite is a SlotTypeCategory enum value + SlotTypeCategoryComposite = "Composite" ) // SlotTypeCategory_Values returns all elements of the SlotTypeCategory enum @@ -30632,6 +31119,7 @@ func SlotTypeCategory_Values() []string { SlotTypeCategoryCustom, SlotTypeCategoryExtended, SlotTypeCategoryExternalGrammar, + SlotTypeCategoryComposite, } } @@ -30689,6 +31177,9 @@ const ( // SlotValueResolutionStrategyTopResolution is a SlotValueResolutionStrategy enum value SlotValueResolutionStrategyTopResolution = "TopResolution" + + // SlotValueResolutionStrategyConcatenation is a SlotValueResolutionStrategy enum value + SlotValueResolutionStrategyConcatenation = "Concatenation" ) // SlotValueResolutionStrategy_Values returns all elements of the SlotValueResolutionStrategy enum @@ -30696,6 +31187,7 @@ func SlotValueResolutionStrategy_Values() []string { return []string{ SlotValueResolutionStrategyOriginalValue, SlotValueResolutionStrategyTopResolution, + SlotValueResolutionStrategyConcatenation, } } diff --git a/service/lexruntimev2/api.go b/service/lexruntimev2/api.go index 4a1ba362c77..233eb8420fb 100644 --- a/service/lexruntimev2/api.go +++ b/service/lexruntimev2/api.go @@ -1672,6 +1672,10 @@ type ConfigurationEvent struct { SessionState *SessionState `locationName:"sessionState" type:"structure"` // A list of messages to send to the user. + // + // If you set the welcomeMessage field, you must also set the DialogAction (https://docs.aws.amazon.com/lexv2/latest/dg/API_runtime_DialogAction.html) + // structure's type (https://docs.aws.amazon.com/lexv2/latest/dg/API_runtime_DialogAction.html#lexv2-Type-runtime_DialogAction-type) + // field. WelcomeMessages []*Message `locationName:"welcomeMessages" type:"list"` } @@ -2214,6 +2218,10 @@ type DialogAction struct { // The name of the slot that should be elicited from the user. SlotToElicit *string `locationName:"slotToElicit" min:"1" type:"string"` + // The name of the constituent sub slot of the composite slot specified in slotToElicit + // that should be elicited from the user. + SubSlotToElicit *ElicitSubSlot `locationName:"subSlotToElicit" type:"structure"` + // The next action that the bot should take in its interaction with the user. // The possible values are: // @@ -2227,6 +2235,8 @@ type DialogAction struct { // // * Delegate - The next action is determined by Amazon Lex V2. // + // * ElicitIntent - The next action is to elicit an intent from the user. + // // * ElicitSlot - The next action is to elicit a slot value from the user. // // Type is a required field @@ -2260,6 +2270,11 @@ func (s *DialogAction) Validate() error { if s.Type == nil { invalidParams.Add(request.NewErrParamRequired("Type")) } + if s.SubSlotToElicit != nil { + if err := s.SubSlotToElicit.Validate(); err != nil { + invalidParams.AddNested("SubSlotToElicit", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -2279,6 +2294,12 @@ func (s *DialogAction) SetSlotToElicit(v string) *DialogAction { return s } +// SetSubSlotToElicit sets the SubSlotToElicit field's value. +func (s *DialogAction) SetSubSlotToElicit(v *ElicitSubSlot) *DialogAction { + s.SubSlotToElicit = v + return s +} + // SetType sets the Type field's value. func (s *DialogAction) SetType(v string) *DialogAction { s.Type = &v @@ -2359,6 +2380,71 @@ func (s *DisconnectionEvent) MarshalEvent(pm protocol.PayloadMarshaler) (msg eve return msg, err } +// The specific constituent sub slot of the composite slot to elicit in dialog +// action. +type ElicitSubSlot struct { + _ struct{} `type:"structure"` + + // The name of the slot that should be elicited from the user. + // + // Name is a required field + Name *string `locationName:"name" min:"1" type:"string" required:"true"` + + // The field is not supported. + SubSlotToElicit *ElicitSubSlot `locationName:"subSlotToElicit" type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ElicitSubSlot) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ElicitSubSlot) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ElicitSubSlot) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ElicitSubSlot"} + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + if s.Name != nil && len(*s.Name) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Name", 1)) + } + if s.SubSlotToElicit != nil { + if err := s.SubSlotToElicit.Validate(); err != nil { + invalidParams.AddNested("SubSlotToElicit", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetName sets the Name field's value. +func (s *ElicitSubSlot) SetName(v string) *ElicitSubSlot { + s.Name = &v + return s +} + +// SetSubSlotToElicit sets the SubSlotToElicit field's value. +func (s *ElicitSubSlot) SetSubSlotToElicit(v *ElicitSubSlot) *ElicitSubSlot { + s.SubSlotToElicit = v + return s +} + type GetSessionInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -4223,9 +4309,14 @@ type RuntimeHintDetails struct { // One or more strings that Amazon Lex V2 should look for in the input to the // bot. Each phrase is given preference when deciding on slot values. - // - // RuntimeHintValues is a required field - RuntimeHintValues []*RuntimeHintValue `locationName:"runtimeHintValues" min:"1" type:"list" required:"true"` + RuntimeHintValues []*RuntimeHintValue `locationName:"runtimeHintValues" min:"1" type:"list"` + + // A map of constituent sub slot names inside a composite slot in the intent + // and the phrases that should be added for each sub slot. Inside each composite + // slot hints, this structure provides a mechanism to add granular sub slot + // phrases. Only sub slot hints are supported for composite slots. The intent + // name, composite slot name and the constituent sub slot names must exist. + SubSlotHints map[string]*RuntimeHintDetails `locationName:"subSlotHints" type:"map"` } // String returns the string representation. @@ -4252,6 +4343,12 @@ func (s *RuntimeHintDetails) SetRuntimeHintValues(v []*RuntimeHintValue) *Runtim return s } +// SetSubSlotHints sets the SubSlotHints field's value. +func (s *RuntimeHintDetails) SetSubSlotHints(v map[string]*RuntimeHintDetails) *RuntimeHintDetails { + s.SubSlotHints = v + return s +} + // Provides the phrase that Amazon Lex V2 should look for in the user's input // to the bot. type RuntimeHintValue struct { @@ -4296,7 +4393,8 @@ func (s *RuntimeHintValue) SetPhrase(v string) *RuntimeHintValue { // Before you can use runtime hints with an existing bot, you must first rebuild // the bot. // -// For more information, see Using hints to improve accuracy (https://docs.aws.amazon.com/lexv2/latest/dg/using-hints.xml). +// For more information, see Using runtime hints to improve recognition of slot +// values (https://docs.aws.amazon.com/lexv2/latest/dg/using-hints.html). type RuntimeHints struct { _ struct{} `type:"structure"` @@ -4305,7 +4403,7 @@ type RuntimeHints struct { // // The first level of the slotHints map is the name of the intent. The second // level is the name of the slot within the intent. For more information, see - // Using hints to improve accuracy (https://docs.aws.amazon.com/lexv2/latest/dg/using-hints.xml). + // Using hints to improve accuracy (https://docs.aws.amazon.com/lexv2/latest/dg/using-hints.html). // // The intent name and slot name must exist. SlotHints map[string]map[string]*RuntimeHintDetails `locationName:"slotHints" type:"map"` @@ -4569,6 +4667,9 @@ type Slot struct { // field contains a single value. Shape *string `locationName:"shape" type:"string" enum:"Shape"` + // The constituent sub slots of a composite slot. + SubSlots map[string]*Slot `locationName:"subSlots" type:"map"` + // The current value of the slot. Value *Value `locationName:"value" type:"structure"` @@ -4627,6 +4728,12 @@ func (s *Slot) SetShape(v string) *Slot { return s } +// SetSubSlots sets the SubSlots field's value. +func (s *Slot) SetSubSlots(v map[string]*Slot) *Slot { + s.SubSlots = v + return s +} + // SetValue sets the Value field's value. func (s *Slot) SetValue(v *Value) *Slot { s.Value = v @@ -5729,6 +5836,9 @@ const ( // ShapeList is a Shape enum value ShapeList = "List" + + // ShapeComposite is a Shape enum value + ShapeComposite = "Composite" ) // Shape_Values returns all elements of the Shape enum @@ -5736,6 +5846,7 @@ func Shape_Values() []string { return []string{ ShapeScalar, ShapeList, + ShapeComposite, } } diff --git a/service/lexruntimev2/eventstream_test.go b/service/lexruntimev2/eventstream_test.go index 69eae1bd66c..cbb927c07f8 100644 --- a/service/lexruntimev2/eventstream_test.go +++ b/service/lexruntimev2/eventstream_test.go @@ -241,7 +241,8 @@ func mockStartConversationReadEvents() ( Name: aws.String("string value goes here"), Slots: map[string]*Slot{ "a": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -254,7 +255,8 @@ func mockStartConversationReadEvents() ( Values: []*Slot{}, }, "b": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -267,7 +269,8 @@ func mockStartConversationReadEvents() ( Values: []*Slot{}, }, "c": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -301,7 +304,8 @@ func mockStartConversationReadEvents() ( Name: aws.String("string value goes here"), Slots: map[string]*Slot{ "a": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -314,7 +318,8 @@ func mockStartConversationReadEvents() ( Values: []*Slot{}, }, "b": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -327,7 +332,8 @@ func mockStartConversationReadEvents() ( Values: []*Slot{}, }, "c": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -361,7 +367,8 @@ func mockStartConversationReadEvents() ( Name: aws.String("string value goes here"), Slots: map[string]*Slot{ "a": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -374,7 +381,8 @@ func mockStartConversationReadEvents() ( Values: []*Slot{}, }, "b": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -387,7 +395,8 @@ func mockStartConversationReadEvents() ( Values: []*Slot{}, }, "c": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -464,14 +473,19 @@ func mockStartConversationReadEvents() ( DialogAction: &DialogAction{ SlotElicitationStyle: aws.String("string value goes here"), SlotToElicit: aws.String("string value goes here"), - Type: aws.String("string value goes here"), + SubSlotToElicit: &ElicitSubSlot{ + Name: aws.String("string value goes here"), + SubSlotToElicit: nil, + }, + Type: aws.String("string value goes here"), }, Intent: &Intent{ ConfirmationState: aws.String("string value goes here"), Name: aws.String("string value goes here"), Slots: map[string]*Slot{ "a": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -484,7 +498,8 @@ func mockStartConversationReadEvents() ( Values: []*Slot{}, }, "b": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -497,7 +512,8 @@ func mockStartConversationReadEvents() ( Values: []*Slot{}, }, "c": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -528,6 +544,7 @@ func mockStartConversationReadEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "b": { RuntimeHintValues: []*RuntimeHintValue{ @@ -541,6 +558,7 @@ func mockStartConversationReadEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "c": { RuntimeHintValues: []*RuntimeHintValue{ @@ -554,6 +572,7 @@ func mockStartConversationReadEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, }, "b": { @@ -569,6 +588,7 @@ func mockStartConversationReadEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "b": { RuntimeHintValues: []*RuntimeHintValue{ @@ -582,6 +602,7 @@ func mockStartConversationReadEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "c": { RuntimeHintValues: []*RuntimeHintValue{ @@ -595,6 +616,7 @@ func mockStartConversationReadEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, }, "c": { @@ -610,6 +632,7 @@ func mockStartConversationReadEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "b": { RuntimeHintValues: []*RuntimeHintValue{ @@ -623,6 +646,7 @@ func mockStartConversationReadEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "c": { RuntimeHintValues: []*RuntimeHintValue{ @@ -636,6 +660,7 @@ func mockStartConversationReadEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, }, }, @@ -1118,14 +1143,19 @@ func mockStartConversationWriteEvents() ( DialogAction: &DialogAction{ SlotElicitationStyle: aws.String("string value goes here"), SlotToElicit: aws.String("string value goes here"), - Type: aws.String("string value goes here"), + SubSlotToElicit: &ElicitSubSlot{ + Name: aws.String("string value goes here"), + SubSlotToElicit: nil, + }, + Type: aws.String("string value goes here"), }, Intent: &Intent{ ConfirmationState: aws.String("string value goes here"), Name: aws.String("string value goes here"), Slots: map[string]*Slot{ "a": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -1138,7 +1168,8 @@ func mockStartConversationWriteEvents() ( Values: []*Slot{}, }, "b": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -1151,7 +1182,8 @@ func mockStartConversationWriteEvents() ( Values: []*Slot{}, }, "c": { - Shape: aws.String("string value goes here"), + Shape: aws.String("string value goes here"), + SubSlots: nil, Value: &Value{ InterpretedValue: aws.String("string value goes here"), OriginalValue: aws.String("string value goes here"), @@ -1182,6 +1214,7 @@ func mockStartConversationWriteEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "b": { RuntimeHintValues: []*RuntimeHintValue{ @@ -1195,6 +1228,7 @@ func mockStartConversationWriteEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "c": { RuntimeHintValues: []*RuntimeHintValue{ @@ -1208,6 +1242,7 @@ func mockStartConversationWriteEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, }, "b": { @@ -1223,6 +1258,7 @@ func mockStartConversationWriteEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "b": { RuntimeHintValues: []*RuntimeHintValue{ @@ -1236,6 +1272,7 @@ func mockStartConversationWriteEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "c": { RuntimeHintValues: []*RuntimeHintValue{ @@ -1249,6 +1286,7 @@ func mockStartConversationWriteEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, }, "c": { @@ -1264,6 +1302,7 @@ func mockStartConversationWriteEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "b": { RuntimeHintValues: []*RuntimeHintValue{ @@ -1277,6 +1316,7 @@ func mockStartConversationWriteEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, "c": { RuntimeHintValues: []*RuntimeHintValue{ @@ -1290,6 +1330,7 @@ func mockStartConversationWriteEvents() ( Phrase: aws.String("string value goes here"), }, }, + SubSlotHints: nil, }, }, }, diff --git a/service/redshift/api.go b/service/redshift/api.go index ba2c99ced87..ce271d20443 100644 --- a/service/redshift/api.go +++ b/service/redshift/api.go @@ -10037,7 +10037,9 @@ func (c *Redshift) ModifyAquaConfigurationRequest(input *ModifyAquaConfiguration // ModifyAquaConfiguration API operation for Amazon Redshift. // -// Modifies whether a cluster can use AQUA (Advanced Query Accelerator). +// This operation is retired. Calling this operation does not change AQUA configuration. +// Amazon Redshift automatically determines whether to use AQUA (Advanced Query +// Accelerator). // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -13240,29 +13242,17 @@ func (s *AddPartnerOutput) SetPartnerName(v string) *AddPartnerOutput { return s } -// The AQUA (Advanced Query Accelerator) configuration of the cluster. +// The operation that uses this structure is retired. Amazon Redshift automatically +// determines whether to use AQUA (Advanced Query Accelerator). type AquaConfiguration struct { _ struct{} `type:"structure"` - // The value represents how the cluster is configured to use AQUA. Possible - // values include the following. - // - // * enabled - Use AQUA if it is available for the current Amazon Web Services - // Region and Amazon Redshift node type. - // - // * disabled - Don't use AQUA. - // - // * auto - Amazon Redshift determines whether to use AQUA. + // This field is retired. Amazon Redshift automatically determines whether to + // use AQUA (Advanced Query Accelerator). AquaConfigurationStatus *string `type:"string" enum:"AquaConfigurationStatus"` - // The value indicates the status of AQUA on the cluster. Possible values include - // the following. - // - // * enabled - AQUA is enabled. - // - // * disabled - AQUA is not enabled. - // - // * applying - AQUA status is being applied. + // This field is retired. Amazon Redshift automatically determines whether to + // use AQUA (Advanced Query Accelerator). AquaStatus *string `type:"string" enum:"AquaStatus"` } @@ -14538,7 +14528,8 @@ type Cluster struct { // be applied automatically to the cluster during the maintenance window. AllowVersionUpgrade *bool `type:"boolean"` - // The AQUA (Advanced Query Accelerator) configuration of the cluster. + // This field is retired. Amazon Redshift automatically determines whether to + // use AQUA (Advanced Query Accelerator). AquaConfiguration *AquaConfiguration `type:"structure"` // The number of days that automatic cluster snapshots are retained. @@ -16116,15 +16107,9 @@ type CreateClusterInput struct { // Default: true AllowVersionUpgrade *bool `type:"boolean"` - // The value represents how the cluster is configured to use AQUA (Advanced - // Query Accelerator) when it is created. Possible values include the following. - // - // * enabled - Use AQUA if it is available for the current Amazon Web Services - // Region and Amazon Redshift node type. - // - // * disabled - Don't use AQUA. - // - // * auto - Amazon Redshift determines whether to use AQUA. + // This parameter is retired. It does not set the AQUA configuration status. + // Amazon Redshift automatically determines whether to use AQUA (Advanced Query + // Accelerator). AquaConfigurationStatus *string `type:"string" enum:"AquaConfigurationStatus"` // The number of days that automated snapshots are retained. If the value is @@ -16249,9 +16234,7 @@ type CreateClusterInput struct { // the cluster when the cluster was created. DefaultIamRoleArn *string `type:"string"` - // The Elastic IP (EIP) address for the cluster. You don't have to specify the - // EIP for a publicly accessible cluster with AvailabilityZoneRelocation turned - // on. + // The Elastic IP (EIP) address for the cluster. // // Constraints: The cluster must be provisioned in EC2-VPC and publicly-accessible // through an Internet gateway. For more information about provisioning clusters @@ -26498,8 +26481,8 @@ type GetClusterCredentialsInput struct { // // * Must be 1 to 64 alphanumeric characters or hyphens // - // * Must contain only lowercase letters, numbers, underscore, plus sign, - // period (dot), at symbol (@), or hyphen. + // * Must contain uppercase or lowercase letters, numbers, underscore, plus + // sign, period (dot), at symbol (@), or hyphen. // // * First character must be a letter. // @@ -26526,8 +26509,8 @@ type GetClusterCredentialsInput struct { // * Must be 1 to 64 alphanumeric characters or hyphens. The user name can't // be PUBLIC. // - // * Must contain only lowercase letters, numbers, underscore, plus sign, - // period (dot), at symbol (@), or hyphen. + // * Must contain uppercase or lowercase letters, numbers, underscore, plus + // sign, period (dot), at symbol (@), or hyphen. // // * First character must be a letter. // @@ -27439,14 +27422,8 @@ func (s *MaintenanceTrack) SetUpdateTargets(v []*UpdateTarget) *MaintenanceTrack type ModifyAquaConfigurationInput struct { _ struct{} `type:"structure"` - // The new value of AQUA configuration status. Possible values include the following. - // - // * enabled - Use AQUA if it is available for the current Amazon Web Services - // Region and Amazon Redshift node type. - // - // * disabled - Don't use AQUA. - // - // * auto - Amazon Redshift determines whether to use AQUA. + // This parameter is retired. Amazon Redshift automatically determines whether + // to use AQUA (Advanced Query Accelerator). AquaConfigurationStatus *string `type:"string" enum:"AquaConfigurationStatus"` // The identifier of the cluster to be modified. @@ -27501,7 +27478,8 @@ func (s *ModifyAquaConfigurationInput) SetClusterIdentifier(v string) *ModifyAqu type ModifyAquaConfigurationOutput struct { _ struct{} `type:"structure"` - // The updated AQUA configuration of the cluster. + // This parameter is retired. Amazon Redshift automatically determines whether + // to use AQUA (Advanced Query Accelerator). AquaConfiguration *AquaConfiguration `type:"structure"` } @@ -31573,16 +31551,9 @@ type RestoreFromClusterSnapshotInput struct { // Default: true AllowVersionUpgrade *bool `type:"boolean"` - // The value represents how the cluster is configured to use AQUA (Advanced - // Query Accelerator) after the cluster is restored. Possible values include - // the following. - // - // * enabled - Use AQUA if it is available for the current Amazon Web Services - // Region and Amazon Redshift node type. - // - // * disabled - Don't use AQUA. - // - // * auto - Amazon Redshift determines whether to use AQUA. + // This parameter is retired. It does not set the AQUA configuration status. + // Amazon Redshift automatically determines whether to use AQUA (Advanced Query + // Accelerator). AquaConfigurationStatus *string `type:"string" enum:"AquaConfigurationStatus"` // The number of days that automated snapshots are retained. If the value is @@ -31658,9 +31629,7 @@ type RestoreFromClusterSnapshotInput struct { // a snapshot. DefaultIamRoleArn *string `type:"string"` - // The elastic IP (EIP) address for the cluster. You don't have to specify the - // EIP for a publicly accessible cluster with AvailabilityZoneRelocation turned - // on. + // The elastic IP (EIP) address for the cluster. ElasticIp *string `type:"string"` // Enables support for restoring an unencrypted snapshot to a cluster encrypted @@ -31771,7 +31740,8 @@ type RestoreFromClusterSnapshotInput struct { ReservedNodeId *string `type:"string"` // The Amazon Resource Name (ARN) of the snapshot associated with the message - // to restore from a cluster. + // to restore from a cluster. You can specify this parameter or snapshotIdentifier, + // but not both. SnapshotArn *string `type:"string"` // The name of the cluster the source snapshot was created from. This parameter @@ -31780,7 +31750,8 @@ type RestoreFromClusterSnapshotInput struct { SnapshotClusterIdentifier *string `type:"string"` // The name of the snapshot from which to create the new cluster. This parameter - // isn't case sensitive. + // isn't case sensitive. You can specify this parameter or snapshotArn, but + // not both. // // Example: my-snapshot-id SnapshotIdentifier *string `type:"string"`