diff --git a/CHANGELOG.md b/CHANGELOG.md index f2652900dfe..79f504e01b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Release v1.44.223 (2023-03-16) +=== + +### Service Client Updates +* `service/guardduty`: Updates service API, documentation, and paginators + * Updated 9 APIs for feature enablement to reflect expansion of GuardDuty to features. Added new APIs and updated existing APIs to support RDS Protection GA. +* `service/resource-explorer-2`: Updates service documentation +* `service/runtime.sagemaker`: Updates service documentation + Release v1.44.222 (2023-03-15) === diff --git a/aws/endpoints/defaults.go b/aws/endpoints/defaults.go index e950df717a0..495a57077b1 100644 --- a/aws/endpoints/defaults.go +++ b/aws/endpoints/defaults.go @@ -32458,9 +32458,39 @@ var awsusgovPartition = partition{ endpointKey{ Region: "us-gov-east-1", }: endpoint{}, + endpointKey{ + Region: "us-gov-east-1", + Variant: fipsVariant, + }: endpoint{ + Hostname: "dlm.us-gov-east-1.amazonaws.com", + }, + endpointKey{ + Region: "us-gov-east-1-fips", + }: endpoint{ + Hostname: "dlm.us-gov-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-east-1", + }, + Deprecated: boxedTrue, + }, endpointKey{ Region: "us-gov-west-1", }: endpoint{}, + endpointKey{ + Region: "us-gov-west-1", + Variant: fipsVariant, + }: endpoint{ + Hostname: "dlm.us-gov-west-1.amazonaws.com", + }, + endpointKey{ + Region: "us-gov-west-1-fips", + }: endpoint{ + Hostname: "dlm.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + Deprecated: boxedTrue, + }, }, }, "dms": service{ diff --git a/aws/version.go b/aws/version.go index c5c2307ae6a..d8b21faaf44 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.222" +const SDKVersion = "1.44.223" diff --git a/models/apis/guardduty/2017-11-28/api-2.json b/models/apis/guardduty/2017-11-28/api-2.json index f30f980de3c..9b148017724 100644 --- a/models/apis/guardduty/2017-11-28/api-2.json +++ b/models/apis/guardduty/2017-11-28/api-2.json @@ -1056,7 +1056,13 @@ }, "DataSources":{ "shape":"DataSourcesFreeTrial", + "deprecated":true, + "deprecatedMessage":"This parameter is deprecated, use Features instead", "locationName":"dataSources" + }, + "Features":{ + "shape":"FreeTrialFeatureConfigurationsResults", + "locationName":"features" } } }, @@ -1110,6 +1116,10 @@ "KubernetesApiCallAction":{ "shape":"KubernetesApiCallAction", "locationName":"kubernetesApiCallAction" + }, + "RdsLoginAttemptAction":{ + "shape":"RdsLoginAttemptAction", + "locationName":"rdsLoginAttemptAction" } } }, @@ -1455,11 +1465,17 @@ }, "DataSources":{ "shape":"DataSourceConfigurations", + "deprecated":true, + "deprecatedMessage":"This parameter is deprecated, use Features instead", "locationName":"dataSources" }, "Tags":{ "shape":"TagMap", "locationName":"tags" + }, + "Features":{ + "shape":"DetectorFeatureConfigurations", + "locationName":"features" } } }, @@ -2102,6 +2118,16 @@ "shape":"DetectorId", "location":"uri", "locationName":"detectorId" + }, + "MaxResults":{ + "shape":"MaxResults", + "location":"querystring", + "locationName":"maxResults" + }, + "NextToken":{ + "shape":"String", + "location":"querystring", + "locationName":"nextToken" } } }, @@ -2122,7 +2148,17 @@ }, "DataSources":{ "shape":"OrganizationDataSourceConfigurationsResult", + "deprecated":true, + "deprecatedMessage":"This parameter is deprecated, use Features instead", "locationName":"dataSources" + }, + "Features":{ + "shape":"OrganizationFeaturesConfigurationsResults", + "locationName":"features" + }, + "NextToken":{ + "shape":"String", + "locationName":"nextToken" } } }, @@ -2222,6 +2258,65 @@ "type":"list", "member":{"shape":"Destination"} }, + "DetectorFeature":{ + "type":"string", + "enum":[ + "S3_DATA_EVENTS", + "EKS_AUDIT_LOGS", + "EBS_MALWARE_PROTECTION", + "RDS_LOGIN_EVENTS" + ] + }, + "DetectorFeatureConfiguration":{ + "type":"structure", + "members":{ + "Name":{ + "shape":"DetectorFeature", + "locationName":"name" + }, + "Status":{ + "shape":"FeatureStatus", + "locationName":"status" + } + } + }, + "DetectorFeatureConfigurationResult":{ + "type":"structure", + "members":{ + "Name":{ + "shape":"DetectorFeatureResult", + "locationName":"name" + }, + "Status":{ + "shape":"FeatureStatus", + "locationName":"status" + }, + "UpdatedAt":{ + "shape":"Timestamp", + "locationName":"updatedAt" + } + } + }, + "DetectorFeatureConfigurations":{ + "type":"list", + "member":{"shape":"DetectorFeatureConfiguration"} + }, + "DetectorFeatureConfigurationsResults":{ + "type":"list", + "member":{"shape":"DetectorFeatureConfigurationResult"} + }, + "DetectorFeatureResult":{ + "type":"string", + "enum":[ + "FLOW_LOGS", + "CLOUD_TRAIL", + "DNS_LOGS", + "S3_DATA_EVENTS", + "EKS_AUDIT_LOGS", + "EBS_MALWARE_PROTECTION", + "RDS_LOGIN_EVENTS" + ] + }, "DetectorId":{ "type":"string", "max":300, @@ -2558,6 +2653,13 @@ } } }, + "FeatureStatus":{ + "type":"string", + "enum":[ + "ENABLED", + "DISABLED" + ] + }, "Feedback":{ "type":"string", "enum":[ @@ -2795,6 +2897,35 @@ } } }, + "FreeTrialFeatureConfigurationResult":{ + "type":"structure", + "members":{ + "Name":{ + "shape":"FreeTrialFeatureResult", + "locationName":"name" + }, + "FreeTrialDaysRemaining":{ + "shape":"Integer", + "locationName":"freeTrialDaysRemaining" + } + } + }, + "FreeTrialFeatureConfigurationsResults":{ + "type":"list", + "member":{"shape":"FreeTrialFeatureConfigurationResult"} + }, + "FreeTrialFeatureResult":{ + "type":"string", + "enum":[ + "FLOW_LOGS", + "CLOUD_TRAIL", + "DNS_LOGS", + "S3_DATA_EVENTS", + "EKS_AUDIT_LOGS", + "EBS_MALWARE_PROTECTION", + "RDS_LOGIN_EVENTS" + ] + }, "GeoLocation":{ "type":"structure", "members":{ @@ -2869,11 +3000,17 @@ }, "DataSources":{ "shape":"DataSourceConfigurationsResult", + "deprecated":true, + "deprecatedMessage":"This parameter is deprecated, use Features instead", "locationName":"dataSources" }, "Tags":{ "shape":"TagMap", "locationName":"tags" + }, + "Features":{ + "shape":"DetectorFeatureConfigurationsResults", + "locationName":"features" } } }, @@ -4029,6 +4166,31 @@ "max":300, "min":1 }, + "LoginAttribute":{ + "type":"structure", + "members":{ + "User":{ + "shape":"String", + "locationName":"user" + }, + "Application":{ + "shape":"String", + "locationName":"application" + }, + "FailedLoginAttempts":{ + "shape":"Integer", + "locationName":"failedLoginAttempts" + }, + "SuccessfulLoginAttempts":{ + "shape":"Integer", + "locationName":"successfulLoginAttempts" + } + } + }, + "LoginAttributes":{ + "type":"list", + "member":{"shape":"LoginAttribute"} + }, "Long":{"type":"long"}, "LongValue":{"type":"long"}, "MalwareProtectionConfiguration":{ @@ -4138,10 +4300,7 @@ }, "MemberDataSourceConfiguration":{ "type":"structure", - "required":[ - "AccountId", - "DataSources" - ], + "required":["AccountId"], "members":{ "AccountId":{ "shape":"AccountId", @@ -4149,7 +4308,13 @@ }, "DataSources":{ "shape":"DataSourceConfigurationsResult", + "deprecated":true, + "deprecatedMessage":"This parameter is deprecated, use Features instead", "locationName":"dataSources" + }, + "Features":{ + "shape":"MemberFeaturesConfigurationsResults", + "locationName":"features" } } }, @@ -4159,6 +4324,44 @@ "max":50, "min":1 }, + "MemberFeaturesConfiguration":{ + "type":"structure", + "members":{ + "Name":{ + "shape":"OrgFeature", + "locationName":"name" + }, + "Status":{ + "shape":"FeatureStatus", + "locationName":"status" + } + } + }, + "MemberFeaturesConfigurationResult":{ + "type":"structure", + "members":{ + "Name":{ + "shape":"OrgFeature", + "locationName":"name" + }, + "Status":{ + "shape":"FeatureStatus", + "locationName":"status" + }, + "UpdatedAt":{ + "shape":"Timestamp", + "locationName":"updatedAt" + } + } + }, + "MemberFeaturesConfigurations":{ + "type":"list", + "member":{"shape":"MemberFeaturesConfiguration"} + }, + "MemberFeaturesConfigurationsResults":{ + "type":"list", + "member":{"shape":"MemberFeaturesConfigurationResult"} + }, "Members":{ "type":"list", "member":{"shape":"Member"}, @@ -4272,6 +4475,22 @@ "DESC" ] }, + "OrgFeature":{ + "type":"string", + "enum":[ + "S3_DATA_EVENTS", + "EKS_AUDIT_LOGS", + "EBS_MALWARE_PROTECTION", + "RDS_LOGIN_EVENTS" + ] + }, + "OrgFeatureStatus":{ + "type":"string", + "enum":[ + "NEW", + "NONE" + ] + }, "Organization":{ "type":"structure", "members":{ @@ -4346,6 +4565,40 @@ } } }, + "OrganizationFeatureConfiguration":{ + "type":"structure", + "members":{ + "Name":{ + "shape":"OrgFeature", + "locationName":"name" + }, + "AutoEnable":{ + "shape":"OrgFeatureStatus", + "locationName":"autoEnable" + } + } + }, + "OrganizationFeatureConfigurationResult":{ + "type":"structure", + "members":{ + "Name":{ + "shape":"OrgFeature", + "locationName":"name" + }, + "AutoEnable":{ + "shape":"OrgFeatureStatus", + "locationName":"autoEnable" + } + } + }, + "OrganizationFeaturesConfigurations":{ + "type":"list", + "member":{"shape":"OrganizationFeatureConfiguration"} + }, + "OrganizationFeaturesConfigurationsResults":{ + "type":"list", + "member":{"shape":"OrganizationFeatureConfigurationResult"} + }, "OrganizationKubernetesAuditLogsConfiguration":{ "type":"structure", "required":["AutoEnable"], @@ -4560,6 +4813,70 @@ "max":300, "min":1 }, + "RdsDbInstanceDetails":{ + "type":"structure", + "members":{ + "DbInstanceIdentifier":{ + "shape":"String", + "locationName":"dbInstanceIdentifier" + }, + "Engine":{ + "shape":"String", + "locationName":"engine" + }, + "EngineVersion":{ + "shape":"String", + "locationName":"engineVersion" + }, + "DbClusterIdentifier":{ + "shape":"String", + "locationName":"dbClusterIdentifier" + }, + "DbInstanceArn":{ + "shape":"String", + "locationName":"dbInstanceArn" + }, + "Tags":{ + "shape":"Tags", + "locationName":"tags" + } + } + }, + "RdsDbUserDetails":{ + "type":"structure", + "members":{ + "User":{ + "shape":"String", + "locationName":"user" + }, + "Application":{ + "shape":"String", + "locationName":"application" + }, + "Database":{ + "shape":"String", + "locationName":"database" + }, + "Ssl":{ + "shape":"String", + "locationName":"ssl" + }, + "AuthMethod":{ + "shape":"String", + "locationName":"authMethod" + } + } + }, + "RdsLoginAttemptAction":{ + "type":"structure", + "members":{ + "RemoteIpDetails":{ + "shape":"RemoteIpDetails", + "locationName":"remoteIpDetails" + }, + "LoginAttributes":{"shape":"LoginAttributes"} + } + }, "RemoteAccountDetails":{ "type":"structure", "members":{ @@ -4649,6 +4966,14 @@ "ContainerDetails":{ "shape":"Container", "locationName":"containerDetails" + }, + "RdsDbInstanceDetails":{ + "shape":"RdsDbInstanceDetails", + "locationName":"rdsDbInstanceDetails" + }, + "RdsDbUserDetails":{ + "shape":"RdsDbUserDetails", + "locationName":"rdsDbUserDetails" } } }, @@ -5409,7 +5734,13 @@ }, "DataSources":{ "shape":"DataSourceConfigurations", + "deprecated":true, + "deprecatedMessage":"This parameter is deprecated, use Features instead", "locationName":"dataSources" + }, + "Features":{ + "shape":"DetectorFeatureConfigurations", + "locationName":"features" } } }, @@ -5573,7 +5904,13 @@ }, "DataSources":{ "shape":"DataSourceConfigurations", + "deprecated":true, + "deprecatedMessage":"This parameter is deprecated, use Features instead", "locationName":"dataSources" + }, + "Features":{ + "shape":"MemberFeaturesConfigurations", + "locationName":"features" } } }, @@ -5605,7 +5942,13 @@ }, "DataSources":{ "shape":"OrganizationDataSourceConfigurations", + "deprecated":true, + "deprecatedMessage":"This parameter is deprecated, use Features instead", "locationName":"dataSources" + }, + "Features":{ + "shape":"OrganizationFeaturesConfigurations", + "locationName":"features" } } }, @@ -5697,7 +6040,6 @@ }, "UsageCriteria":{ "type":"structure", - "required":["DataSources"], "members":{ "AccountIds":{ "shape":"AccountIds", @@ -5705,11 +6047,17 @@ }, "DataSources":{ "shape":"DataSourceList", + "deprecated":true, + "deprecatedMessage":"This parameter is deprecated, use Features instead", "locationName":"dataSources" }, "Resources":{ "shape":"ResourceList", "locationName":"resources" + }, + "Features":{ + "shape":"UsageFeatureList", + "locationName":"features" } } }, @@ -5730,6 +6078,41 @@ "type":"list", "member":{"shape":"UsageDataSourceResult"} }, + "UsageFeature":{ + "type":"string", + "enum":[ + "FLOW_LOGS", + "CLOUD_TRAIL", + "DNS_LOGS", + "S3_DATA_EVENTS", + "EKS_AUDIT_LOGS", + "EBS_MALWARE_PROTECTION", + "RDS_LOGIN_EVENTS", + "LAMBDA_NETWORK_LOGS", + "EKS_RUNTIME_MONITORING" + ] + }, + "UsageFeatureList":{ + "type":"list", + "member":{"shape":"UsageFeature"} + }, + "UsageFeatureResult":{ + "type":"structure", + "members":{ + "Feature":{ + "shape":"UsageFeature", + "locationName":"feature" + }, + "Total":{ + "shape":"Total", + "locationName":"total" + } + } + }, + "UsageFeatureResultList":{ + "type":"list", + "member":{"shape":"UsageFeatureResult"} + }, "UsageResourceResult":{ "type":"structure", "members":{ @@ -5753,7 +6136,8 @@ "SUM_BY_ACCOUNT", "SUM_BY_DATA_SOURCE", "SUM_BY_RESOURCE", - "TOP_RESOURCES" + "TOP_RESOURCES", + "SUM_BY_FEATURES" ] }, "UsageStatistics":{ @@ -5774,6 +6158,10 @@ "TopResources":{ "shape":"UsageResourceResultList", "locationName":"topResources" + }, + "SumByFeature":{ + "shape":"UsageFeatureResultList", + "locationName":"sumByFeature" } } }, diff --git a/models/apis/guardduty/2017-11-28/docs-2.json b/models/apis/guardduty/2017-11-28/docs-2.json index 0c0ab785b23..efd6ae6e007 100644 --- a/models/apis/guardduty/2017-11-28/docs-2.json +++ b/models/apis/guardduty/2017-11-28/docs-2.json @@ -6,7 +6,7 @@ "AcceptInvitation": "

Accepts the invitation to be monitored by a GuardDuty administrator account.

", "ArchiveFindings": "

Archives GuardDuty findings that are specified by the list of finding IDs.

Only the administrator account can archive findings. Member accounts don't have permission to archive findings from their accounts.

", "CreateDetector": "

Creates a single Amazon GuardDuty detector. A detector is a resource that represents the GuardDuty service. To start using GuardDuty, you must create a detector in each Region where you enable the service. You can have only one detector per account per Region. All data sources are enabled in a new detector by default.

There might be regional differences because some data sources might not be available in all the Amazon Web Services Regions where GuardDuty is presently supported. For more information, see Regions and endpoints.

", - "CreateFilter": "

Creates a filter using the specified finding criteria.

", + "CreateFilter": "

Creates a filter using the specified finding criteria. The maximum number of saved filters per Amazon Web Services account per Region is 100. For more information, see Quotas for GuardDuty.

", "CreateIPSet": "

Creates a new IPSet, which is called a trusted IP list in the console user interface. An IPSet is a list of IP addresses that are trusted for secure communication with Amazon Web Services infrastructure and applications. GuardDuty doesn't generate findings for IP addresses that are included in IPSets. Only users from the administrator account can use this operation.

", "CreateMembers": "

Creates member accounts of the current Amazon Web Services account by specifying a list of Amazon Web Services account IDs. This step is a prerequisite for managing the associated member accounts either by invitation or through an organization.

When using Create Members as an organizations delegated administrator this action will enable GuardDuty in the added member accounts, with the exception of the organization delegated administrator account, which must enable GuardDuty prior to being added as a member.

If you are adding accounts by invitation, use this action after GuardDuty has bee enabled in potential member accounts and before using InviteMembers.

", "CreatePublishingDestination": "

Creates a publishing destination to export findings to. The resource to export findings to must exist before you use this operation.

", @@ -621,6 +621,43 @@ "ListPublishingDestinationsResponse$Destinations": "

A Destinations object that includes information about each publishing destination returned.

" } }, + "DetectorFeature": { + "base": null, + "refs": { + "DetectorFeatureConfiguration$Name": "

The name of the feature.

" + } + }, + "DetectorFeatureConfiguration": { + "base": "

Contains information about a GuardDuty feature.

", + "refs": { + "DetectorFeatureConfigurations$member": null + } + }, + "DetectorFeatureConfigurationResult": { + "base": "

Contains information about a GuardDuty feature.

", + "refs": { + "DetectorFeatureConfigurationsResults$member": null + } + }, + "DetectorFeatureConfigurations": { + "base": null, + "refs": { + "CreateDetectorRequest$Features": "

A list of features that will be configured for the detector.

", + "UpdateDetectorRequest$Features": "

Provides the features that will be updated for the detector.

" + } + }, + "DetectorFeatureConfigurationsResults": { + "base": null, + "refs": { + "GetDetectorResponse$Features": "

Describes the features that have been enabled for the detector.

" + } + }, + "DetectorFeatureResult": { + "base": null, + "refs": { + "DetectorFeatureConfigurationResult$Name": "

Indicates the name of the feature that can be enabled for the detector.

" + } + }, "DetectorId": { "base": null, "refs": { @@ -836,6 +873,15 @@ "Service$Evidence": "

An evidence object associated with the service.

" } }, + "FeatureStatus": { + "base": null, + "refs": { + "DetectorFeatureConfiguration$Status": "

The status of the feature.

", + "DetectorFeatureConfigurationResult$Status": "

Indicates the status of the feature that is enabled for the detector.

", + "MemberFeaturesConfiguration$Status": "

The status of the feature.

", + "MemberFeaturesConfigurationResult$Status": "

Indicates the status of the feature that is enabled for the detector.

" + } + }, "Feedback": { "base": null, "refs": { @@ -883,7 +929,7 @@ "FilterDescription": { "base": null, "refs": { - "CreateFilterRequest$Description": "

The description of the filter. Valid characters include alphanumeric characters, and special characters such as -, ., :, { }, [ ], ( ), /, \\t, \\n, \\x0B, \\f, \\r, _, and whitespace.

", + "CreateFilterRequest$Description": "

The description of the filter. Valid characters include alphanumeric characters, and special characters such as hyphen, period, colon, underscore, parentheses ({ }, [ ], and ( )), forward slash, horizontal tab, vertical tab, newline, form feed, return, and whitespace.

", "GetFilterResponse$Description": "

The description of the filter.

", "UpdateFilterRequest$Description": "

The description of the filter. Valid characters include alphanumeric characters, and special characters such as hyphen, period, colon, underscore, parentheses ({ }, [ ], and ( )), forward slash, horizontal tab, vertical tab, newline, form feed, return, and whitespace.

" } @@ -995,6 +1041,24 @@ "DataSourceConfigurationsResult$FlowLogs": "

An object that contains information on the status of VPC flow logs as a data source.

" } }, + "FreeTrialFeatureConfigurationResult": { + "base": "

Contains information about the free trial period for a feature.

", + "refs": { + "FreeTrialFeatureConfigurationsResults$member": null + } + }, + "FreeTrialFeatureConfigurationsResults": { + "base": null, + "refs": { + "AccountFreeTrialInfo$Features": "

A list of features enabled for the GuardDuty account.

" + } + }, + "FreeTrialFeatureResult": { + "base": null, + "refs": { + "FreeTrialFeatureConfigurationResult$Name": "

The name of the feature for which the free trial is configured.

" + } + }, "GeoLocation": { "base": "

Contains information about the location of the remote IP address.

", "refs": { @@ -1197,10 +1261,13 @@ "EcsClusterDetails$ActiveServicesCount": "

The number of services that are running on the cluster in an ACTIVE state.

", "EcsClusterDetails$RegisteredContainerInstancesCount": "

The number of container instances registered into the cluster.

", "EcsClusterDetails$RunningTasksCount": "

The number of tasks in the cluster that are in the RUNNING state.

", + "FreeTrialFeatureConfigurationResult$FreeTrialDaysRemaining": "

The number of the remaining free trial days for the feature.

", "GetInvitationsCountResponse$InvitationsCount": "

The number of received invitations.

", "HighestSeverityThreatDetails$Count": "

Total number of infected files with the highest severity threat detected.

", "KubernetesApiCallAction$StatusCode": "

The resulting HTTP response code of the Kubernetes API call action.

", "LocalPortDetails$Port": "

The port number of the local connection.

", + "LoginAttribute$FailedLoginAttempts": "

Represents the sum of failed (unsuccessful) login attempts made to establish a connection to the database instance.

", + "LoginAttribute$SuccessfulLoginAttempts": "

Represents the sum of successful connections (a correct combination of login attributes) made to the database instance by the actor.

", "RemotePortDetails$Port": "

The port number of the remote connection.

", "ScanThreatName$ItemCount": "

Total number of files infected with given threat.

", "ScannedItemCount$TotalGb": "

Total GB of files scanned for malware.

", @@ -1450,6 +1517,18 @@ "UpdateThreatIntelSetRequest$Location": "

The updated URI of the file that contains the ThreateIntelSet.

" } }, + "LoginAttribute": { + "base": "

Information about the login attempts.

", + "refs": { + "LoginAttributes$member": null + } + }, + "LoginAttributes": { + "base": null, + "refs": { + "RdsLoginAttemptAction$LoginAttributes": "

Indicates the login attributes used in the login attempt.

" + } + }, "Long": { "base": null, "refs": { @@ -1501,6 +1580,7 @@ "MaxResults": { "base": null, "refs": { + "DescribeOrganizationConfigurationRequest$MaxResults": "

You can use this parameter to indicate the maximum number of items that you want in the response.

", "GetUsageStatisticsRequest$MaxResults": "

The maximum number of results to return in the response.

", "ListDetectorsRequest$MaxResults": "

You can use this parameter to indicate the maximum number of items that you want in the response. The default value is 50. The maximum value is 50.

", "ListFiltersRequest$MaxResults": "

You can use this parameter to indicate the maximum number of items that you want in the response. The default value is 50. The maximum value is 50.

", @@ -1531,6 +1611,30 @@ "GetMemberDetectorsResponse$MemberDataSourceConfigurations": "

An object that describes which data sources are enabled for a member account.

" } }, + "MemberFeaturesConfiguration": { + "base": "

Contains information about the features for the member account.

", + "refs": { + "MemberFeaturesConfigurations$member": null + } + }, + "MemberFeaturesConfigurationResult": { + "base": "

Contains information about the features for the member account.

", + "refs": { + "MemberFeaturesConfigurationsResults$member": null + } + }, + "MemberFeaturesConfigurations": { + "base": null, + "refs": { + "UpdateMemberDetectorsRequest$Features": "

A list of features that will be updated for the specified member accounts.

" + } + }, + "MemberFeaturesConfigurationsResults": { + "base": null, + "refs": { + "MemberDataSourceConfiguration$Features": "

Contains information about the status of the features for the member account.

" + } + }, "Members": { "base": null, "refs": { @@ -1595,6 +1699,22 @@ "SortCriteria$OrderBy": "

The order by which the sorted findings are to be displayed.

" } }, + "OrgFeature": { + "base": null, + "refs": { + "MemberFeaturesConfiguration$Name": "

The name of the feature.

", + "MemberFeaturesConfigurationResult$Name": "

Indicates the name of the feature that is enabled for the detector.

", + "OrganizationFeatureConfiguration$Name": "

The name of the feature that will be configured for the organization.

", + "OrganizationFeatureConfigurationResult$Name": "

The name of the feature that is configured for the member accounts within the organization.

" + } + }, + "OrgFeatureStatus": { + "base": null, + "refs": { + "OrganizationFeatureConfiguration$AutoEnable": "

The status of the feature that will be configured for the organization.

", + "OrganizationFeatureConfigurationResult$AutoEnable": "

Describes how The status of the feature that are configured for the member accounts within the organization.

If you set AutoEnable to NEW, a feature will be configured for only the new accounts when they join the organization.

If you set AutoEnable to NONE, no feature will be configured for the accounts when they join the organization.

" + } + }, "Organization": { "base": "

Contains information about the ISP organization of the remote IP address.

", "refs": { @@ -1625,6 +1745,30 @@ "OrganizationScanEc2InstanceWithFindingsResult$EbsVolumes": "

Describes the configuration for scanning EBS volumes for an organization.

" } }, + "OrganizationFeatureConfiguration": { + "base": "

A list of features which will be configured for the organization.

", + "refs": { + "OrganizationFeaturesConfigurations$member": null + } + }, + "OrganizationFeatureConfigurationResult": { + "base": "

A list of features which will be configured for the organization.

", + "refs": { + "OrganizationFeaturesConfigurationsResults$member": null + } + }, + "OrganizationFeaturesConfigurations": { + "base": null, + "refs": { + "UpdateOrganizationConfigurationRequest$Features": "

A list of features that will be configured for the organization.

" + } + }, + "OrganizationFeaturesConfigurationsResults": { + "base": null, + "refs": { + "DescribeOrganizationConfigurationResponse$Features": "

A list of features that are configured for this organization.

" + } + }, "OrganizationKubernetesAuditLogsConfiguration": { "base": "

Organization-wide Kubernetes audit logs configuration.

", "refs": { @@ -1759,6 +1903,24 @@ "Destination$Status": "

The status of the publishing destination.

" } }, + "RdsDbInstanceDetails": { + "base": "

Contains information about the resource type RDSDBInstance involved in a GuardDuty finding.

", + "refs": { + "Resource$RdsDbInstanceDetails": "

Contains information about the database instance to which an anomalous login attempt was made.

" + } + }, + "RdsDbUserDetails": { + "base": "

Contains information about the user and authentication details for a database instance involved in the finding.

", + "refs": { + "Resource$RdsDbUserDetails": "

Contains information about the user details through which anomalous login attempt was made.

" + } + }, + "RdsLoginAttemptAction": { + "base": "

Indicates that a login attempt was made to the potentially compromised database from a remote IP address.

", + "refs": { + "Action$RdsLoginAttemptAction": "

Information about RDS_LOGIN_ATTEMPT action described in this finding.

" + } + }, "RemoteAccountDetails": { "base": "

Contains details about the remote Amazon Web Services account that made the API call.

", "refs": { @@ -1771,7 +1933,8 @@ "AwsApiCallAction$RemoteIpDetails": "

The remote IP information of the connection that initiated the Amazon Web Services API call.

", "KubernetesApiCallAction$RemoteIpDetails": null, "NetworkConnectionAction$RemoteIpDetails": "

The remote IP information of the connection.

", - "PortProbeDetail$RemoteIpDetails": "

The remote IP information of the connection.

" + "PortProbeDetail$RemoteIpDetails": "

The remote IP information of the connection.

", + "RdsLoginAttemptAction$RemoteIpDetails": null } }, "RemotePortDetails": { @@ -2043,6 +2206,8 @@ "DeleteThreatIntelSetRequest$ThreatIntelSetId": "

The unique ID of the threatIntelSet that you want to delete.

", "DescribeMalwareScansRequest$NextToken": "

You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the list action. For subsequent calls to the action, fill nextToken in the request with the value of NextToken from the previous response to continue listing data.

", "DescribeMalwareScansResponse$NextToken": "

The pagination parameter to be used on the next list operation to retrieve more items.

", + "DescribeOrganizationConfigurationRequest$NextToken": "

You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the list action. For subsequent calls to the action, fill nextToken in the request with the value of NextToken from the previous response to continue listing data.

", + "DescribeOrganizationConfigurationResponse$NextToken": "

The pagination parameter to be used on the next list operation to retrieve more items.

", "DescribePublishingDestinationRequest$DestinationId": "

The ID of the publishing destination to retrieve.

", "DescribePublishingDestinationResponse$DestinationId": "

The ID of the publishing destination.

", "Destination$DestinationId": "

The unique ID of the publishing destination.

", @@ -2143,6 +2308,8 @@ "ListThreatIntelSetsResponse$NextToken": "

The pagination parameter to be used on the next list operation to retrieve more items.

", "LocalIpDetails$IpAddressV4": "

The IPv4 local address of the connection.

", "LocalPortDetails$PortName": "

The port name of the local connection.

", + "LoginAttribute$User": "

Indicates the user name which attempted to log in.

", + "LoginAttribute$Application": "

Indicates the application name used to attempt log in.

", "MalwareProtectionConfigurationResult$ServiceRole": "

The GuardDuty Malware Protection service role.

", "Master$InvitationId": "

The value used to validate the administrator account to the member account.

", "Master$RelationshipStatus": "

The status of the relationship between the administrator and member accounts.

", @@ -2173,6 +2340,16 @@ "ProductCode$Code": "

The product code information.

", "ProductCode$ProductType": "

The product code type.

", "PublicAccess$EffectivePermission": "

Describes the effective permission on this bucket after factoring all attached policies.

", + "RdsDbInstanceDetails$DbInstanceIdentifier": "

The identifier associated to the database instance that was involved in the finding.

", + "RdsDbInstanceDetails$Engine": "

The database engine of the database instance involved in the finding.

", + "RdsDbInstanceDetails$EngineVersion": "

The version of the database engine that was involved in the finding.

", + "RdsDbInstanceDetails$DbClusterIdentifier": "

The identifier of the database cluster that contains the database instance ID involved in the finding.

", + "RdsDbInstanceDetails$DbInstanceArn": "

The Amazon Resource Name (ARN) that identifies the database instance involved in the finding.

", + "RdsDbUserDetails$User": "

The user name used in the anomalous login attempt.

", + "RdsDbUserDetails$Application": "

The application name used in the anomalous login attempt.

", + "RdsDbUserDetails$Database": "

The name of the database instance involved in the anomalous login attempt.

", + "RdsDbUserDetails$Ssl": "

The version of the Secure Socket Layer (SSL) used for the network.

", + "RdsDbUserDetails$AuthMethod": "

The authentication method used by the user involved in the finding.

", "RemoteAccountDetails$AccountId": "

The Amazon Web Services account ID of the remote API caller.

", "RemoteIpDetails$IpAddressV4": "

The IPv4 remote address of the connection.

", "RemotePortDetails$PortName": "

The port name of the remote connection.

", @@ -2284,6 +2461,7 @@ "EcsTaskDetails$Tags": "

The tags of the ECS Task.

", "EksClusterDetails$Tags": "

The EKS cluster tags.

", "InstanceDetails$Tags": "

The tags of the EC2 instance.

", + "RdsDbInstanceDetails$Tags": "

Instance tag key-value pairs associated with the database instance ID.

", "S3BucketDetail$Tags": "

All tags attached to the S3 bucket

" } }, @@ -2339,11 +2517,13 @@ "Timestamp": { "base": null, "refs": { + "DetectorFeatureConfigurationResult$UpdatedAt": "

The timestamp at which the feature object was updated.

", "EbsVolumeScanDetails$ScanStartedAt": "

Returns the start date and time of the malware scan.

", "EbsVolumeScanDetails$ScanCompletedAt": "

Returns the completion date and time of the malware scan.

", "EcsTaskDetails$TaskCreatedAt": "

The Unix timestamp for the time when the task was created.

", "EcsTaskDetails$StartedAt": "

The Unix timestamp for the time when the task started.

", "EksClusterDetails$CreatedAt": "

The timestamp when the EKS cluster was created.

", + "MemberFeaturesConfigurationResult$UpdatedAt": "

The timestamp at which the feature object was updated.

", "S3BucketDetail$CreatedAt": "

The date and time the bucket was created at.

", "Scan$ScanStartTime": "

The timestamp of when the scan was triggered.

", "Scan$ScanEndTime": "

The timestamp of when the scan was finished.

" @@ -2354,6 +2534,7 @@ "refs": { "UsageAccountResult$Total": "

Represents the total of usage for the Account ID.

", "UsageDataSourceResult$Total": "

Represents the total of usage for the specified data source.

", + "UsageFeatureResult$Total": null, "UsageResourceResult$Total": "

Represents the sum total of usage for the specified resource type.

" } }, @@ -2532,6 +2713,31 @@ "UsageStatistics$SumByDataSource": "

The usage statistic sum organized by on data source.

" } }, + "UsageFeature": { + "base": null, + "refs": { + "UsageFeatureList$member": null, + "UsageFeatureResult$Feature": "

The feature that generated the usage cost.

" + } + }, + "UsageFeatureList": { + "base": null, + "refs": { + "UsageCriteria$Features": "

The features to aggregate usage statistics from.

" + } + }, + "UsageFeatureResult": { + "base": "

Contains information about the result of the total usage based on the feature.

", + "refs": { + "UsageFeatureResultList$member": null + } + }, + "UsageFeatureResultList": { + "base": null, + "refs": { + "UsageStatistics$SumByFeature": "

The usage statistic sum organized by feature.

" + } + }, "UsageResourceResult": { "base": "

Contains information on the sum of usage based on an Amazon Web Services resource.

", "refs": { diff --git a/models/apis/guardduty/2017-11-28/endpoint-tests-1.json b/models/apis/guardduty/2017-11-28/endpoint-tests-1.json index 514a0597591..0103573bb0c 100644 --- a/models/apis/guardduty/2017-11-28/endpoint-tests-1.json +++ b/models/apis/guardduty/2017-11-28/endpoint-tests-1.json @@ -9,8 +9,8 @@ }, "params": { "Region": "af-south-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -22,8 +22,8 @@ }, "params": { "Region": "ap-east-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -35,8 +35,8 @@ }, "params": { "Region": "ap-northeast-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -48,8 +48,8 @@ }, "params": { "Region": "ap-northeast-2", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -61,8 +61,8 @@ }, "params": { "Region": "ap-northeast-3", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -74,8 +74,8 @@ }, "params": { "Region": "ap-south-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -87,8 +87,8 @@ }, "params": { "Region": "ap-southeast-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -100,8 +100,8 @@ }, "params": { "Region": "ap-southeast-2", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -113,8 +113,8 @@ }, "params": { "Region": "ap-southeast-3", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -126,8 +126,8 @@ }, "params": { "Region": "ca-central-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -139,8 +139,8 @@ }, "params": { "Region": "eu-central-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -152,8 +152,8 @@ }, "params": { "Region": "eu-north-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -165,8 +165,8 @@ }, "params": { "Region": "eu-south-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -178,8 +178,8 @@ }, "params": { "Region": "eu-west-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -191,8 +191,8 @@ }, "params": { "Region": "eu-west-2", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -204,8 +204,8 @@ }, "params": { "Region": "eu-west-3", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -217,8 +217,8 @@ }, "params": { "Region": "me-south-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -230,8 +230,8 @@ }, "params": { "Region": "sa-east-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -243,8 +243,8 @@ }, "params": { "Region": "us-east-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -256,8 +256,8 @@ }, "params": { "Region": "us-east-1", - "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true } }, { @@ -269,8 +269,8 @@ }, "params": { "Region": "us-east-2", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -282,8 +282,8 @@ }, "params": { "Region": "us-east-2", - "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true } }, { @@ -295,8 +295,8 @@ }, "params": { "Region": "us-west-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -308,8 +308,8 @@ }, "params": { "Region": "us-west-1", - "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true } }, { @@ -321,8 +321,8 @@ }, "params": { "Region": "us-west-2", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -334,8 +334,8 @@ }, "params": { "Region": "us-west-2", - "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true } }, { @@ -347,8 +347,8 @@ }, "params": { "Region": "us-east-1", - "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "UseFIPS": true } }, { @@ -360,8 +360,8 @@ }, "params": { "Region": "us-east-1", - "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "UseFIPS": false } }, { @@ -373,8 +373,8 @@ }, "params": { "Region": "cn-north-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -386,8 +386,8 @@ }, "params": { "Region": "cn-northwest-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -399,8 +399,8 @@ }, "params": { "Region": "cn-north-1", - "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "UseFIPS": true } }, { @@ -412,8 +412,8 @@ }, "params": { "Region": "cn-north-1", - "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true } }, { @@ -425,8 +425,8 @@ }, "params": { "Region": "cn-north-1", - "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "UseFIPS": false } }, { @@ -438,8 +438,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -451,8 +451,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true } }, { @@ -464,8 +464,8 @@ }, "params": { "Region": "us-gov-west-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -477,8 +477,8 @@ }, "params": { "Region": "us-gov-west-1", - "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true } }, { @@ -490,8 +490,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseFIPS": true, - "UseDualStack": true + "UseDualStack": true, + "UseFIPS": true } }, { @@ -503,8 +503,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseFIPS": false, - "UseDualStack": true + "UseDualStack": true, + "UseFIPS": false } }, { @@ -516,8 +516,8 @@ }, "params": { "Region": "us-iso-east-1", - "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true } }, { @@ -529,8 +529,8 @@ }, "params": { "Region": "us-iso-east-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -542,8 +542,8 @@ }, "params": { "Region": "us-isob-east-1", - "UseFIPS": true, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true } }, { @@ -555,8 +555,8 @@ }, "params": { "Region": "us-isob-east-1", - "UseFIPS": false, - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false } }, { @@ -568,8 +568,8 @@ }, "params": { "Region": "us-east-1", - "UseFIPS": false, "UseDualStack": false, + "UseFIPS": false, "Endpoint": "https://example.com" } }, @@ -581,8 +581,8 @@ } }, "params": { - "UseFIPS": false, "UseDualStack": false, + "UseFIPS": false, "Endpoint": "https://example.com" } }, @@ -593,8 +593,8 @@ }, "params": { "Region": "us-east-1", - "UseFIPS": true, "UseDualStack": false, + "UseFIPS": true, "Endpoint": "https://example.com" } }, @@ -605,8 +605,8 @@ }, "params": { "Region": "us-east-1", - "UseFIPS": false, "UseDualStack": true, + "UseFIPS": false, "Endpoint": "https://example.com" } } diff --git a/models/apis/guardduty/2017-11-28/paginators-1.json b/models/apis/guardduty/2017-11-28/paginators-1.json index fa3d923c7aa..ca1f6cbca2d 100644 --- a/models/apis/guardduty/2017-11-28/paginators-1.json +++ b/models/apis/guardduty/2017-11-28/paginators-1.json @@ -6,6 +6,11 @@ "limit_key": "MaxResults", "result_key": "Scans" }, + "DescribeOrganizationConfiguration": { + "input_token": "NextToken", + "output_token": "NextToken", + "limit_key": "MaxResults" + }, "GetUsageStatistics": { "input_token": "NextToken", "output_token": "NextToken", diff --git a/models/apis/resource-explorer-2/2022-07-28/docs-2.json b/models/apis/resource-explorer-2/2022-07-28/docs-2.json index 96cc23459a3..26a3c6c56bd 100644 --- a/models/apis/resource-explorer-2/2022-07-28/docs-2.json +++ b/models/apis/resource-explorer-2/2022-07-28/docs-2.json @@ -79,7 +79,7 @@ } }, "ConflictException": { - "base": "

You tried to create a new view or index when one already exists, and you either didn't specify or specified a different idempotency token as the original request.

", + "base": "

The request failed because either you specified parameters that didn’t match the original request, or you attempted to create a view with a name that already exists in this Amazon Web Services Region.

", "refs": { } }, diff --git a/models/apis/resource-explorer-2/2022-07-28/endpoint-rule-set-1.json b/models/apis/resource-explorer-2/2022-07-28/endpoint-rule-set-1.json index c1e99000faa..62dff1a5cb6 100644 --- a/models/apis/resource-explorer-2/2022-07-28/endpoint-rule-set-1.json +++ b/models/apis/resource-explorer-2/2022-07-28/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" }, @@ -25,13 +25,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -39,80 +38,64 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] } ], - "type": "tree", - "rules": [ + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ { - "conditions": [ + "fn": "isSet", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] + "ref": "Region" } - ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + ] } - ] - }, - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] + "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", "rules": [ { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - } - ], + "conditions": [], "type": "tree", "rules": [ { @@ -127,7 +110,7 @@ { "ref": "PartitionResult" }, - "supportsFIPS" + "supportsDualStack" ] } ] @@ -135,10 +118,62 @@ ], "type": "tree", "rules": [ + { + "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": [], + "endpoint": { + "url": "https://resource-explorer-2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, { "conditions": [], "endpoint": { - "url": "https://resource-explorer-2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "url": "https://resource-explorer-2.{Region}.{PartitionResult#dualStackDnsSuffix}", "properties": {}, "headers": {} }, @@ -148,90 +183,93 @@ }, { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [], - "endpoint": { - "url": "https://resource-explorer-2.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ + "type": "tree", + "rules": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + 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://resource-explorer-2-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], - "endpoint": { - "url": "https://resource-explorer-2-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://resource-explorer-2.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] } ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" } ] - }, - { - "conditions": [], - "endpoint": { - "url": "https://resource-explorer-2.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" } ] } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/models/apis/resource-explorer-2/2022-07-28/endpoint-tests-1.json b/models/apis/resource-explorer-2/2022-07-28/endpoint-tests-1.json index 924c6acee70..7153473aa14 100644 --- a/models/apis/resource-explorer-2/2022-07-28/endpoint-tests-1.json +++ b/models/apis/resource-explorer-2/2022-07-28/endpoint-tests-1.json @@ -1,1565 +1,5 @@ { "testCases": [ - { - "documentation": "For region ap-south-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-south-2.api.aws" - } - }, - "params": { - "Region": "ap-south-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-south-2.api.aws" - } - }, - "params": { - "Region": "ap-south-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-south-2.api.aws" - } - }, - "params": { - "Region": "ap-south-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-south-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-south-2.api.aws" - } - }, - "params": { - "Region": "ap-south-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-south-1.api.aws" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-south-1.api.aws" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-south-1.api.aws" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-south-1.api.aws" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-south-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-south-2.api.aws" - } - }, - "params": { - "Region": "eu-south-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-south-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-south-2.api.aws" - } - }, - "params": { - "Region": "eu-south-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-south-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-south-2.api.aws" - } - }, - "params": { - "Region": "eu-south-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-south-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-south-2.api.aws" - } - }, - "params": { - "Region": "eu-south-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-gov-east-1.api.aws" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-gov-east-1.api.aws" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-gov-east-1.api.aws" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-gov-east-1.api.aws" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region me-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.me-central-1.api.aws" - } - }, - "params": { - "Region": "me-central-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region me-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.me-central-1.api.aws" - } - }, - "params": { - "Region": "me-central-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region me-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.me-central-1.api.aws" - } - }, - "params": { - "Region": "me-central-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region me-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.me-central-1.api.aws" - } - }, - "params": { - "Region": "me-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ca-central-1.api.aws" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ca-central-1.api.aws" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ca-central-1.api.aws" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ca-central-1.api.aws" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-central-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-central-2.api.aws" - } - }, - "params": { - "Region": "eu-central-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-central-2.api.aws" - } - }, - "params": { - "Region": "eu-central-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-central-2.api.aws" - } - }, - "params": { - "Region": "eu-central-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-central-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-central-2.api.aws" - } - }, - "params": { - "Region": "eu-central-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.af-south-1.api.aws" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.af-south-1.api.aws" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.af-south-1.api.aws" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.af-south-1.api.aws" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-northeast-3.api.aws" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-northeast-3.api.aws" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-northeast-3.api.aws" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-northeast-3.api.aws" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-northeast-2.api.aws" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-northeast-2.api.aws" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-northeast-2.api.aws" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-northeast-2.api.aws" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-northeast-1.api.aws" - } - }, - "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-northeast-1.api.aws" - } - }, - "params": { - "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-northeast-1.api.aws" - } - }, - "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-northeast-1.api.aws" - } - }, - "params": { - "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.me-south-1.api.aws" - } - }, - "params": { - "Region": "me-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.me-south-1.api.aws" - } - }, - "params": { - "Region": "me-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.me-south-1.api.aws" - } - }, - "params": { - "Region": "me-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.me-south-1.api.aws" - } - }, - "params": { - "Region": "me-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.sa-east-1.api.aws" - } - }, - "params": { - "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.sa-east-1.api.aws" - } - }, - "params": { - "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.sa-east-1.api.aws" - } - }, - "params": { - "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.sa-east-1.api.aws" - } - }, - "params": { - "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-east-1.api.aws" - } - }, - "params": { - "Region": "ap-east-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-east-1.api.aws" - } - }, - "params": { - "Region": "ap-east-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-east-1.api.aws" - } - }, - "params": { - "Region": "ap-east-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-east-1.api.aws" - } - }, - "params": { - "Region": "ap-east-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.cn-north-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.cn-north-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.cn-north-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.cn-north-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ca-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ca-west-1.api.aws" - } - }, - "params": { - "Region": "ca-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ca-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ca-west-1.api.aws" - } - }, - "params": { - "Region": "ca-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ca-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ca-west-1.api.aws" - } - }, - "params": { - "Region": "ca-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ca-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ca-west-1.api.aws" - } - }, - "params": { - "Region": "ca-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-gov-west-1.api.aws" - } - }, - "params": { - "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-gov-west-1.api.aws" - } - }, - "params": { - "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-gov-west-1.api.aws" - } - }, - "params": { - "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-gov-west-1.api.aws" - } - }, - "params": { - "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-1.api.aws" - } - }, - "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-1.api.aws" - } - }, - "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-1.api.aws" - } - }, - "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-1.api.aws" - } - }, - "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-2.api.aws" - } - }, - "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-2.api.aws" - } - }, - "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-2.api.aws" - } - }, - "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-2.api.aws" - } - }, - "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-3.api.aws" - } - }, - "params": { - "Region": "ap-southeast-3", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-3.api.aws" - } - }, - "params": { - "Region": "ap-southeast-3", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-3.api.aws" - } - }, - "params": { - "Region": "ap-southeast-3", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-3.api.aws" - } - }, - "params": { - "Region": "ap-southeast-3", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-4 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-4.api.aws" - } - }, - "params": { - "Region": "ap-southeast-4", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-4 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-4.api.aws" - } - }, - "params": { - "Region": "ap-southeast-4", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-4 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-4.api.aws" - } - }, - "params": { - "Region": "ap-southeast-4", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-4 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-4.api.aws" - } - }, - "params": { - "Region": "ap-southeast-4", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-5 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-5.api.aws" - } - }, - "params": { - "Region": "ap-southeast-5", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-5 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-5.api.aws" - } - }, - "params": { - "Region": "ap-southeast-5", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-5 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-5.api.aws" - } - }, - "params": { - "Region": "ap-southeast-5", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-5 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-5.api.aws" - } - }, - "params": { - "Region": "ap-southeast-5", - "UseDualStack": false, - "UseFIPS": false - } - }, { "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { @@ -1569,20 +9,6 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-east-1.api.aws" - } - }, - "params": { - "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true } }, @@ -1595,189 +21,78 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-east-1.api.aws" - } - }, - "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-6 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-6.api.aws" - } - }, - "params": { - "Region": "ap-southeast-6", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-6 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.ap-southeast-6.api.aws" - } - }, - "params": { - "Region": "ap-southeast-6", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-southeast-6 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-6.api.aws" - } - }, - "params": { - "Region": "ap-southeast-6", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-southeast-6 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.ap-southeast-6.api.aws" - } - }, - "params": { - "Region": "ap-southeast-6", - "UseDualStack": false, "UseFIPS": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.us-east-2.api.aws" - } - }, - "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://resource-explorer-2-fips.us-east-2.api.aws" + "url": "https://resource-explorer-2-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "us-east-2", - "UseDualStack": false, + "Region": "cn-north-1", "UseFIPS": true } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2.us-east-2.api.aws" - } - }, - "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://resource-explorer-2.us-east-2.api.aws" + "url": "https://resource-explorer-2.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "us-east-2", - "UseDualStack": false, + "Region": "cn-north-1", "UseFIPS": false } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://resource-explorer-2-fips.cn-northwest-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "Region": "cn-northwest-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://resource-explorer-2-fips.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://resource-explorer-2-fips.us-gov-east-1.api.aws" } }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": false, + "Region": "us-gov-east-1", "UseFIPS": true } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://resource-explorer-2.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://resource-explorer-2.us-gov-east-1.api.aws" } }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": true, + "Region": "us-gov-east-1", "UseFIPS": false } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { - "url": "https://resource-explorer-2.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://example.com" } }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": false, + "Endpoint": "https://example.com" } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": false, "Endpoint": "https://example.com" } @@ -1789,7 +104,6 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, "Endpoint": "https://example.com" } diff --git a/models/apis/runtime.sagemaker/2017-05-13/docs-2.json b/models/apis/runtime.sagemaker/2017-05-13/docs-2.json index e33272c0649..bc02a5c05e8 100644 --- a/models/apis/runtime.sagemaker/2017-05-13/docs-2.json +++ b/models/apis/runtime.sagemaker/2017-05-13/docs-2.json @@ -73,7 +73,7 @@ "InvocationTimeoutSecondsHeader": { "base": null, "refs": { - "InvokeEndpointAsyncInput$InvocationTimeoutSeconds": "

Maximum amount of time in seconds a request can be processed before it is marked as expired.

" + "InvokeEndpointAsyncInput$InvocationTimeoutSeconds": "

Maximum amount of time in seconds a request can be processed before it is marked as expired. The default is 15 minutes, or 900 seconds.

" } }, "InvokeEndpointAsyncInput": { @@ -127,7 +127,7 @@ "RequestTTLSecondsHeader": { "base": null, "refs": { - "InvokeEndpointAsyncInput$RequestTTLSeconds": "

Maximum age in seconds a request can be in the queue before it is marked as expired.

" + "InvokeEndpointAsyncInput$RequestTTLSeconds": "

Maximum age in seconds a request can be in the queue before it is marked as expired. The default is 6 hours, or 21,600 seconds.

" } }, "ServiceUnavailable": { diff --git a/models/apis/runtime.sagemaker/2017-05-13/endpoint-rule-set-1.json b/models/apis/runtime.sagemaker/2017-05-13/endpoint-rule-set-1.json index c7feffe0bc5..1df2646e75f 100644 --- a/models/apis/runtime.sagemaker/2017-05-13/endpoint-rule-set-1.json +++ b/models/apis/runtime.sagemaker/2017-05-13/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" }, @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,14 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -62,67 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack 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" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "isSet", "argv": [ { - "ref": "UseDualStack" - }, - true + "ref": "Region" + } ] } ], @@ -131,224 +111,288 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] + "ref": "Region" } - ] - }, + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsDualStack" + true ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://runtime.sagemaker-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", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsFIPS" + true ] } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "stringEquals", + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", "argv": [ - "aws", + true, { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "name" + "supportsDualStack" ] } ] } ], - "endpoint": { - "url": "https://runtime-fips.sagemaker.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://runtime.sagemaker-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": "stringEquals", + "fn": "booleanEquals", "argv": [ - "aws-us-gov", + true, { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "name" + "supportsFIPS" ] } ] } ], - "endpoint": { - "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + "aws", + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "name" + ] + } + ] + } + ], + "endpoint": { + "url": "https://runtime-fips.sagemaker.{Region}.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + "aws-us-gov", + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "name" + ] + } + ] + } + ], + "endpoint": { + "url": "https://runtime.sagemaker.{Region}.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [], + "endpoint": { + "url": "https://runtime.sagemaker-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] }, { "conditions": [], - "endpoint": { - "url": "https://runtime.sagemaker-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" } ] - } - ] - }, - { - "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, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsDualStack" + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], - "endpoint": { - "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } ] }, { "conditions": [], - "endpoint": { - "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/models/apis/runtime.sagemaker/2017-05-13/endpoint-tests-1.json b/models/apis/runtime.sagemaker/2017-05-13/endpoint-tests-1.json index b35573ad7bc..e8f9a07a30e 100644 --- a/models/apis/runtime.sagemaker/2017-05-13/endpoint-tests-1.json +++ b/models/apis/runtime.sagemaker/2017-05-13/endpoint-tests-1.json @@ -1,1466 +1,523 @@ { "testCases": [ { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.ap-south-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-south-1" - } - }, - { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.ap-south-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-south-1" - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ap-south-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "ap-south-1" - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ap-south-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-south-1" - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.eu-south-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-south-1" - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.eu-south-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-south-1" - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-south-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-south-1" - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-south-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-south-1" - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.us-gov-east-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "us-gov-east-1" - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.us-gov-east-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "us-gov-east-1" - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.us-gov-east-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "us-gov-east-1" - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.us-gov-east-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "us-gov-east-1" - } - }, - { - "documentation": "For region me-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.me-central-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "me-central-1" - } - }, - { - "documentation": "For region me-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.me-central-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "me-central-1" - } - }, - { - "documentation": "For region me-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.me-central-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "me-central-1" - } - }, - { - "documentation": "For region me-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.me-central-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "me-central-1" - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.ca-central-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "ca-central-1" - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.ca-central-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "ca-central-1" - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ca-central-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "ca-central-1" - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ca-central-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "ca-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.eu-central-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.eu-central-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-central-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-central-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.us-west-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "us-west-1" - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.us-west-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "us-west-1" - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.us-west-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "us-west-1" - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.us-west-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "us-west-1" - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.us-west-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "us-west-2" - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.us-west-2.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "us-west-2" - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.us-west-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "us-west-2" - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.us-west-2.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "us-west-2" - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.af-south-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "af-south-1" - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.af-south-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "af-south-1" - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.af-south-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "af-south-1" - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.af-south-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "af-south-1" - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.eu-north-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-north-1" - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.eu-north-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-north-1" - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-north-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-north-1" - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-north-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-north-1" - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.eu-west-3.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-west-3" - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.eu-west-3.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-west-3" - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-west-3.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-west-3" - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-west-3.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-west-3" - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.eu-west-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-west-2" - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.eu-west-2.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-west-2" - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-west-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-west-2" - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-west-2.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-west-2" - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.eu-west-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-west-1" - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.eu-west-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-west-1" - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-west-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-west-1" - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.eu-west-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-west-1" - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.ap-northeast-3.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-northeast-3" - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.ap-northeast-3.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-northeast-3" - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ap-northeast-3.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "ap-northeast-3" - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ap-northeast-3.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-northeast-3" - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.ap-northeast-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-northeast-2" - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.ap-northeast-2.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-northeast-2" - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ap-northeast-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "ap-northeast-2" - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ap-northeast-2.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-northeast-2" - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.ap-northeast-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-northeast-1" - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.ap-northeast-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-northeast-1" - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ap-northeast-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "ap-northeast-1" - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.ap-northeast-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-northeast-1" - } - }, - { - "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.me-south-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "me-south-1" - } - }, - { - "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime-fips.sagemaker.me-south-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "me-south-1" - } - }, - { - "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.me-south-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "me-south-1" - } - }, - { - "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker.me-south-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "me-south-1" - } - }, - { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.sa-east-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "sa-east-1" - } - }, - { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime-fips.sagemaker.sa-east-1.amazonaws.com" + "url": "https://runtime.sagemaker.af-south-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "sa-east-1" + "Region": "af-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.sa-east-1.api.aws" + "url": "https://runtime.sagemaker.ap-east-1.amazonaws.com" } }, "params": { - "UseDualStack": true, + "Region": "ap-east-1", "UseFIPS": false, - "Region": "sa-east-1" + "UseDualStack": false } }, { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.sa-east-1.amazonaws.com" + "url": "https://runtime.sagemaker.ap-northeast-1.amazonaws.com" } }, "params": { - "UseDualStack": false, + "Region": "ap-northeast-1", "UseFIPS": false, - "Region": "sa-east-1" + "UseDualStack": false } }, { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.ap-east-1.api.aws" + "url": "https://runtime.sagemaker.ap-northeast-2.amazonaws.com" } }, "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-east-1" + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime-fips.sagemaker.ap-east-1.amazonaws.com" + "url": "https://runtime.sagemaker.ap-northeast-3.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-east-1" + "Region": "ap-northeast-3", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.ap-east-1.api.aws" + "url": "https://runtime.sagemaker.ap-south-1.amazonaws.com" } }, "params": { - "UseDualStack": true, + "Region": "ap-south-1", "UseFIPS": false, - "Region": "ap-east-1" + "UseDualStack": false } }, { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.ap-east-1.amazonaws.com" + "url": "https://runtime.sagemaker.ap-southeast-1.amazonaws.com" } }, "params": { - "UseDualStack": false, + "Region": "ap-southeast-1", "UseFIPS": false, - "Region": "ap-east-1" + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://runtime.sagemaker.ap-southeast-2.amazonaws.com" } }, "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "cn-north-1" + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.cn-north-1.amazonaws.com.cn" + "url": "https://runtime.sagemaker.ca-central-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "cn-north-1" + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://runtime.sagemaker.eu-central-1.amazonaws.com" } }, "params": { - "UseDualStack": true, + "Region": "eu-central-1", "UseFIPS": false, - "Region": "cn-north-1" + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.cn-north-1.amazonaws.com.cn" + "url": "https://runtime.sagemaker.eu-north-1.amazonaws.com" } }, "params": { - "UseDualStack": false, + "Region": "eu-north-1", "UseFIPS": false, - "Region": "cn-north-1" + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.us-gov-west-1.api.aws" + "url": "https://runtime.sagemaker.eu-south-1.amazonaws.com" } }, "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "us-gov-west-1" + "Region": "eu-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.us-gov-west-1.amazonaws.com" + "url": "https://runtime.sagemaker.eu-west-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "us-gov-west-1" + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.us-gov-west-1.api.aws" + "url": "https://runtime.sagemaker.eu-west-2.amazonaws.com" } }, "params": { - "UseDualStack": true, + "Region": "eu-west-2", "UseFIPS": false, - "Region": "us-gov-west-1" + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.us-gov-west-1.amazonaws.com" + "url": "https://runtime.sagemaker.eu-west-3.amazonaws.com" } }, "params": { - "UseDualStack": false, + "Region": "eu-west-3", "UseFIPS": false, - "Region": "us-gov-west-1" + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.ap-southeast-1.api.aws" + "url": "https://runtime.sagemaker.me-south-1.amazonaws.com" } }, "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-southeast-1" + "Region": "me-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime-fips.sagemaker.ap-southeast-1.amazonaws.com" + "url": "https://runtime.sagemaker.sa-east-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-southeast-1" + "Region": "sa-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.ap-southeast-1.api.aws" + "url": "https://runtime.sagemaker.us-east-1.amazonaws.com" } }, "params": { - "UseDualStack": true, + "Region": "us-east-1", "UseFIPS": false, - "Region": "ap-southeast-1" + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.ap-southeast-1.amazonaws.com" + "url": "https://runtime-fips.sagemaker.us-east-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-southeast-1" + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.ap-southeast-2.api.aws" + "url": "https://runtime.sagemaker.us-east-2.amazonaws.com" } }, "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-southeast-2" + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime-fips.sagemaker.ap-southeast-2.amazonaws.com" + "url": "https://runtime-fips.sagemaker.us-east-2.amazonaws.com" } }, "params": { - "UseDualStack": false, + "Region": "us-east-2", "UseFIPS": true, - "Region": "ap-southeast-2" + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.ap-southeast-2.api.aws" + "url": "https://runtime.sagemaker.us-west-1.amazonaws.com" } }, "params": { - "UseDualStack": true, + "Region": "us-west-1", "UseFIPS": false, - "Region": "ap-southeast-2" + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.ap-southeast-2.amazonaws.com" + "url": "https://runtime-fips.sagemaker.us-west-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-southeast-2" - } - }, - { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" - }, - "params": { - "UseDualStack": true, + "Region": "us-west-1", "UseFIPS": true, - "Region": "us-iso-east-1" + "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.us-iso-east-1.c2s.ic.gov" + "url": "https://runtime.sagemaker.us-west-2.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "us-iso-east-1" - } - }, - { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" - }, - "params": { - "UseDualStack": true, + "Region": "us-west-2", "UseFIPS": false, - "Region": "us-iso-east-1" + "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.us-iso-east-1.c2s.ic.gov" + "url": "https://runtime-fips.sagemaker.us-west-2.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "us-iso-east-1" + "Region": "us-west-2", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.ap-southeast-3.api.aws" + "url": "https://runtime.sagemaker-fips.us-east-1.api.aws" } }, "params": { - "UseDualStack": true, + "Region": "us-east-1", "UseFIPS": true, - "Region": "ap-southeast-3" + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://runtime-fips.sagemaker.ap-southeast-3.amazonaws.com" + "url": "https://runtime.sagemaker.us-east-1.api.aws" } }, "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-southeast-3" + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.ap-southeast-3.api.aws" + "url": "https://runtime.sagemaker.cn-north-1.amazonaws.com.cn" } }, "params": { - "UseDualStack": true, + "Region": "cn-north-1", "UseFIPS": false, - "Region": "ap-southeast-3" + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.ap-southeast-3.amazonaws.com" + "url": "https://runtime.sagemaker.cn-northwest-1.amazonaws.com.cn" } }, "params": { - "UseDualStack": false, + "Region": "cn-northwest-1", "UseFIPS": false, - "Region": "ap-southeast-3" + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.us-east-1.api.aws" + "url": "https://runtime.sagemaker-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "UseDualStack": true, + "Region": "cn-north-1", "UseFIPS": true, - "Region": "us-east-1" + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime-fips.sagemaker.us-east-1.amazonaws.com" + "url": "https://runtime.sagemaker-fips.cn-north-1.amazonaws.com.cn" } }, "params": { - "UseDualStack": false, + "Region": "cn-north-1", "UseFIPS": true, - "Region": "us-east-1" + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.us-east-1.api.aws" + "url": "https://runtime.sagemaker.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "UseDualStack": true, + "Region": "cn-north-1", "UseFIPS": false, - "Region": "us-east-1" + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.us-east-1.amazonaws.com" + "url": "https://runtime.sagemaker.us-gov-west-1.amazonaws.com" } }, "params": { - "UseDualStack": false, + "Region": "us-gov-west-1", "UseFIPS": false, - "Region": "us-east-1" + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.us-east-2.api.aws" + "url": "https://runtime.sagemaker.us-gov-west-1.amazonaws.com" } }, "params": { - "UseDualStack": true, + "Region": "us-gov-west-1", "UseFIPS": true, - "Region": "us-east-2" + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://runtime-fips.sagemaker.us-east-2.amazonaws.com" + "url": "https://runtime.sagemaker-fips.us-gov-east-1.api.aws" } }, "params": { - "UseDualStack": false, + "Region": "us-gov-east-1", "UseFIPS": true, - "Region": "us-east-2" + "UseDualStack": true } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.us-east-2.api.aws" + "url": "https://runtime.sagemaker.us-gov-east-1.amazonaws.com" } }, "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "us-east-2" + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.us-east-2.amazonaws.com" + "url": "https://runtime.sagemaker.us-gov-east-1.api.aws" } }, "params": { - "UseDualStack": false, + "Region": "us-gov-east-1", "UseFIPS": false, - "Region": "us-east-2" - } - }, - { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://runtime.sagemaker-fips.cn-northwest-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "cn-northwest-1" + "UseDualStack": true } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker-fips.cn-northwest-1.amazonaws.com.cn" + "url": "https://runtime.sagemaker.us-gov-east-1.amazonaws.com" } }, "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "cn-northwest-1" + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://runtime.sagemaker.us-iso-east-1.c2s.ic.gov" } }, "params": { - "UseDualStack": true, + "Region": "us-iso-east-1", "UseFIPS": false, - "Region": "cn-northwest-1" + "UseDualStack": false } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.cn-northwest-1.amazonaws.com.cn" + "url": "https://runtime.sagemaker-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "cn-northwest-1" - } - }, - { - "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" - }, - "params": { - "UseDualStack": true, + "Region": "us-iso-east-1", "UseFIPS": true, - "Region": "us-isob-east-1" + "UseDualStack": false } }, { @@ -1471,46 +528,48 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-isob-east-1", "UseFIPS": true, - "Region": "us-isob-east-1" + "UseDualStack": false } }, { - "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" + "endpoint": { + "url": "https://runtime.sagemaker.us-isob-east-1.sc2s.sgov.gov" + } }, "params": { - "UseDualStack": true, + "Region": "us-isob-east-1", "UseFIPS": false, - "Region": "us-isob-east-1" + "UseDualStack": false } }, { - "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { - "url": "https://runtime.sagemaker.us-isob-east-1.sc2s.sgov.gov" + "url": "https://example.com" } }, "params": { - "UseDualStack": false, + "Region": "us-east-1", "UseFIPS": false, - "Region": "us-isob-east-1" + "UseDualStack": false, + "Endpoint": "https://example.com" } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" } }, "params": { - "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-1", + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1520,9 +579,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseDualStack": false, - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1532,9 +591,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseDualStack": true, - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } } diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index d7ba532db9f..f0d2de3cec5 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -19194,8 +19194,32 @@ }, "dlm" : { "endpoints" : { - "us-gov-east-1" : { }, - "us-gov-west-1" : { } + "us-gov-east-1" : { + "variants" : [ { + "hostname" : "dlm.us-gov-east-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, + "us-gov-east-1-fips" : { + "credentialScope" : { + "region" : "us-gov-east-1" + }, + "deprecated" : true, + "hostname" : "dlm.us-gov-east-1.amazonaws.com" + }, + "us-gov-west-1" : { + "variants" : [ { + "hostname" : "dlm.us-gov-west-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, + "us-gov-west-1-fips" : { + "credentialScope" : { + "region" : "us-gov-west-1" + }, + "deprecated" : true, + "hostname" : "dlm.us-gov-west-1.amazonaws.com" + } } }, "dms" : { diff --git a/service/guardduty/api.go b/service/guardduty/api.go index c7fc8ac01bb..a0ae8a42372 100644 --- a/service/guardduty/api.go +++ b/service/guardduty/api.go @@ -408,7 +408,9 @@ func (c *GuardDuty) CreateFilterRequest(input *CreateFilterInput) (req *request. // CreateFilter API operation for Amazon GuardDuty. // -// Creates a filter using the specified finding criteria. +// Creates a filter using the specified finding criteria. The maximum number +// of saved filters per Amazon Web Services account per Region is 100. For more +// information, see Quotas for GuardDuty (https://docs.aws.amazon.com/guardduty/latest/ug/guardduty_limits.html). // // 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 @@ -1719,6 +1721,12 @@ func (c *GuardDuty) DescribeOrganizationConfigurationRequest(input *DescribeOrga Name: opDescribeOrganizationConfiguration, HTTPMethod: "GET", HTTPPath: "/detector/{detectorId}/admin", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } if input == nil { @@ -1776,6 +1784,57 @@ func (c *GuardDuty) DescribeOrganizationConfigurationWithContext(ctx aws.Context return out, req.Send() } +// DescribeOrganizationConfigurationPages iterates over the pages of a DescribeOrganizationConfiguration operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See DescribeOrganizationConfiguration method for more information on how to use this operation. +// +// Note: This operation can generate multiple requests to a service. +// +// // Example iterating over at most 3 pages of a DescribeOrganizationConfiguration operation. +// pageNum := 0 +// err := client.DescribeOrganizationConfigurationPages(params, +// func(page *guardduty.DescribeOrganizationConfigurationOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +func (c *GuardDuty) DescribeOrganizationConfigurationPages(input *DescribeOrganizationConfigurationInput, fn func(*DescribeOrganizationConfigurationOutput, bool) bool) error { + return c.DescribeOrganizationConfigurationPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// DescribeOrganizationConfigurationPagesWithContext same as DescribeOrganizationConfigurationPages except +// it takes a Context and allows setting request options on the pages. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *GuardDuty) DescribeOrganizationConfigurationPagesWithContext(ctx aws.Context, input *DescribeOrganizationConfigurationInput, fn func(*DescribeOrganizationConfigurationOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *DescribeOrganizationConfigurationInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.DescribeOrganizationConfigurationRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*DescribeOrganizationConfigurationOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + const opDescribePublishingDestination = "DescribePublishingDestination" // DescribePublishingDestinationRequest generates a "aws/request.Request" representing the @@ -6508,7 +6567,12 @@ type AccountFreeTrialInfo struct { AccountId *string `locationName:"accountId" type:"string"` // Describes the data source enabled for the GuardDuty member account. - DataSources *DataSourcesFreeTrial `locationName:"dataSources" type:"structure"` + // + // Deprecated: This parameter is deprecated, use Features instead + DataSources *DataSourcesFreeTrial `locationName:"dataSources" deprecated:"true" type:"structure"` + + // A list of features enabled for the GuardDuty account. + Features []*FreeTrialFeatureConfigurationResult `locationName:"features" type:"list"` } // String returns the string representation. @@ -6541,6 +6605,12 @@ func (s *AccountFreeTrialInfo) SetDataSources(v *DataSourcesFreeTrial) *AccountF return s } +// SetFeatures sets the Features field's value. +func (s *AccountFreeTrialInfo) SetFeatures(v []*FreeTrialFeatureConfigurationResult) *AccountFreeTrialInfo { + s.Features = v + return s +} + // Contains information about the account level permissions on the S3 bucket. type AccountLevelPermissions struct { _ struct{} `type:"structure"` @@ -6594,6 +6664,9 @@ type Action struct { // Information about the PORT_PROBE action described in this finding. PortProbeAction *PortProbeAction `locationName:"portProbeAction" type:"structure"` + + // Information about RDS_LOGIN_ATTEMPT action described in this finding. + RdsLoginAttemptAction *RdsLoginAttemptAction `locationName:"rdsLoginAttemptAction" type:"structure"` } // String returns the string representation. @@ -6650,6 +6723,12 @@ func (s *Action) SetPortProbeAction(v *PortProbeAction) *Action { return s } +// SetRdsLoginAttemptAction sets the RdsLoginAttemptAction field's value. +func (s *Action) SetRdsLoginAttemptAction(v *RdsLoginAttemptAction) *Action { + s.RdsLoginAttemptAction = v + return s +} + // The account within the organization specified as the GuardDuty delegated // administrator. type AdminAccount struct { @@ -7530,13 +7609,18 @@ type CreateDetectorInput struct { // There might be regional differences because some data sources might not be // available in all the Amazon Web Services Regions where GuardDuty is presently // supported. For more information, see Regions and endpoints (https://docs.aws.amazon.com/guardduty/latest/ug/guardduty_regions.html). - DataSources *DataSourceConfigurations `locationName:"dataSources" type:"structure"` + // + // Deprecated: This parameter is deprecated, use Features instead + DataSources *DataSourceConfigurations `locationName:"dataSources" deprecated:"true" type:"structure"` // A Boolean value that specifies whether the detector is to be enabled. // // Enable is a required field Enable *bool `locationName:"enable" type:"boolean" required:"true"` + // A list of features that will be configured for the detector. + Features []*DetectorFeatureConfiguration `locationName:"features" type:"list"` + // A value that specifies how frequently updated findings are exported. FindingPublishingFrequency *string `locationName:"findingPublishingFrequency" type:"string" enum:"FindingPublishingFrequency"` @@ -7601,6 +7685,12 @@ func (s *CreateDetectorInput) SetEnable(v bool) *CreateDetectorInput { return s } +// SetFeatures sets the Features field's value. +func (s *CreateDetectorInput) SetFeatures(v []*DetectorFeatureConfiguration) *CreateDetectorInput { + s.Features = v + return s +} + // SetFindingPublishingFrequency sets the FindingPublishingFrequency field's value. func (s *CreateDetectorInput) SetFindingPublishingFrequency(v string) *CreateDetectorInput { s.FindingPublishingFrequency = &v @@ -7665,8 +7755,9 @@ type CreateFilterInput struct { ClientToken *string `locationName:"clientToken" type:"string" idempotencyToken:"true"` // The description of the filter. Valid characters include alphanumeric characters, - // and special characters such as -, ., :, { }, [ ], ( ), /, \t, \n, \x0B, \f, - // \r, _, and whitespace. + // and special characters such as hyphen, period, colon, underscore, parentheses + // ({ }, [ ], and ( )), forward slash, horizontal tab, vertical tab, newline, + // form feed, return, and whitespace. Description *string `locationName:"description" type:"string"` // The ID of the detector belonging to the GuardDuty account that you want to @@ -9792,6 +9883,16 @@ type DescribeOrganizationConfigurationInput struct { // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` + + // You can use this parameter to indicate the maximum number of items that you + // want in the response. + MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` + + // You can use this parameter when paginating results. Set the value of this + // parameter to null on your first call to the list action. For subsequent calls + // to the action, fill nextToken in the request with the value of NextToken + // from the previous response to continue listing data. + NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` } // String returns the string representation. @@ -9821,6 +9922,9 @@ func (s *DescribeOrganizationConfigurationInput) Validate() error { if s.DetectorId != nil && len(*s.DetectorId) < 1 { invalidParams.Add(request.NewErrParamMinLen("DetectorId", 1)) } + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } if invalidParams.Len() > 0 { return invalidParams @@ -9834,6 +9938,18 @@ func (s *DescribeOrganizationConfigurationInput) SetDetectorId(v string) *Descri return s } +// SetMaxResults sets the MaxResults field's value. +func (s *DescribeOrganizationConfigurationInput) SetMaxResults(v int64) *DescribeOrganizationConfigurationInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *DescribeOrganizationConfigurationInput) SetNextToken(v string) *DescribeOrganizationConfigurationInput { + s.NextToken = &v + return s +} + type DescribeOrganizationConfigurationOutput struct { _ struct{} `type:"structure"` @@ -9844,13 +9960,22 @@ type DescribeOrganizationConfigurationOutput struct { AutoEnable *bool `locationName:"autoEnable" type:"boolean" required:"true"` // Describes which data sources are enabled automatically for member accounts. - DataSources *OrganizationDataSourceConfigurationsResult `locationName:"dataSources" type:"structure"` + // + // Deprecated: This parameter is deprecated, use Features instead + DataSources *OrganizationDataSourceConfigurationsResult `locationName:"dataSources" deprecated:"true" type:"structure"` + + // A list of features that are configured for this organization. + Features []*OrganizationFeatureConfigurationResult `locationName:"features" type:"list"` // Indicates whether the maximum number of allowed member accounts are already // associated with the delegated administrator account for your organization. // // MemberAccountLimitReached is a required field MemberAccountLimitReached *bool `locationName:"memberAccountLimitReached" type:"boolean" required:"true"` + + // The pagination parameter to be used on the next list operation to retrieve + // more items. + NextToken *string `locationName:"nextToken" type:"string"` } // String returns the string representation. @@ -9883,12 +10008,24 @@ func (s *DescribeOrganizationConfigurationOutput) SetDataSources(v *Organization return s } +// SetFeatures sets the Features field's value. +func (s *DescribeOrganizationConfigurationOutput) SetFeatures(v []*OrganizationFeatureConfigurationResult) *DescribeOrganizationConfigurationOutput { + s.Features = v + return s +} + // SetMemberAccountLimitReached sets the MemberAccountLimitReached field's value. func (s *DescribeOrganizationConfigurationOutput) SetMemberAccountLimitReached(v bool) *DescribeOrganizationConfigurationOutput { s.MemberAccountLimitReached = &v return s } +// SetNextToken sets the NextToken field's value. +func (s *DescribeOrganizationConfigurationOutput) SetNextToken(v string) *DescribeOrganizationConfigurationOutput { + s.NextToken = &v + return s +} + type DescribePublishingDestinationInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -10138,6 +10275,97 @@ func (s *DestinationProperties) SetKmsKeyArn(v string) *DestinationProperties { return s } +// Contains information about a GuardDuty feature. +type DetectorFeatureConfiguration struct { + _ struct{} `type:"structure"` + + // The name of the feature. + Name *string `locationName:"name" type:"string" enum:"DetectorFeature"` + + // The status of the feature. + Status *string `locationName:"status" type:"string" enum:"FeatureStatus"` +} + +// 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 DetectorFeatureConfiguration) 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 DetectorFeatureConfiguration) GoString() string { + return s.String() +} + +// SetName sets the Name field's value. +func (s *DetectorFeatureConfiguration) SetName(v string) *DetectorFeatureConfiguration { + s.Name = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *DetectorFeatureConfiguration) SetStatus(v string) *DetectorFeatureConfiguration { + s.Status = &v + return s +} + +// Contains information about a GuardDuty feature. +type DetectorFeatureConfigurationResult struct { + _ struct{} `type:"structure"` + + // Indicates the name of the feature that can be enabled for the detector. + Name *string `locationName:"name" type:"string" enum:"DetectorFeatureResult"` + + // Indicates the status of the feature that is enabled for the detector. + Status *string `locationName:"status" type:"string" enum:"FeatureStatus"` + + // The timestamp at which the feature object was updated. + UpdatedAt *time.Time `locationName:"updatedAt" type:"timestamp"` +} + +// 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 DetectorFeatureConfigurationResult) 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 DetectorFeatureConfigurationResult) GoString() string { + return s.String() +} + +// SetName sets the Name field's value. +func (s *DetectorFeatureConfigurationResult) SetName(v string) *DetectorFeatureConfigurationResult { + s.Name = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *DetectorFeatureConfigurationResult) SetStatus(v string) *DetectorFeatureConfigurationResult { + s.Status = &v + return s +} + +// SetUpdatedAt sets the UpdatedAt field's value. +func (s *DetectorFeatureConfigurationResult) SetUpdatedAt(v time.Time) *DetectorFeatureConfigurationResult { + s.UpdatedAt = &v + return s +} + type DisableOrganizationAdminAccountInput struct { _ struct{} `type:"structure"` @@ -11540,6 +11768,47 @@ func (s *FlowLogsConfigurationResult) SetStatus(v string) *FlowLogsConfiguration return s } +// Contains information about the free trial period for a feature. +type FreeTrialFeatureConfigurationResult struct { + _ struct{} `type:"structure"` + + // The number of the remaining free trial days for the feature. + FreeTrialDaysRemaining *int64 `locationName:"freeTrialDaysRemaining" type:"integer"` + + // The name of the feature for which the free trial is configured. + Name *string `locationName:"name" type:"string" enum:"FreeTrialFeatureResult"` +} + +// 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 FreeTrialFeatureConfigurationResult) 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 FreeTrialFeatureConfigurationResult) GoString() string { + return s.String() +} + +// SetFreeTrialDaysRemaining sets the FreeTrialDaysRemaining field's value. +func (s *FreeTrialFeatureConfigurationResult) SetFreeTrialDaysRemaining(v int64) *FreeTrialFeatureConfigurationResult { + s.FreeTrialDaysRemaining = &v + return s +} + +// SetName sets the Name field's value. +func (s *FreeTrialFeatureConfigurationResult) SetName(v string) *FreeTrialFeatureConfigurationResult { + s.Name = &v + return s +} + // Contains information about the location of the remote IP address. type GeoLocation struct { _ struct{} `type:"structure"` @@ -11719,7 +11988,12 @@ type GetDetectorOutput struct { CreatedAt *string `locationName:"createdAt" type:"string"` // Describes which data sources are enabled for the detector. - DataSources *DataSourceConfigurationsResult `locationName:"dataSources" type:"structure"` + // + // Deprecated: This parameter is deprecated, use Features instead + DataSources *DataSourceConfigurationsResult `locationName:"dataSources" deprecated:"true" type:"structure"` + + // Describes the features that have been enabled for the detector. + Features []*DetectorFeatureConfigurationResult `locationName:"features" type:"list"` // The publishing frequency of the finding. FindingPublishingFrequency *string `locationName:"findingPublishingFrequency" type:"string" enum:"FindingPublishingFrequency"` @@ -11771,6 +12045,12 @@ func (s *GetDetectorOutput) SetDataSources(v *DataSourceConfigurationsResult) *G return s } +// SetFeatures sets the Features field's value. +func (s *GetDetectorOutput) SetFeatures(v []*DetectorFeatureConfigurationResult) *GetDetectorOutput { + s.Features = v + return s +} + // SetFindingPublishingFrequency sets the FindingPublishingFrequency field's value. func (s *GetDetectorOutput) SetFindingPublishingFrequency(v string) *GetDetectorOutput { s.FindingPublishingFrequency = &v @@ -15419,6 +15699,67 @@ func (s *LocalPortDetails) SetPortName(v string) *LocalPortDetails { return s } +// Information about the login attempts. +type LoginAttribute struct { + _ struct{} `type:"structure"` + + // Indicates the application name used to attempt log in. + Application *string `locationName:"application" type:"string"` + + // Represents the sum of failed (unsuccessful) login attempts made to establish + // a connection to the database instance. + FailedLoginAttempts *int64 `locationName:"failedLoginAttempts" type:"integer"` + + // Represents the sum of successful connections (a correct combination of login + // attributes) made to the database instance by the actor. + SuccessfulLoginAttempts *int64 `locationName:"successfulLoginAttempts" type:"integer"` + + // Indicates the user name which attempted to log in. + User *string `locationName:"user" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s LoginAttribute) 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 LoginAttribute) GoString() string { + return s.String() +} + +// SetApplication sets the Application field's value. +func (s *LoginAttribute) SetApplication(v string) *LoginAttribute { + s.Application = &v + return s +} + +// SetFailedLoginAttempts sets the FailedLoginAttempts field's value. +func (s *LoginAttribute) SetFailedLoginAttempts(v int64) *LoginAttribute { + s.FailedLoginAttempts = &v + return s +} + +// SetSuccessfulLoginAttempts sets the SuccessfulLoginAttempts field's value. +func (s *LoginAttribute) SetSuccessfulLoginAttempts(v int64) *LoginAttribute { + s.SuccessfulLoginAttempts = &v + return s +} + +// SetUser sets the User field's value. +func (s *LoginAttribute) SetUser(v string) *LoginAttribute { + s.User = &v + return s +} + // Describes whether Malware Protection will be enabled as a data source. type MalwareProtectionConfiguration struct { _ struct{} `type:"structure"` @@ -15703,8 +16044,11 @@ type MemberDataSourceConfiguration struct { // Contains information on the status of data sources for the account. // - // DataSources is a required field - DataSources *DataSourceConfigurationsResult `locationName:"dataSources" type:"structure" required:"true"` + // Deprecated: This parameter is deprecated, use Features instead + DataSources *DataSourceConfigurationsResult `locationName:"dataSources" deprecated:"true" type:"structure"` + + // Contains information about the status of the features for the member account. + Features []*MemberFeaturesConfigurationResult `locationName:"features" type:"list"` } // String returns the string representation. @@ -15737,22 +16081,119 @@ func (s *MemberDataSourceConfiguration) SetDataSources(v *DataSourceConfiguratio return s } -// Contains information about the NETWORK_CONNECTION action described in the -// finding. -type NetworkConnectionAction struct { - _ struct{} `type:"structure"` - - // Indicates whether EC2 blocked the network connection to your instance. - Blocked *bool `locationName:"blocked" type:"boolean"` +// SetFeatures sets the Features field's value. +func (s *MemberDataSourceConfiguration) SetFeatures(v []*MemberFeaturesConfigurationResult) *MemberDataSourceConfiguration { + s.Features = v + return s +} - // The network connection direction. - ConnectionDirection *string `locationName:"connectionDirection" type:"string"` +// Contains information about the features for the member account. +type MemberFeaturesConfiguration struct { + _ struct{} `type:"structure"` - // The local IP information of the connection. - LocalIpDetails *LocalIpDetails `locationName:"localIpDetails" type:"structure"` + // The name of the feature. + Name *string `locationName:"name" type:"string" enum:"OrgFeature"` - // The local port information of the connection. - LocalPortDetails *LocalPortDetails `locationName:"localPortDetails" type:"structure"` + // The status of the feature. + Status *string `locationName:"status" type:"string" enum:"FeatureStatus"` +} + +// 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 MemberFeaturesConfiguration) 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 MemberFeaturesConfiguration) GoString() string { + return s.String() +} + +// SetName sets the Name field's value. +func (s *MemberFeaturesConfiguration) SetName(v string) *MemberFeaturesConfiguration { + s.Name = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *MemberFeaturesConfiguration) SetStatus(v string) *MemberFeaturesConfiguration { + s.Status = &v + return s +} + +// Contains information about the features for the member account. +type MemberFeaturesConfigurationResult struct { + _ struct{} `type:"structure"` + + // Indicates the name of the feature that is enabled for the detector. + Name *string `locationName:"name" type:"string" enum:"OrgFeature"` + + // Indicates the status of the feature that is enabled for the detector. + Status *string `locationName:"status" type:"string" enum:"FeatureStatus"` + + // The timestamp at which the feature object was updated. + UpdatedAt *time.Time `locationName:"updatedAt" type:"timestamp"` +} + +// 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 MemberFeaturesConfigurationResult) 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 MemberFeaturesConfigurationResult) GoString() string { + return s.String() +} + +// SetName sets the Name field's value. +func (s *MemberFeaturesConfigurationResult) SetName(v string) *MemberFeaturesConfigurationResult { + s.Name = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *MemberFeaturesConfigurationResult) SetStatus(v string) *MemberFeaturesConfigurationResult { + s.Status = &v + return s +} + +// SetUpdatedAt sets the UpdatedAt field's value. +func (s *MemberFeaturesConfigurationResult) SetUpdatedAt(v time.Time) *MemberFeaturesConfigurationResult { + s.UpdatedAt = &v + return s +} + +// Contains information about the NETWORK_CONNECTION action described in the +// finding. +type NetworkConnectionAction struct { + _ struct{} `type:"structure"` + + // Indicates whether EC2 blocked the network connection to your instance. + Blocked *bool `locationName:"blocked" type:"boolean"` + + // The network connection direction. + ConnectionDirection *string `locationName:"connectionDirection" type:"string"` + + // The local IP information of the connection. + LocalIpDetails *LocalIpDetails `locationName:"localIpDetails" type:"structure"` + + // The local port information of the connection. + LocalPortDetails *LocalPortDetails `locationName:"localPortDetails" type:"structure"` // The network connection protocol. Protocol *string `locationName:"protocol" type:"string"` @@ -16190,6 +16631,96 @@ func (s *OrganizationEbsVolumesResult) SetAutoEnable(v bool) *OrganizationEbsVol return s } +// A list of features which will be configured for the organization. +type OrganizationFeatureConfiguration struct { + _ struct{} `type:"structure"` + + // The status of the feature that will be configured for the organization. + AutoEnable *string `locationName:"autoEnable" type:"string" enum:"OrgFeatureStatus"` + + // The name of the feature that will be configured for the organization. + Name *string `locationName:"name" type:"string" enum:"OrgFeature"` +} + +// 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 OrganizationFeatureConfiguration) 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 OrganizationFeatureConfiguration) GoString() string { + return s.String() +} + +// SetAutoEnable sets the AutoEnable field's value. +func (s *OrganizationFeatureConfiguration) SetAutoEnable(v string) *OrganizationFeatureConfiguration { + s.AutoEnable = &v + return s +} + +// SetName sets the Name field's value. +func (s *OrganizationFeatureConfiguration) SetName(v string) *OrganizationFeatureConfiguration { + s.Name = &v + return s +} + +// A list of features which will be configured for the organization. +type OrganizationFeatureConfigurationResult struct { + _ struct{} `type:"structure"` + + // Describes how The status of the feature that are configured for the member + // accounts within the organization. + // + // If you set AutoEnable to NEW, a feature will be configured for only the new + // accounts when they join the organization. + // + // If you set AutoEnable to NONE, no feature will be configured for the accounts + // when they join the organization. + AutoEnable *string `locationName:"autoEnable" type:"string" enum:"OrgFeatureStatus"` + + // The name of the feature that is configured for the member accounts within + // the organization. + Name *string `locationName:"name" type:"string" enum:"OrgFeature"` +} + +// 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 OrganizationFeatureConfigurationResult) 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 OrganizationFeatureConfigurationResult) GoString() string { + return s.String() +} + +// SetAutoEnable sets the AutoEnable field's value. +func (s *OrganizationFeatureConfigurationResult) SetAutoEnable(v string) *OrganizationFeatureConfigurationResult { + s.AutoEnable = &v + return s +} + +// SetName sets the Name field's value. +func (s *OrganizationFeatureConfigurationResult) SetName(v string) *OrganizationFeatureConfigurationResult { + s.Name = &v + return s +} + // Organization-wide Kubernetes audit logs configuration. type OrganizationKubernetesAuditLogsConfiguration struct { _ struct{} `type:"structure"` @@ -16870,6 +17401,198 @@ func (s *PublicAccess) SetPermissionConfiguration(v *PermissionConfiguration) *P return s } +// Contains information about the resource type RDSDBInstance involved in a +// GuardDuty finding. +type RdsDbInstanceDetails struct { + _ struct{} `type:"structure"` + + // The identifier of the database cluster that contains the database instance + // ID involved in the finding. + DbClusterIdentifier *string `locationName:"dbClusterIdentifier" type:"string"` + + // The Amazon Resource Name (ARN) that identifies the database instance involved + // in the finding. + DbInstanceArn *string `locationName:"dbInstanceArn" type:"string"` + + // The identifier associated to the database instance that was involved in the + // finding. + DbInstanceIdentifier *string `locationName:"dbInstanceIdentifier" type:"string"` + + // The database engine of the database instance involved in the finding. + Engine *string `locationName:"engine" type:"string"` + + // The version of the database engine that was involved in the finding. + EngineVersion *string `locationName:"engineVersion" type:"string"` + + // Instance tag key-value pairs associated with the database instance ID. + Tags []*Tag `locationName:"tags" 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 RdsDbInstanceDetails) 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 RdsDbInstanceDetails) GoString() string { + return s.String() +} + +// SetDbClusterIdentifier sets the DbClusterIdentifier field's value. +func (s *RdsDbInstanceDetails) SetDbClusterIdentifier(v string) *RdsDbInstanceDetails { + s.DbClusterIdentifier = &v + return s +} + +// SetDbInstanceArn sets the DbInstanceArn field's value. +func (s *RdsDbInstanceDetails) SetDbInstanceArn(v string) *RdsDbInstanceDetails { + s.DbInstanceArn = &v + return s +} + +// SetDbInstanceIdentifier sets the DbInstanceIdentifier field's value. +func (s *RdsDbInstanceDetails) SetDbInstanceIdentifier(v string) *RdsDbInstanceDetails { + s.DbInstanceIdentifier = &v + return s +} + +// SetEngine sets the Engine field's value. +func (s *RdsDbInstanceDetails) SetEngine(v string) *RdsDbInstanceDetails { + s.Engine = &v + return s +} + +// SetEngineVersion sets the EngineVersion field's value. +func (s *RdsDbInstanceDetails) SetEngineVersion(v string) *RdsDbInstanceDetails { + s.EngineVersion = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *RdsDbInstanceDetails) SetTags(v []*Tag) *RdsDbInstanceDetails { + s.Tags = v + return s +} + +// Contains information about the user and authentication details for a database +// instance involved in the finding. +type RdsDbUserDetails struct { + _ struct{} `type:"structure"` + + // The application name used in the anomalous login attempt. + Application *string `locationName:"application" type:"string"` + + // The authentication method used by the user involved in the finding. + AuthMethod *string `locationName:"authMethod" type:"string"` + + // The name of the database instance involved in the anomalous login attempt. + Database *string `locationName:"database" type:"string"` + + // The version of the Secure Socket Layer (SSL) used for the network. + Ssl *string `locationName:"ssl" type:"string"` + + // The user name used in the anomalous login attempt. + User *string `locationName:"user" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s RdsDbUserDetails) 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 RdsDbUserDetails) GoString() string { + return s.String() +} + +// SetApplication sets the Application field's value. +func (s *RdsDbUserDetails) SetApplication(v string) *RdsDbUserDetails { + s.Application = &v + return s +} + +// SetAuthMethod sets the AuthMethod field's value. +func (s *RdsDbUserDetails) SetAuthMethod(v string) *RdsDbUserDetails { + s.AuthMethod = &v + return s +} + +// SetDatabase sets the Database field's value. +func (s *RdsDbUserDetails) SetDatabase(v string) *RdsDbUserDetails { + s.Database = &v + return s +} + +// SetSsl sets the Ssl field's value. +func (s *RdsDbUserDetails) SetSsl(v string) *RdsDbUserDetails { + s.Ssl = &v + return s +} + +// SetUser sets the User field's value. +func (s *RdsDbUserDetails) SetUser(v string) *RdsDbUserDetails { + s.User = &v + return s +} + +// Indicates that a login attempt was made to the potentially compromised database +// from a remote IP address. +type RdsLoginAttemptAction struct { + _ struct{} `type:"structure"` + + // Indicates the login attributes used in the login attempt. + LoginAttributes []*LoginAttribute `type:"list"` + + // Contains information about the remote IP address of the connection. + RemoteIpDetails *RemoteIpDetails `locationName:"remoteIpDetails" 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 RdsLoginAttemptAction) 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 RdsLoginAttemptAction) GoString() string { + return s.String() +} + +// SetLoginAttributes sets the LoginAttributes field's value. +func (s *RdsLoginAttemptAction) SetLoginAttributes(v []*LoginAttribute) *RdsLoginAttemptAction { + s.LoginAttributes = v + return s +} + +// SetRemoteIpDetails sets the RemoteIpDetails field's value. +func (s *RdsLoginAttemptAction) SetRemoteIpDetails(v *RemoteIpDetails) *RdsLoginAttemptAction { + s.RemoteIpDetails = v + return s +} + // Contains details about the remote Amazon Web Services account that made the // API call. type RemoteAccountDetails struct { @@ -17052,6 +17775,14 @@ type Resource struct { // Details about the Kubernetes user and workload involved in a Kubernetes finding. KubernetesDetails *KubernetesDetails `locationName:"kubernetesDetails" type:"structure"` + // Contains information about the database instance to which an anomalous login + // attempt was made. + RdsDbInstanceDetails *RdsDbInstanceDetails `locationName:"rdsDbInstanceDetails" type:"structure"` + + // Contains information about the user details through which anomalous login + // attempt was made. + RdsDbUserDetails *RdsDbUserDetails `locationName:"rdsDbUserDetails" type:"structure"` + // The type of Amazon Web Services resource. ResourceType *string `locationName:"resourceType" type:"string"` @@ -17119,6 +17850,18 @@ func (s *Resource) SetKubernetesDetails(v *KubernetesDetails) *Resource { return s } +// SetRdsDbInstanceDetails sets the RdsDbInstanceDetails field's value. +func (s *Resource) SetRdsDbInstanceDetails(v *RdsDbInstanceDetails) *Resource { + s.RdsDbInstanceDetails = v + return s +} + +// SetRdsDbUserDetails sets the RdsDbUserDetails field's value. +func (s *Resource) SetRdsDbUserDetails(v *RdsDbUserDetails) *Resource { + s.RdsDbUserDetails = v + return s +} + // SetResourceType sets the ResourceType field's value. func (s *Resource) SetResourceType(v string) *Resource { s.ResourceType = &v @@ -19118,7 +19861,9 @@ type UpdateDetectorInput struct { // There might be regional differences because some data sources might not be // available in all the Amazon Web Services Regions where GuardDuty is presently // supported. For more information, see Regions and endpoints (https://docs.aws.amazon.com/guardduty/latest/ug/guardduty_regions.html). - DataSources *DataSourceConfigurations `locationName:"dataSources" type:"structure"` + // + // Deprecated: This parameter is deprecated, use Features instead + DataSources *DataSourceConfigurations `locationName:"dataSources" deprecated:"true" type:"structure"` // The unique ID of the detector to update. // @@ -19128,6 +19873,9 @@ type UpdateDetectorInput struct { // Specifies whether the detector is enabled or not enabled. Enable *bool `locationName:"enable" type:"boolean"` + // Provides the features that will be updated for the detector. + Features []*DetectorFeatureConfiguration `locationName:"features" type:"list"` + // An enum value that specifies how frequently findings are exported, such as // to CloudWatch Events. FindingPublishingFrequency *string `locationName:"findingPublishingFrequency" type:"string" enum:"FindingPublishingFrequency"` @@ -19190,6 +19938,12 @@ func (s *UpdateDetectorInput) SetEnable(v bool) *UpdateDetectorInput { return s } +// SetFeatures sets the Features field's value. +func (s *UpdateDetectorInput) SetFeatures(v []*DetectorFeatureConfiguration) *UpdateDetectorInput { + s.Features = v + return s +} + // SetFindingPublishingFrequency sets the FindingPublishingFrequency field's value. func (s *UpdateDetectorInput) SetFindingPublishingFrequency(v string) *UpdateDetectorInput { s.FindingPublishingFrequency = &v @@ -19700,12 +20454,17 @@ type UpdateMemberDetectorsInput struct { AccountIds []*string `locationName:"accountIds" min:"1" type:"list" required:"true"` // Describes which data sources will be updated. - DataSources *DataSourceConfigurations `locationName:"dataSources" type:"structure"` + // + // Deprecated: This parameter is deprecated, use Features instead + DataSources *DataSourceConfigurations `locationName:"dataSources" deprecated:"true" type:"structure"` // The detector ID of the administrator account. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` + + // A list of features that will be updated for the specified member accounts. + Features []*MemberFeaturesConfiguration `locationName:"features" type:"list"` } // String returns the string representation. @@ -19771,6 +20530,12 @@ func (s *UpdateMemberDetectorsInput) SetDetectorId(v string) *UpdateMemberDetect return s } +// SetFeatures sets the Features field's value. +func (s *UpdateMemberDetectorsInput) SetFeatures(v []*MemberFeaturesConfiguration) *UpdateMemberDetectorsInput { + s.Features = v + return s +} + type UpdateMemberDetectorsOutput struct { _ struct{} `type:"structure"` @@ -19814,12 +20579,17 @@ type UpdateOrganizationConfigurationInput struct { AutoEnable *bool `locationName:"autoEnable" type:"boolean" required:"true"` // Describes which data sources will be updated. - DataSources *OrganizationDataSourceConfigurations `locationName:"dataSources" type:"structure"` + // + // Deprecated: This parameter is deprecated, use Features instead + DataSources *OrganizationDataSourceConfigurations `locationName:"dataSources" deprecated:"true" type:"structure"` // The ID of the detector to update the delegated administrator for. // // DetectorId is a required field DetectorId *string `location:"uri" locationName:"detectorId" min:"1" type:"string" required:"true"` + + // A list of features that will be configured for the organization. + Features []*OrganizationFeatureConfiguration `locationName:"features" type:"list"` } // String returns the string representation. @@ -19882,6 +20652,12 @@ func (s *UpdateOrganizationConfigurationInput) SetDetectorId(v string) *UpdateOr return s } +// SetFeatures sets the Features field's value. +func (s *UpdateOrganizationConfigurationInput) SetFeatures(v []*OrganizationFeatureConfiguration) *UpdateOrganizationConfigurationInput { + s.Features = v + return s +} + type UpdateOrganizationConfigurationOutput struct { _ struct{} `type:"structure"` } @@ -20175,8 +20951,11 @@ type UsageCriteria struct { // The data sources to aggregate usage statistics from. // - // DataSources is a required field - DataSources []*string `locationName:"dataSources" type:"list" required:"true" enum:"DataSource"` + // Deprecated: This parameter is deprecated, use Features instead + DataSources []*string `locationName:"dataSources" deprecated:"true" type:"list" enum:"DataSource"` + + // The features to aggregate usage statistics from. + Features []*string `locationName:"features" type:"list" enum:"UsageFeature"` // The resources to aggregate usage statistics from. Only accepts exact resource // names. @@ -20207,9 +20986,6 @@ func (s *UsageCriteria) Validate() error { if s.AccountIds != nil && len(s.AccountIds) < 1 { invalidParams.Add(request.NewErrParamMinLen("AccountIds", 1)) } - if s.DataSources == nil { - invalidParams.Add(request.NewErrParamRequired("DataSources")) - } if invalidParams.Len() > 0 { return invalidParams @@ -20229,6 +21005,12 @@ func (s *UsageCriteria) SetDataSources(v []*string) *UsageCriteria { return s } +// SetFeatures sets the Features field's value. +func (s *UsageCriteria) SetFeatures(v []*string) *UsageCriteria { + s.Features = v + return s +} + // SetResources sets the Resources field's value. func (s *UsageCriteria) SetResources(v []*string) *UsageCriteria { s.Resources = v @@ -20276,6 +21058,47 @@ func (s *UsageDataSourceResult) SetTotal(v *Total) *UsageDataSourceResult { return s } +// Contains information about the result of the total usage based on the feature. +type UsageFeatureResult struct { + _ struct{} `type:"structure"` + + // The feature that generated the usage cost. + Feature *string `locationName:"feature" type:"string" enum:"UsageFeature"` + + // Contains the total usage with the corresponding currency unit for that value. + Total *Total `locationName:"total" 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 UsageFeatureResult) 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 UsageFeatureResult) GoString() string { + return s.String() +} + +// SetFeature sets the Feature field's value. +func (s *UsageFeatureResult) SetFeature(v string) *UsageFeatureResult { + s.Feature = &v + return s +} + +// SetTotal sets the Total field's value. +func (s *UsageFeatureResult) SetTotal(v *Total) *UsageFeatureResult { + s.Total = v + return s +} + // Contains information on the sum of usage based on an Amazon Web Services // resource. type UsageResourceResult struct { @@ -20329,6 +21152,9 @@ type UsageStatistics struct { // The usage statistic sum organized by on data source. SumByDataSource []*UsageDataSourceResult `locationName:"sumByDataSource" type:"list"` + // The usage statistic sum organized by feature. + SumByFeature []*UsageFeatureResult `locationName:"sumByFeature" type:"list"` + // The usage statistic sum organized by resource. SumByResource []*UsageResourceResult `locationName:"sumByResource" type:"list"` @@ -20367,6 +21193,12 @@ func (s *UsageStatistics) SetSumByDataSource(v []*UsageDataSourceResult) *UsageS return s } +// SetSumByFeature sets the SumByFeature field's value. +func (s *UsageStatistics) SetSumByFeature(v []*UsageFeatureResult) *UsageStatistics { + s.SumByFeature = v + return s +} + // SetSumByResource sets the SumByResource field's value. func (s *UsageStatistics) SetSumByResource(v []*UsageResourceResult) *UsageStatistics { s.SumByResource = v @@ -20656,6 +21488,66 @@ func DestinationType_Values() []string { } } +const ( + // DetectorFeatureS3DataEvents is a DetectorFeature enum value + DetectorFeatureS3DataEvents = "S3_DATA_EVENTS" + + // DetectorFeatureEksAuditLogs is a DetectorFeature enum value + DetectorFeatureEksAuditLogs = "EKS_AUDIT_LOGS" + + // DetectorFeatureEbsMalwareProtection is a DetectorFeature enum value + DetectorFeatureEbsMalwareProtection = "EBS_MALWARE_PROTECTION" + + // DetectorFeatureRdsLoginEvents is a DetectorFeature enum value + DetectorFeatureRdsLoginEvents = "RDS_LOGIN_EVENTS" +) + +// DetectorFeature_Values returns all elements of the DetectorFeature enum +func DetectorFeature_Values() []string { + return []string{ + DetectorFeatureS3DataEvents, + DetectorFeatureEksAuditLogs, + DetectorFeatureEbsMalwareProtection, + DetectorFeatureRdsLoginEvents, + } +} + +const ( + // DetectorFeatureResultFlowLogs is a DetectorFeatureResult enum value + DetectorFeatureResultFlowLogs = "FLOW_LOGS" + + // DetectorFeatureResultCloudTrail is a DetectorFeatureResult enum value + DetectorFeatureResultCloudTrail = "CLOUD_TRAIL" + + // DetectorFeatureResultDnsLogs is a DetectorFeatureResult enum value + DetectorFeatureResultDnsLogs = "DNS_LOGS" + + // DetectorFeatureResultS3DataEvents is a DetectorFeatureResult enum value + DetectorFeatureResultS3DataEvents = "S3_DATA_EVENTS" + + // DetectorFeatureResultEksAuditLogs is a DetectorFeatureResult enum value + DetectorFeatureResultEksAuditLogs = "EKS_AUDIT_LOGS" + + // DetectorFeatureResultEbsMalwareProtection is a DetectorFeatureResult enum value + DetectorFeatureResultEbsMalwareProtection = "EBS_MALWARE_PROTECTION" + + // DetectorFeatureResultRdsLoginEvents is a DetectorFeatureResult enum value + DetectorFeatureResultRdsLoginEvents = "RDS_LOGIN_EVENTS" +) + +// DetectorFeatureResult_Values returns all elements of the DetectorFeatureResult enum +func DetectorFeatureResult_Values() []string { + return []string{ + DetectorFeatureResultFlowLogs, + DetectorFeatureResultCloudTrail, + DetectorFeatureResultDnsLogs, + DetectorFeatureResultS3DataEvents, + DetectorFeatureResultEksAuditLogs, + DetectorFeatureResultEbsMalwareProtection, + DetectorFeatureResultRdsLoginEvents, + } +} + const ( // DetectorStatusEnabled is a DetectorStatus enum value DetectorStatusEnabled = "ENABLED" @@ -20688,6 +21580,22 @@ func EbsSnapshotPreservation_Values() []string { } } +const ( + // FeatureStatusEnabled is a FeatureStatus enum value + FeatureStatusEnabled = "ENABLED" + + // FeatureStatusDisabled is a FeatureStatus enum value + FeatureStatusDisabled = "DISABLED" +) + +// FeatureStatus_Values returns all elements of the FeatureStatus enum +func FeatureStatus_Values() []string { + return []string{ + FeatureStatusEnabled, + FeatureStatusDisabled, + } +} + const ( // FeedbackUseful is a Feedback enum value FeedbackUseful = "USEFUL" @@ -20752,6 +21660,42 @@ func FindingStatisticType_Values() []string { } } +const ( + // FreeTrialFeatureResultFlowLogs is a FreeTrialFeatureResult enum value + FreeTrialFeatureResultFlowLogs = "FLOW_LOGS" + + // FreeTrialFeatureResultCloudTrail is a FreeTrialFeatureResult enum value + FreeTrialFeatureResultCloudTrail = "CLOUD_TRAIL" + + // FreeTrialFeatureResultDnsLogs is a FreeTrialFeatureResult enum value + FreeTrialFeatureResultDnsLogs = "DNS_LOGS" + + // FreeTrialFeatureResultS3DataEvents is a FreeTrialFeatureResult enum value + FreeTrialFeatureResultS3DataEvents = "S3_DATA_EVENTS" + + // FreeTrialFeatureResultEksAuditLogs is a FreeTrialFeatureResult enum value + FreeTrialFeatureResultEksAuditLogs = "EKS_AUDIT_LOGS" + + // FreeTrialFeatureResultEbsMalwareProtection is a FreeTrialFeatureResult enum value + FreeTrialFeatureResultEbsMalwareProtection = "EBS_MALWARE_PROTECTION" + + // FreeTrialFeatureResultRdsLoginEvents is a FreeTrialFeatureResult enum value + FreeTrialFeatureResultRdsLoginEvents = "RDS_LOGIN_EVENTS" +) + +// FreeTrialFeatureResult_Values returns all elements of the FreeTrialFeatureResult enum +func FreeTrialFeatureResult_Values() []string { + return []string{ + FreeTrialFeatureResultFlowLogs, + FreeTrialFeatureResultCloudTrail, + FreeTrialFeatureResultDnsLogs, + FreeTrialFeatureResultS3DataEvents, + FreeTrialFeatureResultEksAuditLogs, + FreeTrialFeatureResultEbsMalwareProtection, + FreeTrialFeatureResultRdsLoginEvents, + } +} + const ( // IpSetFormatTxt is a IpSetFormat enum value IpSetFormatTxt = "TXT" @@ -20836,6 +21780,46 @@ func OrderBy_Values() []string { } } +const ( + // OrgFeatureS3DataEvents is a OrgFeature enum value + OrgFeatureS3DataEvents = "S3_DATA_EVENTS" + + // OrgFeatureEksAuditLogs is a OrgFeature enum value + OrgFeatureEksAuditLogs = "EKS_AUDIT_LOGS" + + // OrgFeatureEbsMalwareProtection is a OrgFeature enum value + OrgFeatureEbsMalwareProtection = "EBS_MALWARE_PROTECTION" + + // OrgFeatureRdsLoginEvents is a OrgFeature enum value + OrgFeatureRdsLoginEvents = "RDS_LOGIN_EVENTS" +) + +// OrgFeature_Values returns all elements of the OrgFeature enum +func OrgFeature_Values() []string { + return []string{ + OrgFeatureS3DataEvents, + OrgFeatureEksAuditLogs, + OrgFeatureEbsMalwareProtection, + OrgFeatureRdsLoginEvents, + } +} + +const ( + // OrgFeatureStatusNew is a OrgFeatureStatus enum value + OrgFeatureStatusNew = "NEW" + + // OrgFeatureStatusNone is a OrgFeatureStatus enum value + OrgFeatureStatusNone = "NONE" +) + +// OrgFeatureStatus_Values returns all elements of the OrgFeatureStatus enum +func OrgFeatureStatus_Values() []string { + return []string{ + OrgFeatureStatusNew, + OrgFeatureStatusNone, + } +} + const ( // PublishingStatusPendingVerification is a PublishingStatus enum value PublishingStatusPendingVerification = "PENDING_VERIFICATION" @@ -20978,6 +21962,50 @@ func ThreatIntelSetStatus_Values() []string { } } +const ( + // UsageFeatureFlowLogs is a UsageFeature enum value + UsageFeatureFlowLogs = "FLOW_LOGS" + + // UsageFeatureCloudTrail is a UsageFeature enum value + UsageFeatureCloudTrail = "CLOUD_TRAIL" + + // UsageFeatureDnsLogs is a UsageFeature enum value + UsageFeatureDnsLogs = "DNS_LOGS" + + // UsageFeatureS3DataEvents is a UsageFeature enum value + UsageFeatureS3DataEvents = "S3_DATA_EVENTS" + + // UsageFeatureEksAuditLogs is a UsageFeature enum value + UsageFeatureEksAuditLogs = "EKS_AUDIT_LOGS" + + // UsageFeatureEbsMalwareProtection is a UsageFeature enum value + UsageFeatureEbsMalwareProtection = "EBS_MALWARE_PROTECTION" + + // UsageFeatureRdsLoginEvents is a UsageFeature enum value + UsageFeatureRdsLoginEvents = "RDS_LOGIN_EVENTS" + + // UsageFeatureLambdaNetworkLogs is a UsageFeature enum value + UsageFeatureLambdaNetworkLogs = "LAMBDA_NETWORK_LOGS" + + // UsageFeatureEksRuntimeMonitoring is a UsageFeature enum value + UsageFeatureEksRuntimeMonitoring = "EKS_RUNTIME_MONITORING" +) + +// UsageFeature_Values returns all elements of the UsageFeature enum +func UsageFeature_Values() []string { + return []string{ + UsageFeatureFlowLogs, + UsageFeatureCloudTrail, + UsageFeatureDnsLogs, + UsageFeatureS3DataEvents, + UsageFeatureEksAuditLogs, + UsageFeatureEbsMalwareProtection, + UsageFeatureRdsLoginEvents, + UsageFeatureLambdaNetworkLogs, + UsageFeatureEksRuntimeMonitoring, + } +} + const ( // UsageStatisticTypeSumByAccount is a UsageStatisticType enum value UsageStatisticTypeSumByAccount = "SUM_BY_ACCOUNT" @@ -20990,6 +22018,9 @@ const ( // UsageStatisticTypeTopResources is a UsageStatisticType enum value UsageStatisticTypeTopResources = "TOP_RESOURCES" + + // UsageStatisticTypeSumByFeatures is a UsageStatisticType enum value + UsageStatisticTypeSumByFeatures = "SUM_BY_FEATURES" ) // UsageStatisticType_Values returns all elements of the UsageStatisticType enum @@ -20999,5 +22030,6 @@ func UsageStatisticType_Values() []string { UsageStatisticTypeSumByDataSource, UsageStatisticTypeSumByResource, UsageStatisticTypeTopResources, + UsageStatisticTypeSumByFeatures, } } diff --git a/service/guardduty/guarddutyiface/interface.go b/service/guardduty/guarddutyiface/interface.go index 9a258598c5b..0733caaef9c 100644 --- a/service/guardduty/guarddutyiface/interface.go +++ b/service/guardduty/guarddutyiface/interface.go @@ -143,6 +143,9 @@ type GuardDutyAPI interface { DescribeOrganizationConfigurationWithContext(aws.Context, *guardduty.DescribeOrganizationConfigurationInput, ...request.Option) (*guardduty.DescribeOrganizationConfigurationOutput, error) DescribeOrganizationConfigurationRequest(*guardduty.DescribeOrganizationConfigurationInput) (*request.Request, *guardduty.DescribeOrganizationConfigurationOutput) + DescribeOrganizationConfigurationPages(*guardduty.DescribeOrganizationConfigurationInput, func(*guardduty.DescribeOrganizationConfigurationOutput, bool) bool) error + DescribeOrganizationConfigurationPagesWithContext(aws.Context, *guardduty.DescribeOrganizationConfigurationInput, func(*guardduty.DescribeOrganizationConfigurationOutput, bool) bool, ...request.Option) error + DescribePublishingDestination(*guardduty.DescribePublishingDestinationInput) (*guardduty.DescribePublishingDestinationOutput, error) DescribePublishingDestinationWithContext(aws.Context, *guardduty.DescribePublishingDestinationInput, ...request.Option) (*guardduty.DescribePublishingDestinationOutput, error) DescribePublishingDestinationRequest(*guardduty.DescribePublishingDestinationInput) (*request.Request, *guardduty.DescribePublishingDestinationOutput) diff --git a/service/resourceexplorer2/api.go b/service/resourceexplorer2/api.go index 5fd4011a7c8..a4cb9c412f0 100644 --- a/service/resourceexplorer2/api.go +++ b/service/resourceexplorer2/api.go @@ -314,9 +314,9 @@ func (c *ResourceExplorer2) CreateIndexRequest(input *CreateIndexInput) (req *re // the syntax for the operation, and try again. // // - ConflictException -// You tried to create a new view or index when one already exists, and you -// either didn't specify or specified a different idempotency token as the original -// request. +// The request failed because either you specified parameters that didn’t +// match the original request, or you attempted to create a view with a name +// that already exists in this Amazon Web Services Region. // // - ThrottlingException // The request failed because you exceeded a rate limit for this operation. @@ -419,9 +419,9 @@ func (c *ResourceExplorer2) CreateViewRequest(input *CreateViewInput) (req *requ // the syntax for the operation, and try again. // // - ConflictException -// You tried to create a new view or index when one already exists, and you -// either didn't specify or specified a different idempotency token as the original -// request. +// The request failed because either you specified parameters that didn’t +// match the original request, or you attempted to create a view with a name +// that already exists in this Amazon Web Services Region. // // - ServiceQuotaExceededException // The request failed because it exceeds a service quota. @@ -1854,9 +1854,9 @@ func (c *ResourceExplorer2) TagResourceRequest(input *TagResourceInput) (req *re // the syntax for the operation, and try again. // // - ConflictException -// You tried to create a new view or index when one already exists, and you -// either didn't specify or specified a different idempotency token as the original -// request. +// The request failed because either you specified parameters that didn’t +// match the original request, or you attempted to create a view with a name +// that already exists in this Amazon Web Services Region. // // - UnauthorizedException // The principal making the request isn't permitted to perform the operation. @@ -2101,9 +2101,9 @@ func (c *ResourceExplorer2) UpdateIndexTypeRequest(input *UpdateIndexTypeInput) // the syntax for the operation, and try again. // // - ConflictException -// You tried to create a new view or index when one already exists, and you -// either didn't specify or specified a different idempotency token as the original -// request. +// The request failed because either you specified parameters that didn’t +// match the original request, or you attempted to create a view with a name +// that already exists in this Amazon Web Services Region. // // - ServiceQuotaExceededException // The request failed because it exceeds a service quota. @@ -2522,9 +2522,9 @@ func (s *BatchGetViewOutput) SetViews(v []*View) *BatchGetViewOutput { return s } -// You tried to create a new view or index when one already exists, and you -// either didn't specify or specified a different idempotency token as the original -// request. +// The request failed because either you specified parameters that didn’t +// match the original request, or you attempted to create a view with a name +// that already exists in this Amazon Web Services Region. type ConflictException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` diff --git a/service/resourceexplorer2/errors.go b/service/resourceexplorer2/errors.go index db1053455d6..8d9818b8047 100644 --- a/service/resourceexplorer2/errors.go +++ b/service/resourceexplorer2/errors.go @@ -18,9 +18,9 @@ const ( // ErrCodeConflictException for service response error code // "ConflictException". // - // You tried to create a new view or index when one already exists, and you - // either didn't specify or specified a different idempotency token as the original - // request. + // The request failed because either you specified parameters that didn’t + // match the original request, or you attempted to create a view with a name + // that already exists in this Amazon Web Services Region. ErrCodeConflictException = "ConflictException" // ErrCodeInternalServerException for service response error code diff --git a/service/sagemakerruntime/api.go b/service/sagemakerruntime/api.go index 89f349011b4..3e100a227f5 100644 --- a/service/sagemakerruntime/api.go +++ b/service/sagemakerruntime/api.go @@ -411,11 +411,11 @@ type InvokeEndpointAsyncInput struct { InputLocation *string `location:"header" locationName:"X-Amzn-SageMaker-InputLocation" min:"1" type:"string" required:"true"` // Maximum amount of time in seconds a request can be processed before it is - // marked as expired. + // marked as expired. The default is 15 minutes, or 900 seconds. InvocationTimeoutSeconds *int64 `location:"header" locationName:"X-Amzn-SageMaker-InvocationTimeoutSeconds" min:"1" type:"integer"` // Maximum age in seconds a request can be in the queue before it is marked - // as expired. + // as expired. The default is 6 hours, or 21,600 seconds. RequestTTLSeconds *int64 `location:"header" locationName:"X-Amzn-SageMaker-RequestTTLSeconds" min:"60" type:"integer"` }