diff --git a/.changes/2.1281.0.json b/.changes/2.1281.0.json new file mode 100644 index 0000000000..19fe2fe9a5 --- /dev/null +++ b/.changes/2.1281.0.json @@ -0,0 +1,27 @@ +[ + { + "type": "feature", + "category": "ComputeOptimizer", + "description": "This release enables AWS Compute Optimizer to analyze and generate optimization recommendations for ecs services running on Fargate." + }, + { + "type": "feature", + "category": "Connect", + "description": "Amazon Connect Chat introduces the Idle Participant/Autodisconnect feature, which allows users to set timeouts relating to the activity of chat participants, using the new UpdateParticipantRoleConfig API." + }, + { + "type": "feature", + "category": "IotDeviceAdvisor", + "description": "This release adds the following new features: 1) Documentation updates for IoT Device Advisor APIs. 2) Updated required request parameters for IoT Device Advisor APIs. 3) Added new service feature: ability to provide the test endpoint when customer executing the StartSuiteRun API." + }, + { + "type": "feature", + "category": "KinesisVideoWebRTCStorage", + "description": "Amazon Kinesis Video Streams offers capabilities to stream video and audio in real-time via WebRTC to the cloud for storage, playback, and analytical processing. Customers can use our enhanced WebRTC SDK and cloud APIs to enable real-time streaming, as well as media ingestion to the cloud." + }, + { + "type": "feature", + "category": "RDS", + "description": "Add support for managing master user password in AWS Secrets Manager for the DBInstance and DBCluster." + } +] \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 360ec4cd26..b9fb0a2a65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ # Changelog for AWS SDK for JavaScript - + +## 2.1281.0 +* feature: ComputeOptimizer: This release enables AWS Compute Optimizer to analyze and generate optimization recommendations for ecs services running on Fargate. +* feature: Connect: Amazon Connect Chat introduces the Idle Participant/Autodisconnect feature, which allows users to set timeouts relating to the activity of chat participants, using the new UpdateParticipantRoleConfig API. +* feature: IotDeviceAdvisor: This release adds the following new features: 1) Documentation updates for IoT Device Advisor APIs. 2) Updated required request parameters for IoT Device Advisor APIs. 3) Added new service feature: ability to provide the test endpoint when customer executing the StartSuiteRun API. +* feature: KinesisVideoWebRTCStorage: Amazon Kinesis Video Streams offers capabilities to stream video and audio in real-time via WebRTC to the cloud for storage, playback, and analytical processing. Customers can use our enhanced WebRTC SDK and cloud APIs to enable real-time streaming, as well as media ingestion to the cloud. +* feature: RDS: Add support for managing master user password in AWS Secrets Manager for the DBInstance and DBCluster. + ## 2.1280.0 * feature: Connect: Amazon Connect Chat now allows for JSON (application/json) message types to be sent as part of the initial message in the StartChatContact API. * feature: ConnectParticipant: Amazon Connect Chat now allows for JSON (application/json) message types to be sent in the SendMessage API. diff --git a/README.md b/README.md index 014b3ab8eb..0202084cba 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ for further details. To use the SDK in the browser, simply add the following script tag to your HTML pages: - + You can also build a custom browser SDK with your specified set of AWS services. This can allow you to reduce the SDK's size, specify different API versions of diff --git a/apis/compute-optimizer-2019-11-01.min.json b/apis/compute-optimizer-2019-11-01.min.json index 57f010a004..83b5706741 100644 --- a/apis/compute-optimizer-2019-11-01.min.json +++ b/apis/compute-optimizer-2019-11-01.min.json @@ -209,7 +209,7 @@ } } }, - "ExportLambdaFunctionRecommendations": { + "ExportECSServiceRecommendations": { "input": { "type": "structure", "required": [ @@ -245,6 +245,42 @@ } } }, + "ExportLambdaFunctionRecommendations": { + "input": { + "type": "structure", + "required": [ + "s3DestinationConfig" + ], + "members": { + "accountIds": { + "shape": "Sw" + }, + "filters": { + "shape": "S1u" + }, + "fieldsToExport": { + "type": "list", + "member": {} + }, + "s3DestinationConfig": { + "shape": "S13" + }, + "fileFormat": {}, + "includeMemberAccounts": { + "type": "boolean" + } + } + }, + "output": { + "type": "structure", + "members": { + "jobId": {}, + "s3Destination": { + "shape": "Sn" + } + } + } + }, "GetAutoScalingGroupRecommendations": { "input": { "type": "structure", @@ -282,13 +318,13 @@ "autoScalingGroupName": {}, "finding": {}, "utilizationMetrics": { - "shape": "S21" + "shape": "S28" }, "lookBackPeriodInDays": { "type": "double" }, "currentConfiguration": { - "shape": "S27" + "shape": "S2e" }, "recommendationOptions": { "type": "list", @@ -296,10 +332,10 @@ "type": "structure", "members": { "configuration": { - "shape": "S27" + "shape": "S2e" }, "projectedUtilizationMetrics": { - "shape": "S2e" + "shape": "S2l" }, "performanceRisk": { "type": "double" @@ -308,7 +344,7 @@ "type": "integer" }, "savingsOpportunity": { - "shape": "S2h" + "shape": "S2o" }, "migrationEffort": {} } @@ -319,16 +355,16 @@ }, "currentPerformanceRisk": {}, "effectiveRecommendationPreferences": { - "shape": "S2p" + "shape": "S2w" }, "inferredWorkloadTypes": { - "shape": "S2u" + "shape": "S31" } } } }, "errors": { - "shape": "S2w" + "shape": "S33" } } } @@ -365,7 +401,7 @@ "volumeArn": {}, "accountId": {}, "currentConfiguration": { - "shape": "S37" + "shape": "S3e" }, "finding": {}, "utilizationMetrics": { @@ -390,7 +426,7 @@ "type": "structure", "members": { "configuration": { - "shape": "S37" + "shape": "S3e" }, "performanceRisk": { "type": "double" @@ -399,7 +435,7 @@ "type": "integer" }, "savingsOpportunity": { - "shape": "S2h" + "shape": "S2o" } } } @@ -412,7 +448,7 @@ } }, "errors": { - "shape": "S2w" + "shape": "S33" } } } @@ -459,7 +495,7 @@ "member": {} }, "utilizationMetrics": { - "shape": "S21" + "shape": "S28" }, "lookBackPeriodInDays": { "type": "double" @@ -471,7 +507,7 @@ "members": { "instanceType": {}, "projectedUtilizationMetrics": { - "shape": "S2e" + "shape": "S2l" }, "platformDifferences": { "type": "list", @@ -484,7 +520,7 @@ "type": "integer" }, "savingsOpportunity": { - "shape": "S2h" + "shape": "S2o" }, "migrationEffort": {} } @@ -505,16 +541,16 @@ }, "currentPerformanceRisk": {}, "effectiveRecommendationPreferences": { - "shape": "S2p" + "shape": "S2w" }, "inferredWorkloadTypes": { - "shape": "S2u" + "shape": "S31" } } } }, "errors": { - "shape": "S2w" + "shape": "S33" } } } @@ -565,22 +601,220 @@ "members": { "name": {}, "timestamps": { + "shape": "S4i" + }, + "values": { + "shape": "S4j" + } + } + } + } + } + } + } + } + } + }, + "GetECSServiceRecommendationProjectedMetrics": { + "input": { + "type": "structure", + "required": [ + "serviceArn", + "stat", + "period", + "startTime", + "endTime" + ], + "members": { + "serviceArn": {}, + "stat": {}, + "period": { + "type": "integer" + }, + "startTime": { + "type": "timestamp" + }, + "endTime": { + "type": "timestamp" + } + } + }, + "output": { + "type": "structure", + "members": { + "recommendedOptionProjectedMetrics": { + "type": "list", + "member": { + "type": "structure", + "members": { + "recommendedCpuUnits": { + "type": "integer" + }, + "recommendedMemorySize": { + "type": "integer" + }, + "projectedMetrics": { + "type": "list", + "member": { + "type": "structure", + "members": { + "name": {}, + "timestamps": { + "shape": "S4i" + }, + "upperBoundValues": { + "shape": "S4j" + }, + "lowerBoundValues": { + "shape": "S4j" + } + } + } + } + } + } + } + } + } + }, + "GetECSServiceRecommendations": { + "input": { + "type": "structure", + "members": { + "serviceArns": { + "type": "list", + "member": {} + }, + "nextToken": {}, + "maxResults": { + "type": "integer" + }, + "filters": { + "shape": "S1n" + }, + "accountIds": { + "shape": "Sw" + } + } + }, + "output": { + "type": "structure", + "members": { + "nextToken": {}, + "ecsServiceRecommendations": { + "type": "list", + "member": { + "type": "structure", + "members": { + "serviceArn": {}, + "accountId": {}, + "currentServiceConfiguration": { + "type": "structure", + "members": { + "memory": { + "type": "integer" + }, + "cpu": { + "type": "integer" + }, + "containerConfigurations": { + "type": "list", + "member": { + "type": "structure", + "members": { + "containerName": {}, + "memorySizeConfiguration": { + "shape": "S55" + }, + "cpu": { + "type": "integer" + } + } + } + }, + "autoScalingConfiguration": {}, + "taskDefinitionArn": {} + } + }, + "utilizationMetrics": { + "type": "list", + "member": { + "type": "structure", + "members": { + "name": {}, + "statistic": {}, + "value": { + "type": "double" + } + } + } + }, + "lookbackPeriodInDays": { + "type": "double" + }, + "launchType": {}, + "lastRefreshTimestamp": { + "type": "timestamp" + }, + "finding": {}, + "findingReasonCodes": { + "type": "list", + "member": {} + }, + "serviceRecommendationOptions": { + "type": "list", + "member": { + "type": "structure", + "members": { + "memory": { + "type": "integer" + }, + "cpu": { + "type": "integer" + }, + "savingsOpportunity": { + "shape": "S2o" + }, + "projectedUtilizationMetrics": { "type": "list", "member": { - "type": "timestamp" + "type": "structure", + "members": { + "name": {}, + "statistic": {}, + "lowerBoundValue": { + "type": "double" + }, + "upperBoundValue": { + "type": "double" + } + } } }, - "values": { + "containerRecommendations": { "type": "list", "member": { - "type": "double" + "type": "structure", + "members": { + "containerName": {}, + "memorySizeConfiguration": { + "shape": "S55" + }, + "cpu": { + "type": "integer" + } + } } } } } - } + }, + "currentPerformanceRisk": {} } } + }, + "errors": { + "shape": "S33" } } } @@ -600,7 +834,7 @@ "members": { "enhancedInfrastructureMetrics": {}, "externalMetricsPreference": { - "shape": "S2s" + "shape": "S2z" } } } @@ -682,7 +916,7 @@ "shape": "Sw" }, "filters": { - "shape": "S1n" + "shape": "S1u" }, "nextToken": {}, "maxResults": { @@ -757,7 +991,7 @@ } }, "savingsOpportunity": { - "shape": "S2h" + "shape": "S2o" } } } @@ -802,7 +1036,7 @@ "enhancedInfrastructureMetrics": {}, "inferredWorkloadTypes": {}, "externalMetricsPreference": { - "shape": "S2s" + "shape": "S2z" } } } @@ -859,7 +1093,7 @@ "recommendationResourceType": {}, "accountId": {}, "savingsOpportunity": { - "shape": "S2h" + "shape": "S2o" }, "currentPerformanceRiskRatings": { "type": "structure", @@ -898,7 +1132,7 @@ "enhancedInfrastructureMetrics": {}, "inferredWorkloadTypes": {}, "externalMetricsPreference": { - "shape": "S2s" + "shape": "S2z" } } }, @@ -1008,13 +1242,25 @@ } } }, - "S21": { + "S1u": { + "type": "list", + "member": { + "type": "structure", + "members": { + "name": {}, + "values": { + "shape": "Sf" + } + } + } + }, + "S28": { "type": "list", "member": { - "shape": "S22" + "shape": "S29" } }, - "S22": { + "S29": { "type": "structure", "members": { "name": {}, @@ -1024,7 +1270,7 @@ } } }, - "S27": { + "S2e": { "type": "structure", "members": { "desiredCapacity": { @@ -1039,13 +1285,13 @@ "instanceType": {} } }, - "S2e": { + "S2l": { "type": "list", "member": { - "shape": "S22" + "shape": "S29" } }, - "S2h": { + "S2o": { "type": "structure", "members": { "savingsOpportunityPercentage": { @@ -1062,7 +1308,7 @@ } } }, - "S2p": { + "S2w": { "type": "structure", "members": { "cpuVendorArchitectures": { @@ -1071,21 +1317,21 @@ "enhancedInfrastructureMetrics": {}, "inferredWorkloadTypes": {}, "externalMetricsPreference": { - "shape": "S2s" + "shape": "S2z" } } }, - "S2s": { + "S2z": { "type": "structure", "members": { "source": {} } }, - "S2u": { + "S31": { "type": "list", "member": {} }, - "S2w": { + "S33": { "type": "list", "member": { "type": "structure", @@ -1096,7 +1342,7 @@ } } }, - "S37": { + "S3e": { "type": "structure", "members": { "volumeType": {}, @@ -1116,6 +1362,29 @@ "type": "integer" } } + }, + "S4i": { + "type": "list", + "member": { + "type": "timestamp" + } + }, + "S4j": { + "type": "list", + "member": { + "type": "double" + } + }, + "S55": { + "type": "structure", + "members": { + "memory": { + "type": "integer" + }, + "memoryReservation": { + "type": "integer" + } + } } } } \ No newline at end of file diff --git a/apis/compute-optimizer-2019-11-01.normal.json b/apis/compute-optimizer-2019-11-01.normal.json index f8924639ba..19acbc2ef0 100644 --- a/apis/compute-optimizer-2019-11-01.normal.json +++ b/apis/compute-optimizer-2019-11-01.normal.json @@ -213,6 +213,46 @@ ], "documentation": "
Exports optimization recommendations for Amazon EC2 instances.
Recommendations are exported in a comma-separated values (.csv) file, and its metadata in a JavaScript Object Notation (JSON) (.json) file, to an existing Amazon Simple Storage Service (Amazon S3) bucket that you specify. For more information, see Exporting Recommendations in the Compute Optimizer User Guide.
You can have only one Amazon EC2 instance export job in progress per Amazon Web Services Region.
" }, + "ExportECSServiceRecommendations": { + "name": "ExportECSServiceRecommendations", + "http": { + "method": "POST", + "requestUri": "/" + }, + "input": { + "shape": "ExportECSServiceRecommendationsRequest" + }, + "output": { + "shape": "ExportECSServiceRecommendationsResponse" + }, + "errors": [ + { + "shape": "OptInRequiredException" + }, + { + "shape": "InternalServerException" + }, + { + "shape": "ServiceUnavailableException" + }, + { + "shape": "AccessDeniedException" + }, + { + "shape": "InvalidParameterValueException" + }, + { + "shape": "MissingAuthenticationToken" + }, + { + "shape": "ThrottlingException" + }, + { + "shape": "LimitExceededException" + } + ], + "documentation": "Exports optimization recommendations for Amazon ECS services on Fargate.
Recommendations are exported in a CSV file, and its metadata in a JSON file, to an existing Amazon Simple Storage Service (Amazon S3) bucket that you specify. For more information, see Exporting Recommendations in the Compute Optimizer User Guide.
You can only have one Amazon ECS service export job in progress per Amazon Web Services Region.
" + }, "ExportLambdaFunctionRecommendations": { "name": "ExportLambdaFunctionRecommendations", "http": { @@ -413,6 +453,86 @@ ], "documentation": "Returns the projected utilization metrics of Amazon EC2 instance recommendations.
The Cpu
and Memory
metrics are the only projected utilization metrics returned when you run this action. Additionally, the Memory
metric is returned only for resources that have the unified CloudWatch agent installed on them. For more information, see Enabling Memory Utilization with the CloudWatch Agent.
Returns the projected metrics of Amazon ECS service recommendations.
" + }, + "GetECSServiceRecommendations": { + "name": "GetECSServiceRecommendations", + "http": { + "method": "POST", + "requestUri": "/" + }, + "input": { + "shape": "GetECSServiceRecommendationsRequest" + }, + "output": { + "shape": "GetECSServiceRecommendationsResponse" + }, + "errors": [ + { + "shape": "OptInRequiredException" + }, + { + "shape": "InternalServerException" + }, + { + "shape": "ServiceUnavailableException" + }, + { + "shape": "AccessDeniedException" + }, + { + "shape": "InvalidParameterValueException" + }, + { + "shape": "ResourceNotFoundException" + }, + { + "shape": "MissingAuthenticationToken" + }, + { + "shape": "ThrottlingException" + } + ], + "documentation": "Returns Amazon ECS service recommendations.
Compute Optimizer generates recommendations for Amazon ECS services on Fargate that meet a specific set of requirements. For more information, see the Supported resources and requirements in the Compute Optimizer User Guide.
" + }, "GetEffectiveRecommendationPreferences": { "name": "GetEffectiveRecommendationPreferences", "http": { @@ -636,7 +756,7 @@ "shape": "ThrottlingException" } ], - "documentation": "Returns the optimization findings for an account.
It returns the number of:
Amazon EC2 instances in an account that are Underprovisioned
, Overprovisioned
, or Optimized
.
Auto Scaling groups in an account that are NotOptimized
, or Optimized
.
Amazon EBS volumes in an account that are NotOptimized
, or Optimized
.
Lambda functions in an account that are NotOptimized
, or Optimized
.
Returns the optimization findings for an account.
It returns the number of:
Amazon EC2 instances in an account that are Underprovisioned
, Overprovisioned
, or Optimized
.
Auto Scaling groups in an account that are NotOptimized
, or Optimized
.
Amazon EBS volumes in an account that are NotOptimized
, or Optimized
.
Lambda functions in an account that are NotOptimized
, or Optimized
.
Amazon ECS services in an account that are Underprovisioned
, Overprovisioned
, or Optimized
.
The name of the container.
" + }, + "memorySizeConfiguration": { + "shape": "MemorySizeConfiguration", + "documentation": "The memory size configurations for the container.
" + }, + "cpu": { + "shape": "NullableCpu", + "documentation": "The number of CPU units reserved for the container.
" + } + }, + "documentation": "Describes the container configurations within the tasks of your Amazon ECS service.
" + }, + "ContainerConfigurations": { + "type": "list", + "member": { + "shape": "ContainerConfiguration" + } + }, + "ContainerName": { + "type": "string" + }, + "ContainerRecommendation": { + "type": "structure", + "members": { + "containerName": { + "shape": "ContainerName", + "documentation": "The name of the container.
" + }, + "memorySizeConfiguration": { + "shape": "MemorySizeConfiguration", + "documentation": "The recommended memory size configurations for the container.
" + }, + "cpu": { + "shape": "NullableCpu", + "documentation": "The recommended number of CPU units reserved for the container.
" + } + }, + "documentation": "The CPU and memory recommendations for a container within the tasks of your Amazon ECS service.
" + }, + "ContainerRecommendations": { + "type": "list", + "member": { + "shape": "ContainerRecommendation" + } + }, + "CpuSize": { + "type": "integer" + }, "CpuVendorArchitecture": { "type": "string", "enum": [ @@ -1078,6 +1259,268 @@ "shape": "EBSUtilizationMetric" } }, + "ECSServiceLaunchType": { + "type": "string", + "enum": [ + "EC2", + "Fargate" + ] + }, + "ECSServiceMetricName": { + "type": "string", + "enum": [ + "Cpu", + "Memory" + ] + }, + "ECSServiceMetricStatistic": { + "type": "string", + "enum": [ + "Maximum", + "Average" + ] + }, + "ECSServiceProjectedMetric": { + "type": "structure", + "members": { + "name": { + "shape": "ECSServiceMetricName", + "documentation": "The name of the projected metric.
The following metrics are available:
CPU
— The percentage of allocated compute units that are currently in use on the ECS service tasks.
Memory
— The percentage of memory that is currently in use on the ECS service tasks.
The timestamps of the projected metric.
" + }, + "upperBoundValues": { + "shape": "MetricValues", + "documentation": "The upper bound values for the projected metric.
" + }, + "lowerBoundValues": { + "shape": "MetricValues", + "documentation": "The lower bound values for the projected metric.
" + } + }, + "documentation": "Describes the projected metrics of an Amazon ECS service recommendation option.
To determine the performance difference between your current ECS service and the recommended option, compare the metric data of your service against its projected metric data.
" + }, + "ECSServiceProjectedMetrics": { + "type": "list", + "member": { + "shape": "ECSServiceProjectedMetric" + } + }, + "ECSServiceProjectedUtilizationMetric": { + "type": "structure", + "members": { + "name": { + "shape": "ECSServiceMetricName", + "documentation": "The name of the projected utilization metric.
The following utilization metrics are available:
CPU
— The percentage of allocated compute units that are currently in use on the ECS service tasks.
Memory
— The percentage of memory that is currently in use on the ECS service tasks.
The statistic of the projected utilization metric.
The Compute Optimizer API, Command Line Interface (CLI), and SDKs return utilization metrics using only the Maximum
statistic, which is the highest value observed during the specified period.
The Compute Optimizer console displays graphs for some utilization metrics using the Average
statistic, which is the value of Sum
/ SampleCount
during the specified period. For more information, see Viewing resource recommendations in the Compute Optimizer User Guide. You can also get averaged utilization metric data for your resources using Amazon CloudWatch. For more information, see the Amazon CloudWatch User Guide.
The lower bound values for the projected utilization metrics.
" + }, + "upperBoundValue": { + "shape": "UpperBoundValue", + "documentation": "The upper bound values for the projected utilization metrics.
" + } + }, + "documentation": "Describes the projected utilization metrics of an Amazon ECS service recommendation option.
To determine the performance difference between your current ECS service and the recommended option, compare the utilization metric data of your service against its projected utilization metric data.
" + }, + "ECSServiceProjectedUtilizationMetrics": { + "type": "list", + "member": { + "shape": "ECSServiceProjectedUtilizationMetric" + } + }, + "ECSServiceRecommendation": { + "type": "structure", + "members": { + "serviceArn": { + "shape": "ServiceArn", + "documentation": "The Amazon Resource Name (ARN) of the current ECS service.
The following is the format of the ARN:
arn:aws:ecs:region:aws_account_id:service/cluster-name/service-name
The Amazon Web Services account ID of the ECS service.
" + }, + "currentServiceConfiguration": { + "shape": "ServiceConfiguration", + "documentation": "The configuration of the current ECS service.
" + }, + "utilizationMetrics": { + "shape": "ECSServiceUtilizationMetrics", + "documentation": "An array of objects that describe the utilization metrics of the ECS service.
" + }, + "lookbackPeriodInDays": { + "shape": "LookBackPeriodInDays", + "documentation": "The number of days the ECS service utilization metrics were analyzed.
" + }, + "launchType": { + "shape": "ECSServiceLaunchType", + "documentation": "The launch type the ECS service is using.
Compute Optimizer only supports the Fargate launch type.
The timestamp of when the ECS service recommendation was last generated.
" + }, + "finding": { + "shape": "ECSServiceRecommendationFinding", + "documentation": "The finding classification of an ECS service.
Findings for ECS services include:
Underprovisioned
— When Compute Optimizer detects that there’s not enough memory or CPU, an ECS service is considered under-provisioned. An under-provisioned ECS service might result in poor application performance.
Overprovisioned
— When Compute Optimizer detects that there’s excessive memory or CPU, an ECS service is considered over-provisioned. An over-provisioned ECS service might result in additional infrastructure costs.
Optimized
— When both the CPU and memory of your ECS service meet the performance requirements of your workload, the service is considered optimized.
The reason for the finding classification of an ECS service.
Finding reason codes for ECS services include:
CPUUnderprovisioned
— The ECS service CPU configuration can be sized up to enhance the performance of your workload. This is identified by analyzing the CPUUtilization
metric of the current service during the look-back period.
CPUOverprovisioned
— The ECS service CPU configuration can be sized down while still meeting the performance requirements of your workload. This is identified by analyzing the CPUUtilization
metric of the current service during the look-back period.
MemoryUnderprovisioned
— The ECS service memory configuration can be sized up to enhance the performance of your workload. This is identified by analyzing the MemoryUtilization
metric of the current service during the look-back period.
MemoryOverprovisioned
— The ECS service memory configuration can be sized down while still meeting the performance requirements of your workload. This is identified by analyzing the MemoryUtilization
metric of the current service during the look-back period.
An array of objects that describe the recommendation options for the ECS service.
" + }, + "currentPerformanceRisk": { + "shape": "CurrentPerformanceRisk", + "documentation": "The risk of the current ECS service not meeting the performance needs of its workloads. The higher the risk, the more likely the current service can't meet the performance requirements of its workload.
" + } + }, + "documentation": "Describes an Amazon ECS service recommendation.
" + }, + "ECSServiceRecommendationFilter": { + "type": "structure", + "members": { + "name": { + "shape": "ECSServiceRecommendationFilterName", + "documentation": "The name of the filter.
Specify Finding
to return recommendations with a specific finding classification.
Specify FindingReasonCode
to return recommendations with a specific finding reason code.
The value of the filter.
The valid values for this parameter are as follows:
If you specify the name
parameter as Finding
, specify Optimized
, NotOptimized
, or Unavailable
.
If you specify the name
parameter as FindingReasonCode
, specify CPUUnderprovisioned
, CPUOverprovisioned
, MemoryUnderprovisioned
, or MemoryOverprovisioned
.
Describes a filter that returns a more specific list of Amazon ECS service recommendations. Use this filter with the GetECSServiceRecommendations action.
" + }, + "ECSServiceRecommendationFilterName": { + "type": "string", + "enum": [ + "Finding", + "FindingReasonCode" + ] + }, + "ECSServiceRecommendationFilters": { + "type": "list", + "member": { + "shape": "ECSServiceRecommendationFilter" + } + }, + "ECSServiceRecommendationFinding": { + "type": "string", + "enum": [ + "Optimized", + "Underprovisioned", + "Overprovisioned" + ] + }, + "ECSServiceRecommendationFindingReasonCode": { + "type": "string", + "enum": [ + "MemoryOverprovisioned", + "MemoryUnderprovisioned", + "CPUOverprovisioned", + "CPUUnderprovisioned" + ] + }, + "ECSServiceRecommendationFindingReasonCodes": { + "type": "list", + "member": { + "shape": "ECSServiceRecommendationFindingReasonCode" + } + }, + "ECSServiceRecommendationOption": { + "type": "structure", + "members": { + "memory": { + "shape": "NullableMemory", + "documentation": "The memory size of the ECS service recommendation option.
" + }, + "cpu": { + "shape": "NullableCpu", + "documentation": "The CPU size of the ECS service recommendation option.
" + }, + "savingsOpportunity": { + "shape": "SavingsOpportunity" + }, + "projectedUtilizationMetrics": { + "shape": "ECSServiceProjectedUtilizationMetrics", + "documentation": "An array of objects that describe the projected utilization metrics of the ECS service recommendation option.
" + }, + "containerRecommendations": { + "shape": "ContainerRecommendations", + "documentation": "The CPU and memory size recommendations for the containers within the task of your ECS service.
" + } + }, + "documentation": "Describes the recommendation options for an Amazon ECS service.
" + }, + "ECSServiceRecommendationOptions": { + "type": "list", + "member": { + "shape": "ECSServiceRecommendationOption" + } + }, + "ECSServiceRecommendations": { + "type": "list", + "member": { + "shape": "ECSServiceRecommendation" + } + }, + "ECSServiceRecommendedOptionProjectedMetric": { + "type": "structure", + "members": { + "recommendedCpuUnits": { + "shape": "CpuSize", + "documentation": "The recommended CPU size for the ECS service.
" + }, + "recommendedMemorySize": { + "shape": "MemorySize", + "documentation": "The recommended memory size for the ECS service.
" + }, + "projectedMetrics": { + "shape": "ECSServiceProjectedMetrics", + "documentation": "An array of objects that describe the projected metric.
" + } + }, + "documentation": "Describes the projected metrics of an Amazon ECS service recommendation option.
To determine the performance difference between your current ECS service and the recommended option, compare the metric data of your service against its projected metric data.
" + }, + "ECSServiceRecommendedOptionProjectedMetrics": { + "type": "list", + "member": { + "shape": "ECSServiceRecommendedOptionProjectedMetric" + } + }, + "ECSServiceUtilizationMetric": { + "type": "structure", + "members": { + "name": { + "shape": "ECSServiceMetricName", + "documentation": "The name of the utilization metric.
The following utilization metrics are available:
Cpu
— The amount of CPU units that are used in the service.
Memory
— The amount of memory that is used in the service.
The statistic of the utilization metric.
The Compute Optimizer API, Command Line Interface (CLI), and SDKs return utilization metrics using only the Maximum
statistic, which is the highest value observed during the specified period.
The Compute Optimizer console displays graphs for some utilization metrics using the Average
statistic, which is the value of Sum
/ SampleCount
during the specified period. For more information, see Viewing resource recommendations in the Compute Optimizer User Guide. You can also get averaged utilization metric data for your resources using Amazon CloudWatch. For more information, see the Amazon CloudWatch User Guide.
The value of the utilization metric.
" + } + }, + "documentation": "Describes the utilization metric of an Amazon ECS service.
To determine the performance difference between your current ECS service and the recommended option, compare the utilization metric data of your service against its projected utilization metric data.
" + }, + "ECSServiceUtilizationMetrics": { + "type": "list", + "member": { + "shape": "ECSServiceUtilizationMetric" + } + }, "EffectiveRecommendationPreferences": { "type": "structure", "members": { @@ -1298,6 +1741,49 @@ } } }, + "ExportECSServiceRecommendationsRequest": { + "type": "structure", + "required": [ + "s3DestinationConfig" + ], + "members": { + "accountIds": { + "shape": "AccountIds", + "documentation": "The Amazon Web Services account IDs for the export ECS service recommendations.
If your account is the management account or the delegated administrator of an organization, use this parameter to specify the member account you want to export recommendations to.
This parameter can't be specified together with the include member accounts parameter. The parameters are mutually exclusive.
If this parameter or the include member accounts parameter is omitted, the recommendations for member accounts aren't included in the export.
You can specify multiple account IDs per request.
" + }, + "filters": { + "shape": "ECSServiceRecommendationFilters", + "documentation": "An array of objects to specify a filter that exports a more specific set of ECS service recommendations.
" + }, + "fieldsToExport": { + "shape": "ExportableECSServiceFields", + "documentation": "The recommendations data to include in the export file. For more information about the fields that can be exported, see Exported files in the Compute Optimizer User Guide.
" + }, + "s3DestinationConfig": { + "shape": "S3DestinationConfig" + }, + "fileFormat": { + "shape": "FileFormat", + "documentation": "The format of the export file.
The CSV file is the only export file format currently supported.
" + }, + "includeMemberAccounts": { + "shape": "IncludeMemberAccounts", + "documentation": "If your account is the management account or the delegated administrator of an organization, this parameter indicates whether to include recommendations for resources in all member accounts of the organization.
The member accounts must also be opted in to Compute Optimizer, and trusted access for Compute Optimizer must be enabled in the organization account. For more information, see Compute Optimizer and Amazon Web Services Organizations trusted access in the Compute Optimizer User Guide.
If this parameter is omitted, recommendations for member accounts of the organization aren't included in the export file.
If this parameter or the account ID parameter is omitted, recommendations for member accounts aren't included in the export.
" + } + } + }, + "ExportECSServiceRecommendationsResponse": { + "type": "structure", + "members": { + "jobId": { + "shape": "JobId", + "documentation": "The identification number of the export job.
To view the status of an export job, use the DescribeRecommendationExportJobs action and specify the job ID.
" + }, + "s3Destination": { + "shape": "S3Destination" + } + } + }, "ExportLambdaFunctionRecommendationsRequest": { "type": "structure", "required": [ @@ -1406,6 +1892,40 @@ "shape": "ExportableAutoScalingGroupField" } }, + "ExportableECSServiceField": { + "type": "string", + "enum": [ + "AccountId", + "ServiceArn", + "LookbackPeriodInDays", + "LastRefreshTimestamp", + "LaunchType", + "CurrentPerformanceRisk", + "CurrentServiceConfigurationMemory", + "CurrentServiceConfigurationCpu", + "CurrentServiceConfigurationTaskDefinitionArn", + "CurrentServiceConfigurationAutoScalingConfiguration", + "CurrentServiceContainerConfigurations", + "UtilizationMetricsCpuMaximum", + "UtilizationMetricsMemoryMaximum", + "Finding", + "FindingReasonCodes", + "RecommendationOptionsMemory", + "RecommendationOptionsCpu", + "RecommendationOptionsSavingsOpportunityPercentage", + "RecommendationOptionsEstimatedMonthlySavingsCurrency", + "RecommendationOptionsEstimatedMonthlySavingsValue", + "RecommendationOptionsContainerRecommendations", + "RecommendationOptionsProjectedUtilizationMetricsCpuMaximum", + "RecommendationOptionsProjectedUtilizationMetricsMemoryMaximum" + ] + }, + "ExportableECSServiceFields": { + "type": "list", + "member": { + "shape": "ExportableECSServiceField" + } + }, "ExportableInstanceField": { "type": "string", "enum": [ @@ -1818,6 +2338,89 @@ } } }, + "GetECSServiceRecommendationProjectedMetricsRequest": { + "type": "structure", + "required": [ + "serviceArn", + "stat", + "period", + "startTime", + "endTime" + ], + "members": { + "serviceArn": { + "shape": "ServiceArn", + "documentation": "The ARN that identifies the ECS service.
The following is the format of the ARN:
arn:aws:ecs:region:aws_account_id:service/cluster-name/service-name
The statistic of the projected metrics.
" + }, + "period": { + "shape": "Period", + "documentation": "The granularity, in seconds, of the projected metrics data points.
" + }, + "startTime": { + "shape": "Timestamp", + "documentation": "The timestamp of the first projected metrics data point to return.
" + }, + "endTime": { + "shape": "Timestamp", + "documentation": "The timestamp of the last projected metrics data point to return.
" + } + } + }, + "GetECSServiceRecommendationProjectedMetricsResponse": { + "type": "structure", + "members": { + "recommendedOptionProjectedMetrics": { + "shape": "ECSServiceRecommendedOptionProjectedMetrics", + "documentation": "An array of objects that describes the projected metrics.
" + } + } + }, + "GetECSServiceRecommendationsRequest": { + "type": "structure", + "members": { + "serviceArns": { + "shape": "ServiceArns", + "documentation": "The ARN that identifies the ECS service.
The following is the format of the ARN:
arn:aws:ecs:region:aws_account_id:service/cluster-name/service-name
The token to advance to the next page of ECS service recommendations.
" + }, + "maxResults": { + "shape": "MaxResults", + "documentation": "The maximum number of ECS service recommendations to return with a single request.
To retrieve the remaining results, make another request with the returned nextToken
value.
An array of objects to specify a filter that returns a more specific list of ECS service recommendations.
" + }, + "accountIds": { + "shape": "AccountIds", + "documentation": "Return the ECS service recommendations to the specified Amazon Web Services account IDs.
If your account is the management account or the delegated administrator of an organization, use this parameter to return the ECS service recommendations to specific member accounts.
You can only specify one account ID per request.
" + } + } + }, + "GetECSServiceRecommendationsResponse": { + "type": "structure", + "members": { + "nextToken": { + "shape": "NextToken", + "documentation": "The token to advance to the next page of ECS service recommendations.
" + }, + "ecsServiceRecommendations": { + "shape": "ECSServiceRecommendations", + "documentation": "An array of objects that describe the ECS service recommendations.
" + }, + "errors": { + "shape": "GetRecommendationErrors", + "documentation": "An array of objects that describe errors of the request.
" + } + } + }, "GetEffectiveRecommendationPreferencesRequest": { "type": "structure", "required": [ @@ -1839,7 +2442,7 @@ }, "externalMetricsPreference": { "shape": "ExternalMetricsPreference", - "documentation": "The provider of the external metrics recommendation preference. Considers all applicable preferences that you might have set at the account and organization level.
If the preference is applied in the latest recommendation refresh, an object with a valid source
value appears in the response. If the preference isn't applied to the recommendations already, then this object doesn't appear in the response.
To validate whether the preference is applied to your last generated set of recommendations, review the effectiveRecommendationPreferences
value in the response of the GetEC2InstanceRecommendations actions.
For more information, see Enhanced infrastructure metrics in the Compute Optimizer User Guide.
" + "documentation": "The provider of the external metrics recommendation preference. Considers all applicable preferences that you might have set at the account and organization level.
If the preference is applied in the latest recommendation refresh, an object with a valid source
value appears in the response. If the preference isn't applied to the recommendations already, then this object doesn't appear in the response.
To validate whether the preference is applied to your last generated set of recommendations, review the effectiveRecommendationPreferences
value in the response of the GetEC2InstanceRecommendations actions.
For more information, see Enhanced infrastructure metrics in the Compute Optimizer User Guide.
" } } }, @@ -2480,9 +3083,14 @@ "Low": { "type": "long" }, + "LowerBoundValue": { + "type": "double" + }, "MaxResults": { "type": "integer", - "box": true + "box": true, + "max": 1000, + "min": 0 }, "MaxSize": { "type": "integer" @@ -2496,6 +3104,20 @@ "MemorySize": { "type": "integer" }, + "MemorySizeConfiguration": { + "type": "structure", + "members": { + "memory": { + "shape": "NullableMemory", + "documentation": "The amount of memory in the container.
" + }, + "memoryReservation": { + "shape": "NullableMemoryReservation", + "documentation": "The limit of memory reserve for the container.
" + } + }, + "documentation": "The memory size configurations of a container.
" + }, "Message": { "type": "string" }, @@ -2552,6 +3174,15 @@ "NextToken": { "type": "string" }, + "NullableCpu": { + "type": "integer" + }, + "NullableMemory": { + "type": "integer" + }, + "NullableMemoryReservation": { + "type": "integer" + }, "NumberOfInvocations": { "type": "long" }, @@ -2793,7 +3424,8 @@ "Ec2Instance", "AutoScalingGroup", "EbsVolume", - "LambdaFunction" + "LambdaFunction", + "EcsService" ] }, "RecommendationSources": { @@ -2871,7 +3503,8 @@ "AutoScalingGroup", "EbsVolume", "LambdaFunction", - "NotApplicable" + "NotApplicable", + "EcsService" ] }, "S3Destination": { @@ -2948,6 +3581,41 @@ "ScopeValue": { "type": "string" }, + "ServiceArn": { + "type": "string" + }, + "ServiceArns": { + "type": "list", + "member": { + "shape": "ServiceArn" + } + }, + "ServiceConfiguration": { + "type": "structure", + "members": { + "memory": { + "shape": "NullableMemory", + "documentation": "The amount of memory used by the tasks in the ECS service.
" + }, + "cpu": { + "shape": "NullableCpu", + "documentation": "The number of CPU units used by the tasks in the ECS service.
" + }, + "containerConfigurations": { + "shape": "ContainerConfigurations", + "documentation": "The container configurations within a task of an ECS service.
" + }, + "autoScalingConfiguration": { + "shape": "AutoScalingConfiguration", + "documentation": "Describes the Auto Scaling configuration methods for an Amazon ECS service. This affects the generated recommendations. For example, if Auto Scaling is configured on a ECS service’s CPU, then Compute Optimizer doesn’t generate CPU size recommendations.
The Auto Scaling configuration methods include:
TARGET_TRACKING_SCALING_CPU
— If the ECS service is configured to use target scaling on CPU, Compute Optimizer doesn't generate CPU recommendations.
TARGET_TRACKING_SCALING_MEMORY
— If the ECS service is configured to use target scaling on memory, Compute Optimizer doesn't generate memory recommendations.
For more information about step scaling and target scaling, see Step scaling policies for Application Auto Scaling and Target tracking scaling policies for Application Auto Scaling in the Application Auto Scaling User Guide.
" + }, + "taskDefinitionArn": { + "shape": "TaskDefinitionArn", + "documentation": "The task definition ARN used by the tasks in the ECS service.
" + } + }, + "documentation": "The Amazon ECS service configurations used for recommendations.
" + }, "Status": { "type": "string", "enum": [ @@ -2987,6 +3655,9 @@ "SummaryValue": { "type": "double" }, + "TaskDefinitionArn": { + "type": "string" + }, "Timestamp": { "type": "timestamp" }, @@ -3025,6 +3696,9 @@ } } }, + "UpperBoundValue": { + "type": "double" + }, "UtilizationMetric": { "type": "structure", "members": { @@ -3189,5 +3863,5 @@ "type": "string" } }, - "documentation": "Compute Optimizer is a service that analyzes the configuration and utilization metrics of your Amazon Web Services compute resources, such as Amazon EC2 instances, Amazon EC2 Auto Scaling groups, Lambda functions, and Amazon EBS volumes. It reports whether your resources are optimal, and generates optimization recommendations to reduce the cost and improve the performance of your workloads. Compute Optimizer also provides recent utilization metric data, in addition to projected utilization metric data for the recommendations, which you can use to evaluate which recommendation provides the best price-performance trade-off. The analysis of your usage patterns can help you decide when to move or resize your running resources, and still meet your performance and capacity requirements. For more information about Compute Optimizer, including the required permissions to use the service, see the Compute Optimizer User Guide.
" + "documentation": "Compute Optimizer is a service that analyzes the configuration and utilization metrics of your Amazon Web Services compute resources, such as Amazon EC2 instances, Amazon EC2 Auto Scaling groups, Lambda functions, Amazon EBS volumes, and Amazon ECS services on Fargate. It reports whether your resources are optimal, and generates optimization recommendations to reduce the cost and improve the performance of your workloads. Compute Optimizer also provides recent utilization metric data, in addition to projected utilization metric data for the recommendations, which you can use to evaluate which recommendation provides the best price-performance trade-off. The analysis of your usage patterns can help you decide when to move or resize your running resources, and still meet your performance and capacity requirements. For more information about Compute Optimizer, including the required permissions to use the service, see the Compute Optimizer User Guide.
" } \ No newline at end of file diff --git a/apis/compute-optimizer-2019-11-01.paginators.json b/apis/compute-optimizer-2019-11-01.paginators.json index 5677bd8e4a..1d115fc226 100644 --- a/apis/compute-optimizer-2019-11-01.paginators.json +++ b/apis/compute-optimizer-2019-11-01.paginators.json @@ -1,4 +1,34 @@ { "pagination": { + "DescribeRecommendationExportJobs": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "recommendationExportJobs" + }, + "GetEnrollmentStatusesForOrganization": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "accountEnrollmentStatuses" + }, + "GetLambdaFunctionRecommendations": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "lambdaFunctionRecommendations" + }, + "GetRecommendationPreferences": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "recommendationPreferencesDetails" + }, + "GetRecommendationSummaries": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "recommendationSummaries" + } } } diff --git a/apis/connect-2017-08-08.min.json b/apis/connect-2017-08-08.min.json index db7a1322d6..12bab9f1b2 100644 --- a/apis/connect-2017-08-08.min.json +++ b/apis/connect-2017-08-08.min.json @@ -5531,6 +5531,73 @@ } } }, + "UpdateParticipantRoleConfig": { + "http": { + "method": "PUT", + "requestUri": "/contact/participant-role-config/{InstanceId}/{ContactId}" + }, + "input": { + "type": "structure", + "required": [ + "InstanceId", + "ContactId", + "ChannelConfiguration" + ], + "members": { + "InstanceId": { + "location": "uri", + "locationName": "InstanceId" + }, + "ContactId": { + "location": "uri", + "locationName": "ContactId" + }, + "ChannelConfiguration": { + "type": "structure", + "members": { + "Chat": { + "type": "structure", + "required": [ + "ParticipantTimerConfigList" + ], + "members": { + "ParticipantTimerConfigList": { + "type": "list", + "member": { + "type": "structure", + "required": [ + "ParticipantRole", + "TimerType", + "TimerValue" + ], + "members": { + "ParticipantRole": {}, + "TimerType": {}, + "TimerValue": { + "type": "structure", + "members": { + "ParticipantTimerAction": {}, + "ParticipantTimerDurationInMinutes": { + "type": "integer" + } + }, + "union": true + } + } + } + } + } + } + }, + "union": true + } + } + }, + "output": { + "type": "structure", + "members": {} + } + }, "UpdatePhoneNumber": { "http": { "method": "PUT", @@ -6048,19 +6115,19 @@ "type": "structure", "members": { "LevelOne": { - "shape": "Sjr" + "shape": "Sk2" }, "LevelTwo": { - "shape": "Sjr" + "shape": "Sk2" }, "LevelThree": { - "shape": "Sjr" + "shape": "Sk2" }, "LevelFour": { - "shape": "Sjr" + "shape": "Sk2" }, "LevelFive": { - "shape": "Sjr" + "shape": "Sk2" } } }, @@ -6940,7 +7007,7 @@ "shape": "Sh2" } }, - "Sjr": { + "Sk2": { "type": "structure", "required": [ "Name" diff --git a/apis/connect-2017-08-08.normal.json b/apis/connect-2017-08-08.normal.json index 2916c923f0..36200810a5 100644 --- a/apis/connect-2017-08-08.normal.json +++ b/apis/connect-2017-08-08.normal.json @@ -3497,7 +3497,7 @@ "shape": "InternalServiceException" } ], - "documentation": "Initiates silent monitoring of a contact. The Contact Control Panel (CCP) of the user specified by userId will be set to silent monitoring mode on the contact.
" + "documentation": "Initiates silent monitoring of a contact. The Contact Control Panel (CCP) of the user specified by userId will be set to silent monitoring mode on the contact. Supports voice and chat contacts.
" }, "PutUserStatus": { "name": "PutUserStatus", @@ -4553,6 +4553,40 @@ ], "documentation": "This API is in preview release for Amazon Connect and is subject to change.
Updates an existing configuration for a resource type. This API is idempotent.
" }, + "UpdateParticipantRoleConfig": { + "name": "UpdateParticipantRoleConfig", + "http": { + "method": "PUT", + "requestUri": "/contact/participant-role-config/{InstanceId}/{ContactId}" + }, + "input": { + "shape": "UpdateParticipantRoleConfigRequest" + }, + "output": { + "shape": "UpdateParticipantRoleConfigResponse" + }, + "errors": [ + { + "shape": "InvalidRequestException" + }, + { + "shape": "InvalidParameterException" + }, + { + "shape": "ResourceNotFoundException" + }, + { + "shape": "AccessDeniedException" + }, + { + "shape": "ThrottlingException" + }, + { + "shape": "InternalServiceException" + } + ], + "documentation": "Updates timeouts for when human chat participants are to be considered idle, and when agents are automatically disconnected from a chat due to idleness. You can set four timers:
Customer idle timeout
Customer auto-disconnect timeout
Agent idle timeout
Agent auto-disconnect timeout
For more information about how chat timeouts work, see Set up chat timeouts for human participants.
" + }, "UpdatePhoneNumber": { "name": "UpdatePhoneNumber", "http": { @@ -5911,15 +5945,28 @@ "members": { "ContentType": { "shape": "ChatContentType", - "documentation": "The type of the content. Supported types are text/plain
.
The type of the content. Supported types are text/plain
, text/markdown
, and application/json
.
The content of the chat message.
" + "documentation": "The content of the chat message.
For text/plain
and text/markdown
, the Length Constraints are Minimum of 1, Maximum of 1024.
For application/json
, the Length Constraints are Minimum of 1, Maximum of 12000.
A chat message.
" }, + "ChatParticipantRoleConfig": { + "type": "structure", + "required": [ + "ParticipantTimerConfigList" + ], + "members": { + "ParticipantTimerConfigList": { + "shape": "ParticipantTimerConfigList", + "documentation": "A list of participant timers. You can specify any unique combination of role and timer type. Duplicate entries error out the request with a 400.
" + } + }, + "documentation": "Configuration information for the chat participant role.
" + }, "ChatStreamingConfiguration": { "type": "structure", "required": [ @@ -11622,6 +11669,70 @@ "max": 256, "min": 1 }, + "ParticipantTimerAction": { + "type": "string", + "enum": [ + "Unset" + ] + }, + "ParticipantTimerConfigList": { + "type": "list", + "member": { + "shape": "ParticipantTimerConfiguration" + }, + "max": 6, + "min": 1 + }, + "ParticipantTimerConfiguration": { + "type": "structure", + "required": [ + "ParticipantRole", + "TimerType", + "TimerValue" + ], + "members": { + "ParticipantRole": { + "shape": "TimerEligibleParticipantRoles", + "documentation": "The role of the participant in the chat conversation.
" + }, + "TimerType": { + "shape": "ParticipantTimerType", + "documentation": "The type of timer. IDLE
indicates the timer applies for considering a human chat participant as idle. DISCONNECT_NONCUSTOMER
indicates the timer applies to automatically disconnecting a chat participant due to idleness.
The value of the timer. Either the timer action (Unset to delete the timer), or the duration of the timer in minutes. Only one value can be set.
" + } + }, + "documentation": "Configuration information for the timer. After the timer configuration is set, it persists for the duration of the chat. It persists across new contacts in the chain, for example, transfer contacts.
For more information about how chat timeouts work, see Set up chat timeouts for human participants.
" + }, + "ParticipantTimerDurationInMinutes": { + "type": "integer", + "max": 480, + "min": 2 + }, + "ParticipantTimerType": { + "type": "string", + "enum": [ + "IDLE", + "DISCONNECT_NONCUSTOMER" + ] + }, + "ParticipantTimerValue": { + "type": "structure", + "members": { + "ParticipantTimerAction": { + "shape": "ParticipantTimerAction", + "documentation": "The timer action. Currently only one value is allowed: Unset
. It deletes a timer.
The duration of a timer, in minutes.
" + } + }, + "documentation": "The value of the timer. Either the timer action (Unset
to delete the timer), or the duration of the timer in minutes. Only one value can be set.
For more information about how chat timeouts work, see Set up chat timeouts for human participants.
", + "union": true + }, "ParticipantToken": { "type": "string", "max": 1000, @@ -13623,7 +13734,7 @@ }, "SupportedMessagingContentTypes": { "shape": "SupportedMessagingContentTypes", - "documentation": "The supported chat message content types. Content types can be text/plain or both text/plain and text/markdown.
" + "documentation": "The supported chat message content types. Content types must always contain text/plain
. You can then put any other supported type in the list. For example, all the following lists are valid because they contain text/plain
: [text/plain, text/markdown, application/json]
, [text/markdown, text/plain]
, [text/plain, application/json]
.
Configuration information for the chat participant role.
" + } + }, + "documentation": "Configuration information for the chat participant role.
", + "union": true + }, + "UpdateParticipantRoleConfigRequest": { + "type": "structure", + "required": [ + "InstanceId", + "ContactId", + "ChannelConfiguration" + ], + "members": { + "InstanceId": { + "shape": "InstanceId", + "documentation": "The identifier of the Amazon Connect instance. You can find the instanceId in the ARN of the instance.
", + "location": "uri", + "locationName": "InstanceId" + }, + "ContactId": { + "shape": "ContactId", + "documentation": "The identifier of the contact in this instance of Amazon Connect.
", + "location": "uri", + "locationName": "ContactId" + }, + "ChannelConfiguration": { + "shape": "UpdateParticipantRoleConfigChannelInfo", + "documentation": "The Amazon Connect channel you want to configure.
" + } + } + }, + "UpdateParticipantRoleConfigResponse": { + "type": "structure", + "members": {} + }, "UpdatePhoneNumberRequest": { "type": "structure", "required": [ diff --git a/apis/iotdeviceadvisor-2020-09-18.min.json b/apis/iotdeviceadvisor-2020-09-18.min.json index 1614bf9081..a5bc32e0dd 100644 --- a/apis/iotdeviceadvisor-2020-09-18.min.json +++ b/apis/iotdeviceadvisor-2020-09-18.min.json @@ -19,6 +19,9 @@ }, "input": { "type": "structure", + "required": [ + "suiteDefinitionConfiguration" + ], "members": { "suiteDefinitionConfiguration": { "shape": "S2" @@ -398,7 +401,8 @@ "input": { "type": "structure", "required": [ - "suiteDefinitionId" + "suiteDefinitionId", + "suiteRunConfiguration" ], "members": { "suiteDefinitionId": { @@ -421,7 +425,8 @@ "suiteRunArn": {}, "createdAt": { "type": "timestamp" - } + }, + "endpoint": {} } } }, @@ -513,7 +518,8 @@ "input": { "type": "structure", "required": [ - "suiteDefinitionId" + "suiteDefinitionId", + "suiteDefinitionConfiguration" ], "members": { "suiteDefinitionId": { @@ -545,6 +551,11 @@ "shapes": { "S2": { "type": "structure", + "required": [ + "suiteDefinitionName", + "rootGroup", + "devicePermissionRoleArn" + ], "members": { "suiteDefinitionName": {}, "devices": { @@ -581,6 +592,9 @@ }, "Sr": { "type": "structure", + "required": [ + "primaryDevice" + ], "members": { "primaryDevice": { "shape": "S5" diff --git a/apis/iotdeviceadvisor-2020-09-18.normal.json b/apis/iotdeviceadvisor-2020-09-18.normal.json index a579d6e50f..3049022833 100644 --- a/apis/iotdeviceadvisor-2020-09-18.normal.json +++ b/apis/iotdeviceadvisor-2020-09-18.normal.json @@ -357,6 +357,9 @@ }, "CreateSuiteDefinitionRequest": { "type": "structure", + "required": [ + "suiteDefinitionConfiguration" + ], "members": { "suiteDefinitionConfiguration": { "shape": "SuiteDefinitionConfiguration", @@ -373,19 +376,19 @@ "members": { "suiteDefinitionId": { "shape": "UUID", - "documentation": "Creates a Device Advisor test suite with suite UUID.
" + "documentation": "The UUID of the test suite created.
" }, "suiteDefinitionArn": { "shape": "AmazonResourceName", - "documentation": "Creates a Device Advisor test suite with Amazon Resource Name (ARN).
" + "documentation": "The Amazon Resource Name (ARN) of the test suite.
" }, "suiteDefinitionName": { "shape": "SuiteDefinitionName", - "documentation": "Creates a Device Advisor test suite with suite definition name.
" + "documentation": "The suite definition name of the test suite. This is a required parameter.
" }, "createdAt": { "shape": "Timestamp", - "documentation": "Creates a Device Advisor test suite with TimeStamp of when it was created.
" + "documentation": "The timestamp of when the test suite was created.
" } } }, @@ -737,7 +740,7 @@ "members": { "resourceArn": { "shape": "AmazonResourceName", - "documentation": "The ARN of the IoT Device Advisor resource.
", + "documentation": "The resource ARN of the IoT Device Advisor resource. This can be SuiteDefinition ARN or SuiteRun ARN.
", "location": "uri", "locationName": "resourceArn" } @@ -789,7 +792,8 @@ "StartSuiteRunRequest": { "type": "structure", "required": [ - "suiteDefinitionId" + "suiteDefinitionId", + "suiteRunConfiguration" ], "members": { "suiteDefinitionId": { @@ -826,6 +830,10 @@ "createdAt": { "shape": "Timestamp", "documentation": "Starts a Device Advisor test suite run based on suite create time.
" + }, + "endpoint": { + "shape": "Endpoint", + "documentation": "The response of an Device Advisor test endpoint.
" } } }, @@ -880,10 +888,15 @@ }, "SuiteDefinitionConfiguration": { "type": "structure", + "required": [ + "suiteDefinitionName", + "rootGroup", + "devicePermissionRoleArn" + ], "members": { "suiteDefinitionName": { "shape": "SuiteDefinitionName", - "documentation": "Gets Suite Definition Configuration name.
" + "documentation": "Gets the suite definition name. This is a required parameter.
" }, "devices": { "shape": "DeviceUnderTestList", @@ -895,22 +908,22 @@ }, "isLongDurationTest": { "shape": "IsLongDurationTestBoolean", - "documentation": "Verifies if the test suite is a long duration test.
" + "documentation": "Verifies if the test suite is a long duration test.
" }, "rootGroup": { "shape": "RootGroup", - "documentation": "Gets test suite root group.
" + "documentation": "Gets the test suite root group. This is a required parameter.
" }, "devicePermissionRoleArn": { "shape": "AmazonResourceName", - "documentation": "Gets the device permission ARN.
" + "documentation": "Gets the device permission ARN. This is a required parameter.
" }, "protocol": { "shape": "Protocol", - "documentation": "Gets the MQTT protocol that is configured in the suite definition.
" + "documentation": "Sets the MQTT protocol that is configured in the suite definition.
" } }, - "documentation": "Gets Suite Definition Configuration.
" + "documentation": "Gets the suite definition configuration.
" }, "SuiteDefinitionInformation": { "type": "structure", @@ -933,11 +946,11 @@ }, "isLongDurationTest": { "shape": "IsLongDurationTestBoolean", - "documentation": "Verifies if the test suite is a long duration test.
" + "documentation": "Verifies if the test suite is a long duration test.
" }, "protocol": { "shape": "Protocol", - "documentation": "Gets the MQTT protocol that is configured in the suite definition.
" + "documentation": "Gets the MQTT protocol that is configured in the suite definition.
" }, "createdAt": { "shape": "Timestamp", @@ -964,14 +977,17 @@ }, "SuiteRunConfiguration": { "type": "structure", + "required": [ + "primaryDevice" + ], "members": { "primaryDevice": { "shape": "DeviceUnderTest", - "documentation": "Gets the primary device for suite run.
" + "documentation": "Sets the primary device for the test suite run. This requires a thing ARN or a certificate ARN.
" }, "selectedTestList": { "shape": "SelectedTestList", - "documentation": "Gets test case list.
" + "documentation": "Sets test case list.
" }, "parallelRun": { "shape": "ParallelRun", @@ -1082,7 +1098,7 @@ "members": { "resourceArn": { "shape": "AmazonResourceName", - "documentation": "The resource ARN of an IoT Device Advisor resource.
", + "documentation": "The resource ARN of an IoT Device Advisor resource. This can be SuiteDefinition ARN or SuiteRun ARN.
", "location": "uri", "locationName": "resourceArn" }, @@ -1239,7 +1255,7 @@ "members": { "resourceArn": { "shape": "AmazonResourceName", - "documentation": "The resource ARN of an IoT Device Advisor resource.
", + "documentation": "The resource ARN of an IoT Device Advisor resource. This can be SuiteDefinition ARN or SuiteRun ARN.
", "location": "uri", "locationName": "resourceArn" }, @@ -1258,7 +1274,8 @@ "UpdateSuiteDefinitionRequest": { "type": "structure", "required": [ - "suiteDefinitionId" + "suiteDefinitionId", + "suiteDefinitionConfiguration" ], "members": { "suiteDefinitionId": { @@ -1286,7 +1303,7 @@ }, "suiteDefinitionName": { "shape": "SuiteDefinitionName", - "documentation": "Suite definition name of the updated test suite.
" + "documentation": "Updates the suite definition name. This is a required parameter.
" }, "suiteDefinitionVersion": { "shape": "SuiteDefinitionVersion", diff --git a/apis/kinesis-video-webrtc-storage-2018-05-10.min.json b/apis/kinesis-video-webrtc-storage-2018-05-10.min.json index 333fc52ae9..9c986594d9 100644 --- a/apis/kinesis-video-webrtc-storage-2018-05-10.min.json +++ b/apis/kinesis-video-webrtc-storage-2018-05-10.min.json @@ -26,23 +26,6 @@ "channelArn": {} } } - }, - "JoinStorageSessionAsViewer": { - "http": { - "requestUri": "/joinStorageSessionAsViewer", - "responseCode": 200 - }, - "input": { - "type": "structure", - "required": [ - "channelArn", - "clientId" - ], - "members": { - "channelArn": {}, - "clientId": {} - } - } } }, "shapes": {} diff --git a/apis/kinesis-video-webrtc-storage-2018-05-10.normal.json b/apis/kinesis-video-webrtc-storage-2018-05-10.normal.json index c464278e2b..d22f024222 100644 --- a/apis/kinesis-video-webrtc-storage-2018-05-10.normal.json +++ b/apis/kinesis-video-webrtc-storage-2018-05-10.normal.json @@ -37,32 +37,6 @@ } ], "documentation": "Join the ongoing one way-video and/or multi-way audio WebRTC session as a video producing device for an input channel. If there’s no existing session for the channel, a new streaming session needs to be created, and the Amazon Resource Name (ARN) of the signaling channel must be provided.
Currently for the SINGLE_MASTER
type, a video producing device is able to ingest both audio and video media into a stream, while viewers can only ingest audio. Both a video producing device and viewers can join the session first, and wait for other participants.
While participants are having peer to peer conversations through webRTC, the ingested media session will be stored into the Kinesis Video Stream. Multiple viewers are able to playback real-time media.
Customers can also use existing Kinesis Video Streams features like HLS
or DASH
playback, Image generation, and more with ingested WebRTC media.
Assume that only one video producing device client can be associated with a session for the channel. If more than one client joins the session of a specific channel as a video producing device, the most recent client request takes precedence.
Join the ongoing one way-video and/or multi-way audio WebRTC session as a viewer for an input channel. If there’s no existing session for the channel, create a new streaming session and provide the Amazon Resource Name (ARN) of the signaling channel (channelArn
) and client id (clientId
).
Currently for SINGLE_MASTER
type, a video producing device is able to ingest both audio and video media into a stream, while viewers can only ingest audio. Both a video producing device and viewers can join a session first and wait for other participants. While participants are having peer to peer conversations through webRTC, the ingested media session will be stored into the Kinesis Video Stream. Multiple viewers are able to playback real-time media.
Customers can also use existing Kinesis Video Streams features like HLS
or DASH
playback, Image generation, and more with ingested WebRTC media. If there’s an existing session with the same clientId
that's found in the join session request, the new request takes precedence.
The Amazon Resource Name (ARN) of the signaling channel.
" - }, - "clientId": { - "shape": "ClientId", - "documentation": "The unique identifier for the sender client.
" - } - } - }, "JoinStorageSessionInput": { "type": "structure", "required": [ diff --git a/apis/rds-2014-10-31.min.json b/apis/rds-2014-10-31.min.json index 774d732aa2..d4b8d4905c 100644 --- a/apis/rds-2014-10-31.min.json +++ b/apis/rds-2014-10-31.min.json @@ -469,6 +469,10 @@ }, "NetworkType": {}, "DBSystemId": {}, + "ManageMasterUserPassword": { + "type": "boolean" + }, + "MasterUserSecretKmsKeyId": {}, "SourceRegion": {} } }, @@ -506,7 +510,7 @@ } }, "output": { - "shape": "S3e", + "shape": "S3f", "resultWrapper": "CreateDBClusterEndpointResult" } }, @@ -581,7 +585,7 @@ "MasterUsername": {}, "MasterUserPassword": {}, "DBSecurityGroups": { - "shape": "S3k" + "shape": "S3l" }, "VpcSecurityGroupIds": { "shape": "S2q" @@ -668,7 +672,11 @@ "NetworkType": {}, "StorageThroughput": { "type": "integer" - } + }, + "ManageMasterUserPassword": { + "type": "boolean" + }, + "MasterUserSecretKmsKeyId": {} } }, "output": { @@ -676,7 +684,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -771,7 +779,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -817,7 +825,7 @@ "DBProxyName": {}, "EngineFamily": {}, "Auth": { - "shape": "S4f" + "shape": "S4g" }, "RoleArn": {}, "VpcSubnetIds": { @@ -845,7 +853,7 @@ "type": "structure", "members": { "DBProxy": { - "shape": "S4l" + "shape": "S4m" } } } @@ -878,7 +886,7 @@ "type": "structure", "members": { "DBProxyEndpoint": { - "shape": "S4u" + "shape": "S4v" } } } @@ -945,7 +953,7 @@ "DBSubnetGroupName": {}, "DBSubnetGroupDescription": {}, "SubnetIds": { - "shape": "S51" + "shape": "S52" }, "Tags": { "shape": "Sb" @@ -957,7 +965,7 @@ "type": "structure", "members": { "DBSubnetGroup": { - "shape": "S3q" + "shape": "S3r" } } } @@ -1019,7 +1027,7 @@ "type": "structure", "members": { "GlobalCluster": { - "shape": "S57" + "shape": "S58" } } } @@ -1128,7 +1136,7 @@ } }, "output": { - "shape": "S3e", + "shape": "S3f", "resultWrapper": "DeleteDBClusterEndpointResult" } }, @@ -1185,7 +1193,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -1203,7 +1211,7 @@ "type": "structure", "members": { "DBInstanceAutomatedBackup": { - "shape": "S5s" + "shape": "S5t" } } } @@ -1234,7 +1242,7 @@ "type": "structure", "members": { "DBProxy": { - "shape": "S4l" + "shape": "S4m" } } } @@ -1254,7 +1262,7 @@ "type": "structure", "members": { "DBProxyEndpoint": { - "shape": "S4u" + "shape": "S4v" } } } @@ -1336,7 +1344,7 @@ "type": "structure", "members": { "GlobalCluster": { - "shape": "S57" + "shape": "S58" } } } @@ -1410,7 +1418,7 @@ "members": { "BlueGreenDeploymentIdentifier": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "Marker": {}, "MaxRecords": { @@ -1438,7 +1446,7 @@ "members": { "CertificateIdentifier": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1453,7 +1461,7 @@ "Certificates": { "type": "list", "member": { - "shape": "S6p", + "shape": "S6q", "locationName": "Certificate" } }, @@ -1471,7 +1479,7 @@ "DBClusterIdentifier": {}, "BacktrackIdentifier": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1501,7 +1509,7 @@ "DBClusterIdentifier": {}, "DBClusterEndpointIdentifier": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1517,7 +1525,7 @@ "DBClusterEndpoints": { "type": "list", "member": { - "shape": "S3e", + "shape": "S3f", "locationName": "DBClusterEndpointList" } } @@ -1530,7 +1538,7 @@ "members": { "DBClusterParameterGroupName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1563,7 +1571,7 @@ "DBClusterParameterGroupName": {}, "Source": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1576,7 +1584,7 @@ "type": "structure", "members": { "Parameters": { - "shape": "S71" + "shape": "S72" }, "Marker": {} } @@ -1597,7 +1605,7 @@ "type": "structure", "members": { "DBClusterSnapshotAttributesResult": { - "shape": "S76" + "shape": "S77" } } } @@ -1610,7 +1618,7 @@ "DBClusterSnapshotIdentifier": {}, "SnapshotType": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1645,7 +1653,7 @@ "members": { "DBClusterIdentifier": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1679,7 +1687,7 @@ "EngineVersion": {}, "DBParameterGroupFamily": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1721,7 +1729,7 @@ "DbiResourceId": {}, "DBInstanceIdentifier": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1738,7 +1746,7 @@ "DBInstanceAutomatedBackups": { "type": "list", "member": { - "shape": "S5s", + "shape": "S5t", "locationName": "DBInstanceAutomatedBackup" } } @@ -1751,7 +1759,7 @@ "members": { "DBInstanceIdentifier": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1767,7 +1775,7 @@ "DBInstances": { "type": "list", "member": { - "shape": "S3m", + "shape": "S3n", "locationName": "DBInstance" } } @@ -1790,7 +1798,7 @@ "type": "long" }, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1828,7 +1836,7 @@ "members": { "DBParameterGroupName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1861,7 +1869,7 @@ "DBParameterGroupName": {}, "Source": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -1874,7 +1882,7 @@ "type": "structure", "members": { "Parameters": { - "shape": "S71" + "shape": "S72" }, "Marker": {} } @@ -1886,7 +1894,7 @@ "members": { "DBProxyName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "Marker": {}, "MaxRecords": { @@ -1901,7 +1909,7 @@ "DBProxies": { "type": "list", "member": { - "shape": "S4l" + "shape": "S4m" } }, "Marker": {} @@ -1915,7 +1923,7 @@ "DBProxyName": {}, "DBProxyEndpointName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "Marker": {}, "MaxRecords": { @@ -1930,7 +1938,7 @@ "DBProxyEndpoints": { "type": "list", "member": { - "shape": "S4u" + "shape": "S4v" } }, "Marker": {} @@ -1947,7 +1955,7 @@ "DBProxyName": {}, "TargetGroupName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "Marker": {}, "MaxRecords": { @@ -1962,7 +1970,7 @@ "TargetGroups": { "type": "list", "member": { - "shape": "S87" + "shape": "S88" } }, "Marker": {} @@ -1979,7 +1987,7 @@ "DBProxyName": {}, "TargetGroupName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "Marker": {}, "MaxRecords": { @@ -1992,7 +2000,7 @@ "type": "structure", "members": { "Targets": { - "shape": "S8b" + "shape": "S8c" }, "Marker": {} } @@ -2004,7 +2012,7 @@ "members": { "DBSecurityGroupName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2042,7 +2050,7 @@ "type": "structure", "members": { "DBSnapshotAttributesResult": { - "shape": "S8n" + "shape": "S8o" } } } @@ -2055,7 +2063,7 @@ "DBSnapshotIdentifier": {}, "SnapshotType": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2091,7 +2099,7 @@ "members": { "DBSubnetGroupName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2107,7 +2115,7 @@ "DBSubnetGroups": { "type": "list", "member": { - "shape": "S3q", + "shape": "S3r", "locationName": "DBSubnetGroup" } } @@ -2123,7 +2131,7 @@ "members": { "DBParameterGroupFamily": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2136,7 +2144,7 @@ "type": "structure", "members": { "EngineDefaults": { - "shape": "S8y" + "shape": "S8z" } } } @@ -2150,7 +2158,7 @@ "members": { "DBParameterGroupFamily": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2163,7 +2171,7 @@ "type": "structure", "members": { "EngineDefaults": { - "shape": "S8y" + "shape": "S8z" } } } @@ -2174,7 +2182,7 @@ "members": { "SourceType": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" } } }, @@ -2205,7 +2213,7 @@ "members": { "SubscriptionName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2247,7 +2255,7 @@ "shape": "S8" }, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2289,7 +2297,7 @@ "ExportTaskIdentifier": {}, "SourceArn": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "Marker": {}, "MaxRecords": { @@ -2319,7 +2327,7 @@ "members": { "GlobalClusterIdentifier": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2335,7 +2343,7 @@ "GlobalClusters": { "type": "list", "member": { - "shape": "S57", + "shape": "S58", "locationName": "GlobalClusterMember" } } @@ -2352,7 +2360,7 @@ "EngineName": {}, "MajorEngineVersion": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2468,7 +2476,7 @@ "members": { "OptionGroupName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "Marker": {}, "MaxRecords": { @@ -2509,7 +2517,7 @@ "type": "boolean" }, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2535,7 +2543,7 @@ "AvailabilityZones": { "type": "list", "member": { - "shape": "S3t", + "shape": "S3u", "locationName": "AvailabilityZone" } }, @@ -2583,7 +2591,7 @@ "type": "double" }, "AvailableProcessorFeatures": { - "shape": "Sa3" + "shape": "Sa4" }, "SupportedEngineModes": { "shape": "S2k" @@ -2639,7 +2647,7 @@ "members": { "ResourceIdentifier": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "Marker": {}, "MaxRecords": { @@ -2677,7 +2685,7 @@ }, "LeaseId": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2693,7 +2701,7 @@ "ReservedDBInstances": { "type": "list", "member": { - "shape": "Sac", + "shape": "Sad", "locationName": "ReservedDBInstance" } } @@ -2713,7 +2721,7 @@ "type": "boolean" }, "Filters": { - "shape": "S6g" + "shape": "S6h" }, "MaxRecords": { "type": "integer" @@ -2750,7 +2758,7 @@ "type": "boolean" }, "RecurringCharges": { - "shape": "Sae" + "shape": "Saf" } }, "wrapper": true @@ -2769,7 +2777,7 @@ }, "Marker": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" } } }, @@ -2821,28 +2829,28 @@ "members": { "StorageType": {}, "StorageSize": { - "shape": "Sat" + "shape": "Sau" }, "ProvisionedIops": { - "shape": "Sat" + "shape": "Sau" }, "IopsToStorageRatio": { - "shape": "Sav" + "shape": "Saw" }, "SupportsStorageAutoscaling": { "type": "boolean" }, "ProvisionedStorageThroughput": { - "shape": "Sat" + "shape": "Sau" }, "StorageThroughputToIopsRatio": { - "shape": "Sav" + "shape": "Saw" } } } }, "ValidProcessorFeatures": { - "shape": "Sa3" + "shape": "Sa4" } }, "wrapper": true @@ -2916,7 +2924,7 @@ "type": "structure", "members": { "GlobalCluster": { - "shape": "S57" + "shape": "S58" } } } @@ -2930,7 +2938,7 @@ "members": { "ResourceName": {}, "Filters": { - "shape": "S6g" + "shape": "S6h" } } }, @@ -2982,7 +2990,7 @@ "type": "structure", "members": { "Certificate": { - "shape": "S6p" + "shape": "S6q" } } } @@ -3074,7 +3082,7 @@ "type": "long" }, "CloudwatchLogsExportConfiguration": { - "shape": "Sbh" + "shape": "Sbi" }, "EngineVersion": {}, "AllowMajorVersionUpgrade": { @@ -3123,7 +3131,14 @@ "ServerlessV2ScalingConfiguration": { "shape": "S2t" }, - "NetworkType": {} + "NetworkType": {}, + "ManageMasterUserPassword": { + "type": "boolean" + }, + "RotateMasterUserPassword": { + "type": "boolean" + }, + "MasterUserSecretKmsKeyId": {} } }, "output": { @@ -3154,7 +3169,7 @@ } }, "output": { - "shape": "S3e", + "shape": "S3f", "resultWrapper": "ModifyDBClusterEndpointResult" } }, @@ -3168,12 +3183,12 @@ "members": { "DBClusterParameterGroupName": {}, "Parameters": { - "shape": "S71" + "shape": "S72" } } }, "output": { - "shape": "Sbl", + "shape": "Sbm", "resultWrapper": "ModifyDBClusterParameterGroupResult" } }, @@ -3188,10 +3203,10 @@ "DBClusterSnapshotIdentifier": {}, "AttributeName": {}, "ValuesToAdd": { - "shape": "S79" + "shape": "S7a" }, "ValuesToRemove": { - "shape": "S79" + "shape": "S7a" } } }, @@ -3200,7 +3215,7 @@ "type": "structure", "members": { "DBClusterSnapshotAttributesResult": { - "shape": "S76" + "shape": "S77" } } } @@ -3219,7 +3234,7 @@ "DBInstanceClass": {}, "DBSubnetGroupName": {}, "DBSecurityGroups": { - "shape": "S3k" + "shape": "S3l" }, "VpcSecurityGroupIds": { "shape": "S2q" @@ -3283,7 +3298,7 @@ "type": "integer" }, "CloudwatchLogsExportConfiguration": { - "shape": "Sbh" + "shape": "Sbi" }, "ProcessorFeatures": { "shape": "S1c" @@ -3312,7 +3327,14 @@ "NetworkType": {}, "StorageThroughput": { "type": "integer" - } + }, + "ManageMasterUserPassword": { + "type": "boolean" + }, + "RotateMasterUserPassword": { + "type": "boolean" + }, + "MasterUserSecretKmsKeyId": {} } }, "output": { @@ -3320,7 +3342,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -3335,12 +3357,12 @@ "members": { "DBParameterGroupName": {}, "Parameters": { - "shape": "S71" + "shape": "S72" } } }, "output": { - "shape": "Sbs", + "shape": "Sbt", "resultWrapper": "ModifyDBParameterGroupResult" } }, @@ -3354,7 +3376,7 @@ "DBProxyName": {}, "NewDBProxyName": {}, "Auth": { - "shape": "S4f" + "shape": "S4g" }, "RequireTLS": { "type": "boolean" @@ -3376,7 +3398,7 @@ "type": "structure", "members": { "DBProxy": { - "shape": "S4l" + "shape": "S4m" } } } @@ -3400,7 +3422,7 @@ "type": "structure", "members": { "DBProxyEndpoint": { - "shape": "S4u" + "shape": "S4v" } } } @@ -3441,7 +3463,7 @@ "type": "structure", "members": { "DBProxyTargetGroup": { - "shape": "S87" + "shape": "S88" } } } @@ -3479,10 +3501,10 @@ "DBSnapshotIdentifier": {}, "AttributeName": {}, "ValuesToAdd": { - "shape": "S79" + "shape": "S7a" }, "ValuesToRemove": { - "shape": "S79" + "shape": "S7a" } } }, @@ -3491,7 +3513,7 @@ "type": "structure", "members": { "DBSnapshotAttributesResult": { - "shape": "S8n" + "shape": "S8o" } } } @@ -3507,7 +3529,7 @@ "DBSubnetGroupName": {}, "DBSubnetGroupDescription": {}, "SubnetIds": { - "shape": "S51" + "shape": "S52" } } }, @@ -3516,7 +3538,7 @@ "type": "structure", "members": { "DBSubnetGroup": { - "shape": "S3q" + "shape": "S3r" } } } @@ -3569,7 +3591,7 @@ "type": "structure", "members": { "GlobalCluster": { - "shape": "S57" + "shape": "S58" } } } @@ -3597,7 +3619,7 @@ }, "OptionVersion": {}, "DBSecurityGroupMemberships": { - "shape": "S3k" + "shape": "S3l" }, "VpcSecurityGroupMemberships": { "shape": "S2q" @@ -3650,7 +3672,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -3697,7 +3719,7 @@ "type": "structure", "members": { "ReservedDBInstance": { - "shape": "Sac" + "shape": "Sad" } } } @@ -3740,7 +3762,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -3767,7 +3789,7 @@ "type": "structure", "members": { "DBProxyTargets": { - "shape": "S8b" + "shape": "S8c" } } } @@ -3785,7 +3807,7 @@ "type": "structure", "members": { "GlobalCluster": { - "shape": "S57" + "shape": "S58" } } } @@ -3869,12 +3891,12 @@ "type": "boolean" }, "Parameters": { - "shape": "S71" + "shape": "S72" } } }, "output": { - "shape": "Sbl", + "shape": "Sbm", "resultWrapper": "ResetDBClusterParameterGroupResult" } }, @@ -3890,12 +3912,12 @@ "type": "boolean" }, "Parameters": { - "shape": "S71" + "shape": "S72" } } }, "output": { - "shape": "Sbs", + "shape": "Sbt", "resultWrapper": "ResetDBParameterGroupResult" } }, @@ -3906,7 +3928,6 @@ "DBClusterIdentifier", "Engine", "MasterUsername", - "MasterUserPassword", "SourceEngine", "SourceEngineVersion", "S3BucketName", @@ -3969,7 +3990,11 @@ "ServerlessV2ScalingConfiguration": { "shape": "S2t" }, - "NetworkType": {} + "NetworkType": {}, + "ManageMasterUserPassword": { + "type": "boolean" + }, + "MasterUserSecretKmsKeyId": {} } }, "output": { @@ -4210,7 +4235,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -4238,7 +4263,7 @@ "MasterUsername": {}, "MasterUserPassword": {}, "DBSecurityGroups": { - "shape": "S3k" + "shape": "S3l" }, "VpcSecurityGroupIds": { "shape": "S2q" @@ -4317,7 +4342,11 @@ "NetworkType": {}, "StorageThroughput": { "type": "integer" - } + }, + "ManageMasterUserPassword": { + "type": "boolean" + }, + "MasterUserSecretKmsKeyId": {} } }, "output": { @@ -4325,7 +4354,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -4418,7 +4447,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -4519,7 +4548,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -4544,7 +4573,7 @@ "type": "structure", "members": { "DBInstanceAutomatedBackup": { - "shape": "S5s" + "shape": "S5t" } } } @@ -4635,7 +4664,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -4655,7 +4684,7 @@ "type": "structure", "members": { "DBInstanceAutomatedBackup": { - "shape": "S5s" + "shape": "S5t" } } } @@ -4698,7 +4727,7 @@ "type": "structure", "members": { "DBInstance": { - "shape": "S3m" + "shape": "S3n" } } } @@ -5537,7 +5566,10 @@ } }, "NetworkType": {}, - "DBSystemId": {} + "DBSystemId": {}, + "MasterUserSecret": { + "shape": "S3d" + } }, "wrapper": true }, @@ -5565,7 +5597,15 @@ } } }, - "S3e": { + "S3d": { + "type": "structure", + "members": { + "SecretArn": {}, + "SecretStatus": {}, + "KmsKeyId": {} + } + }, + "S3f": { "type": "structure", "members": { "DBClusterEndpointIdentifier": {}, @@ -5584,13 +5624,13 @@ "DBClusterEndpointArn": {} } }, - "S3k": { + "S3l": { "type": "list", "member": { "locationName": "DBSecurityGroupName" } }, - "S3m": { + "S3n": { "type": "structure", "members": { "DBInstanceIdentifier": {}, @@ -5603,7 +5643,7 @@ "MasterUsername": {}, "DBName": {}, "Endpoint": { - "shape": "S3n" + "shape": "S3o" }, "AllocatedStorage": { "type": "integer" @@ -5634,7 +5674,7 @@ }, "AvailabilityZone": {}, "DBSubnetGroup": { - "shape": "S3q" + "shape": "S3r" }, "PreferredMaintenanceWindow": {}, "PendingModifiedValues": { @@ -5801,7 +5841,7 @@ } }, "ListenerEndpoint": { - "shape": "S3n" + "shape": "S3o" }, "MaxAllocatedStorage": { "type": "integer" @@ -5810,7 +5850,7 @@ "shape": "Sb" }, "DBInstanceAutomatedBackupsReplications": { - "shape": "S46" + "shape": "S47" }, "CustomerOwnedIpEnabled": { "type": "boolean" @@ -5834,11 +5874,14 @@ "StorageThroughput": { "type": "integer" }, - "DBSystemId": {} + "DBSystemId": {}, + "MasterUserSecret": { + "shape": "S3d" + } }, "wrapper": true }, - "S3n": { + "S3o": { "type": "structure", "members": { "Address": {}, @@ -5848,7 +5891,7 @@ "HostedZoneId": {} } }, - "S3q": { + "S3r": { "type": "structure", "members": { "DBSubnetGroupName": {}, @@ -5863,7 +5906,7 @@ "members": { "SubnetIdentifier": {}, "SubnetAvailabilityZone": { - "shape": "S3t" + "shape": "S3u" }, "SubnetOutpost": { "type": "structure", @@ -5882,14 +5925,14 @@ }, "wrapper": true }, - "S3t": { + "S3u": { "type": "structure", "members": { "Name": {} }, "wrapper": true }, - "S46": { + "S47": { "type": "list", "member": { "locationName": "DBInstanceAutomatedBackupsReplication", @@ -5899,7 +5942,7 @@ } } }, - "S4f": { + "S4g": { "type": "list", "member": { "type": "structure", @@ -5913,7 +5956,7 @@ } } }, - "S4l": { + "S4m": { "type": "structure", "members": { "DBProxyName": {}, @@ -5960,7 +6003,7 @@ } } }, - "S4u": { + "S4v": { "type": "structure", "members": { "DBProxyEndpointName": {}, @@ -5984,13 +6027,13 @@ } } }, - "S51": { + "S52": { "type": "list", "member": { "locationName": "SubnetIdentifier" } }, - "S57": { + "S58": { "type": "structure", "members": { "GlobalClusterIdentifier": {}, @@ -6037,7 +6080,7 @@ }, "wrapper": true }, - "S5s": { + "S5t": { "type": "structure", "members": { "DBInstanceArn": {}, @@ -6090,7 +6133,7 @@ }, "DBInstanceAutomatedBackupsArn": {}, "DBInstanceAutomatedBackupsReplications": { - "shape": "S46" + "shape": "S47" }, "BackupTarget": {}, "StorageThroughput": { @@ -6099,7 +6142,7 @@ }, "wrapper": true }, - "S6g": { + "S6h": { "type": "list", "member": { "locationName": "Filter", @@ -6119,7 +6162,7 @@ } } }, - "S6p": { + "S6q": { "type": "structure", "members": { "CertificateIdentifier": {}, @@ -6141,7 +6184,7 @@ }, "wrapper": true }, - "S71": { + "S72": { "type": "list", "member": { "locationName": "Parameter", @@ -6165,7 +6208,7 @@ } } }, - "S76": { + "S77": { "type": "structure", "members": { "DBClusterSnapshotIdentifier": {}, @@ -6177,7 +6220,7 @@ "members": { "AttributeName": {}, "AttributeValues": { - "shape": "S79" + "shape": "S7a" } } } @@ -6185,13 +6228,13 @@ }, "wrapper": true }, - "S79": { + "S7a": { "type": "list", "member": { "locationName": "AttributeValue" } }, - "S87": { + "S88": { "type": "structure", "members": { "DBProxyName": {}, @@ -6227,7 +6270,7 @@ } } }, - "S8b": { + "S8c": { "type": "list", "member": { "type": "structure", @@ -6252,7 +6295,7 @@ } } }, - "S8n": { + "S8o": { "type": "structure", "members": { "DBSnapshotIdentifier": {}, @@ -6264,7 +6307,7 @@ "members": { "AttributeName": {}, "AttributeValues": { - "shape": "S79" + "shape": "S7a" } }, "wrapper": true @@ -6273,18 +6316,18 @@ }, "wrapper": true }, - "S8y": { + "S8z": { "type": "structure", "members": { "DBParameterGroupFamily": {}, "Marker": {}, "Parameters": { - "shape": "S71" + "shape": "S72" } }, "wrapper": true }, - "Sa3": { + "Sa4": { "type": "list", "member": { "locationName": "AvailableProcessorFeature", @@ -6296,7 +6339,7 @@ } } }, - "Sac": { + "Sad": { "type": "structure", "members": { "ReservedDBInstanceId": {}, @@ -6325,14 +6368,14 @@ }, "State": {}, "RecurringCharges": { - "shape": "Sae" + "shape": "Saf" }, "ReservedDBInstanceArn": {}, "LeaseId": {} }, "wrapper": true }, - "Sae": { + "Saf": { "type": "list", "member": { "locationName": "RecurringCharge", @@ -6346,7 +6389,7 @@ "wrapper": true } }, - "Sat": { + "Sau": { "type": "list", "member": { "locationName": "Range", @@ -6364,7 +6407,7 @@ } } }, - "Sav": { + "Saw": { "type": "list", "member": { "locationName": "DoubleRange", @@ -6379,7 +6422,7 @@ } } }, - "Sbh": { + "Sbi": { "type": "structure", "members": { "EnableLogTypes": { @@ -6390,13 +6433,13 @@ } } }, - "Sbl": { + "Sbm": { "type": "structure", "members": { "DBClusterParameterGroupName": {} } }, - "Sbs": { + "Sbt": { "type": "structure", "members": { "DBParameterGroupName": {} diff --git a/apis/rds-2014-10-31.normal.json b/apis/rds-2014-10-31.normal.json index 12d6e886a0..7c4248066a 100644 --- a/apis/rds-2014-10-31.normal.json +++ b/apis/rds-2014-10-31.normal.json @@ -5072,7 +5072,7 @@ }, "MasterUserPassword": { "shape": "String", - "documentation": "The password for the master database user. This password can contain any printable ASCII character except \"/\", \"\"\", or \"@\".
Constraints: Must contain from 8 to 41 characters.
Valid for: Aurora DB clusters and Multi-AZ DB clusters
" + "documentation": "The password for the master database user. This password can contain any printable ASCII character except \"/\", \"\"\", or \"@\".
Constraints:
Must contain from 8 to 41 characters.
Can't be specified if ManageMasterUserPassword
is turned on.
Valid for: Aurora DB clusters and Multi-AZ DB clusters
" }, "OptionGroupName": { "shape": "String", @@ -5209,6 +5209,14 @@ "shape": "String", "documentation": "Reserved for future use.
" }, + "ManageMasterUserPassword": { + "shape": "BooleanOptional", + "documentation": "A value that indicates whether to manage the master user password with Amazon Web Services Secrets Manager.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide and Password management with Amazon Web Services Secrets Manager in the Amazon Aurora User Guide.
Constraints:
Can't manage the master user password with Amazon Web Services Secrets Manager if MasterUserPassword
is specified.
Valid for: Aurora DB clusters and Multi-AZ DB clusters
" + }, + "MasterUserSecretKmsKeyId": { + "shape": "String", + "documentation": "The Amazon Web Services KMS key identifier to encrypt a secret that is automatically generated and managed in Amazon Web Services Secrets Manager.
This setting is valid only if the master user password is managed by RDS in Amazon Web Services Secrets Manager for the DB cluster.
The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key. To use a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN.
If you don't specify MasterUserSecretKmsKeyId
, then the aws/secretsmanager
KMS key is used to encrypt the secret. If the secret is in a different Amazon Web Services account, then you can't use the aws/secretsmanager
KMS key to encrypt the secret, and you must use a customer managed KMS key.
There is a default KMS key for your Amazon Web Services account. Your Amazon Web Services account has a different default KMS key for each Amazon Web Services Region.
Valid for: Aurora DB clusters and Multi-AZ DB clusters
" + }, "SourceRegion": { "shape": "String", "documentation": "The ID of the region that contains the source for the read replica.
" @@ -5323,7 +5331,7 @@ }, "MasterUserPassword": { "shape": "String", - "documentation": "The password for the master user. The password can include any printable ASCII character except \"/\", \"\"\", or \"@\".
Amazon Aurora
Not applicable. The password for the master user is managed by the DB cluster.
MariaDB
Constraints: Must contain from 8 to 41 characters.
Microsoft SQL Server
Constraints: Must contain from 8 to 128 characters.
MySQL
Constraints: Must contain from 8 to 41 characters.
Oracle
Constraints: Must contain from 8 to 30 characters.
PostgreSQL
Constraints: Must contain from 8 to 128 characters.
" + "documentation": "The password for the master user. The password can include any printable ASCII character except \"/\", \"\"\", or \"@\".
Amazon Aurora
Not applicable. The password for the master user is managed by the DB cluster.
Constraints: Can't be specified if ManageMasterUserPassword
is turned on.
MariaDB
Constraints: Must contain from 8 to 41 characters.
Microsoft SQL Server
Constraints: Must contain from 8 to 128 characters.
MySQL
Constraints: Must contain from 8 to 41 characters.
Oracle
Constraints: Must contain from 8 to 30 characters.
PostgreSQL
Constraints: Must contain from 8 to 128 characters.
" }, "DBSecurityGroups": { "shape": "DBSecurityGroupNameList", @@ -5504,6 +5512,14 @@ "StorageThroughput": { "shape": "IntegerOptional", "documentation": "Specifies the storage throughput value for the DB instance.
This setting applies only to the gp3
storage type.
This setting doesn't apply to RDS Custom or Amazon Aurora.
" + }, + "ManageMasterUserPassword": { + "shape": "BooleanOptional", + "documentation": "A value that indicates whether to manage the master user password with Amazon Web Services Secrets Manager.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide.
Constraints:
Can't manage the master user password with Amazon Web Services Secrets Manager if MasterUserPassword
is specified.
The Amazon Web Services KMS key identifier to encrypt a secret that is automatically generated and managed in Amazon Web Services Secrets Manager.
This setting is valid only if the master user password is managed by RDS in Amazon Web Services Secrets Manager for the DB instance.
The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key. To use a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN.
If you don't specify MasterUserSecretKmsKeyId
, then the aws/secretsmanager
KMS key is used to encrypt the secret. If the secret is in a different Amazon Web Services account, then you can't use the aws/secretsmanager
KMS key to encrypt the secret, and you must use a customer managed KMS key.
There is a default KMS key for your Amazon Web Services account. Your Amazon Web Services account has a different default KMS key for each Amazon Web Services Region.
" } }, "documentation": "" @@ -6343,6 +6359,10 @@ "DBSystemId": { "shape": "String", "documentation": "Reserved for future use.
" + }, + "MasterUserSecret": { + "shape": "MasterUserSecret", + "documentation": "Contains the secret managed by RDS in Amazon Web Services Secrets Manager for the master user password.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide and Password management with Amazon Web Services Secrets Manager in the Amazon Aurora User Guide.
" } }, "documentation": "Contains the details of an Amazon Aurora DB cluster or Multi-AZ DB cluster.
For an Amazon Aurora DB cluster, this data type is used as a response element in the operations CreateDBCluster
, DeleteDBCluster
, DescribeDBClusters
, FailoverDBCluster
, ModifyDBCluster
, PromoteReadReplicaDBCluster
, RestoreDBClusterFromS3
, RestoreDBClusterFromSnapshot
, RestoreDBClusterToPointInTime
, StartDBCluster
, and StopDBCluster
.
For a Multi-AZ DB cluster, this data type is used as a response element in the operations CreateDBCluster
, DeleteDBCluster
, DescribeDBClusters
, FailoverDBCluster
, ModifyDBCluster
, RebootDBCluster
, RestoreDBClusterFromSnapshot
, and RestoreDBClusterToPointInTime
.
For more information on Amazon Aurora DB clusters, see What is Amazon Aurora? in the Amazon Aurora User Guide.
For more information on Multi-AZ DB clusters, see Multi-AZ deployments with two readable standby DB instances in the Amazon RDS User Guide.
", @@ -7263,6 +7283,10 @@ "DBSystemId": { "shape": "String", "documentation": "The Oracle system ID (Oracle SID) for a container database (CDB). The Oracle SID is also the name of the CDB. This setting is valid for RDS Custom only.
" + }, + "MasterUserSecret": { + "shape": "MasterUserSecret", + "documentation": "Contains the secret managed by RDS in Amazon Web Services Secrets Manager for the master user password.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide.
" } }, "documentation": "Contains the details of an Amazon RDS DB instance.
This data type is used as a response element in the operations CreateDBInstance
, CreateDBInstanceReadReplica
, DeleteDBInstance
, DescribeDBInstances
, ModifyDBInstance
, PromoteReadReplica
, RebootDBInstance
, RestoreDBInstanceFromDBSnapshot
, RestoreDBInstanceFromS3
, RestoreDBInstanceToPointInTime
, StartDBInstance
, and StopDBInstance
.
The Amazon Resource Name (ARN) of the secret.
" + }, + "SecretStatus": { + "shape": "String", + "documentation": "The status of the secret.
The possible status values include the following:
creating
- The secret is being created.
active
- The secret is available for normal use and rotation.
rotating
- The secret is being rotated.
impaired
- The secret can be used to access database credentials, but it can't be rotated. A secret might have this status if, for example, permissions are changed so that RDS can no longer access either the secret or the KMS key for the secret.
When a secret has this status, you can correct the condition that caused the status. Alternatively, modify the DB instance to turn off automatic management of database credentials, and then modify the DB instance again to turn on automatic management of database credentials.
The Amazon Web Services KMS key identifier that is used to encrypt the secret.
" + } + }, + "documentation": "Contains the secret managed by RDS in Amazon Web Services Secrets Manager for the master user password.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide and Password management with Amazon Web Services Secrets Manager in the Amazon Aurora User Guide.
" + }, "MaxRecords": { "type": "integer", "max": 100, @@ -10661,7 +10703,7 @@ }, "MasterUserPassword": { "shape": "String", - "documentation": "The new password for the master database user. This password can contain any printable ASCII character except \"/\", \"\"\", or \"@\".
Constraints: Must contain from 8 to 41 characters.
Valid for: Aurora DB clusters and Multi-AZ DB clusters
" + "documentation": "The new password for the master database user. This password can contain any printable ASCII character except \"/\", \"\"\", or \"@\".
Constraints:
Must contain from 8 to 41 characters.
Can't be specified if ManageMasterUserPassword
is turned on.
Valid for: Aurora DB clusters and Multi-AZ DB clusters
" }, "OptionGroupName": { "shape": "String", @@ -10773,6 +10815,18 @@ "NetworkType": { "shape": "String", "documentation": "The network type of the DB cluster.
Valid values:
IPV4
DUAL
The network type is determined by the DBSubnetGroup
specified for the DB cluster. A DBSubnetGroup
can support only the IPv4 protocol or the IPv4 and the IPv6 protocols (DUAL
).
For more information, see Working with a DB instance in a VPC in the Amazon Aurora User Guide.
Valid for: Aurora DB clusters only
" + }, + "ManageMasterUserPassword": { + "shape": "BooleanOptional", + "documentation": "A value that indicates whether to manage the master user password with Amazon Web Services Secrets Manager.
If the DB cluster doesn't manage the master user password with Amazon Web Services Secrets Manager, you can turn on this management. In this case, you can't specify MasterUserPassword
.
If the DB cluster already manages the master user password with Amazon Web Services Secrets Manager, and you specify that the master user password is not managed with Amazon Web Services Secrets Manager, then you must specify MasterUserPassword
. In this case, RDS deletes the secret and uses the new password for the master user specified by MasterUserPassword
.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide and Password management with Amazon Web Services Secrets Manager in the Amazon Aurora User Guide.
Valid for: Aurora DB clusters and Multi-AZ DB clusters
" + }, + "RotateMasterUserPassword": { + "shape": "BooleanOptional", + "documentation": "A value that indicates whether to rotate the secret managed by Amazon Web Services Secrets Manager for the master user password.
This setting is valid only if the master user password is managed by RDS in Amazon Web Services Secrets Manager for the DB cluster. The secret value contains the updated password.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide and Password management with Amazon Web Services Secrets Manager in the Amazon Aurora User Guide.
Constraints:
You must apply the change immediately when rotating the master user password.
Valid for: Aurora DB clusters and Multi-AZ DB clusters
" + }, + "MasterUserSecretKmsKeyId": { + "shape": "String", + "documentation": "The Amazon Web Services KMS key identifier to encrypt a secret that is automatically generated and managed in Amazon Web Services Secrets Manager.
This setting is valid only if both of the following conditions are met:
The DB cluster doesn't manage the master user password in Amazon Web Services Secrets Manager.
If the DB cluster already manages the master user password in Amazon Web Services Secrets Manager, you can't change the KMS key that is used to encrypt the secret.
You are turning on ManageMasterUserPassword
to manage the master user password in Amazon Web Services Secrets Manager.
If you are turning on ManageMasterUserPassword
and don't specify MasterUserSecretKmsKeyId
, then the aws/secretsmanager
KMS key is used to encrypt the secret. If the secret is in a different Amazon Web Services account, then you can't use the aws/secretsmanager
KMS key to encrypt the secret, and you must use a customer managed KMS key.
The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key. To use a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN.
There is a default KMS key for your Amazon Web Services account. Your Amazon Web Services account has a different default KMS key for each Amazon Web Services Region.
Valid for: Aurora DB clusters and Multi-AZ DB clusters
" } }, "documentation": "" @@ -10853,7 +10907,7 @@ }, "DBInstanceClass": { "shape": "String", - "documentation": "The new compute and memory capacity of the DB instance, for example db.m4.large. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see DB Instance Class in the Amazon RDS User Guide or Aurora DB instance classes in the Amazon Aurora User Guide. For RDS Custom, see DB instance class support for RDS Custom for Oracle and DB instance class support for RDS Custom for SQL Server.
If you modify the DB instance class, an outage occurs during the change. The change is applied during the next maintenance window, unless you specify ApplyImmediately
in your request.
Default: Uses existing setting
" + "documentation": "The new compute and memory capacity of the DB instance, for example db.m4.large. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see DB Instance Class in the Amazon RDS User Guide or Aurora DB instance classes in the Amazon Aurora User Guide. For RDS Custom, see DB instance class support for RDS Custom for Oracle and DB instance class support for RDS Custom for SQL Server.
If you modify the DB instance class, an outage occurs during the change. The change is applied during the next maintenance window, unless you specify ApplyImmediately
in your request.
Default: Uses existing setting
" }, "DBSubnetGroupName": { "shape": "String", @@ -10873,7 +10927,7 @@ }, "MasterUserPassword": { "shape": "String", - "documentation": "The new password for the master user. The password can include any printable ASCII character except \"/\", \"\"\", or \"@\".
Changing this parameter doesn't result in an outage and the change is asynchronously applied as soon as possible. Between the time of the request and the completion of the request, the MasterUserPassword
element exists in the PendingModifiedValues
element of the operation response.
This setting doesn't apply to RDS Custom.
Amazon Aurora
Not applicable. The password for the master user is managed by the DB cluster. For more information, see ModifyDBCluster
.
Default: Uses existing setting
MariaDB
Constraints: Must contain from 8 to 41 characters.
Microsoft SQL Server
Constraints: Must contain from 8 to 128 characters.
MySQL
Constraints: Must contain from 8 to 41 characters.
Oracle
Constraints: Must contain from 8 to 30 characters.
PostgreSQL
Constraints: Must contain from 8 to 128 characters.
Amazon RDS API operations never return the password, so this action provides a way to regain access to a primary instance user if the password is lost. This includes restoring privileges that might have been accidentally revoked.
The new password for the master user. The password can include any printable ASCII character except \"/\", \"\"\", or \"@\".
Changing this parameter doesn't result in an outage and the change is asynchronously applied as soon as possible. Between the time of the request and the completion of the request, the MasterUserPassword
element exists in the PendingModifiedValues
element of the operation response.
This setting doesn't apply to RDS Custom.
Amazon Aurora
Not applicable. The password for the master user is managed by the DB cluster. For more information, see ModifyDBCluster
.
Default: Uses existing setting
Constraints: Can't be specified if ManageMasterUserPassword
is turned on.
MariaDB
Constraints: Must contain from 8 to 41 characters.
Microsoft SQL Server
Constraints: Must contain from 8 to 128 characters.
MySQL
Constraints: Must contain from 8 to 41 characters.
Oracle
Constraints: Must contain from 8 to 30 characters.
PostgreSQL
Constraints: Must contain from 8 to 128 characters.
Amazon RDS API operations never return the password, so this action provides a way to regain access to a primary instance user if the password is lost. This includes restoring privileges that might have been accidentally revoked.
Specifies the storage throughput value for the DB instance.
This setting applies only to the gp3
storage type.
This setting doesn't apply to RDS Custom or Amazon Aurora.
" + }, + "ManageMasterUserPassword": { + "shape": "BooleanOptional", + "documentation": "A value that indicates whether to manage the master user password with Amazon Web Services Secrets Manager.
If the DB cluster doesn't manage the master user password with Amazon Web Services Secrets Manager, you can turn on this management. In this case, you can't specify MasterUserPassword
.
If the DB cluster already manages the master user password with Amazon Web Services Secrets Manager, and you specify that the master user password is not managed with Amazon Web Services Secrets Manager, then you must specify MasterUserPassword
. In this case, RDS deletes the secret and uses the new password for the master user specified by MasterUserPassword
.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide.
Constraints:
Can't manage the master user password with Amazon Web Services Secrets Manager if MasterUserPassword
is specified.
A value that indicates whether to rotate the secret managed by Amazon Web Services Secrets Manager for the master user password.
This setting is valid only if the master user password is managed by RDS in Amazon Web Services Secrets Manager for the DB cluster. The secret value contains the updated password.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide.
Constraints:
You must apply the change immediately when rotating the master user password.
The Amazon Web Services KMS key identifier to encrypt a secret that is automatically generated and managed in Amazon Web Services Secrets Manager.
This setting is valid only if both of the following conditions are met:
The DB instance doesn't manage the master user password in Amazon Web Services Secrets Manager.
If the DB instance already manages the master user password in Amazon Web Services Secrets Manager, you can't change the KMS key used to encrypt the secret.
You are turning on ManageMasterUserPassword
to manage the master user password in Amazon Web Services Secrets Manager.
If you are turning on ManageMasterUserPassword
and don't specify MasterUserSecretKmsKeyId
, then the aws/secretsmanager
KMS key is used to encrypt the secret. If the secret is in a different Amazon Web Services account, then you can't use the aws/secretsmanager
KMS key to encrypt the secret, and you must use a customer managed KMS key.
The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key. To use a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN.
There is a default KMS key for your Amazon Web Services account. Your Amazon Web Services account has a different default KMS key for each Amazon Web Services Region.
" } }, "documentation": "" @@ -12775,7 +12841,6 @@ "DBClusterIdentifier", "Engine", "MasterUsername", - "MasterUserPassword", "SourceEngine", "SourceEngineVersion", "S3BucketName", @@ -12832,7 +12897,7 @@ }, "MasterUserPassword": { "shape": "String", - "documentation": "The password for the master database user. This password can contain any printable ASCII character except \"/\", \"\"\", or \"@\".
Constraints: Must contain from 8 to 41 characters.
" + "documentation": "The password for the master database user. This password can contain any printable ASCII character except \"/\", \"\"\", or \"@\".
Constraints:
Must contain from 8 to 41 characters.
Can't be specified if ManageMasterUserPassword
is turned on.
The network type of the DB cluster.
Valid values:
IPV4
DUAL
The network type is determined by the DBSubnetGroup
specified for the DB cluster. A DBSubnetGroup
can support only the IPv4 protocol or the IPv4 and the IPv6 protocols (DUAL
).
For more information, see Working with a DB instance in a VPC in the Amazon Aurora User Guide.
" + }, + "ManageMasterUserPassword": { + "shape": "BooleanOptional", + "documentation": "A value that indicates whether to manage the master user password with Amazon Web Services Secrets Manager.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide and Password management with Amazon Web Services Secrets Manager in the Amazon Aurora User Guide.
Constraints:
Can't manage the master user password with Amazon Web Services Secrets Manager if MasterUserPassword
is specified.
The Amazon Web Services KMS key identifier to encrypt a secret that is automatically generated and managed in Amazon Web Services Secrets Manager.
This setting is valid only if the master user password is managed by RDS in Amazon Web Services Secrets Manager for the DB cluster.
The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key. To use a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN.
If you don't specify MasterUserSecretKmsKeyId
, then the aws/secretsmanager
KMS key is used to encrypt the secret. If the secret is in a different Amazon Web Services account, then you can't use the aws/secretsmanager
KMS key to encrypt the secret, and you must use a customer managed KMS key.
There is a default KMS key for your Amazon Web Services account. Your Amazon Web Services account has a different default KMS key for each Amazon Web Services Region.
" } } }, @@ -13366,7 +13439,7 @@ }, "MasterUserPassword": { "shape": "String", - "documentation": "The password for the master user. The password can include any printable ASCII character except \"/\", \"\"\", or \"@\".
Constraints: Must contain from 8 to 41 characters.
" + "documentation": "The password for the master user. The password can include any printable ASCII character except \"/\", \"\"\", or \"@\".
Constraints: Can't be specified if ManageMasterUserPassword
is turned on.
MariaDB
Constraints: Must contain from 8 to 41 characters.
Microsoft SQL Server
Constraints: Must contain from 8 to 128 characters.
MySQL
Constraints: Must contain from 8 to 41 characters.
Oracle
Constraints: Must contain from 8 to 30 characters.
PostgreSQL
Constraints: Must contain from 8 to 128 characters.
" }, "DBSecurityGroups": { "shape": "DBSecurityGroupNameList", @@ -13523,6 +13596,14 @@ "StorageThroughput": { "shape": "IntegerOptional", "documentation": "Specifies the storage throughput value for the DB instance.
This setting doesn't apply to RDS Custom or Amazon Aurora.
" + }, + "ManageMasterUserPassword": { + "shape": "BooleanOptional", + "documentation": "A value that indicates whether to manage the master user password with Amazon Web Services Secrets Manager.
For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide.
Constraints:
Can't manage the master user password with Amazon Web Services Secrets Manager if MasterUserPassword
is specified.
The Amazon Web Services KMS key identifier to encrypt a secret that is automatically generated and managed in Amazon Web Services Secrets Manager.
This setting is valid only if the master user password is managed by RDS in Amazon Web Services Secrets Manager for the DB instance.
The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key. To use a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN.
If you don't specify MasterUserSecretKmsKeyId
, then the aws/secretsmanager
KMS key is used to encrypt the secret. If the secret is in a different Amazon Web Services account, then you can't use the aws/secretsmanager
KMS key to encrypt the secret, and you must use a customer managed KMS key.
There is a default KMS key for your Amazon Web Services account. Your Amazon Web Services account has a different default KMS key for each Amazon Web Services Region.
" } } }, diff --git a/apis/secretsmanager-2017-10-17.normal.json b/apis/secretsmanager-2017-10-17.normal.json index d2a5209c13..f04b3abcb4 100644 --- a/apis/secretsmanager-2017-10-17.normal.json +++ b/apis/secretsmanager-2017-10-17.normal.json @@ -85,7 +85,7 @@ "shape": "DecryptionFailure" } ], - "documentation": "Creates a new secret. A secret can be a password, a set of credentials such as a user name and password, an OAuth token, or other secret information that you store in an encrypted form in Secrets Manager. The secret also includes the connection information to access a database or other service, which Secrets Manager doesn't encrypt. A secret in Secrets Manager consists of both the protected secret data and the important information needed to manage the secret.
For information about creating a secret in the console, see Create a secret.
To create a secret, you can provide the secret value to be encrypted in either the SecretString
parameter or the SecretBinary
parameter, but not both. If you include SecretString
or SecretBinary
then Secrets Manager creates an initial secret version and automatically attaches the staging label AWSCURRENT
to it.
For database credentials you want to rotate, for Secrets Manager to be able to rotate the secret, you must make sure the JSON you store in the SecretString
matches the JSON structure of a database secret.
If you don't specify an KMS encryption key, Secrets Manager uses the Amazon Web Services managed key aws/secretsmanager
. If this key doesn't already exist in your account, then Secrets Manager creates it for you automatically. All users and roles in the Amazon Web Services account automatically have access to use aws/secretsmanager
. Creating aws/secretsmanager
can result in a one-time significant delay in returning the result.
If the secret is in a different Amazon Web Services account from the credentials calling the API, then you can't use aws/secretsmanager
to encrypt the secret, and you must create and use a customer managed KMS key.
Secrets Manager generates a CloudTrail log entry when you call this action. Do not include sensitive information in request parameters except SecretBinary
or SecretString
because it might be logged. For more information, see Logging Secrets Manager events with CloudTrail.
Required permissions: secretsmanager:CreateSecret
. If you include tags in the secret, you also need secretsmanager:TagResource
. For more information, see IAM policy actions for Secrets Manager and Authentication and access control in Secrets Manager.
To encrypt the secret with a KMS key other than aws/secretsmanager
, you need kms:GenerateDataKey
and kms:Decrypt
permission to the key.
Creates a new secret. A secret can be a password, a set of credentials such as a user name and password, an OAuth token, or other secret information that you store in an encrypted form in Secrets Manager. The secret also includes the connection information to access a database or other service, which Secrets Manager doesn't encrypt. A secret in Secrets Manager consists of both the protected secret data and the important information needed to manage the secret.
For secrets that use managed rotation, you need to create the secret through the managing service. For more information, see Secrets Manager secrets managed by other Amazon Web Services services.
For information about creating a secret in the console, see Create a secret.
To create a secret, you can provide the secret value to be encrypted in either the SecretString
parameter or the SecretBinary
parameter, but not both. If you include SecretString
or SecretBinary
then Secrets Manager creates an initial secret version and automatically attaches the staging label AWSCURRENT
to it.
For database credentials you want to rotate, for Secrets Manager to be able to rotate the secret, you must make sure the JSON you store in the SecretString
matches the JSON structure of a database secret.
If you don't specify an KMS encryption key, Secrets Manager uses the Amazon Web Services managed key aws/secretsmanager
. If this key doesn't already exist in your account, then Secrets Manager creates it for you automatically. All users and roles in the Amazon Web Services account automatically have access to use aws/secretsmanager
. Creating aws/secretsmanager
can result in a one-time significant delay in returning the result.
If the secret is in a different Amazon Web Services account from the credentials calling the API, then you can't use aws/secretsmanager
to encrypt the secret, and you must create and use a customer managed KMS key.
Secrets Manager generates a CloudTrail log entry when you call this action. Do not include sensitive information in request parameters except SecretBinary
or SecretString
because it might be logged. For more information, see Logging Secrets Manager events with CloudTrail.
Required permissions: secretsmanager:CreateSecret
. If you include tags in the secret, you also need secretsmanager:TagResource
. For more information, see IAM policy actions for Secrets Manager and Authentication and access control in Secrets Manager.
To encrypt the secret with a KMS key other than aws/secretsmanager
, you need kms:GenerateDataKey
and kms:Decrypt
permission to the key.
Configures and starts the asynchronous process of rotating the secret. For more information about rotation, see Rotate secrets.
If you include the configuration parameters, the operation sets the values for the secret and then immediately starts a rotation. If you don't include the configuration parameters, the operation starts a rotation with the values already stored in the secret.
For database credentials you want to rotate, for Secrets Manager to be able to rotate the secret, you must make sure the secret value is in the JSON structure of a database secret. In particular, if you want to use the alternating users strategy, your secret must contain the ARN of a superuser secret.
To configure rotation, you also need the ARN of an Amazon Web Services Lambda function and the schedule for the rotation. The Lambda rotation function creates a new version of the secret and creates or updates the credentials on the database or service to match. After testing the new credentials, the function marks the new secret version with the staging label AWSCURRENT
. Then anyone who retrieves the secret gets the new version. For more information, see How rotation works.
You can create the Lambda rotation function based on the rotation function templates that Secrets Manager provides. Choose a template that matches your Rotation strategy.
When rotation is successful, the AWSPENDING
staging label might be attached to the same version as the AWSCURRENT
version, or it might not be attached to any version. If the AWSPENDING
staging label is present but not attached to the same version as AWSCURRENT
, then any later invocation of RotateSecret
assumes that a previous rotation request is still in progress and returns an error.
When rotation is unsuccessful, the AWSPENDING
staging label might be attached to an empty secret version. For more information, see Troubleshoot rotation in the Secrets Manager User Guide.
Secrets Manager generates a CloudTrail log entry when you call this action. Do not include sensitive information in request parameters because it might be logged. For more information, see Logging Secrets Manager events with CloudTrail.
Required permissions: secretsmanager:RotateSecret
. For more information, see IAM policy actions for Secrets Manager and Authentication and access control in Secrets Manager. You also need lambda:InvokeFunction
permissions on the rotation function. For more information, see Permissions for rotation.
Configures and starts the asynchronous process of rotating the secret. For information about rotation, see Rotate secrets in the Secrets Manager User Guide. If you include the configuration parameters, the operation sets the values for the secret and then immediately starts a rotation. If you don't include the configuration parameters, the operation starts a rotation with the values already stored in the secret.
When rotation is successful, the AWSPENDING
staging label might be attached to the same version as the AWSCURRENT
version, or it might not be attached to any version. If the AWSPENDING
staging label is present but not attached to the same version as AWSCURRENT
, then any later invocation of RotateSecret
assumes that a previous rotation request is still in progress and returns an error. When rotation is unsuccessful, the AWSPENDING
staging label might be attached to an empty secret version. For more information, see Troubleshoot rotation in the Secrets Manager User Guide.
Secrets Manager generates a CloudTrail log entry when you call this action. Do not include sensitive information in request parameters because it might be logged. For more information, see Logging Secrets Manager events with CloudTrail.
Required permissions: secretsmanager:RotateSecret
. For more information, see IAM policy actions for Secrets Manager and Authentication and access control in Secrets Manager. You also need lambda:InvokeFunction
permissions on the rotation function. For more information, see Permissions for rotation.
Modifies the details of a secret, including metadata and the secret value. To change the secret value, you can also use PutSecretValue.
To change the rotation configuration of a secret, use RotateSecret instead.
We recommend you avoid calling UpdateSecret
at a sustained rate of more than once every 10 minutes. When you call UpdateSecret
to update the secret value, Secrets Manager creates a new version of the secret. Secrets Manager removes outdated versions when there are more than 100, but it does not remove versions created less than 24 hours ago. If you update the secret value more than once every 10 minutes, you create more versions than Secrets Manager removes, and you will reach the quota for secret versions.
If you include SecretString
or SecretBinary
to create a new secret version, Secrets Manager automatically moves the staging label AWSCURRENT
to the new version. Then it attaches the label AWSPREVIOUS
to the version that AWSCURRENT
was removed from.
If you call this operation with a ClientRequestToken
that matches an existing version's VersionId
, the operation results in an error. You can't modify an existing version, you can only create a new version. To remove a version, remove all staging labels from it. See UpdateSecretVersionStage.
Secrets Manager generates a CloudTrail log entry when you call this action. Do not include sensitive information in request parameters except SecretBinary
or SecretString
because it might be logged. For more information, see Logging Secrets Manager events with CloudTrail.
Required permissions: secretsmanager:UpdateSecret
. For more information, see IAM policy actions for Secrets Manager and Authentication and access control in Secrets Manager. If you use a customer managed key, you must also have kms:GenerateDataKey
and kms:Decrypt
permissions on the key. For more information, see Secret encryption and decryption.
Modifies the details of a secret, including metadata and the secret value. To change the secret value, you can also use PutSecretValue.
To change the rotation configuration of a secret, use RotateSecret instead.
To change a secret so that it is managed by another service, you need to recreate the secret in that service. See Secrets Manager secrets managed by other Amazon Web Services services.
We recommend you avoid calling UpdateSecret
at a sustained rate of more than once every 10 minutes. When you call UpdateSecret
to update the secret value, Secrets Manager creates a new version of the secret. Secrets Manager removes outdated versions when there are more than 100, but it does not remove versions created less than 24 hours ago. If you update the secret value more than once every 10 minutes, you create more versions than Secrets Manager removes, and you will reach the quota for secret versions.
If you include SecretString
or SecretBinary
to create a new secret version, Secrets Manager automatically moves the staging label AWSCURRENT
to the new version. Then it attaches the label AWSPREVIOUS
to the version that AWSCURRENT
was removed from.
If you call this operation with a ClientRequestToken
that matches an existing version's VersionId
, the operation results in an error. You can't modify an existing version, you can only create a new version. To remove a version, remove all staging labels from it. See UpdateSecretVersionStage.
Secrets Manager generates a CloudTrail log entry when you call this action. Do not include sensitive information in request parameters except SecretBinary
or SecretString
because it might be logged. For more information, see Logging Secrets Manager events with CloudTrail.
Required permissions: secretsmanager:UpdateSecret
. For more information, see IAM policy actions for Secrets Manager and Authentication and access control in Secrets Manager. If you use a customer managed key, you must also have kms:GenerateDataKey
and kms:Decrypt
permissions on the key. For more information, see Secret encryption and decryption.
The ARN of the Lambda rotation function that can rotate the secret.
" + "documentation": "For secrets that use a Lambda rotation function to rotate, the ARN of the Lambda rotation function.
For secrets that use managed rotation, omit this field. For more information, see Managed rotation in the Secrets Manager User Guide.
" }, "RotationRules": { "shape": "RotationRulesType", @@ -1575,7 +1575,7 @@ }, "RotateImmediately": { "shape": "BooleanType", - "documentation": "Specifies whether to rotate the secret immediately or wait until the next scheduled rotation window. The rotation schedule is defined in RotateSecretRequest$RotationRules.
If you don't immediately rotate the secret, Secrets Manager tests the rotation configuration by running the testSecret
step of the Lambda rotation function. The test creates an AWSPENDING
version of the secret and then removes it.
If you don't specify this value, then by default, Secrets Manager rotates the secret immediately.
", + "documentation": "Specifies whether to rotate the secret immediately or wait until the next scheduled rotation window. The rotation schedule is defined in RotateSecretRequest$RotationRules.
For secrets that use a Lambda rotation function to rotate, if you don't immediately rotate the secret, Secrets Manager tests the rotation configuration by running the testSecret
step of the Lambda rotation function. The test creates an AWSPENDING
version of the secret and then removes it.
If you don't specify this value, then by default, Secrets Manager rotates the secret immediately.
", "box": true } } @@ -2054,5 +2054,5 @@ } } }, - "documentation": "Amazon Web Services Secrets Manager provides a service to enable you to store, manage, and retrieve, secrets.
This guide provides descriptions of the Secrets Manager API. For more information about using this service, see the Amazon Web Services Secrets Manager User Guide.
API Version
This version of the Secrets Manager API Reference documents the Secrets Manager API version 2017-10-17.
Support and Feedback for Amazon Web Services Secrets Manager
We welcome your feedback. Send your comments to awssecretsmanager-feedback@amazon.com, or post your feedback and questions in the Amazon Web Services Secrets Manager Discussion Forum. For more information about the Amazon Web Services Discussion Forums, see Forums Help.
Logging API Requests
Amazon Web Services Secrets Manager supports Amazon Web Services CloudTrail, a service that records Amazon Web Services API calls for your Amazon Web Services account and delivers log files to an Amazon S3 bucket. By using information that's collected by Amazon Web Services CloudTrail, you can determine the requests successfully made to Secrets Manager, who made the request, when it was made, and so on. For more about Amazon Web Services Secrets Manager and support for Amazon Web Services CloudTrail, see Logging Amazon Web Services Secrets Manager Events with Amazon Web Services CloudTrail in the Amazon Web Services Secrets Manager User Guide. To learn more about CloudTrail, including enabling it and find your log files, see the Amazon Web Services CloudTrail User Guide.
" + "documentation": "Amazon Web Services Secrets Manager provides a service to enable you to store, manage, and retrieve, secrets.
This guide provides descriptions of the Secrets Manager API. For more information about using this service, see the Amazon Web Services Secrets Manager User Guide.
API Version
This version of the Secrets Manager API Reference documents the Secrets Manager API version 2017-10-17.
For a list of endpoints, see Amazon Web Services Secrets Manager endpoints.
Support and Feedback for Amazon Web Services Secrets Manager
We welcome your feedback. Send your comments to awssecretsmanager-feedback@amazon.com, or post your feedback and questions in the Amazon Web Services Secrets Manager Discussion Forum. For more information about the Amazon Web Services Discussion Forums, see Forums Help.
Logging API Requests
Amazon Web Services Secrets Manager supports Amazon Web Services CloudTrail, a service that records Amazon Web Services API calls for your Amazon Web Services account and delivers log files to an Amazon S3 bucket. By using information that's collected by Amazon Web Services CloudTrail, you can determine the requests successfully made to Secrets Manager, who made the request, when it was made, and so on. For more about Amazon Web Services Secrets Manager and support for Amazon Web Services CloudTrail, see Logging Amazon Web Services Secrets Manager Events with Amazon Web Services CloudTrail in the Amazon Web Services Secrets Manager User Guide. To learn more about CloudTrail, including enabling it and find your log files, see the Amazon Web Services CloudTrail User Guide.
" } \ No newline at end of file diff --git a/clients/computeoptimizer.d.ts b/clients/computeoptimizer.d.ts index a6f06586fe..147a62f15e 100644 --- a/clients/computeoptimizer.d.ts +++ b/clients/computeoptimizer.d.ts @@ -51,6 +51,14 @@ declare class ComputeOptimizer extends Service { * Exports optimization recommendations for Amazon EC2 instances. Recommendations are exported in a comma-separated values (.csv) file, and its metadata in a JavaScript Object Notation (JSON) (.json) file, to an existing Amazon Simple Storage Service (Amazon S3) bucket that you specify. For more information, see Exporting Recommendations in the Compute Optimizer User Guide. You can have only one Amazon EC2 instance export job in progress per Amazon Web Services Region. */ exportEC2InstanceRecommendations(callback?: (err: AWSError, data: ComputeOptimizer.Types.ExportEC2InstanceRecommendationsResponse) => void): Request>1,l=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,d=a?0:s-1,y=a?1:-1,b=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(n=isNaN(t)?1:0,o=m):(o=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-o))<1&&(o--,u*=2),t+=o+c>=1?l/u:l*Math.pow(2,1-c),t*u>=2&&(o++,u/=2),o+c>=m?(n=0,o=m):o+c>=1?(n=(t*u-1)*Math.pow(2,i),o+=c):(n=t*Math.pow(2,c-1)*Math.pow(2,i),o=0));i>=8;e[r+d]=255&n,d+=y,n/=256,i-=8);for(o=o<0;e[r+d]=255&o,d+=y,o/=256,p-=8);e[r+d-y]|=128*b}},{}],437:[function(e,t,r){var a={}.toString;t.exports=Array.isArray||function(e){return"[object Array]"==a.call(e)}},{}],438:[function(e,t,r){!function(e){"use strict";function t(e){return null!==e&&"[object Array]"===Object.prototype.toString.call(e)}function r(e){return null!==e&&"[object Object]"===Object.prototype.toString.call(e)}function a(e,i){if(e===i)return!0;if(Object.prototype.toString.call(e)!==Object.prototype.toString.call(i))return!1;if(!0===t(e)){if(e.length!==i.length)return!1;for(var s=0;s G((f-r)/g)&&i("overflow"),r+=(p-t)*g,t=p,u=0;u =0?(c=b.substr(0,S),l=b.substr(S+1)):(c=b,l=""),d=decodeURIComponent(c),y=decodeURIComponent(l),a(o,d)?i(o[d])?o[d].push(y):o[d]=[o[d],y]:o[d]=y}return o};var i=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)}},{}],442:[function(e,t,r){"use strict";function a(e,t){if(e.map)return e.map(t);for(var r=[],a=0;a >1,l=23===i?Math.pow(2,-24)-Math.pow(2,-77):0,d=a?0:s-1,y=a?1:-1,b=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(n=isNaN(t)?1:0,o=m):(o=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-o))<1&&(o--,u*=2),t+=o+c>=1?l/u:l*Math.pow(2,1-c),t*u>=2&&(o++,u/=2),o+c>=m?(n=0,o=m):o+c>=1?(n=(t*u-1)*Math.pow(2,i),o+=c):(n=t*Math.pow(2,c-1)*Math.pow(2,i),o=0));i>=8;e[r+d]=255&n,d+=y,n/=256,i-=8);for(o=o<0;e[r+d]=255&o,d+=y,o/=256,p-=8);e[r+d-y]|=128*b}},{}],437:[function(e,t,r){var a={}.toString;t.exports=Array.isArray||function(e){return"[object Array]"==a.call(e)}},{}],438:[function(e,t,r){!function(e){"use strict";function t(e){return null!==e&&"[object Array]"===Object.prototype.toString.call(e)}function r(e){return null!==e&&"[object Object]"===Object.prototype.toString.call(e)}function a(e,i){if(e===i)return!0;if(Object.prototype.toString.call(e)!==Object.prototype.toString.call(i))return!1;if(!0===t(e)){if(e.length!==i.length)return!1;for(var s=0;s =0?this.expression(e):"Lbracket"===t?(this._match("Lbracket"),this._parseMultiselectList()):"Lbrace"===t?(this._match("Lbrace"),this._parseMultiselectHash()):void 0},_parseProjectionRHS:function(e){var t;if(P[this._lookahead(0)]<10)t={type:"Identity"};else if("Lbracket"===this._lookahead(0))t=this.expression(e);else if("Filter"===this._lookahead(0))t=this.expression(e);else{if("Dot"!==this._lookahead(0)){var r=this._lookaheadToken(0),a=new Error("Sytanx error, unexpected token: "+r.value+"("+r.type+")");throw a.name="ParserError",a}this._match("Dot"),t=this._parseDotRHS(e)}return t},_parseMultiselectList:function(){for(var e=[];"Rbracket"!==this._lookahead(0);){var t=this.expression(0);if(e.push(t),"Comma"===this._lookahead(0)&&(this._match("Comma"),"Rbracket"===this._lookahead(0)))throw new Error("Unexpected token Rbracket")}return this._match("Rbracket"),{type:"MultiSelectList",children:e}},_parseMultiselectHash:function(){for(var e,t,r,a,i=[],s=["UnquotedIdentifier","QuotedIdentifier"];;){if(e=this._lookaheadToken(0),s.indexOf(e.type)<0)throw new Error("Expecting an identifier token, got: "+e.type);if(t=e.value,this._advance(),this._match("Colon"),r=this.expression(0),a={type:"KeyValuePair",name:t,value:r},i.push(a),"Comma"===this._lookahead(0))this._match("Comma");else if("Rbrace"===this._lookahead(0)){this._match("Rbrace");break}}return{type:"MultiSelectHash",children:i}}},c.prototype={search:function(e,t){return this.visit(e,t)},visit:function(e,o){var n,u,p,m,c,l,d,y,b;switch(e.type){case"Field":return null!==o&&r(o)?(l=o[e.name],void 0===l?null:l):null;case"Subexpression":for(p=this.visit(e.children[0],o),b=1;b G((f-r)/g)&&i("overflow"),r+=(p-t)*g,t=p,u=0;u =0?(c=b.substr(0,S),l=b.substr(S+1)):(c=b,l=""),d=decodeURIComponent(c),y=decodeURIComponent(l),a(o,d)?i(o[d])?o[d].push(y):o[d]=[o[d],y]:o[d]=y}return o};var i=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)}},{}],442:[function(e,t,r){"use strict";function a(e,t){if(e.map)return e.map(t);for(var r=[],a=0;a=55296&&t<=56319&&i65535&&(e-=65536,t+=w(e>>>10&1023|55296),e=56320|1023&e),t+=w(e)}).join("")}function p(e){return e-48<10?e-22:e-65<26?e-65:e-97<26?e-97:T}function m(e,t){return e+22+75*(e<26)-((0!=t)<<5)}function c(e,t,r){var a=0;for(e=r?G(e/R):e>>1,e+=G(e/t);e>L*k>>1;a+=T)e=G(e/L);return G(a+(L+1)*e/(e+A))}function l(e){var t,r,a,s,o,n,m,l,d,y,b=[],S=e.length,g=0,h=v,N=D;for(r=e.lastIndexOf(x),r<0&&(r=0),
-a=0;a=S&&i("invalid-input"),l=p(e.charCodeAt(s++)),(l>=T||l>G((f-g)/n))&&i("overflow"),g+=l*n,d=m<=N?C:m>=N+k?k:m-N,!(l=t&&bf&&i("overflow"),b==t){for(l=r,d=T;y=d<=o?C:d>=o+k?k:d-o,!(l=0&&delete e.httpRequest.headers["Content-Length"]}function i(e){var t=new l,r=e.service.api.operations[e.operation].input;if(r.payload){var a={},i=r.members[r.payload];a=e.params[r.payload],"structure"===i.type?(e.httpRequest.body=t.build(a||{},i),s(e)):void 0!==a&&(e.httpRequest.body=a,("binary"===i.type||i.isStreaming)&&s(e,!0))}else e.httpRequest.body=t.build(e.params,r),s(e)}function s(e,t){if(!e.httpRequest.headers["Content-Type"]){var r=t?"binary/octet-stream":"application/json";e.httpRequest.headers["Content-Type"]=r}}function o(e){m.buildRequest(e),y.indexOf(e.httpRequest.method)<0&&i(e)}function n(e){c.extractError(e)}function u(e){m.extractData(e);var t,r=e.request,a=r.service.api.operations[r.operation],i=r.service.api.operations[r.operation].output||{};a.hasEventOutput;if(i.payload){var s=i.members[i.payload],o=e.httpResponse.body;if(s.isEventStream)t=new d,e.data[payload]=p.createEventStream(2===AWS.HttpClient.streamsApiVersion?e.httpResponse.stream:o,t,s);else if("structure"===s.type||"list"===s.type){var t=new d;e.data[i.payload]=t.parse(o,s)}else"binary"===s.type||s.isStreaming?e.data[i.payload]=o:e.data[i.payload]=s.toType(o)}else{var n=e.data;c.extractData(e),e.data=p.merge(n,e.data)}}var p=e("../util"),m=e("./rest"),c=e("./json"),l=e("../json/builder"),d=e("../json/parser"),y=["GET","HEAD","DELETE"];t.exports={buildRequest:o,extractError:n,extractData:u,unsetContentLength:a}},{"../json/builder":369,"../json/parser":370,"../util":422,"./json":380,"./rest":382}],384:[function(e,t,r){function a(e){var t=e.service.api.operations[e.operation].input,r=new n.XML.Builder,a=e.params,i=t.payload;if(i){var s=t.members[i];if(void 0===(a=a[i]))return;if("structure"===s.type){var o=s.name;e.httpRequest.body=r.toXML(a,s,o,!0)}else e.httpRequest.body=a}else e.httpRequest.body=r.toXML(a,t,t.name||t.shape||u.string.upperFirst(e.operation)+"Request")}function i(e){p.buildRequest(e),["GET","HEAD"].indexOf(e.httpRequest.method)<0&&a(e)}function s(e){p.extractError(e);var t;try{t=(new n.XML.Parser).parse(e.httpResponse.body.toString())}catch(r){t={Code:e.httpResponse.statusCode,Message:e.httpResponse.statusMessage}}t.Errors&&(t=t.Errors),t.Error&&(t=t.Error),t.Code?e.error=u.error(new Error,{code:t.Code,message:t.Message}):e.error=u.error(new Error,{code:e.httpResponse.statusCode,message:null})}function o(e){p.extractData(e);var t,r=e.request,a=e.httpResponse.body,i=r.service.api.operations[r.operation],s=i.output,o=(i.hasEventOutput,s.payload);if(o){var m=s.members[o];m.isEventStream?(t=new n.XML.Parser,e.data[o]=u.createEventStream(2===n.HttpClient.streamsApiVersion?e.httpResponse.stream:e.httpResponse.body,t,m)):"structure"===m.type?(t=new n.XML.Parser,e.data[o]=t.parse(a.toString(),m)):"binary"===m.type||m.isStreaming?e.data[o]=a:e.data[o]=m.toType(a)}else if(a.length>0){t=new n.XML.Parser;var c=t.parse(a.toString(),s);u.update(e.data,c)}}var n=e("../core"),u=e("../util"),p=e("./rest");t.exports={buildRequest:i,extractError:s,extractData:o}},{"../core":345,"../util":422,"./rest":382}],385:[function(e,t,r){function a(){}function i(e){return e.isQueryName||"ec2"!==e.api.protocol?e.name:e.name[0].toUpperCase()+e.name.substr(1)}function s(e,t,r,a){p.each(r.members,function(r,s){var o=t[r];if(null!==o&&void 0!==o){var n=i(s);n=e?e+"."+n:n,u(n,o,s,a)}})}function o(e,t,r,a){var i=1;p.each(t,function(t,s){var o=r.flattened?".":".entry.",n=o+i+++".",p=n+(r.key.name||"key"),m=n+(r.value.name||"value");u(e+p,t,r.key,a),u(e+m,s,r.value,a)})}function n(e,t,r,a){var s=r.member||{};if(0===t.length)return void a.call(this,e,null);p.arrayEach(t,function(t,o){var n="."+(o+1);if("ec2"===r.api.protocol)n+="";else if(r.flattened){if(s.name){var p=e.split(".");p.pop(),p.push(i(s)),e=p.join(".")}}else n="."+(s.name?s.name:"member")+n;u(e+n,t,s,a)})}function u(e,t,r,a){null!==t&&void 0!==t&&("structure"===r.type?s(e,t,r,a):"list"===r.type?n(e,t,r,a):"map"===r.type?o(e,t,r,a):a(e,r.toWireFormat(t).toString()))}var p=e("../util");a.prototype.serialize=function(e,t,r){s("",e,t,r)},t.exports=a},{"../util":422}],386:[function(e,t,r){var a=e("../core"),i=null,s={signatureVersion:"v4",signingName:"rds-db",operations:{}},o={region:"string",hostname:"string",port:"number",username:"string"};a.RDS.Signer=a.util.inherit({constructor:function(e){this.options=e||{}},convertUrlToAuthToken:function(e){if(0===e.indexOf("https://"))return e.substring("https://".length)},getAuthToken:function(e,t){"function"==typeof e&&void 0===t&&(t=e,e={});var r=this,o="function"==typeof t;e=a.util.merge(this.options,e);var n=this.validateAuthTokenOptions(e);if(!0!==n){if(o)return t(n,null);throw n}var u={region:e.region,endpoint:new a.Endpoint(e.hostname+":"+e.port),paramValidation:!1,signatureVersion:"v4"};e.credentials&&(u.credentials=e.credentials),i=new a.Service(u),i.api=s;var p=i.makeRequest();if(this.modifyRequestForAuthToken(p,e),!o){var m=p.presign(900);return this.convertUrlToAuthToken(m)}p.presign(900,function(e,a){a&&(a=r.convertUrlToAuthToken(a)),t(e,a)})},modifyRequestForAuthToken:function(e,t){e.on("build",e.buildAsGet),e.httpRequest.body=a.util.queryParamsToString({Action:"connect",DBUser:t.username})},validateAuthTokenOptions:function(e){var t="";e=e||{};for(var r in o)Object.prototype.hasOwnProperty.call(o,r)&&typeof e[r]!==o[r]&&(t+="option '"+r+"' should have been type '"+o[r]+"', was '"+typeof e[r]+"'.\n");return!t.length||a.util.error(new Error,{code:"InvalidParameter",message:t})}})},{"../core":345}],387:[function(e,t,r){t.exports={now:function(){return"undefined"!=typeof performance&&"function"==typeof performance.now?performance.now():Date.now()}}},{}],388:[function(e,t,r){function a(e){return"string"==typeof e&&(e.startsWith("fips-")||e.endsWith("-fips"))}function i(e){return"string"==typeof e&&["aws-global","aws-us-gov-global"].includes(e)}function s(e){return["fips-aws-global","aws-fips","aws-global"].includes(e)?"us-east-1":["fips-aws-us-gov-global","aws-us-gov-global"].includes(e)?"us-gov-west-1":e.replace(/fips-(dkr-|prod-)?|-fips/,"")}t.exports={isFipsRegion:a,isGlobalRegion:i,getRealRegion:s}},{}],389:[function(e,t,r){function a(e){if(!e)return null;var t=e.split("-");return t.length<3?null:t.slice(0,t.length-2).join("-")+"-*"}function i(e){var t=e.config.region,r=a(t),i=e.api.endpointPrefix;return[[t,i],[r,i],[t,"*"],[r,"*"],["*",i],["*","*"]].map(function(e){return e[0]&&e[1]?e.join("/"):null})}function s(e,t){u.each(t,function(t,r){"globalEndpoint"!==t&&(void 0!==e.config[t]&&null!==e.config[t]||(e.config[t]=r))})}function o(e){for(var t=i(e),r=e.config.useFipsEndpoint,a=e.config.useDualstackEndpoint,o=0;o=a())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+a().toString(16)+" bytes");return 0|e}function b(e){return+e!=e&&(e=0),s.alloc(+e)}function S(e,t){if(s.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var r=e.length;if(0===r)return 0;for(var a=!1;;)switch(t){case"ascii":case"latin1":case"binary":return r;case"utf8":case"utf-8":case void 0:return K(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*r;case"hex":return r>>>1;case"base64":return H(e).length;default:if(a)return K(e).length;t=(""+t).toLowerCase(),a=!0}}function g(e,t,r){var a=!1;if((void 0===t||t<0)&&(t=0),t>this.length)return"";if((void 0===r||r>this.length)&&(r=this.length),r<=0)return"";if(r>>>=0,t>>>=0,r<=t)return"";for(e||(e="utf8");;)switch(e){case"hex":return E(this,t,r);case"utf8":case"utf-8":return v(this,t,r);case"ascii":return x(this,t,r);case"latin1":case"binary":return q(this,t,r);case"base64":return D(this,t,r);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return M(this,t,r);default:if(a)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),a=!0}}function h(e,t,r){var a=e[t];e[t]=e[r],e[r]=a}function N(e,t,r,a,i){if(0===e.length)return-1;if("string"==typeof r?(a=r,r=0):r>2147483647?r=2147483647:r<-2147483648&&(r=-2147483648),r=+r,isNaN(r)&&(r=i?0:e.length-1),r<0&&(r=e.length+r),r>=e.length){if(i)return-1;r=e.length-1}else if(r<0){if(!i)return-1;r=0}if("string"==typeof t&&(t=s.from(t,a)),s.isBuffer(t))return 0===t.length?-1:I(e,t,r,a,i);if("number"==typeof t)return t&=255,s.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(e,t,r):Uint8Array.prototype.lastIndexOf.call(e,t,r):I(e,[t],r,a,i);throw new TypeError("val must be string, number or Buffer")}function I(e,t,r,a,i){function s(e,t){return 1===o?e[t]:e.readUInt16BE(t*o)}var o=1,n=e.length,u=t.length;if(void 0!==a&&("ucs2"===(a=String(a).toLowerCase())||"ucs-2"===a||"utf16le"===a||"utf-16le"===a)){if(e.length<2||t.length<2)return-1;o=2,n/=2,u/=2,r/=2}var p;if(i){var m=-1;for(p=r;p>>8*(a?i:1-i)}function B(e,t,r,a){t<0&&(t=4294967295+t+1);for(var i=0,s=Math.min(e.length-r,4);i>>8*(a?i:3-i)&255}function U(e,t,r,a,i,s){if(r+a>e.length)throw new RangeError("Index out of range");if(r<0)throw new RangeError("Index out of range")}function _(e,t,r,a,i){return i||U(e,t,r,4,3.4028234663852886e38,-3.4028234663852886e38),X.write(e,t,r,a,23,4),r+4}function F(e,t,r,a,i){return i||U(e,t,r,8,1.7976931348623157e308,-1.7976931348623157e308),X.write(e,t,r,a,52,8),r+8}function O(e){if(e=V(e).replace(ee,""),e.length<2)return"";for(;e.length%4!=0;)e+="=";return e}function V(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}function z(e){return e<16?"0"+e.toString(16):e.toString(16)}function K(e,t){t=t||1/0;for(var r,a=e.length,i=null,s=[],o=0;o55295&&r<57344){if(!i){if(r>56319){(t-=3)>-1&&s.push(239,191,189);continue}if(o+1===a){(t-=3)>-1&&s.push(239,191,189);continue}i=r;continue}if(r<56320){(t-=3)>-1&&s.push(239,191,189),i=r;continue}r=65536+(i-55296<<10|r-56320)}else i&&(t-=3)>-1&&s.push(239,191,189);if(i=null,r<128){if((t-=1)<0)break;s.push(r)}else if(r<2048){if((t-=2)<0)break;s.push(r>>6|192,63&r|128)}else if(r<65536){if((t-=3)<0)break;s.push(r>>12|224,r>>6&63|128,63&r|128)}else{if(!(r<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;s.push(r>>18|240,r>>12&63|128,r>>6&63|128,63&r|128)}}return s}function j(e){for(var t=[],r=0;r=55296&&t<=56319&&i65535&&(e-=65536,t+=w(e>>>10&1023|55296),e=56320|1023&e),t+=w(e)}).join("")}function p(e){return e-48<10?e-22:e-65<26?e-65:e-97<26?e-97:T}function m(e,t){return e+22+75*(e<26)-((0!=t)<<5)}function c(e,t,r){var a=0;for(e=r?G(e/R):e>>1,e+=G(e/t);e>L*k>>1;a+=T)e=G(e/L);return G(a+(L+1)*e/(e+A))}function l(e){var t,r,a,s,o,n,m,l,d,y,b=[],S=e.length,g=0,h=v,N=D;for(r=e.lastIndexOf(P),r<0&&(r=0),a=0;a=S&&i("invalid-input"),l=p(e.charCodeAt(s++)),(l>=T||l>G((f-g)/n))&&i("overflow"),g+=l*n,d=m<=N?C:m>=N+k?k:m-N,!(l=t&&bf&&i("overflow"),b==t){for(l=r,d=T;y=d<=o?C:d>=o+k?k:d-o,!(l