From 0c9ed07ae62297b8f53b062ec7deaef53926ae76 Mon Sep 17 00:00:00 2001 From: awssdkgo Date: Thu, 26 Jul 2018 22:09:41 +0000 Subject: [PATCH] Release v1.15.0 --- CHANGELOG.md | 32 ++ CHANGELOG_PENDING.md | 10 - aws/version.go | 2 +- models/apis/codebuild/2016-10-06/api-2.json | 9 +- models/apis/codebuild/2016-10-06/docs-2.json | 3 + models/apis/ec2/2016-11-15/api-2.json | 60 +- models/apis/ec2/2016-11-15/docs-2.json | 149 +++-- models/apis/greengrass/2017-06-07/docs-2.json | 2 +- models/apis/inspector/2016-02-16/api-2.json | 64 ++- models/apis/inspector/2016-02-16/docs-2.json | 17 +- models/apis/inspector/2016-02-16/smoke.json | 18 + models/apis/redshift/2012-12-01/api-2.json | 98 +++- models/apis/redshift/2012-12-01/docs-2.json | 62 +- models/apis/ssm/2014-11-06/api-2.json | 71 ++- models/apis/ssm/2014-11-06/docs-2.json | 50 +- service/codebuild/api.go | 33 ++ service/ec2/api.go | 536 ++++++++++++------ service/ec2/doc.go | 19 +- service/greengrass/api.go | 2 +- service/inspector/api.go | 72 ++- service/inspector/errors.go | 6 + service/inspector/examples_test.go | 30 + service/redshift/api.go | 330 ++++++++++- service/redshift/errors.go | 6 + service/redshift/redshiftiface/interface.go | 4 + service/ssm/api.go | 251 +++++++- service/ssm/errors.go | 4 + service/ssm/ssmiface/interface.go | 4 + 28 files changed, 1636 insertions(+), 308 deletions(-) create mode 100644 models/apis/inspector/2016-02-16/smoke.json diff --git a/CHANGELOG.md b/CHANGELOG.md index aaac8a7d8af..cf072c8bef0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,35 @@ +Release v1.15.0 (2018-07-26) +=== + +### Service Client Updates +* `service/codebuild`: Updates service API and documentation + * Add artifacts encryptionDisabled and build encryptionKey. +* `service/ec2`: Updates service API and documentation + * This change provides the EC2/Spot customers with two new allocation strategies -- LowestN for Spot instances, and OD priority for on-demand instances. +* `service/greengrass`: Updates service documentation + * Documentation updates for Greengrass Local Resource Access feature +* `service/inspector`: Updates service API and documentation + * inspector will return ServiceTemporarilyUnavailableException when service is under stress +* `service/redshift`: Updates service API and documentation + * When we make a new version of Amazon Redshift available, we update your cluster during its maintenance window. By selecting a maintenance track, you control whether we update your cluster with the most recent approved release, or with the previous release. The two values for maintenance track are current and trailing. If you choose the current track, your cluster is updated with the latest approved release. If you choose the trailing track, your cluster is updated with the release that was approved previously.The new API operation for managing maintenance tracks for a cluster is DescribeClusterTracks. In addition, the following API operations have new MaintenanceTrackName parameters: Cluster, PendingModifiedValues, ModifyCluster, RestoreFromClusterSnapshot, CreateCluster, Snapshot +* `service/ssm`: Updates service API and documentation + * This release updates AWS Systems Manager APIs to allow customers to attach labels to history parameter records and reference history parameter records via labels. It also adds Parameter Store integration with AWS Secrets Manager to allow referencing and retrieving AWS Secrets Manager's secrets from Parameter Store. + +### SDK Features +* `private/model/api`: SDK APIs input/output are not consistently generated ([#2073](https://github.com/aws/aws-sdk-go/pull/2073)) + * Updates the SDK's API code generation to generate the API input and output types consistently. This ensures that the SDK will no longer rename input/output types unexpectedly as in [#2070](https://github.com/aws/aws-sdk-go/issues/2070). SDK API input and output parameter types will always be the API name with a suffix of Input and Output. + * Existing service APIs which were incorrectly modeled have been preserved to ensure they do not break. + * Fixes [#2070](https://github.com/aws/aws-sdk-go/issues/2070) + +### SDK Enhancements +* `service/s3/s3manager`: Document default behavior for Upload's MaxNumParts ([#2077](https://github.com/aws/aws-sdk-go/issues/2077)) + * Updates the S3 Upload Manager's default behavior for MaxNumParts, and ensures that the Uploader.MaxNumPart's member value is initialized properly if the type was created via struct initialization instead of using the NewUploader function. + * Fixes [#2015](https://github.com/aws/aws-sdk-go/issues/2015) + +### SDK Bugs +* `private/model/api`: SDK APIs input/output are not consistently generated ([#2073](https://github.com/aws/aws-sdk-go/pull/2073)) + * Fixes EFS service breaking change in v1.14.26 where `FileSystemDescription` was incorrectly renamed to `UpdateFileSystemOutput. + * Fixes [#2070](https://github.com/aws/aws-sdk-go/issues/2070) Release v1.14.33 (2018-07-25) === diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index fb027c4afe6..8a1927a39ca 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -1,15 +1,5 @@ ### SDK Features -* `private/model/api`: SDK APIs input/output are not consistently generated ([#2073](https://github.com/aws/aws-sdk-go/pull/2073)) - * Updates the SDK's API code generation to generate the API input and output types consistently. This ensures that the SDK will no longer rename input/output types unexpectedly as in [#2070](https://github.com/aws/aws-sdk-go/issues/2070). SDK API input and output parameter types will always be the API name with a suffix of Input and Output. - * Existing service APIs which were incorrectly modeled have been preserved to ensure they do not break. - * Fixes [#2070](https://github.com/aws/aws-sdk-go/issues/2070) ### SDK Enhancements -* `service/s3/s3manager`: Document default behavior for Upload's MaxNumParts ([#2077](https://github.com/aws/aws-sdk-go/issues/2077)) - * Updates the S3 Upload Manager's default behavior for MaxNumParts, and ensures that the Uploader.MaxNumPart's member value is initialized properly if the type was created via struct initialization instead of using the NewUploader function. - * Fixes [#2015](https://github.com/aws/aws-sdk-go/issues/2015) ### SDK Bugs -* `private/model/api`: SDK APIs input/output are not consistently generated ([#2073](https://github.com/aws/aws-sdk-go/pull/2073)) - * Fixes EFS service breaking change in v1.14.26 where `FileSystemDescription` was incorrectly renamed to `UpdateFileSystemOutput. - * Fixes [#2070](https://github.com/aws/aws-sdk-go/issues/2070) diff --git a/aws/version.go b/aws/version.go index 65b5fe2ca7e..05885623db3 100644 --- a/aws/version.go +++ b/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.14.33" +const SDKVersion = "1.15.0" diff --git a/models/apis/codebuild/2016-10-06/api-2.json b/models/apis/codebuild/2016-10-06/api-2.json index 8cc8a8404b3..98166bfd051 100644 --- a/models/apis/codebuild/2016-10-06/api-2.json +++ b/models/apis/codebuild/2016-10-06/api-2.json @@ -311,7 +311,8 @@ "buildComplete":{"shape":"Boolean"}, "initiator":{"shape":"String"}, "vpcConfig":{"shape":"VpcConfig"}, - "networkInterface":{"shape":"NetworkInterface"} + "networkInterface":{"shape":"NetworkInterface"}, + "encryptionKey":{"shape":"NonEmptyString"} } }, "BuildArtifacts":{ @@ -319,7 +320,8 @@ "members":{ "location":{"shape":"String"}, "sha256sum":{"shape":"String"}, - "md5sum":{"shape":"String"} + "md5sum":{"shape":"String"}, + "encryptionDisabled":{"shape":"WrapperBoolean"} } }, "BuildIds":{ @@ -697,7 +699,8 @@ "path":{"shape":"String"}, "namespaceType":{"shape":"ArtifactNamespace"}, "name":{"shape":"String"}, - "packaging":{"shape":"ArtifactPackaging"} + "packaging":{"shape":"ArtifactPackaging"}, + "encryptionDisabled":{"shape":"WrapperBoolean"} } }, "ProjectBadge":{ diff --git a/models/apis/codebuild/2016-10-06/docs-2.json b/models/apis/codebuild/2016-10-06/docs-2.json index f73e5b7be1a..a2ce3792f66 100644 --- a/models/apis/codebuild/2016-10-06/docs-2.json +++ b/models/apis/codebuild/2016-10-06/docs-2.json @@ -357,6 +357,7 @@ "Build$sourceVersion": "

Any version identifier for the version of the source code to be built.

", "Build$projectName": "

The name of the AWS CodeBuild project.

", "Build$serviceRole": "

The name of a service role used for this build.

", + "Build$encryptionKey": "

The AWS Key Management Service (AWS KMS) customer master key (CMK) to be used for encrypting the build output artifacts.

This is expressed either as the CMK's Amazon Resource Name (ARN) or, if specified, the CMK's alias (using the format alias/alias-name ).

", "BuildIds$member": null, "BuildNotDeleted$id": "

The ID of the build that could not be successfully deleted.

", "CreateProjectInput$serviceRole": "

The ARN of the AWS Identity and Access Management (IAM) role that enables AWS CodeBuild to interact with dependent AWS services on behalf of the AWS account.

", @@ -700,7 +701,9 @@ "WrapperBoolean": { "base": null, "refs": { + "BuildArtifacts$encryptionDisabled": "

Information that tells you if encryption for build artifacts is disabled.

", "CreateProjectInput$badgeEnabled": "

Set this to true to generate a publicly-accessible URL for your project's build badge.

", + "ProjectArtifacts$encryptionDisabled": "

Set to true if you do not want your output artifacts encrypted. This option is only valid if your artifacts type is Amazon S3. If this is set with another artifacts type, an invalidInputException will be thrown.

", "ProjectEnvironment$privilegedMode": "

Enables running the Docker daemon inside a Docker container. Set to true only if the build project is be used to build Docker images, and the specified build environment image is not provided by AWS CodeBuild with Docker support. Otherwise, all associated builds that attempt to interact with the Docker daemon will fail. Note that you must also start the Docker daemon so that builds can interact with it. One way to do this is to initialize the Docker daemon during the install phase of your build spec by running the following build commands. (Do not run the following build commands if the specified build environment image is provided by AWS CodeBuild with Docker support.)

If the operating system's base image is Ubuntu Linux:

- nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --storage-driver=overlay& - timeout 15 sh -c \"until docker info; do echo .; sleep 1; done\"

If the operating system's base image is Alpine Linux, add the -t argument to timeout:

- nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --storage-driver=overlay& - timeout 15 -t sh -c \"until docker info; do echo .; sleep 1; done\"

", "ProjectSource$reportBuildStatus": "

Set to true to report the status of a build's start and finish to your source provider. This option is only valid when your source provider is GitHub. If this is set and you use a different source provider, an invalidInputException is thrown.

", "ProjectSource$insecureSsl": "

Enable this flag to ignore SSL warnings while connecting to the project source code.

", diff --git a/models/apis/ec2/2016-11-15/api-2.json b/models/apis/ec2/2016-11-15/api-2.json index 7d600d02e0a..0a2486f87c8 100755 --- a/models/apis/ec2/2016-11-15/api-2.json +++ b/models/apis/ec2/2016-11-15/api-2.json @@ -4162,6 +4162,7 @@ "DryRun":{"shape":"Boolean"}, "ClientToken":{"shape":"String"}, "SpotOptions":{"shape":"SpotOptionsRequest"}, + "OnDemandOptions":{"shape":"OnDemandOptionsRequest"}, "ExcessCapacityTerminationPolicy":{"shape":"FleetExcessCapacityTerminationPolicy"}, "LaunchTemplateConfigs":{"shape":"FleetLaunchTemplateConfigListRequest"}, "TargetCapacitySpecification":{"shape":"TargetCapacitySpecificationRequest"}, @@ -9180,6 +9181,10 @@ "shape":"SpotOptions", "locationName":"spotOptions" }, + "OnDemandOptions":{ + "shape":"OnDemandOptions", + "locationName":"onDemandOptions" + }, "Tags":{ "shape":"TagList", "locationName":"tagSet" @@ -9263,6 +9268,10 @@ "WeightedCapacity":{ "shape":"Double", "locationName":"weightedCapacity" + }, + "Priority":{ + "shape":"Double", + "locationName":"priority" } } }, @@ -9288,7 +9297,8 @@ "MaxPrice":{"shape":"String"}, "SubnetId":{"shape":"String"}, "AvailabilityZone":{"shape":"String"}, - "WeightedCapacity":{"shape":"Double"} + "WeightedCapacity":{"shape":"Double"}, + "Priority":{"shape":"Double"} } }, "FleetLaunchTemplateSpecification":{ @@ -9316,6 +9326,13 @@ "Version":{"shape":"String"} } }, + "FleetOnDemandAllocationStrategy":{ + "type":"string", + "enum":[ + "lowest-price", + "prioritized" + ] + }, "FleetSet":{ "type":"list", "member":{ @@ -12408,6 +12425,10 @@ "WeightedCapacity":{ "shape":"Double", "locationName":"weightedCapacity" + }, + "Priority":{ + "shape":"Double", + "locationName":"priority" } } }, @@ -13948,6 +13969,28 @@ "All Upfront" ] }, + "OnDemandAllocationStrategy":{ + "type":"string", + "enum":[ + "lowestPrice", + "prioritized" + ] + }, + "OnDemandOptions":{ + "type":"structure", + "members":{ + "AllocationStrategy":{ + "shape":"FleetOnDemandAllocationStrategy", + "locationName":"allocationStrategy" + } + } + }, + "OnDemandOptionsRequest":{ + "type":"structure", + "members":{ + "AllocationStrategy":{"shape":"FleetOnDemandAllocationStrategy"} + } + }, "OperationType":{ "type":"string", "enum":[ @@ -17191,6 +17234,10 @@ "shape":"AllocationStrategy", "locationName":"allocationStrategy" }, + "OnDemandAllocationStrategy":{ + "shape":"OnDemandAllocationStrategy", + "locationName":"onDemandAllocationStrategy" + }, "ClientToken":{ "shape":"String", "locationName":"clientToken" @@ -17258,6 +17305,10 @@ "LoadBalancersConfig":{ "shape":"LoadBalancersConfig", "locationName":"loadBalancersConfig" + }, + "InstancePoolsToUseCount":{ + "shape":"Integer", + "locationName":"instancePoolsToUseCount" } } }, @@ -17458,6 +17509,10 @@ "InstanceInterruptionBehavior":{ "shape":"SpotInstanceInterruptionBehavior", "locationName":"instanceInterruptionBehavior" + }, + "InstancePoolsToUseCount":{ + "shape":"Integer", + "locationName":"instancePoolsToUseCount" } } }, @@ -17465,7 +17520,8 @@ "type":"structure", "members":{ "AllocationStrategy":{"shape":"SpotAllocationStrategy"}, - "InstanceInterruptionBehavior":{"shape":"SpotInstanceInterruptionBehavior"} + "InstanceInterruptionBehavior":{"shape":"SpotInstanceInterruptionBehavior"}, + "InstancePoolsToUseCount":{"shape":"Integer"} } }, "SpotPlacement":{ diff --git a/models/apis/ec2/2016-11-15/docs-2.json b/models/apis/ec2/2016-11-15/docs-2.json index e30396faa1e..fae606e8427 100755 --- a/models/apis/ec2/2016-11-15/docs-2.json +++ b/models/apis/ec2/2016-11-15/docs-2.json @@ -1,6 +1,6 @@ { "version": "2.0", - "service": "Amazon Elastic Compute Cloud

Amazon Elastic Compute Cloud (Amazon EC2) provides resizable computing capacity in the AWS Cloud. Using Amazon EC2 eliminates the need to invest in hardware up front, so you can develop and deploy applications faster.

", + "service": "Amazon Elastic Compute Cloud

Amazon Elastic Compute Cloud (Amazon EC2) provides secure and resizable computing capacity in the AWS cloud. Using Amazon EC2 eliminates the need to invest in hardware up front, so you can develop and deploy applications faster.

To learn more about Amazon EC2, Amazon EBS, and Amazon VPC, see the following resources:

", "operations": { "AcceptReservedInstancesExchangeQuote": "

Accepts the Convertible Reserved Instance exchange quote described in the GetReservedInstancesExchangeQuote call.

", "AcceptVpcEndpointConnections": "

Accepts one or more interface VPC endpoint connection requests to your VPC endpoint service.

", @@ -22,7 +22,7 @@ "AttachVpnGateway": "

Attaches a virtual private gateway to a VPC. You can attach one virtual private gateway to one VPC at a time.

For more information, see AWS Managed VPN Connections in the Amazon Virtual Private Cloud User Guide.

", "AuthorizeSecurityGroupEgress": "

[EC2-VPC only] Adds one or more egress rules to a security group for use with a VPC. Specifically, this action permits instances to send traffic to one or more destination IPv4 or IPv6 CIDR address ranges, or to one or more destination security groups for the same VPC. This action doesn't apply to security groups for use in EC2-Classic. For more information, see Security Groups for Your VPC in the Amazon Virtual Private Cloud User Guide. For more information about security group limits, see Amazon VPC Limits.

Each rule consists of the protocol (for example, TCP), plus either a CIDR range or a source group. For the TCP and UDP protocols, you must also specify the destination port or port range. For the ICMP protocol, you must also specify the ICMP type and code. You can use -1 for the type or code to mean all types or all codes. You can optionally specify a description for the rule.

Rule changes are propagated to affected instances as quickly as possible. However, a small delay might occur.

", "AuthorizeSecurityGroupIngress": "

Adds one or more ingress rules to a security group.

Rule changes are propagated to instances within the security group as quickly as possible. However, a small delay might occur.

[EC2-Classic] This action gives one or more IPv4 CIDR address ranges permission to access a security group in your account, or gives one or more security groups (called the source groups) permission to access a security group for your account. A source group can be for your own AWS account, or another. You can have up to 100 rules per group.

[EC2-VPC] This action gives one or more IPv4 or IPv6 CIDR address ranges permission to access a security group in your VPC, or gives one or more other security groups (called the source groups) permission to access a security group for your VPC. The security groups must all be for the same VPC or a peer VPC in a VPC peering connection. For more information about VPC security group limits, see Amazon VPC Limits.

You can optionally specify a description for the security group rule.

", - "BundleInstance": "

Bundles an Amazon instance store-backed Windows instance.

During bundling, only the root device volume (C:\\) is bundled. Data on other instance store volumes is not preserved.

This action is not applicable for Linux/Unix instances or Windows instances that are backed by Amazon EBS.

For more information, see Creating an Instance Store-Backed Windows AMI.

", + "BundleInstance": "

Bundles an Amazon instance store-backed Windows instance.

During bundling, only the root device volume (C:\\) is bundled. Data on other instance store volumes is not preserved.

This action is not applicable for Linux/Unix instances or Windows instances that are backed by Amazon EBS.

", "CancelBundleTask": "

Cancels a bundling operation for an instance store-backed Windows instance.

", "CancelConversionTask": "

Cancels an active conversion task. The task can be the import of an instance or volume. The action removes all artifacts of the conversion, including a partially uploaded volume or instance. If the conversion is complete or is in the process of transferring the final disk image, the command fails and returns an exception.

For more information, see Importing a Virtual Machine Using the Amazon EC2 CLI.

", "CancelExportTask": "

Cancels an active export task. The request removes all artifacts of the export, including any partially-created Amazon S3 objects. If the export task is complete or is in the process of transferring the final disk image, the command fails and returns an error.

", @@ -122,9 +122,9 @@ "DescribeFlowLogs": "

Describes one or more flow logs. To view the information in your flow logs (the log streams for the network interfaces), you must use the CloudWatch Logs console or the CloudWatch Logs API.

", "DescribeFpgaImageAttribute": "

Describes the specified attribute of the specified Amazon FPGA Image (AFI).

", "DescribeFpgaImages": "

Describes one or more available Amazon FPGA Images (AFIs). These include public AFIs, private AFIs that you own, and AFIs owned by other AWS accounts for which you have load permissions.

", - "DescribeHostReservationOfferings": "

Describes the Dedicated Host Reservations that are available to purchase.

The results describe all the Dedicated Host Reservation offerings, including offerings that may not match the instance family and region of your Dedicated Hosts. When purchasing an offering, ensure that the the instance family and region of the offering matches that of the Dedicated Host/s it will be associated with. For an overview of supported instance types, see Dedicated Hosts Overview in the Amazon Elastic Compute Cloud User Guide.

", - "DescribeHostReservations": "

Describes Dedicated Host Reservations which are associated with Dedicated Hosts in your account.

", - "DescribeHosts": "

Describes one or more of your Dedicated Hosts.

The results describe only the Dedicated Hosts in the region you're currently using. All listed instances consume capacity on your Dedicated Host. Dedicated Hosts that have recently been released will be listed with the state released.

", + "DescribeHostReservationOfferings": "

Describes the Dedicated Host reservations that are available to purchase.

The results describe all the Dedicated Host reservation offerings, including offerings that may not match the instance family and region of your Dedicated Hosts. When purchasing an offering, ensure that the instance family and Region of the offering matches that of the Dedicated Hosts with which it is to be associated . For more information about supported instance types, see Dedicated Hosts Overview in the Amazon Elastic Compute Cloud User Guide.

", + "DescribeHostReservations": "

Describes reservations that are associated with Dedicated Hosts in your account.

", + "DescribeHosts": "

Describes one or more of your Dedicated Hosts.

The results describe only the Dedicated Hosts in the region you're currently using. All listed instances consume capacity on your Dedicated Host. Dedicated Hosts that have recently been released are listed with the state released.

", "DescribeIamInstanceProfileAssociations": "

Describes your IAM instance profile associations.

", "DescribeIdFormat": "

Describes the ID format settings for your resources on a per-region basis, for example, to view which resource types are enabled for longer IDs. This request only returns information about resource types whose ID formats can be modified; it does not return information about other resource types.

The following resource types support longer IDs: bundle | conversion-task | customer-gateway | dhcp-options | elastic-ip-allocation | elastic-ip-association | export-task | flow-log | image | import-task | instance | internet-gateway | network-acl | network-acl-association | network-interface | network-interface-attachment | prefix-list | reservation | route-table | route-table-association | security-group | snapshot | subnet | subnet-cidr-block-association | volume | vpc | vpc-cidr-block-association | vpc-endpoint | vpc-peering-connection | vpn-connection | vpn-gateway.

These settings apply to the IAM user who makes the request; they do not apply to the entire AWS account. By default, an IAM user defaults to the same settings as the root user, unless they explicitly override the settings by running the ModifyIdFormat command. Resources created with longer IDs are visible to all IAM users, regardless of these settings and provided that they have permission to use the relevant Describe command for the resource type.

", "DescribeIdentityIdFormat": "

Describes the ID format settings for resources for the specified IAM user, IAM role, or root user. For example, you can view the resource types that are enabled for longer IDs. This request only returns information about resource types whose ID formats can be modified; it does not return information about other resource types. For more information, see Resource IDs in the Amazon Elastic Compute Cloud User Guide.

The following resource types support longer IDs: bundle | conversion-task | customer-gateway | dhcp-options | elastic-ip-allocation | elastic-ip-association | export-task | flow-log | image | import-task | instance | internet-gateway | network-acl | network-acl-association | network-interface | network-interface-attachment | prefix-list | reservation | route-table | route-table-association | security-group | snapshot | subnet | subnet-cidr-block-association | volume | vpc | vpc-cidr-block-association | vpc-endpoint | vpc-peering-connection | vpn-connection | vpn-gateway.

These settings apply to the principal specified in the request. They do not apply to the principal that makes the request.

", @@ -217,7 +217,7 @@ "ImportVolume": "

Creates an import volume task using metadata from the specified disk image.For more information, see Importing Disks to Amazon EBS.

For information about the import manifest referenced by this API action, see VM Import Manifest.

", "ModifyFleet": "

Modifies the specified EC2 Fleet.

While the EC2 Fleet is being modified, it is in the modifying state.

", "ModifyFpgaImageAttribute": "

Modifies the specified attribute of the specified Amazon FPGA Image (AFI).

", - "ModifyHosts": "

Modify the auto-placement setting of a Dedicated Host. When auto-placement is enabled, AWS will place instances that you launch with a tenancy of host, but without targeting a specific host ID, onto any available Dedicated Host in your account which has auto-placement enabled. When auto-placement is disabled, you need to provide a host ID if you want the instance to launch onto a specific host. If no host ID is provided, the instance will be launched onto a suitable host which has auto-placement enabled.

", + "ModifyHosts": "

Modify the auto-placement setting of a Dedicated Host. When auto-placement is enabled, any instances that you launch with a tenancy of host but without a specific host ID are placed onto any available Dedicated Host in your account that has auto-placement enabled. When auto-placement is disabled, you need to provide a host ID ito have the instance launch onto a specific host. If no host ID is provided, the instance is launched onto a suitable host with auto-placement enabled.

", "ModifyIdFormat": "

Modifies the ID format for the specified resource on a per-region basis. You can specify that resources should receive longer IDs (17-character IDs) when they are created.

This request can only be used to modify longer ID settings for resource types that are within the opt-in period. Resources currently in their opt-in period include: bundle | conversion-task | customer-gateway | dhcp-options | elastic-ip-allocation | elastic-ip-association | export-task | flow-log | image | import-task | internet-gateway | network-acl | network-acl-association | network-interface | network-interface-attachment | prefix-list | route-table | route-table-association | security-group | subnet | subnet-cidr-block-association | vpc | vpc-cidr-block-association | vpc-endpoint | vpc-peering-connection | vpn-connection | vpn-gateway.

This setting applies to the IAM user who makes the request; it does not apply to the entire AWS account. By default, an IAM user defaults to the same settings as the root user. If you're using this action as the root user, then these settings apply to the entire account, unless an IAM user explicitly overrides these settings for themselves. For more information, see Resource IDs in the Amazon Elastic Compute Cloud User Guide.

Resources created with longer IDs are visible to all IAM roles and users, regardless of these settings and provided that they have permission to use the relevant Describe command for the resource type.

", "ModifyIdentityIdFormat": "

Modifies the ID format of a resource for a specified IAM user, IAM role, or the root user for an account; or all IAM users, IAM roles, and the root user for an account. You can specify that resources should receive longer IDs (17-character IDs) when they are created.

This request can only be used to modify longer ID settings for resource types that are within the opt-in period. Resources currently in their opt-in period include: bundle | conversion-task | customer-gateway | dhcp-options | elastic-ip-allocation | elastic-ip-association | export-task | flow-log | image | import-task | internet-gateway | network-acl | network-acl-association | network-interface | network-interface-attachment | prefix-list | route-table | route-table-association | security-group | subnet | subnet-cidr-block-association | vpc | vpc-cidr-block-association | vpc-endpoint | vpc-peering-connection | vpn-connection | vpn-gateway.

For more information, see Resource IDs in the Amazon Elastic Compute Cloud User Guide.

This setting applies to the principal specified in the request; it does not apply to the principal that makes the request.

Resources created with longer IDs are visible to all IAM roles and users, regardless of these settings and provided that they have permission to use the relevant Describe command for the resource type.

", "ModifyImageAttribute": "

Modifies the specified attribute of the specified AMI. You can specify only one attribute at a time. You can use the Attribute parameter to specify the attribute or one of the following parameters: Description, LaunchPermission, or ProductCode.

AWS Marketplace product codes cannot be modified. Images with an AWS Marketplace product code cannot be made public.

To enable the SriovNetSupport enhanced networking attribute of an image, enable SriovNetSupport on an instance and create an AMI from the instance.

", @@ -245,11 +245,11 @@ "PurchaseReservedInstancesOffering": "

Purchases a Reserved Instance for use with your account. With Reserved Instances, you pay a lower hourly rate compared to On-Demand instance pricing.

Use DescribeReservedInstancesOfferings to get a list of Reserved Instance offerings that match your specifications. After you've purchased a Reserved Instance, you can check for your new Reserved Instance with DescribeReservedInstances.

For more information, see Reserved Instances and Reserved Instance Marketplace in the Amazon Elastic Compute Cloud User Guide.

", "PurchaseScheduledInstances": "

Purchases one or more Scheduled Instances with the specified schedule.

Scheduled Instances enable you to purchase Amazon EC2 compute capacity by the hour for a one-year term. Before you can purchase a Scheduled Instance, you must call DescribeScheduledInstanceAvailability to check for available schedules and obtain a purchase token. After you purchase a Scheduled Instance, you must call RunScheduledInstances during each scheduled time period.

After you purchase a Scheduled Instance, you can't cancel, modify, or resell your purchase.

", "RebootInstances": "

Requests a reboot of one or more instances. This operation is asynchronous; it only queues a request to reboot the specified instances. The operation succeeds if the instances are valid and belong to you. Requests to reboot terminated instances are ignored.

If an instance does not cleanly shut down within four minutes, Amazon EC2 performs a hard reboot.

For more information about troubleshooting, see Getting Console Output and Rebooting Instances in the Amazon Elastic Compute Cloud User Guide.

", - "RegisterImage": "

Registers an AMI. When you're creating an AMI, this is the final step you must complete before you can launch an instance from the AMI. For more information about creating AMIs, see Creating Your Own AMIs in the Amazon Elastic Compute Cloud User Guide.

For Amazon EBS-backed instances, CreateImage creates and registers the AMI in a single request, so you don't have to register the AMI yourself.

You can also use RegisterImage to create an Amazon EBS-backed Linux AMI from a snapshot of a root device volume. You specify the snapshot using the block device mapping. For more information, see Launching a Linux Instance from a Backup in the Amazon Elastic Compute Cloud User Guide.

You can't register an image where a secondary (non-root) snapshot has AWS Marketplace product codes.

Some Linux distributions, such as Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES), use the EC2 billing product code associated with an AMI to verify the subscription status for package updates. Creating an AMI from an EBS snapshot does not maintain this billing code, and subsequent instances launched from such an AMI will not be able to connect to package update infrastructure. To create an AMI that must retain billing codes, see CreateImage.

If needed, you can deregister an AMI at any time. Any modifications you make to an AMI backed by an instance store volume invalidates its registration. If you make changes to an image, deregister the previous image and register the new image.

", + "RegisterImage": "

Registers an AMI. When you're creating an AMI, this is the final step you must complete before you can launch an instance from the AMI. For more information about creating AMIs, see Creating Your Own AMIs in the Amazon Elastic Compute Cloud User Guide.

For Amazon EBS-backed instances, CreateImage creates and registers the AMI in a single request, so you don't have to register the AMI yourself.

You can also use RegisterImage to create an Amazon EBS-backed Linux AMI from a snapshot of a root device volume. You specify the snapshot using the block device mapping. For more information, see Launching a Linux Instance from a Backup in the Amazon Elastic Compute Cloud User Guide.

You can't register an image where a secondary (non-root) snapshot has AWS Marketplace product codes.

Some Linux distributions, such as Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES), use the EC2 billing product code associated with an AMI to verify the subscription status for package updates. Creating an AMI from an EBS snapshot does not maintain this billing code, and instances launched from such an AMI are not able to connect to package update infrastructure. If you purchase a Reserved Instance offering for one of these Linux distributions and launch instances using an AMI that does not contain the required billing code, your Reserved Instance is not applied to these instances.

To create an AMI for operating systems that require a billing code, see CreateImage.

If needed, you can deregister an AMI at any time. Any modifications you make to an AMI backed by an instance store volume invalidates its registration. If you make changes to an image, deregister the previous image and register the new image.

", "RejectVpcEndpointConnections": "

Rejects one or more VPC endpoint connection requests to your VPC endpoint service.

", "RejectVpcPeeringConnection": "

Rejects a VPC peering connection request. The VPC peering connection must be in the pending-acceptance state. Use the DescribeVpcPeeringConnections request to view your outstanding VPC peering connection requests. To delete an active VPC peering connection, or to delete a VPC peering connection request that you initiated, use DeleteVpcPeeringConnection.

", "ReleaseAddress": "

Releases the specified Elastic IP address.

[EC2-Classic, default VPC] Releasing an Elastic IP address automatically disassociates it from any instance that it's associated with. To disassociate an Elastic IP address without releasing it, use DisassociateAddress.

[Nondefault VPC] You must use DisassociateAddress to disassociate the Elastic IP address before you can release it. Otherwise, Amazon EC2 returns an error (InvalidIPAddress.InUse).

After releasing an Elastic IP address, it is released to the IP address pool. Be sure to update your DNS records and any servers or devices that communicate with the address. If you attempt to release an Elastic IP address that you already released, you'll get an AuthFailure error if the address is already allocated to another AWS account.

[EC2-VPC] After you release an Elastic IP address for use in a VPC, you might be able to recover it. For more information, see AllocateAddress.

", - "ReleaseHosts": "

When you no longer want to use an On-Demand Dedicated Host it can be released. On-Demand billing is stopped and the host goes into released state. The host ID of Dedicated Hosts that have been released can no longer be specified in another request, e.g., ModifyHosts. You must stop or terminate all instances on a host before it can be released.

When Dedicated Hosts are released, it make take some time for them to stop counting toward your limit and you may receive capacity errors when trying to allocate new Dedicated hosts. Try waiting a few minutes, and then try again.

Released hosts will still appear in a DescribeHosts response.

", + "ReleaseHosts": "

When you no longer want to use an On-Demand Dedicated Host it can be released. On-Demand billing is stopped and the host goes into released state. The host ID of Dedicated Hosts that have been released can no longer be specified in another request, for example, ModifyHosts. You must stop or terminate all instances on a host before it can be released.

When Dedicated Hosts are released, it may take some time for them to stop counting toward your limit and you may receive capacity errors when trying to allocate new Dedicated Hosts. Wait a few minutes and then try again.

Released hosts still appear in a DescribeHosts response.

", "ReplaceIamInstanceProfileAssociation": "

Replaces an IAM instance profile for the specified running instance. You can use this action to change the IAM instance profile that's associated with an instance without having to disassociate the existing IAM instance profile first.

Use DescribeIamInstanceProfileAssociations to get the association ID.

", "ReplaceNetworkAclAssociation": "

Changes which network ACL a subnet is associated with. By default when you create a subnet, it's automatically associated with the default network ACL. For more information about network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User Guide.

This is an idempotent operation.

", "ReplaceNetworkAclEntry": "

Replaces an entry (rule) in a network ACL. For more information about network ACLs, see Network ACLs in the Amazon Virtual Private Cloud User Guide.

", @@ -671,7 +671,7 @@ "AvailableInstanceCapacityList": { "base": null, "refs": { - "AvailableCapacity$AvailableInstanceCapacity": "

The total number of instances that the Dedicated Host supports.

" + "AvailableCapacity$AvailableInstanceCapacity": "

The total number of instances supported by the Dedicated Host.

" } }, "BatchState": { @@ -977,7 +977,7 @@ "LaunchTemplatesMonitoring$Enabled": "

Indicates whether detailed monitoring is enabled. Otherwise, basic monitoring is enabled.

", "LaunchTemplatesMonitoringRequest$Enabled": "

Specify true to enable detailed monitoring. Otherwise, basic monitoring is enabled.

", "ModifyFleetRequest$DryRun": "

Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.

", - "ModifyFleetResult$Return": "

Is true if the request succeeds, and an error otherwise.

", + "ModifyFleetResult$Return": "

Is true if the request succeeds, and an error otherwise.

", "ModifyFpgaImageAttributeRequest$DryRun": "

Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.

", "ModifyIdFormatRequest$UseLongIds": "

Indicate whether the resource should use longer IDs (17-character IDs).

", "ModifyIdentityIdFormatRequest$UseLongIds": "

Indicates whether the resource should use longer IDs (17-character IDs)

", @@ -3249,8 +3249,11 @@ "FleetData$FulfilledCapacity": "

The number of units fulfilled by this request compared to the set target capacity.

", "FleetData$FulfilledOnDemandCapacity": "

The number of units fulfilled by this request compared to the set target On-Demand capacity.

", "FleetLaunchTemplateOverrides$WeightedCapacity": "

The number of units provided by the specified instance type.

", + "FleetLaunchTemplateOverrides$Priority": "

The priority for the launch template override. If AllocationStrategy is set to prioritized, EC2 Fleet uses priority to determine which launch template override to use first in fulfilling On-Demand capacity. The highest priority is launched first. Valid values are whole numbers starting at 0. The lower the number, the higher the priority. If no number is set, the override has the lowest priority.

", "FleetLaunchTemplateOverridesRequest$WeightedCapacity": "

The number of units provided by the specified instance type.

", + "FleetLaunchTemplateOverridesRequest$Priority": "

The priority for the launch template override. If AllocationStrategy is set to prioritized, EC2 Fleet uses priority to determine which launch template override to use first in fulfilling On-Demand capacity. The highest priority is launched first. Valid values are whole numbers starting at 0. The lower the number, the higher the priority. If no number is set, the launch template override has the lowest priority.

", "LaunchTemplateOverrides$WeightedCapacity": "

The number of units provided by the specified instance type.

", + "LaunchTemplateOverrides$Priority": "

The priority for the launch template override. If OnDemandAllocationStrategy is set to prioritized, Spot Fleet uses priority to determine which launch template override to use first in fulfilling On-Demand capacity. The highest priority is launched first. Valid values are whole numbers starting at 0. The lower the number, the higher the priority. If no number is set, the launch template override has the lowest priority.

", "PriceSchedule$Price": "

The fixed price for the term.

", "PriceScheduleSpecification$Price": "

The fixed price for the term.

", "PricingDetail$Price": "

The price per instance.

", @@ -3503,66 +3506,66 @@ "FilterList": { "base": null, "refs": { - "DescribeAddressesRequest$Filters": "

One or more filters. Filter names and values are case-sensitive.

", + "DescribeAddressesRequest$Filters": "

One or more filters. Filter names and values are case-sensitive.

", "DescribeAvailabilityZonesRequest$Filters": "

One or more filters.

", "DescribeBundleTasksRequest$Filters": "

One or more filters.

", - "DescribeClassicLinkInstancesRequest$Filters": "

One or more filters.

", - "DescribeCustomerGatewaysRequest$Filters": "

One or more filters.

", - "DescribeDhcpOptionsRequest$Filters": "

One or more filters.

", + "DescribeClassicLinkInstancesRequest$Filters": "

One or more filters.

", + "DescribeCustomerGatewaysRequest$Filters": "

One or more filters.

", + "DescribeDhcpOptionsRequest$Filters": "

One or more filters.

", "DescribeElasticGpusRequest$Filters": "

One or more filters.

", "DescribeFleetInstancesRequest$Filters": "

One or more filters.

", "DescribeFleetsRequest$Filters": "

One or more filters.

", "DescribeFlowLogsRequest$Filter": "

One or more filters.

", - "DescribeFpgaImagesRequest$Filters": "

One or more filters.

", - "DescribeHostReservationOfferingsRequest$Filter": "

One or more filters.

", - "DescribeHostReservationsRequest$Filter": "

One or more filters.

", - "DescribeHostsRequest$Filter": "

One or more filters.

", + "DescribeFpgaImagesRequest$Filters": "

One or more filters.

", + "DescribeHostReservationOfferingsRequest$Filter": "

One or more filters.

", + "DescribeHostReservationsRequest$Filter": "

One or more filters.

", + "DescribeHostsRequest$Filter": "

One or more filters.

", "DescribeIamInstanceProfileAssociationsRequest$Filters": "

One or more filters.

", - "DescribeImagesRequest$Filters": "

One or more filters.

", + "DescribeImagesRequest$Filters": "

One or more filters.

", "DescribeImportImageTasksRequest$Filters": "

Filter tasks using the task-state filter and one of the following values: active, completed, deleting, deleted.

", "DescribeImportSnapshotTasksRequest$Filters": "

One or more filters.

", "DescribeInstanceCreditSpecificationsRequest$Filters": "

One or more filters.

", - "DescribeInstanceStatusRequest$Filters": "

One or more filters.

", - "DescribeInstancesRequest$Filters": "

One or more filters.

", - "DescribeInternetGatewaysRequest$Filters": "

One or more filters.

", + "DescribeInstanceStatusRequest$Filters": "

One or more filters.

", + "DescribeInstancesRequest$Filters": "

One or more filters.

", + "DescribeInternetGatewaysRequest$Filters": "

One or more filters.

", "DescribeKeyPairsRequest$Filters": "

One or more filters.

", "DescribeLaunchTemplateVersionsRequest$Filters": "

One or more filters.

", - "DescribeLaunchTemplatesRequest$Filters": "

One or more filters.

", + "DescribeLaunchTemplatesRequest$Filters": "

One or more filters.

", "DescribeMovingAddressesRequest$Filters": "

One or more filters.

", - "DescribeNatGatewaysRequest$Filter": "

One or more filters.

", - "DescribeNetworkAclsRequest$Filters": "

One or more filters.

", + "DescribeNatGatewaysRequest$Filter": "

One or more filters.

", + "DescribeNetworkAclsRequest$Filters": "

One or more filters.

", "DescribeNetworkInterfacePermissionsRequest$Filters": "

One or more filters.

", - "DescribeNetworkInterfacesRequest$Filters": "

One or more filters.

", + "DescribeNetworkInterfacesRequest$Filters": "

One or more filters.

", "DescribePlacementGroupsRequest$Filters": "

One or more filters.

", "DescribePrefixListsRequest$Filters": "

One or more filters.

", "DescribeRegionsRequest$Filters": "

One or more filters.

", "DescribeReservedInstancesListingsRequest$Filters": "

One or more filters.

", "DescribeReservedInstancesModificationsRequest$Filters": "

One or more filters.

", "DescribeReservedInstancesOfferingsRequest$Filters": "

One or more filters.

", - "DescribeReservedInstancesRequest$Filters": "

One or more filters.

", - "DescribeRouteTablesRequest$Filters": "

One or more filters.

", + "DescribeReservedInstancesRequest$Filters": "

One or more filters.

", + "DescribeRouteTablesRequest$Filters": "

One or more filters.

", "DescribeScheduledInstanceAvailabilityRequest$Filters": "

One or more filters.

", "DescribeScheduledInstancesRequest$Filters": "

One or more filters.

", - "DescribeSecurityGroupsRequest$Filters": "

One or more filters. If using multiple filters for rules, the results include security groups for which any combination of rules - not necessarily a single rule - match all filters.

", - "DescribeSnapshotsRequest$Filters": "

One or more filters.

", - "DescribeSpotInstanceRequestsRequest$Filters": "

One or more filters.

", + "DescribeSecurityGroupsRequest$Filters": "

One or more filters. If using multiple filters for rules, the results include security groups for which any combination of rules - not necessarily a single rule - match all filters.

", + "DescribeSnapshotsRequest$Filters": "

One or more filters.

", + "DescribeSpotInstanceRequestsRequest$Filters": "

One or more filters.

", "DescribeSpotPriceHistoryRequest$Filters": "

One or more filters.

", - "DescribeSubnetsRequest$Filters": "

One or more filters.

", + "DescribeSubnetsRequest$Filters": "

One or more filters.

", "DescribeTagsRequest$Filters": "

One or more filters.

", "DescribeVolumeStatusRequest$Filters": "

One or more filters.

", "DescribeVolumesModificationsRequest$Filters": "

One or more filters. Supported filters: volume-id, modification-state, target-size, target-iops, target-volume-type, original-size, original-iops, original-volume-type, start-time.

", - "DescribeVolumesRequest$Filters": "

One or more filters.

", - "DescribeVpcClassicLinkRequest$Filters": "

One or more filters.

", + "DescribeVolumesRequest$Filters": "

One or more filters.

", + "DescribeVpcClassicLinkRequest$Filters": "

One or more filters.

", "DescribeVpcEndpointConnectionNotificationsRequest$Filters": "

One or more filters.

", "DescribeVpcEndpointConnectionsRequest$Filters": "

One or more filters.

", "DescribeVpcEndpointServiceConfigurationsRequest$Filters": "

One or more filters.

", "DescribeVpcEndpointServicePermissionsRequest$Filters": "

One or more filters.

", "DescribeVpcEndpointServicesRequest$Filters": "

One or more filters.

", "DescribeVpcEndpointsRequest$Filters": "

One or more filters.

", - "DescribeVpcPeeringConnectionsRequest$Filters": "

One or more filters.

", - "DescribeVpcsRequest$Filters": "

One or more filters.

", - "DescribeVpnConnectionsRequest$Filters": "

One or more filters.

", - "DescribeVpnGatewaysRequest$Filters": "

One or more filters.

" + "DescribeVpcPeeringConnectionsRequest$Filters": "

One or more filters.

", + "DescribeVpcsRequest$Filters": "

One or more filters.

", + "DescribeVpnConnectionsRequest$Filters": "

One or more filters.

", + "DescribeVpnGatewaysRequest$Filters": "

One or more filters.

" } }, "FleetActivityStatus": { @@ -3675,6 +3678,13 @@ "FleetLaunchTemplateConfigRequest$LaunchTemplateSpecification": "

The launch template to use. You must specify either the launch template ID or launch template name in the request.

" } }, + "FleetOnDemandAllocationStrategy": { + "base": null, + "refs": { + "OnDemandOptions$AllocationStrategy": "

The order of the launch template overrides to use in fulfilling On-Demand capacity. If you specify lowest-price, EC2 Fleet uses price to determine the order, launching the lowest price first. If you specify prioritized, EC2 Fleet uses the priority that you assigned to each launch template override, launching the highest priority first. If you do not specify a value, EC2 Fleet defaults to lowest-price.

", + "OnDemandOptionsRequest$AllocationStrategy": "

The order of the launch template overrides to use in fulfilling On-Demand capacity. If you specify lowest-price, EC2 Fleet uses price to determine the order, launching the lowest price first. If you specify prioritized, EC2 Fleet uses the priority that you assigned to each launch template override, launching the highest priority first. If you do not specify a value, EC2 Fleet defaults to lowest-price.

" + } + }, "FleetSet": { "base": null, "refs": { @@ -4382,7 +4392,7 @@ "InstanceMarketOptionsRequest": { "base": "

Describes the market (purchasing) option for the instances.

", "refs": { - "RunInstancesRequest$InstanceMarketOptions": "

The market (purchasing) option for the instances.

" + "RunInstancesRequest$InstanceMarketOptions": "

The market (purchasing) option for the instances.

For RunInstances, persistent Spot Instance requests are only supported when InstanceInterruptionBehavior is set to either hibernate or stop.

" } }, "InstanceMonitoring": { @@ -4582,11 +4592,11 @@ "DescribeFleetInstancesRequest$MaxResults": "

The maximum number of results to return in a single call. Specify a value between 1 and 1000. The default value is 1000. To retrieve the remaining results, make another call with the returned NextToken value.

", "DescribeFleetsRequest$MaxResults": "

The maximum number of results to return in a single call. Specify a value between 1 and 1000. The default value is 1000. To retrieve the remaining results, make another call with the returned NextToken value.

", "DescribeFlowLogsRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results can be seen by sending another request with the returned NextToken value. This value can be between 5 and 1000; if MaxResults is given a value larger than 1000, only 1000 results are returned. You cannot specify this parameter and the flow log IDs parameter in the same request.

", - "DescribeHostReservationOfferingsRequest$MaxDuration": "

This is the maximum duration of the reservation you'd like to purchase, specified in seconds. Reservations are available in one-year and three-year terms. The number of seconds specified must be the number of seconds in a year (365x24x60x60) times one of the supported durations (1 or 3). For example, specify 94608000 for three years.

", - "DescribeHostReservationOfferingsRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results can be seen by sending another request with the returned nextToken value. This value can be between 5 and 500; if maxResults is given a larger value than 500, you will receive an error.

", + "DescribeHostReservationOfferingsRequest$MaxDuration": "

This is the maximum duration of the reservation to purchase, specified in seconds. Reservations are available in one-year and three-year terms. The number of seconds specified must be the number of seconds in a year (365x24x60x60) times one of the supported durations (1 or 3). For example, specify 94608000 for three years.

", + "DescribeHostReservationOfferingsRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results can be seen by sending another request with the returned nextToken value. This value can be between 5 and 500. If maxResults is given a larger value than 500, you receive an error.

", "DescribeHostReservationOfferingsRequest$MinDuration": "

This is the minimum duration of the reservation you'd like to purchase, specified in seconds. Reservations are available in one-year and three-year terms. The number of seconds specified must be the number of seconds in a year (365x24x60x60) times one of the supported durations (1 or 3). For example, specify 31536000 for one year.

", - "DescribeHostReservationsRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results can be seen by sending another request with the returned nextToken value. This value can be between 5 and 500; if maxResults is given a larger value than 500, you will receive an error.

", - "DescribeHostsRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results can be seen by sending another request with the returned nextToken value. This value can be between 5 and 500; if maxResults is given a larger value than 500, you will receive an error. You cannot specify this parameter and the host IDs parameter in the same request.

", + "DescribeHostReservationsRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results can be seen by sending another request with the returned nextToken value. This value can be between 5 and 500.If maxResults is given a larger value than 500, you receive an error.

", + "DescribeHostsRequest$MaxResults": "

The maximum number of results to return for the request in a single page. The remaining results can be seen by sending another request with the returned nextToken value. This value can be between 5 and 500. If maxResults is given a larger value than 500, you receive an error. You cannot specify this parameter and the host IDs parameter in the same request.

", "DescribeImportImageTasksRequest$MaxResults": "

The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned NextToken value.

", "DescribeImportSnapshotTasksRequest$MaxResults": "

The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned NextToken value.

", "DescribeInstanceCreditSpecificationsRequest$MaxResults": "

The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned NextToken value. This value can be between 5 and 1000. You cannot specify this parameter and the instance IDs parameter in the same call.

", @@ -4639,7 +4649,7 @@ "InstanceNetworkInterfaceSpecification$DeviceIndex": "

The index of the device on the instance for the network interface attachment. If you are specifying a network interface in a RunInstances request, you must provide the device index.

", "InstanceNetworkInterfaceSpecification$Ipv6AddressCount": "

A number of IPv6 addresses to assign to the network interface. Amazon EC2 chooses the IPv6 addresses from the range of the subnet. You cannot specify this option and the option to assign specific IPv6 addresses in the same request. You can specify this option if you've specified a minimum number of instances to launch.

", "InstanceNetworkInterfaceSpecification$SecondaryPrivateIpAddressCount": "

The number of secondary private IPv4 addresses. You can't specify this option and specify more than one private IP address using the private IP addresses option. You cannot specify this option if you're launching more than one instance in a RunInstances request.

", - "InstanceState$Code": "

The low byte represents the state. The high byte is an opaque internal value and should be ignored.

", + "InstanceState$Code": "

The low byte represents the state. The high byte is used for internal purposes and should be ignored.

", "IpPermission$FromPort": "

The start of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 type number. A value of -1 indicates all ICMP/ICMPv6 types. If you specify all ICMP/ICMPv6 types, you must specify all codes.

", "IpPermission$ToPort": "

The end of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 code. A value of -1 indicates all ICMP/ICMPv6 codes for the specified ICMP type. If you specify all ICMP/ICMPv6 types, you must specify all codes.

", "LaunchTemplateCpuOptions$CoreCount": "

The number of CPU cores for the instance.

", @@ -4702,8 +4712,11 @@ "Snapshot$VolumeSize": "

The size of the volume, in GiB.

", "SpotFleetRequestConfigData$TargetCapacity": "

The number of units to request. You can choose to set the target capacity in terms of instances or a performance characteristic that is important to your application workload, such as vCPUs, memory, or I/O. If the request type is maintain, you can specify a target capacity of 0 and add capacity later.

", "SpotFleetRequestConfigData$OnDemandTargetCapacity": "

The number of On-Demand units to request. You can choose to set the target capacity in terms of instances or a performance characteristic that is important to your application workload, such as vCPUs, memory, or I/O. If the request type is maintain, you can specify a target capacity of 0 and add capacity later.

", + "SpotFleetRequestConfigData$InstancePoolsToUseCount": "

The number of Spot pools across which to allocate your target Spot capacity. Valid only when Spot AllocationStrategy is set to lowest-price. Spot Fleet selects the cheapest Spot pools and evenly allocates your target Spot capacity across the number of Spot pools that you specify.

", "SpotInstanceRequest$BlockDurationMinutes": "

The duration for the Spot Instance, in minutes.

", "SpotMarketOptions$BlockDurationMinutes": "

The required duration for the Spot Instances (also known as Spot blocks), in minutes. This value must be a multiple of 60 (60, 120, 180, 240, 300, or 360).

", + "SpotOptions$InstancePoolsToUseCount": "

The number of Spot pools across which to allocate your target Spot capacity. Valid only when AllocationStrategy is set to lowestPrice. EC2 Fleet selects the cheapest Spot pools and evenly allocates your target Spot capacity across the number of Spot pools that you specify.

", + "SpotOptionsRequest$InstancePoolsToUseCount": "

The number of Spot pools across which to allocate your target Spot capacity. Valid only when Spot AllocationStrategy is set to lowest-price. EC2 Fleet selects the cheapest Spot pools and evenly allocates your target Spot capacity across the number of Spot pools that you specify.

", "StaleIpPermission$FromPort": "

The start of the port range for the TCP and UDP protocols, or an ICMP type number. A value of -1 indicates all ICMP types.

", "StaleIpPermission$ToPort": "

The end of the port range for the TCP and UDP protocols, or an ICMP type number. A value of -1 indicates all ICMP types.

", "Subnet$AvailableIpAddressCount": "

The number of unused private IPv4 addresses in the subnet. Note that the IPv4 addresses for any stopped instances are considered unavailable.

", @@ -5702,6 +5715,24 @@ "ReservedInstancesOffering$OfferingType": "

The Reserved Instance offering type.

" } }, + "OnDemandAllocationStrategy": { + "base": null, + "refs": { + "SpotFleetRequestConfigData$OnDemandAllocationStrategy": "

The order of the launch template overrides to use in fulfilling On-Demand capacity. If you specify lowestPrice, Spot Fleet uses price to determine the order, launching the lowest price first. If you specify prioritized, Spot Fleet uses the priority that you assign to each Spot Fleet launch template override, launching the highest priority first. If you do not specify a value, Spot Fleet defaults to lowestPrice.

" + } + }, + "OnDemandOptions": { + "base": "

The allocation strategy of On-Demand Instances in an EC2 Fleet.

", + "refs": { + "FleetData$OnDemandOptions": "

The allocation strategy of On-Demand Instances in an EC2 Fleet.

" + } + }, + "OnDemandOptionsRequest": { + "base": "

The allocation strategy of On-Demand Instances in an EC2 Fleet.

", + "refs": { + "CreateFleetRequest$OnDemandOptions": "

The allocation strategy of On-Demand Instances in an EC2 Fleet.

" + } + }, "OperationType": { "base": null, "refs": { @@ -6036,7 +6067,7 @@ "PurchaseSet": { "base": null, "refs": { - "GetHostReservationPurchasePreviewResult$Purchase": "

The purchase information of the Dedicated Host Reservation and the Dedicated Hosts associated with it.

", + "GetHostReservationPurchasePreviewResult$Purchase": "

The purchase information of the Dedicated Host reservation and the Dedicated Hosts associated with it.

", "PurchaseHostReservationResult$Purchase": "

Describes the details of the purchase.

" } }, @@ -6210,15 +6241,15 @@ "base": null, "refs": { "DescribeHostsRequest$HostIds": "

The IDs of the Dedicated Hosts. The IDs are used for targeted instance launches.

", - "ModifyHostsRequest$HostIds": "

The host IDs of the Dedicated Hosts you want to modify.

", - "ReleaseHostsRequest$HostIds": "

The IDs of the Dedicated Hosts you want to release.

" + "ModifyHostsRequest$HostIds": "

The IDs of the Dedicated Hosts to modify.

", + "ReleaseHostsRequest$HostIds": "

The IDs of the Dedicated Hosts to release.

" } }, "RequestHostIdSet": { "base": null, "refs": { - "GetHostReservationPurchasePreviewRequest$HostIdSet": "

The ID/s of the Dedicated Host/s that the reservation will be associated with.

", - "PurchaseHostReservationRequest$HostIdSet": "

The ID/s of the Dedicated Host/s that the reservation will be associated with.

" + "GetHostReservationPurchasePreviewRequest$HostIdSet": "

The IDs of the Dedicated Hosts with which the reservation is associated.

", + "PurchaseHostReservationRequest$HostIdSet": "

The IDs of the Dedicated Hosts with which the reservation will be associated.

" } }, "RequestLaunchTemplateData": { @@ -6928,7 +6959,7 @@ "SpotAllocationStrategy": { "base": null, "refs": { - "SpotOptions$AllocationStrategy": "

Indicates how to allocate the target capacity across the Spot pools specified by the Spot Fleet request. The default is lowestPrice.

", + "SpotOptions$AllocationStrategy": "

Indicates how to allocate the target capacity across the Spot pools specified by the Spot Fleet request. The default is lowest-price.

", "SpotOptionsRequest$AllocationStrategy": "

Indicates how to allocate the target capacity across the Spot pools specified by the Spot Fleet request. The default is lowestPrice.

" } }, @@ -7035,7 +7066,7 @@ "LaunchTemplateSpotMarketOptionsRequest$SpotInstanceType": "

The Spot Instance request type.

", "RequestSpotInstancesRequest$Type": "

The Spot Instance request type.

Default: one-time

", "SpotInstanceRequest$Type": "

The Spot Instance request type.

", - "SpotMarketOptions$SpotInstanceType": "

The Spot Instance request type.

" + "SpotMarketOptions$SpotInstanceType": "

The Spot Instance request type. For RunInstances, persistent Spot Instance requests are only supported when InstanceInterruptionBehavior is set to either hibernate or stop.

" } }, "SpotMarketOptions": { @@ -7053,7 +7084,7 @@ "SpotOptionsRequest": { "base": "

Describes the configuration of Spot Instances in an EC2 Fleet request.

", "refs": { - "CreateFleetRequest$SpotOptions": "

Includes SpotAllocationStrategy and SpotInstanceInterruptionBehavior inside this structure.

" + "CreateFleetRequest$SpotOptions": "

Describes the configuration of Spot Instances in an EC2 Fleet.

" } }, "SpotPlacement": { @@ -7245,7 +7276,7 @@ "AvailabilityZoneMessage$Message": "

The message about the Availability Zone.

", "BillingProductList$member": null, "BlockDeviceMapping$DeviceName": "

The device name (for example, /dev/sdh or xvdh).

", - "BlockDeviceMapping$VirtualName": "

The virtual device name (ephemeralN). Instance store volumes are numbered starting from 0. An instance type with 2 available instance store volumes can specify mappings for ephemeral0 and ephemeral1.The number of available instance store volumes depends on the instance type. After you connect to the instance, you must mount the volume.

Constraints: For M3 instances, you must specify instance store volumes in the block device mapping for the instance. When you launch an M3 instance, we ignore any instance store volumes specified in the block device mapping for the AMI.

", + "BlockDeviceMapping$VirtualName": "

The virtual device name (ephemeralN). Instance store volumes are numbered starting from 0. An instance type with 2 available instance store volumes can specify mappings for ephemeral0 and ephemeral1. The number of available instance store volumes depends on the instance type. After you connect to the instance, you must mount the volume.

NVMe instance store volumes are automatically enumerated and assigned a device name. Including them in your block device mapping has no effect.

Constraints: For M3 instances, you must specify instance store volumes in the block device mapping for the instance. When you launch an M3 instance, we ignore any instance store volumes specified in the block device mapping for the AMI.

", "BlockDeviceMapping$NoDevice": "

Suppresses the specified device included in the block device mapping of the AMI.

", "BundleIdStringList$member": null, "BundleInstanceRequest$InstanceId": "

The ID of the instance to bundle.

Type: String

Default: None

Required: Yes

", @@ -7398,7 +7429,7 @@ "CreateVpnConnectionRouteRequest$DestinationCidrBlock": "

The CIDR block associated with the local subnet of the customer network.

", "CreateVpnConnectionRouteRequest$VpnConnectionId": "

The ID of the VPN connection.

", "CreateVpnGatewayRequest$AvailabilityZone": "

The Availability Zone for the virtual private gateway.

", - "CreditSpecification$CpuCredits": "

The credit option for CPU usage of a T2 instance.

", + "CreditSpecification$CpuCredits": "

The credit option for CPU usage of a T2 instance. Valid values are standard and unlimited.

", "CreditSpecificationRequest$CpuCredits": "

The credit option for CPU usage of a T2 instance. Valid values are standard and unlimited.

", "CustomerGateway$BgpAsn": "

The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number (ASN).

", "CustomerGateway$CustomerGatewayId": "

The ID of the customer gateway.

", @@ -7530,7 +7561,7 @@ "DescribeStaleSecurityGroupsRequest$VpcId": "

The ID of the VPC.

", "DescribeStaleSecurityGroupsResult$NextToken": "

The token to use when requesting the next set of items. If there are no additional items to return, the string is empty.

", "DescribeTagsRequest$NextToken": "

The token to retrieve the next page of results.

", - "DescribeTagsResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return..

", + "DescribeTagsResult$NextToken": "

The token to use to retrieve the next page of results. This value is null when there are no more results to return.

", "DescribeVolumeAttributeRequest$VolumeId": "

The ID of the volume.

", "DescribeVolumeAttributeResult$VolumeId": "

The ID of the volume.

", "DescribeVolumeStatusRequest$NextToken": "

The NextToken value to include in a future DescribeVolumeStatus request. When the results of the request exceed MaxResults, this value can be used to retrieve the next page of results. This value is null when there are no more results to return.

", @@ -7672,7 +7703,7 @@ "GroupIds$member": null, "GroupNameStringList$member": null, "Host$AvailabilityZone": "

The Availability Zone of the Dedicated Host.

", - "Host$ClientToken": "

Unique, case-sensitive identifier you provide to ensure idempotency of the request. For more information, see How to Ensure Idempotency in the Amazon Elastic Compute Cloud User Guide.

", + "Host$ClientToken": "

Unique, case-sensitive identifier that you provide to ensure idempotency of the request. For more information, see How to Ensure Idempotency in the Amazon Elastic Compute Cloud User Guide.

", "Host$HostId": "

The ID of the Dedicated Host.

", "Host$HostReservationId": "

The reservation ID of the Dedicated Host. This returns a null response if the Dedicated Host doesn't have an associated reservation.

", "HostInstance$InstanceId": "

the IDs of instances that are running on the Dedicated Host.

", @@ -8007,11 +8038,11 @@ "Purchase$InstanceFamily": "

The instance family on the Dedicated Host that the reservation can be associated with.

", "Purchase$UpfrontPrice": "

The upfront price of the reservation.

", "PurchaseHostReservationRequest$ClientToken": "

Unique, case-sensitive identifier you provide to ensure idempotency of the request. For more information, see How to Ensure Idempotency in the Amazon Elastic Compute Cloud User Guide.

", - "PurchaseHostReservationRequest$LimitPrice": "

The specified limit is checked against the total upfront cost of the reservation (calculated as the offering's upfront cost multiplied by the host count). If the total upfront cost is greater than the specified price limit, the request will fail. This is used to ensure that the purchase does not exceed the expected upfront cost of the purchase. At this time, the only supported currency is USD. For example, to indicate a limit price of USD 100, specify 100.00.

", + "PurchaseHostReservationRequest$LimitPrice": "

The specified limit is checked against the total upfront cost of the reservation (calculated as the offering's upfront cost multiplied by the host count). If the total upfront cost is greater than the specified price limit, the request fails. This is used to ensure that the purchase does not exceed the expected upfront cost of the purchase. At this time, the only supported currency is USD. For example, to indicate a limit price of USD 100, specify 100.00.

", "PurchaseHostReservationRequest$OfferingId": "

The ID of the offering.

", - "PurchaseHostReservationResult$ClientToken": "

Unique, case-sensitive identifier you provide to ensure idempotency of the request. For more information, see How to Ensure Idempotency in the Amazon Elastic Compute Cloud User Guide

", + "PurchaseHostReservationResult$ClientToken": "

Unique, case-sensitive identifier you provide to ensure idempotency of the request. For more information, see How to Ensure Idempotency in the Amazon Elastic Compute Cloud User Guide.

", "PurchaseHostReservationResult$TotalHourlyPrice": "

The total hourly price of the reservation calculated per hour.

", - "PurchaseHostReservationResult$TotalUpfrontPrice": "

The total amount that will be charged to your account when you purchase the reservation.

", + "PurchaseHostReservationResult$TotalUpfrontPrice": "

The total amount charged to your account when you purchase the reservation.

", "PurchaseRequest$PurchaseToken": "

The purchase token.

", "PurchaseReservedInstancesOfferingRequest$ReservedInstancesOfferingId": "

The ID of the Reserved Instance offering to purchase.

", "PurchaseReservedInstancesOfferingResult$ReservedInstancesId": "

The IDs of the purchased Reserved Instances.

", diff --git a/models/apis/greengrass/2017-06-07/docs-2.json b/models/apis/greengrass/2017-06-07/docs-2.json index 8e90aa202c2..7c96c7e0f40 100644 --- a/models/apis/greengrass/2017-06-07/docs-2.json +++ b/models/apis/greengrass/2017-06-07/docs-2.json @@ -698,7 +698,7 @@ "ListVersionsResponse$NextToken" : "The token for the next set of results, or ''null'' if there are no additional results.", "LocalDeviceResourceData$SourcePath" : "The local absolute path of the device resource. The source path for a device resource can refer only to a character device or block device under ''/dev''.", "LocalVolumeResourceData$DestinationPath" : "The absolute local path of the resource inside the lambda environment.", - "LocalVolumeResourceData$SourcePath" : "The local absolute path of the volume resource on the host. The source path for a volume resource type cannot start with ''/proc'' or ''/sys''.", + "LocalVolumeResourceData$SourcePath" : "The local absolute path of the volume resource on the host. The source path for a volume resource type cannot start with ''/sys''.", "Logger$Id" : "The id of the logger.", "ResetDeploymentsResponse$DeploymentArn" : "The ARN of the deployment.", "ResetDeploymentsResponse$DeploymentId" : "The ID of the deployment.", diff --git a/models/apis/inspector/2016-02-16/api-2.json b/models/apis/inspector/2016-02-16/api-2.json index 4cd7321011f..c4850fca4d5 100644 --- a/models/apis/inspector/2016-02-16/api-2.json +++ b/models/apis/inspector/2016-02-16/api-2.json @@ -6,6 +6,7 @@ "jsonVersion":"1.1", "protocol":"json", "serviceFullName":"Amazon Inspector", + "serviceId":"Inspector", "signatureVersion":"v4", "targetPrefix":"InspectorService", "uid":"inspector-2016-02-16" @@ -23,7 +24,8 @@ {"shape":"InternalException"}, {"shape":"InvalidInputException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "CreateAssessmentTarget":{ @@ -40,7 +42,8 @@ {"shape":"LimitExceededException"}, {"shape":"AccessDeniedException"}, {"shape":"NoSuchEntityException"}, - {"shape":"InvalidCrossAccountRoleException"} + {"shape":"InvalidCrossAccountRoleException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "CreateAssessmentTemplate":{ @@ -56,7 +59,8 @@ {"shape":"InvalidInputException"}, {"shape":"LimitExceededException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "CreateExclusionsPreview":{ @@ -72,7 +76,8 @@ {"shape":"PreviewGenerationInProgressException"}, {"shape":"InternalException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "CreateResourceGroup":{ @@ -87,7 +92,8 @@ {"shape":"InternalException"}, {"shape":"InvalidInputException"}, {"shape":"LimitExceededException"}, - {"shape":"AccessDeniedException"} + {"shape":"AccessDeniedException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "DeleteAssessmentRun":{ @@ -102,7 +108,8 @@ {"shape":"InvalidInputException"}, {"shape":"AssessmentRunInProgressException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "DeleteAssessmentTarget":{ @@ -117,7 +124,8 @@ {"shape":"InvalidInputException"}, {"shape":"AssessmentRunInProgressException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "DeleteAssessmentTemplate":{ @@ -132,7 +140,8 @@ {"shape":"InvalidInputException"}, {"shape":"AssessmentRunInProgressException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "DescribeAssessmentRuns":{ @@ -251,7 +260,8 @@ {"shape":"AccessDeniedException"}, {"shape":"NoSuchEntityException"}, {"shape":"AssessmentRunInProgressException"}, - {"shape":"UnsupportedFeatureException"} + {"shape":"UnsupportedFeatureException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "GetExclusionsPreview":{ @@ -444,7 +454,8 @@ {"shape":"InternalException"}, {"shape":"InvalidInputException"}, {"shape":"AccessDeniedException"}, - {"shape":"InvalidCrossAccountRoleException"} + {"shape":"InvalidCrossAccountRoleException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "RemoveAttributesFromFindings":{ @@ -459,7 +470,8 @@ {"shape":"InternalException"}, {"shape":"InvalidInputException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "SetTagsForResource":{ @@ -473,7 +485,8 @@ {"shape":"InternalException"}, {"shape":"InvalidInputException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "StartAssessmentRun":{ @@ -491,7 +504,8 @@ {"shape":"AccessDeniedException"}, {"shape":"NoSuchEntityException"}, {"shape":"InvalidCrossAccountRoleException"}, - {"shape":"AgentsAlreadyRunningAssessmentException"} + {"shape":"AgentsAlreadyRunningAssessmentException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "StopAssessmentRun":{ @@ -505,7 +519,8 @@ {"shape":"InternalException"}, {"shape":"InvalidInputException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "SubscribeToEvent":{ @@ -520,7 +535,8 @@ {"shape":"InvalidInputException"}, {"shape":"LimitExceededException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "UnsubscribeFromEvent":{ @@ -534,7 +550,8 @@ {"shape":"InternalException"}, {"shape":"InvalidInputException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] }, "UpdateAssessmentTarget":{ @@ -548,7 +565,8 @@ {"shape":"InternalException"}, {"shape":"InvalidInputException"}, {"shape":"AccessDeniedException"}, - {"shape":"NoSuchEntityException"} + {"shape":"NoSuchEntityException"}, + {"shape":"ServiceTemporarilyUnavailableException"} ] } }, @@ -2099,6 +2117,18 @@ "max":128, "min":0 }, + "ServiceTemporarilyUnavailableException":{ + "type":"structure", + "required":[ + "message", + "canRetry" + ], + "members":{ + "message":{"shape":"ErrorMessage"}, + "canRetry":{"shape":"Bool"} + }, + "exception":true + }, "SetTagsForResourceRequest":{ "type":"structure", "required":["resourceArn"], diff --git a/models/apis/inspector/2016-02-16/docs-2.json b/models/apis/inspector/2016-02-16/docs-2.json index 6bd76e85f11..ac48b8d2ff1 100644 --- a/models/apis/inspector/2016-02-16/docs-2.json +++ b/models/apis/inspector/2016-02-16/docs-2.json @@ -3,8 +3,8 @@ "service": "Amazon Inspector

Amazon Inspector enables you to analyze the behavior of your AWS resources and to identify potential security issues. For more information, see Amazon Inspector User Guide.

", "operations": { "AddAttributesToFindings": "

Assigns attributes (key and value pairs) to the findings that are specified by the ARNs of the findings.

", - "CreateAssessmentTarget": "

Creates a new assessment target using the ARN of the resource group that is generated by CreateResourceGroup. If the service-linked role isn’t already registered, also creates and registers a service-linked role to grant Amazon Inspector access to AWS Services needed to perform security assessments. You can create up to 50 assessment targets per AWS account. You can run up to 500 concurrent agents per AWS account. For more information, see Amazon Inspector Assessment Targets.

", - "CreateAssessmentTemplate": "

Creates an assessment template for the assessment target that is specified by the ARN of the assessment target. If the service-linked role isn’t already registered, also creates and registers a service-linked role to grant Amazon Inspector access to AWS Services needed to perform security assessments.

", + "CreateAssessmentTarget": "

Creates a new assessment target using the ARN of the resource group that is generated by CreateResourceGroup. If resourceGroupArn is not specified, all EC2 instances in the current AWS account and region are included in the assessment target. If the service-linked role isn’t already registered, this action also creates and registers a service-linked role to grant Amazon Inspector access to AWS Services needed to perform security assessments. You can create up to 50 assessment targets per AWS account. You can run up to 500 concurrent agents per AWS account. For more information, see Amazon Inspector Assessment Targets.

", + "CreateAssessmentTemplate": "

Creates an assessment template for the assessment target that is specified by the ARN of the assessment target. If the service-linked role isn’t already registered, this action also creates and registers a service-linked role to grant Amazon Inspector access to AWS Services needed to perform security assessments.

", "CreateExclusionsPreview": "

Starts the generation of an exclusions preview for the specified assessment template. The exclusions preview lists the potential exclusions (ExclusionPreview) that Inspector can detect before it runs the assessment.

", "CreateResourceGroup": "

Creates a resource group using the specified set of tags (key and value pairs) that are used to select the EC2 instances to be included in an Amazon Inspector assessment target. The created resource group is then used to create an Amazon Inspector assessment target. For more information, see CreateAssessmentTarget.

", "DeleteAssessmentRun": "

Deletes the assessment run that is specified by the ARN of the assessment run.

", @@ -38,7 +38,7 @@ "StopAssessmentRun": "

Stops the assessment run that is specified by the ARN of the assessment run.

", "SubscribeToEvent": "

Enables the process of sending Amazon Simple Notification Service (SNS) notifications about a specified event to a specified SNS topic.

", "UnsubscribeFromEvent": "

Disables the process of sending Amazon Simple Notification Service (SNS) notifications about a specified event to a specified SNS topic.

", - "UpdateAssessmentTarget": "

Updates the assessment target that is specified by the ARN of the assessment target.

" + "UpdateAssessmentTarget": "

Updates the assessment target that is specified by the ARN of the assessment target.

If resourceGroupArn is not specified, all EC2 instances in the current AWS account and region are included in the assessment target.

" }, "shapes": { "AccessDeniedErrorCode": { @@ -178,7 +178,7 @@ "AssessmentTemplateRulesPackageArnList$member": null, "BatchDescribeArnList$member": null, "BatchDescribeExclusionsArnList$member": null, - "CreateAssessmentTargetRequest$resourceGroupArn": "

The ARN that specifies the resource group that is used to create the assessment target.

", + "CreateAssessmentTargetRequest$resourceGroupArn": "

The ARN that specifies the resource group that is used to create the assessment target. If resourceGroupArn is not specified, all EC2 instances in the current AWS account and region are included in the assessment target.

", "CreateAssessmentTargetResponse$assessmentTargetArn": "

The ARN that specifies the assessment target that is created.

", "CreateAssessmentTemplateRequest$assessmentTargetArn": "

The ARN that specifies the assessment target for which you want to create the assessment template.

", "CreateAssessmentTemplateResponse$assessmentTemplateArn": "

The ARN that specifies the assessment template that is created.

", @@ -257,7 +257,7 @@ "refs": { "AssessmentRun$durationInSeconds": "

The duration of the assessment run.

", "AssessmentTemplate$durationInSeconds": "

The duration in seconds specified for this assessment template. The default value is 3600 seconds (one hour). The maximum value is 86400 seconds (one day).

", - "CreateAssessmentTemplateRequest$durationInSeconds": "

The duration of the assessment run in seconds. The default value is 3600 seconds (one hour).

", + "CreateAssessmentTemplateRequest$durationInSeconds": "

The duration of the assessment run in seconds.

", "DurationRange$minSeconds": "

The minimum value of the duration range. Must be greater than zero.

", "DurationRange$maxSeconds": "

The maximum value of the duration range. Must be less than or equal to 604800 seconds (1 week).

" } @@ -492,6 +492,7 @@ "InvalidInputException$canRetry": "

You can immediately retry your request.

", "LimitExceededException$canRetry": "

You can immediately retry your request.

", "NoSuchEntityException$canRetry": "

You can immediately retry your request.

", + "ServiceTemporarilyUnavailableException$canRetry": "

You can wait and then retry your request.

", "UnsupportedFeatureException$canRetry": null } }, @@ -644,6 +645,7 @@ "LimitExceededException$message": "

Details of the exception error.

", "NoSuchEntityException$message": "

Details of the exception error.

", "PreviewGenerationInProgressException$message": null, + "ServiceTemporarilyUnavailableException$message": "

Details of the exception error.

", "UnsupportedFeatureException$message": null } }, @@ -1235,6 +1237,11 @@ "Finding$service": "

The data element is set to \"Inspector\".

" } }, + "ServiceTemporarilyUnavailableException": { + "base": "

The serice is temporary unavailable.

", + "refs": { + } + }, "SetTagsForResourceRequest": { "base": null, "refs": { diff --git a/models/apis/inspector/2016-02-16/smoke.json b/models/apis/inspector/2016-02-16/smoke.json new file mode 100644 index 00000000000..3b7b0dfe015 --- /dev/null +++ b/models/apis/inspector/2016-02-16/smoke.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "defaultRegion": "us-west-2", + "testCases": [ + { + "operationName": "ListAssessmentTemplates", + "input": {}, + "errorExpectedFromService": false + }, + { + "operationName": "ListTagsForResource", + "input": { + "resourceArn": "fake-arn" + }, + "errorExpectedFromService": true + } + ] +} diff --git a/models/apis/redshift/2012-12-01/api-2.json b/models/apis/redshift/2012-12-01/api-2.json index 0ada471e1c9..f3f9618557c 100644 --- a/models/apis/redshift/2012-12-01/api-2.json +++ b/models/apis/redshift/2012-12-01/api-2.json @@ -118,7 +118,8 @@ {"shape":"TagLimitExceededFault"}, {"shape":"InvalidTagFault"}, {"shape":"LimitExceededFault"}, - {"shape":"DependentServiceRequestThrottlingFault"} + {"shape":"DependentServiceRequestThrottlingFault"}, + {"shape":"InvalidClusterTrackFault"} ] }, "CreateClusterParameterGroup":{ @@ -519,6 +520,22 @@ {"shape":"InvalidTagFault"} ] }, + "DescribeClusterTracks":{ + "name":"DescribeClusterTracks", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"DescribeClusterTracksMessage"}, + "output":{ + "shape":"TrackListMessage", + "resultWrapper":"DescribeClusterTracksResult" + }, + "errors":[ + {"shape":"InvalidClusterTrackFault"}, + {"shape":"UnauthorizedOperation"} + ] + }, "DescribeClusterVersions":{ "name":"DescribeClusterVersions", "http":{ @@ -895,7 +912,8 @@ {"shape":"LimitExceededFault"}, {"shape":"DependentServiceRequestThrottlingFault"}, {"shape":"InvalidElasticIpFault"}, - {"shape":"TableLimitExceededFault"} + {"shape":"TableLimitExceededFault"}, + {"shape":"InvalidClusterTrackFault"} ] }, "ModifyClusterDbRevision":{ @@ -1090,7 +1108,8 @@ {"shape":"ClusterParameterGroupNotFoundFault"}, {"shape":"ClusterSecurityGroupNotFoundFault"}, {"shape":"LimitExceededFault"}, - {"shape":"DependentServiceRequestThrottlingFault"} + {"shape":"DependentServiceRequestThrottlingFault"}, + {"shape":"InvalidClusterTrackFault"} ] }, "RestoreTableFromClusterSnapshot":{ @@ -1340,7 +1359,8 @@ "KmsKeyId":{"shape":"String"}, "EnhancedVpcRouting":{"shape":"Boolean"}, "IamRoles":{"shape":"ClusterIamRoleList"}, - "PendingActions":{"shape":"PendingActionsList"} + "PendingActions":{"shape":"PendingActionsList"}, + "MaintenanceTrackName":{"shape":"String"} }, "wrapper":true }, @@ -1826,7 +1846,8 @@ "KmsKeyId":{"shape":"String"}, "EnhancedVpcRouting":{"shape":"BooleanOptional"}, "AdditionalInfo":{"shape":"String"}, - "IamRoles":{"shape":"IamRoleArnList"} + "IamRoles":{"shape":"IamRoleArnList"}, + "MaintenanceTrackName":{"shape":"String"} } }, "CreateClusterParameterGroupMessage":{ @@ -2191,6 +2212,14 @@ "TagValues":{"shape":"TagValueList"} } }, + "DescribeClusterTracksMessage":{ + "type":"structure", + "members":{ + "MaintenanceTrackName":{"shape":"String"}, + "MaxRecords":{"shape":"IntegerOptional"}, + "Marker":{"shape":"String"} + } + }, "DescribeClusterVersionsMessage":{ "type":"structure", "members":{ @@ -2387,6 +2416,13 @@ "Status":{"shape":"String"} } }, + "EligibleTracksToUpdateList":{ + "type":"list", + "member":{ + "shape":"UpdateTarget", + "locationName":"UpdateTarget" + } + }, "EnableLoggingMessage":{ "type":"structure", "required":[ @@ -2837,6 +2873,17 @@ }, "exception":true }, + "InvalidClusterTrackFault":{ + "type":"structure", + "members":{ + }, + "error":{ + "code":"InvalidClusterTrack", + "httpStatusCode":400, + "senderFault":true + }, + "exception":true + }, "InvalidElasticIpFault":{ "type":"structure", "members":{ @@ -3004,6 +3051,14 @@ }, "Long":{"type":"long"}, "LongOptional":{"type":"long"}, + "MaintenanceTrack":{ + "type":"structure", + "members":{ + "MaintenanceTrackName":{"shape":"String"}, + "DatabaseVersion":{"shape":"String"}, + "UpdateTargets":{"shape":"EligibleTracksToUpdateList"} + } + }, "ModifyClusterDbRevisionMessage":{ "type":"structure", "required":[ @@ -3057,7 +3112,8 @@ "NewClusterIdentifier":{"shape":"String"}, "PubliclyAccessible":{"shape":"BooleanOptional"}, "ElasticIp":{"shape":"String"}, - "EnhancedVpcRouting":{"shape":"BooleanOptional"} + "EnhancedVpcRouting":{"shape":"BooleanOptional"}, + "MaintenanceTrackName":{"shape":"String"} } }, "ModifyClusterParameterGroupMessage":{ @@ -3227,7 +3283,8 @@ "AutomatedSnapshotRetentionPeriod":{"shape":"IntegerOptional"}, "ClusterIdentifier":{"shape":"String"}, "PubliclyAccessible":{"shape":"BooleanOptional"}, - "EnhancedVpcRouting":{"shape":"BooleanOptional"} + "EnhancedVpcRouting":{"shape":"BooleanOptional"}, + "MaintenanceTrackName":{"shape":"String"} } }, "PurchaseReservedNodeOfferingMessage":{ @@ -3479,7 +3536,8 @@ "NodeType":{"shape":"String"}, "EnhancedVpcRouting":{"shape":"BooleanOptional"}, "AdditionalInfo":{"shape":"String"}, - "IamRoles":{"shape":"IamRoleArnList"} + "IamRoles":{"shape":"IamRoleArnList"}, + "MaintenanceTrackName":{"shape":"String"} } }, "RestoreFromClusterSnapshotResult":{ @@ -3655,7 +3713,8 @@ "SourceRegion":{"shape":"String"}, "Tags":{"shape":"TagList"}, "RestorableNodeTypes":{"shape":"RestorableNodeTypeList"}, - "EnhancedVpcRouting":{"shape":"Boolean"} + "EnhancedVpcRouting":{"shape":"Boolean"}, + "MaintenanceTrackName":{"shape":"String"} }, "wrapper":true }, @@ -4020,6 +4079,20 @@ "Marker":{"shape":"String"} } }, + "TrackList":{ + "type":"list", + "member":{ + "shape":"MaintenanceTrack", + "locationName":"MaintenanceTrack" + } + }, + "TrackListMessage":{ + "type":"structure", + "members":{ + "MaintenanceTracks":{"shape":"TrackList"}, + "Marker":{"shape":"String"} + } + }, "UnauthorizedOperation":{ "type":"structure", "members":{ @@ -4064,6 +4137,13 @@ }, "exception":true }, + "UpdateTarget":{ + "type":"structure", + "members":{ + "MaintenanceTrackName":{"shape":"String"}, + "DatabaseVersion":{"shape":"String"} + } + }, "VpcSecurityGroupIdList":{ "type":"list", "member":{ diff --git a/models/apis/redshift/2012-12-01/docs-2.json b/models/apis/redshift/2012-12-01/docs-2.json index b693bf48a6f..b5a30bd94bf 100644 --- a/models/apis/redshift/2012-12-01/docs-2.json +++ b/models/apis/redshift/2012-12-01/docs-2.json @@ -32,6 +32,7 @@ "DescribeClusterSecurityGroups": "

Returns information about Amazon Redshift security groups. If the name of a security group is specified, the response will contain only information about only that security group.

For information about managing security groups, go to Amazon Redshift Cluster Security Groups in the Amazon Redshift Cluster Management Guide.

If you specify both tag keys and tag values in the same request, Amazon Redshift returns all security groups that match any combination of the specified keys and values. For example, if you have owner and environment for tag keys, and admin and test for tag values, all security groups that have any combination of those values are returned.

If both tag keys and values are omitted from the request, security groups are returned regardless of whether they have tag keys or values associated with them.

", "DescribeClusterSnapshots": "

Returns one or more snapshot objects, which contain metadata about your cluster snapshots. By default, this operation returns information about all snapshots of all clusters that are owned by you AWS customer account. No information is returned for snapshots owned by inactive AWS customer accounts.

If you specify both tag keys and tag values in the same request, Amazon Redshift returns all snapshots that match any combination of the specified keys and values. For example, if you have owner and environment for tag keys, and admin and test for tag values, all snapshots that have any combination of those values are returned. Only snapshots that you own are returned in the response; shared snapshots are not returned with the tag key and tag value request parameters.

If both tag keys and values are omitted from the request, snapshots are returned regardless of whether they have tag keys or values associated with them.

", "DescribeClusterSubnetGroups": "

Returns one or more cluster subnet group objects, which contain metadata about your cluster subnet groups. By default, this operation returns information about all cluster subnet groups that are defined in you AWS account.

If you specify both tag keys and tag values in the same request, Amazon Redshift returns all subnet groups that match any combination of the specified keys and values. For example, if you have owner and environment for tag keys, and admin and test for tag values, all subnet groups that have any combination of those values are returned.

If both tag keys and values are omitted from the request, subnet groups are returned regardless of whether they have tag keys or values associated with them.

", + "DescribeClusterTracks": "

Returns a list of all the available maintenance tracks.

", "DescribeClusterVersions": "

Returns descriptions of the available Amazon Redshift cluster versions. You can call this operation even before creating any clusters to learn more about the Amazon Redshift versions. For more information about managing clusters, go to Amazon Redshift Clusters in the Amazon Redshift Cluster Management Guide.

", "DescribeClusters": "

Returns properties of provisioned clusters including general cluster properties, cluster database properties, maintenance and backup properties, and security and access properties. This operation supports pagination. For more information about managing clusters, go to Amazon Redshift Clusters in the Amazon Redshift Cluster Management Guide.

If you specify both tag keys and tag values in the same request, Amazon Redshift returns all clusters that match any combination of the specified keys and values. For example, if you have owner and environment for tag keys, and admin and test for tag values, all clusters that have any combination of those values are returned.

If both tag keys and values are omitted from the request, clusters are returned regardless of whether they have tag keys or values associated with them.

", "DescribeDefaultClusterParameters": "

Returns a list of parameter settings for the specified parameter group family.

For more information about parameters and parameter groups, go to Amazon Redshift Parameter Groups in the Amazon Redshift Cluster Management Guide.

", @@ -53,7 +54,7 @@ "EnableLogging": "

Starts logging information, such as queries and connection attempts, for the specified Amazon Redshift cluster.

", "EnableSnapshotCopy": "

Enables the automatic copy of snapshots from one region to another region for a specified cluster.

", "GetClusterCredentials": "

Returns a database user name and temporary password with temporary authorization to log on to an Amazon Redshift database. The action returns the database user name prefixed with IAM: if AutoCreate is False or IAMA: if AutoCreate is True. You can optionally specify one or more database user groups that the user will join at log on. By default, the temporary credentials expire in 900 seconds. You can optionally specify a duration between 900 seconds (15 minutes) and 3600 seconds (60 minutes). For more information, see Using IAM Authentication to Generate Database User Credentials in the Amazon Redshift Cluster Management Guide.

The AWS Identity and Access Management (IAM)user or role that executes GetClusterCredentials must have an IAM policy attached that allows access to all necessary actions and resources. For more information about permissions, see Resource Policies for GetClusterCredentials in the Amazon Redshift Cluster Management Guide.

If the DbGroups parameter is specified, the IAM policy must allow the redshift:JoinGroup action with access to the listed dbgroups.

In addition, if the AutoCreate parameter is set to True, then the policy must include the redshift:CreateClusterUser privilege.

If the DbName parameter is specified, the IAM policy must allow access to the resource dbname for the specified database name.

", - "GetReservedNodeExchangeOfferings": "

Returns an array of ReservedNodeOfferings which is filtered by payment type, term, and instance type.

", + "GetReservedNodeExchangeOfferings": "

Returns an array of DC2 ReservedNodeOfferings that matches the payment type, term, and usage price of the given DC1 reserved node.

", "ModifyCluster": "

Modifies the settings for a cluster. For example, you can add another security or parameter group, update the preferred maintenance window, or change the master user password. Resetting a cluster password or modifying the security groups associated with a cluster do not need a reboot. However, modifying a parameter group requires a reboot for parameters to take effect. For more information about managing clusters, go to Amazon Redshift Clusters in the Amazon Redshift Cluster Management Guide.

You can also change node type and the number of nodes to scale up or down the cluster. When resizing a cluster, you must specify both the number of nodes and the node type even if one of the parameters does not change.

", "ModifyClusterDbRevision": "

Modifies the database revision of a cluster. The database revision is a unique revision of the database running in a cluster.

", "ModifyClusterIamRoles": "

Modifies the list of AWS Identity and Access Management (IAM) roles that can be used by the cluster to access other AWS services.

A cluster can have up to 10 IAM roles associated at any time.

", @@ -698,6 +699,11 @@ "refs": { } }, + "DescribeClusterTracksMessage": { + "base": null, + "refs": { + } + }, "DescribeClusterVersionsMessage": { "base": "

", "refs": { @@ -837,6 +843,12 @@ "Cluster$ElasticIpStatus": "

The status of the elastic IP (EIP) address.

" } }, + "EligibleTracksToUpdateList": { + "base": null, + "refs": { + "MaintenanceTrack$UpdateTargets": "

An array of UpdateTarget objects to update with the maintenance track.

" + } + }, "EnableLoggingMessage": { "base": "

", "refs": { @@ -1110,6 +1122,7 @@ "DescribeClusterSecurityGroupsMessage$MaxRecords": "

The maximum number of response records to return in each call. If the number of remaining response records exceeds the specified MaxRecords value, a value is returned in a marker field of the response. You can retrieve the next set of records by retrying the command with the returned marker value.

Default: 100

Constraints: minimum 20, maximum 100.

", "DescribeClusterSnapshotsMessage$MaxRecords": "

The maximum number of response records to return in each call. If the number of remaining response records exceeds the specified MaxRecords value, a value is returned in a marker field of the response. You can retrieve the next set of records by retrying the command with the returned marker value.

Default: 100

Constraints: minimum 20, maximum 100.

", "DescribeClusterSubnetGroupsMessage$MaxRecords": "

The maximum number of response records to return in each call. If the number of remaining response records exceeds the specified MaxRecords value, a value is returned in a marker field of the response. You can retrieve the next set of records by retrying the command with the returned marker value.

Default: 100

Constraints: minimum 20, maximum 100.

", + "DescribeClusterTracksMessage$MaxRecords": "

An integer value for the maximum number of maintenance tracks to return.

", "DescribeClusterVersionsMessage$MaxRecords": "

The maximum number of response records to return in each call. If the number of remaining response records exceeds the specified MaxRecords value, a value is returned in a marker field of the response. You can retrieve the next set of records by retrying the command with the returned marker value.

Default: 100

Constraints: minimum 20, maximum 100.

", "DescribeClustersMessage$MaxRecords": "

The maximum number of response records to return in each call. If the number of remaining response records exceeds the specified MaxRecords value, a value is returned in a marker field of the response. You can retrieve the next set of records by retrying the command with the returned marker value.

Default: 100

Constraints: minimum 20, maximum 100.

", "DescribeDefaultClusterParametersMessage$MaxRecords": "

The maximum number of response records to return in each call. If the number of remaining response records exceeds the specified MaxRecords value, a value is returned in a marker field of the response. You can retrieve the next set of records by retrying the command with the returned marker value.

Default: 100

Constraints: minimum 20, maximum 100.

", @@ -1167,6 +1180,11 @@ "refs": { } }, + "InvalidClusterTrackFault": { + "base": "

The provided cluster track name is not valid.

", + "refs": { + } + }, "InvalidElasticIpFault": { "base": "

The Elastic IP (EIP) is invalid or cannot be found.

", "refs": { @@ -1265,6 +1283,12 @@ "TableRestoreStatus$TotalDataInMegaBytes": "

The total amount of data to restore to the new table, in megabytes (MB).

" } }, + "MaintenanceTrack": { + "base": "

Defines a maintenance track that determines which Amazon Redshift version to apply during a maintenance window. If the value for MaintenanceTrack is current, the cluster is updated to the most recently certified maintenance release. If the value is trailing, the cluster is updated to the previously certified maintenance release.

", + "refs": { + "TrackList$member": null + } + }, "ModifyClusterDbRevisionMessage": { "base": null, "refs": { @@ -1706,8 +1730,8 @@ "String": { "base": null, "refs": { - "AcceptReservedNodeExchangeInputMessage$ReservedNodeId": "

A string representing the identifier of the Reserved Node to be exchanged.

", - "AcceptReservedNodeExchangeInputMessage$TargetReservedNodeOfferingId": "

The unique identifier of the Reserved Node offering to be used for the exchange.

", + "AcceptReservedNodeExchangeInputMessage$ReservedNodeId": "

A string representing the node identifier of the DC1 Reserved Node to be exchanged.

", + "AcceptReservedNodeExchangeInputMessage$TargetReservedNodeOfferingId": "

The unique identifier of the DC2 Reserved Node offering to be used for the exchange. You can obtain the value for the parameter by calling GetReservedNodeExchangeOfferings

", "AccountWithRestoreAccess$AccountId": "

The identifier of an AWS customer account authorized to restore a snapshot.

", "AccountWithRestoreAccess$AccountAlias": "

The identifier of an AWS support account authorized to restore a snapshot. For AWS support, the identifier is amazon-redshift-support.

", "AuthorizeClusterSecurityGroupIngressMessage$ClusterSecurityGroupName": "

The name of the security group to which the ingress rule is added.

", @@ -1732,6 +1756,7 @@ "Cluster$ClusterPublicKey": "

The public key for the cluster.

", "Cluster$ClusterRevisionNumber": "

The specific revision number of the database in the cluster.

", "Cluster$KmsKeyId": "

The AWS Key Management Service (AWS KMS) key ID of the encryption key used to encrypt data in the cluster.

", + "Cluster$MaintenanceTrackName": "

The name of the maintenance track for the cluster.

", "ClusterCredentials$DbUser": "

A database user name that is authorized to log on to the database DbName using the password DbPassword. If the specified DbUser exists in the database, the new user name has the same database privileges as the the user named in DbUser. By default, the user is added to PUBLIC. If the DbGroups parameter is specifed, DbUser is added to the listed groups for any sessions created using these credentials.

", "ClusterDbRevision$ClusterIdentifier": "

The unique identifier of the cluster.

", "ClusterDbRevision$CurrentDatabaseRevision": "

A string representing the current cluster version.

", @@ -1790,6 +1815,7 @@ "CreateClusterMessage$ElasticIp": "

The Elastic IP (EIP) address for the cluster.

Constraints: The cluster must be provisioned in EC2-VPC and publicly-accessible through an Internet gateway. For more information about provisioning clusters in EC2-VPC, go to Supported Platforms to Launch Your Cluster in the Amazon Redshift Cluster Management Guide.

", "CreateClusterMessage$KmsKeyId": "

The AWS Key Management Service (KMS) key ID of the encryption key that you want to use to encrypt data in the cluster.

", "CreateClusterMessage$AdditionalInfo": "

Reserved.

", + "CreateClusterMessage$MaintenanceTrackName": "

An optional parameter for the name of the maintenance track for the cluster. If you don't provide a maintenance track name, the cluster is assigned to the current track.

", "CreateClusterParameterGroupMessage$ParameterGroupName": "

The name of the cluster parameter group.

Constraints:

This value is stored as a lower-case string.

", "CreateClusterParameterGroupMessage$ParameterGroupFamily": "

The Amazon Redshift engine version to which the cluster parameter group applies. The cluster engine version determines the set of parameters.

To get a list of valid parameter group family names, you can call DescribeClusterParameterGroups. By default, Amazon Redshift returns a list of all the parameter groups that are owned by your AWS account, including the default parameter groups for each Amazon Redshift engine version. The parameter group family names associated with the default parameter groups provide you the valid values. For example, a valid family name is \"redshift-1.0\".

", "CreateClusterParameterGroupMessage$Description": "

A description of the parameter group.

", @@ -1844,6 +1870,8 @@ "DescribeClusterSnapshotsMessage$OwnerAccount": "

The AWS customer account used to create or copy the snapshot. Use this field to filter the results to snapshots owned by a particular account. To describe snapshots you own, either specify your AWS customer account, or do not specify the parameter.

", "DescribeClusterSubnetGroupsMessage$ClusterSubnetGroupName": "

The name of the cluster subnet group for which information is requested.

", "DescribeClusterSubnetGroupsMessage$Marker": "

An optional parameter that specifies the starting point to return a set of response records. When the results of a DescribeClusterSubnetGroups request exceed the value specified in MaxRecords, AWS returns a value in the Marker field of the response. You can retrieve the next set of response records by providing the returned marker value in the Marker parameter and retrying the request.

", + "DescribeClusterTracksMessage$MaintenanceTrackName": "

The name of the maintenance track.

", + "DescribeClusterTracksMessage$Marker": "

An optional parameter that specifies the starting point to return a set of response records. When the results of a DescribeClusterTracks request exceed the value specified in MaxRecords, Amazon Redshift returns a value in the Marker field of the response. You can retrieve the next set of response records by providing the returned marker value in the Marker parameter and retrying the request.

", "DescribeClusterVersionsMessage$ClusterVersion": "

The specific cluster version to return.

Example: 1.0

", "DescribeClusterVersionsMessage$ClusterParameterGroupFamily": "

The name of a specific cluster parameter group family to return details for.

Constraints:

", "DescribeClusterVersionsMessage$Marker": "

An optional parameter that specifies the starting point to return a set of response records. When the results of a DescribeClusterVersions request exceed the value specified in MaxRecords, AWS returns a value in the Marker field of the response. You can retrieve the next set of response records by providing the returned marker value in the Marker parameter and retrying the request.

", @@ -1911,7 +1939,7 @@ "GetClusterCredentialsMessage$DbUser": "

The name of a database user. If a user name matching DbUser exists in the database, the temporary user credentials have the same permissions as the existing user. If DbUser doesn't exist in the database and Autocreate is True, a new user is created using the value for DbUser with PUBLIC permissions. If a database user matching the value for DbUser doesn't exist and Autocreate is False, then the command succeeds but the connection attempt will fail because the user doesn't exist in the database.

For more information, see CREATE USER in the Amazon Redshift Database Developer Guide.

Constraints:

", "GetClusterCredentialsMessage$DbName": "

The name of a database that DbUser is authorized to log on to. If DbName is not specified, DbUser can log on to any existing database.

Constraints:

", "GetClusterCredentialsMessage$ClusterIdentifier": "

The unique identifier of the cluster that contains the database for which your are requesting credentials. This parameter is case sensitive.

", - "GetReservedNodeExchangeOfferingsInputMessage$ReservedNodeId": "

A string representing the node identifier for the Reserved Node to be exchanged.

", + "GetReservedNodeExchangeOfferingsInputMessage$ReservedNodeId": "

A string representing the node identifier for the DC1 Reserved Node to be exchanged.

", "GetReservedNodeExchangeOfferingsInputMessage$Marker": "

A value that indicates the starting point for the next set of ReservedNodeOfferings.

", "GetReservedNodeExchangeOfferingsOutputMessage$Marker": "

An optional parameter that specifies the starting point for returning a set of response records. When the results of a GetReservedNodeExchangeOfferings request exceed the value specified in MaxRecords, Amazon Redshift returns a value in the marker field of the response. You can retrieve the next set of response records by providing the returned marker value in the marker parameter and retrying the request.

", "HsmClientCertificate$HsmClientCertificateIdentifier": "

The identifier of the HSM client certificate.

", @@ -1934,6 +1962,8 @@ "LoggingStatus$BucketName": "

The name of the S3 bucket where the log files are stored.

", "LoggingStatus$S3KeyPrefix": "

The prefix applied to the log file names.

", "LoggingStatus$LastFailureMessage": "

The message indicating that logs failed to be delivered.

", + "MaintenanceTrack$MaintenanceTrackName": "

The name of the maintenance track. Possible values are current and trailing.

", + "MaintenanceTrack$DatabaseVersion": "

The version number for the cluster release.

", "ModifyClusterDbRevisionMessage$ClusterIdentifier": "

The unique identifier of a cluster whose database revision you want to modify.

Example: examplecluster

", "ModifyClusterDbRevisionMessage$RevisionTarget": "

The identifier of the database revision. You can retrieve this value from the response to the DescribeClusterDbRevisions request.

", "ModifyClusterIamRolesMessage$ClusterIdentifier": "

The unique identifier of the cluster for which you want to associate or disassociate IAM roles.

", @@ -1948,6 +1978,7 @@ "ModifyClusterMessage$HsmConfigurationIdentifier": "

Specifies the name of the HSM configuration that contains the information the Amazon Redshift cluster can use to retrieve and store keys in an HSM.

", "ModifyClusterMessage$NewClusterIdentifier": "

The new identifier for the cluster.

Constraints:

Example: examplecluster

", "ModifyClusterMessage$ElasticIp": "

The Elastic IP (EIP) address for the cluster.

Constraints: The cluster must be provisioned in EC2-VPC and publicly-accessible through an Internet gateway. For more information about provisioning clusters in EC2-VPC, go to Supported Platforms to Launch Your Cluster in the Amazon Redshift Cluster Management Guide.

", + "ModifyClusterMessage$MaintenanceTrackName": "

The name for the maintenance track that you want to assign for the cluster. This name change is asynchronous. The new track name stays in the PendingModifiedValues for the cluster until the next maintenance window. When the maintenance track changes, the cluster is switched to the latest cluster release available for the maintenance track. At this point, the maintenance track name is applied.

", "ModifyClusterParameterGroupMessage$ParameterGroupName": "

The name of the parameter group to be modified.

", "ModifyClusterSubnetGroupMessage$ClusterSubnetGroupName": "

The name of the subnet group to be modified.

", "ModifyClusterSubnetGroupMessage$Description": "

A text description of the subnet group to be modified.

", @@ -1973,6 +2004,7 @@ "PendingModifiedValues$ClusterType": "

The pending or in-progress change of the cluster type.

", "PendingModifiedValues$ClusterVersion": "

The pending or in-progress change of the service version.

", "PendingModifiedValues$ClusterIdentifier": "

The pending or in-progress change of the new identifier for the cluster.

", + "PendingModifiedValues$MaintenanceTrackName": "

The name of the maintenance track that the cluster will change to during the next maintenance window.

", "PurchaseReservedNodeOfferingMessage$ReservedNodeOfferingId": "

The unique identifier of the reserved node offering you want to purchase.

", "RebootClusterMessage$ClusterIdentifier": "

The cluster identifier.

", "RecurringCharge$RecurringChargeFrequency": "

The frequency at which the recurring charge amount is applied.

", @@ -2007,6 +2039,7 @@ "RestoreFromClusterSnapshotMessage$KmsKeyId": "

The AWS Key Management Service (KMS) key ID of the encryption key that you want to use to encrypt data in the cluster that you restore from a shared snapshot.

", "RestoreFromClusterSnapshotMessage$NodeType": "

The node type that the restored cluster will be provisioned with.

Default: The node type of the cluster from which the snapshot was taken. You can modify this if you are using any DS node type. In that case, you can choose to restore into another DS node type of the same size. For example, you can restore ds1.8xlarge into ds2.8xlarge, or ds1.xlarge into ds2.xlarge. If you have a DC instance type, you must restore into that same instance type and size. In other words, you can only restore a dc1.large instance type into another dc1.large instance type or dc2.large instance type. You can't restore dc1.8xlarge to dc2.8xlarge. First restore to a dc1.8xlareg cluster, then resize to a dc2.8large cluster. For more information about node types, see About Clusters and Nodes in the Amazon Redshift Cluster Management Guide.

", "RestoreFromClusterSnapshotMessage$AdditionalInfo": "

Reserved.

", + "RestoreFromClusterSnapshotMessage$MaintenanceTrackName": "

The name of the maintenance track for the restored cluster. When you take a snapshot, the snapshot inherits the MaintenanceTrack value from the cluster. The snapshot might be on a different track than the cluster that was the source for the snapshot. For example, suppose that you take a snapshot of a cluster that is on the current track and then change the cluster to be on the trailing track. In this case, the snapshot and the source cluster are on different tracks.

", "RestoreStatus$Status": "

The status of the restore action. Returns starting, restoring, completed, or failed.

", "RestoreTableFromClusterSnapshotMessage$ClusterIdentifier": "

The identifier of the Amazon Redshift cluster to restore the table to.

", "RestoreTableFromClusterSnapshotMessage$SnapshotIdentifier": "

The identifier of the snapshot to restore the table from. This snapshot must have been created from the Amazon Redshift cluster specified by the ClusterIdentifier parameter.

", @@ -2039,6 +2072,7 @@ "Snapshot$KmsKeyId": "

The AWS Key Management Service (KMS) key ID of the encryption key that was used to encrypt data in the cluster from which the snapshot was taken.

", "Snapshot$OwnerAccount": "

For manual snapshots, the AWS customer account used to create or copy the snapshot. For automatic snapshots, the owner of the cluster. The owner can perform all snapshot actions, such as sharing a manual snapshot.

", "Snapshot$SourceRegion": "

The source region from which the snapshot was copied.

", + "Snapshot$MaintenanceTrackName": "

The name of the maintenance track for the snapshot.

", "SnapshotCopyGrant$SnapshotCopyGrantName": "

The name of the snapshot copy grant.

", "SnapshotCopyGrant$KmsKeyId": "

The unique identifier of the customer master key (CMK) in AWS KMS to which Amazon Redshift is granted permission.

", "SnapshotCopyGrantMessage$Marker": "

An optional parameter that specifies the starting point to return a set of response records. When the results of a DescribeSnapshotCopyGrant request exceed the value specified in MaxRecords, AWS returns a value in the Marker field of the response. You can retrieve the next set of response records by providing the returned marker value in the Marker parameter and retrying the request.

Constraints: You can specify either the SnapshotCopyGrantName parameter or the Marker parameter, but not both.

", @@ -2066,6 +2100,9 @@ "TaggedResource$ResourceName": "

The Amazon Resource Name (ARN) with which the tag is associated. For example, arn:aws:redshift:us-east-1:123456789:cluster:t1.

", "TaggedResource$ResourceType": "

The type of resource with which the tag is associated. Valid resource types are:

For more information about Amazon Redshift resource types and constructing ARNs, go to Constructing an Amazon Redshift Amazon Resource Name (ARN) in the Amazon Redshift Cluster Management Guide.

", "TaggedResourceListMessage$Marker": "

A value that indicates the starting point for the next set of response records in a subsequent request. If a value is returned in a response, you can retrieve the next set of records by providing this returned marker value in the Marker parameter and retrying the command. If the Marker field is empty, all response records have been retrieved for the request.

", + "TrackListMessage$Marker": "

The starting point to return a set of response tracklist records. You can retrieve the next set of response records by providing the returned marker value in the Marker parameter and retrying the request.

", + "UpdateTarget$MaintenanceTrackName": "

The name of the new maintenance track.

", + "UpdateTarget$DatabaseVersion": "

The cluster version for the new maintenance track.

", "VpcSecurityGroupIdList$member": null, "VpcSecurityGroupMembership$VpcSecurityGroupId": "

The identifier of the VPC security group.

", "VpcSecurityGroupMembership$Status": "

The status of the VPC security group.

" @@ -2273,6 +2310,17 @@ "refs": { } }, + "TrackList": { + "base": null, + "refs": { + "TrackListMessage$MaintenanceTracks": "

A list of maintenance tracks output by the DescribeClusterTracks operation.

" + } + }, + "TrackListMessage": { + "base": null, + "refs": { + } + }, "UnauthorizedOperation": { "base": "

Your account is not authorized to perform the requested operation.

", "refs": { @@ -2293,6 +2341,12 @@ "refs": { } }, + "UpdateTarget": { + "base": "

A maintenance track that you can switch the current track to.

", + "refs": { + "EligibleTracksToUpdateList$member": null + } + }, "VpcSecurityGroupIdList": { "base": null, "refs": { diff --git a/models/apis/ssm/2014-11-06/api-2.json b/models/apis/ssm/2014-11-06/api-2.json index a1d91088a9d..274393d171b 100644 --- a/models/apis/ssm/2014-11-06/api-2.json +++ b/models/apis/ssm/2014-11-06/api-2.json @@ -961,6 +961,22 @@ {"shape":"InternalServerError"} ] }, + "LabelParameterVersion":{ + "name":"LabelParameterVersion", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"LabelParameterVersionRequest"}, + "output":{"shape":"LabelParameterVersionResult"}, + "errors":[ + {"shape":"InternalServerError"}, + {"shape":"TooManyUpdates"}, + {"shape":"ParameterNotFound"}, + {"shape":"ParameterVersionNotFound"}, + {"shape":"ParameterVersionLabelLimitExceeded"} + ] + }, "ListAssociationVersions":{ "name":"ListAssociationVersions", "http":{ @@ -4990,6 +5006,27 @@ "type":"list", "member":{"shape":"TagKey"} }, + "LabelParameterVersionRequest":{ + "type":"structure", + "required":[ + "Name", + "Labels" + ], + "members":{ + "Name":{"shape":"PSParameterName"}, + "ParameterVersion":{ + "shape":"PSParameterVersion", + "box":true + }, + "Labels":{"shape":"ParameterLabelList"} + } + }, + "LabelParameterVersionResult":{ + "type":"structure", + "members":{ + "InvalidLabels":{"shape":"ParameterLabelList"} + } + }, "LastResourceDataSyncMessage":{"type":"string"}, "LastResourceDataSyncStatus":{ "type":"string", @@ -5742,6 +5779,11 @@ "max":2048, "min":1 }, + "PSParameterSelector":{ + "type":"string", + "max":128, + "min":0 + }, "PSParameterValue":{ "type":"string", "max":4096, @@ -5754,7 +5796,11 @@ "Name":{"shape":"PSParameterName"}, "Type":{"shape":"ParameterType"}, "Value":{"shape":"PSParameterValue"}, - "Version":{"shape":"PSParameterVersion"} + "Version":{"shape":"PSParameterVersion"}, + "Selector":{"shape":"PSParameterSelector"}, + "SourceResult":{"shape":"String"}, + "LastModifiedDate":{"shape":"DateTime"}, + "ARN":{"shape":"String"} } }, "ParameterAlreadyExists":{ @@ -5780,7 +5826,8 @@ "Description":{"shape":"ParameterDescription"}, "Value":{"shape":"PSParameterValue"}, "AllowedPattern":{"shape":"AllowedPattern"}, - "Version":{"shape":"PSParameterVersion"} + "Version":{"shape":"PSParameterVersion"}, + "Labels":{"shape":"ParameterLabelList"} } }, "ParameterHistoryList":{ @@ -5793,6 +5840,17 @@ "min":1, "pattern":"^([a-zA-Z0-9:/_-]+)$" }, + "ParameterLabel":{ + "type":"string", + "max":100, + "min":1 + }, + "ParameterLabelList":{ + "type":"list", + "member":{"shape":"ParameterLabel"}, + "max":10, + "min":1 + }, "ParameterLimitExceeded":{ "type":"structure", "members":{ @@ -5862,7 +5920,7 @@ "type":"string", "max":132, "min":1, - "pattern":"tag:.+|Name|Type|KeyId|Path" + "pattern":"tag:.+|Name|Type|KeyId|Path|Label" }, "ParameterStringFilterList":{ "type":"list", @@ -5897,6 +5955,13 @@ "type":"list", "member":{"shape":"ParameterValue"} }, + "ParameterVersionLabelLimitExceeded":{ + "type":"structure", + "members":{ + "message":{"shape":"String"} + }, + "exception":true + }, "ParameterVersionNotFound":{ "type":"structure", "members":{ diff --git a/models/apis/ssm/2014-11-06/docs-2.json b/models/apis/ssm/2014-11-06/docs-2.json index 6d27ec3a5a8..a57683f98d3 100644 --- a/models/apis/ssm/2014-11-06/docs-2.json +++ b/models/apis/ssm/2014-11-06/docs-2.json @@ -69,6 +69,7 @@ "GetParametersByPath": "

Retrieve parameters in a specific hierarchy. For more information, see Working with Systems Manager Parameters in the AWS Systems Manager User Guide.

Request results are returned on a best-effort basis. If you specify MaxResults in the request, the response includes information up to the limit specified. The number of items returned, however, can be between zero and the value of MaxResults. If the service reaches an internal limit while processing the results, it stops the operation and returns the matching values up to that point and a NextToken. You can specify the NextToken in a subsequent call to get the next set of results.

This API action doesn't support filtering by tags.

", "GetPatchBaseline": "

Retrieves information about a patch baseline.

", "GetPatchBaselineForPatchGroup": "

Retrieves the patch baseline that should be used for the specified patch group.

", + "LabelParameterVersion": null, "ListAssociationVersions": "

Retrieves all versions of an association for a specific association ID.

", "ListAssociations": "

Lists the associations for the specified Systems Manager document or instance.

", "ListCommandInvocations": "

An invocation is copy of a command sent to a specific instance. A command can apply to one or more instances. A command invocation applies to one instance. For example, if a user executes SendCommand against three instances, then a command invocation is created for each requested instance ID. ListCommandInvocations provide status about command execution.

", @@ -685,8 +686,8 @@ "PatchRule$EnableNonSecurity": "

For instances identified by the approval rule filters, enables a patch baseline to apply non-security updates available in the specified repository. The default value is 'false'. Applies to Linux instances only.

", "PutParameterRequest$Overwrite": "

Overwrite an existing parameter. If not specified, will default to \"false\".

", "ResolvedTargets$Truncated": "

A boolean value indicating whether the resolved target list is truncated.

", - "StepExecution$IsEnd": "

Enable this option to stop an Automation execution at the end of a specific step. The Automation execution stops if the step execution failed or succeeded.

", - "StepExecution$IsCritical": "

Enable this option to designate a step as critical for the successful completion of the Automation. If a step with this designation fails, then Automation reports the final status of the Automation as Failed.

", + "StepExecution$IsEnd": "

The flag which can be used to end automation no matter whether the step succeeds or fails.

", + "StepExecution$IsCritical": "

The flag which can be used to help decide whether the failure of current step leads to the Automation failure.

", "UpdateMaintenanceWindowRequest$Replace": "

If True, then all fields that are required by the CreateMaintenanceWindow action are also required for this API request. Optional fields that are not specified are set to null.

", "UpdateMaintenanceWindowTargetRequest$Replace": "

If True, then all fields that are required by the RegisterTargetWithMaintenanceWindow action are also required for this API request. Optional fields that are not specified are set to null.

", "UpdateMaintenanceWindowTaskRequest$Replace": "

If True, then all fields that are required by the RegisterTaskWithMaintenanceWndow action are also required for this API request. Optional fields that are not specified are set to null.

", @@ -1215,6 +1216,7 @@ "MaintenanceWindowExecutionTaskIdentity$EndTime": "

The time the task execution finished.

", "MaintenanceWindowExecutionTaskInvocationIdentity$StartTime": "

The time the invocation started.

", "MaintenanceWindowExecutionTaskInvocationIdentity$EndTime": "

The time the invocation finished.

", + "Parameter$LastModifiedDate": "

Date the parameter was last changed or updated and the parameter version was created.

", "ParameterHistory$LastModifiedDate": "

Date the parameter was last changed or updated.

", "ParameterMetadata$LastModifiedDate": "

Date the parameter was last changed or updated.

", "Patch$ReleaseDate": "

The date the patch was released.

", @@ -3060,6 +3062,16 @@ "RemoveTagsFromResourceRequest$TagKeys": "

Tag keys that you want to remove from the specified resource.

" } }, + "LabelParameterVersionRequest": { + "base": null, + "refs": { + } + }, + "LabelParameterVersionResult": { + "base": null, + "refs": { + } + }, "LastResourceDataSyncMessage": { "base": null, "refs": { @@ -3971,6 +3983,7 @@ "GetParameterHistoryRequest$Name": "

The name of a parameter you want to query.

", "GetParameterRequest$Name": "

The name of the parameter you want to query.

", "GetParametersByPathRequest$Path": "

The hierarchy for the parameter. Hierarchies start with a forward slash (/) and end with the parameter name. A parameter name hierarchy can have a maximum of 15 levels. Here is an example of a hierarchy: /Finance/Prod/IAD/WinServ2016/license33

", + "LabelParameterVersionRequest$Name": null, "Parameter$Name": "

The name of the parameter.

", "ParameterHistory$Name": "

The name of the parameter.

", "ParameterMetadata$Name": "

The parameter name.

", @@ -3978,6 +3991,12 @@ "PutParameterRequest$Name": "

The fully qualified name of the parameter that you want to add to the system. The fully qualified name includes the complete hierarchy of the parameter path and name. For example: /Dev/DBServer/MySQL/db-string13

Naming Constraints:

For additional information about valid values for parameter names, see Requirements and Constraints for Parameter Names in the AWS Systems Manager User Guide.

The maximum length constraint listed below includes capacity for additional system attributes that are not part of the name. The maximum length for the fully qualified parameter name is 1011 characters.

" } }, + "PSParameterSelector": { + "base": null, + "refs": { + "Parameter$Selector": "

Either the version number or the label used to retrieve the parameter value. Specify selectors by using one of the following formats:

parameter_name:version

parameter_name:label

" + } + }, "PSParameterValue": { "base": null, "refs": { @@ -3989,6 +4008,7 @@ "PSParameterVersion": { "base": null, "refs": { + "LabelParameterVersionRequest$ParameterVersion": null, "Parameter$Version": "

The parameter version.

", "ParameterHistory$Version": "

The parameter version.

", "ParameterMetadata$Version": "

The parameter version.

", @@ -4035,6 +4055,20 @@ "PutParameterRequest$KeyId": "

The KMS Key ID that you want to use to encrypt a parameter. Either the default AWS Key Management Service (AWS KMS) key automatically assigned to your AWS account or a custom key. Required for parameters that use the SecureString data type.

If you don't specify a key ID, the system uses the default key associated with your AWS account.

" } }, + "ParameterLabel": { + "base": null, + "refs": { + "ParameterLabelList$member": null + } + }, + "ParameterLabelList": { + "base": null, + "refs": { + "LabelParameterVersionRequest$Labels": null, + "LabelParameterVersionResult$InvalidLabels": null, + "ParameterHistory$Labels": "

Labels assigned to the parameter version.

" + } + }, "ParameterLimitExceeded": { "base": "

You have exceeded the number of parameters for this AWS account. Delete one or more parameters and try again.

", "refs": { @@ -4149,6 +4183,11 @@ "Parameters$value": null } }, + "ParameterVersionLabelLimitExceeded": { + "base": null, + "refs": { + } + }, "ParameterVersionNotFound": { "base": "

The specified parameter version was not found. Verify the parameter name and version, and try again.

", "refs": { @@ -5210,6 +5249,8 @@ "MaxDocumentSizeExceeded$Message": null, "NormalStringMap$key": null, "NormalStringMap$value": null, + "Parameter$SourceResult": "

Applies to parameters that reference information in other AWS services. SourceResult is the raw result or response from the source.

", + "Parameter$ARN": "

The Amazon Resource Name (ARN) of the parameter.

", "ParameterAlreadyExists$message": null, "ParameterHistory$LastModifiedUser": "

Amazon Resource Name (ARN) of the AWS user who last changed the parameter.

", "ParameterLimitExceeded$message": null, @@ -5217,6 +5258,7 @@ "ParameterMetadata$LastModifiedUser": "

Amazon Resource Name (ARN) of the AWS user who last changed the parameter.

", "ParameterNotFound$message": null, "ParameterPatternMismatchException$message": "

The parameter name is not valid.

", + "ParameterVersionLabelLimitExceeded$message": null, "ParameterVersionNotFound$message": null, "ResourceDataSyncCountExceededException$Message": null, "ResourceDataSyncInvalidConfigurationException$Message": null, @@ -5228,7 +5270,7 @@ "StepExecution$Response": "

A message associated with the response code for an execution.

", "StepExecution$FailureMessage": "

If a step failed, this message explains why the execution failed.

", "StepExecution$StepExecutionId": "

The unique ID of a step execution.

", - "StepExecution$NextStep": "

Specifies which step in an Automation to process next after successfully completing a step.

", + "StepExecution$NextStep": "

The next step after the step succeeds.

", "StringList$member": null, "SubTypeCountLimitExceededException$Message": null, "TargetInUseException$Message": null, @@ -5527,7 +5569,7 @@ "ValidNextStepList": { "base": null, "refs": { - "StepExecution$ValidNextSteps": "

ValidNextSteps offer different strategies for managing an Automation workflow when a step finishes. Automation dynamically processes ValidNextSteps when a step is completed. For example, you can specify Abort to stop the Automation when a step fails or Continue to ignore the failure of the current step and allow Automation to continue processing the next step. You can also specify step:step_name to jump to a designated step after a step succeeds. The result of the current step dynamically determines the ValidNextSteps. If a step finishes and no ValidNextStep is designated, then the Automation stops.

" + "StepExecution$ValidNextSteps": "

Strategies used when step fails, we support Continue and Abort. Abort will fail the automation when the step fails. Continue will ignore the failure of current step and allow automation to execute the next step. With conditional branching, we add step:stepName to support the automation to go to another specific step.

" } }, "Version": { diff --git a/service/codebuild/api.go b/service/codebuild/api.go index 8337312ca45..598421f1cc7 100644 --- a/service/codebuild/api.go +++ b/service/codebuild/api.go @@ -1585,6 +1585,13 @@ type Build struct { // The current build phase. CurrentPhase *string `locationName:"currentPhase" type:"string"` + // The AWS Key Management Service (AWS KMS) customer master key (CMK) to be + // used for encrypting the build output artifacts. + // + // This is expressed either as the CMK's Amazon Resource Name (ARN) or, if specified, + // the CMK's alias (using the format alias/alias-name). + EncryptionKey *string `locationName:"encryptionKey" min:"1" type:"string"` + // When the build process ended, expressed in Unix time format. EndTime *time.Time `locationName:"endTime" type:"timestamp"` @@ -1688,6 +1695,12 @@ func (s *Build) SetCurrentPhase(v string) *Build { return s } +// SetEncryptionKey sets the EncryptionKey field's value. +func (s *Build) SetEncryptionKey(v string) *Build { + s.EncryptionKey = &v + return s +} + // SetEndTime sets the EndTime field's value. func (s *Build) SetEndTime(v time.Time) *Build { s.EndTime = &v @@ -1776,6 +1789,9 @@ func (s *Build) SetVpcConfig(v *VpcConfig) *Build { type BuildArtifacts struct { _ struct{} `type:"structure"` + // Information that tells you if encryption for build artifacts is disabled. + EncryptionDisabled *bool `locationName:"encryptionDisabled" type:"boolean"` + // Information about the location of the build artifacts. Location *string `locationName:"location" type:"string"` @@ -1808,6 +1824,12 @@ func (s BuildArtifacts) GoString() string { return s.String() } +// SetEncryptionDisabled sets the EncryptionDisabled field's value. +func (s *BuildArtifacts) SetEncryptionDisabled(v bool) *BuildArtifacts { + s.EncryptionDisabled = &v + return s +} + // SetLocation sets the Location field's value. func (s *BuildArtifacts) SetLocation(v string) *BuildArtifacts { s.Location = &v @@ -3247,6 +3269,11 @@ func (s *Project) SetWebhook(v *Webhook) *Project { type ProjectArtifacts struct { _ struct{} `type:"structure"` + // Set to true if you do not want your output artifacts encrypted. This option + // is only valid if your artifacts type is Amazon S3. If this is set with another + // artifacts type, an invalidInputException will be thrown. + EncryptionDisabled *bool `locationName:"encryptionDisabled" type:"boolean"` + // Information about the build output artifact location, as follows: // // * If type is set to CODEPIPELINE, then AWS CodePipeline will ignore this @@ -3382,6 +3409,12 @@ func (s *ProjectArtifacts) Validate() error { return nil } +// SetEncryptionDisabled sets the EncryptionDisabled field's value. +func (s *ProjectArtifacts) SetEncryptionDisabled(v bool) *ProjectArtifacts { + s.EncryptionDisabled = &v + return s +} + // SetLocation sets the Location field's value. func (s *ProjectArtifacts) SetLocation(v string) *ProjectArtifacts { s.Location = &v diff --git a/service/ec2/api.go b/service/ec2/api.go index 6f6e497f321..f965ecbd628 100644 --- a/service/ec2/api.go +++ b/service/ec2/api.go @@ -1722,8 +1722,6 @@ func (c *EC2) BundleInstanceRequest(input *BundleInstanceInput) (req *request.Re // This action is not applicable for Linux/Unix instances or Windows instances // that are backed by Amazon EBS. // -// For more information, see Creating an Instance Store-Backed Windows AMI (http://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/Creating_InstanceStoreBacked_WinAMI.html). -// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -9825,14 +9823,14 @@ func (c *EC2) DescribeHostReservationOfferingsRequest(input *DescribeHostReserva // DescribeHostReservationOfferings API operation for Amazon Elastic Compute Cloud. // -// Describes the Dedicated Host Reservations that are available to purchase. +// Describes the Dedicated Host reservations that are available to purchase. // -// The results describe all the Dedicated Host Reservation offerings, including +// The results describe all the Dedicated Host reservation offerings, including // offerings that may not match the instance family and region of your Dedicated -// Hosts. When purchasing an offering, ensure that the the instance family and -// region of the offering matches that of the Dedicated Host/s it will be associated -// with. For an overview of supported instance types, see Dedicated Hosts Overview -// (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-overview.html) +// Hosts. When purchasing an offering, ensure that the instance family and Region +// of the offering matches that of the Dedicated Hosts with which it is to be +// associated . For more information about supported instance types, see Dedicated +// Hosts Overview (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-overview.html) // in the Amazon Elastic Compute Cloud User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -9907,8 +9905,7 @@ func (c *EC2) DescribeHostReservationsRequest(input *DescribeHostReservationsInp // DescribeHostReservations API operation for Amazon Elastic Compute Cloud. // -// Describes Dedicated Host Reservations which are associated with Dedicated -// Hosts in your account. +// Describes reservations that are associated with Dedicated Hosts in your account. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -9986,7 +9983,7 @@ func (c *EC2) DescribeHostsRequest(input *DescribeHostsInput) (req *request.Requ // // The results describe only the Dedicated Hosts in the region you're currently // using. All listed instances consume capacity on your Dedicated Host. Dedicated -// Hosts that have recently been released will be listed with the state released. +// Hosts that have recently been released are listed with the state released. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -17997,12 +17994,12 @@ func (c *EC2) ModifyHostsRequest(input *ModifyHostsInput) (req *request.Request, // ModifyHosts API operation for Amazon Elastic Compute Cloud. // // Modify the auto-placement setting of a Dedicated Host. When auto-placement -// is enabled, AWS will place instances that you launch with a tenancy of host, -// but without targeting a specific host ID, onto any available Dedicated Host -// in your account which has auto-placement enabled. When auto-placement is -// disabled, you need to provide a host ID if you want the instance to launch -// onto a specific host. If no host ID is provided, the instance will be launched -// onto a suitable host which has auto-placement enabled. +// is enabled, any instances that you launch with a tenancy of host but without +// a specific host ID are placed onto any available Dedicated Host in your account +// that has auto-placement enabled. When auto-placement is disabled, you need +// to provide a host ID ito have the instance launch onto a specific host. If +// no host ID is provided, the instance is launched onto a suitable host with +// auto-placement enabled. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -20366,10 +20363,13 @@ func (c *EC2) RegisterImageRequest(input *RegisterImageInput) (req *request.Requ // Some Linux distributions, such as Red Hat Enterprise Linux (RHEL) and SUSE // Linux Enterprise Server (SLES), use the EC2 billing product code associated // with an AMI to verify the subscription status for package updates. Creating -// an AMI from an EBS snapshot does not maintain this billing code, and subsequent -// instances launched from such an AMI will not be able to connect to package -// update infrastructure. To create an AMI that must retain billing codes, see -// CreateImage. +// an AMI from an EBS snapshot does not maintain this billing code, and instances +// launched from such an AMI are not able to connect to package update infrastructure. +// If you purchase a Reserved Instance offering for one of these Linux distributions +// and launch instances using an AMI that does not contain the required billing +// code, your Reserved Instance is not applied to these instances. +// +// To create an AMI for operating systems that require a billing code, see CreateImage. // // If needed, you can deregister an AMI at any time. Any modifications you make // to an AMI backed by an instance store volume invalidates its registration. @@ -20697,15 +20697,14 @@ func (c *EC2) ReleaseHostsRequest(input *ReleaseHostsInput) (req *request.Reques // When you no longer want to use an On-Demand Dedicated Host it can be released. // On-Demand billing is stopped and the host goes into released state. The host // ID of Dedicated Hosts that have been released can no longer be specified -// in another request, e.g., ModifyHosts. You must stop or terminate all instances -// on a host before it can be released. +// in another request, for example, ModifyHosts. You must stop or terminate +// all instances on a host before it can be released. // -// When Dedicated Hosts are released, it make take some time for them to stop +// When Dedicated Hosts are released, it may take some time for them to stop // counting toward your limit and you may receive capacity errors when trying -// to allocate new Dedicated hosts. Try waiting a few minutes, and then try -// again. +// to allocate new Dedicated Hosts. Wait a few minutes and then try again. // -// Released hosts will still appear in a DescribeHosts response. +// Released hosts still appear in a DescribeHosts response. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -25216,7 +25215,7 @@ func (s *AvailabilityZoneMessage) SetMessage(v string) *AvailabilityZoneMessage type AvailableCapacity struct { _ struct{} `type:"structure"` - // The total number of instances that the Dedicated Host supports. + // The total number of instances supported by the Dedicated Host. AvailableInstanceCapacity []*InstanceCapacity `locationName:"availableInstanceCapacity" locationNameList:"item" type:"list"` // The number of vCPUs available on the Dedicated Host. @@ -25285,10 +25284,13 @@ type BlockDeviceMapping struct { // The virtual device name (ephemeralN). Instance store volumes are numbered // starting from 0. An instance type with 2 available instance store volumes - // can specify mappings for ephemeral0 and ephemeral1.The number of available + // can specify mappings for ephemeral0 and ephemeral1. The number of available // instance store volumes depends on the instance type. After you connect to // the instance, you must mount the volume. // + // NVMe instance store volumes are automatically enumerated and assigned a device + // name. Including them in your block device mapping has no effect. + // // Constraints: For M3 instances, you must specify instance store volumes in // the block device mapping for the instance. When you launch an M3 instance, // we ignore any instance store volumes specified in the block device mapping @@ -27699,11 +27701,13 @@ type CreateFleetInput struct { // LaunchTemplateConfigs is a required field LaunchTemplateConfigs []*FleetLaunchTemplateConfigRequest `locationNameList:"item" type:"list" required:"true"` + // The allocation strategy of On-Demand Instances in an EC2 Fleet. + OnDemandOptions *OnDemandOptionsRequest `type:"structure"` + // Indicates whether EC2 Fleet should replace unhealthy instances. ReplaceUnhealthyInstances *bool `type:"boolean"` - // Includes SpotAllocationStrategy and SpotInstanceInterruptionBehavior inside - // this structure. + // Describes the configuration of Spot Instances in an EC2 Fleet. SpotOptions *SpotOptionsRequest `type:"structure"` // The key-value pair for tagging the EC2 Fleet request on creation. The value @@ -27807,6 +27811,12 @@ func (s *CreateFleetInput) SetLaunchTemplateConfigs(v []*FleetLaunchTemplateConf return s } +// SetOnDemandOptions sets the OnDemandOptions field's value. +func (s *CreateFleetInput) SetOnDemandOptions(v *OnDemandOptionsRequest) *CreateFleetInput { + s.OnDemandOptions = v + return s +} + // SetReplaceUnhealthyInstances sets the ReplaceUnhealthyInstances field's value. func (s *CreateFleetInput) SetReplaceUnhealthyInstances(v bool) *CreateFleetInput { s.ReplaceUnhealthyInstances = &v @@ -31360,7 +31370,8 @@ func (s *CreateVpnGatewayOutput) SetVpnGateway(v *VpnGateway) *CreateVpnGatewayO type CreditSpecification struct { _ struct{} `type:"structure"` - // The credit option for CPU usage of a T2 instance. + // The credit option for CPU usage of a T2 instance. Valid values are standard + // and unlimited. CpuCredits *string `locationName:"cpuCredits" type:"string"` } @@ -34128,10 +34139,11 @@ type DescribeAddressesInput struct { // // * public-ip - The Elastic IP address. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -34451,7 +34463,11 @@ type DescribeClassicLinkInstancesInput struct { // // * instance-id - The ID of the instance. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -34642,10 +34658,11 @@ type DescribeCustomerGatewaysInput struct { // * type - The type of customer gateway. Currently, the only supported type // is ipsec.1. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -34728,10 +34745,11 @@ type DescribeDhcpOptionsInput struct { // // * value - The value for one of the options. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -35648,10 +35666,11 @@ type DescribeFpgaImagesInput struct { // // * state - The state of the AFI (pending | failed | available | unavailable). // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -35774,22 +35793,23 @@ type DescribeHostReservationOfferingsInput struct { // One or more filters. // - // * instance-family - The instance family of the offering (e.g., m4). + // * instance-family - The instance family of the offering (for example, + // m4). // // * payment-option - The payment option (NoUpfront | PartialUpfront | AllUpfront). Filter []*Filter `locationNameList:"Filter" type:"list"` - // This is the maximum duration of the reservation you'd like to purchase, specified - // in seconds. Reservations are available in one-year and three-year terms. - // The number of seconds specified must be the number of seconds in a year (365x24x60x60) + // This is the maximum duration of the reservation to purchase, specified in + // seconds. Reservations are available in one-year and three-year terms. The + // number of seconds specified must be the number of seconds in a year (365x24x60x60) // times one of the supported durations (1 or 3). For example, specify 94608000 // for three years. MaxDuration *int64 `type:"integer"` // The maximum number of results to return for the request in a single page. // The remaining results can be seen by sending another request with the returned - // nextToken value. This value can be between 5 and 500; if maxResults is given - // a larger value than 500, you will receive an error. + // nextToken value. This value can be between 5 and 500. If maxResults is given + // a larger value than 500, you receive an error. MaxResults *int64 `type:"integer"` // This is the minimum duration of the reservation you'd like to purchase, specified @@ -35890,7 +35910,7 @@ type DescribeHostReservationsInput struct { // One or more filters. // - // * instance-family - The instance family (e.g., m4). + // * instance-family - The instance family (for example, m4). // // * payment-option - The payment option (NoUpfront | PartialUpfront | AllUpfront). // @@ -35903,8 +35923,8 @@ type DescribeHostReservationsInput struct { // The maximum number of results to return for the request in a single page. // The remaining results can be seen by sending another request with the returned - // nextToken value. This value can be between 5 and 500; if maxResults is given - // a larger value than 500, you will receive an error. + // nextToken value. This value can be between 5 and 500.If maxResults is given + // a larger value than 500, you receive an error. MaxResults *int64 `type:"integer"` // The token to use to retrieve the next page of results. @@ -35989,7 +36009,7 @@ type DescribeHostsInput struct { // // * availability-zone - The Availability Zone of the host. // - // * client-token - The idempotency token you provided when you allocated + // * client-token - The idempotency token that you provided when you allocated // the host. // // * host-reservation-id - The ID of the reservation assigned to this host. @@ -36010,9 +36030,9 @@ type DescribeHostsInput struct { // The maximum number of results to return for the request in a single page. // The remaining results can be seen by sending another request with the returned - // nextToken value. This value can be between 5 and 500; if maxResults is given - // a larger value than 500, you will receive an error. You cannot specify this - // parameter and the host IDs parameter in the same request. + // nextToken value. This value can be between 5 and 500. If maxResults is given + // a larger value than 500, you receive an error. You cannot specify this parameter + // and the host IDs parameter in the same request. MaxResults *int64 `locationName:"maxResults" type:"integer"` // The token to retrieve the next page of results. @@ -36562,10 +36582,11 @@ type DescribeImagesInput struct { // * sriov-net-support - A value of simple indicates that enhanced networking // with the Intel 82599 VF interface is enabled. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -37201,7 +37222,7 @@ type DescribeInstanceStatusInput struct { // example, 2014-09-15T17:15:20.000Z). // // * instance-state-code - The code for the instance state, as a 16-bit unsigned - // integer. The high byte is an opaque internal value and should be ignored. + // integer. The high byte is used for internal purposes and should be ignored. // The low byte is set based on the state represented. The valid values are // 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), // and 80 (stopped). @@ -37385,7 +37406,7 @@ type DescribeInstancesInput struct { // Scheduled Instance (spot | scheduled). // // * instance-state-code - The state of the instance, as a 16-bit unsigned - // integer. The high byte is an opaque internal value and should be ignored. + // integer. The high byte is used for internal purposes and should be ignored. // The low byte is set based on the state represented. The valid values are: // 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), // and 80 (stopped). @@ -37552,14 +37573,15 @@ type DescribeInstancesInput struct { // // * subnet-id - The ID of the subnet for the instance. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter - // to find all resources assigned a tag with a specific key, regardless of - // the tag value. + // to find all resources that have a tag with a specific key, regardless + // of the tag value. // // * tenancy - The tenancy of an instance (dedicated | default | host). // @@ -37677,10 +37699,11 @@ type DescribeInternetGatewaysInput struct { // // * internet-gateway-id - The ID of the Internet gateway. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -38001,10 +38024,11 @@ type DescribeLaunchTemplatesInput struct { // // * launch-template-name - The name of the launch template. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -38223,10 +38247,11 @@ type DescribeNatGatewaysInput struct { // // * subnet-id - The ID of the subnet in which the NAT gateway resides. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -38366,10 +38391,11 @@ type DescribeNetworkAclsInput struct { // // * network-acl-id - The ID of the network ACL. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -38759,10 +38785,11 @@ type DescribeNetworkInterfacesInput struct { // // * subnet-id - The ID of the subnet for the network interface. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -39225,10 +39252,11 @@ type DescribeReservedInstancesInput struct { // * state - The state of the Reserved Instance (payment-pending | active // | payment-failed | retired). // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -39802,10 +39830,11 @@ type DescribeRouteTablesInput struct { // * route.vpc-peering-connection-id - The ID of a VPC peering connection // specified in a route in the table. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -40300,6 +40329,12 @@ type DescribeSecurityGroupsInput struct { // // * owner-id - The AWS account ID of the owner of the security group. // + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. + // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of // the tag value. @@ -40547,10 +40582,11 @@ type DescribeSnapshotsInput struct { // // * status - The status of the snapshot (pending | completed | error). // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -41209,10 +41245,11 @@ type DescribeSpotInstanceRequestsInput struct { // * status-message - The message explaining the status of the Spot Instance // request. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -41582,10 +41619,11 @@ type DescribeSubnetsInput struct { // // * subnet-id - The ID of the subnet. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -41725,7 +41763,7 @@ type DescribeTagsOutput struct { _ struct{} `type:"structure"` // The token to use to retrieve the next page of results. This value is null - // when there are no more results to return.. + // when there are no more results to return. NextToken *string `locationName:"nextToken" type:"string"` // A list of tags. @@ -42033,10 +42071,11 @@ type DescribeVolumesInput struct { // * status - The status of the volume (creating | available | in-use | deleting // | deleted | error). // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -42463,10 +42502,11 @@ type DescribeVpcClassicLinkInput struct { // * is-classic-link-enabled - Whether the VPC is enabled for ClassicLink // (true | false). // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -43221,10 +43261,11 @@ type DescribeVpcPeeringConnectionsInput struct { // * status-message - A message that provides more information about the // status of the VPC peering connection, if applicable. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -43332,10 +43373,11 @@ type DescribeVpcsInput struct { // // * state - The state of the VPC (pending | available). // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -43433,10 +43475,11 @@ type DescribeVpnConnectionsInput struct { // * bgp-asn - The BGP Autonomous System Number (ASN) associated with a BGP // device. // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -43535,10 +43578,11 @@ type DescribeVpnGatewaysInput struct { // * state - The state of the virtual private gateway (pending | available // | deleting | deleted). // - // * tag:key=value - The key/value combination of a tag assigned to the resource. - // Specify the key of the tag in the filter name and the value of the tag - // in the filter value. For example, for the tag Purpose=X, specify tag:Purpose - // for the filter name and X for the filter value. + // * tag: - The key/value combination of a tag assigned to the resource. + // Use the tag key in the filter name and the tag value as the filter value. + // For example, to find all resources that have a tag with the key Owner + // and the value TeamA, specify tag:Owner for the filter name and TeamA for + // the filter value. // // * tag-key - The key of a tag assigned to the resource. Use this filter // to find all resources assigned a tag with a specific key, regardless of @@ -45940,6 +45984,9 @@ type FleetData struct { // The launch template and overrides. LaunchTemplateConfigs []*FleetLaunchTemplateConfig `locationName:"launchTemplateConfigs" locationNameList:"item" type:"list"` + // The allocation strategy of On-Demand Instances in an EC2 Fleet. + OnDemandOptions *OnDemandOptions `locationName:"onDemandOptions" type:"structure"` + // Indicates whether EC2 Fleet should replace unhealthy instances. ReplaceUnhealthyInstances *bool `locationName:"replaceUnhealthyInstances" type:"boolean"` @@ -46044,6 +46091,12 @@ func (s *FleetData) SetLaunchTemplateConfigs(v []*FleetLaunchTemplateConfig) *Fl return s } +// SetOnDemandOptions sets the OnDemandOptions field's value. +func (s *FleetData) SetOnDemandOptions(v *OnDemandOptions) *FleetData { + s.OnDemandOptions = v + return s +} + // SetReplaceUnhealthyInstances sets the ReplaceUnhealthyInstances field's value. func (s *FleetData) SetReplaceUnhealthyInstances(v bool) *FleetData { s.ReplaceUnhealthyInstances = &v @@ -46189,6 +46242,14 @@ type FleetLaunchTemplateOverrides struct { // The maximum price per unit hour that you are willing to pay for a Spot Instance. MaxPrice *string `locationName:"maxPrice" type:"string"` + // The priority for the launch template override. If AllocationStrategy is set + // to prioritized, EC2 Fleet uses priority to determine which launch template + // override to use first in fulfilling On-Demand capacity. The highest priority + // is launched first. Valid values are whole numbers starting at 0. The lower + // the number, the higher the priority. If no number is set, the override has + // the lowest priority. + Priority *float64 `locationName:"priority" type:"double"` + // The ID of the subnet in which to launch the instances. SubnetId *string `locationName:"subnetId" type:"string"` @@ -46224,6 +46285,12 @@ func (s *FleetLaunchTemplateOverrides) SetMaxPrice(v string) *FleetLaunchTemplat return s } +// SetPriority sets the Priority field's value. +func (s *FleetLaunchTemplateOverrides) SetPriority(v float64) *FleetLaunchTemplateOverrides { + s.Priority = &v + return s +} + // SetSubnetId sets the SubnetId field's value. func (s *FleetLaunchTemplateOverrides) SetSubnetId(v string) *FleetLaunchTemplateOverrides { s.SubnetId = &v @@ -46249,6 +46316,14 @@ type FleetLaunchTemplateOverridesRequest struct { // The maximum price per unit hour that you are willing to pay for a Spot Instance. MaxPrice *string `type:"string"` + // The priority for the launch template override. If AllocationStrategy is set + // to prioritized, EC2 Fleet uses priority to determine which launch template + // override to use first in fulfilling On-Demand capacity. The highest priority + // is launched first. Valid values are whole numbers starting at 0. The lower + // the number, the higher the priority. If no number is set, the launch template + // override has the lowest priority. + Priority *float64 `type:"double"` + // The ID of the subnet in which to launch the instances. SubnetId *string `type:"string"` @@ -46284,6 +46359,12 @@ func (s *FleetLaunchTemplateOverridesRequest) SetMaxPrice(v string) *FleetLaunch return s } +// SetPriority sets the Priority field's value. +func (s *FleetLaunchTemplateOverridesRequest) SetPriority(v float64) *FleetLaunchTemplateOverridesRequest { + s.Priority = &v + return s +} + // SetSubnetId sets the SubnetId field's value. func (s *FleetLaunchTemplateOverridesRequest) SetSubnetId(v string) *FleetLaunchTemplateOverridesRequest { s.SubnetId = &v @@ -46956,8 +47037,7 @@ func (s *GetConsoleScreenshotOutput) SetInstanceId(v string) *GetConsoleScreensh type GetHostReservationPurchasePreviewInput struct { _ struct{} `type:"structure"` - // The ID/s of the Dedicated Host/s that the reservation will be associated - // with. + // The IDs of the Dedicated Hosts with which the reservation is associated. // // HostIdSet is a required field HostIdSet []*string `locationNameList:"item" type:"list" required:"true"` @@ -47013,7 +47093,7 @@ type GetHostReservationPurchasePreviewOutput struct { // are specified. At this time, the only supported currency is USD. CurrencyCode *string `locationName:"currencyCode" type:"string" enum:"CurrencyCodeValues"` - // The purchase information of the Dedicated Host Reservation and the Dedicated + // The purchase information of the Dedicated Host reservation and the Dedicated // Hosts associated with it. Purchase []*Purchase `locationName:"purchase" locationNameList:"item" type:"list"` @@ -47540,8 +47620,8 @@ type Host struct { // The number of new instances that can be launched onto the Dedicated Host. AvailableCapacity *AvailableCapacity `locationName:"availableCapacity" type:"structure"` - // Unique, case-sensitive identifier you provide to ensure idempotency of the - // request. For more information, see How to Ensure Idempotency (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html) + // Unique, case-sensitive identifier that you provide to ensure idempotency + // of the request. For more information, see How to Ensure Idempotency (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html) // in the Amazon Elastic Compute Cloud User Guide. ClientToken *string `locationName:"clientToken" type:"string"` @@ -50854,7 +50934,7 @@ func (s *InstancePrivateIpAddress) SetPrivateIpAddress(v string) *InstancePrivat type InstanceState struct { _ struct{} `type:"structure"` - // The low byte represents the state. The high byte is an opaque internal value + // The low byte represents the state. The high byte is used for internal purposes // and should be ignored. // // * 0 : pending @@ -52541,6 +52621,14 @@ type LaunchTemplateOverrides struct { // The instance type. InstanceType *string `locationName:"instanceType" type:"string" enum:"InstanceType"` + // The priority for the launch template override. If OnDemandAllocationStrategy + // is set to prioritized, Spot Fleet uses priority to determine which launch + // template override to use first in fulfilling On-Demand capacity. The highest + // priority is launched first. Valid values are whole numbers starting at 0. + // The lower the number, the higher the priority. If no number is set, the launch + // template override has the lowest priority. + Priority *float64 `locationName:"priority" type:"double"` + // The maximum price per unit hour that you are willing to pay for a Spot Instance. SpotPrice *string `locationName:"spotPrice" type:"string"` @@ -52573,6 +52661,12 @@ func (s *LaunchTemplateOverrides) SetInstanceType(v string) *LaunchTemplateOverr return s } +// SetPriority sets the Priority field's value. +func (s *LaunchTemplateOverrides) SetPriority(v float64) *LaunchTemplateOverrides { + s.Priority = &v + return s +} + // SetSpotPrice sets the SpotPrice field's value. func (s *LaunchTemplateOverrides) SetSpotPrice(v string) *LaunchTemplateOverrides { s.SpotPrice = &v @@ -53526,7 +53620,7 @@ type ModifyHostsInput struct { // AutoPlacement is a required field AutoPlacement *string `locationName:"autoPlacement" type:"string" required:"true" enum:"AutoPlacement"` - // The host IDs of the Dedicated Hosts you want to modify. + // The IDs of the Dedicated Hosts to modify. // // HostIds is a required field HostIds []*string `locationName:"hostId" locationNameList:"item" type:"list" required:"true"` @@ -57020,6 +57114,64 @@ func (s *NewDhcpConfiguration) SetValues(v []*string) *NewDhcpConfiguration { return s } +// The allocation strategy of On-Demand Instances in an EC2 Fleet. +type OnDemandOptions struct { + _ struct{} `type:"structure"` + + // The order of the launch template overrides to use in fulfilling On-Demand + // capacity. If you specify lowest-price, EC2 Fleet uses price to determine + // the order, launching the lowest price first. If you specify prioritized, + // EC2 Fleet uses the priority that you assigned to each launch template override, + // launching the highest priority first. If you do not specify a value, EC2 + // Fleet defaults to lowest-price. + AllocationStrategy *string `locationName:"allocationStrategy" type:"string" enum:"FleetOnDemandAllocationStrategy"` +} + +// String returns the string representation +func (s OnDemandOptions) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s OnDemandOptions) GoString() string { + return s.String() +} + +// SetAllocationStrategy sets the AllocationStrategy field's value. +func (s *OnDemandOptions) SetAllocationStrategy(v string) *OnDemandOptions { + s.AllocationStrategy = &v + return s +} + +// The allocation strategy of On-Demand Instances in an EC2 Fleet. +type OnDemandOptionsRequest struct { + _ struct{} `type:"structure"` + + // The order of the launch template overrides to use in fulfilling On-Demand + // capacity. If you specify lowest-price, EC2 Fleet uses price to determine + // the order, launching the lowest price first. If you specify prioritized, + // EC2 Fleet uses the priority that you assigned to each launch template override, + // launching the highest priority first. If you do not specify a value, EC2 + // Fleet defaults to lowest-price. + AllocationStrategy *string `type:"string" enum:"FleetOnDemandAllocationStrategy"` +} + +// String returns the string representation +func (s OnDemandOptionsRequest) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s OnDemandOptionsRequest) GoString() string { + return s.String() +} + +// SetAllocationStrategy sets the AllocationStrategy field's value. +func (s *OnDemandOptionsRequest) SetAllocationStrategy(v string) *OnDemandOptionsRequest { + s.AllocationStrategy = &v + return s +} + // Describes the data that identifies an Amazon FPGA image (AFI) on the PCI // bus. type PciId struct { @@ -57825,8 +57977,7 @@ type PurchaseHostReservationInput struct { // amounts are specified. At this time, the only supported currency is USD. CurrencyCode *string `type:"string" enum:"CurrencyCodeValues"` - // The ID/s of the Dedicated Host/s that the reservation will be associated - // with. + // The IDs of the Dedicated Hosts with which the reservation will be associated. // // HostIdSet is a required field HostIdSet []*string `locationNameList:"item" type:"list" required:"true"` @@ -57834,10 +57985,9 @@ type PurchaseHostReservationInput struct { // The specified limit is checked against the total upfront cost of the reservation // (calculated as the offering's upfront cost multiplied by the host count). // If the total upfront cost is greater than the specified price limit, the - // request will fail. This is used to ensure that the purchase does not exceed - // the expected upfront cost of the purchase. At this time, the only supported - // currency is USD. For example, to indicate a limit price of USD 100, specify - // 100.00. + // request fails. This is used to ensure that the purchase does not exceed the + // expected upfront cost of the purchase. At this time, the only supported currency + // is USD. For example, to indicate a limit price of USD 100, specify 100.00. LimitPrice *string `type:"string"` // The ID of the offering. @@ -57907,7 +58057,7 @@ type PurchaseHostReservationOutput struct { // Unique, case-sensitive identifier you provide to ensure idempotency of the // request. For more information, see How to Ensure Idempotency (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html) - // in the Amazon Elastic Compute Cloud User Guide + // in the Amazon Elastic Compute Cloud User Guide. ClientToken *string `locationName:"clientToken" type:"string"` // The currency in which the totalUpfrontPrice and totalHourlyPrice amounts @@ -57920,8 +58070,7 @@ type PurchaseHostReservationOutput struct { // The total hourly price of the reservation calculated per hour. TotalHourlyPrice *string `locationName:"totalHourlyPrice" type:"string"` - // The total amount that will be charged to your account when you purchase the - // reservation. + // The total amount charged to your account when you purchase the reservation. TotalUpfrontPrice *string `locationName:"totalUpfrontPrice" type:"string"` } @@ -58768,7 +58917,7 @@ func (s ReleaseAddressOutput) GoString() string { type ReleaseHostsInput struct { _ struct{} `type:"structure"` - // The IDs of the Dedicated Hosts you want to release. + // The IDs of the Dedicated Hosts to release. // // HostIds is a required field HostIds []*string `locationName:"hostId" locationNameList:"item" type:"list" required:"true"` @@ -62443,6 +62592,9 @@ type RunInstancesInput struct { InstanceInitiatedShutdownBehavior *string `locationName:"instanceInitiatedShutdownBehavior" type:"string" enum:"ShutdownBehavior"` // The market (purchasing) option for the instances. + // + // For RunInstances, persistent Spot Instance requests are only supported when + // InstanceInterruptionBehavior is set to either hibernate or stop. InstanceMarketOptions *InstanceMarketOptionsRequest `type:"structure"` // The instance type. For more information, see Instance Types (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html) @@ -65289,6 +65441,12 @@ type SpotFleetRequestConfigData struct { // The behavior when a Spot Instance is interrupted. The default is terminate. InstanceInterruptionBehavior *string `locationName:"instanceInterruptionBehavior" type:"string" enum:"InstanceInterruptionBehavior"` + // The number of Spot pools across which to allocate your target Spot capacity. + // Valid only when Spot AllocationStrategy is set to lowest-price. Spot Fleet + // selects the cheapest Spot pools and evenly allocates your target Spot capacity + // across the number of Spot pools that you specify. + InstancePoolsToUseCount *int64 `locationName:"instancePoolsToUseCount" type:"integer"` + // The launch specifications for the Spot Fleet request. LaunchSpecifications []*SpotFleetLaunchSpecification `locationName:"launchSpecifications" locationNameList:"item" type:"list"` @@ -65304,6 +65462,14 @@ type SpotFleetRequestConfigData struct { // HS1, M1, M2, M3, and T1. LoadBalancersConfig *LoadBalancersConfig `locationName:"loadBalancersConfig" type:"structure"` + // The order of the launch template overrides to use in fulfilling On-Demand + // capacity. If you specify lowestPrice, Spot Fleet uses price to determine + // the order, launching the lowest price first. If you specify prioritized, + // Spot Fleet uses the priority that you assign to each Spot Fleet launch template + // override, launching the highest priority first. If you do not specify a value, + // Spot Fleet defaults to lowestPrice. + OnDemandAllocationStrategy *string `locationName:"onDemandAllocationStrategy" type:"string" enum:"OnDemandAllocationStrategy"` + // The number of On-Demand units fulfilled by this request compared to the set // target On-Demand capacity. OnDemandFulfilledCapacity *float64 `locationName:"onDemandFulfilledCapacity" type:"double"` @@ -65431,6 +65597,12 @@ func (s *SpotFleetRequestConfigData) SetInstanceInterruptionBehavior(v string) * return s } +// SetInstancePoolsToUseCount sets the InstancePoolsToUseCount field's value. +func (s *SpotFleetRequestConfigData) SetInstancePoolsToUseCount(v int64) *SpotFleetRequestConfigData { + s.InstancePoolsToUseCount = &v + return s +} + // SetLaunchSpecifications sets the LaunchSpecifications field's value. func (s *SpotFleetRequestConfigData) SetLaunchSpecifications(v []*SpotFleetLaunchSpecification) *SpotFleetRequestConfigData { s.LaunchSpecifications = v @@ -65449,6 +65621,12 @@ func (s *SpotFleetRequestConfigData) SetLoadBalancersConfig(v *LoadBalancersConf return s } +// SetOnDemandAllocationStrategy sets the OnDemandAllocationStrategy field's value. +func (s *SpotFleetRequestConfigData) SetOnDemandAllocationStrategy(v string) *SpotFleetRequestConfigData { + s.OnDemandAllocationStrategy = &v + return s +} + // SetOnDemandFulfilledCapacity sets the OnDemandFulfilledCapacity field's value. func (s *SpotFleetRequestConfigData) SetOnDemandFulfilledCapacity(v float64) *SpotFleetRequestConfigData { s.OnDemandFulfilledCapacity = &v @@ -65829,7 +66007,9 @@ type SpotMarketOptions struct { // default is the On-Demand price. MaxPrice *string `type:"string"` - // The Spot Instance request type. + // The Spot Instance request type. For RunInstances, persistent Spot Instance + // requests are only supported when InstanceInterruptionBehavior is set to either + // hibernate or stop. SpotInstanceType *string `type:"string" enum:"SpotInstanceType"` // The end date of the request. For a one-time request, the request remains @@ -65885,11 +66065,17 @@ type SpotOptions struct { _ struct{} `type:"structure"` // Indicates how to allocate the target capacity across the Spot pools specified - // by the Spot Fleet request. The default is lowestPrice. + // by the Spot Fleet request. The default is lowest-price. AllocationStrategy *string `locationName:"allocationStrategy" type:"string" enum:"SpotAllocationStrategy"` // The behavior when a Spot Instance is interrupted. The default is terminate. InstanceInterruptionBehavior *string `locationName:"instanceInterruptionBehavior" type:"string" enum:"SpotInstanceInterruptionBehavior"` + + // The number of Spot pools across which to allocate your target Spot capacity. + // Valid only when AllocationStrategy is set to lowestPrice. EC2 Fleet selects + // the cheapest Spot pools and evenly allocates your target Spot capacity across + // the number of Spot pools that you specify. + InstancePoolsToUseCount *int64 `locationName:"instancePoolsToUseCount" type:"integer"` } // String returns the string representation @@ -65914,6 +66100,12 @@ func (s *SpotOptions) SetInstanceInterruptionBehavior(v string) *SpotOptions { return s } +// SetInstancePoolsToUseCount sets the InstancePoolsToUseCount field's value. +func (s *SpotOptions) SetInstancePoolsToUseCount(v int64) *SpotOptions { + s.InstancePoolsToUseCount = &v + return s +} + // Describes the configuration of Spot Instances in an EC2 Fleet request. type SpotOptionsRequest struct { _ struct{} `type:"structure"` @@ -65924,6 +66116,12 @@ type SpotOptionsRequest struct { // The behavior when a Spot Instance is interrupted. The default is terminate. InstanceInterruptionBehavior *string `type:"string" enum:"SpotInstanceInterruptionBehavior"` + + // The number of Spot pools across which to allocate your target Spot capacity. + // Valid only when Spot AllocationStrategy is set to lowest-price. EC2 Fleet + // selects the cheapest Spot pools and evenly allocates your target Spot capacity + // across the number of Spot pools that you specify. + InstancePoolsToUseCount *int64 `type:"integer"` } // String returns the string representation @@ -65948,6 +66146,12 @@ func (s *SpotOptionsRequest) SetInstanceInterruptionBehavior(v string) *SpotOpti return s } +// SetInstancePoolsToUseCount sets the InstancePoolsToUseCount field's value. +func (s *SpotOptionsRequest) SetInstancePoolsToUseCount(v int64) *SpotOptionsRequest { + s.InstancePoolsToUseCount = &v + return s +} + // Describes Spot Instance placement. type SpotPlacement struct { _ struct{} `type:"structure"` @@ -70120,6 +70324,14 @@ const ( FleetExcessCapacityTerminationPolicyTermination = "termination" ) +const ( + // FleetOnDemandAllocationStrategyLowestPrice is a FleetOnDemandAllocationStrategy enum value + FleetOnDemandAllocationStrategyLowestPrice = "lowest-price" + + // FleetOnDemandAllocationStrategyPrioritized is a FleetOnDemandAllocationStrategy enum value + FleetOnDemandAllocationStrategyPrioritized = "prioritized" +) + const ( // FleetStateCodeSubmitted is a FleetStateCode enum value FleetStateCodeSubmitted = "submitted" @@ -70982,6 +71194,14 @@ const ( OfferingTypeValuesAllUpfront = "All Upfront" ) +const ( + // OnDemandAllocationStrategyLowestPrice is a OnDemandAllocationStrategy enum value + OnDemandAllocationStrategyLowestPrice = "lowestPrice" + + // OnDemandAllocationStrategyPrioritized is a OnDemandAllocationStrategy enum value + OnDemandAllocationStrategyPrioritized = "prioritized" +) + const ( // OperationTypeAdd is a OperationType enum value OperationTypeAdd = "add" diff --git a/service/ec2/doc.go b/service/ec2/doc.go index 909e05a14f3..c258e0e85c0 100644 --- a/service/ec2/doc.go +++ b/service/ec2/doc.go @@ -3,9 +3,22 @@ // Package ec2 provides the client and types for making API // requests to Amazon Elastic Compute Cloud. // -// Amazon Elastic Compute Cloud (Amazon EC2) provides resizable computing capacity -// in the AWS Cloud. Using Amazon EC2 eliminates the need to invest in hardware -// up front, so you can develop and deploy applications faster. +// Amazon Elastic Compute Cloud (Amazon EC2) provides secure and resizable computing +// capacity in the AWS cloud. Using Amazon EC2 eliminates the need to invest +// in hardware up front, so you can develop and deploy applications faster. +// +// To learn more about Amazon EC2, Amazon EBS, and Amazon VPC, see the following +// resources: +// +// * Amazon EC2 product page (http://aws.amazon.com/ec2) +// +// * Amazon EC2 documentation (http://aws.amazon.com/documentation/ec2) +// +// * Amazon EBS product page (http://aws.amazon.com/ebs) +// +// * Amazon VPC product page (http://aws.amazon.com/vpc) +// +// * Amazon VPC documentation (http://aws.amazon.com/documentation/vpc) // // See https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15 for more information on this service. // diff --git a/service/greengrass/api.go b/service/greengrass/api.go index c1a58c9c34b..69f0b8d1b7d 100644 --- a/service/greengrass/api.go +++ b/service/greengrass/api.go @@ -12144,7 +12144,7 @@ type LocalVolumeResourceData struct { GroupOwnerSetting *GroupOwnerSetting `type:"structure"` // The local absolute path of the volume resource on the host. The source path - // for a volume resource type cannot start with ''/proc'' or ''/sys''. + // for a volume resource type cannot start with ''/sys''. SourcePath *string `type:"string"` } diff --git a/service/inspector/api.go b/service/inspector/api.go index 98fe8c4f8ca..d5698b18caf 100644 --- a/service/inspector/api.go +++ b/service/inspector/api.go @@ -82,6 +82,9 @@ func (c *Inspector) AddAttributesToFindingsRequest(input *AddAttributesToFinding // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/AddAttributesToFindings func (c *Inspector) AddAttributesToFindings(input *AddAttributesToFindingsInput) (*AddAttributesToFindingsOutput, error) { req, out := c.AddAttributesToFindingsRequest(input) @@ -149,9 +152,11 @@ func (c *Inspector) CreateAssessmentTargetRequest(input *CreateAssessmentTargetI // CreateAssessmentTarget API operation for Amazon Inspector. // // Creates a new assessment target using the ARN of the resource group that -// is generated by CreateResourceGroup. If the service-linked role (https://docs.aws.amazon.com/inspector/latest/userguide/inspector_slr.html) -// isn’t already registered, also creates and registers a service-linked role -// to grant Amazon Inspector access to AWS Services needed to perform security +// is generated by CreateResourceGroup. If resourceGroupArn is not specified, +// all EC2 instances in the current AWS account and region are included in the +// assessment target. If the service-linked role (https://docs.aws.amazon.com/inspector/latest/userguide/inspector_slr.html) +// isn’t already registered, this action also creates and registers a service-linked +// role to grant Amazon Inspector access to AWS Services needed to perform security // assessments. You can create up to 50 assessment targets per AWS account. // You can run up to 500 concurrent agents per AWS account. For more information, // see Amazon Inspector Assessment Targets (http://docs.aws.amazon.com/inspector/latest/userguide/inspector_applications.html). @@ -186,6 +191,9 @@ func (c *Inspector) CreateAssessmentTargetRequest(input *CreateAssessmentTargetI // Amazon Inspector cannot assume the cross-account role that it needs to list // your EC2 instances during the assessment run. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/CreateAssessmentTarget func (c *Inspector) CreateAssessmentTarget(input *CreateAssessmentTargetInput) (*CreateAssessmentTargetOutput, error) { req, out := c.CreateAssessmentTargetRequest(input) @@ -254,8 +262,8 @@ func (c *Inspector) CreateAssessmentTemplateRequest(input *CreateAssessmentTempl // // Creates an assessment template for the assessment target that is specified // by the ARN of the assessment target. If the service-linked role (https://docs.aws.amazon.com/inspector/latest/userguide/inspector_slr.html) -// isn’t already registered, also creates and registers a service-linked role -// to grant Amazon Inspector access to AWS Services needed to perform security +// isn’t already registered, this action also creates and registers a service-linked +// role to grant Amazon Inspector access to AWS Services needed to perform security // assessments. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -284,6 +292,9 @@ func (c *Inspector) CreateAssessmentTemplateRequest(input *CreateAssessmentTempl // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/CreateAssessmentTemplate func (c *Inspector) CreateAssessmentTemplate(input *CreateAssessmentTemplateInput) (*CreateAssessmentTemplateOutput, error) { req, out := c.CreateAssessmentTemplateRequest(input) @@ -380,6 +391,9 @@ func (c *Inspector) CreateExclusionsPreviewRequest(input *CreateExclusionsPrevie // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/CreateExclusionsPreview func (c *Inspector) CreateExclusionsPreview(input *CreateExclusionsPreviewInput) (*CreateExclusionsPreviewOutput, error) { req, out := c.CreateExclusionsPreviewRequest(input) @@ -473,6 +487,9 @@ func (c *Inspector) CreateResourceGroupRequest(input *CreateResourceGroupInput) // * ErrCodeAccessDeniedException "AccessDeniedException" // You do not have required permissions to access the requested resource. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/CreateResourceGroup func (c *Inspector) CreateResourceGroup(input *CreateResourceGroupInput) (*CreateResourceGroupOutput, error) { req, out := c.CreateResourceGroupRequest(input) @@ -570,6 +587,9 @@ func (c *Inspector) DeleteAssessmentRunRequest(input *DeleteAssessmentRunInput) // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/DeleteAssessmentRun func (c *Inspector) DeleteAssessmentRun(input *DeleteAssessmentRunInput) (*DeleteAssessmentRunOutput, error) { req, out := c.DeleteAssessmentRunRequest(input) @@ -667,6 +687,9 @@ func (c *Inspector) DeleteAssessmentTargetRequest(input *DeleteAssessmentTargetI // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/DeleteAssessmentTarget func (c *Inspector) DeleteAssessmentTarget(input *DeleteAssessmentTargetInput) (*DeleteAssessmentTargetOutput, error) { req, out := c.DeleteAssessmentTargetRequest(input) @@ -764,6 +787,9 @@ func (c *Inspector) DeleteAssessmentTemplateRequest(input *DeleteAssessmentTempl // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/DeleteAssessmentTemplate func (c *Inspector) DeleteAssessmentTemplate(input *DeleteAssessmentTemplateInput) (*DeleteAssessmentTemplateOutput, error) { req, out := c.DeleteAssessmentTemplateRequest(input) @@ -1531,6 +1557,9 @@ func (c *Inspector) GetAssessmentReportRequest(input *GetAssessmentReportInput) // runs that took place or will take place after generating reports in Amazon // Inspector became available. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/GetAssessmentReport func (c *Inspector) GetAssessmentReport(input *GetAssessmentReportInput) (*GetAssessmentReportOutput, error) { req, out := c.GetAssessmentReportRequest(input) @@ -3272,6 +3301,9 @@ func (c *Inspector) RegisterCrossAccountAccessRoleRequest(input *RegisterCrossAc // Amazon Inspector cannot assume the cross-account role that it needs to list // your EC2 instances during the assessment run. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/RegisterCrossAccountAccessRole func (c *Inspector) RegisterCrossAccountAccessRole(input *RegisterCrossAccountAccessRoleInput) (*RegisterCrossAccountAccessRoleOutput, error) { req, out := c.RegisterCrossAccountAccessRoleRequest(input) @@ -3364,6 +3396,9 @@ func (c *Inspector) RemoveAttributesFromFindingsRequest(input *RemoveAttributesF // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/RemoveAttributesFromFindings func (c *Inspector) RemoveAttributesFromFindings(input *RemoveAttributesFromFindingsInput) (*RemoveAttributesFromFindingsOutput, error) { req, out := c.RemoveAttributesFromFindingsRequest(input) @@ -3457,6 +3492,9 @@ func (c *Inspector) SetTagsForResourceRequest(input *SetTagsForResourceInput) (r // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/SetTagsForResource func (c *Inspector) SetTagsForResource(input *SetTagsForResourceInput) (*SetTagsForResourceOutput, error) { req, out := c.SetTagsForResourceRequest(input) @@ -3561,6 +3599,9 @@ func (c *Inspector) StartAssessmentRunRequest(input *StartAssessmentRunInput) (r // You started an assessment run, but one of the instances is already participating // in another assessment run. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/StartAssessmentRun func (c *Inspector) StartAssessmentRun(input *StartAssessmentRunInput) (*StartAssessmentRunOutput, error) { req, out := c.StartAssessmentRunRequest(input) @@ -3653,6 +3694,9 @@ func (c *Inspector) StopAssessmentRunRequest(input *StopAssessmentRunInput) (req // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/StopAssessmentRun func (c *Inspector) StopAssessmentRun(input *StopAssessmentRunInput) (*StopAssessmentRunOutput, error) { req, out := c.StopAssessmentRunRequest(input) @@ -3750,6 +3794,9 @@ func (c *Inspector) SubscribeToEventRequest(input *SubscribeToEventInput) (req * // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/SubscribeToEvent func (c *Inspector) SubscribeToEvent(input *SubscribeToEventInput) (*SubscribeToEventOutput, error) { req, out := c.SubscribeToEventRequest(input) @@ -3843,6 +3890,9 @@ func (c *Inspector) UnsubscribeFromEventRequest(input *UnsubscribeFromEventInput // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/UnsubscribeFromEvent func (c *Inspector) UnsubscribeFromEvent(input *UnsubscribeFromEventInput) (*UnsubscribeFromEventOutput, error) { req, out := c.UnsubscribeFromEventRequest(input) @@ -3914,6 +3964,9 @@ func (c *Inspector) UpdateAssessmentTargetRequest(input *UpdateAssessmentTargetI // Updates the assessment target that is specified by the ARN of the assessment // target. // +// If resourceGroupArn is not specified, all EC2 instances in the current AWS +// account and region are included in the assessment target. +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -3936,6 +3989,9 @@ func (c *Inspector) UpdateAssessmentTargetRequest(input *UpdateAssessmentTargetI // The request was rejected because it referenced an entity that does not exist. // The error code describes the entity. // +// * ErrCodeServiceTemporarilyUnavailableException "ServiceTemporarilyUnavailableException" +// The serice is temporary unavailable. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/inspector-2016-02-16/UpdateAssessmentTarget func (c *Inspector) UpdateAssessmentTarget(input *UpdateAssessmentTargetInput) (*UpdateAssessmentTargetOutput, error) { req, out := c.UpdateAssessmentTargetRequest(input) @@ -5166,7 +5222,8 @@ type CreateAssessmentTargetInput struct { AssessmentTargetName *string `locationName:"assessmentTargetName" min:"1" type:"string" required:"true"` // The ARN that specifies the resource group that is used to create the assessment - // target. + // target. If resourceGroupArn is not specified, all EC2 instances in the current + // AWS account and region are included in the assessment target. ResourceGroupArn *string `locationName:"resourceGroupArn" min:"1" type:"string"` } @@ -5253,8 +5310,7 @@ type CreateAssessmentTemplateInput struct { // AssessmentTemplateName is a required field AssessmentTemplateName *string `locationName:"assessmentTemplateName" min:"1" type:"string" required:"true"` - // The duration of the assessment run in seconds. The default value is 3600 - // seconds (one hour). + // The duration of the assessment run in seconds. // // DurationInSeconds is a required field DurationInSeconds *int64 `locationName:"durationInSeconds" min:"180" type:"integer" required:"true"` diff --git a/service/inspector/errors.go b/service/inspector/errors.go index 8d532b03ed5..9e106a58743 100644 --- a/service/inspector/errors.go +++ b/service/inspector/errors.go @@ -65,6 +65,12 @@ const ( // an exclusions preview. ErrCodePreviewGenerationInProgressException = "PreviewGenerationInProgressException" + // ErrCodeServiceTemporarilyUnavailableException for service response error code + // "ServiceTemporarilyUnavailableException". + // + // The serice is temporary unavailable. + ErrCodeServiceTemporarilyUnavailableException = "ServiceTemporarilyUnavailableException" + // ErrCodeUnsupportedFeatureException for service response error code // "UnsupportedFeatureException". // diff --git a/service/inspector/examples_test.go b/service/inspector/examples_test.go index c3d21df5fdb..633ef854abf 100644 --- a/service/inspector/examples_test.go +++ b/service/inspector/examples_test.go @@ -55,6 +55,8 @@ func ExampleInspector_AddAttributesToFindings_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -97,6 +99,8 @@ func ExampleInspector_CreateAssessmentTarget_shared00() { fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) case inspector.ErrCodeInvalidCrossAccountRoleException: fmt.Println(inspector.ErrCodeInvalidCrossAccountRoleException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -146,6 +150,8 @@ func ExampleInspector_CreateAssessmentTemplate_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -189,6 +195,8 @@ func ExampleInspector_CreateResourceGroup_shared00() { fmt.Println(inspector.ErrCodeLimitExceededException, aerr.Error()) case inspector.ErrCodeAccessDeniedException: fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -226,6 +234,8 @@ func ExampleInspector_DeleteAssessmentRun_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -263,6 +273,8 @@ func ExampleInspector_DeleteAssessmentTarget_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -300,6 +312,8 @@ func ExampleInspector_DeleteAssessmentTemplate_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -929,6 +943,8 @@ func ExampleInspector_RegisterCrossAccountAccessRole_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeInvalidCrossAccountRoleException: fmt.Println(inspector.ErrCodeInvalidCrossAccountRoleException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -970,6 +986,8 @@ func ExampleInspector_RemoveAttributesFromFindings_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -1012,6 +1030,8 @@ func ExampleInspector_SetTagsForResource_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -1056,6 +1076,8 @@ func ExampleInspector_StartAssessmentRun_shared00() { fmt.Println(inspector.ErrCodeInvalidCrossAccountRoleException, aerr.Error()) case inspector.ErrCodeAgentsAlreadyRunningAssessmentException: fmt.Println(inspector.ErrCodeAgentsAlreadyRunningAssessmentException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -1091,6 +1113,8 @@ func ExampleInspector_StopAssessmentRun_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -1131,6 +1155,8 @@ func ExampleInspector_SubscribeToEvent_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -1169,6 +1195,8 @@ func ExampleInspector_UnsubscribeFromEvent_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } @@ -1206,6 +1234,8 @@ func ExampleInspector_UpdateAssessmentTarget_shared00() { fmt.Println(inspector.ErrCodeAccessDeniedException, aerr.Error()) case inspector.ErrCodeNoSuchEntityException: fmt.Println(inspector.ErrCodeNoSuchEntityException, aerr.Error()) + case inspector.ErrCodeServiceTemporarilyUnavailableException: + fmt.Println(inspector.ErrCodeServiceTemporarilyUnavailableException, aerr.Error()) default: fmt.Println(aerr.Error()) } diff --git a/service/redshift/api.go b/service/redshift/api.go index 82e996e83cb..f49e6d8e9c8 100644 --- a/service/redshift/api.go +++ b/service/redshift/api.go @@ -553,6 +553,9 @@ func (c *Redshift) CreateClusterRequest(input *CreateClusterInput) (req *request // The request cannot be completed because a dependent service is throttling // requests made by Amazon Redshift on your behalf. Wait and retry the request. // +// * ErrCodeInvalidClusterTrackFault "InvalidClusterTrack" +// The provided cluster track name is not valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/CreateCluster func (c *Redshift) CreateCluster(input *CreateClusterInput) (*CreateClusterOutput, error) { req, out := c.CreateClusterRequest(input) @@ -3264,6 +3267,88 @@ func (c *Redshift) DescribeClusterSubnetGroupsPagesWithContext(ctx aws.Context, return p.Err() } +const opDescribeClusterTracks = "DescribeClusterTracks" + +// DescribeClusterTracksRequest generates a "aws/request.Request" representing the +// client's request for the DescribeClusterTracks operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See DescribeClusterTracks for more information on using the DescribeClusterTracks +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the DescribeClusterTracksRequest method. +// req, resp := client.DescribeClusterTracksRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeClusterTracks +func (c *Redshift) DescribeClusterTracksRequest(input *DescribeClusterTracksInput) (req *request.Request, output *DescribeClusterTracksOutput) { + op := &request.Operation{ + Name: opDescribeClusterTracks, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeClusterTracksInput{} + } + + output = &DescribeClusterTracksOutput{} + req = c.newRequest(op, input, output) + return +} + +// DescribeClusterTracks API operation for Amazon Redshift. +// +// Returns a list of all the available maintenance tracks. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Redshift's +// API operation DescribeClusterTracks for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInvalidClusterTrackFault "InvalidClusterTrack" +// The provided cluster track name is not valid. +// +// * ErrCodeUnauthorizedOperation "UnauthorizedOperation" +// Your account is not authorized to perform the requested operation. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeClusterTracks +func (c *Redshift) DescribeClusterTracks(input *DescribeClusterTracksInput) (*DescribeClusterTracksOutput, error) { + req, out := c.DescribeClusterTracksRequest(input) + return out, req.Send() +} + +// DescribeClusterTracksWithContext is the same as DescribeClusterTracks with the addition of +// the ability to pass a context and additional request options. +// +// See DescribeClusterTracks for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *Redshift) DescribeClusterTracksWithContext(ctx aws.Context, input *DescribeClusterTracksInput, opts ...request.Option) (*DescribeClusterTracksOutput, error) { + req, out := c.DescribeClusterTracksRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDescribeClusterVersions = "DescribeClusterVersions" // DescribeClusterVersionsRequest generates a "aws/request.Request" representing the @@ -5744,8 +5829,8 @@ func (c *Redshift) GetReservedNodeExchangeOfferingsRequest(input *GetReservedNod // GetReservedNodeExchangeOfferings API operation for Amazon Redshift. // -// Returns an array of ReservedNodeOfferings which is filtered by payment type, -// term, and instance type. +// Returns an array of DC2 ReservedNodeOfferings that matches the payment type, +// term, and usage price of the given DC1 reserved node. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -5917,6 +6002,9 @@ func (c *Redshift) ModifyClusterRequest(input *ModifyClusterInput) (req *request // The number of tables in the cluster exceeds the limit for the requested new // cluster node type. // +// * ErrCodeInvalidClusterTrackFault "InvalidClusterTrack" +// The provided cluster track name is not valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/ModifyCluster func (c *Redshift) ModifyCluster(input *ModifyClusterInput) (*ModifyClusterOutput, error) { req, out := c.ModifyClusterRequest(input) @@ -6916,6 +7004,9 @@ func (c *Redshift) RestoreFromClusterSnapshotRequest(input *RestoreFromClusterSn // The request cannot be completed because a dependent service is throttling // requests made by Amazon Redshift on your behalf. Wait and retry the request. // +// * ErrCodeInvalidClusterTrackFault "InvalidClusterTrack" +// The provided cluster track name is not valid. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/RestoreFromClusterSnapshot func (c *Redshift) RestoreFromClusterSnapshot(input *RestoreFromClusterSnapshotInput) (*RestoreFromClusterSnapshotOutput, error) { req, out := c.RestoreFromClusterSnapshotRequest(input) @@ -7323,12 +7414,14 @@ func (c *Redshift) RotateEncryptionKeyWithContext(ctx aws.Context, input *Rotate type AcceptReservedNodeExchangeInput struct { _ struct{} `type:"structure"` - // A string representing the identifier of the Reserved Node to be exchanged. + // A string representing the node identifier of the DC1 Reserved Node to be + // exchanged. // // ReservedNodeId is a required field ReservedNodeId *string `type:"string" required:"true"` - // The unique identifier of the Reserved Node offering to be used for the exchange. + // The unique identifier of the DC2 Reserved Node offering to be used for the + // exchange. You can obtain the value for the parameter by calling GetReservedNodeExchangeOfferings // // TargetReservedNodeOfferingId is a required field TargetReservedNodeOfferingId *string `type:"string" required:"true"` @@ -7772,6 +7865,9 @@ type Cluster struct { // to encrypt data in the cluster. KmsKeyId *string `type:"string"` + // The name of the maintenance track for the cluster. + MaintenanceTrackName *string `type:"string"` + // The master user name for the cluster. This name is used to connect to the // database that is specified in the DBName parameter. MasterUsername *string `type:"string"` @@ -7958,6 +8054,12 @@ func (s *Cluster) SetKmsKeyId(v string) *Cluster { return s } +// SetMaintenanceTrackName sets the MaintenanceTrackName field's value. +func (s *Cluster) SetMaintenanceTrackName(v string) *Cluster { + s.MaintenanceTrackName = &v + return s +} + // SetMasterUsername sets the MasterUsername field's value. func (s *Cluster) SetMasterUsername(v string) *Cluster { s.MasterUsername = &v @@ -8896,6 +8998,11 @@ type CreateClusterInput struct { // want to use to encrypt data in the cluster. KmsKeyId *string `type:"string"` + // An optional parameter for the name of the maintenance track for the cluster. + // If you don't provide a maintenance track name, the cluster is assigned to + // the current track. + MaintenanceTrackName *string `type:"string"` + // The password associated with the master user account for the cluster that // is being created. // @@ -9136,6 +9243,12 @@ func (s *CreateClusterInput) SetKmsKeyId(v string) *CreateClusterInput { return s } +// SetMaintenanceTrackName sets the MaintenanceTrackName field's value. +func (s *CreateClusterInput) SetMaintenanceTrackName(v string) *CreateClusterInput { + s.MaintenanceTrackName = &v + return s +} + // SetMasterUserPassword sets the MasterUserPassword field's value. func (s *CreateClusterInput) SetMasterUserPassword(v string) *CreateClusterInput { s.MasterUserPassword = &v @@ -11621,6 +11734,86 @@ func (s *DescribeClusterSubnetGroupsOutput) SetMarker(v string) *DescribeCluster return s } +type DescribeClusterTracksInput struct { + _ struct{} `type:"structure"` + + // The name of the maintenance track. + MaintenanceTrackName *string `type:"string"` + + // An optional parameter that specifies the starting point to return a set of + // response records. When the results of a DescribeClusterTracks request exceed + // the value specified in MaxRecords, Amazon Redshift returns a value in the + // Marker field of the response. You can retrieve the next set of response records + // by providing the returned marker value in the Marker parameter and retrying + // the request. + Marker *string `type:"string"` + + // An integer value for the maximum number of maintenance tracks to return. + MaxRecords *int64 `type:"integer"` +} + +// String returns the string representation +func (s DescribeClusterTracksInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeClusterTracksInput) GoString() string { + return s.String() +} + +// SetMaintenanceTrackName sets the MaintenanceTrackName field's value. +func (s *DescribeClusterTracksInput) SetMaintenanceTrackName(v string) *DescribeClusterTracksInput { + s.MaintenanceTrackName = &v + return s +} + +// SetMarker sets the Marker field's value. +func (s *DescribeClusterTracksInput) SetMarker(v string) *DescribeClusterTracksInput { + s.Marker = &v + return s +} + +// SetMaxRecords sets the MaxRecords field's value. +func (s *DescribeClusterTracksInput) SetMaxRecords(v int64) *DescribeClusterTracksInput { + s.MaxRecords = &v + return s +} + +type DescribeClusterTracksOutput struct { + _ struct{} `type:"structure"` + + // A list of maintenance tracks output by the DescribeClusterTracks operation. + MaintenanceTracks []*MaintenanceTrack `locationNameList:"MaintenanceTrack" type:"list"` + + // The starting point to return a set of response tracklist records. You can + // retrieve the next set of response records by providing the returned marker + // value in the Marker parameter and retrying the request. + Marker *string `type:"string"` +} + +// String returns the string representation +func (s DescribeClusterTracksOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeClusterTracksOutput) GoString() string { + return s.String() +} + +// SetMaintenanceTracks sets the MaintenanceTracks field's value. +func (s *DescribeClusterTracksOutput) SetMaintenanceTracks(v []*MaintenanceTrack) *DescribeClusterTracksOutput { + s.MaintenanceTracks = v + return s +} + +// SetMarker sets the Marker field's value. +func (s *DescribeClusterTracksOutput) SetMarker(v string) *DescribeClusterTracksOutput { + s.Marker = &v + return s +} + type DescribeClusterVersionsInput struct { _ struct{} `type:"structure"` @@ -14316,7 +14509,8 @@ type GetReservedNodeExchangeOfferingsInput struct { // An integer setting the maximum number of ReservedNodeOfferings to retrieve. MaxRecords *int64 `type:"integer"` - // A string representing the node identifier for the Reserved Node to be exchanged. + // A string representing the node identifier for the DC1 Reserved Node to be + // exchanged. // // ReservedNodeId is a required field ReservedNodeId *string `type:"string" required:"true"` @@ -14666,6 +14860,52 @@ func (s *LoggingStatus) SetS3KeyPrefix(v string) *LoggingStatus { return s } +// Defines a maintenance track that determines which Amazon Redshift version +// to apply during a maintenance window. If the value for MaintenanceTrack is +// current, the cluster is updated to the most recently certified maintenance +// release. If the value is trailing, the cluster is updated to the previously +// certified maintenance release. +type MaintenanceTrack struct { + _ struct{} `type:"structure"` + + // The version number for the cluster release. + DatabaseVersion *string `type:"string"` + + // The name of the maintenance track. Possible values are current and trailing. + MaintenanceTrackName *string `type:"string"` + + // An array of UpdateTarget objects to update with the maintenance track. + UpdateTargets []*UpdateTarget `locationNameList:"UpdateTarget" type:"list"` +} + +// String returns the string representation +func (s MaintenanceTrack) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s MaintenanceTrack) GoString() string { + return s.String() +} + +// SetDatabaseVersion sets the DatabaseVersion field's value. +func (s *MaintenanceTrack) SetDatabaseVersion(v string) *MaintenanceTrack { + s.DatabaseVersion = &v + return s +} + +// SetMaintenanceTrackName sets the MaintenanceTrackName field's value. +func (s *MaintenanceTrack) SetMaintenanceTrackName(v string) *MaintenanceTrack { + s.MaintenanceTrackName = &v + return s +} + +// SetUpdateTargets sets the UpdateTargets field's value. +func (s *MaintenanceTrack) SetUpdateTargets(v []*UpdateTarget) *MaintenanceTrack { + s.UpdateTargets = v + return s +} + type ModifyClusterDbRevisionInput struct { _ struct{} `type:"structure"` @@ -14931,6 +15171,13 @@ type ModifyClusterInput struct { // the Amazon Redshift cluster can use to retrieve and store keys in an HSM. HsmConfigurationIdentifier *string `type:"string"` + // The name for the maintenance track that you want to assign for the cluster. + // This name change is asynchronous. The new track name stays in the PendingModifiedValues + // for the cluster until the next maintenance window. When the maintenance track + // changes, the cluster is switched to the latest cluster release available + // for the maintenance track. At this point, the maintenance track name is applied. + MaintenanceTrackName *string `type:"string"` + // The new password for the cluster master user. This 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 @@ -15118,6 +15365,12 @@ func (s *ModifyClusterInput) SetHsmConfigurationIdentifier(v string) *ModifyClus return s } +// SetMaintenanceTrackName sets the MaintenanceTrackName field's value. +func (s *ModifyClusterInput) SetMaintenanceTrackName(v string) *ModifyClusterInput { + s.MaintenanceTrackName = &v + return s +} + // SetMasterUserPassword sets the MasterUserPassword field's value. func (s *ModifyClusterInput) SetMasterUserPassword(v string) *ModifyClusterInput { s.MasterUserPassword = &v @@ -15733,6 +15986,10 @@ type PendingModifiedValues struct { // Default: false EnhancedVpcRouting *bool `type:"boolean"` + // The name of the maintenance track that the cluster will change to during + // the next maintenance window. + MaintenanceTrackName *string `type:"string"` + // The pending or in-progress change of the master user password for the cluster. MasterUserPassword *string `type:"string"` @@ -15787,6 +16044,12 @@ func (s *PendingModifiedValues) SetEnhancedVpcRouting(v bool) *PendingModifiedVa return s } +// SetMaintenanceTrackName sets the MaintenanceTrackName field's value. +func (s *PendingModifiedValues) SetMaintenanceTrackName(v string) *PendingModifiedValues { + s.MaintenanceTrackName = &v + return s +} + // SetMasterUserPassword sets the MasterUserPassword field's value. func (s *PendingModifiedValues) SetMasterUserPassword(v string) *PendingModifiedValues { s.MasterUserPassword = &v @@ -16398,6 +16661,15 @@ type RestoreFromClusterSnapshotInput struct { // snapshot. KmsKeyId *string `type:"string"` + // The name of the maintenance track for the restored cluster. When you take + // a snapshot, the snapshot inherits the MaintenanceTrack value from the cluster. + // The snapshot might be on a different track than the cluster that was the + // source for the snapshot. For example, suppose that you take a snapshot of + // a cluster that is on the current track and then change the cluster to be + // on the trailing track. In this case, the snapshot and the source cluster + // are on different tracks. + MaintenanceTrackName *string `type:"string"` + // The node type that the restored cluster will be provisioned with. // // Default: The node type of the cluster from which the snapshot was taken. @@ -16574,6 +16846,12 @@ func (s *RestoreFromClusterSnapshotInput) SetKmsKeyId(v string) *RestoreFromClus return s } +// SetMaintenanceTrackName sets the MaintenanceTrackName field's value. +func (s *RestoreFromClusterSnapshotInput) SetMaintenanceTrackName(v string) *RestoreFromClusterSnapshotInput { + s.MaintenanceTrackName = &v + return s +} + // SetNodeType sets the NodeType field's value. func (s *RestoreFromClusterSnapshotInput) SetNodeType(v string) *RestoreFromClusterSnapshotInput { s.NodeType = &v @@ -17222,6 +17500,9 @@ type Snapshot struct { // used to encrypt data in the cluster from which the snapshot was taken. KmsKeyId *string `type:"string"` + // The name of the maintenance track for the snapshot. + MaintenanceTrackName *string `type:"string"` + // The master user name for the cluster. MasterUsername *string `type:"string"` @@ -17380,6 +17661,12 @@ func (s *Snapshot) SetKmsKeyId(v string) *Snapshot { return s } +// SetMaintenanceTrackName sets the MaintenanceTrackName field's value. +func (s *Snapshot) SetMaintenanceTrackName(v string) *Snapshot { + s.MaintenanceTrackName = &v + return s +} + // SetMasterUsername sets the MasterUsername field's value. func (s *Snapshot) SetMasterUsername(v string) *Snapshot { s.MasterUsername = &v @@ -17823,6 +18110,39 @@ func (s *TaggedResource) SetTag(v *Tag) *TaggedResource { return s } +// A maintenance track that you can switch the current track to. +type UpdateTarget struct { + _ struct{} `type:"structure"` + + // The cluster version for the new maintenance track. + DatabaseVersion *string `type:"string"` + + // The name of the new maintenance track. + MaintenanceTrackName *string `type:"string"` +} + +// String returns the string representation +func (s UpdateTarget) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UpdateTarget) GoString() string { + return s.String() +} + +// SetDatabaseVersion sets the DatabaseVersion field's value. +func (s *UpdateTarget) SetDatabaseVersion(v string) *UpdateTarget { + s.DatabaseVersion = &v + return s +} + +// SetMaintenanceTrackName sets the MaintenanceTrackName field's value. +func (s *UpdateTarget) SetMaintenanceTrackName(v string) *UpdateTarget { + s.MaintenanceTrackName = &v + return s +} + // Describes the members of a VPC security group. type VpcSecurityGroupMembership struct { _ struct{} `type:"structure"` diff --git a/service/redshift/errors.go b/service/redshift/errors.go index 0cf4ad603b1..00fb70dae2f 100644 --- a/service/redshift/errors.go +++ b/service/redshift/errors.go @@ -294,6 +294,12 @@ const ( // The state of the subnet is invalid. ErrCodeInvalidClusterSubnetStateFault = "InvalidClusterSubnetStateFault" + // ErrCodeInvalidClusterTrackFault for service response error code + // "InvalidClusterTrack". + // + // The provided cluster track name is not valid. + ErrCodeInvalidClusterTrackFault = "InvalidClusterTrack" + // ErrCodeInvalidElasticIpFault for service response error code // "InvalidElasticIpFault". // diff --git a/service/redshift/redshiftiface/interface.go b/service/redshift/redshiftiface/interface.go index bbacb61faa0..999fd689e0e 100644 --- a/service/redshift/redshiftiface/interface.go +++ b/service/redshift/redshiftiface/interface.go @@ -195,6 +195,10 @@ type RedshiftAPI interface { DescribeClusterSubnetGroupsPages(*redshift.DescribeClusterSubnetGroupsInput, func(*redshift.DescribeClusterSubnetGroupsOutput, bool) bool) error DescribeClusterSubnetGroupsPagesWithContext(aws.Context, *redshift.DescribeClusterSubnetGroupsInput, func(*redshift.DescribeClusterSubnetGroupsOutput, bool) bool, ...request.Option) error + DescribeClusterTracks(*redshift.DescribeClusterTracksInput) (*redshift.DescribeClusterTracksOutput, error) + DescribeClusterTracksWithContext(aws.Context, *redshift.DescribeClusterTracksInput, ...request.Option) (*redshift.DescribeClusterTracksOutput, error) + DescribeClusterTracksRequest(*redshift.DescribeClusterTracksInput) (*request.Request, *redshift.DescribeClusterTracksOutput) + DescribeClusterVersions(*redshift.DescribeClusterVersionsInput) (*redshift.DescribeClusterVersionsOutput, error) DescribeClusterVersionsWithContext(aws.Context, *redshift.DescribeClusterVersionsInput, ...request.Option) (*redshift.DescribeClusterVersionsOutput, error) DescribeClusterVersionsRequest(*redshift.DescribeClusterVersionsInput) (*request.Request, *redshift.DescribeClusterVersionsOutput) diff --git a/service/ssm/api.go b/service/ssm/api.go index adbb5b2c175..e6cb90eb22b 100644 --- a/service/ssm/api.go +++ b/service/ssm/api.go @@ -6387,6 +6387,96 @@ func (c *SSM) GetPatchBaselineForPatchGroupWithContext(ctx aws.Context, input *G return out, req.Send() } +const opLabelParameterVersion = "LabelParameterVersion" + +// LabelParameterVersionRequest generates a "aws/request.Request" representing the +// client's request for the LabelParameterVersion operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See LabelParameterVersion for more information on using the LabelParameterVersion +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// +// // Example sending a request using the LabelParameterVersionRequest method. +// req, resp := client.LabelParameterVersionRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/LabelParameterVersion +func (c *SSM) LabelParameterVersionRequest(input *LabelParameterVersionInput) (req *request.Request, output *LabelParameterVersionOutput) { + op := &request.Operation{ + Name: opLabelParameterVersion, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &LabelParameterVersionInput{} + } + + output = &LabelParameterVersionOutput{} + req = c.newRequest(op, input, output) + return +} + +// LabelParameterVersion API operation for Amazon Simple Systems Manager (SSM). +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Simple Systems Manager (SSM)'s +// API operation LabelParameterVersion for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInternalServerError "InternalServerError" +// An error occurred on the server side. +// +// * ErrCodeTooManyUpdates "TooManyUpdates" +// There are concurrent updates for a resource that supports one update at a +// time. +// +// * ErrCodeParameterNotFound "ParameterNotFound" +// The parameter could not be found. Verify the name and try again. +// +// * ErrCodeParameterVersionNotFound "ParameterVersionNotFound" +// The specified parameter version was not found. Verify the parameter name +// and version, and try again. +// +// * ErrCodeParameterVersionLabelLimitExceeded "ParameterVersionLabelLimitExceeded" +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06/LabelParameterVersion +func (c *SSM) LabelParameterVersion(input *LabelParameterVersionInput) (*LabelParameterVersionOutput, error) { + req, out := c.LabelParameterVersionRequest(input) + return out, req.Send() +} + +// LabelParameterVersionWithContext is the same as LabelParameterVersion with the addition of +// the ability to pass a context and additional request options. +// +// See LabelParameterVersion for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *SSM) LabelParameterVersionWithContext(ctx aws.Context, input *LabelParameterVersionInput, opts ...request.Option) (*LabelParameterVersionOutput, error) { + req, out := c.LabelParameterVersionRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListAssociationVersions = "ListAssociationVersions" // ListAssociationVersionsRequest generates a "aws/request.Request" representing the @@ -22325,6 +22415,90 @@ func (s *InventoryResultItem) SetTypeName(v string) *InventoryResultItem { return s } +type LabelParameterVersionInput struct { + _ struct{} `type:"structure"` + + // Labels is a required field + Labels []*string `min:"1" type:"list" required:"true"` + + // Name is a required field + Name *string `min:"1" type:"string" required:"true"` + + ParameterVersion *int64 `type:"long"` +} + +// String returns the string representation +func (s LabelParameterVersionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s LabelParameterVersionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *LabelParameterVersionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "LabelParameterVersionInput"} + if s.Labels == nil { + invalidParams.Add(request.NewErrParamRequired("Labels")) + } + if s.Labels != nil && len(s.Labels) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Labels", 1)) + } + if s.Name == nil { + invalidParams.Add(request.NewErrParamRequired("Name")) + } + if s.Name != nil && len(*s.Name) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Name", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLabels sets the Labels field's value. +func (s *LabelParameterVersionInput) SetLabels(v []*string) *LabelParameterVersionInput { + s.Labels = v + return s +} + +// SetName sets the Name field's value. +func (s *LabelParameterVersionInput) SetName(v string) *LabelParameterVersionInput { + s.Name = &v + return s +} + +// SetParameterVersion sets the ParameterVersion field's value. +func (s *LabelParameterVersionInput) SetParameterVersion(v int64) *LabelParameterVersionInput { + s.ParameterVersion = &v + return s +} + +type LabelParameterVersionOutput struct { + _ struct{} `type:"structure"` + + InvalidLabels []*string `min:"1" type:"list"` +} + +// String returns the string representation +func (s LabelParameterVersionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s LabelParameterVersionOutput) GoString() string { + return s.String() +} + +// SetInvalidLabels sets the InvalidLabels field's value. +func (s *LabelParameterVersionOutput) SetInvalidLabels(v []*string) *LabelParameterVersionOutput { + s.InvalidLabels = v + return s +} + type ListAssociationVersionsInput struct { _ struct{} `type:"structure"` @@ -25011,9 +25185,28 @@ func (s *OutputSource) SetOutputSourceType(v string) *OutputSource { type Parameter struct { _ struct{} `type:"structure"` + // The Amazon Resource Name (ARN) of the parameter. + ARN *string `type:"string"` + + // Date the parameter was last changed or updated and the parameter version + // was created. + LastModifiedDate *time.Time `type:"timestamp"` + // The name of the parameter. Name *string `min:"1" type:"string"` + // Either the version number or the label used to retrieve the parameter value. + // Specify selectors by using one of the following formats: + // + // parameter_name:version + // + // parameter_name:label + Selector *string `type:"string"` + + // Applies to parameters that reference information in other AWS services. SourceResult + // is the raw result or response from the source. + SourceResult *string `type:"string"` + // The type of parameter. Valid values include the following: String, String // list, Secure string. Type *string `type:"string" enum:"ParameterType"` @@ -25035,12 +25228,36 @@ func (s Parameter) GoString() string { return s.String() } +// SetARN sets the ARN field's value. +func (s *Parameter) SetARN(v string) *Parameter { + s.ARN = &v + return s +} + +// SetLastModifiedDate sets the LastModifiedDate field's value. +func (s *Parameter) SetLastModifiedDate(v time.Time) *Parameter { + s.LastModifiedDate = &v + return s +} + // SetName sets the Name field's value. func (s *Parameter) SetName(v string) *Parameter { s.Name = &v return s } +// SetSelector sets the Selector field's value. +func (s *Parameter) SetSelector(v string) *Parameter { + s.Selector = &v + return s +} + +// SetSourceResult sets the SourceResult field's value. +func (s *Parameter) SetSourceResult(v string) *Parameter { + s.SourceResult = &v + return s +} + // SetType sets the Type field's value. func (s *Parameter) SetType(v string) *Parameter { s.Type = &v @@ -25074,6 +25291,9 @@ type ParameterHistory struct { // The ID of the query key used for this parameter. KeyId *string `min:"1" type:"string"` + // Labels assigned to the parameter version. + Labels []*string `min:"1" type:"list"` + // Date the parameter was last changed or updated. LastModifiedDate *time.Time `type:"timestamp"` @@ -25121,6 +25341,12 @@ func (s *ParameterHistory) SetKeyId(v string) *ParameterHistory { return s } +// SetLabels sets the Labels field's value. +func (s *ParameterHistory) SetLabels(v []*string) *ParameterHistory { + s.Labels = v + return s +} + // SetLastModifiedDate sets the LastModifiedDate field's value. func (s *ParameterHistory) SetLastModifiedDate(v time.Time) *ParameterHistory { s.LastModifiedDate = &v @@ -28745,21 +28971,19 @@ type StepExecution struct { // Fully-resolved values passed into the step before execution. Inputs map[string]*string `type:"map"` - // Enable this option to designate a step as critical for the successful completion - // of the Automation. If a step with this designation fails, then Automation - // reports the final status of the Automation as Failed. + // The flag which can be used to help decide whether the failure of current + // step leads to the Automation failure. IsCritical *bool `type:"boolean"` - // Enable this option to stop an Automation execution at the end of a specific - // step. The Automation execution stops if the step execution failed or succeeded. + // The flag which can be used to end automation no matter whether the step succeeds + // or fails. IsEnd *bool `type:"boolean"` // The maximum number of tries to run the action of the step. The default value // is 1. MaxAttempts *int64 `type:"integer"` - // Specifies which step in an Automation to process next after successfully - // completing a step. + // The next step after the step succeeds. NextStep *string `type:"string"` // The action to take if the step fails. The default value is Abort. @@ -28790,14 +29014,11 @@ type StepExecution struct { // The timeout seconds of the step. TimeoutSeconds *int64 `type:"long"` - // ValidNextSteps offer different strategies for managing an Automation workflow - // when a step finishes. Automation dynamically processes ValidNextSteps when - // a step is completed. For example, you can specify Abort to stop the Automation - // when a step fails or Continue to ignore the failure of the current step and - // allow Automation to continue processing the next step. You can also specify - // step:step_name to jump to a designated step after a step succeeds. The result - // of the current step dynamically determines the ValidNextSteps. If a step - // finishes and no ValidNextStep is designated, then the Automation stops. + // Strategies used when step fails, we support Continue and Abort. Abort will + // fail the automation when the step fails. Continue will ignore the failure + // of current step and allow automation to execute the next step. With conditional + // branching, we add step:stepName to support the automation to go to another + // specific step. ValidNextSteps []*string `type:"list"` } diff --git a/service/ssm/errors.go b/service/ssm/errors.go index b95f36009d1..4c7cf3e36fd 100644 --- a/service/ssm/errors.go +++ b/service/ssm/errors.go @@ -524,6 +524,10 @@ const ( // The parameter name is not valid. ErrCodeParameterPatternMismatchException = "ParameterPatternMismatchException" + // ErrCodeParameterVersionLabelLimitExceeded for service response error code + // "ParameterVersionLabelLimitExceeded". + ErrCodeParameterVersionLabelLimitExceeded = "ParameterVersionLabelLimitExceeded" + // ErrCodeParameterVersionNotFound for service response error code // "ParameterVersionNotFound". // diff --git a/service/ssm/ssmiface/interface.go b/service/ssm/ssmiface/interface.go index 2de5c580007..1c87b90cbee 100644 --- a/service/ssm/ssmiface/interface.go +++ b/service/ssm/ssmiface/interface.go @@ -343,6 +343,10 @@ type SSMAPI interface { GetPatchBaselineForPatchGroupWithContext(aws.Context, *ssm.GetPatchBaselineForPatchGroupInput, ...request.Option) (*ssm.GetPatchBaselineForPatchGroupOutput, error) GetPatchBaselineForPatchGroupRequest(*ssm.GetPatchBaselineForPatchGroupInput) (*request.Request, *ssm.GetPatchBaselineForPatchGroupOutput) + LabelParameterVersion(*ssm.LabelParameterVersionInput) (*ssm.LabelParameterVersionOutput, error) + LabelParameterVersionWithContext(aws.Context, *ssm.LabelParameterVersionInput, ...request.Option) (*ssm.LabelParameterVersionOutput, error) + LabelParameterVersionRequest(*ssm.LabelParameterVersionInput) (*request.Request, *ssm.LabelParameterVersionOutput) + ListAssociationVersions(*ssm.ListAssociationVersionsInput) (*ssm.ListAssociationVersionsOutput, error) ListAssociationVersionsWithContext(aws.Context, *ssm.ListAssociationVersionsInput, ...request.Option) (*ssm.ListAssociationVersionsOutput, error) ListAssociationVersionsRequest(*ssm.ListAssociationVersionsInput) (*request.Request, *ssm.ListAssociationVersionsOutput)