Lists the use cases for the integration association.
", "ListUserHierarchyGroups": "Provides summary information about the hierarchy groups for the specified Amazon Connect instance.
For more information about agent hierarchies, see Set Up Agent Hierarchies in the Amazon Connect Administrator Guide.
", "ListUsers": "Provides summary information about the users for the specified Amazon Connect instance.
", - "MonitorContact": "Initiates silent monitoring of a contact. The Contact Control Panel (CCP) of the user specified by userId will be set to silent monitoring mode on the contact. Supports voice and chat contacts.
", + "MonitorContact": "Initiates silent monitoring of a contact. The Contact Control Panel (CCP) of the user specified by userId will be set to silent monitoring mode on the contact.
", "PutUserStatus": "Changes the current status of a user or agent in Amazon Connect. If the agent is currently handling a contact, this sets the agent's next status.
For more information, see Agent status and Set your next status in the Amazon Connect Administrator Guide.
", "ReleasePhoneNumber": "Releases a phone number previously claimed to an Amazon Connect instance or traffic distribution group. You can call this API only in the Amazon Web Services Region where the number was claimed.
To release phone numbers from a traffic distribution group, use the ReleasePhoneNumber API, not the Amazon Connect console.
After releasing a phone number, the phone number enters into a cooldown period of 30 days. It cannot be searched for or claimed again until the period has ended. If you accidentally release a phone number, contact Amazon Web Services Support.
Replicates an Amazon Connect instance in the specified Amazon Web Services Region.
For more information about replicating an Amazon Connect instance, see Create a replica of your existing Amazon Connect instance in the Amazon Connect Administrator Guide.
", @@ -358,9 +358,11 @@ "base": null, "refs": { "AgentStatus$Name": "The name of the agent status.
", + "AgentStatusReference$StatusName": "The name of the agent status.
", "AgentStatusSummary$Name": "The name of the agent status.
", "CreateAgentStatusRequest$Name": "The name of the status.
", - "UpdateAgentStatusRequest$Name": "The name of the agent status.
" + "UpdateAgentStatusRequest$Name": "The name of the agent status.
", + "UserData$NextStatus": "The Next status of the agent.
" } }, "AgentStatusOrderNumber": { @@ -420,6 +422,12 @@ "UserSummary$Username": "The Amazon Connect user name of the user account.
" } }, + "AgentsMinOneMaxHundred": { + "base": null, + "refs": { + "UserDataFilters$Agents": "A list of up to 100 agent IDs or ARNs.
" + } + }, "AliasArn": { "base": null, "refs": { @@ -449,6 +457,8 @@ "ApproximateTotalCount": { "base": null, "refs": { + "GetCurrentMetricDataResponse$ApproximateTotalCount": "The total count of the result, regardless of the current page size.
", + "GetCurrentUserDataResponse$ApproximateTotalCount": "The total count of the result, regardless of the current page size.
", "SearchQueuesResponse$ApproximateTotalCount": "The total number of queues which matched your search query.
", "SearchRoutingProfilesResponse$ApproximateTotalCount": "The total number of routing profiles which matched your search query.
", "SearchSecurityProfilesResponse$ApproximateTotalCount": "The total number of security profiles which matched your search query.
", @@ -1230,7 +1240,8 @@ "CurrentMetricName": { "base": "The current metric names.
", "refs": { - "CurrentMetric$Name": "The name of the metric.
" + "CurrentMetric$Name": "The name of the metric.
", + "CurrentMetricSortCriteria$SortByMetric": null } }, "CurrentMetricResult": { @@ -1245,6 +1256,18 @@ "GetCurrentMetricDataResponse$MetricResults": "Information about the real-time metrics.
" } }, + "CurrentMetricSortCriteria": { + "base": "The way to sort the resulting response based on metrics. By default resources are sorted based on AGENTS_ONLINE, DESCENDING. The metric collection is sorted based on the input metrics.
The way to sort the resulting response based on metrics. You can enter one sort criteria. By default resources are sorted based on AGENTS_ONLINE, DESCENDING. The metric collection is sorted based on the input metrics.
Note the following:
Sorting on SLOTS_ACTIVE and SLOTS_AVAILABLE is not supported.
Contains the filter to apply when retrieving metrics.
", "refs": { - "GetCurrentMetricDataRequest$Filters": "The queues, up to 100, or channels, to use to filter the metrics returned. Metric data is retrieved only for the resources associated with the queues or channels included in the filter. You can include both queue IDs and queue ARNs in the same request. VOICE, CHAT, and TASK channels are supported.
", + "GetCurrentMetricDataRequest$Filters": "The filters to apply to returned metrics. You can filter up to the following limits:
Queues: 100
Routing profiles: 100
Channels: 3 (VOICE, CHAT, and TASK channels are supported.)
Metric data is retrieved only for the resources associated with the queues or routing profiles, and by any channels included in the filter. (You cannot filter by both queue AND routing profile.) You can include both resource IDs and resource ARNs in the same request.
Currently tagging is only supported on the resources that are passed in the filter.
", "GetMetricDataRequest$Filters": "The queues, up to 100, or channels, to use to filter the metrics returned. Metric data is retrieved only for the resources associated with the queues or channels included in the filter. You can include both queue IDs and queue ARNs in the same request. VOICE, CHAT, and TASK channels are supported.
To filter by Queues, enter the queue ID/ARN, not the name of the queue.
The grouping applied to the metrics returned. For example, when grouped by QUEUE, the metrics returned apply to each queue rather than aggregated for all queues.
If you group by CHANNEL, you should include a Channels filter. VOICE, CHAT, and TASK channels are supported.
If you group by ROUTING_PROFILE, you must include either a queue or routing profile filter.
If no Grouping is included in the request, a summary of metrics is returned.
The grouping applied to the metrics returned. For example, when grouped by QUEUE, the metrics returned apply to each queue rather than aggregated for all queues.
If you group by CHANNEL, you should include a Channels filter. VOICE, CHAT, and TASK channels are supported.
If you group by ROUTING_PROFILE, you must include either a queue or routing profile filter. In addition, a routing profile filter is required for metrics CONTACTS_SCHEDULED, CONTACTS_IN_QUEUE, and OLDEST_CONTACT_AGE.
If no Grouping is included in the request, a summary of metrics is returned.
The grouping applied to the metrics returned. For example, when results are grouped by queue, the metrics returned are grouped by queue. The values returned apply to the metrics for each queue rather than aggregated for all queues.
If no grouping is specified, a summary of metrics for all queues is returned.
" } }, @@ -1868,6 +1891,7 @@ "UpdateUserHierarchyGroupNameRequest$HierarchyGroupId": "The identifier of the hierarchy group.
", "UpdateUserHierarchyRequest$HierarchyGroupId": "The identifier of the hierarchy group.
", "User$HierarchyGroupId": "The identifier of the hierarchy group for the user.
", + "UserDataHierarchyGroups$member": null, "UserSearchSummary$HierarchyGroupId": "The identifier of the user's hierarchy group.
" } }, @@ -3596,7 +3620,7 @@ "base": null, "refs": { "Filters$Queues": "The queues to use to filter the metrics. You should specify at least one queue, and can specify up to 100 queues per request. The GetCurrentMetricsData API in particular requires a queue when you include a Filter in your request.
Contains information about a queue resource for which metrics are returned.
" + "UserDataFilters$Queues": "A list of up to 100 queues or ARNs.
" } }, "QuickConnect": { @@ -3841,6 +3865,7 @@ "RoutingProfile$RoutingProfileId": "The identifier of the routing profile.
", "RoutingProfileReference$Id": "The identifier of the routing profile.
", "RoutingProfileSummary$Id": "The identifier of the routing profile.
", + "RoutingProfiles$member": null, "UpdateRoutingProfileConcurrencyRequest$RoutingProfileId": "The identifier of the routing profile.
", "UpdateRoutingProfileDefaultOutboundQueueRequest$RoutingProfileId": "The identifier of the routing profile.
", "UpdateRoutingProfileNameRequest$RoutingProfileId": "The identifier of the routing profile.
", @@ -3907,6 +3932,7 @@ "RoutingProfileReference": { "base": "Information about the routing profile assigned to the user.
", "refs": { + "Dimensions$RoutingProfile": null, "UserData$RoutingProfile": "Information about the routing profile that is assigned to the user.
" } }, @@ -3942,6 +3968,13 @@ "ListRoutingProfilesResponse$RoutingProfileSummaryList": "Information about the routing profiles.
" } }, + "RoutingProfiles": { + "base": null, + "refs": { + "Filters$RoutingProfiles": "A list of up to 100 routing profile IDs or ARNs.
", + "UserDataFilters$RoutingProfiles": "A list of up to 100 routing profile IDs or ARNs.
" + } + }, "Rule": { "base": "Information about a rule.
", "refs": { @@ -4241,6 +4274,12 @@ "GetTaskTemplateRequest$SnapshotVersion": "The system generated version of a task template that is associated with a task, when the task is created.
" } }, + "SortOrder": { + "base": null, + "refs": { + "CurrentMetricSortCriteria$SortOrder": "The way to sort.
" + } + }, "SourceApplicationName": { "base": null, "refs": { @@ -5127,7 +5166,13 @@ "UserDataFilters": { "base": "A filter for the user data.
", "refs": { - "GetCurrentUserDataRequest$Filters": "Filters up to 100 Queues, or up to 9 ContactStates. The user data is retrieved only for those users who are associated with the queues and have contacts that are in the specified ContactState.
The filters to apply to returned user data. You can filter up to the following limits:
Queues: 100
Routing profiles: 100
Agents: 100
Contact states: 9
User hierarchy groups: 1
The user data is retrieved for only the specified values/resources in the filter. A maximum of one filter can be passed from queues, routing profiles, agents, and user hierarchy groups.
Currently tagging is only supported on the resources that are passed in the filter.
" + } + }, + "UserDataHierarchyGroups": { + "base": null, + "refs": { + "UserDataFilters$UserHierarchyGroups": "A UserHierarchyGroup ID or ARN.
" } }, "UserDataList": { @@ -5139,6 +5184,7 @@ "UserId": { "base": null, "refs": { + "AgentsMinOneMaxHundred$member": null, "CreateUserResponse$UserId": "The identifier of the user account.
", "DeleteUserRequest$UserId": "The identifier of the user.
", "DescribeUserRequest$UserId": "The identifier of the user account.
", diff --git a/models/apis/connectparticipant/2018-09-07/api-2.json b/models/apis/connectparticipant/2018-09-07/api-2.json index 12d6708c58..82630a3bf0 100644 --- a/models/apis/connectparticipant/2018-09-07/api-2.json +++ b/models/apis/connectparticipant/2018-09-07/api-2.json @@ -216,7 +216,9 @@ "MESSAGE", "EVENT", "ATTACHMENT", - "CONNECTION_ACK" + "CONNECTION_ACK", + "MESSAGE_DELIVERED", + "MESSAGE_READ" ] }, "ClientToken":{ @@ -288,10 +290,7 @@ }, "CreateParticipantConnectionRequest":{ "type":"structure", - "required":[ - "Type", - "ParticipantToken" - ], + "required":["ParticipantToken"], "members":{ "Type":{"shape":"ConnectionTypeList"}, "ParticipantToken":{ @@ -411,7 +410,8 @@ "ParticipantId":{"shape":"ParticipantId"}, "DisplayName":{"shape":"DisplayName"}, "ParticipantRole":{"shape":"ParticipantRole"}, - "Attachments":{"shape":"Attachments"} + "Attachments":{"shape":"Attachments"}, + "MessageMetadata":{"shape":"MessageMetadata"} } }, "MaxResults":{ @@ -420,6 +420,13 @@ "min":0 }, "Message":{"type":"string"}, + "MessageMetadata":{ + "type":"structure", + "members":{ + "MessageId":{"shape":"ChatItemId"}, + "Receipts":{"shape":"Receipts"} + } + }, "MostRecent":{ "type":"integer", "max":100, @@ -468,6 +475,18 @@ "max":2000, "min":1 }, + "Receipt":{ + "type":"structure", + "members":{ + "DeliveredTimestamp":{"shape":"Instant"}, + "ReadTimestamp":{"shape":"Instant"}, + "RecipientParticipantId":{"shape":"ParticipantId"} + } + }, + "Receipts":{ + "type":"list", + "member":{"shape":"Receipt"} + }, "ScanDirection":{ "type":"string", "enum":[ diff --git a/models/apis/connectparticipant/2018-09-07/docs-2.json b/models/apis/connectparticipant/2018-09-07/docs-2.json index 75a7f59724..5e8bd7ee4c 100644 --- a/models/apis/connectparticipant/2018-09-07/docs-2.json +++ b/models/apis/connectparticipant/2018-09-07/docs-2.json @@ -1,15 +1,15 @@ { "version": "2.0", - "service": "Amazon Connect is a cloud-based contact center solution that makes it easy to set up and manage a customer contact center and provide reliable customer engagement at any scale.
Amazon Connect enables customer contacts through voice or chat.
The APIs described here are used by chat participants, such as agents and customers.
", + "service": "Amazon Connect is a cloud-based contact center solution that makes it easy to set up and manage a customer contact center. Amazon Connect enables customer contacts through voice or chat. Use the Amazon Connect Participant Service to manage chat participants, such as agents and customers.
", "operations": { - "CompleteAttachmentUpload": "Allows you to confirm that the attachment has been uploaded using the pre-signed URL provided in StartAttachmentUpload API.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", - "CreateParticipantConnection": "Creates the participant's connection. Note that ParticipantToken is used for invoking this API instead of ConnectionToken.
The participant token is valid for the lifetime of the participant – until they are part of a contact.
The response URL for WEBSOCKET Type has a connect expiry timeout of 100s. Clients must manually connect to the returned websocket URL and subscribe to the desired topic.
For chat, you need to publish the following on the established websocket connection:
{\"topic\":\"aws/subscribe\",\"content\":{\"topics\":[\"aws/chat\"]}}
Upon websocket URL expiry, as specified in the response ConnectionExpiry parameter, clients need to call this API again to obtain a new websocket URL and perform the same steps as before.
Message streaming support: This API can also be used together with the StartContactStreaming API to create a participant connection for chat contacts that are not using a websocket. For more information about message streaming, Enable real-time chat message streaming in the Amazon Connect Administrator Guide.
Feature specifications: For information about feature specifications, such as the allowed number of open websocket connections per participant, see Feature specifications in the Amazon Connect Administrator Guide.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
Disconnects a participant. Note that ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", - "GetAttachment": "Provides a pre-signed URL for download of a completed attachment. This is an asynchronous API for use with active contacts.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", - "GetTranscript": "Retrieves a transcript of the session, including details about any attachments. Note that ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", - "SendEvent": "Sends an event. Note that ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", - "SendMessage": "Sends a message. Note that ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", - "StartAttachmentUpload": "Provides a pre-signed Amazon S3 URL in response for uploading the file directly to S3.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
" + "CompleteAttachmentUpload": "Allows you to confirm that the attachment has been uploaded using the pre-signed URL provided in StartAttachmentUpload API.
ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", + "CreateParticipantConnection": "Creates the participant's connection.
ParticipantToken is used for invoking this API instead of ConnectionToken.
The participant token is valid for the lifetime of the participant – until they are part of a contact.
The response URL for WEBSOCKET Type has a connect expiry timeout of 100s. Clients must manually connect to the returned websocket URL and subscribe to the desired topic.
For chat, you need to publish the following on the established websocket connection:
{\"topic\":\"aws/subscribe\",\"content\":{\"topics\":[\"aws/chat\"]}}
Upon websocket URL expiry, as specified in the response ConnectionExpiry parameter, clients need to call this API again to obtain a new websocket URL and perform the same steps as before.
Message streaming support: This API can also be used together with the StartContactStreaming API to create a participant connection for chat contacts that are not using a websocket. For more information about message streaming, Enable real-time chat message streaming in the Amazon Connect Administrator Guide.
Feature specifications: For information about feature specifications, such as the allowed number of open websocket connections per participant, see Feature specifications in the Amazon Connect Administrator Guide.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
Disconnects a participant.
ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", + "GetAttachment": "Provides a pre-signed URL for download of a completed attachment. This is an asynchronous API for use with active contacts.
ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", + "GetTranscript": "Retrieves a transcript of the session, including details about any attachments.
ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", + "SendEvent": "Sends an event.
ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", + "SendMessage": "Sends a message.
ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
", + "StartAttachmentUpload": "Provides a pre-signed Amazon S3 URL in response for uploading the file directly to S3.
ConnectionToken is used for invoking this API instead of ParticipantToken.
The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.
" }, "shapes": { "AccessDeniedException": { @@ -73,22 +73,23 @@ "base": null, "refs": { "Item$Content": "The content of the message or event.
", - "SendEventRequest$Content": "The content of the event to be sent (for example, message text). This is not yet supported.
", - "SendMessageRequest$Content": "The content of the message.
" + "SendEventRequest$Content": "The content of the event to be sent (for example, message text). For content related to message receipts, this is supported in the form of a JSON string.
Sample Content: \"{\\\"messageId\\\":\\\"11111111-aaaa-bbbb-cccc-EXAMPLE01234\\\"}\"
", + "SendMessageRequest$Content": "The content of the message.
For text/plain and text/markdown, the Length Constraints are Minimum of 1, Maximum of 1024.
For application/json, the Length Constraints are Minimum of 1, Maximum of 12000.
The type of content of the item.
", - "SendEventRequest$ContentType": "The content type of the request. Supported types are:
application/vnd.amazonaws.connect.event.typing
application/vnd.amazonaws.connect.event.connection.acknowledged
The type of the content. Supported types are text/plain.
" + "SendEventRequest$ContentType": "The content type of the request. Supported types are:
application/vnd.amazonaws.connect.event.typing
application/vnd.amazonaws.connect.event.connection.acknowledged
application/vnd.amazonaws.connect.event.message.delivered
application/vnd.amazonaws.connect.event.message.read
The type of the content. Supported types are text/plain, text/markdown, and application/json.
The ID of the item.
", + "MessageMetadata$MessageId": "The identifier of the message that contains the metadata information.
", "SendEventResponse$Id": "The ID of the response.
", "SendMessageResponse$Id": "The ID of the message.
", "StartPosition$Id": "The ID of the message or event where to start.
" @@ -103,9 +104,9 @@ "ClientToken": { "base": null, "refs": { - "DisconnectParticipantRequest$ClientToken": "A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.
", - "SendEventRequest$ClientToken": "A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.
", - "SendMessageRequest$ClientToken": "A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.
" + "DisconnectParticipantRequest$ClientToken": "A unique, case-sensitive identifier that you provide to ensure the idempotency of the request. If not provided, the Amazon Web Services SDK populates this field. For more information about idempotency, see Making retries safe with idempotent APIs.
", + "SendEventRequest$ClientToken": "A unique, case-sensitive identifier that you provide to ensure the idempotency of the request. If not provided, the Amazon Web Services SDK populates this field. For more information about idempotency, see Making retries safe with idempotent APIs.
", + "SendMessageRequest$ClientToken": "A unique, case-sensitive identifier that you provide to ensure the idempotency of the request. If not provided, the Amazon Web Services SDK populates this field. For more information about idempotency, see Making retries safe with idempotent APIs.
" } }, "CompleteAttachmentUploadRequest": { @@ -138,7 +139,7 @@ "ConnectionTypeList": { "base": null, "refs": { - "CreateParticipantConnectionRequest$Type": "Type of connection information required.
" + "CreateParticipantConnectionRequest$Type": "Type of connection information required. This can be omitted if ConnectParticipant is true.
Describes the MIME file type of the attachment. For a list of supported file types, see Feature specifications in the Amazon Connect Administrator Guide.
", - "StartAttachmentUploadRequest$ContentType": "Describes the MIME file type of the attachment. For a list of supported file types, see Feature specifications in the Amazon Connect Administrator Guide.
" + "AttachmentItem$ContentType": "Describes the MIME file type of the attachment. For a list of supported file types, see Feature specifications in the Amazon Connect Administrator Guide.
", + "StartAttachmentUploadRequest$ContentType": "Describes the MIME file type of the attachment. For a list of supported file types, see Feature specifications in the Amazon Connect Administrator Guide.
" } }, "CreateParticipantConnectionRequest": { @@ -214,6 +215,8 @@ "base": null, "refs": { "Item$AbsoluteTime": "The time when the message or event was sent.
It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.
", + "Receipt$DeliveredTimestamp": "The time when the message was delivered to the recipient.
", + "Receipt$ReadTimestamp": "The time when the message was read by the recipient.
", "SendEventResponse$AbsoluteTime": "The time when the event was sent.
It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.
", "SendMessageResponse$AbsoluteTime": "The time when the message was sent.
It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.
", "StartPosition$AbsoluteTime": "The time in ISO format where to start.
It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.
" @@ -245,6 +248,12 @@ "ThrottlingException$Message": null } }, + "MessageMetadata": { + "base": "Contains metadata related to a message.
", + "refs": { + "Item$MessageMetadata": "The metadata related to the message. Currently this supports only information related to message receipts.
" + } + }, "MostRecent": { "base": null, "refs": { @@ -261,14 +270,15 @@ "NonEmptyClientToken": { "base": null, "refs": { - "CompleteAttachmentUploadRequest$ClientToken": "A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.
", - "StartAttachmentUploadRequest$ClientToken": "A unique case sensitive identifier to support idempotency of request.
" + "CompleteAttachmentUploadRequest$ClientToken": "A unique, case-sensitive identifier that you provide to ensure the idempotency of the request. If not provided, the Amazon Web Services SDK populates this field. For more information about idempotency, see Making retries safe with idempotent APIs.
", + "StartAttachmentUploadRequest$ClientToken": "A unique, case-sensitive identifier that you provide to ensure the idempotency of the request. If not provided, the Amazon Web Services SDK populates this field. For more information about idempotency, see Making retries safe with idempotent APIs.
" } }, "ParticipantId": { "base": null, "refs": { - "Item$ParticipantId": "The ID of the sender in the session.
" + "Item$ParticipantId": "The ID of the sender in the session.
", + "Receipt$RecipientParticipantId": "The identifier of the recipient of the message.
" } }, "ParticipantRole": { @@ -310,6 +320,18 @@ "ValidationException$Message": null } }, + "Receipt": { + "base": "The receipt for the message delivered to the recipient.
", + "refs": { + "Receipts$member": null + } + }, + "Receipts": { + "base": null, + "refs": { + "MessageMetadata$Receipts": "The list of receipt information for a message for different recipients.
" + } + }, "ScanDirection": { "base": null, "refs": { diff --git a/models/apis/detective/2018-10-26/api-2.json b/models/apis/detective/2018-10-26/api-2.json index 89efa70431..ff239e3329 100644 --- a/models/apis/detective/2018-10-26/api-2.json +++ b/models/apis/detective/2018-10-26/api-2.json @@ -20,6 +20,7 @@ }, "input":{"shape":"AcceptInvitationRequest"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"ConflictException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, @@ -35,6 +36,7 @@ "input":{"shape":"BatchGetGraphMemberDatasourcesRequest"}, "output":{"shape":"BatchGetGraphMemberDatasourcesResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ValidationException"} @@ -49,6 +51,7 @@ "input":{"shape":"BatchGetMembershipDatasourcesRequest"}, "output":{"shape":"BatchGetMembershipDatasourcesResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ValidationException"} @@ -63,6 +66,7 @@ "input":{"shape":"CreateGraphRequest"}, "output":{"shape":"CreateGraphResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"ConflictException"}, {"shape":"InternalServerException"}, {"shape":"ServiceQuotaExceededException"} @@ -77,6 +81,7 @@ "input":{"shape":"CreateMembersRequest"}, "output":{"shape":"CreateMembersResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ValidationException"}, @@ -91,6 +96,7 @@ }, "input":{"shape":"DeleteGraphRequest"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ValidationException"} @@ -105,6 +111,7 @@ "input":{"shape":"DeleteMembersRequest"}, "output":{"shape":"DeleteMembersResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"ConflictException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, @@ -120,6 +127,7 @@ "input":{"shape":"DescribeOrganizationConfigurationRequest"}, "output":{"shape":"DescribeOrganizationConfigurationResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"}, {"shape":"TooManyRequestsException"} @@ -132,6 +140,7 @@ "requestUri":"/orgs/disableAdminAccount" }, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"}, {"shape":"TooManyRequestsException"} @@ -145,6 +154,7 @@ }, "input":{"shape":"DisassociateMembershipRequest"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"ConflictException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, @@ -159,6 +169,7 @@ }, "input":{"shape":"EnableOrganizationAdminAccountRequest"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"}, {"shape":"TooManyRequestsException"} @@ -173,6 +184,7 @@ "input":{"shape":"GetMembersRequest"}, "output":{"shape":"GetMembersResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ValidationException"} @@ -187,6 +199,7 @@ "input":{"shape":"ListDatasourcePackagesRequest"}, "output":{"shape":"ListDatasourcePackagesResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ValidationException"} @@ -201,6 +214,7 @@ "input":{"shape":"ListGraphsRequest"}, "output":{"shape":"ListGraphsResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"} ] @@ -214,6 +228,7 @@ "input":{"shape":"ListInvitationsRequest"}, "output":{"shape":"ListInvitationsResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"} ] @@ -227,6 +242,7 @@ "input":{"shape":"ListMembersRequest"}, "output":{"shape":"ListMembersResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ValidationException"} @@ -241,6 +257,7 @@ "input":{"shape":"ListOrganizationAdminAccountsRequest"}, "output":{"shape":"ListOrganizationAdminAccountsResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"}, {"shape":"TooManyRequestsException"} @@ -256,6 +273,7 @@ "input":{"shape":"ListTagsForResourceRequest"}, "output":{"shape":"ListTagsForResourceResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"}, {"shape":"ResourceNotFoundException"} @@ -269,6 +287,7 @@ }, "input":{"shape":"RejectInvitationRequest"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"ConflictException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, @@ -283,6 +302,7 @@ }, "input":{"shape":"StartMonitoringMemberRequest"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"ConflictException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, @@ -300,6 +320,7 @@ "input":{"shape":"TagResourceRequest"}, "output":{"shape":"TagResourceResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"}, {"shape":"ResourceNotFoundException"} @@ -315,6 +336,7 @@ "input":{"shape":"UntagResourceRequest"}, "output":{"shape":"UntagResourceResponse"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"}, {"shape":"ResourceNotFoundException"} @@ -328,6 +350,7 @@ }, "input":{"shape":"UpdateDatasourcePackagesRequest"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ResourceNotFoundException"}, {"shape":"ServiceQuotaExceededException"}, @@ -342,6 +365,7 @@ }, "input":{"shape":"UpdateOrganizationConfigurationRequest"}, "errors":[ + {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, {"shape":"ValidationException"}, {"shape":"TooManyRequestsException"} @@ -356,6 +380,18 @@ "GraphArn":{"shape":"GraphArn"} } }, + "AccessDeniedException":{ + "type":"structure", + "members":{ + "Message":{"shape":"ErrorMessage"}, + "ErrorCode":{"shape":"ErrorCode"}, + "ErrorCodeReason":{"shape":"ErrorCodeReason"}, + "SubErrorCode":{"shape":"ErrorCode"}, + "SubErrorCodeReason":{"shape":"ErrorCodeReason"} + }, + "error":{"httpStatusCode":403}, + "exception":true + }, "Account":{ "type":"structure", "required":[ @@ -576,7 +612,7 @@ "type":"string", "max":64, "min":1, - "pattern":"^.+@.+$" + "pattern":"^.+@(?:(?:(?!-)[A-Za-z0-9-]{1,62})?[A-Za-z0-9]{1}\\.)+[A-Za-z]{2,6}$" }, "EmailMessage":{ "type":"string", diff --git a/models/apis/detective/2018-10-26/docs-2.json b/models/apis/detective/2018-10-26/docs-2.json index 26c0ca6635..956273df36 100644 --- a/models/apis/detective/2018-10-26/docs-2.json +++ b/models/apis/detective/2018-10-26/docs-2.json @@ -33,6 +33,11 @@ "refs": { } }, + "AccessDeniedException": { + "base": "The request issuer does not have permission to access this resource or perform this operation.
", + "refs": { + } + }, "Account": { "base": "An Amazon Web Services account that is the administrator account of or a member of a behavior graph.
", "refs": { @@ -252,18 +257,23 @@ "ErrorCode": { "base": null, "refs": { + "AccessDeniedException$ErrorCode": "The SDK default error code associated with the access denied exception.
", + "AccessDeniedException$SubErrorCode": "The error code associated with the access denied exception.
", "ValidationException$ErrorCode": "The error code associated with the validation failure.
" } }, "ErrorCodeReason": { "base": null, "refs": { + "AccessDeniedException$ErrorCodeReason": "The SDK default explanation of why access was denied.
", + "AccessDeniedException$SubErrorCodeReason": "An explanation of why access was denied.
", "ValidationException$ErrorCodeReason": "An explanation of why validation failed.
" } }, "ErrorMessage": { "base": null, "refs": { + "AccessDeniedException$Message": null, "ConflictException$Message": null, "InternalServerException$Message": null, "ResourceNotFoundException$Message": null, diff --git a/models/apis/detective/2018-10-26/endpoint-rule-set-1.json b/models/apis/detective/2018-10-26/endpoint-rule-set-1.json new file mode 100644 index 0000000000..c6e55e4bfe --- /dev/null +++ b/models/apis/detective/2018-10-26/endpoint-rule-set-1.json @@ -0,0 +1,306 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": true, + "documentation": "The AWS region used to dispatch the request.", + "type": "String" + }, + "UseDualStack": { + "builtIn": "AWS::UseDualStack", + "required": true, + "default": false, + "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.", + "type": "Boolean" + }, + "UseFIPS": { + "builtIn": "AWS::UseFIPS", + "required": true, + "default": false, + "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.", + "type": "Boolean" + }, + "Endpoint": { + "builtIn": "SDK::Endpoint", + "required": false, + "documentation": "Override the endpoint used to send this request", + "type": "String" + } + }, + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", + "argv": [ + { + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Endpoint" + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://api.detective-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://api.detective-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://api.detective.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } + ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://api.detective.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/detective/2018-10-26/endpoint-tests-1.json b/models/apis/detective/2018-10-26/endpoint-tests-1.json new file mode 100644 index 0000000000..7d8cee9a3f --- /dev/null +++ b/models/apis/detective/2018-10-26/endpoint-tests-1.json @@ -0,0 +1,1187 @@ +{ + "testCases": [ + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-gov-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-gov-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-gov-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-gov-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-gov-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-gov-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ca-central-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ca-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ca-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ca-central-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ca-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ca-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-central-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-central-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.af-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "af-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.af-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "af-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.af-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "af-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.af-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "af-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-north-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-north-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-north-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-north-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-west-3.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-3", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-west-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-3", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-west-3.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-3", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-west-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-3", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-west-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-west-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-northeast-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-northeast-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-northeast-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-northeast-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.me-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "me-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.me-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "me-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.me-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "me-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.me-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "me-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.sa-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "sa-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.sa-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "sa-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.sa-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "sa-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.sa-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "sa-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-gov-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-gov-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-gov-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-gov-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-gov-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-gov-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-southeast-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-southeast-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-southeast-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-southeast-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-east-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective-fips.us-east-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-east-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://api.detective.us-east-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-2", + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips enabled and dualstack disabled", + "expect": { + "error": "Invalid Configuration: FIPS and custom endpoint are not supported" + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack enabled", + "expect": { + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": true, + "Endpoint": "https://example.com" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/models/apis/fsx/2018-03-01/api-2.json b/models/apis/fsx/2018-03-01/api-2.json index 6a74163d27..1ef961c3b3 100644 --- a/models/apis/fsx/2018-03-01/api-2.json +++ b/models/apis/fsx/2018-03-01/api-2.json @@ -3303,6 +3303,7 @@ "Name":{"shape":"StorageVirtualMachineName"}, "ResourceARN":{"shape":"ResourceARN"}, "StorageVirtualMachineId":{"shape":"StorageVirtualMachineId"}, + "Subtype":{"shape":"StorageVirtualMachineSubtype"}, "UUID":{"shape":"UUID"}, "Tags":{"shape":"Tags"}, "LifecycleTransitionReason":{"shape":"LifecycleTransitionReason"}, @@ -3379,6 +3380,15 @@ "MIXED" ] }, + "StorageVirtualMachineSubtype":{ + "type":"string", + "enum":[ + "DEFAULT", + "DP_DESTINATION", + "SYNC_DESTINATION", + "SYNC_SOURCE" + ] + }, "StorageVirtualMachines":{ "type":"list", "member":{"shape":"StorageVirtualMachine"}, diff --git a/models/apis/fsx/2018-03-01/docs-2.json b/models/apis/fsx/2018-03-01/docs-2.json index a5901684ca..94a495a7ea 100644 --- a/models/apis/fsx/2018-03-01/docs-2.json +++ b/models/apis/fsx/2018-03-01/docs-2.json @@ -1863,7 +1863,7 @@ "OpenZFSDeploymentType": { "base": null, "refs": { - "CreateFileSystemOpenZFSConfiguration$DeploymentType": "Specifies the file system deployment type. Single AZ deployment types are configured for redundancy within a single Availability Zone in an Amazon Web Services Region . Valid values are the following:
SINGLE_AZ_1- (Default) Creates file systems with throughput capacities of 64 - 4,096 MB/s. Single_AZ_1 is available in all Amazon Web Services Regions where Amazon FSx for OpenZFS is available, except US West (Oregon).
SINGLE_AZ_2- Creates file systems with throughput capacities of 160 - 10,240 MB/s using an NVMe L2ARC cache. Single_AZ_2 is available only in the US East (N. Virginia), US East (Ohio), US West (Oregon), and Europe (Ireland) Amazon Web Services Regions.
For more information, see: Deployment type availability and File system performancein theAmazon FSx for OpenZFS User Guide.
", + "CreateFileSystemOpenZFSConfiguration$DeploymentType": "Specifies the file system deployment type. Single AZ deployment types are configured for redundancy within a single Availability Zone in an Amazon Web Services Region . Valid values are the following:
SINGLE_AZ_1- (Default) Creates file systems with throughput capacities of 64 - 4,096 MB/s. Single_AZ_1 is available in all Amazon Web Services Regions where Amazon FSx for OpenZFS is available, except US West (Oregon).
SINGLE_AZ_2- Creates file systems with throughput capacities of 160 - 10,240 MB/s using an NVMe L2ARC cache. Single_AZ_2 is available only in the US East (N. Virginia), US East (Ohio), US West (Oregon), and Europe (Ireland) Amazon Web Services Regions.
For more information, see: Deployment type availability and File system performance in the Amazon FSx for OpenZFS User Guide.
", "OpenZFSFileSystemConfiguration$DeploymentType": "Specifies the file-system deployment type. Amazon FSx for OpenZFS supports
SINGLE_AZ_1 and SINGLE_AZ_2.
The security style of the root volume of the SVM.
" } }, + "StorageVirtualMachineSubtype": { + "base": null, + "refs": { + "StorageVirtualMachine$Subtype": "Describes the SVM's subtype.
" + } + }, "StorageVirtualMachines": { "base": null, "refs": { diff --git a/models/apis/fsx/2018-03-01/endpoint-rule-set-1.json b/models/apis/fsx/2018-03-01/endpoint-rule-set-1.json index 13d705602c..c34da7df90 100644 --- a/models/apis/fsx/2018-03-01/endpoint-rule-set-1.json +++ b/models/apis/fsx/2018-03-01/endpoint-rule-set-1.json @@ -52,15 +52,6 @@ "ref": "Endpoint" } ] - }, - { - "fn": "parseURL", - "argv": [ - { - "ref": "Endpoint" - } - ], - "assign": "url" } ], "type": "tree", diff --git a/models/apis/fsx/2018-03-01/endpoint-tests-1.json b/models/apis/fsx/2018-03-01/endpoint-tests-1.json index 70569c1b42..7893d02ee7 100644 --- a/models/apis/fsx/2018-03-01/endpoint-tests-1.json +++ b/models/apis/fsx/2018-03-01/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { - "Region": "ap-south-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-south-1" } }, { @@ -21,9 +21,9 @@ } }, "params": { - "Region": "ap-south-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-south-1" } }, { @@ -34,9 +34,9 @@ } }, "params": { - "Region": "ap-south-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-south-1" } }, { @@ -47,9 +47,9 @@ } }, "params": { - "Region": "ap-south-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-south-1" } }, { @@ -60,9 +60,9 @@ } }, "params": { - "Region": "eu-south-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-south-1" } }, { @@ -73,9 +73,9 @@ } }, "params": { - "Region": "eu-south-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-south-1" } }, { @@ -86,9 +86,9 @@ } }, "params": { - "Region": "eu-south-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-south-1" } }, { @@ -99,9 +99,9 @@ } }, "params": { - "Region": "eu-south-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-south-1" } }, { @@ -112,9 +112,9 @@ } }, "params": { - "Region": "us-gov-east-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-east-1" } }, { @@ -125,9 +125,9 @@ } }, "params": { - "Region": "us-gov-east-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-east-1" } }, { @@ -138,9 +138,9 @@ } }, "params": { - "Region": "us-gov-east-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-east-1" } }, { @@ -151,9 +151,61 @@ } }, "params": { - "Region": "us-gov-east-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-east-1" + } + }, + { + "documentation": "For region me-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://fsx-fips.me-central-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": true, + "Region": "me-central-1" + } + }, + { + "documentation": "For region me-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://fsx-fips.me-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "UseDualStack": false, + "Region": "me-central-1" + } + }, + { + "documentation": "For region me-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://fsx.me-central-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": true, + "Region": "me-central-1" + } + }, + { + "documentation": "For region me-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://fsx.me-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Region": "me-central-1" } }, { @@ -164,9 +216,9 @@ } }, "params": { - "Region": "ca-central-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "ca-central-1" } }, { @@ -177,9 +229,9 @@ } }, "params": { - "Region": "ca-central-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "ca-central-1" } }, { @@ -190,9 +242,9 @@ } }, "params": { - "Region": "ca-central-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "ca-central-1" } }, { @@ -203,9 +255,9 @@ } }, "params": { - "Region": "ca-central-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "ca-central-1" } }, { @@ -216,9 +268,9 @@ } }, "params": { - "Region": "eu-central-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-central-1" } }, { @@ -229,9 +281,9 @@ } }, "params": { - "Region": "eu-central-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-central-1" } }, { @@ -242,9 +294,9 @@ } }, "params": { - "Region": "eu-central-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-central-1" } }, { @@ -255,9 +307,9 @@ } }, "params": { - "Region": "eu-central-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-central-1" } }, { @@ -268,9 +320,9 @@ } }, "params": { - "Region": "us-west-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-west-1" } }, { @@ -281,9 +333,9 @@ } }, "params": { - "Region": "us-west-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-west-1" } }, { @@ -294,9 +346,9 @@ } }, "params": { - "Region": "us-west-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-west-1" } }, { @@ -307,9 +359,9 @@ } }, "params": { - "Region": "us-west-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-west-1" } }, { @@ -320,9 +372,9 @@ } }, "params": { - "Region": "us-west-2", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-west-2" } }, { @@ -333,9 +385,9 @@ } }, "params": { - "Region": "us-west-2", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-west-2" } }, { @@ -346,9 +398,9 @@ } }, "params": { - "Region": "us-west-2", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-west-2" } }, { @@ -359,9 +411,9 @@ } }, "params": { - "Region": "us-west-2", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-west-2" } }, { @@ -372,9 +424,9 @@ } }, "params": { - "Region": "af-south-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "af-south-1" } }, { @@ -385,9 +437,9 @@ } }, "params": { - "Region": "af-south-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "af-south-1" } }, { @@ -398,9 +450,9 @@ } }, "params": { - "Region": "af-south-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "af-south-1" } }, { @@ -411,9 +463,9 @@ } }, "params": { - "Region": "af-south-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "af-south-1" } }, { @@ -424,9 +476,9 @@ } }, "params": { - "Region": "eu-north-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-north-1" } }, { @@ -437,9 +489,9 @@ } }, "params": { - "Region": "eu-north-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-north-1" } }, { @@ -450,9 +502,9 @@ } }, "params": { - "Region": "eu-north-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-north-1" } }, { @@ -463,9 +515,9 @@ } }, "params": { - "Region": "eu-north-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-north-1" } }, { @@ -476,9 +528,9 @@ } }, "params": { - "Region": "eu-west-3", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-3" } }, { @@ -489,9 +541,9 @@ } }, "params": { - "Region": "eu-west-3", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-3" } }, { @@ -502,9 +554,9 @@ } }, "params": { - "Region": "eu-west-3", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-3" } }, { @@ -515,9 +567,9 @@ } }, "params": { - "Region": "eu-west-3", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-3" } }, { @@ -528,9 +580,9 @@ } }, "params": { - "Region": "eu-west-2", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-2" } }, { @@ -541,9 +593,9 @@ } }, "params": { - "Region": "eu-west-2", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-2" } }, { @@ -554,9 +606,9 @@ } }, "params": { - "Region": "eu-west-2", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-2" } }, { @@ -567,9 +619,9 @@ } }, "params": { - "Region": "eu-west-2", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-2" } }, { @@ -580,9 +632,9 @@ } }, "params": { - "Region": "eu-west-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-1" } }, { @@ -593,9 +645,9 @@ } }, "params": { - "Region": "eu-west-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-1" } }, { @@ -606,9 +658,9 @@ } }, "params": { - "Region": "eu-west-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-1" } }, { @@ -619,9 +671,9 @@ } }, "params": { - "Region": "eu-west-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-1" } }, { @@ -632,9 +684,9 @@ } }, "params": { - "Region": "ap-northeast-3", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-3" } }, { @@ -645,9 +697,9 @@ } }, "params": { - "Region": "ap-northeast-3", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-3" } }, { @@ -658,9 +710,9 @@ } }, "params": { - "Region": "ap-northeast-3", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-3" } }, { @@ -671,9 +723,9 @@ } }, "params": { - "Region": "ap-northeast-3", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-3" } }, { @@ -684,9 +736,9 @@ } }, "params": { - "Region": "ap-northeast-2", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-2" } }, { @@ -697,9 +749,9 @@ } }, "params": { - "Region": "ap-northeast-2", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-2" } }, { @@ -710,9 +762,9 @@ } }, "params": { - "Region": "ap-northeast-2", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-2" } }, { @@ -723,9 +775,9 @@ } }, "params": { - "Region": "ap-northeast-2", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-2" } }, { @@ -736,9 +788,9 @@ } }, "params": { - "Region": "ap-northeast-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-1" } }, { @@ -749,9 +801,9 @@ } }, "params": { - "Region": "ap-northeast-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-1" } }, { @@ -762,9 +814,9 @@ } }, "params": { - "Region": "ap-northeast-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-1" } }, { @@ -775,9 +827,9 @@ } }, "params": { - "Region": "ap-northeast-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-1" } }, { @@ -788,9 +840,9 @@ } }, "params": { - "Region": "me-south-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "me-south-1" } }, { @@ -801,9 +853,9 @@ } }, "params": { - "Region": "me-south-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "me-south-1" } }, { @@ -814,9 +866,9 @@ } }, "params": { - "Region": "me-south-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "me-south-1" } }, { @@ -827,9 +879,9 @@ } }, "params": { - "Region": "me-south-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "me-south-1" } }, { @@ -840,9 +892,9 @@ } }, "params": { - "Region": "sa-east-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "sa-east-1" } }, { @@ -853,9 +905,9 @@ } }, "params": { - "Region": "sa-east-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "sa-east-1" } }, { @@ -866,9 +918,9 @@ } }, "params": { - "Region": "sa-east-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "sa-east-1" } }, { @@ -879,9 +931,9 @@ } }, "params": { - "Region": "sa-east-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "sa-east-1" } }, { @@ -892,9 +944,9 @@ } }, "params": { - "Region": "ap-east-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-east-1" } }, { @@ -905,9 +957,9 @@ } }, "params": { - "Region": "ap-east-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-east-1" } }, { @@ -918,9 +970,9 @@ } }, "params": { - "Region": "ap-east-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-east-1" } }, { @@ -931,9 +983,9 @@ } }, "params": { - "Region": "ap-east-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-east-1" } }, { @@ -944,9 +996,9 @@ } }, "params": { - "Region": "cn-north-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "cn-north-1" } }, { @@ -957,9 +1009,9 @@ } }, "params": { - "Region": "cn-north-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "cn-north-1" } }, { @@ -970,9 +1022,9 @@ } }, "params": { - "Region": "cn-north-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "cn-north-1" } }, { @@ -983,9 +1035,9 @@ } }, "params": { - "Region": "cn-north-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "cn-north-1" } }, { @@ -996,9 +1048,9 @@ } }, "params": { - "Region": "us-gov-west-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-west-1" } }, { @@ -1009,9 +1061,9 @@ } }, "params": { - "Region": "us-gov-west-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-west-1" } }, { @@ -1022,9 +1074,9 @@ } }, "params": { - "Region": "us-gov-west-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-west-1" } }, { @@ -1035,9 +1087,9 @@ } }, "params": { - "Region": "us-gov-west-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-west-1" } }, { @@ -1048,9 +1100,9 @@ } }, "params": { - "Region": "ap-southeast-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-1" } }, { @@ -1061,9 +1113,9 @@ } }, "params": { - "Region": "ap-southeast-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-1" } }, { @@ -1074,9 +1126,9 @@ } }, "params": { - "Region": "ap-southeast-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-1" } }, { @@ -1087,9 +1139,9 @@ } }, "params": { - "Region": "ap-southeast-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-1" } }, { @@ -1100,9 +1152,9 @@ } }, "params": { - "Region": "ap-southeast-2", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-2" } }, { @@ -1113,9 +1165,9 @@ } }, "params": { - "Region": "ap-southeast-2", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-2" } }, { @@ -1126,9 +1178,9 @@ } }, "params": { - "Region": "ap-southeast-2", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-2" } }, { @@ -1139,9 +1191,9 @@ } }, "params": { - "Region": "ap-southeast-2", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-2" } }, { @@ -1150,9 +1202,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-iso-east-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-iso-east-1" } }, { @@ -1163,9 +1215,9 @@ } }, "params": { - "Region": "us-iso-east-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-iso-east-1" } }, { @@ -1174,9 +1226,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-iso-east-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-iso-east-1" } }, { @@ -1187,9 +1239,9 @@ } }, "params": { - "Region": "us-iso-east-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-iso-east-1" } }, { @@ -1200,9 +1252,9 @@ } }, "params": { - "Region": "ap-southeast-3", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-3" } }, { @@ -1213,9 +1265,9 @@ } }, "params": { - "Region": "ap-southeast-3", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-3" } }, { @@ -1226,9 +1278,9 @@ } }, "params": { - "Region": "ap-southeast-3", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-3" } }, { @@ -1239,9 +1291,9 @@ } }, "params": { - "Region": "ap-southeast-3", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-3" } }, { @@ -1252,9 +1304,9 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-1" } }, { @@ -1265,9 +1317,9 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-1" } }, { @@ -1278,9 +1330,9 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-1" } }, { @@ -1291,9 +1343,9 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-1" } }, { @@ -1304,9 +1356,9 @@ } }, "params": { - "Region": "us-east-2", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-2" } }, { @@ -1317,9 +1369,9 @@ } }, "params": { - "Region": "us-east-2", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-2" } }, { @@ -1330,9 +1382,9 @@ } }, "params": { - "Region": "us-east-2", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-2" } }, { @@ -1343,9 +1395,9 @@ } }, "params": { - "Region": "us-east-2", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-2" } }, { @@ -1356,9 +1408,9 @@ } }, "params": { - "Region": "cn-northwest-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "cn-northwest-1" } }, { @@ -1369,9 +1421,9 @@ } }, "params": { - "Region": "cn-northwest-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "cn-northwest-1" } }, { @@ -1382,9 +1434,9 @@ } }, "params": { - "Region": "cn-northwest-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "cn-northwest-1" } }, { @@ -1395,9 +1447,9 @@ } }, "params": { - "Region": "cn-northwest-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "cn-northwest-1" } }, { @@ -1406,9 +1458,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-isob-east-1", "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-isob-east-1" } }, { @@ -1419,9 +1471,9 @@ } }, "params": { - "Region": "us-isob-east-1", "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-isob-east-1" } }, { @@ -1430,9 +1482,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-isob-east-1", "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "Region": "us-isob-east-1" } }, { @@ -1443,9 +1495,9 @@ } }, "params": { - "Region": "us-isob-east-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "Region": "us-isob-east-1" } }, { @@ -1456,9 +1508,9 @@ } }, "params": { - "Region": "us-east-1", "UseFIPS": false, "UseDualStack": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -1468,9 +1520,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", "UseFIPS": true, "UseDualStack": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -1480,9 +1532,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", "UseFIPS": false, "UseDualStack": true, + "Region": "us-east-1", "Endpoint": "https://example.com" } } diff --git a/models/apis/inspector2/2020-06-08/api-2.json b/models/apis/inspector2/2020-06-08/api-2.json index c19c06a738..40a3d2a101 100644 --- a/models/apis/inspector2/2020-06-08/api-2.json +++ b/models/apis/inspector2/2020-06-08/api-2.json @@ -2737,7 +2737,9 @@ "PYTHON_3_7", "PYTHON_3_8", "PYTHON_3_9", - "UNSUPPORTED" + "UNSUPPORTED", + "NODEJS_18_X", + "GO_1_X" ] }, "ScanStatus":{ diff --git a/models/apis/inspector2/2020-06-08/endpoint-rule-set-1.json b/models/apis/inspector2/2020-06-08/endpoint-rule-set-1.json index 9639d6558f..8481012a3c 100644 --- a/models/apis/inspector2/2020-06-08/endpoint-rule-set-1.json +++ b/models/apis/inspector2/2020-06-08/endpoint-rule-set-1.json @@ -3,7 +3,7 @@ "parameters": { "Region": { "builtIn": "AWS::Region", - "required": false, + "required": true, "documentation": "The AWS region used to dispatch the request.", "type": "String" }, @@ -52,15 +52,6 @@ "ref": "Endpoint" } ] - }, - { - "fn": "parseURL", - "argv": [ - { - "ref": "Endpoint" - } - ], - "assign": "url" } ], "type": "tree", diff --git a/models/apis/inspector2/2020-06-08/endpoint-tests-1.json b/models/apis/inspector2/2020-06-08/endpoint-tests-1.json index 51c0be4682..0e14ce7589 100644 --- a/models/apis/inspector2/2020-06-08/endpoint-tests-1.json +++ b/models/apis/inspector2/2020-06-08/endpoint-tests-1.json @@ -9,8 +9,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-south-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-south-1" } }, { @@ -22,8 +22,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-south-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-south-1" } }, { @@ -35,8 +35,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-south-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-south-1" } }, { @@ -48,8 +48,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-south-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-south-1" } }, { @@ -61,8 +61,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-south-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-south-1" } }, { @@ -74,8 +74,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-south-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-south-1" } }, { @@ -87,8 +87,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-south-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-south-1" } }, { @@ -100,8 +100,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-south-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-south-1" } }, { @@ -113,8 +113,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-gov-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-east-1" } }, { @@ -126,8 +126,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-gov-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-east-1" } }, { @@ -139,8 +139,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-gov-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-east-1" } }, { @@ -152,8 +152,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-gov-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-east-1" } }, { @@ -165,8 +165,8 @@ }, "params": { "UseFIPS": true, - "Region": "ca-central-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ca-central-1" } }, { @@ -178,8 +178,8 @@ }, "params": { "UseFIPS": true, - "Region": "ca-central-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ca-central-1" } }, { @@ -191,8 +191,8 @@ }, "params": { "UseFIPS": false, - "Region": "ca-central-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ca-central-1" } }, { @@ -204,8 +204,8 @@ }, "params": { "UseFIPS": false, - "Region": "ca-central-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ca-central-1" } }, { @@ -217,8 +217,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-central-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-central-1" } }, { @@ -230,8 +230,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-central-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-central-1" } }, { @@ -243,8 +243,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-central-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-central-1" } }, { @@ -256,8 +256,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-central-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-central-1" } }, { @@ -269,8 +269,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-west-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-west-1" } }, { @@ -282,8 +282,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-west-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-west-1" } }, { @@ -295,8 +295,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-west-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-west-1" } }, { @@ -308,8 +308,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-west-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-west-1" } }, { @@ -321,8 +321,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-west-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-west-2" } }, { @@ -334,8 +334,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-west-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-west-2" } }, { @@ -347,8 +347,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-west-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-west-2" } }, { @@ -360,8 +360,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-west-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-west-2" } }, { @@ -373,8 +373,8 @@ }, "params": { "UseFIPS": true, - "Region": "af-south-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "af-south-1" } }, { @@ -386,8 +386,8 @@ }, "params": { "UseFIPS": true, - "Region": "af-south-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "af-south-1" } }, { @@ -399,8 +399,8 @@ }, "params": { "UseFIPS": false, - "Region": "af-south-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "af-south-1" } }, { @@ -412,8 +412,8 @@ }, "params": { "UseFIPS": false, - "Region": "af-south-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "af-south-1" } }, { @@ -425,8 +425,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-north-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-north-1" } }, { @@ -438,8 +438,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-north-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-north-1" } }, { @@ -451,8 +451,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-north-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-north-1" } }, { @@ -464,8 +464,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-north-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-north-1" } }, { @@ -477,8 +477,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-west-3", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-3" } }, { @@ -490,8 +490,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-west-3", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-3" } }, { @@ -503,8 +503,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-west-3", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-3" } }, { @@ -516,8 +516,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-west-3", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-3" } }, { @@ -529,8 +529,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-2" } }, { @@ -542,8 +542,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-2" } }, { @@ -555,8 +555,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-2" } }, { @@ -568,8 +568,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-2" } }, { @@ -581,8 +581,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-1" } }, { @@ -594,8 +594,8 @@ }, "params": { "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-1" } }, { @@ -607,8 +607,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "eu-west-1" } }, { @@ -620,8 +620,8 @@ }, "params": { "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "eu-west-1" } }, { @@ -633,8 +633,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-northeast-3", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-3" } }, { @@ -646,8 +646,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-northeast-3", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-3" } }, { @@ -659,8 +659,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-northeast-3", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-3" } }, { @@ -672,8 +672,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-northeast-3", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-3" } }, { @@ -685,8 +685,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-2" } }, { @@ -698,8 +698,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-2" } }, { @@ -711,8 +711,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-2" } }, { @@ -724,8 +724,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-2" } }, { @@ -737,8 +737,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-1" } }, { @@ -750,8 +750,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-1" } }, { @@ -763,8 +763,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-northeast-1" } }, { @@ -776,8 +776,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-northeast-1" } }, { @@ -789,8 +789,8 @@ }, "params": { "UseFIPS": true, - "Region": "me-south-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "me-south-1" } }, { @@ -802,8 +802,8 @@ }, "params": { "UseFIPS": true, - "Region": "me-south-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "me-south-1" } }, { @@ -815,8 +815,8 @@ }, "params": { "UseFIPS": false, - "Region": "me-south-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "me-south-1" } }, { @@ -828,8 +828,8 @@ }, "params": { "UseFIPS": false, - "Region": "me-south-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "me-south-1" } }, { @@ -841,8 +841,8 @@ }, "params": { "UseFIPS": true, - "Region": "sa-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "sa-east-1" } }, { @@ -854,8 +854,8 @@ }, "params": { "UseFIPS": true, - "Region": "sa-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "sa-east-1" } }, { @@ -867,8 +867,8 @@ }, "params": { "UseFIPS": false, - "Region": "sa-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "sa-east-1" } }, { @@ -880,8 +880,8 @@ }, "params": { "UseFIPS": false, - "Region": "sa-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "sa-east-1" } }, { @@ -893,8 +893,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-east-1" } }, { @@ -906,8 +906,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-east-1" } }, { @@ -919,8 +919,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-east-1" } }, { @@ -932,8 +932,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-east-1" } }, { @@ -945,8 +945,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-gov-west-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-west-1" } }, { @@ -958,8 +958,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-gov-west-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-west-1" } }, { @@ -971,8 +971,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-gov-west-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-west-1" } }, { @@ -984,8 +984,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-gov-west-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-west-1" } }, { @@ -997,8 +997,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-1" } }, { @@ -1010,8 +1010,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-1" } }, { @@ -1023,8 +1023,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-1" } }, { @@ -1036,8 +1036,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-1" } }, { @@ -1049,8 +1049,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-southeast-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-2" } }, { @@ -1062,8 +1062,8 @@ }, "params": { "UseFIPS": true, - "Region": "ap-southeast-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-2" } }, { @@ -1075,8 +1075,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-southeast-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "ap-southeast-2" } }, { @@ -1088,8 +1088,8 @@ }, "params": { "UseFIPS": false, - "Region": "ap-southeast-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "ap-southeast-2" } }, { @@ -1101,8 +1101,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-1" } }, { @@ -1114,8 +1114,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-1" } }, { @@ -1127,8 +1127,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-1" } }, { @@ -1140,8 +1140,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-1" } }, { @@ -1153,8 +1153,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-east-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-2" } }, { @@ -1166,8 +1166,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-east-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-2" } }, { @@ -1179,8 +1179,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-2", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-2" } }, { @@ -1192,8 +1192,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-2", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-2" } }, { @@ -1205,8 +1205,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-1", "UseDualStack": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -1217,8 +1217,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-east-1", "UseDualStack": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -1229,8 +1229,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-1", "UseDualStack": true, + "Region": "us-east-1", "Endpoint": "https://example.com" } } diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index 1b6029560b..1d76e0d4af 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -87,7 +87,7 @@ "description" : "Middle East (Bahrain)" }, "sa-east-1" : { - "description" : "South America (Sao Paulo)" + "description" : "South America (São Paulo)" }, "us-east-1" : { "description" : "US East (N. Virginia)" @@ -10178,6 +10178,7 @@ "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, + "ap-southeast-3" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "network-firewall-fips.ca-central-1.amazonaws.com", @@ -13337,6 +13338,12 @@ "tags" : [ "dualstack" ] } ] }, + "ap-south-2" : { + "variants" : [ { + "hostname" : "servicediscovery.ap-south-2.amazonaws.com", + "tags" : [ "dualstack" ] + } ] + }, "ap-southeast-1" : { "variants" : [ { "hostname" : "servicediscovery.ap-southeast-1.amazonaws.com", @@ -13377,6 +13384,12 @@ "tags" : [ "dualstack" ] } ] }, + "eu-central-2" : { + "variants" : [ { + "hostname" : "servicediscovery.eu-central-2.amazonaws.com", + "tags" : [ "dualstack" ] + } ] + }, "eu-north-1" : { "variants" : [ { "hostname" : "servicediscovery.eu-north-1.amazonaws.com", @@ -13389,6 +13402,12 @@ "tags" : [ "dualstack" ] } ] }, + "eu-south-2" : { + "variants" : [ { + "hostname" : "servicediscovery.eu-south-2.amazonaws.com", + "tags" : [ "dualstack" ] + } ] + }, "eu-west-1" : { "variants" : [ { "hostname" : "servicediscovery.eu-west-1.amazonaws.com", @@ -13706,12 +13725,48 @@ "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, - "ca-central-1" : { }, + "ca-central-1" : { + "variants" : [ { + "hostname" : "sms-voice-fips.ca-central-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, "eu-central-1" : { }, "eu-west-1" : { }, "eu-west-2" : { }, - "us-east-1" : { }, - "us-west-2" : { } + "fips-ca-central-1" : { + "credentialScope" : { + "region" : "ca-central-1" + }, + "deprecated" : true, + "hostname" : "sms-voice-fips.ca-central-1.amazonaws.com" + }, + "fips-us-east-1" : { + "credentialScope" : { + "region" : "us-east-1" + }, + "deprecated" : true, + "hostname" : "sms-voice-fips.us-east-1.amazonaws.com" + }, + "fips-us-west-2" : { + "credentialScope" : { + "region" : "us-west-2" + }, + "deprecated" : true, + "hostname" : "sms-voice-fips.us-west-2.amazonaws.com" + }, + "us-east-1" : { + "variants" : [ { + "hostname" : "sms-voice-fips.us-east-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, + "us-west-2" : { + "variants" : [ { + "hostname" : "sms-voice-fips.us-west-2.amazonaws.com", + "tags" : [ "fips" ] + } ] + } } }, "snowball" : { @@ -15140,13 +15195,25 @@ "ap-northeast-1" : { }, "ap-northeast-2" : { }, "ap-southeast-1" : { }, - "ca-central-1" : { }, + "ca-central-1" : { + "variants" : [ { + "hostname" : "voice-chime-fips.ca-central-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, + "ca-central-1-fips" : { + "credentialScope" : { + "region" : "ca-central-1" + }, + "deprecated" : true, + "hostname" : "voice-chime-fips.ca-central-1.amazonaws.com" + }, "eu-central-1" : { }, "eu-west-1" : { }, "eu-west-2" : { }, "us-east-1" : { "variants" : [ { - "hostname" : "fips.voice-chime.us-east-1.amazonaws.com", + "hostname" : "voice-chime-fips.us-east-1.amazonaws.com", "tags" : [ "fips" ] } ] }, @@ -15155,11 +15222,11 @@ "region" : "us-east-1" }, "deprecated" : true, - "hostname" : "fips.voice-chime.us-east-1.amazonaws.com" + "hostname" : "voice-chime-fips.us-east-1.amazonaws.com" }, "us-west-2" : { "variants" : [ { - "hostname" : "fips.voice-chime.us-west-2.amazonaws.com", + "hostname" : "voice-chime-fips.us-west-2.amazonaws.com", "tags" : [ "fips" ] } ] }, @@ -15168,7 +15235,7 @@ "region" : "us-west-2" }, "deprecated" : true, - "hostname" : "fips.voice-chime.us-west-2.amazonaws.com" + "hostname" : "voice-chime-fips.us-west-2.amazonaws.com" } } }, @@ -20663,7 +20730,19 @@ }, "sms-voice" : { "endpoints" : { - "us-gov-west-1" : { } + "fips-us-gov-west-1" : { + "credentialScope" : { + "region" : "us-gov-west-1" + }, + "deprecated" : true, + "hostname" : "sms-voice-fips.us-gov-west-1.amazonaws.com" + }, + "us-gov-west-1" : { + "variants" : [ { + "hostname" : "sms-voice-fips.us-gov-west-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + } } }, "snowball" : { diff --git a/service/connect/api.go b/service/connect/api.go index 5909ff2c47..5745e3ce90 100644 --- a/service/connect/api.go +++ b/service/connect/api.go @@ -12457,7 +12457,7 @@ func (c *Connect) MonitorContactRequest(input *MonitorContactInput) (req *reques // // Initiates silent monitoring of a contact. The Contact Control Panel (CCP) // of the user specified by userId will be set to silent monitoring mode on -// the contact. Supports voice and chat contacts. +// the contact. // // 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 @@ -18815,6 +18815,9 @@ type AgentStatusReference struct { // The Amazon Resource Name (ARN) of the agent's status. StatusArn *string `type:"string"` + // The name of the agent status. + StatusName *string `min:"1" type:"string"` + // The start timestamp of the agent's status. StatusStartTimestamp *time.Time `type:"timestamp"` } @@ -18843,6 +18846,12 @@ func (s *AgentStatusReference) SetStatusArn(v string) *AgentStatusReference { return s } +// SetStatusName sets the StatusName field's value. +func (s *AgentStatusReference) SetStatusName(v string) *AgentStatusReference { + s.StatusName = &v + return s +} + // SetStatusStartTimestamp sets the StatusStartTimestamp field's value. func (s *AgentStatusReference) SetStatusStartTimestamp(v time.Time) *AgentStatusReference { s.StatusStartTimestamp = &v @@ -24346,6 +24355,49 @@ func (s *CurrentMetricResult) SetDimensions(v *Dimensions) *CurrentMetricResult return s } +// The way to sort the resulting response based on metrics. By default resources +// are sorted based on AGENTS_ONLINE, DESCENDING. The metric collection is sorted +// based on the input metrics. +type CurrentMetricSortCriteria struct { + _ struct{} `type:"structure"` + + // The current metric names. + SortByMetric *string `type:"string" enum:"CurrentMetricName"` + + // The way to sort. + SortOrder *string `type:"string" enum:"SortOrder"` +} + +// 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 CurrentMetricSortCriteria) 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 CurrentMetricSortCriteria) GoString() string { + return s.String() +} + +// SetSortByMetric sets the SortByMetric field's value. +func (s *CurrentMetricSortCriteria) SetSortByMetric(v string) *CurrentMetricSortCriteria { + s.SortByMetric = &v + return s +} + +// SetSortOrder sets the SortOrder field's value. +func (s *CurrentMetricSortCriteria) SetSortOrder(v string) *CurrentMetricSortCriteria { + s.SortOrder = &v + return s +} + // Information about a reference when the referenceType is DATE. Otherwise, // null. type DateReference struct { @@ -27611,6 +27663,9 @@ type Dimensions struct { // Information about the queue for which metrics are returned. Queue *QueueReference `type:"structure"` + + // Information about the routing profile assigned to the user. + RoutingProfile *RoutingProfileReference `type:"structure"` } // String returns the string representation. @@ -27643,6 +27698,12 @@ func (s *Dimensions) SetQueue(v *QueueReference) *Dimensions { return s } +// SetRoutingProfile sets the RoutingProfile field's value. +func (s *Dimensions) SetRoutingProfile(v *RoutingProfileReference) *Dimensions { + s.RoutingProfile = v + return s +} + type DisassociateApprovedOriginInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -28918,6 +28979,9 @@ type Filters struct { // queue, and can specify up to 100 queues per request. The GetCurrentMetricsData // API in particular requires a queue when you include a Filter in your request. Queues []*string `min:"1" type:"list"` + + // A list of up to 100 routing profile IDs or ARNs. + RoutingProfiles []*string `min:"1" type:"list"` } // String returns the string representation. @@ -28944,6 +29008,9 @@ func (s *Filters) Validate() error { if s.Queues != nil && len(s.Queues) < 1 { invalidParams.Add(request.NewErrParamMinLen("Queues", 1)) } + if s.RoutingProfiles != nil && len(s.RoutingProfiles) < 1 { + invalidParams.Add(request.NewErrParamMinLen("RoutingProfiles", 1)) + } if invalidParams.Len() > 0 { return invalidParams @@ -28963,6 +29030,12 @@ func (s *Filters) SetQueues(v []*string) *Filters { return s } +// SetRoutingProfiles sets the RoutingProfiles field's value. +func (s *Filters) SetRoutingProfiles(v []*string) *Filters { + s.RoutingProfiles = v + return s +} + type GetContactAttributesInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -29159,10 +29232,22 @@ type GetCurrentMetricDataInput struct { // CurrentMetrics is a required field CurrentMetrics []*CurrentMetric `type:"list" required:"true"` - // The queues, up to 100, or channels, to use to filter the metrics returned. + // The filters to apply to returned metrics. You can filter up to the following + // limits: + // + // * Queues: 100 + // + // * Routing profiles: 100 + // + // * Channels: 3 (VOICE, CHAT, and TASK channels are supported.) + // // Metric data is retrieved only for the resources associated with the queues - // or channels included in the filter. You can include both queue IDs and queue - // ARNs in the same request. VOICE, CHAT, and TASK channels are supported. + // or routing profiles, and by any channels included in the filter. (You cannot + // filter by both queue AND routing profile.) You can include both resource + // IDs and resource ARNs in the same request. + // + // Currently tagging is only supported on the resources that are passed in the + // filter. // // Filters is a required field Filters *Filters `type:"structure" required:"true"` @@ -29175,7 +29260,8 @@ type GetCurrentMetricDataInput struct { // CHAT, and TASK channels are supported. // // * If you group by ROUTING_PROFILE, you must include either a queue or - // routing profile filter. + // routing profile filter. In addition, a routing profile filter is required + // for metrics CONTACTS_SCHEDULED, CONTACTS_IN_QUEUE, and OLDEST_CONTACT_AGE. // // * If no Grouping is included in the request, a summary of metrics is returned. Groupings []*string `type:"list" enum:"Grouping"` @@ -29196,6 +29282,15 @@ type GetCurrentMetricDataInput struct { // requests that use the token must use the same request parameters as the request // that generated the token. NextToken *string `type:"string"` + + // The way to sort the resulting response based on metrics. You can enter one + // sort criteria. By default resources are sorted based on AGENTS_ONLINE, DESCENDING. + // The metric collection is sorted based on the input metrics. + // + // Note the following: + // + // * Sorting on SLOTS_ACTIVE and SLOTS_AVAILABLE is not supported. + SortCriteria []*CurrentMetricSortCriteria `type:"list"` } // String returns the string representation. @@ -29282,9 +29377,18 @@ func (s *GetCurrentMetricDataInput) SetNextToken(v string) *GetCurrentMetricData return s } +// SetSortCriteria sets the SortCriteria field's value. +func (s *GetCurrentMetricDataInput) SetSortCriteria(v []*CurrentMetricSortCriteria) *GetCurrentMetricDataInput { + s.SortCriteria = v + return s +} + type GetCurrentMetricDataOutput struct { _ struct{} `type:"structure"` + // The total count of the result, regardless of the current page size. + ApproximateTotalCount *int64 `type:"long"` + // The time at which the metrics were retrieved and cached for pagination. DataSnapshotTime *time.Time `type:"timestamp"` @@ -29317,6 +29421,12 @@ func (s GetCurrentMetricDataOutput) GoString() string { return s.String() } +// SetApproximateTotalCount sets the ApproximateTotalCount field's value. +func (s *GetCurrentMetricDataOutput) SetApproximateTotalCount(v int64) *GetCurrentMetricDataOutput { + s.ApproximateTotalCount = &v + return s +} + // SetDataSnapshotTime sets the DataSnapshotTime field's value. func (s *GetCurrentMetricDataOutput) SetDataSnapshotTime(v time.Time) *GetCurrentMetricDataOutput { s.DataSnapshotTime = &v @@ -29338,9 +29448,25 @@ func (s *GetCurrentMetricDataOutput) SetNextToken(v string) *GetCurrentMetricDat type GetCurrentUserDataInput struct { _ struct{} `type:"structure"` - // Filters up to 100 Queues, or up to 9 ContactStates. The user data is retrieved - // only for those users who are associated with the queues and have contacts - // that are in the specified ContactState. + // The filters to apply to returned user data. You can filter up to the following + // limits: + // + // * Queues: 100 + // + // * Routing profiles: 100 + // + // * Agents: 100 + // + // * Contact states: 9 + // + // * User hierarchy groups: 1 + // + // The user data is retrieved for only the specified values/resources in the + // filter. A maximum of one filter can be passed from queues, routing profiles, + // agents, and user hierarchy groups. + // + // Currently tagging is only supported on the resources that are passed in the + // filter. // // Filters is a required field Filters *UserDataFilters `type:"structure" required:"true"` @@ -29431,6 +29557,9 @@ func (s *GetCurrentUserDataInput) SetNextToken(v string) *GetCurrentUserDataInpu type GetCurrentUserDataOutput struct { _ struct{} `type:"structure"` + // The total count of the result, regardless of the current page size. + ApproximateTotalCount *int64 `type:"long"` + // If there are additional results, this is the token for the next set of results. NextToken *string `type:"string"` @@ -29456,6 +29585,12 @@ func (s GetCurrentUserDataOutput) GoString() string { return s.String() } +// SetApproximateTotalCount sets the ApproximateTotalCount field's value. +func (s *GetCurrentUserDataOutput) SetApproximateTotalCount(v int64) *GetCurrentUserDataOutput { + s.ApproximateTotalCount = &v + return s +} + // SetNextToken sets the NextToken field's value. func (s *GetCurrentUserDataOutput) SetNextToken(v string) *GetCurrentUserDataOutput { s.NextToken = &v @@ -48661,6 +48796,9 @@ type UserData struct { // of the RoutingProfile assigned to the agent. MaxSlotsByChannel map[string]*int64 `type:"map"` + // The Next status of the agent. + NextStatus *string `min:"1" type:"string"` + // Information about the routing profile that is assigned to the user. RoutingProfile *RoutingProfileReference `type:"structure"` @@ -48721,6 +48859,12 @@ func (s *UserData) SetMaxSlotsByChannel(v map[string]*int64) *UserData { return s } +// SetNextStatus sets the NextStatus field's value. +func (s *UserData) SetNextStatus(v string) *UserData { + s.NextStatus = &v + return s +} + // SetRoutingProfile sets the RoutingProfile field's value. func (s *UserData) SetRoutingProfile(v *RoutingProfileReference) *UserData { s.RoutingProfile = v @@ -48743,12 +48887,21 @@ func (s *UserData) SetUser(v *UserReference) *UserData { type UserDataFilters struct { _ struct{} `type:"structure"` + // A list of up to 100 agent IDs or ARNs. + Agents []*string `min:"1" type:"list"` + // A filter for the user data based on the contact information that is associated // to the user. It contains a list of contact states. ContactFilter *ContactFilter `type:"structure"` - // Contains information about a queue resource for which metrics are returned. + // A list of up to 100 queues or ARNs. Queues []*string `min:"1" type:"list"` + + // A list of up to 100 routing profile IDs or ARNs. + RoutingProfiles []*string `min:"1" type:"list"` + + // A UserHierarchyGroup ID or ARN. + UserHierarchyGroups []*string `min:"1" type:"list"` } // String returns the string representation. @@ -48772,9 +48925,18 @@ func (s UserDataFilters) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *UserDataFilters) Validate() error { invalidParams := request.ErrInvalidParams{Context: "UserDataFilters"} + if s.Agents != nil && len(s.Agents) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Agents", 1)) + } if s.Queues != nil && len(s.Queues) < 1 { invalidParams.Add(request.NewErrParamMinLen("Queues", 1)) } + if s.RoutingProfiles != nil && len(s.RoutingProfiles) < 1 { + invalidParams.Add(request.NewErrParamMinLen("RoutingProfiles", 1)) + } + if s.UserHierarchyGroups != nil && len(s.UserHierarchyGroups) < 1 { + invalidParams.Add(request.NewErrParamMinLen("UserHierarchyGroups", 1)) + } if invalidParams.Len() > 0 { return invalidParams @@ -48782,6 +48944,12 @@ func (s *UserDataFilters) Validate() error { return nil } +// SetAgents sets the Agents field's value. +func (s *UserDataFilters) SetAgents(v []*string) *UserDataFilters { + s.Agents = v + return s +} + // SetContactFilter sets the ContactFilter field's value. func (s *UserDataFilters) SetContactFilter(v *ContactFilter) *UserDataFilters { s.ContactFilter = v @@ -48794,6 +48962,18 @@ func (s *UserDataFilters) SetQueues(v []*string) *UserDataFilters { return s } +// SetRoutingProfiles sets the RoutingProfiles field's value. +func (s *UserDataFilters) SetRoutingProfiles(v []*string) *UserDataFilters { + s.RoutingProfiles = v + return s +} + +// SetUserHierarchyGroups sets the UserHierarchyGroups field's value. +func (s *UserDataFilters) SetUserHierarchyGroups(v []*string) *UserDataFilters { + s.UserHierarchyGroups = v + return s +} + // Contains information about the identity of a user. type UserIdentityInfo struct { _ struct{} `type:"structure"` @@ -50079,6 +50259,9 @@ const ( // GroupingChannel is a Grouping enum value GroupingChannel = "CHANNEL" + + // GroupingRoutingProfile is a Grouping enum value + GroupingRoutingProfile = "ROUTING_PROFILE" ) // Grouping_Values returns all elements of the Grouping enum @@ -50086,6 +50269,7 @@ func Grouping_Values() []string { return []string{ GroupingQueue, GroupingChannel, + GroupingRoutingProfile, } } @@ -51674,6 +51858,22 @@ func SearchableQueueType_Values() []string { } } +const ( + // SortOrderAscending is a SortOrder enum value + SortOrderAscending = "ASCENDING" + + // SortOrderDescending is a SortOrder enum value + SortOrderDescending = "DESCENDING" +) + +// SortOrder_Values returns all elements of the SortOrder enum +func SortOrder_Values() []string { + return []string{ + SortOrderAscending, + SortOrderDescending, + } +} + const ( // SourceTypeSalesforce is a SourceType enum value SourceTypeSalesforce = "SALESFORCE" diff --git a/service/connectparticipant/api.go b/service/connectparticipant/api.go index e55388480c..81aba64ae8 100644 --- a/service/connectparticipant/api.go +++ b/service/connectparticipant/api.go @@ -59,6 +59,8 @@ func (c *ConnectParticipant) CompleteAttachmentUploadRequest(input *CompleteAtta // Allows you to confirm that the attachment has been uploaded using the pre-signed // URL provided in StartAttachmentUpload API. // +// ConnectionToken is used for invoking this API instead of ParticipantToken. +// // The Amazon Connect Participant Service APIs do not use Signature Version // 4 authentication (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). // @@ -155,8 +157,9 @@ func (c *ConnectParticipant) CreateParticipantConnectionRequest(input *CreatePar // CreateParticipantConnection API operation for Amazon Connect Participant Service. // -// Creates the participant's connection. Note that ParticipantToken is used -// for invoking this API instead of ConnectionToken. +// Creates the participant's connection. +// +// ParticipantToken is used for invoking this API instead of ConnectionToken. // // The participant token is valid for the lifetime of the participant – until // they are part of a contact. @@ -277,8 +280,9 @@ func (c *ConnectParticipant) DisconnectParticipantRequest(input *DisconnectParti // DisconnectParticipant API operation for Amazon Connect Participant Service. // -// Disconnects a participant. Note that ConnectionToken is used for invoking -// this API instead of ParticipantToken. +// Disconnects a participant. +// +// ConnectionToken is used for invoking this API instead of ParticipantToken. // // The Amazon Connect Participant Service APIs do not use Signature Version // 4 authentication (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). @@ -373,6 +377,8 @@ func (c *ConnectParticipant) GetAttachmentRequest(input *GetAttachmentInput) (re // Provides a pre-signed URL for download of a completed attachment. This is // an asynchronous API for use with active contacts. // +// ConnectionToken is used for invoking this API instead of ParticipantToken. +// // The Amazon Connect Participant Service APIs do not use Signature Version // 4 authentication (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). // @@ -470,7 +476,8 @@ func (c *ConnectParticipant) GetTranscriptRequest(input *GetTranscriptInput) (re // GetTranscript API operation for Amazon Connect Participant Service. // // Retrieves a transcript of the session, including details about any attachments. -// Note that ConnectionToken is used for invoking this API instead of ParticipantToken. +// +// ConnectionToken is used for invoking this API instead of ParticipantToken. // // The Amazon Connect Participant Service APIs do not use Signature Version // 4 authentication (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). @@ -613,8 +620,9 @@ func (c *ConnectParticipant) SendEventRequest(input *SendEventInput) (req *reque // SendEvent API operation for Amazon Connect Participant Service. // -// Sends an event. Note that ConnectionToken is used for invoking this API instead -// of ParticipantToken. +// Sends an event. +// +// ConnectionToken is used for invoking this API instead of ParticipantToken. // // The Amazon Connect Participant Service APIs do not use Signature Version // 4 authentication (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). @@ -706,8 +714,9 @@ func (c *ConnectParticipant) SendMessageRequest(input *SendMessageInput) (req *r // SendMessage API operation for Amazon Connect Participant Service. // -// Sends a message. Note that ConnectionToken is used for invoking this API -// instead of ParticipantToken. +// Sends a message. +// +// ConnectionToken is used for invoking this API instead of ParticipantToken. // // The Amazon Connect Participant Service APIs do not use Signature Version // 4 authentication (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). @@ -802,6 +811,8 @@ func (c *ConnectParticipant) StartAttachmentUploadRequest(input *StartAttachment // Provides a pre-signed Amazon S3 URL in response for uploading the file directly // to S3. // +// ConnectionToken is used for invoking this API instead of ParticipantToken. +// // The Amazon Connect Participant Service APIs do not use Signature Version // 4 authentication (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). // @@ -928,7 +939,7 @@ type AttachmentItem struct { AttachmentName *string `min:"1" type:"string"` // Describes the MIME file type of the attachment. For a list of supported file - // types, see Feature specifications (https://docs.aws.amazon.com/connect/latest/adminguide/amazon-connect-service-limits.html#feature-limits) + // types, see Feature specifications (https://docs.aws.amazon.com/connect/latest/adminguide/feature-limits.html) // in the Amazon Connect Administrator Guide. ContentType *string `min:"1" type:"string"` @@ -987,7 +998,9 @@ type CompleteAttachmentUploadInput struct { AttachmentIds []*string `min:"1" type:"list" required:"true"` // A unique, case-sensitive identifier that you provide to ensure the idempotency - // of the request. + // of the request. If not provided, the Amazon Web Services SDK populates this + // field. For more information about idempotency, see Making retries safe with + // idempotent APIs (https://aws.amazon.com/builders-library/making-retries-safe-with-idempotent-APIs/). ClientToken *string `min:"1" type:"string" idempotencyToken:"true"` // The authentication token associated with the participant's connection. @@ -1202,10 +1215,9 @@ type CreateParticipantConnectionInput struct { // ParticipantToken is a required field ParticipantToken *string `location:"header" locationName:"X-Amz-Bearer" min:"1" type:"string" required:"true"` - // Type of connection information required. - // - // Type is a required field - Type []*string `min:"1" type:"list" required:"true" enum:"ConnectionType"` + // Type of connection information required. This can be omitted if ConnectParticipant + // is true. + Type []*string `min:"1" type:"list" enum:"ConnectionType"` } // String returns the string representation. @@ -1235,9 +1247,6 @@ func (s *CreateParticipantConnectionInput) Validate() error { if s.ParticipantToken != nil && len(*s.ParticipantToken) < 1 { invalidParams.Add(request.NewErrParamMinLen("ParticipantToken", 1)) } - if s.Type == nil { - invalidParams.Add(request.NewErrParamRequired("Type")) - } if s.Type != nil && len(s.Type) < 1 { invalidParams.Add(request.NewErrParamMinLen("Type", 1)) } @@ -1311,7 +1320,9 @@ type DisconnectParticipantInput struct { _ struct{} `type:"structure"` // A unique, case-sensitive identifier that you provide to ensure the idempotency - // of the request. + // of the request. If not provided, the Amazon Web Services SDK populates this + // field. For more information about idempotency, see Making retries safe with + // idempotent APIs (https://aws.amazon.com/builders-library/making-retries-safe-with-idempotent-APIs/). ClientToken *string `type:"string" idempotencyToken:"true"` // The authentication token associated with the participant's connection. @@ -1752,6 +1763,10 @@ type Item struct { // The ID of the item. Id *string `min:"1" type:"string"` + // The metadata related to the message. Currently this supports only information + // related to message receipts. + MessageMetadata *MessageMetadata `type:"structure"` + // The ID of the sender in the session. ParticipantId *string `min:"1" type:"string"` @@ -1816,6 +1831,12 @@ func (s *Item) SetId(v string) *Item { return s } +// SetMessageMetadata sets the MessageMetadata field's value. +func (s *Item) SetMessageMetadata(v *MessageMetadata) *Item { + s.MessageMetadata = v + return s +} + // SetParticipantId sets the ParticipantId field's value. func (s *Item) SetParticipantId(v string) *Item { s.ParticipantId = &v @@ -1834,11 +1855,104 @@ func (s *Item) SetType(v string) *Item { return s } +// Contains metadata related to a message. +type MessageMetadata struct { + _ struct{} `type:"structure"` + + // The identifier of the message that contains the metadata information. + MessageId *string `min:"1" type:"string"` + + // The list of receipt information for a message for different recipients. + Receipts []*Receipt `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 MessageMetadata) 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 MessageMetadata) GoString() string { + return s.String() +} + +// SetMessageId sets the MessageId field's value. +func (s *MessageMetadata) SetMessageId(v string) *MessageMetadata { + s.MessageId = &v + return s +} + +// SetReceipts sets the Receipts field's value. +func (s *MessageMetadata) SetReceipts(v []*Receipt) *MessageMetadata { + s.Receipts = v + return s +} + +// The receipt for the message delivered to the recipient. +type Receipt struct { + _ struct{} `type:"structure"` + + // The time when the message was delivered to the recipient. + DeliveredTimestamp *string `min:"1" type:"string"` + + // The time when the message was read by the recipient. + ReadTimestamp *string `min:"1" type:"string"` + + // The identifier of the recipient of the message. + RecipientParticipantId *string `min:"1" 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 Receipt) 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 Receipt) GoString() string { + return s.String() +} + +// SetDeliveredTimestamp sets the DeliveredTimestamp field's value. +func (s *Receipt) SetDeliveredTimestamp(v string) *Receipt { + s.DeliveredTimestamp = &v + return s +} + +// SetReadTimestamp sets the ReadTimestamp field's value. +func (s *Receipt) SetReadTimestamp(v string) *Receipt { + s.ReadTimestamp = &v + return s +} + +// SetRecipientParticipantId sets the RecipientParticipantId field's value. +func (s *Receipt) SetRecipientParticipantId(v string) *Receipt { + s.RecipientParticipantId = &v + return s +} + type SendEventInput struct { _ struct{} `type:"structure"` // A unique, case-sensitive identifier that you provide to ensure the idempotency - // of the request. + // of the request. If not provided, the Amazon Web Services SDK populates this + // field. For more information about idempotency, see Making retries safe with + // idempotent APIs (https://aws.amazon.com/builders-library/making-retries-safe-with-idempotent-APIs/). ClientToken *string `type:"string" idempotencyToken:"true"` // The authentication token associated with the participant's connection. @@ -1846,8 +1960,10 @@ type SendEventInput struct { // ConnectionToken is a required field ConnectionToken *string `location:"header" locationName:"X-Amz-Bearer" min:"1" type:"string" required:"true"` - // The content of the event to be sent (for example, message text). This is - // not yet supported. + // The content of the event to be sent (for example, message text). For content + // related to message receipts, this is supported in the form of a JSON string. + // + // Sample Content: "{\"messageId\":\"11111111-aaaa-bbbb-cccc-EXAMPLE01234\"}" Content *string `min:"1" type:"string"` // The content type of the request. Supported types are: @@ -1856,6 +1972,10 @@ type SendEventInput struct { // // * application/vnd.amazonaws.connect.event.connection.acknowledged // + // * application/vnd.amazonaws.connect.event.message.delivered + // + // * application/vnd.amazonaws.connect.event.message.read + // // ContentType is a required field ContentType *string `min:"1" type:"string" required:"true"` } @@ -1974,7 +2094,9 @@ type SendMessageInput struct { _ struct{} `type:"structure"` // A unique, case-sensitive identifier that you provide to ensure the idempotency - // of the request. + // of the request. If not provided, the Amazon Web Services SDK populates this + // field. For more information about idempotency, see Making retries safe with + // idempotent APIs (https://aws.amazon.com/builders-library/making-retries-safe-with-idempotent-APIs/). ClientToken *string `type:"string" idempotencyToken:"true"` // The authentication token associated with the connection. @@ -1984,10 +2106,17 @@ type SendMessageInput struct { // The content of the message. // + // * For text/plain and text/markdown, the Length Constraints are Minimum + // of 1, Maximum of 1024. + // + // * For application/json, the Length Constraints are Minimum of 1, Maximum + // of 12000. + // // Content is a required field Content *string `min:"1" type:"string" required:"true"` - // The type of the content. Supported types are text/plain. + // The type of the content. Supported types are text/plain, text/markdown, and + // application/json. // // ContentType is a required field ContentType *string `min:"1" type:"string" required:"true"` @@ -2183,7 +2312,10 @@ type StartAttachmentUploadInput struct { // AttachmentSizeInBytes is a required field AttachmentSizeInBytes *int64 `min:"1" type:"long" required:"true"` - // A unique case sensitive identifier to support idempotency of request. + // A unique, case-sensitive identifier that you provide to ensure the idempotency + // of the request. If not provided, the Amazon Web Services SDK populates this + // field. For more information about idempotency, see Making retries safe with + // idempotent APIs (https://aws.amazon.com/builders-library/making-retries-safe-with-idempotent-APIs/). ClientToken *string `min:"1" type:"string" idempotencyToken:"true"` // The authentication token associated with the participant's connection. @@ -2192,7 +2324,7 @@ type StartAttachmentUploadInput struct { ConnectionToken *string `location:"header" locationName:"X-Amz-Bearer" min:"1" type:"string" required:"true"` // Describes the MIME file type of the attachment. For a list of supported file - // types, see Feature specifications (https://docs.aws.amazon.com/connect/latest/adminguide/amazon-connect-service-limits.html#feature-limits) + // types, see Feature specifications (https://docs.aws.amazon.com/connect/latest/adminguide/feature-limits.html) // in the Amazon Connect Administrator Guide. // // ContentType is a required field @@ -2668,6 +2800,12 @@ const ( // ChatItemTypeConnectionAck is a ChatItemType enum value ChatItemTypeConnectionAck = "CONNECTION_ACK" + + // ChatItemTypeMessageDelivered is a ChatItemType enum value + ChatItemTypeMessageDelivered = "MESSAGE_DELIVERED" + + // ChatItemTypeMessageRead is a ChatItemType enum value + ChatItemTypeMessageRead = "MESSAGE_READ" ) // ChatItemType_Values returns all elements of the ChatItemType enum @@ -2683,6 +2821,8 @@ func ChatItemType_Values() []string { ChatItemTypeEvent, ChatItemTypeAttachment, ChatItemTypeConnectionAck, + ChatItemTypeMessageDelivered, + ChatItemTypeMessageRead, } } diff --git a/service/connectparticipant/doc.go b/service/connectparticipant/doc.go index bc546b88b8..f1b38df39e 100644 --- a/service/connectparticipant/doc.go +++ b/service/connectparticipant/doc.go @@ -4,13 +4,9 @@ // requests to Amazon Connect Participant Service. // // Amazon Connect is a cloud-based contact center solution that makes it easy -// to set up and manage a customer contact center and provide reliable customer -// engagement at any scale. -// -// Amazon Connect enables customer contacts through voice or chat. -// -// The APIs described here are used by chat participants, such as agents and -// customers. +// to set up and manage a customer contact center. Amazon Connect enables customer +// contacts through voice or chat. Use the Amazon Connect Participant Service +// to manage chat participants, such as agents and customers. // // See https://docs.aws.amazon.com/goto/WebAPI/connectparticipant-2018-09-07 for more information on this service. // diff --git a/service/detective/api.go b/service/detective/api.go index 9f3be0d551..5f2bbbeb54 100644 --- a/service/detective/api.go +++ b/service/detective/api.go @@ -73,6 +73,10 @@ func (c *Detective) AcceptInvitationRequest(input *AcceptInvitationInput) (req * // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - ConflictException // The request attempted an invalid action. // @@ -161,6 +165,10 @@ func (c *Detective) BatchGetGraphMemberDatasourcesRequest(input *BatchGetGraphMe // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -246,6 +254,10 @@ func (c *Detective) BatchGetMembershipDatasourcesRequest(input *BatchGetMembersh // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -351,6 +363,10 @@ func (c *Detective) CreateGraphRequest(input *CreateGraphInput) (req *request.Re // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - ConflictException // The request attempted an invalid action. // @@ -477,6 +493,10 @@ func (c *Detective) CreateMembersRequest(input *CreateMembersInput) (req *reques // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -580,6 +600,10 @@ func (c *Detective) DeleteGraphRequest(input *DeleteGraphInput) (req *request.Re // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -680,6 +704,10 @@ func (c *Detective) DeleteMembersRequest(input *DeleteMembersInput) (req *reques // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - ConflictException // The request attempted an invalid action. // @@ -772,6 +800,10 @@ func (c *Detective) DescribeOrganizationConfigurationRequest(input *DescribeOrga // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -870,6 +902,10 @@ func (c *Detective) DisableOrganizationAdminAccountRequest(input *DisableOrganiz // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -963,6 +999,10 @@ func (c *Detective) DisassociateMembershipRequest(input *DisassociateMembershipI // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - ConflictException // The request attempted an invalid action. // @@ -1068,6 +1108,10 @@ func (c *Detective) EnableOrganizationAdminAccountRequest(input *EnableOrganizat // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -1155,6 +1199,10 @@ func (c *Detective) GetMembersRequest(input *GetMembersInput) (req *request.Requ // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -1246,6 +1294,10 @@ func (c *Detective) ListDatasourcePackagesRequest(input *ListDatasourcePackagesI // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -1392,6 +1444,10 @@ func (c *Detective) ListGraphsRequest(input *ListGraphsInput) (req *request.Requ // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -1539,6 +1595,10 @@ func (c *Detective) ListInvitationsRequest(input *ListInvitationsInput) (req *re // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -1685,6 +1745,10 @@ func (c *Detective) ListMembersRequest(input *ListMembersInput) (req *request.Re // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -1828,6 +1892,10 @@ func (c *Detective) ListOrganizationAdminAccountsRequest(input *ListOrganization // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -1965,6 +2033,10 @@ func (c *Detective) ListTagsForResourceRequest(input *ListTagsForResourceInput) // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -2057,6 +2129,10 @@ func (c *Detective) RejectInvitationRequest(input *RejectInvitationInput) (req * // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - ConflictException // The request attempted an invalid action. // @@ -2153,6 +2229,10 @@ func (c *Detective) StartMonitoringMemberRequest(input *StartMonitoringMemberInp // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - ConflictException // The request attempted an invalid action. // @@ -2255,6 +2335,10 @@ func (c *Detective) TagResourceRequest(input *TagResourceInput) (req *request.Re // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -2341,6 +2425,10 @@ func (c *Detective) UntagResourceRequest(input *UntagResourceInput) (req *reques // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -2427,6 +2515,10 @@ func (c *Detective) UpdateDatasourcePackagesRequest(input *UpdateDatasourcePacka // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -2528,6 +2620,10 @@ func (c *Detective) UpdateOrganizationConfigurationRequest(input *UpdateOrganiza // // Returned Error Types: // +// - AccessDeniedException +// The request issuer does not have permission to access this resource or perform +// this operation. +// // - InternalServerException // The request was valid but failed because of a problem with the service. // @@ -2631,6 +2727,83 @@ func (s AcceptInvitationOutput) GoString() string { return s.String() } +// The request issuer does not have permission to access this resource or perform +// this operation. +type AccessDeniedException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + // The SDK default error code associated with the access denied exception. + ErrorCode *string `type:"string" enum:"ErrorCode"` + + // The SDK default explanation of why access was denied. + ErrorCodeReason *string `type:"string"` + + Message_ *string `locationName:"Message" type:"string"` + + // The error code associated with the access denied exception. + SubErrorCode *string `type:"string" enum:"ErrorCode"` + + // An explanation of why access was denied. + SubErrorCodeReason *string `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 AccessDeniedException) 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 AccessDeniedException) GoString() string { + return s.String() +} + +func newErrorAccessDeniedException(v protocol.ResponseMetadata) error { + return &AccessDeniedException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *AccessDeniedException) Code() string { + return "AccessDeniedException" +} + +// Message returns the exception's message. +func (s *AccessDeniedException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *AccessDeniedException) OrigErr() error { + return nil +} + +func (s *AccessDeniedException) Error() string { + return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *AccessDeniedException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *AccessDeniedException) RequestID() string { + return s.RespMetadata.RequestID +} + // An Amazon Web Services account that is the administrator account of or a // member of a behavior graph. type Account struct { diff --git a/service/detective/errors.go b/service/detective/errors.go index 3a5adfdc6b..c131ce5838 100644 --- a/service/detective/errors.go +++ b/service/detective/errors.go @@ -8,6 +8,13 @@ import ( const ( + // ErrCodeAccessDeniedException for service response error code + // "AccessDeniedException". + // + // The request issuer does not have permission to access this resource or perform + // this operation. + ErrCodeAccessDeniedException = "AccessDeniedException" + // ErrCodeConflictException for service response error code // "ConflictException". // @@ -57,6 +64,7 @@ const ( ) var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ + "AccessDeniedException": newErrorAccessDeniedException, "ConflictException": newErrorConflictException, "InternalServerException": newErrorInternalServerException, "ResourceNotFoundException": newErrorResourceNotFoundException, diff --git a/service/fsx/api.go b/service/fsx/api.go index 51e86f7d33..278da89ff0 100644 --- a/service/fsx/api.go +++ b/service/fsx/api.go @@ -8565,9 +8565,9 @@ type CreateFileSystemOpenZFSConfiguration struct { // in the US East (N. Virginia), US East (Ohio), US West (Oregon), and Europe // (Ireland) Amazon Web Services Regions. // - // For more information, see: Deployment type availability (https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/available-aws-regions.html) - // and File system performance (https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/zfs-fs-performance.html)in - // theAmazon FSx for OpenZFS User Guide. + // For more information, see: Deployment type availability (https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/availability-durability.html#available-aws-regions) + // and File system performance (https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/performance.html#zfs-fs-performance) + // in the Amazon FSx for OpenZFS User Guide. // // DeploymentType is a required field DeploymentType *string `type:"string" required:"true" enum:"OpenZFSDeploymentType"` @@ -19021,6 +19021,9 @@ type StorageVirtualMachine struct { // The SVM's system generated unique ID. StorageVirtualMachineId *string `min:"21" type:"string"` + // Describes the SVM's subtype. + Subtype *string `type:"string" enum:"StorageVirtualMachineSubtype"` + // A list of Tag values, with a maximum of 50 elements. Tags []*Tag `min:"1" type:"list"` @@ -19106,6 +19109,12 @@ func (s *StorageVirtualMachine) SetStorageVirtualMachineId(v string) *StorageVir return s } +// SetSubtype sets the Subtype field's value. +func (s *StorageVirtualMachine) SetSubtype(v string) *StorageVirtualMachine { + s.Subtype = &v + return s +} + // SetTags sets the Tags field's value. func (s *StorageVirtualMachine) SetTags(v []*Tag) *StorageVirtualMachine { s.Tags = v @@ -23307,6 +23316,30 @@ func StorageVirtualMachineRootVolumeSecurityStyle_Values() []string { } } +const ( + // StorageVirtualMachineSubtypeDefault is a StorageVirtualMachineSubtype enum value + StorageVirtualMachineSubtypeDefault = "DEFAULT" + + // StorageVirtualMachineSubtypeDpDestination is a StorageVirtualMachineSubtype enum value + StorageVirtualMachineSubtypeDpDestination = "DP_DESTINATION" + + // StorageVirtualMachineSubtypeSyncDestination is a StorageVirtualMachineSubtype enum value + StorageVirtualMachineSubtypeSyncDestination = "SYNC_DESTINATION" + + // StorageVirtualMachineSubtypeSyncSource is a StorageVirtualMachineSubtype enum value + StorageVirtualMachineSubtypeSyncSource = "SYNC_SOURCE" +) + +// StorageVirtualMachineSubtype_Values returns all elements of the StorageVirtualMachineSubtype enum +func StorageVirtualMachineSubtype_Values() []string { + return []string{ + StorageVirtualMachineSubtypeDefault, + StorageVirtualMachineSubtypeDpDestination, + StorageVirtualMachineSubtypeSyncDestination, + StorageVirtualMachineSubtypeSyncSource, + } +} + const ( // TieringPolicyNameSnapshotOnly is a TieringPolicyName enum value TieringPolicyNameSnapshotOnly = "SNAPSHOT_ONLY" diff --git a/service/inspector2/api.go b/service/inspector2/api.go index 71748d33ea..60301c9691 100644 --- a/service/inspector2/api.go +++ b/service/inspector2/api.go @@ -15313,6 +15313,12 @@ const ( // RuntimeUnsupported is a Runtime enum value RuntimeUnsupported = "UNSUPPORTED" + + // RuntimeNodejs18X is a Runtime enum value + RuntimeNodejs18X = "NODEJS_18_X" + + // RuntimeGo1X is a Runtime enum value + RuntimeGo1X = "GO_1_X" ) // Runtime_Values returns all elements of the Runtime enum @@ -15329,6 +15335,8 @@ func Runtime_Values() []string { RuntimePython38, RuntimePython39, RuntimeUnsupported, + RuntimeNodejs18X, + RuntimeGo1X, } }