From a11b2070d6a63041d4cfbd1f5d0d8d37628230f9 Mon Sep 17 00:00:00 2001
From: aws-sdk-go-automation
<43143561+aws-sdk-go-automation@users.noreply.github.com>
Date: Mon, 14 Nov 2022 11:32:21 -0800
Subject: [PATCH] Release v1.44.137 (2022-11-14) (#4622)
Release v1.44.137 (2022-11-14)
===
### Service Client Updates
* `service/customer-profiles`: Updates service API and documentation
* `service/lakeformation`: Updates service API and documentation
* `service/managedblockchain`: Updates service documentation
* `service/proton`: Updates service API and documentation
* `service/rds`: Updates service API, documentation, waiters, paginators, and examples
* This release adds support for restoring an RDS Multi-AZ DB cluster snapshot to a Single-AZ deployment or a Multi-AZ DB instance deployment.
* `service/workdocs`: Updates service API and documentation
* Added 2 new document related operations, DeleteDocumentVersion and RestoreDocumentVersions.
* `service/xray`: Updates service API and documentation
* This release enhances GetServiceGraph API to support new type of edge to represent links between SQS and Lambda in event-driven applications.
---
CHANGELOG.md | 15 +
aws/version.go | 2 +-
.../customer-profiles/2020-08-15/api-2.json | 44 +-
.../customer-profiles/2020-08-15/docs-2.json | 42 +-
.../2020-08-15/endpoint-rule-set-1.json | 315 ++++
.../2020-08-15/endpoint-tests-1.json | 563 ++++++
.../apis/lakeformation/2017-03-31/api-2.json | 26 +-
.../apis/lakeformation/2017-03-31/docs-2.json | 33 +-
.../2017-03-31/endpoint-rule-set-1.json | 315 ++++
.../2017-03-31/endpoint-tests-1.json | 1343 ++++++++++++++
.../managedblockchain/2018-09-24/docs-2.json | 10 +-
.../2018-09-24/endpoint-rule-set-1.json | 2 +-
.../2018-09-24/endpoint-tests-1.json | 118 +-
models/apis/proton/2020-07-20/api-2.json | 54 +-
models/apis/proton/2020-07-20/docs-2.json | 71 +-
.../2020-07-20/endpoint-rule-set-1.json | 315 ++++
.../proton/2020-07-20/endpoint-tests-1.json | 615 +++++++
models/apis/rds/2014-10-31/api-2.json | 11 +-
models/apis/rds/2014-10-31/docs-2.json | 9 +-
.../apis/rds/2014-10-31/endpoint-tests-1.json | 556 +++---
models/apis/workdocs/2016-05-01/api-2.json | 127 +-
models/apis/workdocs/2016-05-01/docs-2.json | 37 +-
.../2016-05-01/endpoint-rule-set-1.json | 315 ++++
.../workdocs/2016-05-01/endpoint-tests-1.json | 355 ++++
models/apis/xray/2016-04-12/api-2.json | 4 +-
models/apis/xray/2016-04-12/docs-2.json | 8 +-
.../xray/2016-04-12/endpoint-rule-set-1.json | 315 ++++
.../xray/2016-04-12/endpoint-tests-1.json | 1603 +++++++++++++++++
service/customerprofiles/api.go | 219 ++-
service/customerprofiles/doc.go | 11 +-
service/lakeformation/api.go | 16 +-
service/managedblockchain/api.go | 14 +-
service/proton/api.go | 223 ++-
service/rds/api.go | 50 +-
service/rds/examples_test.go | 2 +
service/workdocs/api.go | 519 +++++-
service/workdocs/doc.go | 14 +
service/workdocs/errors.go | 3 +-
service/workdocs/workdocsiface/interface.go | 8 +
service/xray/api.go | 33 +-
40 files changed, 7796 insertions(+), 539 deletions(-)
create mode 100644 models/apis/customer-profiles/2020-08-15/endpoint-rule-set-1.json
create mode 100644 models/apis/customer-profiles/2020-08-15/endpoint-tests-1.json
create mode 100644 models/apis/lakeformation/2017-03-31/endpoint-rule-set-1.json
create mode 100644 models/apis/lakeformation/2017-03-31/endpoint-tests-1.json
create mode 100644 models/apis/proton/2020-07-20/endpoint-rule-set-1.json
create mode 100644 models/apis/proton/2020-07-20/endpoint-tests-1.json
create mode 100644 models/apis/workdocs/2016-05-01/endpoint-rule-set-1.json
create mode 100644 models/apis/workdocs/2016-05-01/endpoint-tests-1.json
create mode 100644 models/apis/xray/2016-04-12/endpoint-rule-set-1.json
create mode 100644 models/apis/xray/2016-04-12/endpoint-tests-1.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29878472442..b52c6acead8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+Release v1.44.137 (2022-11-14)
+===
+
+### Service Client Updates
+* `service/customer-profiles`: Updates service API and documentation
+* `service/lakeformation`: Updates service API and documentation
+* `service/managedblockchain`: Updates service documentation
+* `service/proton`: Updates service API and documentation
+* `service/rds`: Updates service API, documentation, waiters, paginators, and examples
+ * This release adds support for restoring an RDS Multi-AZ DB cluster snapshot to a Single-AZ deployment or a Multi-AZ DB instance deployment.
+* `service/workdocs`: Updates service API and documentation
+ * Added 2 new document related operations, DeleteDocumentVersion and RestoreDocumentVersions.
+* `service/xray`: Updates service API and documentation
+ * This release enhances GetServiceGraph API to support new type of edge to represent links between SQS and Lambda in event-driven applications.
+
Release v1.44.136 (2022-11-11)
===
diff --git a/aws/version.go b/aws/version.go
index b01bc446c57..e1b23bd7112 100644
--- a/aws/version.go
+++ b/aws/version.go
@@ -5,4 +5,4 @@ package aws
const SDKName = "aws-sdk-go"
// SDKVersion is the version of this SDK
-const SDKVersion = "1.44.136"
+const SDKVersion = "1.44.137"
diff --git a/models/apis/customer-profiles/2020-08-15/api-2.json b/models/apis/customer-profiles/2020-08-15/api-2.json
index c580bdaa21a..405cb604bda 100644
--- a/models/apis/customer-profiles/2020-08-15/api-2.json
+++ b/models/apis/customer-profiles/2020-08-15/api-2.json
@@ -656,6 +656,17 @@
"Values":{"shape":"requestValueList"}
}
},
+ "AdditionalSearchKey":{
+ "type":"structure",
+ "required":[
+ "KeyName",
+ "Values"
+ ],
+ "members":{
+ "KeyName":{"shape":"name"},
+ "Values":{"shape":"requestValueList"}
+ }
+ },
"Address":{
"type":"structure",
"members":{
@@ -1211,6 +1222,13 @@
"max":256,
"pattern":"[a-zA-Z0-9][\\w!@#.-]+"
},
+ "FoundByKeyValue":{
+ "type":"structure",
+ "members":{
+ "KeyName":{"shape":"name"},
+ "Values":{"shape":"requestValueList"}
+ }
+ },
"Gender":{
"type":"string",
"enum":[
@@ -2127,7 +2145,8 @@
"ShippingAddress":{"shape":"Address"},
"MailingAddress":{"shape":"Address"},
"BillingAddress":{"shape":"Address"},
- "Attributes":{"shape":"Attributes"}
+ "Attributes":{"shape":"Attributes"},
+ "FoundByItems":{"shape":"foundByList"}
}
},
"ProfileIdList":{
@@ -2416,7 +2435,9 @@
"locationName":"DomainName"
},
"KeyName":{"shape":"name"},
- "Values":{"shape":"requestValueList"}
+ "Values":{"shape":"requestValueList"},
+ "AdditionalSearchKeys":{"shape":"additionalSearchKeysList"},
+ "LogicalOperator":{"shape":"logicalOperator"}
}
},
"SearchProfilesResponse":{
@@ -2820,6 +2841,12 @@
"Object":{"shape":"Object"}
}
},
+ "additionalSearchKeysList":{
+ "type":"list",
+ "member":{"shape":"AdditionalSearchKey"},
+ "max":4,
+ "min":1
+ },
"boolean":{"type":"boolean"},
"encryptionKey":{
"type":"string",
@@ -2831,6 +2858,19 @@
"max":1098,
"min":1
},
+ "foundByList":{
+ "type":"list",
+ "member":{"shape":"FoundByKeyValue"},
+ "max":5,
+ "min":1
+ },
+ "logicalOperator":{
+ "type":"string",
+ "enum":[
+ "AND",
+ "OR"
+ ]
+ },
"long":{"type":"long"},
"matchesNumber":{
"type":"integer",
diff --git a/models/apis/customer-profiles/2020-08-15/docs-2.json b/models/apis/customer-profiles/2020-08-15/docs-2.json
index ec8d8c7b31d..639e3f95fb9 100644
--- a/models/apis/customer-profiles/2020-08-15/docs-2.json
+++ b/models/apis/customer-profiles/2020-08-15/docs-2.json
@@ -1,6 +1,6 @@
{
"version": "2.0",
- "service": "
Welcome to the Amazon Connect Customer Profiles API Reference. This guide provides information about the Amazon Connect Customer Profiles API, including supported operations, data types, parameters, and schemas.
Amazon Connect Customer Profiles is a unified customer profile for your contact center that has pre-built connectors powered by AppFlow that make it easy to combine customer information from third party applications, such as Salesforce (CRM), ServiceNow (ITSM), and your enterprise resource planning (ERP), with contact history from your Amazon Connect contact center.
If you're new to Amazon Connect , you might find it helpful to also review the Amazon Connect Administrator Guide.
", + "service": "Amazon Connect Customer Profiles is a unified customer profile for your contact center that has pre-built connectors powered by AppFlow that make it easy to combine customer information from third party applications, such as Salesforce (CRM), ServiceNow (ITSM), and your enterprise resource planning (ERP), with contact history from your Amazon Connect contact center. If you're new to Amazon Connect, you might find it helpful to review the Amazon Connect Administrator Guide.
", "operations": { "AddProfileKey": "Associates a new key value with a specific profile, such as a Contact Record ContactId.
A profile object can have a single unique key and any number of additional keys that can be used to identify the profile that it belongs to.
", "CreateDomain": "Creates a domain, which is a container for all customer data, such as customer profile attributes, object types, profile keys, and encryption keys. You can create multiple domains, and each domain can have multiple third-party integrations.
Each Amazon Connect instance can be associated with only one domain. Multiple Amazon Connect instances can be associated with one domain.
Use this API or UpdateDomain to enable identity resolution: set Matching
to true.
To prevent cross-service impersonation when you call this API, see Cross-service confused deputy prevention for sample policies that you should apply.
", @@ -35,7 +35,7 @@ "PutIntegration": "Adds an integration between the service and a third-party service, which includes Amazon AppFlow and Amazon Connect.
An integration can belong to only one domain.
To add or remove tags on an existing Integration, see TagResource / UntagResource.
", "PutProfileObject": "Adds additional objects to customer profiles of a given ObjectType.
When adding a specific profile object, like a Contact Record, an inferred profile can get created if it is not mapped to an existing profile. The resulting profile will only have a phone number populated in the standard ProfileObject. Any additional Contact Records with the same phone number will be mapped to the same inferred profile.
When a ProfileObject is created and if a ProfileObjectType already exists for the ProfileObject, it will provide data to a standard profile depending on the ProfileObjectType definition.
PutProfileObject needs an ObjectType, which can be created using PutProfileObjectType.
", "PutProfileObjectType": "Defines a ProfileObjectType.
To add or remove tags on an existing ObjectType, see TagResource/UntagResource.
", - "SearchProfiles": "Searches for profiles within a specific domain name using name, phone number, email address, account number, or a custom defined index.
", + "SearchProfiles": "Searches for profiles within a specific domain using one or more predefined search keys (e.g., _fullName, _phone, _email, _account, etc.) and/or custom-defined search keys. A search key is a data type pair that consists of a KeyName
and Values
list.
This operation supports searching for profiles with a minimum of 1 key-value(s) pair and up to 5 key-value(s) pairs using either AND
or OR
logic.
Assigns one or more tags (key-value pairs) to the specified Amazon Connect Customer Profiles resource. Tags can help you organize and categorize your resources. You can also use them to scope user permissions by granting a user permission to access or change only resources with certain tag values. In Connect Customer Profiles, domains, profile object types, and integrations can be tagged.
Tags don't have any semantic meaning to AWS and are interpreted strictly as strings of characters.
You can use the TagResource action with a resource that already has tags. If you specify a new tag key, this tag is appended to the list of tags associated with the resource. If you specify a tag key that is already associated with the resource, the new tag value that you specify replaces the previous value for that tag.
You can associate as many as 50 tags with a resource.
", "UntagResource": "Removes one or more tags from the specified Amazon Connect Customer Profiles resource. In Connect Customer Profiles, domains, profile object types, and integrations can be tagged.
", "UpdateDomain": "Updates the properties of a domain, including creating or selecting a dead letter queue or an encryption key.
After a domain is created, the name can’t be changed.
Use this API or CreateDomain to enable identity resolution: set Matching
to true.
To prevent cross-service impersonation when you call this API, see Cross-service confused deputy prevention for sample policies that you should apply.
To add or remove tags on an existing Domain, see TagResource/UntagResource.
", @@ -48,6 +48,7 @@ "AddProfileKeyRequest$KeyName": "A searchable identifier of a customer profile. The predefined keys you can use include: _account, _profileId, _assetId, _caseId, _orderId, _fullName, _phone, _email, _ctrContactId, _marketoLeadId, _salesforceAccountId, _salesforceContactId, _salesforceAssetId, _zendeskUserId, _zendeskExternalId, _zendeskTicketId, _serviceNowSystemId, _serviceNowIncidentId, _segmentUserId, _shopifyCustomerId, _shopifyOrderId.
", "AddProfileKeyRequest$DomainName": "The unique name of the domain.
", "AddProfileKeyResponse$KeyName": "A searchable identifier of a customer profile.
", + "AdditionalSearchKey$KeyName": "A searchable identifier of a customer profile.
", "CreateDomainRequest$DomainName": "The unique name of the domain.
", "CreateDomainResponse$DomainName": "The unique name of the domain.
", "CreateIntegrationWorkflowRequest$DomainName": "The unique name of the domain.
", @@ -62,6 +63,7 @@ "DeleteWorkflowRequest$DomainName": "The unique name of the domain.
", "FieldMap$key": null, "FieldNameList$member": null, + "FoundByKeyValue$KeyName": "A searchable identifier of a customer profile.
", "GetAutoMergingPreviewRequest$DomainName": "The unique name of the domain.
", "GetAutoMergingPreviewResponse$DomainName": "The unique name of the domain.
", "GetDomainRequest$DomainName": "The unique name of the domain.
", @@ -121,6 +123,12 @@ "refs": { } }, + "AdditionalSearchKey": { + "base": "A data type pair that consists of a KeyName
and Values
list that is used in conjunction with the KeyName and Values parameters to search for profiles using the SearchProfiles API.
A generic address associated with the customer that is not mailing, shipping, or billing.
", "refs": { @@ -453,6 +461,12 @@ "FlowDefinition$FlowName": "The specified name of the flow. Use underscores (_) or hyphens (-) only. Spaces are not allowed.
" } }, + "FoundByKeyValue": { + "base": "A data type pair that consists of a KeyName
and Values
list that were used to find a profile returned in response to a SearchProfiles request.
The list of SearchProfiles instances.
" + "SearchProfilesResponse$Items": "The list of Profiles matching the search criteria.
" } }, "ProfileObjectList": { @@ -1298,6 +1312,12 @@ "SourceConnectorProperties$Zendesk": "The properties that are applied when using Zendesk as a flow source.
" } }, + "additionalSearchKeysList": { + "base": null, + "refs": { + "SearchProfilesRequest$AdditionalSearchKeys": "A list of AdditionalSearchKey
objects that are each searchable identifiers of a profile. Each AdditionalSearchKey
object contains a KeyName
and a list of Values
associated with that specific key (i.e., a key-value(s) pair). These additional search keys will be used in conjunction with the LogicalOperator
and the required KeyName
and Values
parameters to search for profiles that satisfy the search criteria.
The default number of days until the data within the domain expires.
" } }, + "foundByList": { + "base": null, + "refs": { + "Profile$FoundByItems": "A list of items used to find a profile returned in a SearchProfiles response. An item is a key-value(s) pair that matches an attribute in the profile.
If the optional AdditionalSearchKeys
parameter was included in the SearchProfiles request, the FoundByItems
list should be interpreted based on the LogicalOperator
used in the request:
AND
- The profile included in the response matched all of the search keys specified in the request. The FoundByItems
will include all of the key-value(s) pairs that were specified in the request (as this is a requirement of AND
search logic).
OR
- The profile included in the response matched at least one of the search keys specified in the request. The FoundByItems
will include each of the key-value(s) pairs that the profile was found by.
The OR
relationship is the default behavior if the LogicalOperator
parameter is not included in the SearchProfiles request.
Relationship between all specified search keys that will be used to search for profiles. This includes the required KeyName
and Values
parameters as well as any key-value(s) pairs specified in the AdditionalSearchKeys
list.
This parameter influences which profiles will be returned in the response in the following manner:
AND
- The response only includes profiles that match all of the search keys.
OR
- The response includes profiles that match at least one of the search keys.
The OR
relationship is the default behavior if this parameter is not included in the request.
The maximum number of objects returned per page.
", "ListProfileObjectsRequest$MaxResults": "The maximum number of objects returned per page.
", "ListWorkflowsRequest$MaxResults": "The maximum number of results to return per page.
", - "SearchProfilesRequest$MaxResults": "The maximum number of objects returned per page.
" + "SearchProfilesRequest$MaxResults": "The maximum number of objects returned per page.
The default is 20 if this parameter is not included in the request.
" } }, "message": { @@ -1411,7 +1443,9 @@ "refs": { "AddProfileKeyRequest$Values": "A list of key values.
", "AddProfileKeyResponse$Values": "A list of key values.
", + "AdditionalSearchKey$Values": "A list of key values.
", "DeleteProfileKeyRequest$Values": "A list of key values.
", + "FoundByKeyValue$Values": "A list of key values.
", "ObjectFilter$Values": "A list of key values.
", "SearchProfilesRequest$Values": "A list of key values.
" } diff --git a/models/apis/customer-profiles/2020-08-15/endpoint-rule-set-1.json b/models/apis/customer-profiles/2020-08-15/endpoint-rule-set-1.json new file mode 100644 index 00000000000..a2e97c85b52 --- /dev/null +++ b/models/apis/customer-profiles/2020-08-15/endpoint-rule-set-1.json @@ -0,0 +1,315 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "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" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "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://profile-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://profile-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://profile.{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://profile.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/customer-profiles/2020-08-15/endpoint-tests-1.json b/models/apis/customer-profiles/2020-08-15/endpoint-tests-1.json new file mode 100644 index 00000000000..71d6bc5f171 --- /dev/null +++ b/models/apis/customer-profiles/2020-08-15/endpoint-tests-1.json @@ -0,0 +1,563 @@ +{ + "testCases": [ + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://profile-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://profile-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://profile.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://profile.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://profile-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://profile-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://profile.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://profile.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://profile-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://profile-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://profile.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://profile.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://profile-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://profile-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://profile.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://profile.af-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "af-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://profile-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://profile-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://profile.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://profile.eu-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://profile-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://profile-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://profile.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://profile.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://profile-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://profile-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://profile.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://profile.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://profile-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://profile-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://profile.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://profile.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://profile-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://profile-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://profile.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://profile.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://profile-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://profile-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://profile.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://profile.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "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/lakeformation/2017-03-31/api-2.json b/models/apis/lakeformation/2017-03-31/api-2.json index d4e8e01ff99..ea11d132953 100644 --- a/models/apis/lakeformation/2017-03-31/api-2.json +++ b/models/apis/lakeformation/2017-03-31/api-2.json @@ -1070,6 +1070,7 @@ "DataLakeAdmins":{"shape":"DataLakePrincipalList"}, "CreateDatabaseDefaultPermissions":{"shape":"PrincipalPermissionsList"}, "CreateTableDefaultPermissions":{"shape":"PrincipalPermissionsList"}, + "Parameters":{"shape":"ParametersMap"}, "TrustedResourceOwners":{"shape":"TrustedResourceOwners"}, "AllowExternalDataFiltering":{"shape":"NullableBoolean"}, "ExternalDataFilteringAllowList":{"shape":"DataLakePrincipalList"}, @@ -1580,6 +1581,12 @@ }, "exception":true }, + "KeyString":{ + "type":"string", + "max":255, + "min":1, + "pattern":"[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*" + }, "LFTag":{ "type":"structure", "required":[ @@ -1796,6 +1803,15 @@ "max":1000, "min":1 }, + "ParametersMap":{ + "type":"map", + "key":{"shape":"KeyString"}, + "value":{"shape":"ParametersMapValue"} + }, + "ParametersMapValue":{ + "type":"string", + "max":512000 + }, "PartitionObjects":{ "type":"structure", "members":{ @@ -2084,7 +2100,7 @@ "required":["Expression"], "members":{ "NextToken":{"shape":"Token"}, - "MaxResults":{"shape":"PageSize"}, + "MaxResults":{"shape":"SearchPageSize"}, "CatalogId":{"shape":"CatalogIdString"}, "Expression":{"shape":"Expression"} } @@ -2096,12 +2112,18 @@ "DatabaseList":{"shape":"DatabaseLFTagsList"} } }, + "SearchPageSize":{ + "type":"integer", + "box":true, + "max":100, + "min":1 + }, "SearchTablesByLFTagsRequest":{ "type":"structure", "required":["Expression"], "members":{ "NextToken":{"shape":"Token"}, - "MaxResults":{"shape":"PageSize"}, + "MaxResults":{"shape":"SearchPageSize"}, "CatalogId":{"shape":"CatalogIdString"}, "Expression":{"shape":"Expression"} } diff --git a/models/apis/lakeformation/2017-03-31/docs-2.json b/models/apis/lakeformation/2017-03-31/docs-2.json index 9abf0648614..845593dbe3d 100644 --- a/models/apis/lakeformation/2017-03-31/docs-2.json +++ b/models/apis/lakeformation/2017-03-31/docs-2.json @@ -740,6 +740,12 @@ "refs": { } }, + "KeyString": { + "base": null, + "refs": { + "ParametersMap$key": null + } + }, "LFTag": { "base": "A structure that allows an admin to grant user permissions on certain conditions. For example, granting a role access to all columns that do not have the LF-tag 'PII' in tables that have the LF-tag 'Prod'.
", "refs": { @@ -940,7 +946,7 @@ "base": null, "refs": { "DataLakeSettings$AllowExternalDataFiltering": "Whether to allow Amazon EMR clusters to access data managed by Lake Formation.
If true, you allow Amazon EMR clusters to access data in Amazon S3 locations that are registered with Lake Formation.
If false or null, no Amazon EMR clusters will be able to access data in Amazon S3 locations that are registered with Lake Formation.
For more information, see (Optional) Allow Data Filtering on Amazon EMR.
", - "RegisterResourceRequest$UseServiceLinkedRole": "Designates an Identity and Access Management (IAM) service-linked role by registering this role with the Data Catalog. A service-linked role is a unique type of IAM role that is linked directly to Lake Formation.
For more information, see Using Service-Linked Roles for Lake Formation.
" + "RegisterResourceRequest$UseServiceLinkedRole": "Designates an Identity and Access Management (IAM) service-linked role by registering this role with the Data Catalog. A service-linked role is a unique type of IAM role that is linked directly to Lake Formation.
For more information, see Using Service-Linked Roles for Lake Formation.
" } }, "NumberOfBytes": { @@ -995,9 +1001,19 @@ "ListPermissionsRequest$MaxResults": "The maximum number of results to return.
", "ListResourcesRequest$MaxResults": "The maximum number of resource results.
", "ListTableStorageOptimizersRequest$MaxResults": "The number of storage optimizers to return on each call.
", - "ListTransactionsRequest$MaxResults": "The maximum number of transactions to return in a single call.
", - "SearchDatabasesByLFTagsRequest$MaxResults": "The maximum number of results to return.
", - "SearchTablesByLFTagsRequest$MaxResults": "The maximum number of results to return.
" + "ListTransactionsRequest$MaxResults": "The maximum number of transactions to return in a single call.
" + } + }, + "ParametersMap": { + "base": null, + "refs": { + "DataLakeSettings$Parameters": "A key-value map that provides an additional configuration on your data lake. CrossAccountVersion is the key you can configure in the Parameters field. Accepted values for the CrossAccountVersion key are 1, 2, and 3.
" + } + }, + "ParametersMapValue": { + "base": null, + "refs": { + "ParametersMap$value": null } }, "PartitionObjects": { @@ -1094,7 +1110,7 @@ "PrincipalPermissionsList": { "base": null, "refs": { - "DataLakeSettings$CreateDatabaseDefaultPermissions": "Specifies whether access control on newly created database is managed by Lake Formation permissions or exclusively by IAM permissions. You can override this default setting when you create a database.
A null value indicates access control by Lake Formation permissions. A value that assigns ALL to IAM_ALLOWED_PRINCIPALS indicates access control by IAM permissions. This is referred to as the setting \"Use only IAM access control,\" and is for backward compatibility with the Glue permission model implemented by IAM permissions.
The only permitted values are an empty array or an array that contains a single JSON object that grants ALL to IAM_ALLOWED_PRINCIPALS.
For more information, see Changing the Default Security Settings for Your Data Lake.
", + "DataLakeSettings$CreateDatabaseDefaultPermissions": "Specifies whether access control on newly created database is managed by Lake Formation permissions or exclusively by IAM permissions.
A null value indicates access control by Lake Formation permissions. A value that assigns ALL to IAM_ALLOWED_PRINCIPALS indicates access control by IAM permissions. This is referred to as the setting \"Use only IAM access control,\" and is for backward compatibility with the Glue permission model implemented by IAM permissions.
The only permitted values are an empty array or an array that contains a single JSON object that grants ALL to IAM_ALLOWED_PRINCIPALS.
For more information, see Changing the Default Security Settings for Your Data Lake.
", "DataLakeSettings$CreateTableDefaultPermissions": "Specifies whether access control on newly created table is managed by Lake Formation permissions or exclusively by IAM permissions.
A null value indicates access control by Lake Formation permissions. A value that assigns ALL to IAM_ALLOWED_PRINCIPALS indicates access control by IAM permissions. This is referred to as the setting \"Use only IAM access control,\" and is for backward compatibility with the Glue permission model implemented by IAM permissions.
The only permitted values are an empty array or an array that contains a single JSON object that grants ALL to IAM_ALLOWED_PRINCIPALS.
For more information, see Changing the Default Security Settings for Your Data Lake.
" } }, @@ -1290,6 +1306,13 @@ "refs": { } }, + "SearchPageSize": { + "base": null, + "refs": { + "SearchDatabasesByLFTagsRequest$MaxResults": "The maximum number of results to return.
", + "SearchTablesByLFTagsRequest$MaxResults": "The maximum number of results to return.
" + } + }, "SearchTablesByLFTagsRequest": { "base": null, "refs": { diff --git a/models/apis/lakeformation/2017-03-31/endpoint-rule-set-1.json b/models/apis/lakeformation/2017-03-31/endpoint-rule-set-1.json new file mode 100644 index 00000000000..63ae5f857bc --- /dev/null +++ b/models/apis/lakeformation/2017-03-31/endpoint-rule-set-1.json @@ -0,0 +1,315 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "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" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "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://lakeformation-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://lakeformation-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://lakeformation.{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://lakeformation.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/lakeformation/2017-03-31/endpoint-tests-1.json b/models/apis/lakeformation/2017-03-31/endpoint-tests-1.json new file mode 100644 index 00000000000..6e06c4b93c9 --- /dev/null +++ b/models/apis/lakeformation/2017-03-31/endpoint-tests-1.json @@ -0,0 +1,1343 @@ +{ + "testCases": [ + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://lakeformation-fips.ap-northeast-3.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-3", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://lakeformation-fips.ap-northeast-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-3", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://lakeformation.ap-northeast-3.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-3", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://lakeformation.ap-northeast-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-3", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.ap-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://lakeformation-fips.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": true, + "Region": "cn-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://lakeformation-fips.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": true, + "Region": "cn-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://lakeformation.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": false, + "Region": "cn-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://lakeformation.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": false, + "Region": "cn-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.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://lakeformation-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://lakeformation-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://lakeformation.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://lakeformation.us-east-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-2", + "UseDualStack": false + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://lakeformation-fips.cn-northwest-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": true, + "Region": "cn-northwest-1", + "UseDualStack": true + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://lakeformation-fips.cn-northwest-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": true, + "Region": "cn-northwest-1", + "UseDualStack": false + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://lakeformation.cn-northwest-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": false, + "Region": "cn-northwest-1", + "UseDualStack": true + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://lakeformation.cn-northwest-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": false, + "Region": "cn-northwest-1", + "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/managedblockchain/2018-09-24/docs-2.json b/models/apis/managedblockchain/2018-09-24/docs-2.json index cb2643ed002..d849b3c51cf 100644 --- a/models/apis/managedblockchain/2018-09-24/docs-2.json +++ b/models/apis/managedblockchain/2018-09-24/docs-2.json @@ -7,7 +7,7 @@ "CreateNetwork": "Creates a new blockchain network using Amazon Managed Blockchain.
Applies only to Hyperledger Fabric.
", "CreateNode": "Creates a node on the specified blockchain network.
Applies to Hyperledger Fabric and Ethereum.
", "CreateProposal": "Creates a proposal for a change to the network that other members of the network can vote on, for example, a proposal to add a new member to the network. Any member can create a proposal.
Applies only to Hyperledger Fabric.
", - "DeleteAccessor": "The token based access feature is in preview release for Ethereum on Amazon Managed Blockchain and is subject to change. We recommend that you use this feature only with test scenarios, and not in production environments.
Deletes an accessor that your Amazon Web Services account owns. An accessor object is a container that has the information required for token based access to your Ethereum nodes including, the BILLING_TOKEN
. After an accessor is deleted, the status of the accessor changes from AVAILABLE
to PENDING_DELETION
. An accessor in the PENDING_DELETION
state can’t be used for new WebSocket requests or HTTP requests. However, WebSocket connections that are initiated while the accessor was in the AVAILABLE
state remain open until they expire (up to 2 hours).
The token based access feature is in preview release for Ethereum on Amazon Managed Blockchain and is subject to change. We recommend that you use this feature only with test scenarios, and not in production environments.
Deletes an accessor that your Amazon Web Services account owns. An accessor object is a container that has the information required for token based access to your Ethereum nodes including, the BILLING_TOKEN
. After an accessor is deleted, the status of the accessor changes from AVAILABLE
to PENDING_DELETION
. An accessor in the PENDING_DELETION
state can’t be used for new WebSocket requests or HTTP requests. However, WebSocket connections that were initiated while the accessor was in the AVAILABLE
state remain open until they expire (up to 2 hours).
Deletes a member. Deleting a member removes the member and all associated resources from the network. DeleteMember
can only be called for a specified MemberId
if the principal performing the action is associated with the Amazon Web Services account that owns the member. In all other cases, the DeleteMember
action is carried out as the result of an approved proposal to remove a member. If MemberId
is the last member in a network specified by the last Amazon Web Services account, the network is deleted also.
Applies only to Hyperledger Fabric.
", "DeleteNode": "Deletes a node that your Amazon Web Services account owns. All data on the node is lost and cannot be recovered.
Applies to Hyperledger Fabric and Ethereum.
", "GetAccessor": "The token based access feature is in preview release for Ethereum on Amazon Managed Blockchain and is subject to change. We recommend that you use this feature only with test scenarios, and not in production environments.
Returns detailed information about an accessor. An accessor object is a container that has the information required for token based access to your Ethereum nodes.
", @@ -832,7 +832,7 @@ "CreateMemberOutput$MemberId": "The unique identifier of the member.
", "CreateNetworkOutput$NetworkId": "The unique identifier for the network.
", "CreateNetworkOutput$MemberId": "The unique identifier for the first member within the network.
", - "CreateNodeInput$NetworkId": "The unique identifier of the network for the node.
Ethereum public networks have the following NetworkId
s:
n-ethereum-mainnet
n-ethereum-rinkeby
n-ethereum-ropsten
The unique identifier of the network for the node.
Ethereum public networks have the following NetworkId
s:
n-ethereum-mainnet
n-ethereum-goerli
n-ethereum-rinkeby
n-ethereum-ropsten
The unique identifier of the member that owns this node.
Applies only to Hyperledger Fabric.
", "CreateNodeOutput$NodeId": "The unique identifier of the node.
", "CreateProposalInput$NetworkId": "The unique identifier of the network for which the proposal is made.
", @@ -841,7 +841,7 @@ "DeleteAccessorInput$AccessorId": "The unique identifier of the accessor.
", "DeleteMemberInput$NetworkId": "The unique identifier of the network from which the member is removed.
", "DeleteMemberInput$MemberId": "The unique identifier of the member to remove.
", - "DeleteNodeInput$NetworkId": "The unique identifier of the network that the node is on.
Ethereum public networks have the following NetworkId
s:
n-ethereum-mainnet
n-ethereum-rinkeby
n-ethereum-ropsten
The unique identifier of the network that the node is on.
Ethereum public networks have the following NetworkId
s:
n-ethereum-mainnet
n-ethereum-goerli
n-ethereum-rinkeby
n-ethereum-ropsten
The unique identifier of the member that owns this node.
Applies only to Hyperledger Fabric and is required for Hyperledger Fabric.
", "DeleteNodeInput$NodeId": "The unique identifier of the node.
", "GetAccessorInput$AccessorId": "The unique identifier of the accessor.
", @@ -920,11 +920,11 @@ "Member$KmsKeyArn": "The Amazon Resource Name (ARN) of the customer managed key in Key Management Service (KMS) that the member uses for encryption at rest. If the value of this parameter is \"AWS Owned KMS Key\"
, the member uses an Amazon Web Services owned KMS key for encryption. This parameter is inherited by the nodes that this member owns.
For more information, see Encryption at Rest in the Amazon Managed Blockchain Hyperledger Fabric Developer Guide.
", "MemberFabricAttributes$CaEndpoint": "The endpoint used to access the member's certificate authority.
", "Network$VpcEndpointServiceName": "The VPC endpoint service name of the VPC endpoint service of the network. Members use the VPC endpoint service name to create a VPC endpoint to access network resources.
", - "NetworkEthereumAttributes$ChainId": "The Ethereum CHAIN_ID
associated with the Ethereum network. Chain IDs are as follows:
mainnet = 1
rinkeby = 4
ropsten = 3
The Ethereum CHAIN_ID
associated with the Ethereum network. Chain IDs are as follows:
mainnet = 1
goerli = 5
rinkeby = 4
ropsten = 3
The endpoint of the ordering service for the network.
", "Node$KmsKeyArn": "The Amazon Resource Name (ARN) of the customer managed key in Key Management Service (KMS) that the node uses for encryption at rest. If the value of this parameter is \"AWS Owned KMS Key\"
, the node uses an Amazon Web Services owned KMS key for encryption. The node inherits this parameter from the member that it belongs to.
For more information, see Encryption at Rest in the Amazon Managed Blockchain Hyperledger Fabric Developer Guide.
Applies only to Hyperledger Fabric.
", "NodeEthereumAttributes$HttpEndpoint": "The endpoint on which the Ethereum node listens to run Ethereum API methods over HTTP connections from a client. Use this endpoint in client code for smart contracts when using an HTTP connection. Connections to this endpoint are authenticated using Signature Version 4.
", - "NodeEthereumAttributes$WebSocketEndpoint": "The endpoint on which the Ethereum node listens to run Ethereum JSON-RPC methods over WebSockets connections from a client. Use this endpoint in client code for smart contracts when using a WebSockets connection. Connections to this endpoint are authenticated using Signature Version 4.
", + "NodeEthereumAttributes$WebSocketEndpoint": "The endpoint on which the Ethereum node listens to run Ethereum JSON-RPC methods over WebSocket connections from a client. Use this endpoint in client code for smart contracts when using a WebSocket connection. Connections to this endpoint are authenticated using Signature Version 4.
", "NodeFabricAttributes$PeerEndpoint": "The endpoint that identifies the peer node for all services except peer channel-based event services.
", "NodeFabricAttributes$PeerEventEndpoint": "The endpoint that identifies the peer node for peer channel-based event services.
", "ResourceAlreadyExistsException$Message": null, diff --git a/models/apis/managedblockchain/2018-09-24/endpoint-rule-set-1.json b/models/apis/managedblockchain/2018-09-24/endpoint-rule-set-1.json index b546d0a8e63..08b19332119 100644 --- a/models/apis/managedblockchain/2018-09-24/endpoint-rule-set-1.json +++ b/models/apis/managedblockchain/2018-09-24/endpoint-rule-set-1.json @@ -3,7 +3,7 @@ "parameters": { "Region": { "builtIn": "AWS::Region", - "required": true, + "required": false, "documentation": "The AWS region used to dispatch the request.", "type": "String" }, diff --git a/models/apis/managedblockchain/2018-09-24/endpoint-tests-1.json b/models/apis/managedblockchain/2018-09-24/endpoint-tests-1.json index a6de1f26e6b..bd1d94336cf 100644 --- a/models/apis/managedblockchain/2018-09-24/endpoint-tests-1.json +++ b/models/apis/managedblockchain/2018-09-24/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -21,9 +21,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -34,9 +34,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -47,9 +47,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -60,9 +60,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -73,9 +73,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -86,9 +86,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -99,9 +99,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -112,9 +112,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -125,9 +125,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -138,9 +138,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -151,9 +151,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -164,9 +164,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -177,9 +177,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -190,9 +190,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -203,9 +203,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -216,9 +216,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-gov-west-1", - "UseDualStack": true + "Region": "us-gov-west-1" } }, { @@ -229,9 +229,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-gov-west-1", - "UseDualStack": false + "Region": "us-gov-west-1" } }, { @@ -242,9 +242,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-gov-west-1", - "UseDualStack": true + "Region": "us-gov-west-1" } }, { @@ -255,9 +255,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-gov-west-1", - "UseDualStack": false + "Region": "us-gov-west-1" } }, { @@ -268,9 +268,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -281,9 +281,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -294,9 +294,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -307,9 +307,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -320,9 +320,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -333,9 +333,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -346,9 +346,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -359,9 +359,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -372,9 +372,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, "Region": "us-east-1", - "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -384,9 +384,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { + "UseDualStack": false, "UseFIPS": true, "Region": "us-east-1", - "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -396,9 +396,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { + "UseDualStack": true, "UseFIPS": false, "Region": "us-east-1", - "UseDualStack": true, "Endpoint": "https://example.com" } } diff --git a/models/apis/proton/2020-07-20/api-2.json b/models/apis/proton/2020-07-20/api-2.json index 414624bb599..2bfd7d2ba29 100644 --- a/models/apis/proton/2020-07-20/api-2.json +++ b/models/apis/proton/2020-07-20/api-2.json @@ -1307,14 +1307,16 @@ "AccountSettings":{ "type":"structure", "members":{ + "pipelineCodebuildRoleArn":{"shape":"RoleArnOrEmptyString"}, "pipelineProvisioningRepository":{"shape":"RepositoryBranch"}, - "pipelineServiceRoleArn":{"shape":"PipelineRoleArn"} + "pipelineServiceRoleArn":{"shape":"RoleArnOrEmptyString"} } }, "Arn":{ "type":"string", "max":200, - "min":1 + "min":1, + "pattern":"^arn:(aws|aws-cn|aws-us-gov):[a-zA-Z0-9-]+:[a-zA-Z0-9-]*:\\d{12}:([\\w+=,.@-]+[/:])*[\\w+=,.@-]+$" }, "AwsAccountId":{ "type":"string", @@ -1530,10 +1532,11 @@ "shape":"ClientToken", "idempotencyToken":true }, - "componentRoleArn":{"shape":"Arn"}, + "codebuildRoleArn":{"shape":"RoleArn"}, + "componentRoleArn":{"shape":"RoleArn"}, "environmentName":{"shape":"ResourceName"}, "managementAccountId":{"shape":"AwsAccountId"}, - "roleArn":{"shape":"Arn"}, + "roleArn":{"shape":"RoleArn"}, "tags":{"shape":"TagList"} } }, @@ -1553,7 +1556,8 @@ "templateName" ], "members":{ - "componentRoleArn":{"shape":"Arn"}, + "codebuildRoleArn":{"shape":"RoleArn"}, + "componentRoleArn":{"shape":"RoleArn"}, "description":{"shape":"Description"}, "environmentAccountConnectionId":{"shape":"EnvironmentAccountConnectionId"}, "name":{"shape":"ResourceName"}, @@ -1946,7 +1950,8 @@ ], "members":{ "arn":{"shape":"EnvironmentArn"}, - "componentRoleArn":{"shape":"Arn"}, + "codebuildRoleArn":{"shape":"RoleArn"}, + "componentRoleArn":{"shape":"RoleArn"}, "createdAt":{"shape":"Timestamp"}, "deploymentStatus":{"shape":"DeploymentStatus"}, "deploymentStatusMessage":{"shape":"StatusMessage"}, @@ -1980,7 +1985,8 @@ ], "members":{ "arn":{"shape":"EnvironmentAccountConnectionArn"}, - "componentRoleArn":{"shape":"Arn"}, + "codebuildRoleArn":{"shape":"RoleArn"}, + "componentRoleArn":{"shape":"RoleArn"}, "environmentAccountId":{"shape":"AwsAccountId"}, "environmentName":{"shape":"ResourceName"}, "id":{"shape":"EnvironmentAccountConnectionId"}, @@ -2800,10 +2806,7 @@ }, "NotifyResourceDeploymentStatusChangeInput":{ "type":"structure", - "required":[ - "resourceArn", - "status" - ], + "required":["resourceArn"], "members":{ "deploymentId":{"shape":"DeploymentId"}, "outputs":{"shape":"NotifyResourceDeploymentStatusChangeInputOutputsList"}, @@ -2851,12 +2854,6 @@ "type":"list", "member":{"shape":"Output"} }, - "PipelineRoleArn":{ - "type":"string", - "max":2048, - "min":0, - "pattern":"(^$)|(^arn:[a-zA-Z-]+:[a-zA-Z0-9-]+:[a-zA-Z0-9-]*:\\d*:[\\w+=\\/:,\\.@-]*)" - }, "ProvisionedResource":{ "type":"structure", "members":{ @@ -3136,6 +3133,18 @@ "sha":{"shape":"SHA"} } }, + "RoleArn":{ + "type":"string", + "max":2048, + "min":1, + "pattern":"^arn:(aws|aws-cn|aws-us-gov):iam::\\d{12}:role/([\\w+=,.@-]{1,512}[/:])*([\\w+=,.@-]{1,64})$" + }, + "RoleArnOrEmptyString":{ + "type":"string", + "max":2048, + "min":0, + "pattern":"(^$)|(^arn:(aws|aws-cn|aws-us-gov):iam::\\d{12}:role/([\\w+=,.@-]{1,512}[/:])*([\\w+=,.@-]{1,64})$)" + }, "S3Bucket":{ "type":"string", "max":63, @@ -3607,8 +3616,9 @@ "type":"structure", "members":{ "deletePipelineProvisioningRepository":{"shape":"Boolean"}, + "pipelineCodebuildRoleArn":{"shape":"RoleArnOrEmptyString"}, "pipelineProvisioningRepository":{"shape":"RepositoryBranchInput"}, - "pipelineServiceRoleArn":{"shape":"PipelineRoleArn"} + "pipelineServiceRoleArn":{"shape":"RoleArnOrEmptyString"} } }, "UpdateAccountSettingsOutput":{ @@ -3645,9 +3655,10 @@ "type":"structure", "required":["id"], "members":{ - "componentRoleArn":{"shape":"Arn"}, + "codebuildRoleArn":{"shape":"RoleArn"}, + "componentRoleArn":{"shape":"RoleArn"}, "id":{"shape":"EnvironmentAccountConnectionId"}, - "roleArn":{"shape":"Arn"} + "roleArn":{"shape":"RoleArn"} } }, "UpdateEnvironmentAccountConnectionOutput":{ @@ -3664,7 +3675,8 @@ "name" ], "members":{ - "componentRoleArn":{"shape":"Arn"}, + "codebuildRoleArn":{"shape":"RoleArn"}, + "componentRoleArn":{"shape":"RoleArn"}, "deploymentType":{"shape":"DeploymentUpdateType"}, "description":{"shape":"Description"}, "environmentAccountConnectionId":{"shape":"EnvironmentAccountConnectionId"}, diff --git a/models/apis/proton/2020-07-20/docs-2.json b/models/apis/proton/2020-07-20/docs-2.json index 408444976fc..9a75ecfb5f7 100644 --- a/models/apis/proton/2020-07-20/docs-2.json +++ b/models/apis/proton/2020-07-20/docs-2.json @@ -8,7 +8,7 @@ "CancelServiceInstanceDeployment": "Attempts to cancel a service instance deployment on an UpdateServiceInstance action, if the deployment is IN_PROGRESS
. For more information, see Update a service instance in the Proton User guide.
The following list includes potential cancellation scenarios.
If the cancellation attempt succeeds, the resulting deployment state is CANCELLED
.
If the cancellation attempt fails, the resulting deployment state is FAILED
.
If the current UpdateServiceInstance action succeeds before the cancellation attempt starts, the resulting deployment state is SUCCEEDED
and the cancellation attempt has no effect.
Attempts to cancel a service pipeline deployment on an UpdateServicePipeline action, if the deployment is IN_PROGRESS
. For more information, see Update a service pipeline in the Proton User guide.
The following list includes potential cancellation scenarios.
If the cancellation attempt succeeds, the resulting deployment state is CANCELLED
.
If the cancellation attempt fails, the resulting deployment state is FAILED
.
If the current UpdateServicePipeline action succeeds before the cancellation attempt starts, the resulting deployment state is SUCCEEDED
and the cancellation attempt has no effect.
Create an Proton component. A component is an infrastructure extension for a service instance.
For more information about components, see Proton components in the Proton User Guide.
", - "CreateEnvironment": "Deploy a new environment. An Proton environment is created from an environment template that defines infrastructure and resources that can be shared across services.
You can provision environments using the following methods:
Amazon Web Services-managed provisioning: Proton makes direct calls to provision your resources.
Self-managed provisioning: Proton makes pull requests on your repository to provide compiled infrastructure as code (IaC) files that your IaC engine uses to provision resources.
For more information, see Environments and Provisioning methods in the Proton User Guide.
", + "CreateEnvironment": "Deploy a new environment. An Proton environment is created from an environment template that defines infrastructure and resources that can be shared across services.
You can provision environments using the following methods:
Amazon Web Services-managed provisioning – Proton makes direct calls to provision your resources.
Self-managed provisioning – Proton makes pull requests on your repository to provide compiled infrastructure as code (IaC) files that your IaC engine uses to provision resources.
CodeBuild-based provisioning – Proton uses CodeBuild to run shell commands that you provide. Your commands can read inputs that Proton provides, and are responsible for provisioning or deprovisioning infrastructure and generating output values.
For more information, see Environments and Provisioning methods in the Proton User Guide.
", "CreateEnvironmentAccountConnection": "Create an environment account connection in an environment account so that environment infrastructure resources can be provisioned in the environment account from a management account.
An environment account connection is a secure bi-directional connection between a management account and an environment account that maintains authorization and permissions. For more information, see Environment account connections in the Proton User guide.
", "CreateEnvironmentTemplate": "Create an environment template for Proton. For more information, see Environment Templates in the Proton User Guide.
You can create an environment template in one of the two following ways:
Register and publish a standard environment template that instructs Proton to deploy and manage environment infrastructure.
Register and publish a customer managed environment template that connects Proton to your existing provisioned infrastructure that you manage. Proton doesn't manage your existing provisioned infrastructure. To create an environment template for customer provisioned and managed infrastructure, include the provisioning
parameter and set the value to CUSTOMER_MANAGED
. For more information, see Register and publish an environment template in the Proton User Guide.
Create a new major or minor version of an environment template. A major version of an environment template is a version that isn't backwards compatible. A minor version of an environment template is a version that's backwards compatible within its major version.
", @@ -61,13 +61,13 @@ "ListServiceTemplates": "List service templates with detail data.
", "ListServices": "List services with summaries of detail data.
", "ListTagsForResource": "List tags for a resource. For more information, see Proton resources and tagging in the Proton User Guide.
", - "NotifyResourceDeploymentStatusChange": "Notify Proton of status changes to a provisioned resource when you use self-managed provisioning.
For more information, see Self-managed provisioning in the Proton User Guide.
", + "NotifyResourceDeploymentStatusChange": "Notify Proton of the following information related to a provisioned resource (environment, service instance, or service pipeline):
For CodeBuild-based provisioning, provide your provisioned resource output values to Proton.
For self-managed provisioning, notify Proton about the status of your provisioned resource. To disambiguate between different deployments of the same resource, set deploymentId
to a unique deployment ID of your choice.
</li> </ul>
",
"RejectEnvironmentAccountConnection": "In a management account, reject an environment account connection from another environment account.
After you reject an environment account connection request, you can't accept or use the rejected environment account connection.
You can’t reject an environment account connection that's connected to an environment.
For more information, see Environment account connections in the Proton User guide.
", "TagResource": "Tag a resource. A tag is a key-value pair of metadata that you associate with an Proton resource.
For more information, see Proton resources and tagging in the Proton User Guide.
", "UntagResource": "Remove a customer tag from a resource. A tag is a key-value pair of metadata associated with an Proton resource.
For more information, see Proton resources and tagging in the Proton User Guide.
", "UpdateAccountSettings": "Update Proton settings that are used for multiple services in the Amazon Web Services account.
", "UpdateComponent": "Update a component.
There are a few modes for updating a component. The deploymentType
field defines the mode.
You can't update a component while its deployment status, or the deployment status of a service instance attached to it, is IN_PROGRESS
.
For more information about components, see Proton components in the Proton User Guide.
", - "UpdateEnvironment": "Update an environment.
If the environment is associated with an environment account connection, don't update or include the protonServiceRoleArn
and provisioningRepository
parameter to update or connect to an environment account connection.
You can only update to a new environment account connection if that connection was created in the same environment account that the current environment account connection was created in. The account connection must also be associated with the current environment.
If the environment isn't associated with an environment account connection, don't update or include the environmentAccountConnectionId
parameter. You can't update or connect the environment to an environment account connection if it isn't already associated with an environment connection.
You can update either the environmentAccountConnectionId
or protonServiceRoleArn
parameter and value. You can’t update both.
If the environment was configured for Amazon Web Services-managed provisioning, omit the provisioningRepository
parameter.
If the environment was configured for self-managed provisioning, specify the provisioningRepository
parameter and omit the protonServiceRoleArn
and environmentAccountConnectionId
parameters.
For more information, see Environments and Provisioning methods in the Proton User Guide.
There are four modes for updating an environment. The deploymentType
field defines the mode.
NONE
In this mode, a deployment doesn't occur. Only the requested metadata parameters are updated.
CURRENT_VERSION
In this mode, the environment is deployed and updated with the new spec that you provide. Only requested parameters are updated. Don’t include minor or major version parameters when you use this deployment-type
.
MINOR_VERSION
In this mode, the environment is deployed and updated with the published, recommended (latest) minor version of the current major version in use, by default. You can also specify a different minor version of the current major version in use.
MAJOR_VERSION
In this mode, the environment is deployed and updated with the published, recommended (latest) major and minor version of the current template, by default. You can also specify a different major version that's higher than the major version in use and a minor version.
Update an environment.
If the environment is associated with an environment account connection, don't update or include the protonServiceRoleArn
, codebuildRoleArn
, and provisioningRepository
parameters.
You can only update to a new environment account connection if that connection was created in the same environment account that the current environment account connection was created in. The account connection must also be associated with the current environment.
If the environment isn't associated with an environment account connection, don't update or include the environmentAccountConnectionId
parameter. You can't update or connect the environment to an environment account connection if it isn't already associated with an environment connection.
You can update either environmentAccountConnectionId
or one or more of protonServiceRoleArn
, codebuildRoleArn
, and provisioningRepository
.
If the environment was configured for Amazon Web Services-managed or CodeBuild-based provisioning, omit the provisioningRepository
parameter.
If the environment was configured for self-managed provisioning, specify the provisioningRepository
parameter and omit the protonServiceRoleArn
, codebuildRoleArn
, and provisioningRepository
parameters.
For more information, see Environments and Provisioning methods in the Proton User Guide.
There are four modes for updating an environment. The deploymentType
field defines the mode.
NONE
In this mode, a deployment doesn't occur. Only the requested metadata parameters are updated.
CURRENT_VERSION
In this mode, the environment is deployed and updated with the new spec that you provide. Only requested parameters are updated. Don’t include minor or major version parameters when you use this deployment-type
.
MINOR_VERSION
In this mode, the environment is deployed and updated with the published, recommended (latest) minor version of the current major version in use, by default. You can also specify a different minor version of the current major version in use.
MAJOR_VERSION
In this mode, the environment is deployed and updated with the published, recommended (latest) major and minor version of the current template, by default. You can also specify a different major version that's higher than the major version in use and a minor version.
In an environment account, update an environment account connection to use a new IAM role.
For more information, see Environment account connections in the Proton User guide.
", "UpdateEnvironmentTemplate": "Update an environment template.
", "UpdateEnvironmentTemplateVersion": "Update a major or minor version of an environment template.
", @@ -104,26 +104,21 @@ "Arn": { "base": null, "refs": { - "CreateEnvironmentAccountConnectionInput$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in the associated environment account. It determines the scope of infrastructure that a component can provision in the account.
You must specify componentRoleArn
to allow directly defined components to be associated with any environments running in this account.
For more information about components, see Proton components in the Proton User Guide.
", - "CreateEnvironmentAccountConnectionInput$roleArn": "The Amazon Resource Name (ARN) of the IAM service role that's created in the environment account. Proton uses this role to provision infrastructure resources in the associated environment account.
", - "CreateEnvironmentInput$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in this environment. It determines the scope of infrastructure that a component can provision.
You must specify componentRoleArn
to allow directly defined components to be associated with this environment.
For more information about components, see Proton components in the Proton User Guide.
", - "CreateEnvironmentInput$protonServiceRoleArn": "The Amazon Resource Name (ARN) of the Proton service role that allows Proton to make calls to other services on your behalf.
To use Amazon Web Services-managed provisioning for the environment, specify either the environmentAccountConnectionId
or protonServiceRoleArn
parameter and omit the provisioningRepository
parameter.
The Amazon Resource Name (ARN) of the IAM service role that allows Proton to provision infrastructure using Amazon Web Services-managed provisioning and CloudFormation on your behalf.
To use Amazon Web Services-managed provisioning for the environment or for any service instance running in the environment, specify either the environmentAccountConnectionId
or protonServiceRoleArn
parameter.
A customer provided encryption key that Proton uses to encrypt data.
", "CreateRepositoryInput$connectionArn": "The Amazon Resource Name (ARN) of your AWS CodeStar connection that connects Proton to your repository provider account. For more information, see Setting up for Proton in the Proton User Guide.
", "CreateRepositoryInput$encryptionKey": "The ARN of your customer Amazon Web Services Key Management Service (Amazon Web Services KMS) key.
", "CreateServiceInput$repositoryConnectionArn": "The Amazon Resource Name (ARN) of the repository connection. For more information, see Setting up an AWS CodeStar connection in the Proton User Guide. Don't include this parameter if your service template doesn't include a service pipeline.
", "CreateServiceTemplateInput$encryptionKey": "A customer provided encryption key that's used to encrypt data.
", - "Environment$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in this environment. It determines the scope of infrastructure that a component can provision.
The environment must have a componentRoleArn
to allow directly defined components to be associated with the environment.
For more information about components, see Proton components in the Proton User Guide.
", - "Environment$protonServiceRoleArn": "The Amazon Resource Name (ARN) of the Proton service role that allows Proton to make calls to other services on your behalf.
", - "EnvironmentAccountConnection$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in the associated environment account. It determines the scope of infrastructure that a component can provision in the account.
The environment account connection must have a componentRoleArn
to allow directly defined components to be associated with any environments running in the account.
For more information about components, see Proton components in the Proton User Guide.
", - "EnvironmentAccountConnection$roleArn": "The IAM service role that's associated with the environment account connection.
", + "Environment$protonServiceRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that allows Proton to provision infrastructure using Amazon Web Services-managed provisioning and CloudFormation on your behalf.
", + "EnvironmentAccountConnection$roleArn": "The Amazon Resource Name (ARN) of an IAM service role in the environment account. Proton uses this role to provision infrastructure resources using Amazon Web Services-managed provisioning and CloudFormation in the associated environment account.
", "EnvironmentAccountConnectionSummary$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in the associated environment account. It determines the scope of infrastructure that a component can provision in the account.
The environment account connection must have a componentRoleArn
to allow directly defined components to be associated with any environments running in the account.
For more information about components, see Proton components in the Proton User Guide.
", "EnvironmentAccountConnectionSummary$roleArn": "The IAM service role that's associated with the environment account connection.
", "EnvironmentSummary$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in this environment. It determines the scope of infrastructure that a component can provision.
The environment must have a componentRoleArn
to allow directly defined components to be associated with the environment.
For more information about components, see Proton components in the Proton User Guide.
", "EnvironmentSummary$protonServiceRoleArn": "The Amazon Resource Name (ARN) of the Proton service role that allows Proton to make calls to other services on your behalf.
", "EnvironmentTemplate$encryptionKey": "The customer provided encryption key for the environment template.
", "ListTagsForResourceInput$resourceArn": "The Amazon Resource Name (ARN) of the resource for the listed tags.
", - "NotifyResourceDeploymentStatusChangeInput$resourceArn": "The provisioned resource Amazon Resource Name (ARN).
", + "NotifyResourceDeploymentStatusChangeInput$resourceArn": "The Amazon Resource Name (ARN) of your provisioned resource.
", "Repository$connectionArn": "The Amazon Resource Name (ARN) of your AWS CodeStar connection that connects Proton to your repository provider account.
", "Repository$encryptionKey": "Your customer Amazon Web Services KMS encryption key.
", "Service$repositoryConnectionArn": "The Amazon Resource Name (ARN) of the repository connection. For more information, see Setting up an AWS CodeStar connection in the Proton User Guide.
", @@ -131,10 +126,7 @@ "ServiceTemplate$encryptionKey": "The customer provided service template encryption key that's used to encrypt data.
", "TagResourceInput$resourceArn": "The Amazon Resource Name (ARN) of the Proton resource to apply customer tags to.
", "UntagResourceInput$resourceArn": "The Amazon Resource Name (ARN) of the resource to remove customer tags from.
", - "UpdateEnvironmentAccountConnectionInput$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in the associated environment account. It determines the scope of infrastructure that a component can provision in the account.
The environment account connection must have a componentRoleArn
to allow directly defined components to be associated with any environments running in the account.
For more information about components, see Proton components in the Proton User Guide.
", - "UpdateEnvironmentAccountConnectionInput$roleArn": "The Amazon Resource Name (ARN) of the IAM service role that's associated with the environment account connection to update.
", - "UpdateEnvironmentInput$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in this environment. It determines the scope of infrastructure that a component can provision.
The environment must have a componentRoleArn
to allow directly defined components to be associated with the environment.
For more information about components, see Proton components in the Proton User Guide.
", - "UpdateEnvironmentInput$protonServiceRoleArn": "The Amazon Resource Name (ARN) of the Proton service role that allows Proton to make API calls to other services your behalf.
" + "UpdateEnvironmentInput$protonServiceRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that allows Proton to provision infrastructure using Amazon Web Services-managed provisioning and CloudFormation on your behalf.
" } }, "AwsAccountId": { @@ -471,7 +463,7 @@ "DeploymentId": { "base": null, "refs": { - "NotifyResourceDeploymentStatusChangeInput$deploymentId": "The deployment ID for your provisioned resource.
" + "NotifyResourceDeploymentStatusChangeInput$deploymentId": "The deployment ID for your provisioned resource. Proton uses it to disambiguate different deployments of the resource. Applicable to self-managed provisioning.
" } }, "DeploymentStatus": { @@ -594,16 +586,16 @@ "base": null, "refs": { "AcceptEnvironmentAccountConnectionInput$id": "The ID of the environment account connection.
", - "CreateEnvironmentInput$environmentAccountConnectionId": "The ID of the environment account connection that you provide if you're provisioning your environment infrastructure resources to an environment account. For more information, see Environment account connections in the Proton User guide.
To use Amazon Web Services-managed provisioning for the environment, specify either the environmentAccountConnectionId
or protonServiceRoleArn
parameter and omit the provisioningRepository
parameter.
The ID of the environment account connection that you provide if you want Proton to provision infrastructure resources for your environment or for any of the service instances running in it in an environment account. For more information, see Environment account connections in the Proton User guide.
If you specify the environmentAccountConnectionId
parameter, don't specify protonServiceRoleArn
, codebuildRoleArn
, or provisioningRepository
.
The ID of the environment account connection to delete.
", - "Environment$environmentAccountConnectionId": "The ID of the environment account connection that's used to provision infrastructure resources in an environment account.
", + "Environment$environmentAccountConnectionId": "The ID of the environment account connection that Proton uses to provision infrastructure resources in an environment account.
", "EnvironmentAccountConnection$id": "The ID of the environment account connection.
", "EnvironmentAccountConnectionSummary$id": "The ID of the environment account connection.
", "EnvironmentSummary$environmentAccountConnectionId": "The ID of the environment account connection that the environment is associated with.
", "GetEnvironmentAccountConnectionInput$id": "The ID of the environment account connection that you want to get the detailed data for.
", "RejectEnvironmentAccountConnectionInput$id": "The ID of the environment account connection to reject.
", "UpdateEnvironmentAccountConnectionInput$id": "The ID of the environment account connection to update.
", - "UpdateEnvironmentInput$environmentAccountConnectionId": "The ID of the environment account connection.
You can only update to a new environment account connection if it was created in the same environment account that the current environment account connection was created in and is associated with the current environment.
" + "UpdateEnvironmentInput$environmentAccountConnectionId": "The ID of the environment account connection that you provide if you want Proton to provision infrastructure resources for your environment or for any of the service instances running in it in an environment account. For more information, see Environment account connections in the Proton User guide.
You can only update to a new environment account connection if it was created in the same environment account that the current environment account connection was created in and is associated with the current environment.
" } }, "EnvironmentAccountConnectionRequesterAccountType": { @@ -1155,7 +1147,7 @@ "NotifyResourceDeploymentStatusChangeInputOutputsList": { "base": null, "refs": { - "NotifyResourceDeploymentStatusChangeInput$outputs": "The provisioned resource state change detail data that's returned by Proton.
" + "NotifyResourceDeploymentStatusChangeInput$outputs": "The output values generated by your provisioned resource.
" } }, "NotifyResourceDeploymentStatusChangeInputStatusMessageString": { @@ -1197,13 +1189,6 @@ "ListServicePipelineOutputsOutput$outputs": "An array of service pipeline Infrastructure as Code (IaC) outputs.
" } }, - "PipelineRoleArn": { - "base": null, - "refs": { - "AccountSettings$pipelineServiceRoleArn": "The Amazon Resource Name (ARN) of the service role you want to use for provisioning pipelines. Assumed by Proton for Amazon Web Services-managed provisioning, and by customer-owned automation for self-managed provisioning.
", - "UpdateAccountSettingsInput$pipelineServiceRoleArn": "The Amazon Resource Name (ARN) of the service role you want to use for provisioning pipelines. Assumed by Proton for Amazon Web Services-managed provisioning, and by customer-owned automation for self-managed provisioning.
To remove a previously configured ARN, specify an empty string.
" - } - }, "ProvisionedResource": { "base": "Detail data for a provisioned resource.
", "refs": { @@ -1286,7 +1271,7 @@ "RepositoryBranchInput": { "base": "Detail input data for a linked repository branch.
", "refs": { - "CreateEnvironmentInput$provisioningRepository": "The linked repository that you use to host your rendered infrastructure templates for self-managed provisioning. A linked repository is a repository that has been registered with Proton. For more information, see CreateRepository.
To use self-managed provisioning for the environment, specify this parameter and omit the environmentAccountConnectionId
and protonServiceRoleArn
parameters.
The linked repository that you use to host your rendered infrastructure templates for self-managed provisioning. A linked repository is a repository that has been registered with Proton. For more information, see CreateRepository.
To use self-managed provisioning for the environment or for any service instance running in the environment, specify this parameter.
", "UpdateAccountSettingsInput$pipelineProvisioningRepository": "A linked repository for pipeline provisioning. Specify it if you have environments configured for self-managed provisioning with services that include pipelines. A linked repository is a repository that has been registered with Proton. For more information, see CreateRepository.
To remove a previously configured repository, set deletePipelineProvisioningRepository
to true
, and don't set pipelineProvisioningRepository
.
The linked repository that you use to host your rendered infrastructure templates for self-managed provisioning. A linked repository is a repository that has been registered with Proton. For more information, see CreateRepository.
" } @@ -1543,6 +1528,34 @@ "ResourceSyncAttempt$targetRevision": "Detail data for the target revision.
" } }, + "RoleArn": { + "base": null, + "refs": { + "CreateEnvironmentAccountConnectionInput$codebuildRoleArn": "The Amazon Resource Name (ARN) of an IAM service role in the environment account. Proton uses this role to provision infrastructure resources using CodeBuild-based provisioning in the associated environment account.
", + "CreateEnvironmentAccountConnectionInput$componentRoleArn": "The Amazon Resource Name (ARN) of an IAM service role in the environment account. Proton uses this role to provision directly defined components in the associated environment account. It determines the scope of infrastructure that a component can provision in the account.
You must specify componentRoleArn
to allow directly defined components to be associated with any environments running in this account.
For more information about components, see Proton components in the Proton User Guide.
", + "CreateEnvironmentAccountConnectionInput$roleArn": "The Amazon Resource Name (ARN) of an IAM service role in the environment account. Proton uses this role to provision infrastructure resources using Amazon Web Services-managed provisioning and CloudFormation in the associated environment account.
", + "CreateEnvironmentInput$codebuildRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that allows Proton to provision infrastructure using CodeBuild-based provisioning on your behalf.
To use CodeBuild-based provisioning for the environment or for any service instance running in the environment, specify either the environmentAccountConnectionId
or codebuildRoleArn
parameter.
The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in this environment. It determines the scope of infrastructure that a component can provision.
You must specify componentRoleArn
to allow directly defined components to be associated with this environment.
For more information about components, see Proton components in the Proton User Guide.
", + "Environment$codebuildRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that allows Proton to provision infrastructure using CodeBuild-based provisioning on your behalf.
", + "Environment$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in this environment. It determines the scope of infrastructure that a component can provision.
The environment must have a componentRoleArn
to allow directly defined components to be associated with the environment.
For more information about components, see Proton components in the Proton User Guide.
", + "EnvironmentAccountConnection$codebuildRoleArn": "The Amazon Resource Name (ARN) of an IAM service role in the environment account. Proton uses this role to provision infrastructure resources using CodeBuild-based provisioning in the associated environment account.
", + "EnvironmentAccountConnection$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in the associated environment account. It determines the scope of infrastructure that a component can provision in the account.
The environment account connection must have a componentRoleArn
to allow directly defined components to be associated with any environments running in the account.
For more information about components, see Proton components in the Proton User Guide.
", + "UpdateEnvironmentAccountConnectionInput$codebuildRoleArn": "The Amazon Resource Name (ARN) of an IAM service role in the environment account. Proton uses this role to provision infrastructure resources using CodeBuild-based provisioning in the associated environment account.
", + "UpdateEnvironmentAccountConnectionInput$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in the associated environment account. It determines the scope of infrastructure that a component can provision in the account.
The environment account connection must have a componentRoleArn
to allow directly defined components to be associated with any environments running in the account.
For more information about components, see Proton components in the Proton User Guide.
", + "UpdateEnvironmentAccountConnectionInput$roleArn": "The Amazon Resource Name (ARN) of an IAM service role in the environment account. Proton uses this role to provision infrastructure resources using Amazon Web Services-managed provisioning and CloudFormation in the associated environment account.
", + "UpdateEnvironmentInput$codebuildRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that allows Proton to provision infrastructure using CodeBuild-based provisioning on your behalf.
", + "UpdateEnvironmentInput$componentRoleArn": "The Amazon Resource Name (ARN) of the IAM service role that Proton uses when provisioning directly defined components in this environment. It determines the scope of infrastructure that a component can provision.
The environment must have a componentRoleArn
to allow directly defined components to be associated with the environment.
For more information about components, see Proton components in the Proton User Guide.
" + } + }, + "RoleArnOrEmptyString": { + "base": null, + "refs": { + "AccountSettings$pipelineCodebuildRoleArn": "The Amazon Resource Name (ARN) of the service role that Proton uses for provisioning pipelines. Proton assumes this role for CodeBuild-based provisioning.
", + "AccountSettings$pipelineServiceRoleArn": "The Amazon Resource Name (ARN) of the service role that Proton uses for provisioning pipelines. Proton assumes this role for Amazon Web Services-managed provisioning.
", + "UpdateAccountSettingsInput$pipelineCodebuildRoleArn": "The Amazon Resource Name (ARN) of the service role you want to use for provisioning pipelines. Proton assumes this role for CodeBuild-based provisioning.
", + "UpdateAccountSettingsInput$pipelineServiceRoleArn": "The Amazon Resource Name (ARN) of the service role you want to use for provisioning pipelines. Assumed by Proton for Amazon Web Services-managed provisioning, and by customer-owned automation for self-managed provisioning.
To remove a previously configured ARN, specify an empty string.
" + } + }, "S3Bucket": { "base": null, "refs": { diff --git a/models/apis/proton/2020-07-20/endpoint-rule-set-1.json b/models/apis/proton/2020-07-20/endpoint-rule-set-1.json new file mode 100644 index 00000000000..22c62cfcd50 --- /dev/null +++ b/models/apis/proton/2020-07-20/endpoint-rule-set-1.json @@ -0,0 +1,315 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "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" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "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://proton-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://proton-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://proton.{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://proton.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/proton/2020-07-20/endpoint-tests-1.json b/models/apis/proton/2020-07-20/endpoint-tests-1.json new file mode 100644 index 00000000000..197db45560c --- /dev/null +++ b/models/apis/proton/2020-07-20/endpoint-tests-1.json @@ -0,0 +1,615 @@ +{ + "testCases": [ + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ca-central-1.api.aws" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ca-central-1.amazonaws.com" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.ca-central-1.api.aws" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.ca-central-1.amazonaws.com" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.eu-central-1.api.aws" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.eu-central-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.eu-central-1.api.aws" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.eu-central-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.us-west-2.api.aws" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.us-west-2.amazonaws.com" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.us-west-2.api.aws" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.us-west-2.amazonaws.com" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.eu-west-2.api.aws" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.eu-west-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.eu-west-2.api.aws" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.eu-west-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.eu-west-1.api.aws" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.eu-west-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.eu-west-1.api.aws" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.eu-west-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ap-northeast-2.api.aws" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.ap-northeast-2.api.aws" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ap-northeast-1.api.aws" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.ap-northeast-1.api.aws" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ap-southeast-1.api.aws" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.ap-southeast-1.api.aws" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ap-southeast-2.api.aws" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.ap-southeast-2.api.aws" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.us-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.us-east-2.api.aws" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton-fips.us-east-2.amazonaws.com" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://proton.us-east-2.api.aws" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://proton.us-east-2.amazonaws.com" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "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": { + "Region": "us-east-1", + "UseFIPS": true, + "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": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true, + "Endpoint": "https://example.com" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/models/apis/rds/2014-10-31/api-2.json b/models/apis/rds/2014-10-31/api-2.json index 3ea252000f6..65c0aa514da 100644 --- a/models/apis/rds/2014-10-31/api-2.json +++ b/models/apis/rds/2014-10-31/api-2.json @@ -2132,7 +2132,8 @@ {"shape":"DomainNotFoundFault"}, {"shape":"DBParameterGroupNotFoundFault"}, {"shape":"BackupPolicyNotFoundFault"}, - {"shape":"NetworkTypeNotSupported"} + {"shape":"NetworkTypeNotSupported"}, + {"shape":"DBClusterSnapshotNotFoundFault"} ] }, "RestoreDBInstanceFromS3":{ @@ -7592,10 +7593,7 @@ }, "RestoreDBInstanceFromDBSnapshotMessage":{ "type":"structure", - "required":[ - "DBInstanceIdentifier", - "DBSnapshotIdentifier" - ], + "required":["DBInstanceIdentifier"], "members":{ "DBInstanceIdentifier":{"shape":"String"}, "DBSnapshotIdentifier":{"shape":"String"}, @@ -7629,7 +7627,8 @@ "CustomIamInstanceProfile":{"shape":"String"}, "BackupTarget":{"shape":"String"}, "NetworkType":{"shape":"String"}, - "StorageThroughput":{"shape":"IntegerOptional"} + "StorageThroughput":{"shape":"IntegerOptional"}, + "DBClusterSnapshotIdentifier":{"shape":"String"} } }, "RestoreDBInstanceFromDBSnapshotResult":{ diff --git a/models/apis/rds/2014-10-31/docs-2.json b/models/apis/rds/2014-10-31/docs-2.json index 1926c9ef8a2..7937c9d92ce 100644 --- a/models/apis/rds/2014-10-31/docs-2.json +++ b/models/apis/rds/2014-10-31/docs-2.json @@ -2466,7 +2466,7 @@ "CreateDBInstanceMessage$PromotionTier": "A value that specifies the order in which an Aurora Replica is promoted to the primary instance after a failure of the existing primary instance. For more information, see Fault Tolerance for an Aurora DB Cluster in the Amazon Aurora User Guide.
This setting doesn't apply to RDS Custom.
Default: 1
Valid Values: 0 - 15
", "CreateDBInstanceMessage$PerformanceInsightsRetentionPeriod": "The number of days to retain Performance Insights data. The default is 7 days. The following values are valid:
7
month * 31, where month is a number of months from 1-23
731
For example, the following values are valid:
93 (3 months * 31)
341 (11 months * 31)
589 (19 months * 31)
731
If you specify a retention period such as 94, which isn't a valid value, RDS issues an error.
This setting doesn't apply to RDS Custom.
", "CreateDBInstanceMessage$MaxAllocatedStorage": "The upper limit in gibibytes (GiB) to which Amazon RDS can automatically scale the storage of the DB instance.
For more information about this setting, including limitations that apply to it, see Managing capacity automatically with Amazon RDS storage autoscaling in the Amazon RDS User Guide.
This setting doesn't apply to RDS Custom.
Amazon Aurora
Not applicable. Storage is managed by the DB cluster.
", - "CreateDBInstanceMessage$StorageThroughput": "Specifies the storage throughput value for the DB instance.
This setting doesn't apply to RDS Custom or Amazon Aurora.
", + "CreateDBInstanceMessage$StorageThroughput": "Specifies the storage throughput value for the DB instance.
This setting applies only to the gp3
storage type.
This setting doesn't apply to RDS Custom or Amazon Aurora.
", "CreateDBInstanceReadReplicaMessage$Port": "The port number that the DB instance uses for connections.
Default: Inherits from the source DB instance
Valid Values: 1150-65535
The amount of Provisioned IOPS (input/output operations per second) to be initially allocated for the DB instance.
", "CreateDBInstanceReadReplicaMessage$MonitoringInterval": "The interval, in seconds, between points when Enhanced Monitoring metrics are collected for the read replica. To disable collecting Enhanced Monitoring metrics, specify 0. The default is 0.
If MonitoringRoleArn
is specified, then you must also set MonitoringInterval
to a value other than 0.
This setting doesn't apply to RDS Custom.
Valid Values: 0, 1, 5, 10, 15, 30, 60
A value that specifies the order in which an Aurora Replica is promoted to the primary instance after a failure of the existing primary instance. For more information, see Fault Tolerance for an Aurora DB Cluster in the Amazon Aurora User Guide.
", "DBInstance$PerformanceInsightsRetentionPeriod": "The number of days to retain Performance Insights data. The default is 7 days. The following values are valid:
7
month * 31, where month is a number of months from 1-23
731
For example, the following values are valid:
93 (3 months * 31)
341 (11 months * 31)
589 (19 months * 31)
731
The upper limit in gibibytes (GiB) to which Amazon RDS can automatically scale the storage of the DB instance.
", - "DBInstance$StorageThroughput": "Specifies the storage throughput for the DB instance.
", + "DBInstance$StorageThroughput": "Specifies the storage throughput for the DB instance.
This setting applies only to the gp3
storage type.
The IOPS (I/O operations per second) value for the automated backup.
", "DBInstanceAutomatedBackup$BackupRetentionPeriod": "The retention period for the automated backups.
", "DBInstanceAutomatedBackup$StorageThroughput": "Specifies the storage throughput for the automated backup.
", @@ -2542,7 +2542,7 @@ "ModifyDBInstanceMessage$PerformanceInsightsRetentionPeriod": "The number of days to retain Performance Insights data. The default is 7 days. The following values are valid:
7
month * 31, where month is a number of months from 1-23
731
For example, the following values are valid:
93 (3 months * 31)
341 (11 months * 31)
589 (19 months * 31)
731
If you specify a retention period such as 94, which isn't a valid value, RDS issues an error.
This setting doesn't apply to RDS Custom.
", "ModifyDBInstanceMessage$MaxAllocatedStorage": "The upper limit in gibibytes (GiB) to which Amazon RDS can automatically scale the storage of the DB instance.
For more information about this setting, including limitations that apply to it, see Managing capacity automatically with Amazon RDS storage autoscaling in the Amazon RDS User Guide.
This setting doesn't apply to RDS Custom.
", "ModifyDBInstanceMessage$ResumeFullAutomationModeMinutes": "The number of minutes to pause the automation. When the time period ends, RDS Custom resumes full automation. The minimum value is 60
(default). The maximum value is 1,440
.
Specifies the storage throughput value for the DB instance.
This setting doesn't apply to RDS Custom or Amazon Aurora.
", + "ModifyDBInstanceMessage$StorageThroughput": "Specifies the storage throughput value for the DB instance.
This setting applies only to the gp3
storage type.
This setting doesn't apply to RDS Custom or Amazon Aurora.
", "ModifyDBProxyRequest$IdleClientTimeout": "The number of seconds that a connection to the proxy can be inactive before the proxy disconnects it. You can set this value higher or lower than the connection timeout limit for the associated database.
", "Option$Port": "If required, the port configured for this option to use.
", "OptionConfiguration$Port": "The optional port for the option.
", @@ -4519,7 +4519,7 @@ "RestoreDBClusterToPointInTimeMessage$StorageType": "Specifies the storage type to be associated with the each DB instance in the Multi-AZ DB cluster.
Valid values: io1
When specified, a value for the Iops
parameter is required.
Default: io1
Valid for: Multi-AZ DB clusters only
", "RestoreDBClusterToPointInTimeMessage$NetworkType": "The network type of the DB cluster.
Valid values:
IPV4
DUAL
The network type is determined by the DBSubnetGroup
specified for the DB cluster. A DBSubnetGroup
can support only the IPv4 protocol or the IPv4 and the IPv6 protocols (DUAL
).
For more information, see Working with a DB instance in a VPC in the Amazon Aurora User Guide.
Valid for: Aurora DB clusters only
", "RestoreDBInstanceFromDBSnapshotMessage$DBInstanceIdentifier": "Name of the DB instance to create from the DB snapshot. This parameter isn't case-sensitive.
Constraints:
Must contain from 1 to 63 numbers, letters, or hyphens
First character must be a letter
Can't end with a hyphen or contain two consecutive hyphens
Example: my-snapshot-id
The identifier for the DB snapshot to restore from.
Constraints:
Must match the identifier of an existing DBSnapshot.
If you are restoring from a shared manual DB snapshot, the DBSnapshotIdentifier
must be the ARN of the shared DB snapshot.
The identifier for the DB snapshot to restore from.
Constraints:
Must match the identifier of an existing DBSnapshot.
Can't be specified when DBClusterSnapshotIdentifier
is specified.
Must be specified when DBClusterSnapshotIdentifier
isn't specified.
If you are restoring from a shared manual DB snapshot, the DBSnapshotIdentifier
must be the ARN of the shared DB snapshot.
The compute and memory capacity of the Amazon RDS DB instance, for example db.m4.large. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see DB Instance Class in the Amazon RDS User Guide.
Default: The same DBInstanceClass as the original DB instance.
", "RestoreDBInstanceFromDBSnapshotMessage$AvailabilityZone": "The Availability Zone (AZ) where the DB instance will be created.
Default: A random, system-chosen Availability Zone.
Constraint: You can't specify the AvailabilityZone
parameter if the DB instance is a Multi-AZ deployment.
Example: us-east-1a
The DB subnet group name to use for the new instance.
Constraints: If supplied, must match the name of an existing DBSubnetGroup.
Example: mydbsubnetgroup
The instance profile associated with the underlying Amazon EC2 instance of an RDS Custom DB instance. The instance profile must meet the following requirements:
The profile must exist in your account.
The profile must have an IAM role that Amazon EC2 has permissions to assume.
The instance profile name and the associated IAM role name must start with the prefix AWSRDSCustom
.
For the list of permissions required for the IAM role, see Configure IAM and your VPC in the Amazon RDS User Guide.
This setting is required for RDS Custom.
", "RestoreDBInstanceFromDBSnapshotMessage$BackupTarget": "Specifies where automated backups and manual snapshots are stored for the restored DB instance.
Possible values are outposts
(Amazon Web Services Outposts) and region
(Amazon Web Services Region). The default is region
.
For more information, see Working with Amazon RDS on Amazon Web Services Outposts in the Amazon RDS User Guide.
", "RestoreDBInstanceFromDBSnapshotMessage$NetworkType": "The network type of the DB instance.
Valid values:
IPV4
DUAL
The network type is determined by the DBSubnetGroup
specified for the DB instance. A DBSubnetGroup
can support only the IPv4 protocol or the IPv4 and the IPv6 protocols (DUAL
).
For more information, see Working with a DB instance in a VPC in the Amazon RDS User Guide.
", + "RestoreDBInstanceFromDBSnapshotMessage$DBClusterSnapshotIdentifier": "The identifier for the RDS for MySQL Multi-AZ DB cluster snapshot to restore from.
For more information on Multi-AZ DB clusters, see Multi-AZ deployments with two readable standby DB instances in the Amazon RDS User Guide.
Constraints:
Must match the identifier of an existing Multi-AZ DB cluster snapshot.
Can't be specified when DBSnapshotIdentifier
is specified.
Must be specified when DBSnapshotIdentifier
isn't specified.
If you are restoring from a shared manual Multi-AZ DB cluster snapshot, the DBClusterSnapshotIdentifier
must be the ARN of the shared snapshot.
Can't be the identifier of an Aurora DB cluster snapshot.
Can't be the identifier of an RDS for PostgreSQL Multi-AZ DB cluster snapshot.
The name of the database to create when the DB instance is created. Follow the naming rules specified in CreateDBInstance
.
The DB instance identifier. This parameter is stored as a lowercase string.
Constraints:
Must contain from 1 to 63 letters, numbers, or hyphens.
First character must be a letter.
Can't end with a hyphen or contain two consecutive hyphens.
Example: mydbinstance
The compute and memory capacity of the DB instance, for example db.m4.large. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see DB Instance Class in the Amazon RDS User Guide.
Importing from Amazon S3 isn't supported on the db.t2.micro DB instance class.
", diff --git a/models/apis/rds/2014-10-31/endpoint-tests-1.json b/models/apis/rds/2014-10-31/endpoint-tests-1.json index ccfd8edf99d..8b105992113 100644 --- a/models/apis/rds/2014-10-31/endpoint-tests-1.json +++ b/models/apis/rds/2014-10-31/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { - "Region": "ap-south-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-south-2" } }, { @@ -21,9 +21,9 @@ } }, "params": { - "Region": "ap-south-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-south-2" } }, { @@ -34,9 +34,9 @@ } }, "params": { - "Region": "ap-south-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-south-2" } }, { @@ -47,9 +47,9 @@ } }, "params": { - "Region": "ap-south-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-south-2" } }, { @@ -60,9 +60,9 @@ } }, "params": { - "Region": "ap-south-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-south-1" } }, { @@ -73,9 +73,9 @@ } }, "params": { - "Region": "ap-south-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-south-1" } }, { @@ -86,9 +86,9 @@ } }, "params": { - "Region": "ap-south-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-south-1" } }, { @@ -99,9 +99,9 @@ } }, "params": { - "Region": "ap-south-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-south-1" } }, { @@ -112,9 +112,9 @@ } }, "params": { - "Region": "eu-south-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-south-1" } }, { @@ -125,9 +125,9 @@ } }, "params": { - "Region": "eu-south-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-south-1" } }, { @@ -138,9 +138,9 @@ } }, "params": { - "Region": "eu-south-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-south-1" } }, { @@ -151,9 +151,9 @@ } }, "params": { - "Region": "eu-south-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-south-1" } }, { @@ -164,9 +164,9 @@ } }, "params": { - "Region": "eu-south-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-south-2" } }, { @@ -177,9 +177,9 @@ } }, "params": { - "Region": "eu-south-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-south-2" } }, { @@ -190,9 +190,9 @@ } }, "params": { - "Region": "eu-south-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-south-2" } }, { @@ -203,9 +203,9 @@ } }, "params": { - "Region": "eu-south-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-south-2" } }, { @@ -216,9 +216,9 @@ } }, "params": { - "Region": "us-gov-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-gov-east-1" } }, { @@ -229,9 +229,9 @@ } }, "params": { - "Region": "us-gov-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-gov-east-1" } }, { @@ -242,9 +242,9 @@ } }, "params": { - "Region": "us-gov-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-gov-east-1" } }, { @@ -255,9 +255,9 @@ } }, "params": { - "Region": "us-gov-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-gov-east-1" } }, { @@ -268,9 +268,9 @@ } }, "params": { - "Region": "me-central-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "me-central-1" } }, { @@ -281,9 +281,9 @@ } }, "params": { - "Region": "me-central-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "me-central-1" } }, { @@ -294,9 +294,9 @@ } }, "params": { - "Region": "me-central-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "me-central-1" } }, { @@ -307,9 +307,9 @@ } }, "params": { - "Region": "me-central-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "me-central-1" } }, { @@ -320,9 +320,9 @@ } }, "params": { - "Region": "ca-central-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ca-central-1" } }, { @@ -333,9 +333,9 @@ } }, "params": { - "Region": "ca-central-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ca-central-1" } }, { @@ -346,9 +346,9 @@ } }, "params": { - "Region": "ca-central-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ca-central-1" } }, { @@ -359,9 +359,9 @@ } }, "params": { - "Region": "ca-central-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ca-central-1" } }, { @@ -372,9 +372,9 @@ } }, "params": { - "Region": "eu-central-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-central-1" } }, { @@ -385,9 +385,9 @@ } }, "params": { - "Region": "eu-central-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-central-1" } }, { @@ -398,9 +398,9 @@ } }, "params": { - "Region": "eu-central-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-central-1" } }, { @@ -411,9 +411,9 @@ } }, "params": { - "Region": "eu-central-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-central-1" } }, { @@ -422,9 +422,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-iso-west-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-iso-west-1" } }, { @@ -435,9 +435,9 @@ } }, "params": { - "Region": "us-iso-west-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-iso-west-1" } }, { @@ -446,9 +446,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-iso-west-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-iso-west-1" } }, { @@ -459,9 +459,9 @@ } }, "params": { - "Region": "us-iso-west-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-iso-west-1" } }, { @@ -472,9 +472,9 @@ } }, "params": { - "Region": "eu-central-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-central-2" } }, { @@ -485,9 +485,9 @@ } }, "params": { - "Region": "eu-central-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-central-2" } }, { @@ -498,9 +498,9 @@ } }, "params": { - "Region": "eu-central-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-central-2" } }, { @@ -511,9 +511,9 @@ } }, "params": { - "Region": "eu-central-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-central-2" } }, { @@ -524,9 +524,9 @@ } }, "params": { - "Region": "us-west-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-west-1" } }, { @@ -537,9 +537,9 @@ } }, "params": { - "Region": "us-west-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-west-1" } }, { @@ -550,9 +550,9 @@ } }, "params": { - "Region": "us-west-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-west-1" } }, { @@ -563,9 +563,9 @@ } }, "params": { - "Region": "us-west-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-west-1" } }, { @@ -576,9 +576,9 @@ } }, "params": { - "Region": "us-west-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-west-2" } }, { @@ -589,9 +589,9 @@ } }, "params": { - "Region": "us-west-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-west-2" } }, { @@ -602,9 +602,9 @@ } }, "params": { - "Region": "us-west-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-west-2" } }, { @@ -615,9 +615,9 @@ } }, "params": { - "Region": "us-west-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-west-2" } }, { @@ -628,9 +628,9 @@ } }, "params": { - "Region": "af-south-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "af-south-1" } }, { @@ -641,9 +641,9 @@ } }, "params": { - "Region": "af-south-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "af-south-1" } }, { @@ -654,9 +654,9 @@ } }, "params": { - "Region": "af-south-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "af-south-1" } }, { @@ -667,9 +667,9 @@ } }, "params": { - "Region": "af-south-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "af-south-1" } }, { @@ -680,9 +680,9 @@ } }, "params": { - "Region": "eu-north-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-north-1" } }, { @@ -693,9 +693,9 @@ } }, "params": { - "Region": "eu-north-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-north-1" } }, { @@ -706,9 +706,9 @@ } }, "params": { - "Region": "eu-north-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-north-1" } }, { @@ -719,9 +719,9 @@ } }, "params": { - "Region": "eu-north-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-north-1" } }, { @@ -732,9 +732,9 @@ } }, "params": { - "Region": "eu-west-3", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-west-3" } }, { @@ -745,9 +745,9 @@ } }, "params": { - "Region": "eu-west-3", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-west-3" } }, { @@ -758,9 +758,9 @@ } }, "params": { - "Region": "eu-west-3", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-west-3" } }, { @@ -771,9 +771,9 @@ } }, "params": { - "Region": "eu-west-3", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-west-3" } }, { @@ -784,9 +784,9 @@ } }, "params": { - "Region": "eu-west-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -797,9 +797,9 @@ } }, "params": { - "Region": "eu-west-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -810,9 +810,9 @@ } }, "params": { - "Region": "eu-west-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -823,9 +823,9 @@ } }, "params": { - "Region": "eu-west-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -836,9 +836,9 @@ } }, "params": { - "Region": "eu-west-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -849,9 +849,9 @@ } }, "params": { - "Region": "eu-west-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -862,9 +862,9 @@ } }, "params": { - "Region": "eu-west-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -875,9 +875,9 @@ } }, "params": { - "Region": "eu-west-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -888,9 +888,9 @@ } }, "params": { - "Region": "ap-northeast-3", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-northeast-3" } }, { @@ -901,9 +901,9 @@ } }, "params": { - "Region": "ap-northeast-3", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-northeast-3" } }, { @@ -914,9 +914,9 @@ } }, "params": { - "Region": "ap-northeast-3", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-northeast-3" } }, { @@ -927,9 +927,9 @@ } }, "params": { - "Region": "ap-northeast-3", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-northeast-3" } }, { @@ -940,9 +940,9 @@ } }, "params": { - "Region": "ap-northeast-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -953,9 +953,9 @@ } }, "params": { - "Region": "ap-northeast-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -966,9 +966,9 @@ } }, "params": { - "Region": "ap-northeast-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -979,9 +979,9 @@ } }, "params": { - "Region": "ap-northeast-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -992,9 +992,9 @@ } }, "params": { - "Region": "ap-northeast-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -1005,9 +1005,9 @@ } }, "params": { - "Region": "ap-northeast-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -1018,9 +1018,9 @@ } }, "params": { - "Region": "ap-northeast-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -1031,9 +1031,9 @@ } }, "params": { - "Region": "ap-northeast-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -1044,9 +1044,9 @@ } }, "params": { - "Region": "me-south-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "me-south-1" } }, { @@ -1057,9 +1057,9 @@ } }, "params": { - "Region": "me-south-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "me-south-1" } }, { @@ -1070,9 +1070,9 @@ } }, "params": { - "Region": "me-south-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "me-south-1" } }, { @@ -1083,9 +1083,9 @@ } }, "params": { - "Region": "me-south-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "me-south-1" } }, { @@ -1096,9 +1096,9 @@ } }, "params": { - "Region": "sa-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "sa-east-1" } }, { @@ -1109,9 +1109,9 @@ } }, "params": { - "Region": "sa-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "sa-east-1" } }, { @@ -1122,9 +1122,9 @@ } }, "params": { - "Region": "sa-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "sa-east-1" } }, { @@ -1135,9 +1135,9 @@ } }, "params": { - "Region": "sa-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "sa-east-1" } }, { @@ -1148,9 +1148,9 @@ } }, "params": { - "Region": "ap-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-east-1" } }, { @@ -1161,9 +1161,9 @@ } }, "params": { - "Region": "ap-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-east-1" } }, { @@ -1174,9 +1174,9 @@ } }, "params": { - "Region": "ap-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-east-1" } }, { @@ -1187,9 +1187,9 @@ } }, "params": { - "Region": "ap-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-east-1" } }, { @@ -1200,9 +1200,9 @@ } }, "params": { - "Region": "cn-north-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "cn-north-1" } }, { @@ -1213,9 +1213,9 @@ } }, "params": { - "Region": "cn-north-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "cn-north-1" } }, { @@ -1226,9 +1226,9 @@ } }, "params": { - "Region": "cn-north-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "cn-north-1" } }, { @@ -1239,9 +1239,9 @@ } }, "params": { - "Region": "cn-north-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "cn-north-1" } }, { @@ -1252,9 +1252,9 @@ } }, "params": { - "Region": "us-gov-west-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-gov-west-1" } }, { @@ -1265,9 +1265,9 @@ } }, "params": { - "Region": "us-gov-west-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-gov-west-1" } }, { @@ -1278,9 +1278,9 @@ } }, "params": { - "Region": "us-gov-west-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-gov-west-1" } }, { @@ -1291,9 +1291,9 @@ } }, "params": { - "Region": "us-gov-west-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-gov-west-1" } }, { @@ -1304,9 +1304,9 @@ } }, "params": { - "Region": "ap-southeast-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -1317,9 +1317,9 @@ } }, "params": { - "Region": "ap-southeast-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -1330,9 +1330,9 @@ } }, "params": { - "Region": "ap-southeast-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -1343,9 +1343,9 @@ } }, "params": { - "Region": "ap-southeast-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -1356,9 +1356,9 @@ } }, "params": { - "Region": "ap-southeast-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-southeast-2" } }, { @@ -1369,9 +1369,9 @@ } }, "params": { - "Region": "ap-southeast-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-southeast-2" } }, { @@ -1382,9 +1382,9 @@ } }, "params": { - "Region": "ap-southeast-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-southeast-2" } }, { @@ -1395,9 +1395,9 @@ } }, "params": { - "Region": "ap-southeast-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-southeast-2" } }, { @@ -1406,9 +1406,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-iso-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-iso-east-1" } }, { @@ -1419,9 +1419,9 @@ } }, "params": { - "Region": "us-iso-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-iso-east-1" } }, { @@ -1430,9 +1430,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-iso-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-iso-east-1" } }, { @@ -1443,9 +1443,9 @@ } }, "params": { - "Region": "us-iso-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-iso-east-1" } }, { @@ -1456,9 +1456,9 @@ } }, "params": { - "Region": "ap-southeast-3", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-southeast-3" } }, { @@ -1469,9 +1469,9 @@ } }, "params": { - "Region": "ap-southeast-3", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-southeast-3" } }, { @@ -1482,9 +1482,9 @@ } }, "params": { - "Region": "ap-southeast-3", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-southeast-3" } }, { @@ -1495,9 +1495,9 @@ } }, "params": { - "Region": "ap-southeast-3", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-southeast-3" } }, { @@ -1508,9 +1508,9 @@ } }, "params": { - "Region": "ap-southeast-4", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-southeast-4" } }, { @@ -1521,9 +1521,9 @@ } }, "params": { - "Region": "ap-southeast-4", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-southeast-4" } }, { @@ -1534,9 +1534,9 @@ } }, "params": { - "Region": "ap-southeast-4", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-southeast-4" } }, { @@ -1547,9 +1547,9 @@ } }, "params": { - "Region": "ap-southeast-4", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-southeast-4" } }, { @@ -1560,9 +1560,9 @@ } }, "params": { - "Region": "us-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -1573,9 +1573,9 @@ } }, "params": { - "Region": "us-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -1586,9 +1586,9 @@ } }, "params": { - "Region": "us-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -1599,9 +1599,9 @@ } }, "params": { - "Region": "us-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -1612,9 +1612,9 @@ } }, "params": { - "Region": "us-east-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-east-2" } }, { @@ -1625,9 +1625,9 @@ } }, "params": { - "Region": "us-east-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-east-2" } }, { @@ -1638,9 +1638,9 @@ } }, "params": { - "Region": "us-east-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-east-2" } }, { @@ -1651,9 +1651,9 @@ } }, "params": { - "Region": "us-east-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-east-2" } }, { @@ -1664,9 +1664,9 @@ } }, "params": { - "Region": "cn-northwest-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "cn-northwest-1" } }, { @@ -1677,9 +1677,9 @@ } }, "params": { - "Region": "cn-northwest-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "cn-northwest-1" } }, { @@ -1690,9 +1690,9 @@ } }, "params": { - "Region": "cn-northwest-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "cn-northwest-1" } }, { @@ -1703,9 +1703,9 @@ } }, "params": { - "Region": "cn-northwest-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "cn-northwest-1" } }, { @@ -1714,9 +1714,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-isob-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-isob-east-1" } }, { @@ -1727,9 +1727,9 @@ } }, "params": { - "Region": "us-isob-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-isob-east-1" } }, { @@ -1738,9 +1738,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-isob-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-isob-east-1" } }, { @@ -1751,9 +1751,9 @@ } }, "params": { - "Region": "us-isob-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-isob-east-1" } }, { @@ -1764,9 +1764,9 @@ } }, "params": { - "Region": "us-east-1", - "UseFIPS": false, "UseDualStack": false, + "UseFIPS": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -1776,9 +1776,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", - "UseFIPS": true, "UseDualStack": false, + "UseFIPS": true, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -1788,9 +1788,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", - "UseFIPS": false, "UseDualStack": true, + "UseFIPS": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } } diff --git a/models/apis/workdocs/2016-05-01/api-2.json b/models/apis/workdocs/2016-05-01/api-2.json index 768f1bdee60..909de230c81 100644 --- a/models/apis/workdocs/2016-05-01/api-2.json +++ b/models/apis/workdocs/2016-05-01/api-2.json @@ -25,7 +25,8 @@ {"shape":"UnauthorizedOperationException"}, {"shape":"UnauthorizedResourceAccessException"}, {"shape":"FailedDependencyException"}, - {"shape":"ServiceUnavailableException"} + {"shape":"ServiceUnavailableException"}, + {"shape":"ConcurrentModificationException"} ] }, "ActivateUser":{ @@ -58,7 +59,8 @@ {"shape":"UnauthorizedOperationException"}, {"shape":"UnauthorizedResourceAccessException"}, {"shape":"FailedDependencyException"}, - {"shape":"ServiceUnavailableException"} + {"shape":"ServiceUnavailableException"}, + {"shape":"ProhibitedStateException"} ] }, "CreateComment":{ @@ -114,6 +116,7 @@ {"shape":"EntityAlreadyExistsException"}, {"shape":"ProhibitedStateException"}, {"shape":"ConflictingOperationException"}, + {"shape":"ConcurrentModificationException"}, {"shape":"LimitExceededException"}, {"shape":"UnauthorizedOperationException"}, {"shape":"UnauthorizedResourceAccessException"}, @@ -151,7 +154,8 @@ "errors":[ {"shape":"UnauthorizedResourceAccessException"}, {"shape":"TooManySubscriptionsException"}, - {"shape":"ServiceUnavailableException"} + {"shape":"ServiceUnavailableException"}, + {"shape":"InvalidArgumentException"} ] }, "CreateUser":{ @@ -233,6 +237,7 @@ "input":{"shape":"DeleteDocumentRequest"}, "errors":[ {"shape":"EntityNotExistsException"}, + {"shape":"LimitExceededException"}, {"shape":"ProhibitedStateException"}, {"shape":"ConflictingOperationException"}, {"shape":"ConcurrentModificationException"}, @@ -242,6 +247,25 @@ {"shape":"ServiceUnavailableException"} ] }, + "DeleteDocumentVersion":{ + "name":"DeleteDocumentVersion", + "http":{ + "method":"DELETE", + "requestUri":"/api/v1/documentVersions/{DocumentId}/versions/{VersionId}", + "responseCode":204 + }, + "input":{"shape":"DeleteDocumentVersionRequest"}, + "errors":[ + {"shape":"EntityNotExistsException"}, + {"shape":"ProhibitedStateException"}, + {"shape":"ConflictingOperationException"}, + {"shape":"ConcurrentModificationException"}, + {"shape":"UnauthorizedResourceAccessException"}, + {"shape":"FailedDependencyException"}, + {"shape":"InvalidOperationException"}, + {"shape":"UnauthorizedOperationException"} + ] + }, "DeleteFolder":{ "name":"DeleteFolder", "http":{ @@ -252,6 +276,7 @@ "input":{"shape":"DeleteFolderRequest"}, "errors":[ {"shape":"EntityNotExistsException"}, + {"shape":"LimitExceededException"}, {"shape":"ProhibitedStateException"}, {"shape":"ConflictingOperationException"}, {"shape":"ConcurrentModificationException"}, @@ -293,7 +318,8 @@ {"shape":"UnauthorizedOperationException"}, {"shape":"UnauthorizedResourceAccessException"}, {"shape":"FailedDependencyException"}, - {"shape":"ServiceUnavailableException"} + {"shape":"ServiceUnavailableException"}, + {"shape":"ProhibitedStateException"} ] }, "DeleteNotificationSubscription":{ @@ -378,7 +404,8 @@ {"shape":"InvalidArgumentException"}, {"shape":"FailedDependencyException"}, {"shape":"ServiceUnavailableException"}, - {"shape":"ProhibitedStateException"} + {"shape":"ProhibitedStateException"}, + {"shape":"InvalidPasswordException"} ] }, "DescribeFolderContents":{ @@ -440,6 +467,7 @@ "input":{"shape":"DescribeResourcePermissionsRequest"}, "output":{"shape":"DescribeResourcePermissionsResponse"}, "errors":[ + {"shape":"InvalidArgumentException"}, {"shape":"UnauthorizedOperationException"}, {"shape":"UnauthorizedResourceAccessException"}, {"shape":"FailedDependencyException"}, @@ -621,13 +649,15 @@ {"shape":"EntityAlreadyExistsException"}, {"shape":"StorageLimitExceededException"}, {"shape":"StorageLimitWillExceedException"}, + {"shape":"LimitExceededException"}, {"shape":"ProhibitedStateException"}, {"shape":"UnauthorizedOperationException"}, {"shape":"UnauthorizedResourceAccessException"}, {"shape":"FailedDependencyException"}, {"shape":"ServiceUnavailableException"}, {"shape":"DraftUploadOutOfSyncException"}, - {"shape":"ResourceAlreadyCheckedOutException"} + {"shape":"ResourceAlreadyCheckedOutException"}, + {"shape":"InvalidPasswordException"} ] }, "RemoveAllResourcePermissions":{ @@ -660,6 +690,25 @@ {"shape":"ServiceUnavailableException"} ] }, + "RestoreDocumentVersions":{ + "name":"RestoreDocumentVersions", + "http":{ + "method":"POST", + "requestUri":"/api/v1/documentVersions/restore/{DocumentId}", + "responseCode":204 + }, + "input":{"shape":"RestoreDocumentVersionsRequest"}, + "errors":[ + {"shape":"EntityNotExistsException"}, + {"shape":"ProhibitedStateException"}, + {"shape":"ConflictingOperationException"}, + {"shape":"ConcurrentModificationException"}, + {"shape":"UnauthorizedResourceAccessException"}, + {"shape":"FailedDependencyException"}, + {"shape":"InvalidOperationException"}, + {"shape":"UnauthorizedOperationException"} + ] + }, "UpdateDocument":{ "name":"UpdateDocument", "http":{ @@ -735,6 +784,7 @@ {"shape":"UnauthorizedOperationException"}, {"shape":"UnauthorizedResourceAccessException"}, {"shape":"IllegalUserStateException"}, + {"shape":"ProhibitedStateException"}, {"shape":"FailedDependencyException"}, {"shape":"ServiceUnavailableException"}, {"shape":"DeactivatingLastSystemUserException"}, @@ -1262,6 +1312,36 @@ } } }, + "DeleteDocumentVersionRequest":{ + "type":"structure", + "required":[ + "DocumentId", + "VersionId", + "DeletePriorVersions" + ], + "members":{ + "AuthenticationToken":{ + "shape":"AuthenticationHeaderType", + "location":"header", + "locationName":"Authentication" + }, + "DocumentId":{ + "shape":"ResourceIdType", + "location":"uri", + "locationName":"DocumentId" + }, + "VersionId":{ + "shape":"DocumentVersionIdType", + "location":"uri", + "locationName":"VersionId" + }, + "DeletePriorVersions":{ + "shape":"BooleanType", + "location":"querystring", + "locationName":"deletePriorVersions" + } + } + }, "DeleteFolderContentsRequest":{ "type":"structure", "required":["FolderId"], @@ -1409,7 +1489,7 @@ "locationName":"limit" }, "Marker":{ - "shape":"MarkerType", + "shape":"SearchMarkerType", "location":"querystring", "locationName":"marker" } @@ -1419,7 +1499,7 @@ "type":"structure", "members":{ "UserActivities":{"shape":"UserActivities"}, - "Marker":{"shape":"MarkerType"} + "Marker":{"shape":"SearchMarkerType"} } }, "DescribeCommentsRequest":{ @@ -1864,7 +1944,8 @@ "type":"string", "max":256, "min":1, - "pattern":"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}" + "pattern":"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}", + "sensitive":true }, "EntityAlreadyExistsException":{ "type":"structure", @@ -2201,7 +2282,6 @@ }, "InitiateDocumentVersionUploadRequest":{ "type":"structure", - "required":["ParentFolderId"], "members":{ "AuthenticationToken":{ "shape":"AuthenticationHeaderType", @@ -2512,6 +2592,22 @@ "DOCUMENT" ] }, + "RestoreDocumentVersionsRequest":{ + "type":"structure", + "required":["DocumentId"], + "members":{ + "AuthenticationToken":{ + "shape":"AuthenticationHeaderType", + "location":"header", + "locationName":"Authentication" + }, + "DocumentId":{ + "shape":"ResourceIdType", + "location":"uri", + "locationName":"DocumentId" + } + } + }, "RolePermissionType":{ "type":"string", "enum":[ @@ -2528,6 +2624,12 @@ "COOWNER" ] }, + "SearchMarkerType":{ + "type":"string", + "max":12288, + "min":1, + "pattern":"[\\u0000-\\u00FF]+" + }, "SearchQueryType":{ "type":"string", "max":512, @@ -2650,7 +2752,10 @@ }, "SubscriptionProtocolType":{ "type":"string", - "enum":["HTTPS"] + "enum":[ + "HTTPS", + "SQS" + ] }, "SubscriptionType":{ "type":"string", diff --git a/models/apis/workdocs/2016-05-01/docs-2.json b/models/apis/workdocs/2016-05-01/docs-2.json index 96a13e91a3f..817f2bb1da4 100644 --- a/models/apis/workdocs/2016-05-01/docs-2.json +++ b/models/apis/workdocs/2016-05-01/docs-2.json @@ -1,6 +1,6 @@ { "version": "2.0", - "service": "The WorkDocs API is designed for the following use cases:
File Migration: File migration applications are supported for users who want to migrate their files from an on-premises or off-premises file system or service. Users can insert files into a user directory structure, as well as allow for basic metadata changes, such as modifications to the permissions of files.
Security: Support security applications are supported for users who have additional security needs, such as antivirus or data loss prevention. The API actions, along with AWS CloudTrail, allow these applications to detect when changes occur in Amazon WorkDocs. Then, the application can take the necessary actions and replace the target file. If the target file violates the policy, the application can also choose to email the user.
eDiscovery/Analytics: General administrative applications are supported, such as eDiscovery and analytics. These applications can choose to mimic or record the actions in an Amazon WorkDocs site, along with AWS CloudTrail, to replicate data for eDiscovery, backup, or analytical applications.
All Amazon WorkDocs API actions are Amazon authenticated and certificate-signed. They not only require the use of the AWS SDK, but also allow for the exclusive use of IAM users and roles to help facilitate access, trust, and permission policies. By creating a role and allowing an IAM user to access the Amazon WorkDocs site, the IAM user gains full administrative visibility into the entire Amazon WorkDocs site (or as set in the IAM policy). This includes, but is not limited to, the ability to modify file permissions and upload any file to any user. This allows developers to perform the three use cases above, as well as give users the ability to grant access on a selective basis using the IAM model.
", + "service": "The WorkDocs API is designed for the following use cases:
File Migration: File migration applications are supported for users who want to migrate their files from an on-premises or off-premises file system or service. Users can insert files into a user directory structure, as well as allow for basic metadata changes, such as modifications to the permissions of files.
Security: Support security applications are supported for users who have additional security needs, such as antivirus or data loss prevention. The API actions, along with AWS CloudTrail, allow these applications to detect when changes occur in Amazon WorkDocs. Then, the application can take the necessary actions and replace the target file. If the target file violates the policy, the application can also choose to email the user.
eDiscovery/Analytics: General administrative applications are supported, such as eDiscovery and analytics. These applications can choose to mimic or record the actions in an Amazon WorkDocs site, along with AWS CloudTrail, to replicate data for eDiscovery, backup, or analytical applications.
All Amazon WorkDocs API actions are Amazon authenticated and certificate-signed. They not only require the use of the AWS SDK, but also allow for the exclusive use of IAM users and roles to help facilitate access, trust, and permission policies. By creating a role and allowing an IAM user to access the Amazon WorkDocs site, the IAM user gains full administrative visibility into the entire Amazon WorkDocs site (or as set in the IAM policy). This includes, but is not limited to, the ability to modify file permissions and upload any file to any user. This allows developers to perform the three use cases above, as well as give users the ability to grant access on a selective basis using the IAM model.
The pricing for Amazon WorkDocs APIs varies depending on the API call type for these actions:
READ (Get*)
WRITE (Activate*, Add*, Create*, Deactivate*, Initiate*, Update*)
LIST (Describe*)
DELETE*, CANCEL
For information about Amazon WorkDocs API pricing, see Amazon WorkDocs Pricing.
Aborts the upload of the specified document version that was previously initiated by InitiateDocumentVersionUpload. The client should make this call only when it no longer intends to upload the document version, or fails to do so.
", "ActivateUser": "Activates the specified user. Only active users can access Amazon WorkDocs.
", @@ -9,12 +9,13 @@ "CreateCustomMetadata": "Adds one or more custom properties to the specified resource (a folder, document, or version).
", "CreateFolder": "Creates a folder with the specified name and parent folder.
", "CreateLabels": "Adds the specified list of labels to the given resource (a document or folder)
", - "CreateNotificationSubscription": "Configure Amazon WorkDocs to use Amazon SNS notifications. The endpoint receives a confirmation message, and must confirm the subscription.
For more information, see Subscribe to Notifications in the Amazon WorkDocs Developer Guide.
", + "CreateNotificationSubscription": "Configure Amazon WorkDocs to use Amazon SNS notifications. The endpoint receives a confirmation message, and must confirm the subscription.
For more information, see Setting up notifications for an IAM user or role in the Amazon WorkDocs Developer Guide.
", "CreateUser": "Creates a user in a Simple AD or Microsoft AD directory. The status of a newly created user is \"ACTIVE\". New users can access Amazon WorkDocs.
", "DeactivateUser": "Deactivates the specified user, which revokes the user's access to Amazon WorkDocs.
", "DeleteComment": "Deletes the specified comment from the document version.
", "DeleteCustomMetadata": "Deletes custom metadata from the specified resource.
", "DeleteDocument": "Permanently deletes the specified document and its associated metadata.
", + "DeleteDocumentVersion": "Deletes a version of an Amazon WorkDocs document. Use the DeletePriorVersions
parameter to delete prior versions.
Permanently deletes the specified folder and its contents.
", "DeleteFolderContents": "Deletes the contents of the specified folder.
", "DeleteLabels": "Deletes the specified list of labels from a resource.
", @@ -39,6 +40,7 @@ "InitiateDocumentVersionUpload": "Creates a new document object and version object.
The client specifies the parent folder ID and name of the document to upload. The ID is optionally specified when creating a new version of an existing document. This is the first step to upload a document. Next, upload the document to the URL returned from the call, and then call UpdateDocumentVersion.
To cancel the document upload, call AbortDocumentVersionUpload.
", "RemoveAllResourcePermissions": "Removes all the permissions from the specified resource.
", "RemoveResourcePermission": "Removes the permission for the specified principal from the specified resource.
", + "RestoreDocumentVersions": "Recovers a deleted version of an Amazon WorkDocs document.
", "UpdateDocument": "Updates the specified attributes of a document. The user must have access to both the document and its parent folder, if applicable.
", "UpdateDocumentVersion": "Changes the status of the document version to ACTIVE.
Amazon WorkDocs also sets its document container to ACTIVE. This is the last step in a document upload, after the client uploads the document to an S3-presigned URL returned by InitiateDocumentVersionUpload.
", "UpdateFolder": "Updates the specified attributes of the specified folder. The user must have access to both the folder and its parent folder, if applicable.
", @@ -103,6 +105,7 @@ "DeleteCommentRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "DeleteCustomMetadataRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "DeleteDocumentRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", + "DeleteDocumentVersionRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "DeleteFolderContentsRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "DeleteFolderRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "DeleteLabelsRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", @@ -125,6 +128,7 @@ "InitiateDocumentVersionUploadRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "RemoveAllResourcePermissionsRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "RemoveResourcePermissionRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", + "RestoreDocumentVersionsRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "UpdateDocumentRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "UpdateDocumentVersionRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", "UpdateFolderRequest$AuthenticationToken": "Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.
", @@ -143,6 +147,7 @@ "Activity$IsIndirectActivity": "Indicates whether an activity is indirect or direct. An indirect activity results from a direct activity performed on a parent resource. For example, sharing a parent folder (the direct activity) shares all of the subfolders and documents within the parent folder (the indirect activity).
", "CreateCommentRequest$NotifyCollaborators": "Set this parameter to TRUE to send an email out to the document collaborators after the comment is created.
", "DeleteCustomMetadataRequest$DeleteAll": "Flag to indicate removal of all custom metadata properties from the specified resource.
", + "DeleteDocumentVersionRequest$DeletePriorVersions": "When set to TRUE
, deletes the specified version and all prior versions of a document.
Flag to request removal of all labels from the specified resource.
", "DescribeActivitiesRequest$IncludeIndirectActivities": "Includes indirect activities. An indirect activity results from a direct activity performed on a parent resource. For example, sharing a parent folder (the direct activity) shares all of the subfolders and documents within the parent folder (the indirect activity).
", "GetDocumentRequest$IncludeCustomMetadata": "Set this to TRUE
to include custom metadata in the response.
The ID of the version, if the custom metadata is being added to a document version.
", "DeleteCommentRequest$VersionId": "The ID of the document version.
", "DeleteCustomMetadataRequest$VersionId": "The ID of the version, if the custom metadata is being deleted from a document version.
", + "DeleteDocumentVersionRequest$VersionId": "The version ID of a document.
", "DescribeCommentsRequest$VersionId": "The ID of the document version.
", "DocumentVersionMetadata$Id": "The ID of the version.
", "GetDocumentVersionRequest$VersionId": "The version ID of the document.
", @@ -569,7 +580,7 @@ "EntityIdList": { "base": null, "refs": { - "EntityNotExistsException$EntityIds": null + "EntityNotExistsException$EntityIds": "The IDs of the non-existent resources.
" } }, "EntityNotExistsException": { @@ -829,7 +840,7 @@ } }, "LimitExceededException": { - "base": "The maximum of 100,000 folders under the parent folder has been exceeded.
", + "base": "The maximum of 100,000 files and folders under the parent folder has been exceeded.
", "refs": { } }, @@ -859,8 +870,6 @@ "MarkerType": { "base": null, "refs": { - "DescribeActivitiesRequest$Marker": "The marker for the next set of results.
", - "DescribeActivitiesResponse$Marker": "The marker for the next set of results.
", "DescribeCommentsRequest$Marker": "The marker for the next set of results. This marker was received from a previous call.
", "DescribeCommentsResponse$Marker": "The marker for the next set of results. This marker was received from a previous call.
", "DescribeGroupsRequest$Marker": "The marker for the next set of results. (You received this marker from a previous call.)
", @@ -1013,6 +1022,7 @@ "DeleteCommentRequest$DocumentId": "The ID of the document.
", "DeleteCustomMetadataRequest$ResourceId": "The ID of the resource, either a document or folder.
", "DeleteDocumentRequest$DocumentId": "The ID of the document.
", + "DeleteDocumentVersionRequest$DocumentId": "The ID of a document.
", "DeleteFolderContentsRequest$FolderId": "The ID of the folder.
", "DeleteFolderRequest$FolderId": "The ID of the folder.
", "DeleteLabelsRequest$ResourceId": "The ID of the resource.
", @@ -1033,6 +1043,7 @@ "RemoveResourcePermissionRequest$ResourceId": "The ID of the resource.
", "ResourceMetadata$Id": "The ID of the resource.
", "ResourceMetadata$ParentId": "The parent ID of the resource before a rename operation.
", + "RestoreDocumentVersionsRequest$DocumentId": "The ID of the document.
", "ShareResult$ShareId": "The ID of the resource that was shared.
", "UpdateDocumentRequest$DocumentId": "The ID of the document.
", "UpdateDocumentRequest$ParentFolderId": "The ID of the parent folder.
", @@ -1104,6 +1115,11 @@ "ResourceMetadata$Type": "The type of resource.
" } }, + "RestoreDocumentVersionsRequest": { + "base": null, + "refs": { + } + }, "RolePermissionType": { "base": null, "refs": { @@ -1118,11 +1134,18 @@ "ShareResult$Role": "The role.
" } }, + "SearchMarkerType": { + "base": null, + "refs": { + "DescribeActivitiesRequest$Marker": "The marker for the next set of results.
", + "DescribeActivitiesResponse$Marker": "The marker for the next set of results.
" + } + }, "SearchQueryType": { "base": null, "refs": { "DescribeGroupsRequest$SearchQuery": "A query to describe groups by group name.
", - "DescribeUsersRequest$Query": "A query to filter users by user name.
" + "DescribeUsersRequest$Query": "A query to filter users by user name. Remember the following about the Userids
and Query
parameters:
If you don't use either parameter, the API returns a paginated list of all users on the site.
If you use both parameters, the API ignores the Query
parameter.
The Userid
parameter only returns user names that match a corresponding user ID.
The Query
parameter runs a \"prefix\" search for users by the GivenName
, SurName
, or UserName
fields included in a CreateUser API call. For example, querying on Ma
returns Márcia Oliveira, María García, and Mateo Jackson. If you use multiple characters, the API only returns data that matches all characters. For example, querying on Ma J
only returns Mateo Jackson.
Information about a connection between two services.
", + "base": "Information about a connection between two services. An edge can be a synchronous connection, such as typical call between client and service, or an asynchronous link, such as a Lambda function which retrieves an event from an SNS queue.
", "refs": { "EdgeList$member": null } @@ -592,7 +592,8 @@ "Histogram": { "base": null, "refs": { - "Edge$ResponseTimeHistogram": "A histogram that maps the spread of client response times on an edge.
", + "Edge$ResponseTimeHistogram": "A histogram that maps the spread of client response times on an edge. Only populated for synchronous edges.
", + "Edge$ReceivedEventAgeHistogram": "A histogram that maps the spread of event age when received by consumers. Age is calculated each time an event is received. Only populated when EdgeType is link
.
A histogram that maps the spread of service durations.
", "Service$ResponseTimeHistogram": "A histogram that maps the spread of service response times.
", "TimeSeriesServiceStatistics$ResponseTimeHistogram": "The response time histogram for the selected entities.
" @@ -780,7 +781,7 @@ "ResponseTimeRootCauseEntity$Remote": "A flag that denotes a remote subsegment.
", "ResponseTimeRootCauseService$Inferred": "A Boolean value indicating if the service is inferred from the trace.
", "Service$Root": "Indicates that the service was the first service to process a request.
", - "Trace$LimitExceeded": "LimitExceeded is set to true when the trace has exceeded one of the defined quotas. For more information about quotas, see Amazon Web Services X-Ray endpoints and quotas.
", + "Trace$LimitExceeded": "LimitExceeded is set to true when the trace has exceeded the Trace document size
limit. For more information about this limit and other X-Ray limits and quotas, see Amazon Web Services X-Ray endpoints and quotas.
The root segment document has a 500 series error.
", "TraceSummary$HasError": "The root segment document has a 400 series error.
", "TraceSummary$HasThrottle": "One or more of the segment documents has a 429 throttling error.
", @@ -1167,6 +1168,7 @@ "BatchGetTracesResult$NextToken": "Pagination token.
", "DeleteSamplingRuleRequest$RuleName": "The name of the sampling rule. Specify a rule by either name or ARN, but not both.
", "DeleteSamplingRuleRequest$RuleARN": "The ARN of the sampling rule. Specify a rule by either name or ARN, but not both.
", + "Edge$EdgeType": "Describes an asynchronous connection, with a value of link
.
The ID of the KMS key used for encryption, if applicable.
", "ErrorRootCauseEntity$Name": "The name of the entity.
", "ErrorRootCauseService$Name": "The service name.
", diff --git a/models/apis/xray/2016-04-12/endpoint-rule-set-1.json b/models/apis/xray/2016-04-12/endpoint-rule-set-1.json new file mode 100644 index 00000000000..c006b77dc5d --- /dev/null +++ b/models/apis/xray/2016-04-12/endpoint-rule-set-1.json @@ -0,0 +1,315 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "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" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "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://xray-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://xray-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://xray.{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://xray.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/xray/2016-04-12/endpoint-tests-1.json b/models/apis/xray/2016-04-12/endpoint-tests-1.json new file mode 100644 index 00000000000..293b4f43bde --- /dev/null +++ b/models/apis/xray/2016-04-12/endpoint-tests-1.json @@ -0,0 +1,1603 @@ +{ + "testCases": [ + { + "documentation": "For region ap-south-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-south-2.api.aws" + } + }, + "params": { + "Region": "ap-south-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-south-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-south-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-south-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-south-2.api.aws" + } + }, + "params": { + "Region": "ap-south-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-south-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-south-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-south-1.api.aws" + } + }, + "params": { + "Region": "ap-south-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-south-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-south-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-south-1.api.aws" + } + }, + "params": { + "Region": "ap-south-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-south-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-south-1.api.aws" + } + }, + "params": { + "Region": "eu-south-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-south-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-south-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-south-1.api.aws" + } + }, + "params": { + "Region": "eu-south-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-south-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-south-2.api.aws" + } + }, + "params": { + "Region": "eu-south-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-south-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-south-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-south-2.api.aws" + } + }, + "params": { + "Region": "eu-south-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-south-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-south-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region me-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.me-central-1.api.aws" + } + }, + "params": { + "Region": "me-central-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region me-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.me-central-1.amazonaws.com" + } + }, + "params": { + "Region": "me-central-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region me-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.me-central-1.api.aws" + } + }, + "params": { + "Region": "me-central-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region me-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.me-central-1.amazonaws.com" + } + }, + "params": { + "Region": "me-central-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ca-central-1.api.aws" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ca-central-1.amazonaws.com" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ca-central-1.api.aws" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ca-central-1.amazonaws.com" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-central-1.api.aws" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-central-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-central-1.api.aws" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-central-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-central-2.api.aws" + } + }, + "params": { + "Region": "eu-central-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-central-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-central-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-central-2.api.aws" + } + }, + "params": { + "Region": "eu-central-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-central-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-central-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-west-1.api.aws" + } + }, + "params": { + "Region": "us-west-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-west-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.us-west-1.api.aws" + } + }, + "params": { + "Region": "us-west-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.us-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-west-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-west-2.api.aws" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-west-2.amazonaws.com" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.us-west-2.api.aws" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.us-west-2.amazonaws.com" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.af-south-1.api.aws" + } + }, + "params": { + "Region": "af-south-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.af-south-1.amazonaws.com" + } + }, + "params": { + "Region": "af-south-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.af-south-1.api.aws" + } + }, + "params": { + "Region": "af-south-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.af-south-1.amazonaws.com" + } + }, + "params": { + "Region": "af-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-north-1.api.aws" + } + }, + "params": { + "Region": "eu-north-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-north-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-north-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-north-1.api.aws" + } + }, + "params": { + "Region": "eu-north-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-north-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-north-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-west-3.api.aws" + } + }, + "params": { + "Region": "eu-west-3", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-west-3.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-3", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-west-3.api.aws" + } + }, + "params": { + "Region": "eu-west-3", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-west-3.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-3", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-west-2.api.aws" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-west-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-west-2.api.aws" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-west-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-west-1.api.aws" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.eu-west-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-west-1.api.aws" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.eu-west-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-northeast-3.api.aws" + } + }, + "params": { + "Region": "ap-northeast-3", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-northeast-3.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-3", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-northeast-3.api.aws" + } + }, + "params": { + "Region": "ap-northeast-3", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-northeast-3.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-3", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-northeast-2.api.aws" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-northeast-2.api.aws" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-northeast-1.api.aws" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-northeast-1.api.aws" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.me-south-1.api.aws" + } + }, + "params": { + "Region": "me-south-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.me-south-1.amazonaws.com" + } + }, + "params": { + "Region": "me-south-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.me-south-1.api.aws" + } + }, + "params": { + "Region": "me-south-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.me-south-1.amazonaws.com" + } + }, + "params": { + "Region": "me-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.sa-east-1.api.aws" + } + }, + "params": { + "Region": "sa-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.sa-east-1.amazonaws.com" + } + }, + "params": { + "Region": "sa-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.sa-east-1.api.aws" + } + }, + "params": { + "Region": "sa-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.sa-east-1.amazonaws.com" + } + }, + "params": { + "Region": "sa-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-east-1.api.aws" + } + }, + "params": { + "Region": "ap-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-east-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-east-1.api.aws" + } + }, + "params": { + "Region": "ap-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-east-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-gov-west-1.api.aws" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.us-gov-west-1.api.aws" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-southeast-1.api.aws" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-southeast-1.api.aws" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-southeast-2.api.aws" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-southeast-2.api.aws" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-southeast-3.api.aws" + } + }, + "params": { + "Region": "ap-southeast-3", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.ap-southeast-3.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-3", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-southeast-3.api.aws" + } + }, + "params": { + "Region": "ap-southeast-3", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.ap-southeast-3.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-3", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.us-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-east-2.api.aws" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.us-east-2.amazonaws.com" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.us-east-2.api.aws" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.us-east-2.amazonaws.com" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.cn-northwest-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-northwest-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray-fips.cn-northwest-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-northwest-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://xray.cn-northwest-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-northwest-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://xray.cn-northwest-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-northwest-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "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": { + "Region": "us-east-1", + "UseFIPS": true, + "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": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true, + "Endpoint": "https://example.com" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/service/customerprofiles/api.go b/service/customerprofiles/api.go index bdd5970a3bf..f57d24a0cdd 100644 --- a/service/customerprofiles/api.go +++ b/service/customerprofiles/api.go @@ -3191,8 +3191,13 @@ func (c *CustomerProfiles) SearchProfilesRequest(input *SearchProfilesInput) (re // SearchProfiles API operation for Amazon Connect Customer Profiles. // -// Searches for profiles within a specific domain name using name, phone number, -// email address, account number, or a custom defined index. +// Searches for profiles within a specific domain using one or more predefined +// search keys (e.g., _fullName, _phone, _email, _account, etc.) and/or custom-defined +// search keys. A search key is a data type pair that consists of a KeyName +// and Values list. +// +// This operation supports searching for profiles with a minimum of 1 key-value(s) +// pair and up to 5 key-value(s) pairs using either AND or OR logic. // // 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 @@ -3834,6 +3839,74 @@ func (s *AddProfileKeyOutput) SetValues(v []*string) *AddProfileKeyOutput { return s } +// A data type pair that consists of a KeyName and Values list that is used +// in conjunction with the KeyName (https://docs.aws.amazon.com/customerprofiles/latest/APIReference/API_SearchProfiles.html#customerprofiles-SearchProfiles-request-KeyName) +// and Values (https://docs.aws.amazon.com/customerprofiles/latest/APIReference/API_SearchProfiles.html#customerprofiles-SearchProfiles-request-Values) +// parameters to search for profiles using the SearchProfiles (https://docs.aws.amazon.com/customerprofiles/latest/APIReference/API_SearchProfiles.html) +// API. +type AdditionalSearchKey struct { + _ struct{} `type:"structure"` + + // A searchable identifier of a customer profile. + // + // KeyName is a required field + KeyName *string `min:"1" type:"string" required:"true"` + + // A list of key values. + // + // Values is a required field + Values []*string `type:"list" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s AdditionalSearchKey) 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 AdditionalSearchKey) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *AdditionalSearchKey) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "AdditionalSearchKey"} + if s.KeyName == nil { + invalidParams.Add(request.NewErrParamRequired("KeyName")) + } + if s.KeyName != nil && len(*s.KeyName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("KeyName", 1)) + } + if s.Values == nil { + invalidParams.Add(request.NewErrParamRequired("Values")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetKeyName sets the KeyName field's value. +func (s *AdditionalSearchKey) SetKeyName(v string) *AdditionalSearchKey { + s.KeyName = &v + return s +} + +// SetValues sets the Values field's value. +func (s *AdditionalSearchKey) SetValues(v []*string) *AdditionalSearchKey { + s.Values = v + return s +} + // A generic address associated with the customer that is not mailing, shipping, // or billing. type Address struct { @@ -6648,6 +6721,49 @@ func (s *FlowDefinition) SetTriggerConfig(v *TriggerConfig) *FlowDefinition { return s } +// A data type pair that consists of a KeyName and Values list that were used +// to find a profile returned in response to a SearchProfiles (https://docs.aws.amazon.com/customerprofiles/latest/APIReference/API_SearchProfiles.html) +// request. +type FoundByKeyValue struct { + _ struct{} `type:"structure"` + + // A searchable identifier of a customer profile. + KeyName *string `min:"1" type:"string"` + + // A list of key values. + Values []*string `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 FoundByKeyValue) 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 FoundByKeyValue) GoString() string { + return s.String() +} + +// SetKeyName sets the KeyName field's value. +func (s *FoundByKeyValue) SetKeyName(v string) *FoundByKeyValue { + s.KeyName = &v + return s +} + +// SetValues sets the Values field's value. +func (s *FoundByKeyValue) SetValues(v []*string) *FoundByKeyValue { + s.Values = v + return s +} + type GetAutoMergingPreviewInput struct { _ struct{} `type:"structure"` @@ -10634,6 +10750,29 @@ type Profile struct { // The customer’s first name. FirstName *string `min:"1" type:"string"` + // A list of items used to find a profile returned in a SearchProfiles (https://docs.aws.amazon.com/customerprofiles/latest/APIReference/API_SearchProfiles.html) + // response. An item is a key-value(s) pair that matches an attribute in the + // profile. + // + // If the optional AdditionalSearchKeys parameter was included in the SearchProfiles + // (https://docs.aws.amazon.com/customerprofiles/latest/APIReference/API_SearchProfiles.html) + // request, the FoundByItems list should be interpreted based on the LogicalOperator + // used in the request: + // + // * AND - The profile included in the response matched all of the search + // keys specified in the request. The FoundByItems will include all of the + // key-value(s) pairs that were specified in the request (as this is a requirement + // of AND search logic). + // + // * OR - The profile included in the response matched at least one of the + // search keys specified in the request. The FoundByItems will include each + // of the key-value(s) pairs that the profile was found by. + // + // The OR relationship is the default behavior if the LogicalOperator parameter + // is not included in the SearchProfiles (https://docs.aws.amazon.com/customerprofiles/latest/APIReference/API_SearchProfiles.html) + // request. + FoundByItems []*FoundByKeyValue `min:"1" type:"list"` + // The gender with which the customer identifies. Gender *string `type:"string" enum:"Gender"` @@ -10753,6 +10892,12 @@ func (s *Profile) SetFirstName(v string) *Profile { return s } +// SetFoundByItems sets the FoundByItems field's value. +func (s *Profile) SetFoundByItems(v []*FoundByKeyValue) *Profile { + s.FoundByItems = v + return s +} + // SetGender sets the Gender field's value. func (s *Profile) SetGender(v string) *Profile { s.Gender = &v @@ -11900,6 +12045,14 @@ func (s *ScheduledTriggerProperties) SetTimezone(v string) *ScheduledTriggerProp type SearchProfilesInput struct { _ struct{} `type:"structure"` + // A list of AdditionalSearchKey objects that are each searchable identifiers + // of a profile. Each AdditionalSearchKey object contains a KeyName and a list + // of Values associated with that specific key (i.e., a key-value(s) pair). + // These additional search keys will be used in conjunction with the LogicalOperator + // and the required KeyName and Values parameters to search for profiles that + // satisfy the search criteria. + AdditionalSearchKeys []*AdditionalSearchKey `min:"1" type:"list"` + // The unique name of the domain. // // DomainName is a required field @@ -11915,7 +12068,26 @@ type SearchProfilesInput struct { // KeyName is a required field KeyName *string `min:"1" type:"string" required:"true"` + // Relationship between all specified search keys that will be used to search + // for profiles. This includes the required KeyName and Values parameters as + // well as any key-value(s) pairs specified in the AdditionalSearchKeys list. + // + // This parameter influences which profiles will be returned in the response + // in the following manner: + // + // * AND - The response only includes profiles that match all of the search + // keys. + // + // * OR - The response includes profiles that match at least one of the search + // keys. + // + // The OR relationship is the default behavior if this parameter is not included + // in the request. + LogicalOperator *string `type:"string" enum:"LogicalOperator"` + // The maximum number of objects returned per page. + // + // The default is 20 if this parameter is not included in the request. MaxResults *int64 `location:"querystring" locationName:"max-results" min:"1" type:"integer"` // The pagination token from the previous SearchProfiles API call. @@ -11948,6 +12120,9 @@ func (s SearchProfilesInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *SearchProfilesInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "SearchProfilesInput"} + if s.AdditionalSearchKeys != nil && len(s.AdditionalSearchKeys) < 1 { + invalidParams.Add(request.NewErrParamMinLen("AdditionalSearchKeys", 1)) + } if s.DomainName == nil { invalidParams.Add(request.NewErrParamRequired("DomainName")) } @@ -11969,6 +12144,16 @@ func (s *SearchProfilesInput) Validate() error { if s.Values == nil { invalidParams.Add(request.NewErrParamRequired("Values")) } + if s.AdditionalSearchKeys != nil { + for i, v := range s.AdditionalSearchKeys { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "AdditionalSearchKeys", i), err.(request.ErrInvalidParams)) + } + } + } if invalidParams.Len() > 0 { return invalidParams @@ -11976,6 +12161,12 @@ func (s *SearchProfilesInput) Validate() error { return nil } +// SetAdditionalSearchKeys sets the AdditionalSearchKeys field's value. +func (s *SearchProfilesInput) SetAdditionalSearchKeys(v []*AdditionalSearchKey) *SearchProfilesInput { + s.AdditionalSearchKeys = v + return s +} + // SetDomainName sets the DomainName field's value. func (s *SearchProfilesInput) SetDomainName(v string) *SearchProfilesInput { s.DomainName = &v @@ -11988,6 +12179,12 @@ func (s *SearchProfilesInput) SetKeyName(v string) *SearchProfilesInput { return s } +// SetLogicalOperator sets the LogicalOperator field's value. +func (s *SearchProfilesInput) SetLogicalOperator(v string) *SearchProfilesInput { + s.LogicalOperator = &v + return s +} + // SetMaxResults sets the MaxResults field's value. func (s *SearchProfilesInput) SetMaxResults(v int64) *SearchProfilesInput { s.MaxResults = &v @@ -12009,7 +12206,7 @@ func (s *SearchProfilesInput) SetValues(v []*string) *SearchProfilesInput { type SearchProfilesOutput struct { _ struct{} `type:"structure"` - // The list of SearchProfiles instances. + // The list of Profiles matching the search criteria. Items []*Profile `type:"list"` // The pagination token from the previous SearchProfiles API call. @@ -13657,6 +13854,22 @@ func JobScheduleDayOfTheWeek_Values() []string { } } +const ( + // LogicalOperatorAnd is a LogicalOperator enum value + LogicalOperatorAnd = "AND" + + // LogicalOperatorOr is a LogicalOperator enum value + LogicalOperatorOr = "OR" +) + +// LogicalOperator_Values returns all elements of the LogicalOperator enum +func LogicalOperator_Values() []string { + return []string{ + LogicalOperatorAnd, + LogicalOperatorOr, + } +} + const ( // MarketoConnectorOperatorProjection is a MarketoConnectorOperator enum value MarketoConnectorOperatorProjection = "PROJECTION" diff --git a/service/customerprofiles/doc.go b/service/customerprofiles/doc.go index 19ed991fe43..c96623a6beb 100644 --- a/service/customerprofiles/doc.go +++ b/service/customerprofiles/doc.go @@ -3,18 +3,13 @@ // Package customerprofiles provides the client and types for making API // requests to Amazon Connect Customer Profiles. // -// Welcome to the Amazon Connect Customer Profiles API Reference. This guide -// provides information about the Amazon Connect Customer Profiles API, including -// supported operations, data types, parameters, and schemas. -// // Amazon Connect Customer Profiles is a unified customer profile for your contact // center that has pre-built connectors powered by AppFlow that make it easy // to combine customer information from third party applications, such as Salesforce // (CRM), ServiceNow (ITSM), and your enterprise resource planning (ERP), with -// contact history from your Amazon Connect contact center. -// -// If you're new to Amazon Connect , you might find it helpful to also review -// the Amazon Connect Administrator Guide (https://docs.aws.amazon.com/connect/latest/adminguide/what-is-amazon-connect.html). +// contact history from your Amazon Connect contact center. If you're new to +// Amazon Connect, you might find it helpful to review the Amazon Connect Administrator +// Guide (https://docs.aws.amazon.com/connect/latest/adminguide/). // // See https://docs.aws.amazon.com/goto/WebAPI/customer-profiles-2020-08-15 for more information on this service. // diff --git a/service/lakeformation/api.go b/service/lakeformation/api.go index 971f1699de8..5833fc315dc 100644 --- a/service/lakeformation/api.go +++ b/service/lakeformation/api.go @@ -6551,8 +6551,7 @@ type DataLakeSettings struct { AuthorizedSessionTagValueList []*string `type:"list"` // Specifies whether access control on newly created database is managed by - // Lake Formation permissions or exclusively by IAM permissions. You can override - // this default setting when you create a database. + // Lake Formation permissions or exclusively by IAM permissions. // // A null value indicates access control by Lake Formation permissions. A value // that assigns ALL to IAM_ALLOWED_PRINCIPALS indicates access control by IAM @@ -6591,6 +6590,11 @@ type DataLakeSettings struct { // clusters that are to perform data filtering.> ExternalDataFilteringAllowList []*DataLakePrincipal `type:"list"` + // A key-value map that provides an additional configuration on your data lake. + // CrossAccountVersion is the key you can configure in the Parameters field. + // Accepted values for the CrossAccountVersion key are 1, 2, and 3. + Parameters map[string]*string `type:"map"` + // A list of the resource-owning account IDs that the caller's account can use // to share their user access details (user ARNs). The user ARNs can be logged // in the resource owner's CloudTrail log. @@ -6704,6 +6708,12 @@ func (s *DataLakeSettings) SetExternalDataFilteringAllowList(v []*DataLakePrinci return s } +// SetParameters sets the Parameters field's value. +func (s *DataLakeSettings) SetParameters(v map[string]*string) *DataLakeSettings { + s.Parameters = v + return s +} + // SetTrustedResourceOwners sets the TrustedResourceOwners field's value. func (s *DataLakeSettings) SetTrustedResourceOwners(v []*string) *DataLakeSettings { s.TrustedResourceOwners = v @@ -11320,7 +11330,7 @@ type RegisterResourceInput struct { // registering this role with the Data Catalog. A service-linked role is a unique // type of IAM role that is linked directly to Lake Formation. // - // For more information, see Using Service-Linked Roles for Lake Formation (https://docs-aws.amazon.com/lake-formation/latest/dg/service-linked-roles.html). + // For more information, see Using Service-Linked Roles for Lake Formation (https://docs.aws.amazon.com/lake-formation/latest/dg/service-linked-roles.html). UseServiceLinkedRole *bool `type:"boolean"` } diff --git a/service/managedblockchain/api.go b/service/managedblockchain/api.go index b74678f35c9..a4b79ca9988 100644 --- a/service/managedblockchain/api.go +++ b/service/managedblockchain/api.go @@ -611,7 +611,7 @@ func (c *ManagedBlockchain) DeleteAccessorRequest(input *DeleteAccessorInput) (r // to your Ethereum nodes including, the BILLING_TOKEN. After an accessor is // deleted, the status of the accessor changes from AVAILABLE to PENDING_DELETION. // An accessor in the PENDING_DELETION state can’t be used for new WebSocket -// requests or HTTP requests. However, WebSocket connections that are initiated +// requests or HTTP requests. However, WebSocket connections that were initiated // while the accessor was in the AVAILABLE state remain open until they expire // (up to 2 hours). // @@ -3955,6 +3955,8 @@ type CreateNodeInput struct { // // * n-ethereum-mainnet // + // * n-ethereum-goerli + // // * n-ethereum-rinkeby // // * n-ethereum-ropsten @@ -4427,6 +4429,8 @@ type DeleteNodeInput struct { // // * n-ethereum-mainnet // + // * n-ethereum-goerli + // // * n-ethereum-rinkeby // // * n-ethereum-ropsten @@ -7140,6 +7144,8 @@ type NetworkEthereumAttributes struct { // // * mainnet = 1 // + // * goerli = 5 + // // * rinkeby = 4 // // * ropsten = 3 @@ -7731,9 +7737,9 @@ type NodeEthereumAttributes struct { HttpEndpoint *string `type:"string"` // The endpoint on which the Ethereum node listens to run Ethereum JSON-RPC - // methods over WebSockets connections from a client. Use this endpoint in client - // code for smart contracts when using a WebSockets connection. Connections - // to this endpoint are authenticated using Signature Version 4 (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). + // methods over WebSocket connections from a client. Use this endpoint in client + // code for smart contracts when using a WebSocket connection. Connections to + // this endpoint are authenticated using Signature Version 4 (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). WebSocketEndpoint *string `type:"string"` } diff --git a/service/proton/api.go b/service/proton/api.go index 973436cbf1e..c217b96df1b 100644 --- a/service/proton/api.go +++ b/service/proton/api.go @@ -695,13 +695,18 @@ func (c *Proton) CreateEnvironmentRequest(input *CreateEnvironmentInput) (req *r // // You can provision environments using the following methods: // -// - Amazon Web Services-managed provisioning: Proton makes direct calls +// - Amazon Web Services-managed provisioning – Proton makes direct calls // to provision your resources. // -// - Self-managed provisioning: Proton makes pull requests on your repository +// - Self-managed provisioning – Proton makes pull requests on your repository // to provide compiled infrastructure as code (IaC) files that your IaC engine // uses to provision resources. // +// - CodeBuild-based provisioning – Proton uses CodeBuild to run shell +// commands that you provide. Your commands can read inputs that Proton provides, +// and are responsible for provisioning or deprovisioning infrastructure +// and generating output values. +// // For more information, see Environments (https://docs.aws.amazon.com/proton/latest/userguide/ag-environments.html) // and Provisioning methods (https://docs.aws.amazon.com/proton/latest/userguide/ag-works-prov-methods.html) // in the Proton User Guide. @@ -6909,11 +6914,11 @@ func (c *Proton) NotifyResourceDeploymentStatusChangeRequest(input *NotifyResour // NotifyResourceDeploymentStatusChange API operation for AWS Proton. // -// Notify Proton of status changes to a provisioned resource when you use self-managed -// provisioning. +// Notify Proton of the following information related to a provisioned resource +// (environment, service instance, or service pipeline): // -// For more information, see Self-managed provisioning (https://docs.aws.amazon.com/proton/latest/userguide/ag-works-prov-methods.html#ag-works-prov-methods-self) -// in the Proton User Guide. +// - For CodeBuild-based provisioning (https://docs.aws.amazon.com/proton/latest/userguide/ag-works-prov-methods.html#ag-works-prov-methods-codebuild), +// provide your provisioned resource output values to Proton. // // 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 @@ -7521,8 +7526,8 @@ func (c *Proton) UpdateEnvironmentRequest(input *UpdateEnvironmentInput) (req *r // Update an environment. // // If the environment is associated with an environment account connection, -// don't update or include the protonServiceRoleArn and provisioningRepository -// parameter to update or connect to an environment account connection. +// don't update or include the protonServiceRoleArn, codebuildRoleArn, and provisioningRepository +// parameters. // // You can only update to a new environment account connection if that connection // was created in the same environment account that the current environment @@ -7534,15 +7539,15 @@ func (c *Proton) UpdateEnvironmentRequest(input *UpdateEnvironmentInput) (req *r // can't update or connect the environment to an environment account connection // if it isn't already associated with an environment connection. // -// You can update either the environmentAccountConnectionId or protonServiceRoleArn -// parameter and value. You can’t update both. +// You can update either environmentAccountConnectionId or one or more of protonServiceRoleArn, +// codebuildRoleArn, and provisioningRepository. // -// If the environment was configured for Amazon Web Services-managed provisioning, -// omit the provisioningRepository parameter. +// If the environment was configured for Amazon Web Services-managed or CodeBuild-based +// provisioning, omit the provisioningRepository parameter. // // If the environment was configured for self-managed provisioning, specify -// the provisioningRepository parameter and omit the protonServiceRoleArn and -// environmentAccountConnectionId parameters. +// the provisioningRepository parameter and omit the protonServiceRoleArn, codebuildRoleArn, +// and provisioningRepository parameters. // // For more information, see Environments (https://docs.aws.amazon.com/proton/latest/userguide/ag-environments.html) // and Provisioning methods (https://docs.aws.amazon.com/proton/latest/userguide/ag-works-prov-methods.html) @@ -8693,15 +8698,18 @@ func (s *AccessDeniedException) RequestID() string { type AccountSettings struct { _ struct{} `type:"structure"` + // The Amazon Resource Name (ARN) of the service role that Proton uses for provisioning + // pipelines. Proton assumes this role for CodeBuild-based provisioning. + PipelineCodebuildRoleArn *string `locationName:"pipelineCodebuildRoleArn" type:"string"` + // The linked repository for pipeline provisioning. Required if you have environments // configured for self-managed provisioning with services that include pipelines. // A linked repository is a repository that has been registered with Proton. // For more information, see CreateRepository. PipelineProvisioningRepository *RepositoryBranch `locationName:"pipelineProvisioningRepository" type:"structure"` - // The Amazon Resource Name (ARN) of the service role you want to use for provisioning - // pipelines. Assumed by Proton for Amazon Web Services-managed provisioning, - // and by customer-owned automation for self-managed provisioning. + // The Amazon Resource Name (ARN) of the service role that Proton uses for provisioning + // pipelines. Proton assumes this role for Amazon Web Services-managed provisioning. PipelineServiceRoleArn *string `locationName:"pipelineServiceRoleArn" type:"string"` } @@ -8723,6 +8731,12 @@ func (s AccountSettings) GoString() string { return s.String() } +// SetPipelineCodebuildRoleArn sets the PipelineCodebuildRoleArn field's value. +func (s *AccountSettings) SetPipelineCodebuildRoleArn(v string) *AccountSettings { + s.PipelineCodebuildRoleArn = &v + return s +} + // SetPipelineProvisioningRepository sets the PipelineProvisioningRepository field's value. func (s *AccountSettings) SetPipelineProvisioningRepository(v *RepositoryBranch) *AccountSettings { s.PipelineProvisioningRepository = v @@ -9805,10 +9819,15 @@ type CreateEnvironmentAccountConnectionInput struct { // created. ClientToken *string `locationName:"clientToken" type:"string" idempotencyToken:"true"` - // The Amazon Resource Name (ARN) of the IAM service role that Proton uses when - // provisioning directly defined components in the associated environment account. - // It determines the scope of infrastructure that a component can provision - // in the account. + // The Amazon Resource Name (ARN) of an IAM service role in the environment + // account. Proton uses this role to provision infrastructure resources using + // CodeBuild-based provisioning in the associated environment account. + CodebuildRoleArn *string `locationName:"codebuildRoleArn" min:"1" type:"string"` + + // The Amazon Resource Name (ARN) of an IAM service role in the environment + // account. Proton uses this role to provision directly defined components in + // the associated environment account. It determines the scope of infrastructure + // that a component can provision in the account. // // You must specify componentRoleArn to allow directly defined components to // be associated with any environments running in this account. @@ -9832,9 +9851,10 @@ type CreateEnvironmentAccountConnectionInput struct { // ManagementAccountId is a required field ManagementAccountId *string `locationName:"managementAccountId" type:"string" required:"true"` - // The Amazon Resource Name (ARN) of the IAM service role that's created in - // the environment account. Proton uses this role to provision infrastructure - // resources in the associated environment account. + // The Amazon Resource Name (ARN) of an IAM service role in the environment + // account. Proton uses this role to provision infrastructure resources using + // Amazon Web Services-managed provisioning and CloudFormation in the associated + // environment account. // // RoleArn is a required field RoleArn *string `locationName:"roleArn" min:"1" type:"string" required:"true"` @@ -9868,6 +9888,9 @@ func (s CreateEnvironmentAccountConnectionInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *CreateEnvironmentAccountConnectionInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "CreateEnvironmentAccountConnectionInput"} + if s.CodebuildRoleArn != nil && len(*s.CodebuildRoleArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("CodebuildRoleArn", 1)) + } if s.ComponentRoleArn != nil && len(*s.ComponentRoleArn) < 1 { invalidParams.Add(request.NewErrParamMinLen("ComponentRoleArn", 1)) } @@ -9909,6 +9932,12 @@ func (s *CreateEnvironmentAccountConnectionInput) SetClientToken(v string) *Crea return s } +// SetCodebuildRoleArn sets the CodebuildRoleArn field's value. +func (s *CreateEnvironmentAccountConnectionInput) SetCodebuildRoleArn(v string) *CreateEnvironmentAccountConnectionInput { + s.CodebuildRoleArn = &v + return s +} + // SetComponentRoleArn sets the ComponentRoleArn field's value. func (s *CreateEnvironmentAccountConnectionInput) SetComponentRoleArn(v string) *CreateEnvironmentAccountConnectionInput { s.ComponentRoleArn = &v @@ -9975,6 +10004,14 @@ func (s *CreateEnvironmentAccountConnectionOutput) SetEnvironmentAccountConnecti type CreateEnvironmentInput struct { _ struct{} `type:"structure"` + // The Amazon Resource Name (ARN) of the IAM service role that allows Proton + // to provision infrastructure using CodeBuild-based provisioning on your behalf. + // + // To use CodeBuild-based provisioning for the environment or for any service + // instance running in the environment, specify either the environmentAccountConnectionId + // or codebuildRoleArn parameter. + CodebuildRoleArn *string `locationName:"codebuildRoleArn" min:"1" type:"string"` + // The Amazon Resource Name (ARN) of the IAM service role that Proton uses when // provisioning directly defined components in this environment. It determines // the scope of infrastructure that a component can provision. @@ -9993,14 +10030,14 @@ type CreateEnvironmentInput struct { // String and GoString methods. Description *string `locationName:"description" type:"string" sensitive:"true"` - // The ID of the environment account connection that you provide if you're provisioning - // your environment infrastructure resources to an environment account. For + // The ID of the environment account connection that you provide if you want + // Proton to provision infrastructure resources for your environment or for + // any of the service instances running in it in an environment account. For // more information, see Environment account connections (https://docs.aws.amazon.com/proton/latest/userguide/ag-env-account-connections.html) // in the Proton User guide. // - // To use Amazon Web Services-managed provisioning for the environment, specify - // either the environmentAccountConnectionId or protonServiceRoleArn parameter - // and omit the provisioningRepository parameter. + // If you specify the environmentAccountConnectionId parameter, don't specify + // protonServiceRoleArn, codebuildRoleArn, or provisioningRepository. EnvironmentAccountConnectionId *string `locationName:"environmentAccountConnectionId" type:"string"` // The name of the environment. @@ -10008,20 +10045,21 @@ type CreateEnvironmentInput struct { // Name is a required field Name *string `locationName:"name" min:"1" type:"string" required:"true"` - // The Amazon Resource Name (ARN) of the Proton service role that allows Proton - // to make calls to other services on your behalf. + // The Amazon Resource Name (ARN) of the IAM service role that allows Proton + // to provision infrastructure using Amazon Web Services-managed provisioning + // and CloudFormation on your behalf. // - // To use Amazon Web Services-managed provisioning for the environment, specify - // either the environmentAccountConnectionId or protonServiceRoleArn parameter - // and omit the provisioningRepository parameter. + // To use Amazon Web Services-managed provisioning for the environment or for + // any service instance running in the environment, specify either the environmentAccountConnectionId + // or protonServiceRoleArn parameter. ProtonServiceRoleArn *string `locationName:"protonServiceRoleArn" min:"1" type:"string"` // The linked repository that you use to host your rendered infrastructure templates // for self-managed provisioning. A linked repository is a repository that has // been registered with Proton. For more information, see CreateRepository. // - // To use self-managed provisioning for the environment, specify this parameter - // and omit the environmentAccountConnectionId and protonServiceRoleArn parameters. + // To use self-managed provisioning for the environment or for any service instance + // running in the environment, specify this parameter. ProvisioningRepository *RepositoryBranchInput_ `locationName:"provisioningRepository" type:"structure"` // A YAML formatted string that provides inputs as defined in the environment @@ -10079,6 +10117,9 @@ func (s CreateEnvironmentInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *CreateEnvironmentInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "CreateEnvironmentInput"} + if s.CodebuildRoleArn != nil && len(*s.CodebuildRoleArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("CodebuildRoleArn", 1)) + } if s.ComponentRoleArn != nil && len(*s.ComponentRoleArn) < 1 { invalidParams.Add(request.NewErrParamMinLen("ComponentRoleArn", 1)) } @@ -10134,6 +10175,12 @@ func (s *CreateEnvironmentInput) Validate() error { return nil } +// SetCodebuildRoleArn sets the CodebuildRoleArn field's value. +func (s *CreateEnvironmentInput) SetCodebuildRoleArn(v string) *CreateEnvironmentInput { + s.CodebuildRoleArn = &v + return s +} + // SetComponentRoleArn sets the ComponentRoleArn field's value. func (s *CreateEnvironmentInput) SetComponentRoleArn(v string) *CreateEnvironmentInput { s.ComponentRoleArn = &v @@ -12358,6 +12405,10 @@ type Environment struct { // Arn is a required field Arn *string `locationName:"arn" type:"string" required:"true"` + // The Amazon Resource Name (ARN) of the IAM service role that allows Proton + // to provision infrastructure using CodeBuild-based provisioning on your behalf. + CodebuildRoleArn *string `locationName:"codebuildRoleArn" min:"1" type:"string"` + // The Amazon Resource Name (ARN) of the IAM service role that Proton uses when // provisioning directly defined components in this environment. It determines // the scope of infrastructure that a component can provision. @@ -12393,8 +12444,8 @@ type Environment struct { // String and GoString methods. Description *string `locationName:"description" type:"string" sensitive:"true"` - // The ID of the environment account connection that's used to provision infrastructure - // resources in an environment account. + // The ID of the environment account connection that Proton uses to provision + // infrastructure resources in an environment account. EnvironmentAccountConnectionId *string `locationName:"environmentAccountConnectionId" type:"string"` // The ID of the environment account that the environment infrastructure resources @@ -12416,8 +12467,9 @@ type Environment struct { // Name is a required field Name *string `locationName:"name" min:"1" type:"string" required:"true"` - // The Amazon Resource Name (ARN) of the Proton service role that allows Proton - // to make calls to other services on your behalf. + // The Amazon Resource Name (ARN) of the IAM service role that allows Proton + // to provision infrastructure using Amazon Web Services-managed provisioning + // and CloudFormation on your behalf. ProtonServiceRoleArn *string `locationName:"protonServiceRoleArn" min:"1" type:"string"` // When included, indicates that the environment template is for customer provisioned @@ -12476,6 +12528,12 @@ func (s *Environment) SetArn(v string) *Environment { return s } +// SetCodebuildRoleArn sets the CodebuildRoleArn field's value. +func (s *Environment) SetCodebuildRoleArn(v string) *Environment { + s.CodebuildRoleArn = &v + return s +} + // SetComponentRoleArn sets the ComponentRoleArn field's value. func (s *Environment) SetComponentRoleArn(v string) *Environment { s.ComponentRoleArn = &v @@ -12587,6 +12645,11 @@ type EnvironmentAccountConnection struct { // Arn is a required field Arn *string `locationName:"arn" type:"string" required:"true"` + // The Amazon Resource Name (ARN) of an IAM service role in the environment + // account. Proton uses this role to provision infrastructure resources using + // CodeBuild-based provisioning in the associated environment account. + CodebuildRoleArn *string `locationName:"codebuildRoleArn" min:"1" type:"string"` + // The Amazon Resource Name (ARN) of the IAM service role that Proton uses when // provisioning directly defined components in the associated environment account. // It determines the scope of infrastructure that a component can provision @@ -12632,7 +12695,10 @@ type EnvironmentAccountConnection struct { // RequestedAt is a required field RequestedAt *time.Time `locationName:"requestedAt" type:"timestamp" required:"true"` - // The IAM service role that's associated with the environment account connection. + // The Amazon Resource Name (ARN) of an IAM service role in the environment + // account. Proton uses this role to provision infrastructure resources using + // Amazon Web Services-managed provisioning and CloudFormation in the associated + // environment account. // // RoleArn is a required field RoleArn *string `locationName:"roleArn" min:"1" type:"string" required:"true"` @@ -12667,6 +12733,12 @@ func (s *EnvironmentAccountConnection) SetArn(v string) *EnvironmentAccountConne return s } +// SetCodebuildRoleArn sets the CodebuildRoleArn field's value. +func (s *EnvironmentAccountConnection) SetCodebuildRoleArn(v string) *EnvironmentAccountConnection { + s.CodebuildRoleArn = &v + return s +} + // SetComponentRoleArn sets the ComponentRoleArn field's value. func (s *EnvironmentAccountConnection) SetComponentRoleArn(v string) *EnvironmentAccountConnection { s.ComponentRoleArn = &v @@ -17301,21 +17373,21 @@ func (s *ListTagsForResourceOutput) SetTags(v []*Tag) *ListTagsForResourceOutput type NotifyResourceDeploymentStatusChangeInput struct { _ struct{} `type:"structure"` - // The deployment ID for your provisioned resource. + // The deployment ID for your provisioned resource. Proton uses it to disambiguate + // different deployments of the resource. Applicable to self-managed provisioning + // (https://docs.aws.amazon.com/proton/latest/userguide/ag-works-prov-methods.html#ag-works-prov-methods-self). DeploymentId *string `locationName:"deploymentId" type:"string"` - // The provisioned resource state change detail data that's returned by Proton. + // The output values generated by your provisioned resource. Outputs []*Output_ `locationName:"outputs" type:"list"` - // The provisioned resource Amazon Resource Name (ARN). + // The Amazon Resource Name (ARN) of your provisioned resource. // // ResourceArn is a required field ResourceArn *string `locationName:"resourceArn" min:"1" type:"string" required:"true"` // The status of your provisioned resource. - // - // Status is a required field - Status *string `locationName:"status" type:"string" required:"true" enum:"ResourceDeploymentStatus"` + Status *string `locationName:"status" type:"string" enum:"ResourceDeploymentStatus"` // The deployment status message for your provisioned resource. // @@ -17352,9 +17424,6 @@ func (s *NotifyResourceDeploymentStatusChangeInput) Validate() error { if s.ResourceArn != nil && len(*s.ResourceArn) < 1 { invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 1)) } - if s.Status == nil { - invalidParams.Add(request.NewErrParamRequired("Status")) - } if s.Outputs != nil { for i, v := range s.Outputs { if v == nil { @@ -20272,6 +20341,10 @@ type UpdateAccountSettingsInput struct { // Don't set this field if you are updating the configured pipeline repository. DeletePipelineProvisioningRepository *bool `locationName:"deletePipelineProvisioningRepository" type:"boolean"` + // The Amazon Resource Name (ARN) of the service role you want to use for provisioning + // pipelines. Proton assumes this role for CodeBuild-based provisioning. + PipelineCodebuildRoleArn *string `locationName:"pipelineCodebuildRoleArn" type:"string"` + // A linked repository for pipeline provisioning. Specify it if you have environments // configured for self-managed provisioning with services that include pipelines. // A linked repository is a repository that has been registered with Proton. @@ -20328,6 +20401,12 @@ func (s *UpdateAccountSettingsInput) SetDeletePipelineProvisioningRepository(v b return s } +// SetPipelineCodebuildRoleArn sets the PipelineCodebuildRoleArn field's value. +func (s *UpdateAccountSettingsInput) SetPipelineCodebuildRoleArn(v string) *UpdateAccountSettingsInput { + s.PipelineCodebuildRoleArn = &v + return s +} + // SetPipelineProvisioningRepository sets the PipelineProvisioningRepository field's value. func (s *UpdateAccountSettingsInput) SetPipelineProvisioningRepository(v *RepositoryBranchInput_) *UpdateAccountSettingsInput { s.PipelineProvisioningRepository = v @@ -20560,6 +20639,11 @@ func (s *UpdateComponentOutput) SetComponent(v *Component) *UpdateComponentOutpu type UpdateEnvironmentAccountConnectionInput struct { _ struct{} `type:"structure"` + // The Amazon Resource Name (ARN) of an IAM service role in the environment + // account. Proton uses this role to provision infrastructure resources using + // CodeBuild-based provisioning in the associated environment account. + CodebuildRoleArn *string `locationName:"codebuildRoleArn" min:"1" type:"string"` + // The Amazon Resource Name (ARN) of the IAM service role that Proton uses when // provisioning directly defined components in the associated environment account. // It determines the scope of infrastructure that a component can provision @@ -20578,8 +20662,10 @@ type UpdateEnvironmentAccountConnectionInput struct { // Id is a required field Id *string `locationName:"id" type:"string" required:"true"` - // The Amazon Resource Name (ARN) of the IAM service role that's associated - // with the environment account connection to update. + // The Amazon Resource Name (ARN) of an IAM service role in the environment + // account. Proton uses this role to provision infrastructure resources using + // Amazon Web Services-managed provisioning and CloudFormation in the associated + // environment account. RoleArn *string `locationName:"roleArn" min:"1" type:"string"` } @@ -20604,6 +20690,9 @@ func (s UpdateEnvironmentAccountConnectionInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *UpdateEnvironmentAccountConnectionInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "UpdateEnvironmentAccountConnectionInput"} + if s.CodebuildRoleArn != nil && len(*s.CodebuildRoleArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("CodebuildRoleArn", 1)) + } if s.ComponentRoleArn != nil && len(*s.ComponentRoleArn) < 1 { invalidParams.Add(request.NewErrParamMinLen("ComponentRoleArn", 1)) } @@ -20620,6 +20709,12 @@ func (s *UpdateEnvironmentAccountConnectionInput) Validate() error { return nil } +// SetCodebuildRoleArn sets the CodebuildRoleArn field's value. +func (s *UpdateEnvironmentAccountConnectionInput) SetCodebuildRoleArn(v string) *UpdateEnvironmentAccountConnectionInput { + s.CodebuildRoleArn = &v + return s +} + // SetComponentRoleArn sets the ComponentRoleArn field's value. func (s *UpdateEnvironmentAccountConnectionInput) SetComponentRoleArn(v string) *UpdateEnvironmentAccountConnectionInput { s.ComponentRoleArn = &v @@ -20674,6 +20769,10 @@ func (s *UpdateEnvironmentAccountConnectionOutput) SetEnvironmentAccountConnecti type UpdateEnvironmentInput struct { _ struct{} `type:"structure"` + // The Amazon Resource Name (ARN) of the IAM service role that allows Proton + // to provision infrastructure using CodeBuild-based provisioning on your behalf. + CodebuildRoleArn *string `locationName:"codebuildRoleArn" min:"1" type:"string"` + // The Amazon Resource Name (ARN) of the IAM service role that Proton uses when // provisioning directly defined components in this environment. It determines // the scope of infrastructure that a component can provision. @@ -20723,7 +20822,11 @@ type UpdateEnvironmentInput struct { // String and GoString methods. Description *string `locationName:"description" type:"string" sensitive:"true"` - // The ID of the environment account connection. + // The ID of the environment account connection that you provide if you want + // Proton to provision infrastructure resources for your environment or for + // any of the service instances running in it in an environment account. For + // more information, see Environment account connections (https://docs.aws.amazon.com/proton/latest/userguide/ag-env-account-connections.html) + // in the Proton User guide. // // You can only update to a new environment account connection if it was created // in the same environment account that the current environment account connection @@ -20735,8 +20838,9 @@ type UpdateEnvironmentInput struct { // Name is a required field Name *string `locationName:"name" min:"1" type:"string" required:"true"` - // The Amazon Resource Name (ARN) of the Proton service role that allows Proton - // to make API calls to other services your behalf. + // The Amazon Resource Name (ARN) of the IAM service role that allows Proton + // to provision infrastructure using Amazon Web Services-managed provisioning + // and CloudFormation on your behalf. ProtonServiceRoleArn *string `locationName:"protonServiceRoleArn" min:"1" type:"string"` // The linked repository that you use to host your rendered infrastructure templates @@ -20779,6 +20883,9 @@ func (s UpdateEnvironmentInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *UpdateEnvironmentInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "UpdateEnvironmentInput"} + if s.CodebuildRoleArn != nil && len(*s.CodebuildRoleArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("CodebuildRoleArn", 1)) + } if s.ComponentRoleArn != nil && len(*s.ComponentRoleArn) < 1 { invalidParams.Add(request.NewErrParamMinLen("ComponentRoleArn", 1)) } @@ -20815,6 +20922,12 @@ func (s *UpdateEnvironmentInput) Validate() error { return nil } +// SetCodebuildRoleArn sets the CodebuildRoleArn field's value. +func (s *UpdateEnvironmentInput) SetCodebuildRoleArn(v string) *UpdateEnvironmentInput { + s.CodebuildRoleArn = &v + return s +} + // SetComponentRoleArn sets the ComponentRoleArn field's value. func (s *UpdateEnvironmentInput) SetComponentRoleArn(v string) *UpdateEnvironmentInput { s.ComponentRoleArn = &v diff --git a/service/rds/api.go b/service/rds/api.go index 695119c16be..d9066bbb4d2 100644 --- a/service/rds/api.go +++ b/service/rds/api.go @@ -13684,6 +13684,9 @@ func (c *RDS) RestoreDBInstanceFromDBSnapshotRequest(input *RestoreDBInstanceFro // The network type is invalid for the DB instance. Valid nework type values // are IPV4 and DUAL. // +// - ErrCodeDBClusterSnapshotNotFoundFault "DBClusterSnapshotNotFoundFault" +// DBClusterSnapshotIdentifier doesn't refer to an existing DB cluster snapshot. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/RestoreDBInstanceFromDBSnapshot func (c *RDS) RestoreDBInstanceFromDBSnapshot(input *RestoreDBInstanceFromDBSnapshotInput) (*RestoreDBInstanceFromDBSnapshotOutput, error) { req, out := c.RestoreDBInstanceFromDBSnapshotRequest(input) @@ -20773,6 +20776,8 @@ type CreateDBInstanceInput struct { // Specifies the storage throughput value for the DB instance. // + // This setting applies only to the gp3 storage type. + // // This setting doesn't apply to RDS Custom or Amazon Aurora. StorageThroughput *int64 `type:"integer"` @@ -25566,6 +25571,8 @@ type DBInstance struct { StorageEncrypted *bool `type:"boolean"` // Specifies the storage throughput for the DB instance. + // + // This setting applies only to the gp3 storage type. StorageThroughput *int64 `type:"integer"` // Specifies the storage type associated with the DB instance. @@ -39871,6 +39878,8 @@ type ModifyDBInstanceInput struct { // Specifies the storage throughput value for the DB instance. // + // This setting applies only to the gp3 storage type. + // // This setting doesn't apply to RDS Custom or Amazon Aurora. StorageThroughput *int64 `type:"integer"` @@ -46765,6 +46774,30 @@ type RestoreDBInstanceFromDBSnapshotInput struct { // This setting is required for RDS Custom. CustomIamInstanceProfile *string `type:"string"` + // The identifier for the RDS for MySQL Multi-AZ DB cluster snapshot to restore + // from. + // + // For more information on Multi-AZ DB clusters, see Multi-AZ deployments with + // two readable standby DB instances (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) + // in the Amazon RDS User Guide. + // + // Constraints: + // + // * Must match the identifier of an existing Multi-AZ DB cluster snapshot. + // + // * Can't be specified when DBSnapshotIdentifier is specified. + // + // * Must be specified when DBSnapshotIdentifier isn't specified. + // + // * If you are restoring from a shared manual Multi-AZ DB cluster snapshot, + // the DBClusterSnapshotIdentifier must be the ARN of the shared snapshot. + // + // * Can't be the identifier of an Aurora DB cluster snapshot. + // + // * Can't be the identifier of an RDS for PostgreSQL Multi-AZ DB cluster + // snapshot. + DBClusterSnapshotIdentifier *string `type:"string"` + // The compute and memory capacity of the Amazon RDS DB instance, for example // db.m4.large. Not all DB instance classes are available in all Amazon Web // Services Regions, or for all database engines. For the full list of DB instance @@ -46820,11 +46853,13 @@ type RestoreDBInstanceFromDBSnapshotInput struct { // // * Must match the identifier of an existing DBSnapshot. // + // * Can't be specified when DBClusterSnapshotIdentifier is specified. + // + // * Must be specified when DBClusterSnapshotIdentifier isn't specified. + // // * If you are restoring from a shared manual DB snapshot, the DBSnapshotIdentifier // must be the ARN of the shared DB snapshot. - // - // DBSnapshotIdentifier is a required field - DBSnapshotIdentifier *string `type:"string" required:"true"` + DBSnapshotIdentifier *string `type:"string"` // The DB subnet group name to use for the new instance. // @@ -47076,9 +47111,6 @@ func (s *RestoreDBInstanceFromDBSnapshotInput) Validate() error { if s.DBInstanceIdentifier == nil { invalidParams.Add(request.NewErrParamRequired("DBInstanceIdentifier")) } - if s.DBSnapshotIdentifier == nil { - invalidParams.Add(request.NewErrParamRequired("DBSnapshotIdentifier")) - } if invalidParams.Len() > 0 { return invalidParams @@ -47116,6 +47148,12 @@ func (s *RestoreDBInstanceFromDBSnapshotInput) SetCustomIamInstanceProfile(v str return s } +// SetDBClusterSnapshotIdentifier sets the DBClusterSnapshotIdentifier field's value. +func (s *RestoreDBInstanceFromDBSnapshotInput) SetDBClusterSnapshotIdentifier(v string) *RestoreDBInstanceFromDBSnapshotInput { + s.DBClusterSnapshotIdentifier = &v + return s +} + // SetDBInstanceClass sets the DBInstanceClass field's value. func (s *RestoreDBInstanceFromDBSnapshotInput) SetDBInstanceClass(v string) *RestoreDBInstanceFromDBSnapshotInput { s.DBInstanceClass = &v diff --git a/service/rds/examples_test.go b/service/rds/examples_test.go index 79188274400..b4097efb8d5 100644 --- a/service/rds/examples_test.go +++ b/service/rds/examples_test.go @@ -2907,6 +2907,8 @@ func ExampleRDS_RestoreDBInstanceFromDBSnapshot_shared00() { fmt.Println(rds.ErrCodeBackupPolicyNotFoundFault, aerr.Error()) case rds.ErrCodeNetworkTypeNotSupported: fmt.Println(rds.ErrCodeNetworkTypeNotSupported, aerr.Error()) + case rds.ErrCodeDBClusterSnapshotNotFoundFault: + fmt.Println(rds.ErrCodeDBClusterSnapshotNotFoundFault, aerr.Error()) default: fmt.Println(aerr.Error()) } diff --git a/service/workdocs/api.go b/service/workdocs/api.go index d1a00ba4a29..4d1ee05b4a2 100644 --- a/service/workdocs/api.go +++ b/service/workdocs/api.go @@ -90,6 +90,9 @@ func (c *WorkDocs) AbortDocumentVersionUploadRequest(input *AbortDocumentVersion // - ServiceUnavailableException // One or more of the dependencies is unavailable. // +// - ConcurrentModificationException +// The resource hierarchy is changing. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/AbortDocumentVersionUpload func (c *WorkDocs) AbortDocumentVersionUpload(input *AbortDocumentVersionUploadInput) (*AbortDocumentVersionUploadOutput, error) { req, out := c.AbortDocumentVersionUploadRequest(input) @@ -274,6 +277,9 @@ func (c *WorkDocs) AddResourcePermissionsRequest(input *AddResourcePermissionsIn // - ServiceUnavailableException // One or more of the dependencies is unavailable. // +// - ProhibitedStateException +// The specified document version is not in the INITIALIZED state. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/AddResourcePermissions func (c *WorkDocs) AddResourcePermissions(input *AddResourcePermissionsInput) (*AddResourcePermissionsOutput, error) { req, out := c.AddResourcePermissionsRequest(input) @@ -568,8 +574,12 @@ func (c *WorkDocs) CreateFolderRequest(input *CreateFolderInput) (req *request.R // Another operation is in progress on the resource that conflicts with the // current operation. // +// - ConcurrentModificationException +// The resource hierarchy is changing. +// // - LimitExceededException -// The maximum of 100,000 folders under the parent folder has been exceeded. +// The maximum of 100,000 files and folders under the parent folder has been +// exceeded. // // - UnauthorizedOperationException // The operation is not permitted. @@ -750,7 +760,8 @@ func (c *WorkDocs) CreateNotificationSubscriptionRequest(input *CreateNotificati // Configure Amazon WorkDocs to use Amazon SNS notifications. The endpoint receives // a confirmation message, and must confirm the subscription. // -// For more information, see Subscribe to Notifications (https://docs.aws.amazon.com/workdocs/latest/developerguide/subscribe-notifications.html) +// For more information, see Setting up notifications for an IAM user or role +// (https://docs.aws.amazon.com/workdocs/latest/developerguide/manage-notifications.html) // in the Amazon WorkDocs Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -772,6 +783,9 @@ func (c *WorkDocs) CreateNotificationSubscriptionRequest(input *CreateNotificati // - ServiceUnavailableException // One or more of the dependencies is unavailable. // +// - InvalidArgumentException +// The pagination marker or limit fields are not valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/CreateNotificationSubscription func (c *WorkDocs) CreateNotificationSubscription(input *CreateNotificationSubscriptionInput) (*CreateNotificationSubscriptionOutput, error) { req, out := c.CreateNotificationSubscriptionRequest(input) @@ -1239,6 +1253,10 @@ func (c *WorkDocs) DeleteDocumentRequest(input *DeleteDocumentInput) (req *reque // - EntityNotExistsException // The resource does not exist. // +// - LimitExceededException +// The maximum of 100,000 files and folders under the parent folder has been +// exceeded. +// // - ProhibitedStateException // The specified document version is not in the INITIALIZED state. // @@ -1285,6 +1303,111 @@ func (c *WorkDocs) DeleteDocumentWithContext(ctx aws.Context, input *DeleteDocum return out, req.Send() } +const opDeleteDocumentVersion = "DeleteDocumentVersion" + +// DeleteDocumentVersionRequest generates a "aws/request.Request" representing the +// client's request for the DeleteDocumentVersion operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See DeleteDocumentVersion for more information on using the DeleteDocumentVersion +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the DeleteDocumentVersionRequest method. +// req, resp := client.DeleteDocumentVersionRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/DeleteDocumentVersion +func (c *WorkDocs) DeleteDocumentVersionRequest(input *DeleteDocumentVersionInput) (req *request.Request, output *DeleteDocumentVersionOutput) { + op := &request.Operation{ + Name: opDeleteDocumentVersion, + HTTPMethod: "DELETE", + HTTPPath: "/api/v1/documentVersions/{DocumentId}/versions/{VersionId}", + } + + if input == nil { + input = &DeleteDocumentVersionInput{} + } + + output = &DeleteDocumentVersionOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DeleteDocumentVersion API operation for Amazon WorkDocs. +// +// Deletes a version of an Amazon WorkDocs document. Use the DeletePriorVersions +// parameter to delete prior versions. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon WorkDocs's +// API operation DeleteDocumentVersion for usage and error information. +// +// Returned Error Types: +// +// - EntityNotExistsException +// The resource does not exist. +// +// - ProhibitedStateException +// The specified document version is not in the INITIALIZED state. +// +// - ConflictingOperationException +// Another operation is in progress on the resource that conflicts with the +// current operation. +// +// - ConcurrentModificationException +// The resource hierarchy is changing. +// +// - UnauthorizedResourceAccessException +// The caller does not have access to perform the action on the resource. +// +// - FailedDependencyException +// The AWS Directory Service cannot reach an on-premises instance. Or a dependency +// under the control of the organization is failing, such as a connected Active +// Directory. +// +// - InvalidOperationException +// The operation is invalid. +// +// - UnauthorizedOperationException +// The operation is not permitted. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/DeleteDocumentVersion +func (c *WorkDocs) DeleteDocumentVersion(input *DeleteDocumentVersionInput) (*DeleteDocumentVersionOutput, error) { + req, out := c.DeleteDocumentVersionRequest(input) + return out, req.Send() +} + +// DeleteDocumentVersionWithContext is the same as DeleteDocumentVersion with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteDocumentVersion for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WorkDocs) DeleteDocumentVersionWithContext(ctx aws.Context, input *DeleteDocumentVersionInput, opts ...request.Option) (*DeleteDocumentVersionOutput, error) { + req, out := c.DeleteDocumentVersionRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteFolder = "DeleteFolder" // DeleteFolderRequest generates a "aws/request.Request" representing the @@ -1343,6 +1466,10 @@ func (c *WorkDocs) DeleteFolderRequest(input *DeleteFolderInput) (req *request.R // - EntityNotExistsException // The resource does not exist. // +// - LimitExceededException +// The maximum of 100,000 files and folders under the parent folder has been +// exceeded. +// // - ProhibitedStateException // The specified document version is not in the INITIALIZED state. // @@ -1562,6 +1689,9 @@ func (c *WorkDocs) DeleteLabelsRequest(input *DeleteLabelsInput) (req *request.R // - ServiceUnavailableException // One or more of the dependencies is unavailable. // +// - ProhibitedStateException +// The specified document version is not in the INITIALIZED state. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/DeleteLabels func (c *WorkDocs) DeleteLabels(input *DeleteLabelsInput) (*DeleteLabelsOutput, error) { req, out := c.DeleteLabelsRequest(input) @@ -2041,6 +2171,9 @@ func (c *WorkDocs) DescribeDocumentVersionsRequest(input *DescribeDocumentVersio // - ProhibitedStateException // The specified document version is not in the INITIALIZED state. // +// - InvalidPasswordException +// The password is invalid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/DescribeDocumentVersions func (c *WorkDocs) DescribeDocumentVersions(input *DescribeDocumentVersionsInput) (*DescribeDocumentVersionsOutput, error) { req, out := c.DescribeDocumentVersionsRequest(input) @@ -2503,6 +2636,9 @@ func (c *WorkDocs) DescribeResourcePermissionsRequest(input *DescribeResourcePer // // Returned Error Types: // +// - InvalidArgumentException +// The pagination marker or limit fields are not valid. +// // - UnauthorizedOperationException // The operation is not permitted. // @@ -3563,6 +3699,10 @@ func (c *WorkDocs) InitiateDocumentVersionUploadRequest(input *InitiateDocumentV // - StorageLimitWillExceedException // The storage limit will be exceeded. // +// - LimitExceededException +// The maximum of 100,000 files and folders under the parent folder has been +// exceeded. +// // - ProhibitedStateException // The specified document version is not in the INITIALIZED state. // @@ -3587,6 +3727,9 @@ func (c *WorkDocs) InitiateDocumentVersionUploadRequest(input *InitiateDocumentV // - ResourceAlreadyCheckedOutException // The resource is already checked out. // +// - InvalidPasswordException +// The password is invalid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/InitiateDocumentVersionUpload func (c *WorkDocs) InitiateDocumentVersionUpload(input *InitiateDocumentVersionUploadInput) (*InitiateDocumentVersionUploadOutput, error) { req, out := c.InitiateDocumentVersionUploadRequest(input) @@ -3791,6 +3934,110 @@ func (c *WorkDocs) RemoveResourcePermissionWithContext(ctx aws.Context, input *R return out, req.Send() } +const opRestoreDocumentVersions = "RestoreDocumentVersions" + +// RestoreDocumentVersionsRequest generates a "aws/request.Request" representing the +// client's request for the RestoreDocumentVersions operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See RestoreDocumentVersions for more information on using the RestoreDocumentVersions +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the RestoreDocumentVersionsRequest method. +// req, resp := client.RestoreDocumentVersionsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/RestoreDocumentVersions +func (c *WorkDocs) RestoreDocumentVersionsRequest(input *RestoreDocumentVersionsInput) (req *request.Request, output *RestoreDocumentVersionsOutput) { + op := &request.Operation{ + Name: opRestoreDocumentVersions, + HTTPMethod: "POST", + HTTPPath: "/api/v1/documentVersions/restore/{DocumentId}", + } + + if input == nil { + input = &RestoreDocumentVersionsInput{} + } + + output = &RestoreDocumentVersionsOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// RestoreDocumentVersions API operation for Amazon WorkDocs. +// +// Recovers a deleted version of an Amazon WorkDocs document. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon WorkDocs's +// API operation RestoreDocumentVersions for usage and error information. +// +// Returned Error Types: +// +// - EntityNotExistsException +// The resource does not exist. +// +// - ProhibitedStateException +// The specified document version is not in the INITIALIZED state. +// +// - ConflictingOperationException +// Another operation is in progress on the resource that conflicts with the +// current operation. +// +// - ConcurrentModificationException +// The resource hierarchy is changing. +// +// - UnauthorizedResourceAccessException +// The caller does not have access to perform the action on the resource. +// +// - FailedDependencyException +// The AWS Directory Service cannot reach an on-premises instance. Or a dependency +// under the control of the organization is failing, such as a connected Active +// Directory. +// +// - InvalidOperationException +// The operation is invalid. +// +// - UnauthorizedOperationException +// The operation is not permitted. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01/RestoreDocumentVersions +func (c *WorkDocs) RestoreDocumentVersions(input *RestoreDocumentVersionsInput) (*RestoreDocumentVersionsOutput, error) { + req, out := c.RestoreDocumentVersionsRequest(input) + return out, req.Send() +} + +// RestoreDocumentVersionsWithContext is the same as RestoreDocumentVersions with the addition of +// the ability to pass a context and additional request options. +// +// See RestoreDocumentVersions for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *WorkDocs) RestoreDocumentVersionsWithContext(ctx aws.Context, input *RestoreDocumentVersionsInput, opts ...request.Option) (*RestoreDocumentVersionsOutput, error) { + req, out := c.RestoreDocumentVersionsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opUpdateDocument = "UpdateDocument" // UpdateDocumentRequest generates a "aws/request.Request" representing the @@ -3854,7 +4101,8 @@ func (c *WorkDocs) UpdateDocumentRequest(input *UpdateDocumentInput) (req *reque // The resource already exists. // // - LimitExceededException -// The maximum of 100,000 folders under the parent folder has been exceeded. +// The maximum of 100,000 files and folders under the parent folder has been +// exceeded. // // - ProhibitedStateException // The specified document version is not in the INITIALIZED state. @@ -4082,7 +4330,8 @@ func (c *WorkDocs) UpdateFolderRequest(input *UpdateFolderInput) (req *request.R // The resource hierarchy is changing. // // - LimitExceededException -// The maximum of 100,000 folders under the parent folder has been exceeded. +// The maximum of 100,000 files and folders under the parent folder has been +// exceeded. // // - UnauthorizedOperationException // The operation is not permitted. @@ -4187,6 +4436,9 @@ func (c *WorkDocs) UpdateUserRequest(input *UpdateUserInput) (req *request.Reque // - IllegalUserStateException // The user is undergoing transfer of ownership. // +// - ProhibitedStateException +// The specified document version is not in the INITIALIZED state. +// // - FailedDependencyException // The AWS Directory Service cannot reach an on-premises instance. Or a dependency // under the control of the organization is failing, such as a connected Active @@ -5624,7 +5876,11 @@ type CreateUserInput struct { AuthenticationToken *string `location:"header" locationName:"Authentication" min:"1" type:"string" sensitive:"true"` // The email address of the user. - EmailAddress *string `min:"1" type:"string"` + // + // EmailAddress is a sensitive parameter and its value will be + // replaced with "sensitive" in string returned by CreateUserInput's + // String and GoString methods. + EmailAddress *string `min:"1" type:"string" sensitive:"true"` // The given name of the user. // @@ -6356,6 +6612,126 @@ func (s DeleteDocumentOutput) GoString() string { return s.String() } +type DeleteDocumentVersionInput struct { + _ struct{} `type:"structure" nopayload:"true"` + + // Amazon WorkDocs authentication token. Not required when using AWS administrator + // credentials to access the API. + // + // AuthenticationToken is a sensitive parameter and its value will be + // replaced with "sensitive" in string returned by DeleteDocumentVersionInput's + // String and GoString methods. + AuthenticationToken *string `location:"header" locationName:"Authentication" min:"1" type:"string" sensitive:"true"` + + // When set to TRUE, deletes the specified version and all prior versions of + // a document. + // + // DeletePriorVersions is a required field + DeletePriorVersions *bool `location:"querystring" locationName:"deletePriorVersions" type:"boolean" required:"true"` + + // The ID of a document. + // + // DocumentId is a required field + DocumentId *string `location:"uri" locationName:"DocumentId" min:"1" type:"string" required:"true"` + + // The version ID of a document. + // + // VersionId is a required field + VersionId *string `location:"uri" locationName:"VersionId" min:"1" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DeleteDocumentVersionInput) 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 DeleteDocumentVersionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteDocumentVersionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteDocumentVersionInput"} + if s.AuthenticationToken != nil && len(*s.AuthenticationToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("AuthenticationToken", 1)) + } + if s.DeletePriorVersions == nil { + invalidParams.Add(request.NewErrParamRequired("DeletePriorVersions")) + } + if s.DocumentId == nil { + invalidParams.Add(request.NewErrParamRequired("DocumentId")) + } + if s.DocumentId != nil && len(*s.DocumentId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DocumentId", 1)) + } + if s.VersionId == nil { + invalidParams.Add(request.NewErrParamRequired("VersionId")) + } + if s.VersionId != nil && len(*s.VersionId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("VersionId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAuthenticationToken sets the AuthenticationToken field's value. +func (s *DeleteDocumentVersionInput) SetAuthenticationToken(v string) *DeleteDocumentVersionInput { + s.AuthenticationToken = &v + return s +} + +// SetDeletePriorVersions sets the DeletePriorVersions field's value. +func (s *DeleteDocumentVersionInput) SetDeletePriorVersions(v bool) *DeleteDocumentVersionInput { + s.DeletePriorVersions = &v + return s +} + +// SetDocumentId sets the DocumentId field's value. +func (s *DeleteDocumentVersionInput) SetDocumentId(v string) *DeleteDocumentVersionInput { + s.DocumentId = &v + return s +} + +// SetVersionId sets the VersionId field's value. +func (s *DeleteDocumentVersionInput) SetVersionId(v string) *DeleteDocumentVersionInput { + s.VersionId = &v + return s +} + +type DeleteDocumentVersionOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DeleteDocumentVersionOutput) 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 DeleteDocumentVersionOutput) GoString() string { + return s.String() +} + type DeleteFolderContentsInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -8054,7 +8430,23 @@ type DescribeUsersInput struct { // The ID of the organization. OrganizationId *string `location:"querystring" locationName:"organizationId" min:"1" type:"string"` - // A query to filter users by user name. + // A query to filter users by user name. Remember the following about the Userids + // and Query parameters: + // + // * If you don't use either parameter, the API returns a paginated list + // of all users on the site. + // + // * If you use both parameters, the API ignores the Query parameter. + // + // * The Userid parameter only returns user names that match a corresponding + // user ID. + // + // * The Query parameter runs a "prefix" search for users by the GivenName, + // SurName, or UserName fields included in a CreateUser (https://docs.aws.amazon.com/workdocs/latest/APIReference/API_CreateUser.html) + // API call. For example, querying on Ma returns Márcia Oliveira, María + // García, and Mateo Jackson. If you use multiple characters, the API only + // returns data that matches all characters. For example, querying on Ma + // J only returns Mateo Jackson. // // Query is a sensitive parameter and its value will be // replaced with "sensitive" in string returned by DescribeUsersInput's @@ -8663,6 +9055,7 @@ type EntityNotExistsException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + // The IDs of the non-existent resources. EntityIds []*string `type:"list"` Message_ *string `locationName:"Message" type:"string"` @@ -9920,9 +10313,7 @@ type InitiateDocumentVersionUploadInput struct { Name *string `min:"1" type:"string"` // The ID of the parent folder. - // - // ParentFolderId is a required field - ParentFolderId *string `min:"1" type:"string" required:"true"` + ParentFolderId *string `min:"1" type:"string"` } // String returns the string representation. @@ -9958,9 +10349,6 @@ func (s *InitiateDocumentVersionUploadInput) Validate() error { if s.Name != nil && len(*s.Name) < 1 { invalidParams.Add(request.NewErrParamMinLen("Name", 1)) } - if s.ParentFolderId == nil { - invalidParams.Add(request.NewErrParamRequired("ParentFolderId")) - } if s.ParentFolderId != nil && len(*s.ParentFolderId) < 1 { invalidParams.Add(request.NewErrParamMinLen("ParentFolderId", 1)) } @@ -10315,7 +10703,8 @@ func (s *InvalidPasswordException) RequestID() string { return s.RespMetadata.RequestID } -// The maximum of 100,000 folders under the parent folder has been exceeded. +// The maximum of 100,000 files and folders under the parent folder has been +// exceeded. type LimitExceededException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -11111,6 +11500,94 @@ func (s *ResourcePathComponent) SetName(v string) *ResourcePathComponent { return s } +type RestoreDocumentVersionsInput struct { + _ struct{} `type:"structure" nopayload:"true"` + + // Amazon WorkDocs authentication token. Not required when using AWS administrator + // credentials to access the API. + // + // AuthenticationToken is a sensitive parameter and its value will be + // replaced with "sensitive" in string returned by RestoreDocumentVersionsInput's + // String and GoString methods. + AuthenticationToken *string `location:"header" locationName:"Authentication" min:"1" type:"string" sensitive:"true"` + + // The ID of the document. + // + // DocumentId is a required field + DocumentId *string `location:"uri" locationName:"DocumentId" min:"1" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s RestoreDocumentVersionsInput) 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 RestoreDocumentVersionsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RestoreDocumentVersionsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RestoreDocumentVersionsInput"} + if s.AuthenticationToken != nil && len(*s.AuthenticationToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("AuthenticationToken", 1)) + } + if s.DocumentId == nil { + invalidParams.Add(request.NewErrParamRequired("DocumentId")) + } + if s.DocumentId != nil && len(*s.DocumentId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DocumentId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetAuthenticationToken sets the AuthenticationToken field's value. +func (s *RestoreDocumentVersionsInput) SetAuthenticationToken(v string) *RestoreDocumentVersionsInput { + s.AuthenticationToken = &v + return s +} + +// SetDocumentId sets the DocumentId field's value. +func (s *RestoreDocumentVersionsInput) SetDocumentId(v string) *RestoreDocumentVersionsInput { + s.DocumentId = &v + return s +} + +type RestoreDocumentVersionsOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s RestoreDocumentVersionsOutput) 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 RestoreDocumentVersionsOutput) GoString() string { + return s.String() +} + // One or more of the dependencies is unavailable. type ServiceUnavailableException struct { _ struct{} `type:"structure"` @@ -12389,7 +12866,11 @@ type User struct { CreatedTimestamp *time.Time `type:"timestamp"` // The email address of the user. - EmailAddress *string `min:"1" type:"string"` + // + // EmailAddress is a sensitive parameter and its value will be + // replaced with "sensitive" in string returned by User's + // String and GoString methods. + EmailAddress *string `min:"1" type:"string" sensitive:"true"` // The given name of the user. GivenName *string `min:"1" type:"string"` @@ -12544,7 +13025,11 @@ type UserMetadata struct { _ struct{} `type:"structure"` // The email address of the user. - EmailAddress *string `min:"1" type:"string"` + // + // EmailAddress is a sensitive parameter and its value will be + // replaced with "sensitive" in string returned by UserMetadata's + // String and GoString methods. + EmailAddress *string `min:"1" type:"string" sensitive:"true"` // The given name of the user before a rename operation. GivenName *string `min:"1" type:"string"` @@ -13163,12 +13648,16 @@ func StorageType_Values() []string { const ( // SubscriptionProtocolTypeHttps is a SubscriptionProtocolType enum value SubscriptionProtocolTypeHttps = "HTTPS" + + // SubscriptionProtocolTypeSqs is a SubscriptionProtocolType enum value + SubscriptionProtocolTypeSqs = "SQS" ) // SubscriptionProtocolType_Values returns all elements of the SubscriptionProtocolType enum func SubscriptionProtocolType_Values() []string { return []string{ SubscriptionProtocolTypeHttps, + SubscriptionProtocolTypeSqs, } } diff --git a/service/workdocs/doc.go b/service/workdocs/doc.go index 57e5849fe33..bf379ef4bb8 100644 --- a/service/workdocs/doc.go +++ b/service/workdocs/doc.go @@ -35,6 +35,20 @@ // above, as well as give users the ability to grant access on a selective basis // using the IAM model. // +// The pricing for Amazon WorkDocs APIs varies depending on the API call type +// for these actions: +// +// - READ (Get*) +// +// - WRITE (Activate*, Add*, Create*, Deactivate*, Initiate*, Update*) +// +// - LIST (Describe*) +// +// - DELETE*, CANCEL +// +// For information about Amazon WorkDocs API pricing, see Amazon WorkDocs Pricing +// (https://aws.amazon.com/workdocs/pricing/). +// // See https://docs.aws.amazon.com/goto/WebAPI/workdocs-2016-05-01 for more information on this service. // // See workdocs package documentation for more information. diff --git a/service/workdocs/errors.go b/service/workdocs/errors.go index 18b3a34b46a..bf04ab56f59 100644 --- a/service/workdocs/errors.go +++ b/service/workdocs/errors.go @@ -101,7 +101,8 @@ const ( // ErrCodeLimitExceededException for service response error code // "LimitExceededException". // - // The maximum of 100,000 folders under the parent folder has been exceeded. + // The maximum of 100,000 files and folders under the parent folder has been + // exceeded. ErrCodeLimitExceededException = "LimitExceededException" // ErrCodeProhibitedStateException for service response error code diff --git a/service/workdocs/workdocsiface/interface.go b/service/workdocs/workdocsiface/interface.go index 33aa23c74e1..1a5357592d0 100644 --- a/service/workdocs/workdocsiface/interface.go +++ b/service/workdocs/workdocsiface/interface.go @@ -112,6 +112,10 @@ type WorkDocsAPI interface { DeleteDocumentWithContext(aws.Context, *workdocs.DeleteDocumentInput, ...request.Option) (*workdocs.DeleteDocumentOutput, error) DeleteDocumentRequest(*workdocs.DeleteDocumentInput) (*request.Request, *workdocs.DeleteDocumentOutput) + DeleteDocumentVersion(*workdocs.DeleteDocumentVersionInput) (*workdocs.DeleteDocumentVersionOutput, error) + DeleteDocumentVersionWithContext(aws.Context, *workdocs.DeleteDocumentVersionInput, ...request.Option) (*workdocs.DeleteDocumentVersionOutput, error) + DeleteDocumentVersionRequest(*workdocs.DeleteDocumentVersionInput) (*request.Request, *workdocs.DeleteDocumentVersionOutput) + DeleteFolder(*workdocs.DeleteFolderInput) (*workdocs.DeleteFolderOutput, error) DeleteFolderWithContext(aws.Context, *workdocs.DeleteFolderInput, ...request.Option) (*workdocs.DeleteFolderOutput, error) DeleteFolderRequest(*workdocs.DeleteFolderInput) (*request.Request, *workdocs.DeleteFolderOutput) @@ -217,6 +221,10 @@ type WorkDocsAPI interface { RemoveResourcePermissionWithContext(aws.Context, *workdocs.RemoveResourcePermissionInput, ...request.Option) (*workdocs.RemoveResourcePermissionOutput, error) RemoveResourcePermissionRequest(*workdocs.RemoveResourcePermissionInput) (*request.Request, *workdocs.RemoveResourcePermissionOutput) + RestoreDocumentVersions(*workdocs.RestoreDocumentVersionsInput) (*workdocs.RestoreDocumentVersionsOutput, error) + RestoreDocumentVersionsWithContext(aws.Context, *workdocs.RestoreDocumentVersionsInput, ...request.Option) (*workdocs.RestoreDocumentVersionsOutput, error) + RestoreDocumentVersionsRequest(*workdocs.RestoreDocumentVersionsInput) (*request.Request, *workdocs.RestoreDocumentVersionsOutput) + UpdateDocument(*workdocs.UpdateDocumentInput) (*workdocs.UpdateDocumentOutput, error) UpdateDocumentWithContext(aws.Context, *workdocs.UpdateDocumentInput, ...request.Option) (*workdocs.UpdateDocumentOutput, error) UpdateDocumentRequest(*workdocs.UpdateDocumentInput) (*request.Request, *workdocs.UpdateDocumentOutput) diff --git a/service/xray/api.go b/service/xray/api.go index 5710f43b90e..4f1fe85dbec 100644 --- a/service/xray/api.go +++ b/service/xray/api.go @@ -3658,20 +3658,31 @@ func (s *DeleteSamplingRuleOutput) SetSamplingRuleRecord(v *SamplingRuleRecord) return s } -// Information about a connection between two services. +// Information about a connection between two services. An edge can be a synchronous +// connection, such as typical call between client and service, or an asynchronous +// link, such as a Lambda function which retrieves an event from an SNS queue. type Edge struct { _ struct{} `type:"structure"` // Aliases for the edge. Aliases []*Alias `type:"list"` + // Describes an asynchronous connection, with a value of link. + EdgeType *string `type:"string"` + // The end time of the last segment on the edge. EndTime *time.Time `type:"timestamp"` + // A histogram that maps the spread of event age when received by consumers. + // Age is calculated each time an event is received. Only populated when EdgeType + // is link. + ReceivedEventAgeHistogram []*HistogramEntry `type:"list"` + // Identifier of the edge. Unique within a service map. ReferenceId *int64 `type:"integer"` - // A histogram that maps the spread of client response times on an edge. + // A histogram that maps the spread of client response times on an edge. Only + // populated for synchronous edges. ResponseTimeHistogram []*HistogramEntry `type:"list"` // The start time of the first segment on the edge. @@ -3705,12 +3716,24 @@ func (s *Edge) SetAliases(v []*Alias) *Edge { return s } +// SetEdgeType sets the EdgeType field's value. +func (s *Edge) SetEdgeType(v string) *Edge { + s.EdgeType = &v + return s +} + // SetEndTime sets the EndTime field's value. func (s *Edge) SetEndTime(v time.Time) *Edge { s.EndTime = &v return s } +// SetReceivedEventAgeHistogram sets the ReceivedEventAgeHistogram field's value. +func (s *Edge) SetReceivedEventAgeHistogram(v []*HistogramEntry) *Edge { + s.ReceivedEventAgeHistogram = v + return s +} + // SetReferenceId sets the ReferenceId field's value. func (s *Edge) SetReferenceId(v int64) *Edge { s.ReferenceId = &v @@ -9143,9 +9166,9 @@ type Trace struct { // and subsegments. Id *string `min:"1" type:"string"` - // LimitExceeded is set to true when the trace has exceeded one of the defined - // quotas. For more information about quotas, see Amazon Web Services X-Ray - // endpoints and quotas (https://docs.aws.amazon.com/general/latest/gr/xray.html). + // LimitExceeded is set to true when the trace has exceeded the Trace document + // size limit. For more information about this limit and other X-Ray limits + // and quotas, see Amazon Web Services X-Ray endpoints and quotas (https://docs.aws.amazon.com/general/latest/gr/xray.html). LimitExceeded *bool `type:"boolean"` // Segment documents for the segments and subsegments that comprise the trace.