diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f6ef5a09b..5a0048e7cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +Release v1.38.29 (2021-04-29) +=== + +### Service Client Updates +* `service/chime`: Updates service API + * Increase AppInstanceUserId length to 64 characters +* `service/ecs`: Updates service API and documentation + * Add support for EphemeralStorage on TaskDefinition and TaskOverride +* `service/macie2`: Updates service API and documentation +* `service/organizations`: Updates service documentation + * Minor text updates for AWS Organizations API Reference + Release v1.38.28 (2021-04-28) === diff --git a/aws/version.go b/aws/version.go index ca051578b4..229c12a4d0 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.38.28" +const SDKVersion = "1.38.29" diff --git a/models/apis/chime/2018-05-01/api-2.json b/models/apis/chime/2018-05-01/api-2.json index d47c200d33..27456c0dc1 100644 --- a/models/apis/chime/2018-05-01/api-2.json +++ b/models/apis/chime/2018-05-01/api-2.json @@ -8994,9 +8994,9 @@ }, "UserId":{ "type":"string", - "max":50, + "max":64, "min":1, - "pattern":"[A-Za-z0-9][A-Za-z0-9\\:\\-\\_\\.\\@]{3,50}[A-Za-z0-9]", + "pattern":"[A-Za-z0-9]([A-Za-z0-9\\:\\-\\_\\.\\@]{0,62}[A-Za-z0-9])?", "sensitive":true }, "UserIdList":{ diff --git a/models/apis/ecs/2014-11-13/api-2.json b/models/apis/ecs/2014-11-13/api-2.json index 3632e7f899..0b2253df7a 100644 --- a/models/apis/ecs/2014-11-13/api-2.json +++ b/models/apis/ecs/2014-11-13/api-2.json @@ -1805,6 +1805,13 @@ "type":"list", "member":{"shape":"KeyValuePair"} }, + "EphemeralStorage":{ + "type":"structure", + "required":["sizeInGiB"], + "members":{ + "sizeInGiB":{"shape":"Integer"} + } + }, "ExecuteCommandConfiguration":{ "type":"structure", "members":{ @@ -2588,7 +2595,8 @@ "pidMode":{"shape":"PidMode"}, "ipcMode":{"shape":"IpcMode"}, "proxyConfiguration":{"shape":"ProxyConfiguration"}, - "inferenceAccelerators":{"shape":"InferenceAccelerators"} + "inferenceAccelerators":{"shape":"InferenceAccelerators"}, + "ephemeralStorage":{"shape":"EphemeralStorage"} } }, "RegisterTaskDefinitionResponse":{ @@ -3087,7 +3095,8 @@ "tags":{"shape":"Tags"}, "taskArn":{"shape":"String"}, "taskDefinitionArn":{"shape":"String"}, - "version":{"shape":"Long"} + "version":{"shape":"Long"}, + "ephemeralStorage":{"shape":"EphemeralStorage"} } }, "TaskDefinition":{ @@ -3114,7 +3123,8 @@ "proxyConfiguration":{"shape":"ProxyConfiguration"}, "registeredAt":{"shape":"Timestamp"}, "deregisteredAt":{"shape":"Timestamp"}, - "registeredBy":{"shape":"String"} + "registeredBy":{"shape":"String"}, + "ephemeralStorage":{"shape":"EphemeralStorage"} } }, "TaskDefinitionFamilyStatus":{ @@ -3171,7 +3181,8 @@ "inferenceAcceleratorOverrides":{"shape":"InferenceAcceleratorOverrides"}, "executionRoleArn":{"shape":"String"}, "memory":{"shape":"String"}, - "taskRoleArn":{"shape":"String"} + "taskRoleArn":{"shape":"String"}, + "ephemeralStorage":{"shape":"EphemeralStorage"} } }, "TaskSet":{ diff --git a/models/apis/ecs/2014-11-13/docs-2.json b/models/apis/ecs/2014-11-13/docs-2.json index a212b8b577..22a6983d98 100644 --- a/models/apis/ecs/2014-11-13/docs-2.json +++ b/models/apis/ecs/2014-11-13/docs-2.json @@ -49,7 +49,7 @@ "UpdateCapacityProvider": "

Modifies the parameters for a capacity provider.

", "UpdateCluster": "

Updates the cluster.

", "UpdateClusterSettings": "

Modifies the settings to use for a cluster.

", - "UpdateContainerAgent": "

Updates the Amazon ECS container agent on a specified container instance. Updating the Amazon ECS container agent does not interrupt running tasks or services on the container instance. The process for updating the agent differs depending on whether your container instance was launched with the Amazon ECS-optimized AMI or another operating system.

UpdateContainerAgent requires the Amazon ECS-optimized AMI or Amazon Linux with the ecs-init service installed and running. For help updating the Amazon ECS container agent on other operating systems, see Manually Updating the Amazon ECS Container Agent in the Amazon Elastic Container Service Developer Guide.

", + "UpdateContainerAgent": "

Updates the Amazon ECS container agent on a specified container instance. Updating the Amazon ECS container agent does not interrupt running tasks or services on the container instance. The process for updating the agent differs depending on whether your container instance was launched with the Amazon ECS-optimized AMI or another operating system.

The UpdateContainerAgent API isn't supported for container instances using the Amazon ECS-optimized Amazon Linux 2 (arm64) AMI. To update the container agent, you can update the ecs-init package which will update the agent. For more information, see Updating the Amazon ECS container agent in the Amazon Elastic Container Service Developer Guide.

The UpdateContainerAgent API requires an Amazon ECS-optimized AMI or Amazon Linux AMI with the ecs-init service installed and running. For help updating the Amazon ECS container agent on other operating systems, see Manually updating the Amazon ECS container agent in the Amazon Elastic Container Service Developer Guide.

", "UpdateContainerInstancesState": "

Modifies the status of an Amazon ECS container instance.

Once a container instance has reached an ACTIVE state, you can change the status of a container instance to DRAINING to manually remove an instance from a cluster, for example to perform system updates, update the Docker daemon, or scale down the cluster size.

A container instance cannot be changed to DRAINING until it has reached an ACTIVE status. If the instance is in any other status, an error will be received.

When you set a container instance to DRAINING, Amazon ECS prevents new tasks from being scheduled for placement on the container instance and replacement service tasks are started on other container instances in the cluster if the resources are available. Service tasks on the container instance that are in the PENDING state are stopped immediately.

Service tasks on the container instance that are in the RUNNING state are stopped and replaced according to the service's deployment configuration parameters, minimumHealthyPercent and maximumPercent. You can change the deployment configuration of your service using UpdateService.

Any PENDING or RUNNING tasks that do not belong to a service are not affected. You must wait for them to finish or stop them manually.

A container instance has completed draining when it has no more RUNNING tasks. You can verify this using ListTasks.

When a container instance has been drained, you can set a container instance to ACTIVE status and once it has reached that status the Amazon ECS scheduler can begin scheduling tasks on the instance again.

", "UpdateService": "

Updating the task placement strategies and constraints on an Amazon ECS service remains in preview and is a Beta Service as defined by and subject to the Beta Service Participation Service Terms located at https://aws.amazon.com/service-terms (\"Beta Terms\"). These Beta Terms apply to your participation in this preview.

Modifies the parameters of a service.

For services using the rolling update (ECS) deployment controller, the desired count, deployment configuration, network configuration, task placement constraints and strategies, or task definition used can be updated.

For services using the blue/green (CODE_DEPLOY) deployment controller, only the desired count, deployment configuration, task placement constraints and strategies, and health check grace period can be updated using this API. If the network configuration, platform version, or task definition need to be updated, a new AWS CodeDeploy deployment should be created. For more information, see CreateDeployment in the AWS CodeDeploy API Reference.

For services using an external deployment controller, you can update only the desired count, task placement constraints and strategies, and health check grace period using this API. If the launch type, load balancer, network configuration, platform version, or task definition need to be updated, you should create a new task set. For more information, see CreateTaskSet.

You can add to or subtract from the number of instantiations of a task definition in a service by specifying the cluster that the service is running in and a new desiredCount parameter.

If you have updated the Docker image of your application, you can create a new task definition with that image and deploy it to your service. The service scheduler uses the minimum healthy percent and maximum percent parameters (in the service's deployment configuration) to determine the deployment strategy.

If your updated Docker image uses the same tag as what is in the existing task definition for your service (for example, my_image:latest), you do not need to create a new revision of your task definition. You can update the service using the forceNewDeployment option. The new tasks launched by the deployment pull the current image/tag combination from your repository when they start.

You can also update the deployment configuration of a service. When a deployment is triggered by updating the task definition of a service, the service scheduler uses the deployment configuration parameters, minimumHealthyPercent and maximumPercent, to determine the deployment strategy.

When UpdateService stops a task during a deployment, the equivalent of docker stop is issued to the containers running in the task. This results in a SIGTERM and a 30-second timeout, after which SIGKILL is sent and the containers are forcibly stopped. If the container handles the SIGTERM gracefully and exits within 30 seconds from receiving it, no SIGKILL is sent.

When the service scheduler launches new tasks, it determines task placement in your cluster with the following logic:

When the service scheduler stops running tasks, it attempts to maintain balance across the Availability Zones in your cluster using the following logic:

", "UpdateServicePrimaryTaskSet": "

Modifies which task set in a service is the primary task set. Any parameters that are updated on the primary task set in a service will transition to the service. This is used when a service uses the EXTERNAL deployment controller type. For more information, see Amazon ECS Deployment Types in the Amazon Elastic Container Service Developer Guide.

", @@ -182,9 +182,9 @@ "base": null, "refs": { "ContainerDefinition$essential": "

If the essential parameter of a container is marked as true, and that container fails or stops for any reason, all other containers that are part of the task are stopped. If the essential parameter of a container is marked as false, then its failure does not affect the rest of the containers in a task. If this parameter is omitted, a container is assumed to be essential.

All tasks must have at least one essential container. If you have an application that is composed of multiple containers, you should group containers that are used for a common purpose into components, and separate the different components into multiple task definitions. For more information, see Application Architecture in the Amazon Elastic Container Service Developer Guide.

", - "ContainerDefinition$disableNetworking": "

When this parameter is true, networking is disabled within the container. This parameter maps to NetworkDisabled in the Create a container section of the Docker Remote API.

This parameter is not supported for Windows containers or tasks that use the awsvpc network mode.

", + "ContainerDefinition$disableNetworking": "

When this parameter is true, networking is disabled within the container. This parameter maps to NetworkDisabled in the Create a container section of the Docker Remote API.

This parameter is not supported for Windows containers.

", "ContainerDefinition$privileged": "

When this parameter is true, the container is given elevated privileges on the host container instance (similar to the root user). This parameter maps to Privileged in the Create a container section of the Docker Remote API and the --privileged option to docker run.

This parameter is not supported for Windows containers or tasks run on AWS Fargate.

", - "ContainerDefinition$readonlyRootFilesystem": "

When this parameter is true, the container is given read-only access to its root file system. This parameter maps to ReadonlyRootfs in the Create a container section of the Docker Remote API and the --read-only option to docker run.

This parameter is not supported for Windows containers or tasks that use the awsvpc network mode.

", + "ContainerDefinition$readonlyRootFilesystem": "

When this parameter is true, the container is given read-only access to its root file system. This parameter maps to ReadonlyRootfs in the Create a container section of the Docker Remote API and the --read-only option to docker run.

This parameter is not supported for Windows containers.

", "ContainerDefinition$interactive": "

When this parameter is true, this allows you to deploy containerized applications that require stdin or a tty to be allocated. This parameter maps to OpenStdin in the Create a container section of the Docker Remote API and the --interactive option to docker run.

", "ContainerDefinition$pseudoTerminal": "

When this parameter is true, a TTY is allocated. This parameter maps to Tty in the Create a container section of the Docker Remote API and the --tty option to docker run.

", "DeleteServiceRequest$force": "

If true, allows you to delete a service even if it has not been scaled down to zero tasks. It is only necessary to use this if the service is using the REPLICA scheduling strategy.

", @@ -248,8 +248,8 @@ "refs": { "CapacityProviders$member": null, "CreateCapacityProviderResponse$capacityProvider": "

The full description of the new capacity provider.

", - "DeleteCapacityProviderResponse$capacityProvider": null, - "UpdateCapacityProviderResponse$capacityProvider": null + "DeleteCapacityProviderResponse$capacityProvider": "

The details of the capacity provider.

", + "UpdateCapacityProviderResponse$capacityProvider": "

Details about the capacity provider.

" } }, "CapacityProviderField": { @@ -326,9 +326,9 @@ "Clusters$member": null, "CreateClusterResponse$cluster": "

The full description of your new cluster.

", "DeleteClusterResponse$cluster": "

The full description of the deleted cluster.

", - "PutClusterCapacityProvidersResponse$cluster": null, - "UpdateClusterResponse$cluster": null, - "UpdateClusterSettingsResponse$cluster": null + "PutClusterCapacityProvidersResponse$cluster": "

Details about the cluster.

", + "UpdateClusterResponse$cluster": "

Details about the cluster.

", + "UpdateClusterSettingsResponse$cluster": "

Details about the cluster

" } }, "ClusterConfiguration": { @@ -643,7 +643,7 @@ "DeploymentController": { "base": "

The deployment controller to use for the service. For more information, see Amazon ECS Deployment Types in the Amazon Elastic Container Service Developer Guide.

", "refs": { - "CreateServiceRequest$deploymentController": "

The deployment controller to use for the service.

", + "CreateServiceRequest$deploymentController": "

The deployment controller to use for the service. If no deployment controller is specified, the default value of ECS is used.

", "Service$deploymentController": "

The deployment controller type the service is using. When using the DescribeServices API, this field is omitted if the service is using the ECS deployment controller type.

" } }, @@ -864,6 +864,15 @@ "ContainerOverride$environment": "

The environment variables to send to the container. You can add new environment variables, which are added to the container at launch, or you can override the existing environment variables from the Docker image or the task definition. You must also specify a container name.

" } }, + "EphemeralStorage": { + "base": "

The amount of ephemeral storage to allocate for the task. This parameter is used to expand the total amount of ephemeral storage available, beyond the default amount, for tasks hosted on AWS Fargate. For more information, see Fargate task storage in the Amazon ECS User Guide for AWS Fargate.

This parameter is only supported for tasks hosted on AWS Fargate using platform version 1.4.0 or later.

", + "refs": { + "RegisterTaskDefinitionRequest$ephemeralStorage": "

The amount of ephemeral storage to allocate for the task. This parameter is used to expand the total amount of ephemeral storage available, beyond the default amount, for tasks hosted on AWS Fargate. For more information, see Fargate task storage in the Amazon ECS User Guide for AWS Fargate.

This parameter is only supported for tasks hosted on AWS Fargate using platform version 1.4.0 or later.

", + "Task$ephemeralStorage": "

The ephemeral storage settings for the task.

", + "TaskDefinition$ephemeralStorage": "

The ephemeral storage settings to use for tasks run with the task definition.

", + "TaskOverride$ephemeralStorage": "

The ephemeral storage setting override for the task.

This parameter is only supported for tasks hosted on AWS Fargate using platform version 1.4.0 or later.

" + } + }, "ExecuteCommandConfiguration": { "base": "

The details of the execute command configuration.

", "refs": { @@ -1019,6 +1028,7 @@ "Deployment$pendingCount": "

The number of tasks in the deployment that are in the PENDING status.

", "Deployment$runningCount": "

The number of tasks in the deployment that are in the RUNNING status.

", "Deployment$failedTasks": "

The number of consecutively failed tasks in the deployment. A task is considered a failure if the service scheduler can't launch the task, the task doesn't transition to a RUNNING state, or if it fails any of its defined health checks and is stopped.

Once a service deployment has one or more successfully running tasks, the failed task count resets to zero and stops being evaluated.

", + "EphemeralStorage$sizeInGiB": "

The total amount, in GiB, of ephemeral storage to set for the task. The minimum supported value is 21 GiB and the maximum supported value is 200 GiB.

", "ListAccountSettingsRequest$maxResults": "

The maximum number of account setting results returned by ListAccountSettings in paginated output. When this parameter is used, ListAccountSettings only returns maxResults results in a single page along with a nextToken response element. The remaining results of the initial request can be seen by sending another ListAccountSettings request with the returned nextToken value. This value can be between 1 and 10. If this parameter is not used, then ListAccountSettings returns up to 10 results and a nextToken value if applicable.

", "Resource$integerValue": "

When the integerValue type is set, the value of the resource must be an integer.

", "Service$desiredCount": "

The desired number of instantiations of the task definition to keep running on the service. This value is specified when the service is created with CreateService, and it can be modified with UpdateService.

", @@ -1251,7 +1261,7 @@ "base": "

The managed scaling settings for the Auto Scaling group capacity provider.

When managed scaling is enabled, Amazon ECS manages the scale-in and scale-out actions of the Auto Scaling group. Amazon ECS manages a target tracking scaling policy using an Amazon ECS-managed CloudWatch metric with the specified targetCapacity value as the target value for the metric. For more information, see Using Managed Scaling in the Amazon Elastic Container Service Developer Guide.

If managed scaling is disabled, the user must manage the scaling of the Auto Scaling group.

", "refs": { "AutoScalingGroupProvider$managedScaling": "

The managed scaling settings for the Auto Scaling group capacity provider.

", - "AutoScalingGroupProviderUpdate$managedScaling": null + "AutoScalingGroupProviderUpdate$managedScaling": "

The managed scaling settings for the Auto Scaling group capacity provider.

" } }, "ManagedScalingInstanceWarmupPeriod": { @@ -1321,13 +1331,13 @@ "base": "

An object representing the network configuration for a task or service.

", "refs": { "CreateServiceRequest$networkConfiguration": "

The network configuration for the service. This parameter is required for task definitions that use the awsvpc network mode to receive their own elastic network interface, and it is not supported for other network modes. For more information, see Task networking in the Amazon Elastic Container Service Developer Guide.

", - "CreateTaskSetRequest$networkConfiguration": null, + "CreateTaskSetRequest$networkConfiguration": "

An object representing the network configuration for a task set.

", "Deployment$networkConfiguration": "

The VPC subnet and security group configuration for tasks that receive their own elastic network interface by using the awsvpc networking mode.

", "RunTaskRequest$networkConfiguration": "

The network configuration for the task. This parameter is required for task definitions that use the awsvpc network mode to receive their own elastic network interface, and it is not supported for other network modes. For more information, see Task Networking in the Amazon Elastic Container Service Developer Guide.

", "Service$networkConfiguration": "

The VPC subnet and security group configuration for tasks that receive their own elastic network interface by using the awsvpc networking mode.

", "StartTaskRequest$networkConfiguration": "

The VPC subnet and security group configuration for tasks that receive their own elastic network interface by using the awsvpc networking mode.

", "TaskSet$networkConfiguration": "

The network configuration for the task set.

", - "UpdateServiceRequest$networkConfiguration": null + "UpdateServiceRequest$networkConfiguration": "

An object representing the network configuration for the service.

" } }, "NetworkInterface": { @@ -1432,7 +1442,7 @@ } }, "PortMapping": { - "base": "

Port mappings allow containers to access ports on the host container instance to send or receive traffic. Port mappings are specified as part of the container definition.

If you are using containers in a task with the awsvpc or host network mode, exposed ports should be specified using containerPort. The hostPort can be left blank or it must be the same value as the containerPort.

After a task reaches the RUNNING status, manual and automatic host and container port assignments are visible in the networkBindings section of DescribeTasks API responses.

", + "base": "

Port mappings allow containers to access ports on the host container instance to send or receive traffic. Port mappings are specified as part of the container definition.

If you are using containers in a task with the awsvpc or host network mode, exposed ports should be specified using containerPort. The hostPort can be left blank or it must be the same value as the containerPort.

You cannot expose the same container port for multiple protocols. An error will be returned if this is attempted

After a task reaches the RUNNING status, manual and automatic host and container port assignments are visible in the networkBindings section of DescribeTasks API responses.

", "refs": { "PortMappingList$member": null } @@ -1455,7 +1465,7 @@ "ProxyConfiguration": { "base": "

The configuration details for the App Mesh proxy.

For tasks using the EC2 launch type, the container instances require at least version 1.26.0 of the container agent and at least version 1.26.0-1 of the ecs-init package to enable a proxy configuration. If your container instances are launched from the Amazon ECS-optimized AMI version 20190301 or later, then they contain the required versions of the container agent and ecs-init. For more information, see Amazon ECS-optimized Linux AMI

", "refs": { - "RegisterTaskDefinitionRequest$proxyConfiguration": null, + "RegisterTaskDefinitionRequest$proxyConfiguration": "

The configuration details for the App Mesh proxy.

For tasks hosted on Amazon EC2 instances, the container instances require at least version 1.26.0 of the container agent and at least version 1.26.0-1 of the ecs-init package to enable a proxy configuration. If your container instances are launched from the Amazon ECS-optimized AMI version 20190301 or later, then they contain the required versions of the container agent and ecs-init. For more information, see Amazon ECS-optimized AMI versions in the Amazon Elastic Container Service Developer Guide.

", "TaskDefinition$proxyConfiguration": "

The configuration details for the App Mesh proxy.

Your Amazon ECS container instances require at least version 1.26.0 of the container agent and at least version 1.26.0-1 of the ecs-init package to enable a proxy configuration. If your container instances are launched from the Amazon ECS-optimized AMI version 20190301 or later, then they contain the required versions of the container agent and ecs-init. For more information, see Amazon ECS-optimized Linux AMI in the Amazon Elastic Container Service Developer Guide.

" } }, @@ -1599,9 +1609,9 @@ "Scale": { "base": "

A floating-point percentage of the desired number of tasks to place and keep running in the task set.

", "refs": { - "CreateTaskSetRequest$scale": null, + "CreateTaskSetRequest$scale": "

A floating-point percentage of the desired number of tasks to place and keep running in the task set.

", "TaskSet$scale": "

A floating-point percentage of the desired number of tasks to place and keep running in the task set.

", - "UpdateTaskSetRequest$scale": null + "UpdateTaskSetRequest$scale": "

A floating-point percentage of the desired number of tasks to place and keep running in the task set.

" } }, "ScaleUnit": { @@ -1694,7 +1704,7 @@ "ServiceRegistries": { "base": null, "refs": { - "CreateServiceRequest$serviceRegistries": "

The details of the service discovery registries to assign to this service. For more information, see Service discovery.

Service discovery is supported for Fargate tasks if you are using platform version v1.1.0 or later. For more information, see AWS Fargate platform versions.

", + "CreateServiceRequest$serviceRegistries": "

The details of the service discovery registry to associate with this service. For more information, see Service discovery.

Each service may be associated with one service registry. Multiple service registries per service isn't supported.

", "CreateTaskSetRequest$serviceRegistries": "

The details of the service discovery registries to assign to this task set. For more information, see Service Discovery.

", "Service$serviceRegistries": "

The details of the service discovery registries to assign to this service. For more information, see Service Discovery.

", "TaskSet$serviceRegistries": "

The details of the service discovery registries to assign to this task set. For more information, see Service discovery.

" @@ -1722,7 +1732,7 @@ "base": "

The current account setting for a resource.

", "refs": { "DeleteAccountSettingResponse$setting": "

The account setting for the specified principal ARN.

", - "PutAccountSettingDefaultResponse$setting": null, + "PutAccountSettingDefaultResponse$setting": "

The current setting for a resource.

", "PutAccountSettingResponse$setting": "

The current account setting for a resource.

", "Settings$member": null } @@ -1817,7 +1827,7 @@ "ContainerDefinition$name": "

The name of a container. If you are linking multiple containers together in a task definition, the name of one container can be entered in the links of another container to connect the containers. Up to 255 letters (uppercase and lowercase), numbers, and hyphens are allowed. This parameter maps to name in the Create a container section of the Docker Remote API and the --name option to docker run.

", "ContainerDefinition$image": "

The image used to start a container. This string is passed directly to the Docker daemon. Images in the Docker Hub registry are available by default. Other repositories are specified with either repository-url/image:tag or repository-url/image@digest . Up to 255 letters (uppercase and lowercase), numbers, hyphens, underscores, colons, periods, forward slashes, and number signs are allowed. This parameter maps to Image in the Create a container section of the Docker Remote API and the IMAGE parameter of docker run.

", "ContainerDefinition$hostname": "

The hostname to use for your container. This parameter maps to Hostname in the Create a container section of the Docker Remote API and the --hostname option to docker run.

The hostname parameter is not supported if you are using the awsvpc network mode.

", - "ContainerDefinition$user": "

The user to use inside the container. This parameter maps to User in the Create a container section of the Docker Remote API and the --user option to docker run.

When running tasks using the host network mode, you should not run containers using the root user (UID 0). It is considered best practice to use a non-root user.

You can specify the user using the following formats. If specifying a UID or GID, you must specify it as a positive integer.

This parameter is not supported for Windows containers or tasks that use the awsvpc network mode.

", + "ContainerDefinition$user": "

The user to use inside the container. This parameter maps to User in the Create a container section of the Docker Remote API and the --user option to docker run.

When running tasks using the host network mode, you should not run containers using the root user (UID 0). It is considered best practice to use a non-root user.

You can specify the user using the following formats. If specifying a UID or GID, you must specify it as a positive integer.

This parameter is not supported for Windows containers.

", "ContainerDefinition$workingDirectory": "

The working directory in which to run commands inside the container. This parameter maps to WorkingDir in the Create a container section of the Docker Remote API and the --workdir option to docker run.

", "ContainerDependency$containerName": "

The name of a container.

", "ContainerInstance$containerInstanceArn": "

The Amazon Resource Name (ARN) of the container instance. The ARN contains the arn:aws:ecs namespace, followed by the Region of the container instance, the AWS account ID of the container instance owner, the container-instance namespace, and then the container instance ID. For example, arn:aws:ecs:region:aws_account_id:container-instance/container_instance_ID.

", @@ -1915,7 +1925,7 @@ "KeyValuePair$name": "

The name of the key-value pair. For environment variables, this is the name of the environment variable.

", "KeyValuePair$value": "

The value of the key-value pair. For environment variables, this is the value of the environment variable.

", "ListAccountSettingsRequest$value": "

The value of the account settings with which to filter results. You must also specify an account setting name to use this parameter.

", - "ListAccountSettingsRequest$principalArn": "

The ARN of the principal, which can be an IAM user, IAM role, or the root user. If this field is omitted, the account settings are listed only for the authenticated user.

", + "ListAccountSettingsRequest$principalArn": "

The ARN of the principal, which can be an IAM user, IAM role, or the root user. If this field is omitted, the account settings are listed only for the authenticated user.

Federated users assume the account setting of the root user and can't have explicit account settings set for them.

", "ListAccountSettingsRequest$nextToken": "

The nextToken value returned from a ListAccountSettings request indicating that more results are available to fulfill the request and further calls will be needed. If maxResults was provided, it is possible the number of results to be fewer than maxResults.

This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.

", "ListAccountSettingsResponse$nextToken": "

The nextToken value to include in a future ListAccountSettings request. When the results of a ListAccountSettings 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.

", "ListAttributesRequest$cluster": "

The short name or full Amazon Resource Name (ARN) of the cluster to list attributes. If you do not specify a cluster, the default cluster is assumed.

", @@ -1968,7 +1978,7 @@ "ProxyConfiguration$containerName": "

The name of the container that will serve as the App Mesh proxy.

", "PutAccountSettingDefaultRequest$value": "

The account setting value for the specified principal ARN. Accepted values are enabled and disabled.

", "PutAccountSettingRequest$value": "

The account setting value for the specified principal ARN. Accepted values are enabled and disabled.

", - "PutAccountSettingRequest$principalArn": "

The ARN of the principal, which can be an IAM user, IAM role, or the root user. If you specify the root user, it modifies the account setting for all IAM users, IAM roles, and the root user of the account unless an IAM user or role explicitly overrides these settings. If this field is omitted, the setting is changed only for the authenticated user.

", + "PutAccountSettingRequest$principalArn": "

The ARN of the principal, which can be an IAM user, IAM role, or the root user. If you specify the root user, it modifies the account setting for all IAM users, IAM roles, and the root user of the account unless an IAM user or role explicitly overrides these settings. If this field is omitted, the setting is changed only for the authenticated user.

Federated users assume the account setting of the root user and can't have explicit account settings set for them.

", "PutAttributesRequest$cluster": "

The short name or full Amazon Resource Name (ARN) of the cluster that contains the resource to apply attributes. If you do not specify a cluster, the default cluster is assumed.

", "PutClusterCapacityProvidersRequest$cluster": "

The short name or full Amazon Resource Name (ARN) of the cluster to modify the capacity provider settings for. If you do not specify a cluster, the default cluster is assumed.

", "RegisterContainerInstanceRequest$cluster": "

The short name or full Amazon Resource Name (ARN) of the cluster with which to register your container instance. If you do not specify a cluster, the default cluster is assumed.

", @@ -2103,11 +2113,11 @@ "AwsVpcConfiguration$subnets": "

The IDs of the subnets associated with the task or service. There is a limit of 16 subnets that can be specified per AwsVpcConfiguration.

All specified subnets must be from the same VPC.

", "AwsVpcConfiguration$securityGroups": "

The IDs of the security groups associated with the task or service. If you do not specify a security group, the default security group for the VPC is used. There is a limit of 5 security groups that can be specified per AwsVpcConfiguration.

All specified security groups must be from the same VPC.

", "Cluster$capacityProviders": "

The capacity providers associated with the cluster.

", - "ContainerDefinition$links": "

The links parameter allows containers to communicate with each other without the need for port mappings. This parameter is only supported if the network mode of a task definition is bridge. The name:internalName construct is analogous to name:alias in Docker links. Up to 255 letters (uppercase and lowercase), numbers, and hyphens are allowed. For more information about linking Docker containers, go to Legacy container links in the Docker documentation. This parameter maps to Links in the Create a container section of the Docker Remote API and the --link option to docker run.

This parameter is not supported for Windows containers or tasks that use the awsvpc network mode.

Containers that are collocated on a single container instance may be able to communicate with each other without requiring links or host port mappings. Network isolation is achieved on the container instance using security groups and VPC settings.

", + "ContainerDefinition$links": "

The links parameter allows containers to communicate with each other without the need for port mappings. This parameter is only supported if the network mode of a task definition is bridge. The name:internalName construct is analogous to name:alias in Docker links. Up to 255 letters (uppercase and lowercase), numbers, and hyphens are allowed. For more information about linking Docker containers, go to Legacy container links in the Docker documentation. This parameter maps to Links in the Create a container section of the Docker Remote API and the --link option to docker run.

This parameter is not supported for Windows containers.

Containers that are collocated on a single container instance may be able to communicate with each other without requiring links or host port mappings. Network isolation is achieved on the container instance using security groups and VPC settings.

", "ContainerDefinition$entryPoint": "

Early versions of the Amazon ECS container agent do not properly handle entryPoint parameters. If you have problems using entryPoint, update your container agent or enter your commands and arguments as command array items instead.

The entry point that is passed to the container. This parameter maps to Entrypoint in the Create a container section of the Docker Remote API and the --entrypoint option to docker run. For more information, see https://docs.docker.com/engine/reference/builder/#entrypoint.

", "ContainerDefinition$command": "

The command that is passed to the container. This parameter maps to Cmd in the Create a container section of the Docker Remote API and the COMMAND parameter to docker run. For more information, see https://docs.docker.com/engine/reference/builder/#cmd. If there are multiple arguments, each argument should be a separated string in the array.

", - "ContainerDefinition$dnsServers": "

A list of DNS servers that are presented to the container. This parameter maps to Dns in the Create a container section of the Docker Remote API and the --dns option to docker run.

This parameter is not supported for Windows containers or tasks that use the awsvpc network mode.

", - "ContainerDefinition$dnsSearchDomains": "

A list of DNS search domains that are presented to the container. This parameter maps to DnsSearch in the Create a container section of the Docker Remote API and the --dns-search option to docker run.

This parameter is not supported for Windows containers or tasks that use the awsvpc network mode.

", + "ContainerDefinition$dnsServers": "

A list of DNS servers that are presented to the container. This parameter maps to Dns in the Create a container section of the Docker Remote API and the --dns option to docker run.

This parameter is not supported for Windows containers.

", + "ContainerDefinition$dnsSearchDomains": "

A list of DNS search domains that are presented to the container. This parameter maps to DnsSearch in the Create a container section of the Docker Remote API and the --dns-search option to docker run.

This parameter is not supported for Windows containers.

", "ContainerDefinition$dockerSecurityOptions": "

A list of strings to provide custom labels for SELinux and AppArmor multi-level security systems. This field is not valid for containers in tasks using the Fargate launch type.

With Windows containers, this parameter can be used to reference a credential spec file when configuring a container for Active Directory authentication. For more information, see Using gMSAs for Windows Containers in the Amazon Elastic Container Service Developer Guide.

This parameter maps to SecurityOpt in the Create a container section of the Docker Remote API and the --security-opt option to docker run.

The Amazon ECS container agent running on a container instance must register with the ECS_SELINUX_CAPABLE=true or ECS_APPARMOR_CAPABLE=true environment variables before containers placed on that instance can use these security options. For more information, see Amazon ECS Container Agent Configuration in the Amazon Elastic Container Service Developer Guide.

For more information about valid values, see Docker Run Security Configuration.

Valid values: \"no-new-privileges\" | \"apparmor:PROFILE\" | \"label:value\" | \"credentialspec:CredentialSpecFilePath\"

", "ContainerOverride$command": "

The command to send to the container that overrides the default command from the Docker image or the task definition. You must also specify a container name.

", "CreateClusterRequest$capacityProviders": "

The short name of one or more capacity providers to associate with the cluster. A capacity provider must be associated with a cluster before it can be included as part of the default capacity provider strategy of the cluster or used in a capacity provider strategy when calling the CreateService or RunTask actions.

If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must already be created and not already associated with another cluster. New Auto Scaling group capacity providers can be created with the CreateCapacityProvider API operation.

To use a AWS Fargate capacity provider, specify either the FARGATE or FARGATE_SPOT capacity providers. The AWS Fargate capacity providers are available to all accounts and only need to be associated with a cluster to be used.

The PutClusterCapacityProviders API operation is used to update the list of available capacity providers for a cluster after the cluster is created.

", @@ -2339,11 +2349,11 @@ "TaskSet": { "base": "

Information about a set of Amazon ECS tasks in either an AWS CodeDeploy or an EXTERNAL deployment. An Amazon ECS task set includes details such as the desired number of tasks, how many tasks are running, and whether the task set serves production traffic.

", "refs": { - "CreateTaskSetResponse$taskSet": null, - "DeleteTaskSetResponse$taskSet": null, + "CreateTaskSetResponse$taskSet": "

Information about a set of Amazon ECS tasks in either an AWS CodeDeploy or an EXTERNAL deployment. A task set includes details such as the desired number of tasks, how many tasks are running, and whether the task set serves production traffic.

", + "DeleteTaskSetResponse$taskSet": "

Details about the task set.

", "TaskSets$member": null, - "UpdateServicePrimaryTaskSetResponse$taskSet": null, - "UpdateTaskSetResponse$taskSet": null + "UpdateServicePrimaryTaskSetResponse$taskSet": "

Details about the task set.

", + "UpdateTaskSetResponse$taskSet": "

Details about the task set.

" } }, "TaskSetField": { @@ -2431,7 +2441,7 @@ } }, "Ulimit": { - "base": "

The ulimit settings to pass to the container.

", + "base": "

The ulimit settings to pass to the container.

Amazon ECS tasks hosted on Fargate use the default resource limit values set by the operating system with the exception of the nofile resource limit parameter which Fargate overrides. The nofile resource limit sets a restriction on the number of open files that a container can use. The default nofile soft limit is 1024 and hard limit is 4096.

", "refs": { "UlimitList$member": null } @@ -2439,7 +2449,7 @@ "UlimitList": { "base": null, "refs": { - "ContainerDefinition$ulimits": "

A list of ulimits to set in the container. If a ulimit value is specified in a task definition, it will override the default values set by Docker. This parameter maps to Ulimits in the Create a container section of the Docker Remote API and the --ulimit option to docker run. Valid naming values are displayed in the Ulimit data type. This parameter requires version 1.18 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: sudo docker version --format '{{.Server.APIVersion}}'

This parameter is not supported for Windows containers or tasks that use the awsvpc network mode.

" + "ContainerDefinition$ulimits": "

A list of ulimits to set in the container. If a ulimit value is specified in a task definition, it will override the default values set by Docker. This parameter maps to Ulimits in the Create a container section of the Docker Remote API and the --ulimit option to docker run. Valid naming values are displayed in the Ulimit data type.

Amazon ECS tasks hosted on Fargate use the default resource limit values set by the operating system with the exception of the nofile resource limit parameter which Fargate overrides. The nofile resource limit sets a restriction on the number of open files that a container can use. The default nofile soft limit is 1024 and hard limit is 4096.

This parameter requires version 1.18 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: sudo docker version --format '{{.Server.APIVersion}}'

This parameter is not supported for Windows containers.

" } }, "UlimitName": { diff --git a/models/apis/macie2/2020-01-01/api-2.json b/models/apis/macie2/2020-01-01/api-2.json index b2b7c8170b..9bd6b89533 100644 --- a/models/apis/macie2/2020-01-01/api-2.json +++ b/models/apis/macie2/2020-01-01/api-2.json @@ -2078,6 +2078,14 @@ "DISABLING_IN_PROGRESS" ] }, + "AllowsUnencryptedObjectUploads": { + "type": "string", + "enum": [ + "TRUE", + "FALSE", + "UNKNOWN" + ] + }, "ApiCallDetails": { "type": "structure", "members": { @@ -2253,6 +2261,10 @@ "unencrypted": { "shape": "__long", "locationName": "unencrypted" + }, + "unknown": { + "shape": "__long", + "locationName": "unknown" } } }, @@ -2277,6 +2289,23 @@ } } }, + "BucketCountPolicyAllowsUnencryptedObjectUploads": { + "type": "structure", + "members": { + "allowsUnencryptedObjectUploads": { + "shape": "__long", + "locationName": "allowsUnencryptedObjectUploads" + }, + "deniesUnencryptedObjectUploads": { + "shape": "__long", + "locationName": "deniesUnencryptedObjectUploads" + }, + "unknown": { + "shape": "__long", + "locationName": "unknown" + } + } + }, "BucketCriteria": { "type": "map", "key": { @@ -2343,6 +2372,10 @@ "shape": "__string", "locationName": "accountId" }, + "allowsUnencryptedObjectUploads": { + "shape": "AllowsUnencryptedObjectUploads", + "locationName": "allowsUnencryptedObjectUploads" + }, "bucketArn": { "shape": "__string", "locationName": "bucketArn" @@ -3624,6 +3657,10 @@ "shape": "BucketCountByEncryptionType", "locationName": "bucketCountByEncryptionType" }, + "bucketCountByObjectEncryptionRequirement": { + "shape": "BucketCountPolicyAllowsUnencryptedObjectUploads", + "locationName": "bucketCountByObjectEncryptionRequirement" + }, "bucketCountBySharedAccessType": { "shape": "BucketCountBySharedAccessType", "locationName": "bucketCountBySharedAccessType" @@ -4743,6 +4780,10 @@ "unencrypted": { "shape": "__long", "locationName": "unencrypted" + }, + "unknown": { + "shape": "__long", + "locationName": "unknown" } } }, @@ -4973,6 +5014,10 @@ "S3Bucket": { "type": "structure", "members": { + "allowsUnencryptedObjectUploads": { + "shape": "AllowsUnencryptedObjectUploads", + "locationName": "allowsUnencryptedObjectUploads" + }, "arn": { "shape": "__string", "locationName": "arn" diff --git a/models/apis/macie2/2020-01-01/docs-2.json b/models/apis/macie2/2020-01-01/docs-2.json index 543b453433..5a3ce5fcce 100644 --- a/models/apis/macie2/2020-01-01/docs-2.json +++ b/models/apis/macie2/2020-01-01/docs-2.json @@ -97,6 +97,13 @@ "AdminAccount$Status" : "

The current status of the account as the delegated administrator of Amazon Macie for the organization.

" } }, + "AllowsUnencryptedObjectUploads" : { + "base" : null, + "refs" : { + "BucketMetadata$AllowsUnencryptedObjectUploads" : "

Specifies whether the bucket policy for the bucket requires server-side encryption of objects when objects are uploaded to the bucket. Possible values are:

", + "S3Bucket$AllowsUnencryptedObjectUploads" : "

Specifies whether the bucket policy for the bucket requires server-side encryption of objects when objects are uploaded to the bucket. Possible values are:

" + } + }, "ApiCallDetails" : { "base" : "

Provides information about an API operation that an entity invoked for an affected resource.

", "refs" : { @@ -149,15 +156,21 @@ } }, "BucketCountByEncryptionType" : { - "base" : "

Provides information about the number of S3 buckets that use certain types of server-side encryption by default or don't encrypt new objects by default.

", + "base" : "

Provides information about the number of S3 buckets that use certain types of server-side encryption by default or don't encrypt new objects by default. For detailed information about these settings, see Setting default server-side encryption behavior for Amazon S3 buckets in the Amazon Simple Storage Service User Guide.

", "refs" : { - "GetBucketStatisticsResponse$BucketCountByEncryptionType" : "

The total number of buckets, grouped by default server-side encryption type. This object also reports the total number of buckets that don't encrypt new objects by default.

" + "GetBucketStatisticsResponse$BucketCountByEncryptionType" : "

The total number of buckets that use certain types of server-side encryption to encrypt new objects by default. This object also reports the total number of buckets that don't encrypt new objects by default.

" } }, "BucketCountBySharedAccessType" : { - "base" : "

Provides information about the number of S3 buckets that are shared with other AWS accounts.

", + "base" : "

Provides information about the number of S3 buckets that are and aren't shared with other AWS accounts.

", + "refs" : { + "GetBucketStatisticsResponse$BucketCountBySharedAccessType" : "

The total number of buckets that are and aren't shared with another AWS account.

" + } + }, + "BucketCountPolicyAllowsUnencryptedObjectUploads" : { + "base" : "

Provides information about the number of S3 buckets whose bucket policies do and don't require server-side encryption of objects when objects are uploaded to the buckets.

", "refs" : { - "GetBucketStatisticsResponse$BucketCountBySharedAccessType" : "

The total number of buckets that are shared with another AWS account.

" + "GetBucketStatisticsResponse$BucketCountByObjectEncryptionRequirement" : "

The total number of buckets whose bucket policies do and don't require server-side encryption of objects when objects are uploaded to the buckets.

" } }, "BucketCriteria" : { @@ -187,11 +200,11 @@ "BucketPermissionConfiguration" : { "base" : "

Provides information about the account-level and bucket-level permissions settings for an S3 bucket.

", "refs" : { - "BucketPublicAccess$PermissionConfiguration" : "

The account-level and bucket-level permissions for the bucket.

" + "BucketPublicAccess$PermissionConfiguration" : "

The account-level and bucket-level permissions settings for the bucket.

" } }, "BucketPolicy" : { - "base" : "

Provides information about the permissions settings of a bucket policy for an S3 bucket.

", + "base" : "

Provides information about the permissions settings of the bucket policy for an S3 bucket.

", "refs" : { "BucketLevelPermissions$BucketPolicy" : "

The permissions settings of the bucket policy for the bucket. This value is null if a bucket policy hasn't been defined for the bucket.

" } @@ -974,7 +987,7 @@ "S3BucketOwner" : { "base" : "

Provides information about the user who owns an S3 bucket.

", "refs" : { - "S3Bucket$Owner" : "

The display name and account identifier for the user who owns the bucket.

" + "S3Bucket$Owner" : "

The display name and AWS account ID for the user who owns the bucket.

" } }, "S3Destination" : { @@ -1512,7 +1525,7 @@ "BucketCriteriaAdditionalProperties$Neq" : "

The value for the property doesn't match (doesn't equal) the specified value. If you specify multiple values, Amazon Macie uses OR logic to join the values.

", "CreateClassificationJobRequest$CustomDataIdentifierIds" : "

The custom data identifiers to use for data analysis and classification.

", "CreateCustomDataIdentifierRequest$IgnoreWords" : "

An array that lists specific character sequences (ignore words) to exclude from the results. If the text matched by the regular expression is the same as any string in this array, Amazon Macie ignores it. The array can contain as many as 10 ignore words. Each ignore word can contain 4 - 90 characters. Ignore words are case sensitive.

", - "CreateCustomDataIdentifierRequest$Keywords" : "

An array that lists specific character sequences (keywords), one of which must be within proximity (maximumMatchDistance) of the regular expression to match. The array can contain as many as 50 keywords. Each keyword can contain 4 - 90 characters. Keywords aren't case sensitive.

", + "CreateCustomDataIdentifierRequest$Keywords" : "

An array that lists specific character sequences (keywords), one of which must be within proximity (maximumMatchDistance) of the regular expression to match. The array can contain as many as 50 keywords. Each keyword can contain 3 - 90 characters. Keywords aren't case sensitive.

", "CreateInvitationsRequest$AccountIds" : "

An array that lists AWS account IDs, one for each account to send the invitation to.

", "CriterionAdditionalProperties$Eq" : "

The value for the property matches (equals) the specified value. If you specify multiple values, Macie uses OR logic to join the values.

", "CriterionAdditionalProperties$EqExactMatch" : "

The value for the property exclusively matches (equals an exact match for) all the specified values. If you specify multiple values, Amazon Macie uses AND logic to join the values.

You can use this operator with the following properties: customDataIdentifiers.detections.arn, customDataIdentifiers.detections.name, resourcesAffected.s3Bucket.tags.key, resourcesAffected.s3Bucket.tags.value, resourcesAffected.s3Object.tags.key, resourcesAffected.s3Object.tags.value, sensitiveData.category, and sensitiveData.detections.type.

", @@ -1529,7 +1542,7 @@ "S3BucketDefinitionForJob$Buckets" : "

An array that lists the names of the buckets.

", "SimpleScopeTerm$Values" : "

An array that lists the values to use in the condition. If the value for the key property is OBJECT_EXTENSION or OBJECT_KEY, this array can specify multiple values and Amazon Macie uses an OR operator to join the values. Otherwise, this array can specify only one value.

Valid values for each supported property (key) are:

Macie doesn't support use of wildcard characters in values. Also, string values are case sensitive.

", "TestCustomDataIdentifierRequest$IgnoreWords" : "

An array that lists specific character sequences (ignore words) to exclude from the results. If the text matched by the regular expression is the same as any string in this array, Amazon Macie ignores it. The array can contain as many as 10 ignore words. Each ignore word can contain 4 - 90 characters. Ignore words are case sensitive.

", - "TestCustomDataIdentifierRequest$Keywords" : "

An array that lists specific character sequences (keywords), one of which must be within proximity (maximumMatchDistance) of the regular expression to match. The array can contain as many as 50 keywords. Each keyword can contain 4 - 90 characters. Keywords aren't case sensitive.

", + "TestCustomDataIdentifierRequest$Keywords" : "

An array that lists specific character sequences (keywords), one of which must be within proximity (maximumMatchDistance) of the regular expression to match. The array can contain as many as 50 keywords. Each keyword can contain 3 - 90 characters. Keywords aren't case sensitive.

", "UsageStatisticsFilter$Values" : "

An array that lists values to use in the condition, based on the value for the field specified by the key property. If the value for the key property is accountId, this array can specify multiple values. Otherwise, this array can specify only one value.

Valid values for each supported field are:

" } }, @@ -1540,13 +1553,17 @@ "BucketCountByEffectivePermission$PubliclyReadable" : "

The total number of buckets that allow the general public to have read access to the bucket.

", "BucketCountByEffectivePermission$PubliclyWritable" : "

The total number of buckets that allow the general public to have write access to the bucket.

", "BucketCountByEffectivePermission$Unknown" : "

The total number of buckets that Amazon Macie wasn't able to evaluate permissions settings for. Macie can't determine whether these buckets are publicly accessible.

", - "BucketCountByEncryptionType$KmsManaged" : "

The total number of buckets that use an AWS Key Management Service (AWS KMS) customer master key (CMK) to encrypt new objects by default. These buckets use AWS managed AWS KMS encryption (AWS-KMS) or customer managed AWS KMS encryption (SSE-KMS).

", - "BucketCountByEncryptionType$S3Managed" : "

The total number of buckets that use an Amazon S3 managed key to encrypt new objects by default. These buckets use Amazon S3 managed encryption (SSE-S3).

", + "BucketCountByEncryptionType$KmsManaged" : "

The total number of buckets that use an AWS Key Management Service (AWS KMS) customer master key (CMK) to encrypt new objects by default. These buckets use AWS managed AWS KMS encryption (AWS-KMS) or customer managed AWS KMS encryption (SSE-KMS) by default.

", + "BucketCountByEncryptionType$S3Managed" : "

The total number of buckets that use an Amazon S3 managed key to encrypt new objects by default. These buckets use Amazon S3 managed encryption (SSE-S3) by default.

", "BucketCountByEncryptionType$Unencrypted" : "

The total number of buckets that don't encrypt new objects by default. Default encryption is disabled for these buckets.

", + "BucketCountByEncryptionType$Unknown" : "

The total number of buckets that Amazon Macie doesn't have current encryption metadata for. Macie can't provide current data about the default encryption settings for these buckets.

", "BucketCountBySharedAccessType$External" : "

The total number of buckets that are shared with an AWS account that isn't part of the same Amazon Macie organization.

", "BucketCountBySharedAccessType$Internal" : "

The total number of buckets that are shared with an AWS account that's part of the same Amazon Macie organization.

", "BucketCountBySharedAccessType$NotShared" : "

The total number of buckets that aren't shared with other AWS accounts.

", "BucketCountBySharedAccessType$Unknown" : "

The total number of buckets that Amazon Macie wasn't able to evaluate shared access settings for. Macie can't determine whether these buckets are shared with other AWS accounts.

", + "BucketCountPolicyAllowsUnencryptedObjectUploads$AllowsUnencryptedObjectUploads" : "

The total number of buckets that don't have a bucket policy or have a bucket policy that doesn't require server-side encryption of new objects. If a bucket policy exists, the policy doesn't require PutObject requests to include the x-amz-server-side-encryption header and it doesn't require the value for that header to be AES256 or aws:kms.

", + "BucketCountPolicyAllowsUnencryptedObjectUploads$DeniesUnencryptedObjectUploads" : "

The total number of buckets whose bucket policies require server-side encryption of new objects. PutObject requests for these buckets must include the x-amz-server-side-encryption header and the value for that header must be AES256 or aws:kms.

", + "BucketCountPolicyAllowsUnencryptedObjectUploads$Unknown" : "

The total number of buckets that Amazon Macie wasn't able to evaluate server-side encryption requirements for. Macie can't determine whether the bucket policies for these buckets require server-side encryption of new objects.

", "BucketCriteriaAdditionalProperties$Gt" : "

The value for the property is greater than the specified value.

", "BucketCriteriaAdditionalProperties$Gte" : "

The value for the property is greater than or equal to the specified value.

", "BucketCriteriaAdditionalProperties$Lt" : "

The value for the property is less than the specified value.

", @@ -1579,6 +1596,7 @@ "ObjectCountByEncryptionType$KmsManaged" : "

The total number of objects that are encrypted using an AWS Key Management Service (AWS KMS) customer master key (CMK). The objects use AWS managed AWS KMS encryption (AWS-KMS) or customer managed AWS KMS encryption (SSE-KMS).

", "ObjectCountByEncryptionType$S3Managed" : "

The total number of objects that are encrypted using an Amazon S3 managed key. The objects use Amazon S3 managed encryption (SSE-S3).

", "ObjectCountByEncryptionType$Unencrypted" : "

The total number of objects that aren't encrypted or use client-side encryption.

", + "ObjectCountByEncryptionType$Unknown" : "

The total number of objects that Amazon Macie doesn't have current encryption metadata for. Macie can't provide current data about the encryption settings for these objects.

", "ObjectLevelStatistics$FileType" : "

The total storage size (in bytes) or number of objects that Amazon Macie can't analyze because the objects don't have a file name extension for a supported file or storage format.

", "ObjectLevelStatistics$StorageClass" : "

The total storage size (in bytes) or number of objects that Amazon Macie can't analyze because the objects use an unsupported storage class.

", "ObjectLevelStatistics$Total" : "

The total storage size (in bytes) or number of objects that Amazon Macie can't analyze because the objects use an unsupported storage class or don't have a file name extension for a supported file or storage format.

", diff --git a/models/apis/organizations/2016-11-28/docs-2.json b/models/apis/organizations/2016-11-28/docs-2.json index b8cb2aa413..808ed76b2e 100644 --- a/models/apis/organizations/2016-11-28/docs-2.json +++ b/models/apis/organizations/2016-11-28/docs-2.json @@ -1,11 +1,11 @@ { "version": "2.0", - "service": "AWS Organizations", + "service": "

AWS Organizations is a web service that enables you to consolidate your multiple AWS accounts into an organization and centrally manage your accounts and their resources.

This guide provides descriptions of the Organizations operations. For more information about using this service, see the AWS Organizations User Guide.

Support and feedback for AWS Organizations

We welcome your feedback. Send your comments to feedback-awsorganizations@amazon.com or post your feedback and questions in the AWS Organizations support forum. For more information about the AWS support forums, see Forums Help.

Endpoint to call When using the AWS CLI or the AWS SDK

For the current release of Organizations, specify the us-east-1 region for all AWS API and AWS CLI calls made from the commercial AWS Regions outside of China. If calling from one of the AWS Regions in China, then specify cn-northwest-1. You can do this in the AWS CLI by using these parameters and commands:

Recording API Requests

AWS Organizations supports AWS CloudTrail, a service that records AWS API calls for your AWS account and delivers log files to an Amazon S3 bucket. By using information collected by AWS CloudTrail, you can determine which requests the Organizations service received, who made the request and when, and so on. For more about AWS Organizations and its support for AWS CloudTrail, see Logging AWS Organizations Events with AWS CloudTrail in the AWS Organizations User Guide. To learn more about AWS CloudTrail, including how to turn it on and find your log files, see the AWS CloudTrail User Guide.

", "operations": { "AcceptHandshake": "

Sends a response to the originator of a handshake agreeing to the action proposed by the handshake request.

This operation can be called only by the following principals when they also have the relevant IAM permissions:

After you accept a handshake, it continues to appear in the results of relevant APIs for only 30 days. After that, it's deleted.

", "AttachPolicy": "

Attaches a policy to a root, an organizational unit (OU), or an individual account. How the policy affects accounts depends on the type of policy. Refer to the AWS Organizations User Guide for information about each policy type:

This operation can be called only from the organization's management account.

", "CancelHandshake": "

Cancels a handshake. Canceling a handshake sets the handshake state to CANCELED.

This operation can be called only from the account that originated the handshake. The recipient of the handshake can't cancel it, but can use DeclineHandshake instead. After a handshake is canceled, the recipient can no longer respond to that handshake.

After you cancel a handshake, it continues to appear in the results of relevant APIs for only 30 days. After that, it's deleted.

", - "CreateAccount": "

Creates an AWS account that is automatically a member of the organization whose credentials made the request. This is an asynchronous request that AWS performs in the background. Because CreateAccount operates asynchronously, it can return a successful completion message even though account initialization might still be in progress. You might need to wait a few minutes before you can successfully access the account. To check the status of the request, do one of the following:

The user who calls the API to create an account must have the organizations:CreateAccount permission. If you enabled all features in the organization, AWS Organizations creates the required service-linked role named AWSServiceRoleForOrganizations. For more information, see AWS Organizations and Service-Linked Roles in the AWS Organizations User Guide.

If the request includes tags, then the requester must have the organizations:TagResource permission.

AWS Organizations preconfigures the new member account with a role (named OrganizationAccountAccessRole by default) that grants users in the management account administrator permissions in the new member account. Principals in the management account can assume the role. AWS Organizations clones the company name and address information for the new account from the organization's management account.

This operation can be called only from the organization's management account.

For more information about creating accounts, see Creating an AWS Account in Your Organization in the AWS Organizations User Guide.

When you create a member account with this operation, you can choose whether to create the account with the IAM User and Role Access to Billing Information switch enabled. If you enable it, IAM users and roles that have appropriate permissions can view billing information for the account. If you disable it, only the account root user can access billing information. For information about how to disable this switch for an account, see Granting Access to Your Billing Information and Tools.

", + "CreateAccount": "

Creates an AWS account that is automatically a member of the organization whose credentials made the request. This is an asynchronous request that AWS performs in the background. Because CreateAccount operates asynchronously, it can return a successful completion message even though account initialization might still be in progress. You might need to wait a few minutes before you can successfully access the account. To check the status of the request, do one of the following:

The user who calls the API to create an account must have the organizations:CreateAccount permission. If you enabled all features in the organization, AWS Organizations creates the required service-linked role named AWSServiceRoleForOrganizations. For more information, see AWS Organizations and Service-Linked Roles in the AWS Organizations User Guide.

If the request includes tags, then the requester must have the organizations:TagResource permission.

AWS Organizations preconfigures the new member account with a role (named OrganizationAccountAccessRole by default) that grants users in the management account administrator permissions in the new member account. Principals in the management account can assume the role. AWS Organizations clones the company name and address information for the new account from the organization's management account.

This operation can be called only from the organization's management account.

For more information about creating accounts, see Creating an AWS Account in Your Organization in the AWS Organizations User Guide.

When you create a member account with this operation, you can choose whether to create the account with the IAM User and Role Access to Billing Information switch enabled. If you enable it, IAM users and roles that have appropriate permissions can view billing information for the account. If you disable it, only the account root user can access billing information. For information about how to disable this switch for an account, see Granting Access to Your Billing Information and Tools.

", "CreateGovCloudAccount": "

This action is available if all of the following are true:

AWS Organizations automatically creates the required service-linked role named AWSServiceRoleForOrganizations. For more information, see AWS Organizations and Service-Linked Roles in the AWS Organizations User Guide.

AWS automatically enables AWS CloudTrail for AWS GovCloud (US) accounts, but you should also do the following:

If the request includes tags, then the requester must have the organizations:TagResource permission. The tags are attached to the commercial account associated with the GovCloud account, rather than the GovCloud account itself. To add tags to the GovCloud account, call the TagResource operation in the GovCloud Region after the new GovCloud account exists.

You call this action from the management account of your organization in the commercial Region to create a standalone AWS account in the AWS GovCloud (US) Region. After the account is created, the management account of an organization in the AWS GovCloud (US) Region can invite it to that organization. For more information on inviting standalone accounts in the AWS GovCloud (US) to join an organization, see AWS Organizations in the AWS GovCloud User Guide.

Calling CreateGovCloudAccount is an asynchronous request that AWS performs in the background. Because CreateGovCloudAccount operates asynchronously, it can return a successful completion message even though account initialization might still be in progress. You might need to wait a few minutes before you can successfully access the account. To check the status of the request, do one of the following:

When you call the CreateGovCloudAccount action, you create two accounts: a standalone account in the AWS GovCloud (US) Region and an associated account in the commercial Region for billing and support purposes. The account in the commercial Region is automatically a member of the organization whose credentials made the request. Both accounts are associated with the same email address.

A role is created in the new account in the commercial Region that allows the management account in the organization in the commercial Region to assume it. An AWS GovCloud (US) account is then created and associated with the commercial account that you just created. A role is also created in the new AWS GovCloud (US) account that can be assumed by the AWS GovCloud (US) account that is associated with the management account of the commercial organization. For more information and to view a diagram that explains how account access works, see AWS Organizations in the AWS GovCloud User Guide.

For more information about creating accounts, see Creating an AWS Account in Your Organization in the AWS Organizations User Guide.

When you create a member account with this operation, you can choose whether to create the account with the IAM User and Role Access to Billing Information switch enabled. If you enable it, IAM users and roles that have appropriate permissions can view billing information for the account. If you disable it, only the account root user can access billing information. For information about how to disable this switch for an account, see Granting Access to Your Billing Information and Tools.

", "CreateOrganization": "

Creates an AWS organization. The account whose user is calling the CreateOrganization operation automatically becomes the management account of the new organization.

This operation must be called using credentials from the account that is to become the new organization's management account. The principal must also have the relevant IAM permissions.

By default (or if you set the FeatureSet parameter to ALL), the new organization is created with all features enabled and service control policies automatically enabled in the root. If you instead choose to create the organization supporting only the consolidated billing features by setting the FeatureSet parameter to CONSOLIDATED_BILLING\", no policy types are enabled by default, and you can't use organization policies

", "CreateOrganizationalUnit": "

Creates an organizational unit (OU) within a root or parent OU. An OU is a container for accounts that enables you to organize your accounts to apply policies according to your business requirements. The number of levels deep that you can nest OUs is dependent upon the policy types enabled for that root. For service control policies, the limit is five.

For more information about OUs, see Managing Organizational Units in the AWS Organizations User Guide.

If the request includes tags, then the requester must have the organizations:TagResource permission.

This operation can be called only from the organization's management account.

", @@ -29,7 +29,7 @@ "EnableAllFeatures": "

Enables all features in an organization. This enables the use of organization policies that can restrict the services and actions that can be called in each account. Until you enable all features, you have access only to consolidated billing, and you can't use any of the advanced account administration features that AWS Organizations supports. For more information, see Enabling All Features in Your Organization in the AWS Organizations User Guide.

This operation is required only for organizations that were created explicitly with only the consolidated billing features enabled. Calling this operation sends a handshake to every invited account in the organization. The feature set change can be finalized and the additional features enabled only after all administrators in the invited accounts approve the change by accepting the handshake.

After you enable all features, you can separately enable or disable individual policy types in a root using EnablePolicyType and DisablePolicyType. To see the status of policy types in a root, use ListRoots.

After all invited member accounts accept the handshake, you finalize the feature set change by accepting the handshake that contains \"Action\": \"ENABLE_ALL_FEATURES\". This completes the change.

After you enable all features in your organization, the management account in the organization can apply policies on all member accounts. These policies can restrict what users and even administrators in those accounts can do. The management account can apply policies that prevent accounts from leaving the organization. Ensure that your account administrators are aware of this.

This operation can be called only from the organization's management account.

", "EnablePolicyType": "

Enables a policy type in a root. After you enable a policy type in a root, you can attach policies of that type to the root, any organizational unit (OU), or account in that root. You can undo this by using the DisablePolicyType operation.

This is an asynchronous request that AWS performs in the background. AWS recommends that you first use ListRoots to see the status of policy types for a specified root, and then use this operation.

This operation can be called only from the organization's management account.

You can enable a policy type in a root only if that policy type is available in the organization. To view the status of available policy types in the organization, use DescribeOrganization.

", "InviteAccountToOrganization": "

Sends an invitation to another account to join your organization as a member account. AWS Organizations sends email on your behalf to the email address that is associated with the other account's owner. The invitation is implemented as a Handshake whose details are in the response.

If the request includes tags, then the requester must have the organizations:TagResource permission.

This operation can be called only from the organization's management account.

", - "LeaveOrganization": "

Removes a member account from its parent organization. This version of the operation is performed by the account that wants to leave. To remove a member account as a user in the management account, use RemoveAccountFromOrganization instead.

This operation can be called only from a member account in the organization.

", + "LeaveOrganization": "

Removes a member account from its parent organization. This version of the operation is performed by the account that wants to leave. To remove a member account as a user in the management account, use RemoveAccountFromOrganization instead.

This operation can be called only from a member account in the organization.

", "ListAWSServiceAccessForOrganization": "

Returns a list of the AWS services that you enabled to integrate with your organization. After a service on this list creates the resources that it requires for the integration, it can perform operations on your organization and its accounts.

For more information about integrating other services with AWS Organizations, including the list of services that currently work with Organizations, see Integrating AWS Organizations with Other AWS Services in the AWS Organizations User Guide.

This operation can be called only from the organization's management account or by a member account that is a delegated administrator for an AWS service.

", "ListAccounts": "

Lists all the accounts in the organization. To request only the accounts in a specified root or organizational unit (OU), use the ListAccountsForParent operation instead.

Always check the NextToken response parameter for a null value when calling a List* operation. These operations can occasionally return an empty set of results even when there are more results available. The NextToken response parameter value is null only when there are no more results to display.

This operation can be called only from the organization's management account or by a member account that is a delegated administrator for an AWS service.

", "ListAccountsForParent": "

Lists the accounts in an organization that are contained by the specified target root or organizational unit (OU). If you specify the root, you get a list of all the accounts that aren't in any OU. If you specify an OU, you get a list of all the accounts in only that OU and not in any child OUs. To get a list of all accounts in the organization, use the ListAccounts operation.

Always check the NextToken response parameter for a null value when calling a List* operation. These operations can occasionally return an empty set of results even when there are more results available. The NextToken response parameter value is null only when there are no more results to display.

This operation can be called only from the organization's management account or by a member account that is a delegated administrator for an AWS service.

", @@ -238,7 +238,7 @@ } }, "ConstraintViolationException": { - "base": "

Performing this operation violates a minimum or maximum value limit. For example, attempting to remove the last service control policy (SCP) from an OU or root, inviting or creating too many accounts to the organization, or attaching too many policies to an account, OU, or root. This exception includes a reason that contains additional information about the violated limit:

Some of the reasons in the following list might not be applicable to this specific API or operation.

", + "base": "

Performing this operation violates a minimum or maximum value limit. For example, attempting to remove the last service control policy (SCP) from an OU or root, inviting or creating too many accounts to the organization, or attaching too many policies to an account, OU, or root. This exception includes a reason that contains additional information about the violated limit:

Some of the reasons in the following list might not be applicable to this specific API or operation.

", "refs": { } }, @@ -251,7 +251,7 @@ "CreateAccountFailureReason": { "base": null, "refs": { - "CreateAccountStatus$FailureReason": "

If the request failed, a description of the reason for the failure.

" + "CreateAccountStatus$FailureReason": "

If the request failed, a description of the reason for the failure.

" } }, "CreateAccountRequest": { @@ -275,7 +275,7 @@ "base": null, "refs": { "CreateAccountStates$member": null, - "CreateAccountStatus$State": "

The status of the request.

" + "CreateAccountStatus$State": "

The status of the asynchronous request to create an AWS account.

" } }, "CreateAccountStates": { @@ -640,7 +640,7 @@ } }, "Handshake": { - "base": "

Contains information that must be exchanged to securely establish a relationship between two accounts (an originator and a recipient). For example, when a management account (the originator) invites another account (the recipient) to join its organization, the two accounts exchange information as a series of handshake requests and responses.

Note: Handshakes that are CANCELED, ACCEPTED, or DECLINED show up in lists for only 30 days after entering that state After that they are deleted.

", + "base": "

Contains information that must be exchanged to securely establish a relationship between two accounts (an originator and a recipient). For example, when a management account (the originator) invites another account (the recipient) to join its organization, the two accounts exchange information as a series of handshake requests and responses.

Note: Handshakes that are CANCELED, ACCEPTED, or DECLINED show up in lists for only 30 days after entering that state After that they are deleted.

", "refs": { "AcceptHandshakeResponse$Handshake": "

A structure that contains details about the accepted handshake.

", "CancelHandshakeResponse$Handshake": "

A structure that contains details about the handshake that you canceled.

", @@ -1362,7 +1362,7 @@ "ServicePrincipal": { "base": null, "refs": { - "DelegatedService$ServicePrincipal": "

The name of a service that can request an operation for the specified service. This is typically in the form of a URL, such as: servicename.amazonaws.com.

", + "DelegatedService$ServicePrincipal": "

The name of an AWS service that can request an operation for the specified service. This is typically in the form of a URL, such as: servicename.amazonaws.com.

", "DeregisterDelegatedAdministratorRequest$ServicePrincipal": "

The service principal name of an AWS service for which the account is a delegated administrator.

Delegated administrator privileges are revoked for only the specified AWS service from the member account. If the specified service is the only service for which the member account is a delegated administrator, the operation also revokes Organizations read action permissions.

", "DisableAWSServiceAccessRequest$ServicePrincipal": "

The service principal name of the AWS service for which you want to disable integration with your organization. This is typically in the form of a URL, such as service-abbreviation.amazonaws.com.

", "EnableAWSServiceAccessRequest$ServicePrincipal": "

The service principal name of the AWS service for which you want to enable integration with your organization. This is typically in the form of a URL, such as service-abbreviation.amazonaws.com.

", diff --git a/service/ecs/api.go b/service/ecs/api.go index 1212b71208..e8525239f1 100644 --- a/service/ecs/api.go +++ b/service/ecs/api.go @@ -5268,10 +5268,16 @@ func (c *ECS) UpdateContainerAgentRequest(input *UpdateContainerAgentInput) (req // differs depending on whether your container instance was launched with the // Amazon ECS-optimized AMI or another operating system. // -// UpdateContainerAgent requires the Amazon ECS-optimized AMI or Amazon Linux -// with the ecs-init service installed and running. For help updating the Amazon -// ECS container agent on other operating systems, see Manually Updating the -// Amazon ECS Container Agent (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html#manually_update_agent) +// The UpdateContainerAgent API isn't supported for container instances using +// the Amazon ECS-optimized Amazon Linux 2 (arm64) AMI. To update the container +// agent, you can update the ecs-init package which will update the agent. For +// more information, see Updating the Amazon ECS container agent (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/agent-update-ecs-ami.html) +// in the Amazon Elastic Container Service Developer Guide. +// +// The UpdateContainerAgent API requires an Amazon ECS-optimized AMI or Amazon +// Linux AMI with the ecs-init service installed and running. For help updating +// the Amazon ECS container agent on other operating systems, see Manually updating +// the Amazon ECS container agent (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html#manually_update_agent) // in the Amazon Elastic Container Service Developer Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -6292,16 +6298,6 @@ type AutoScalingGroupProviderUpdate struct { _ struct{} `type:"structure"` // The managed scaling settings for the Auto Scaling group capacity provider. - // - // When managed scaling is enabled, Amazon ECS manages the scale-in and scale-out - // actions of the Auto Scaling group. Amazon ECS manages a target tracking scaling - // policy using an Amazon ECS-managed CloudWatch metric with the specified targetCapacity - // value as the target value for the metric. For more information, see Using - // Managed Scaling (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/asg-capacity-providers.html#asg-capacity-providers-managed-scaling) - // in the Amazon Elastic Container Service Developer Guide. - // - // If managed scaling is disabled, the user must manage the scaling of the Auto - // Scaling group. ManagedScaling *ManagedScaling `locationName:"managedScaling" type:"structure"` // The managed termination protection setting to use for the Auto Scaling group @@ -7555,8 +7551,7 @@ type ContainerDefinition struct { // This parameter maps to NetworkDisabled in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/). // - // This parameter is not supported for Windows containers or tasks that use - // the awsvpc network mode. + // This parameter is not supported for Windows containers. DisableNetworking *bool `locationName:"disableNetworking" type:"boolean"` // A list of DNS search domains that are presented to the container. This parameter @@ -7564,8 +7559,7 @@ type ContainerDefinition struct { // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --dns-search option to docker run (https://docs.docker.com/engine/reference/run/#security-configuration). // - // This parameter is not supported for Windows containers or tasks that use - // the awsvpc network mode. + // This parameter is not supported for Windows containers. DnsSearchDomains []*string `locationName:"dnsSearchDomains" type:"list"` // A list of DNS servers that are presented to the container. This parameter @@ -7573,8 +7567,7 @@ type ContainerDefinition struct { // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --dns option to docker run (https://docs.docker.com/engine/reference/run/#security-configuration). // - // This parameter is not supported for Windows containers or tasks that use - // the awsvpc network mode. + // This parameter is not supported for Windows containers. DnsServers []*string `locationName:"dnsServers" type:"list"` // A key/value map of labels to add to the container. This parameter maps to @@ -7748,8 +7741,7 @@ type ContainerDefinition struct { // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --link option to docker run (https://docs.docker.com/engine/reference/run/#security-configuration). // - // This parameter is not supported for Windows containers or tasks that use - // the awsvpc network mode. + // This parameter is not supported for Windows containers. // // Containers that are collocated on a single container instance may be able // to communicate with each other without requiring links or host port mappings. @@ -7910,8 +7902,7 @@ type ContainerDefinition struct { // of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) and // the --read-only option to docker run (https://docs.docker.com/engine/reference/run/#security-configuration). // - // This parameter is not supported for Windows containers or tasks that use - // the awsvpc network mode. + // This parameter is not supported for Windows containers. ReadonlyRootFilesystem *bool `locationName:"readonlyRootFilesystem" type:"boolean"` // The private repository authentication credentials to use. @@ -7998,14 +7989,20 @@ type ContainerDefinition struct { // This parameter maps to Ulimits in the Create a container (https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate) // section of the Docker Remote API (https://docs.docker.com/engine/api/v1.35/) // and the --ulimit option to docker run (https://docs.docker.com/engine/reference/run/#security-configuration). - // Valid naming values are displayed in the Ulimit data type. This parameter - // requires version 1.18 of the Docker Remote API or greater on your container - // instance. To check the Docker Remote API version on your container instance, - // log in to your container instance and run the following command: sudo docker - // version --format '{{.Server.APIVersion}}' + // Valid naming values are displayed in the Ulimit data type. // - // This parameter is not supported for Windows containers or tasks that use - // the awsvpc network mode. + // Amazon ECS tasks hosted on Fargate use the default resource limit values + // set by the operating system with the exception of the nofile resource limit + // parameter which Fargate overrides. The nofile resource limit sets a restriction + // on the number of open files that a container can use. The default nofile + // soft limit is 1024 and hard limit is 4096. + // + // This parameter requires version 1.18 of the Docker Remote API or greater + // on your container instance. To check the Docker Remote API version on your + // container instance, log in to your container instance and run the following + // command: sudo docker version --format '{{.Server.APIVersion}}' + // + // This parameter is not supported for Windows containers. Ulimits []*Ulimit `locationName:"ulimits" type:"list"` // The user to use inside the container. This parameter maps to User in the @@ -8032,8 +8029,7 @@ type ContainerDefinition struct { // // * uid:group // - // This parameter is not supported for Windows containers or tasks that use - // the awsvpc network mode. + // This parameter is not supported for Windows containers. User *string `locationName:"user" type:"string"` // Data volumes to mount from another container. This parameter maps to VolumesFrom @@ -9253,7 +9249,8 @@ type CreateServiceInput struct { // deployment and the ordering of stopping and starting tasks. DeploymentConfiguration *DeploymentConfiguration `locationName:"deploymentConfiguration" type:"structure"` - // The deployment controller to use for the service. + // The deployment controller to use for the service. If no deployment controller + // is specified, the default value of ECS is used. DeploymentController *DeploymentController `locationName:"deploymentController" type:"structure"` // The number of instantiations of the specified task definition to place and @@ -9437,12 +9434,11 @@ type CreateServiceInput struct { // ServiceName is a required field ServiceName *string `locationName:"serviceName" type:"string" required:"true"` - // The details of the service discovery registries to assign to this service. + // The details of the service discovery registry to associate with this service. // For more information, see Service discovery (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-discovery.html). // - // Service discovery is supported for Fargate tasks if you are using platform - // version v1.1.0 or later. For more information, see AWS Fargate platform versions - // (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/platform_versions.html). + // Each service may be associated with one service registry. Multiple service + // registries per service isn't supported. ServiceRegistries []*ServiceRegistry `locationName:"serviceRegistries" type:"list"` // The metadata that you apply to the service to help you categorize and organize @@ -9758,7 +9754,7 @@ type CreateTaskSetInput struct { // or a Network Load Balancer. LoadBalancers []*LoadBalancer `locationName:"loadBalancers" type:"list"` - // An object representing the network configuration for a task or service. + // An object representing the network configuration for a task set. NetworkConfiguration *NetworkConfiguration `locationName:"networkConfiguration" type:"structure"` // The platform version that the tasks in the task set should use. A platform @@ -9950,9 +9946,9 @@ type CreateTaskSetOutput struct { _ struct{} `type:"structure"` // Information about a set of Amazon ECS tasks in either an AWS CodeDeploy or - // an EXTERNAL deployment. An Amazon ECS task set includes details such as the - // desired number of tasks, how many tasks are running, and whether the task - // set serves production traffic. + // an EXTERNAL deployment. A task set includes details such as the desired number + // of tasks, how many tasks are running, and whether the task set serves production + // traffic. TaskSet *TaskSet `locationName:"taskSet" type:"structure"` } @@ -10178,7 +10174,7 @@ func (s *DeleteCapacityProviderInput) SetCapacityProvider(v string) *DeleteCapac type DeleteCapacityProviderOutput struct { _ struct{} `type:"structure"` - // The details of a capacity provider. + // The details of the capacity provider. CapacityProvider *CapacityProvider `locationName:"capacityProvider" type:"structure"` } @@ -10423,10 +10419,7 @@ func (s *DeleteTaskSetInput) SetTaskSet(v string) *DeleteTaskSetInput { type DeleteTaskSetOutput struct { _ struct{} `type:"structure"` - // Information about a set of Amazon ECS tasks in either an AWS CodeDeploy or - // an EXTERNAL deployment. An Amazon ECS task set includes details such as the - // desired number of tasks, how many tasks are running, and whether the task - // set serves production traffic. + // Details about the task set. TaskSet *TaskSet `locationName:"taskSet" type:"structure"` } @@ -12138,6 +12131,53 @@ func (s *EnvironmentFile) SetValue(v string) *EnvironmentFile { return s } +// The amount of ephemeral storage to allocate for the task. This parameter +// is used to expand the total amount of ephemeral storage available, beyond +// the default amount, for tasks hosted on AWS Fargate. For more information, +// see Fargate task storage (https://docs.aws.amazon.com/AmazonECS/latest/userguide/using_data_volumes.html) +// in the Amazon ECS User Guide for AWS Fargate. +// +// This parameter is only supported for tasks hosted on AWS Fargate using platform +// version 1.4.0 or later. +type EphemeralStorage struct { + _ struct{} `type:"structure"` + + // The total amount, in GiB, of ephemeral storage to set for the task. The minimum + // supported value is 21 GiB and the maximum supported value is 200 GiB. + // + // SizeInGiB is a required field + SizeInGiB *int64 `locationName:"sizeInGiB" type:"integer" required:"true"` +} + +// String returns the string representation +func (s EphemeralStorage) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s EphemeralStorage) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *EphemeralStorage) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "EphemeralStorage"} + if s.SizeInGiB == nil { + invalidParams.Add(request.NewErrParamRequired("SizeInGiB")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetSizeInGiB sets the SizeInGiB field's value. +func (s *EphemeralStorage) SetSizeInGiB(v int64) *EphemeralStorage { + s.SizeInGiB = &v + return s +} + // The details of the execute command configuration. type ExecuteCommandConfiguration struct { _ struct{} `type:"structure"` @@ -13384,6 +13424,9 @@ type ListAccountSettingsInput struct { // The ARN of the principal, which can be an IAM user, IAM role, or the root // user. If this field is omitted, the account settings are listed only for // the authenticated user. + // + // Federated users assume the account setting of the root user and can't have + // explicit account settings set for them. PrincipalArn *string `locationName:"principalArn" type:"string"` // The value of the account settings with which to filter results. You must @@ -15361,6 +15404,9 @@ func (s *PlatformUnknownException) RequestID() string { // exposed ports should be specified using containerPort. The hostPort can be // left blank or it must be the same value as the containerPort. // +// You cannot expose the same container port for multiple protocols. An error +// will be returned if this is attempted +// // After a task reaches the RUNNING status, manual and automatic host and container // port assignments are visible in the networkBindings section of DescribeTasks // API responses. @@ -15599,7 +15645,7 @@ func (s *PutAccountSettingDefaultInput) SetValue(v string) *PutAccountSettingDef type PutAccountSettingDefaultOutput struct { _ struct{} `type:"structure"` - // The current account setting for a resource. + // The current setting for a resource. Setting *Setting `locationName:"setting" type:"structure"` } @@ -15640,6 +15686,9 @@ type PutAccountSettingInput struct { // IAM users, IAM roles, and the root user of the account unless an IAM user // or role explicitly overrides these settings. If this field is omitted, the // setting is changed only for the authenticated user. + // + // Federated users assume the account setting of the root user and can't have + // explicit account settings set for them. PrincipalArn *string `locationName:"principalArn" type:"string"` // The account setting value for the specified principal ARN. Accepted values @@ -15907,10 +15956,7 @@ func (s *PutClusterCapacityProvidersInput) SetDefaultCapacityProviderStrategy(v type PutClusterCapacityProvidersOutput struct { _ struct{} `type:"structure"` - // A regional grouping of one or more container instances on which you can run - // task requests. Each account receives a default cluster the first time you - // use the Amazon ECS service, but you may also create other clusters. Clusters - // may contain more than one instance type simultaneously. + // Details about the cluster. Cluster *Cluster `locationName:"cluster" type:"structure"` } @@ -16160,6 +16206,16 @@ type RegisterTaskDefinitionInput struct { // (30 GB) in increments of 1024 (1 GB) Cpu *string `locationName:"cpu" type:"string"` + // The amount of ephemeral storage to allocate for the task. This parameter + // is used to expand the total amount of ephemeral storage available, beyond + // the default amount, for tasks hosted on AWS Fargate. For more information, + // see Fargate task storage (https://docs.aws.amazon.com/AmazonECS/latest/userguide/using_data_volumes.html) + // in the Amazon ECS User Guide for AWS Fargate. + // + // This parameter is only supported for tasks hosted on AWS Fargate using platform + // version 1.4.0 or later. + EphemeralStorage *EphemeralStorage `locationName:"ephemeralStorage" type:"structure"` + // The Amazon Resource Name (ARN) of the task execution role that grants the // Amazon ECS container agent permission to make AWS API calls on your behalf. // The task execution IAM role is required depending on the requirements of @@ -16305,12 +16361,14 @@ type RegisterTaskDefinitionInput struct { // The configuration details for the App Mesh proxy. // - // For tasks using the EC2 launch type, the container instances require at least - // version 1.26.0 of the container agent and at least version 1.26.0-1 of the - // ecs-init package to enable a proxy configuration. If your container instances - // are launched from the Amazon ECS-optimized AMI version 20190301 or later, - // then they contain the required versions of the container agent and ecs-init. - // For more information, see Amazon ECS-optimized Linux AMI (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html) + // For tasks hosted on Amazon EC2 instances, the container instances require + // at least version 1.26.0 of the container agent and at least version 1.26.0-1 + // of the ecs-init package to enable a proxy configuration. If your container + // instances are launched from the Amazon ECS-optimized AMI version 20190301 + // or later, then they contain the required versions of the container agent + // and ecs-init. For more information, see Amazon ECS-optimized AMI versions + // (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-ami-versions.html) + // in the Amazon Elastic Container Service Developer Guide. ProxyConfiguration *ProxyConfiguration `locationName:"proxyConfiguration" type:"structure"` // The task launch type that Amazon ECS should validate the task definition @@ -16388,6 +16446,11 @@ func (s *RegisterTaskDefinitionInput) Validate() error { } } } + if s.EphemeralStorage != nil { + if err := s.EphemeralStorage.Validate(); err != nil { + invalidParams.AddNested("EphemeralStorage", err.(request.ErrInvalidParams)) + } + } if s.InferenceAccelerators != nil { for i, v := range s.InferenceAccelerators { if v == nil { @@ -16442,6 +16505,12 @@ func (s *RegisterTaskDefinitionInput) SetCpu(v string) *RegisterTaskDefinitionIn return s } +// SetEphemeralStorage sets the EphemeralStorage field's value. +func (s *RegisterTaskDefinitionInput) SetEphemeralStorage(v *EphemeralStorage) *RegisterTaskDefinitionInput { + s.EphemeralStorage = v + return s +} + // SetExecutionRoleArn sets the ExecutionRoleArn field's value. func (s *RegisterTaskDefinitionInput) SetExecutionRoleArn(v string) *RegisterTaskDefinitionInput { s.ExecutionRoleArn = &v @@ -19103,6 +19172,9 @@ type Task struct { // task. EnableExecuteCommand *bool `locationName:"enableExecuteCommand" type:"boolean"` + // The ephemeral storage settings for the task. + EphemeralStorage *EphemeralStorage `locationName:"ephemeralStorage" type:"structure"` + // The Unix timestamp for when the task execution stopped. ExecutionStoppedAt *time.Time `locationName:"executionStoppedAt" type:"timestamp"` @@ -19333,6 +19405,12 @@ func (s *Task) SetEnableExecuteCommand(v bool) *Task { return s } +// SetEphemeralStorage sets the EphemeralStorage field's value. +func (s *Task) SetEphemeralStorage(v *EphemeralStorage) *Task { + s.EphemeralStorage = v + return s +} + // SetExecutionStoppedAt sets the ExecutionStoppedAt field's value. func (s *Task) SetExecutionStoppedAt(v time.Time) *Task { s.ExecutionStoppedAt = &v @@ -19503,6 +19581,9 @@ type TaskDefinition struct { // The Unix timestamp for when the task definition was deregistered. DeregisteredAt *time.Time `locationName:"deregisteredAt" type:"timestamp"` + // The ephemeral storage settings to use for tasks run with the task definition. + EphemeralStorage *EphemeralStorage `locationName:"ephemeralStorage" type:"structure"` + // The Amazon Resource Name (ARN) of the task execution role that grants the // Amazon ECS container agent permission to make AWS API calls on your behalf. // The task execution IAM role is required depending on the requirements of @@ -19749,6 +19830,12 @@ func (s *TaskDefinition) SetDeregisteredAt(v time.Time) *TaskDefinition { return s } +// SetEphemeralStorage sets the EphemeralStorage field's value. +func (s *TaskDefinition) SetEphemeralStorage(v *EphemeralStorage) *TaskDefinition { + s.EphemeralStorage = v + return s +} + // SetExecutionRoleArn sets the ExecutionRoleArn field's value. func (s *TaskDefinition) SetExecutionRoleArn(v string) *TaskDefinition { s.ExecutionRoleArn = &v @@ -19907,6 +19994,12 @@ type TaskOverride struct { // The cpu override for the task. Cpu *string `locationName:"cpu" type:"string"` + // The ephemeral storage setting override for the task. + // + // This parameter is only supported for tasks hosted on AWS Fargate using platform + // version 1.4.0 or later. + EphemeralStorage *EphemeralStorage `locationName:"ephemeralStorage" type:"structure"` + // The Amazon Resource Name (ARN) of the task execution IAM role override for // the task. ExecutionRoleArn *string `locationName:"executionRoleArn" type:"string"` @@ -19946,6 +20039,11 @@ func (s *TaskOverride) Validate() error { } } } + if s.EphemeralStorage != nil { + if err := s.EphemeralStorage.Validate(); err != nil { + invalidParams.AddNested("EphemeralStorage", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -19965,6 +20063,12 @@ func (s *TaskOverride) SetCpu(v string) *TaskOverride { return s } +// SetEphemeralStorage sets the EphemeralStorage field's value. +func (s *TaskOverride) SetEphemeralStorage(v *EphemeralStorage) *TaskOverride { + s.EphemeralStorage = v + return s +} + // SetExecutionRoleArn sets the ExecutionRoleArn field's value. func (s *TaskOverride) SetExecutionRoleArn(v string) *TaskOverride { s.ExecutionRoleArn = &v @@ -20418,6 +20522,12 @@ func (s *Tmpfs) SetSize(v int64) *Tmpfs { } // The ulimit settings to pass to the container. +// +// Amazon ECS tasks hosted on Fargate use the default resource limit values +// set by the operating system with the exception of the nofile resource limit +// parameter which Fargate overrides. The nofile resource limit sets a restriction +// on the number of open files that a container can use. The default nofile +// soft limit is 1024 and hard limit is 4096. type Ulimit struct { _ struct{} `type:"structure"` @@ -20669,7 +20779,7 @@ func (s *UpdateCapacityProviderInput) SetName(v string) *UpdateCapacityProviderI type UpdateCapacityProviderOutput struct { _ struct{} `type:"structure"` - // The details of a capacity provider. + // Details about the capacity provider. CapacityProvider *CapacityProvider `locationName:"capacityProvider" type:"structure"` } @@ -20748,10 +20858,7 @@ func (s *UpdateClusterInput) SetSettings(v []*ClusterSetting) *UpdateClusterInpu type UpdateClusterOutput struct { _ struct{} `type:"structure"` - // A regional grouping of one or more container instances on which you can run - // task requests. Each account receives a default cluster the first time you - // use the Amazon ECS service, but you may also create other clusters. Clusters - // may contain more than one instance type simultaneously. + // Details about the cluster. Cluster *Cluster `locationName:"cluster" type:"structure"` } @@ -20829,10 +20936,7 @@ func (s *UpdateClusterSettingsInput) SetSettings(v []*ClusterSetting) *UpdateClu type UpdateClusterSettingsOutput struct { _ struct{} `type:"structure"` - // A regional grouping of one or more container instances on which you can run - // task requests. Each account receives a default cluster the first time you - // use the Amazon ECS service, but you may also create other clusters. Clusters - // may contain more than one instance type simultaneously. + // Details about the cluster Cluster *Cluster `locationName:"cluster" type:"structure"` } @@ -21152,7 +21256,7 @@ type UpdateServiceInput struct { // and stopping them before they have time to come up. HealthCheckGracePeriodSeconds *int64 `locationName:"healthCheckGracePeriodSeconds" type:"integer"` - // An object representing the network configuration for a task or service. + // An object representing the network configuration for the service. NetworkConfiguration *NetworkConfiguration `locationName:"networkConfiguration" type:"structure"` // An array of task placement constraint objects to update the service to use. @@ -21410,10 +21514,7 @@ func (s *UpdateServicePrimaryTaskSetInput) SetService(v string) *UpdateServicePr type UpdateServicePrimaryTaskSetOutput struct { _ struct{} `type:"structure"` - // Information about a set of Amazon ECS tasks in either an AWS CodeDeploy or - // an EXTERNAL deployment. An Amazon ECS task set includes details such as the - // desired number of tasks, how many tasks are running, and whether the task - // set serves production traffic. + // Details about the task set. TaskSet *TaskSet `locationName:"taskSet" type:"structure"` } @@ -21519,10 +21620,7 @@ func (s *UpdateTaskSetInput) SetTaskSet(v string) *UpdateTaskSetInput { type UpdateTaskSetOutput struct { _ struct{} `type:"structure"` - // Information about a set of Amazon ECS tasks in either an AWS CodeDeploy or - // an EXTERNAL deployment. An Amazon ECS task set includes details such as the - // desired number of tasks, how many tasks are running, and whether the task - // set serves production traffic. + // Details about the task set. TaskSet *TaskSet `locationName:"taskSet" type:"structure"` } diff --git a/service/macie2/api.go b/service/macie2/api.go index 0f53ec6020..e7e792782e 100644 --- a/service/macie2/api.go +++ b/service/macie2/api.go @@ -6870,6 +6870,9 @@ func (s *BucketCountByEffectivePermission) SetUnknown(v int64) *BucketCountByEff // Provides information about the number of S3 buckets that use certain types // of server-side encryption by default or don't encrypt new objects by default. +// For detailed information about these settings, see Setting default server-side +// encryption behavior for Amazon S3 buckets (https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucket-encryption.html) +// in the Amazon Simple Storage Service User Guide. type BucketCountByEncryptionType struct { _ struct{} `type:"structure"` @@ -6878,6 +6881,8 @@ type BucketCountByEncryptionType struct { S3Managed *int64 `locationName:"s3Managed" type:"long"` Unencrypted *int64 `locationName:"unencrypted" type:"long"` + + Unknown *int64 `locationName:"unknown" type:"long"` } // String returns the string representation @@ -6908,8 +6913,14 @@ func (s *BucketCountByEncryptionType) SetUnencrypted(v int64) *BucketCountByEncr return s } -// Provides information about the number of S3 buckets that are shared with -// other AWS accounts. +// SetUnknown sets the Unknown field's value. +func (s *BucketCountByEncryptionType) SetUnknown(v int64) *BucketCountByEncryptionType { + s.Unknown = &v + return s +} + +// Provides information about the number of S3 buckets that are and aren't shared +// with other AWS accounts. type BucketCountBySharedAccessType struct { _ struct{} `type:"structure"` @@ -6956,6 +6967,47 @@ func (s *BucketCountBySharedAccessType) SetUnknown(v int64) *BucketCountByShared return s } +// Provides information about the number of S3 buckets whose bucket policies +// do and don't require server-side encryption of objects when objects are uploaded +// to the buckets. +type BucketCountPolicyAllowsUnencryptedObjectUploads struct { + _ struct{} `type:"structure"` + + AllowsUnencryptedObjectUploads *int64 `locationName:"allowsUnencryptedObjectUploads" type:"long"` + + DeniesUnencryptedObjectUploads *int64 `locationName:"deniesUnencryptedObjectUploads" type:"long"` + + Unknown *int64 `locationName:"unknown" type:"long"` +} + +// String returns the string representation +func (s BucketCountPolicyAllowsUnencryptedObjectUploads) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BucketCountPolicyAllowsUnencryptedObjectUploads) GoString() string { + return s.String() +} + +// SetAllowsUnencryptedObjectUploads sets the AllowsUnencryptedObjectUploads field's value. +func (s *BucketCountPolicyAllowsUnencryptedObjectUploads) SetAllowsUnencryptedObjectUploads(v int64) *BucketCountPolicyAllowsUnencryptedObjectUploads { + s.AllowsUnencryptedObjectUploads = &v + return s +} + +// SetDeniesUnencryptedObjectUploads sets the DeniesUnencryptedObjectUploads field's value. +func (s *BucketCountPolicyAllowsUnencryptedObjectUploads) SetDeniesUnencryptedObjectUploads(v int64) *BucketCountPolicyAllowsUnencryptedObjectUploads { + s.DeniesUnencryptedObjectUploads = &v + return s +} + +// SetUnknown sets the Unknown field's value. +func (s *BucketCountPolicyAllowsUnencryptedObjectUploads) SetUnknown(v int64) *BucketCountPolicyAllowsUnencryptedObjectUploads { + s.Unknown = &v + return s +} + // Specifies the operator to use in a property-based condition that filters // the results of a query for information about S3 buckets. type BucketCriteriaAdditionalProperties struct { @@ -7044,8 +7096,8 @@ type BucketLevelPermissions struct { // in the Amazon Simple Storage Service User Guide. BlockPublicAccess *BlockPublicAccess `locationName:"blockPublicAccess" type:"structure"` - // Provides information about the permissions settings of a bucket policy for - // an S3 bucket. + // Provides information about the permissions settings of the bucket policy + // for an S3 bucket. BucketPolicy *BucketPolicy `locationName:"bucketPolicy" type:"structure"` } @@ -7083,6 +7135,8 @@ type BucketMetadata struct { AccountId *string `locationName:"accountId" type:"string"` + AllowsUnencryptedObjectUploads *string `locationName:"allowsUnencryptedObjectUploads" type:"string" enum:"AllowsUnencryptedObjectUploads"` + BucketArn *string `locationName:"bucketArn" type:"string"` BucketCreatedAt *time.Time `locationName:"bucketCreatedAt" type:"timestamp" timestampFormat:"iso8601"` @@ -7167,6 +7221,12 @@ func (s *BucketMetadata) SetAccountId(v string) *BucketMetadata { return s } +// SetAllowsUnencryptedObjectUploads sets the AllowsUnencryptedObjectUploads field's value. +func (s *BucketMetadata) SetAllowsUnencryptedObjectUploads(v string) *BucketMetadata { + s.AllowsUnencryptedObjectUploads = &v + return s +} + // SetBucketArn sets the BucketArn field's value. func (s *BucketMetadata) SetBucketArn(v string) *BucketMetadata { s.BucketArn = &v @@ -7323,8 +7383,8 @@ func (s *BucketPermissionConfiguration) SetBucketLevelPermissions(v *BucketLevel return s } -// Provides information about the permissions settings of a bucket policy for -// an S3 bucket. +// Provides information about the permissions settings of the bucket policy +// for an S3 bucket. type BucketPolicy struct { _ struct{} `type:"structure"` @@ -10110,10 +10170,18 @@ type GetBucketStatisticsOutput struct { // Provides information about the number of S3 buckets that use certain types // of server-side encryption by default or don't encrypt new objects by default. + // For detailed information about these settings, see Setting default server-side + // encryption behavior for Amazon S3 buckets (https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucket-encryption.html) + // in the Amazon Simple Storage Service User Guide. BucketCountByEncryptionType *BucketCountByEncryptionType `locationName:"bucketCountByEncryptionType" type:"structure"` - // Provides information about the number of S3 buckets that are shared with - // other AWS accounts. + // Provides information about the number of S3 buckets whose bucket policies + // do and don't require server-side encryption of objects when objects are uploaded + // to the buckets. + BucketCountByObjectEncryptionRequirement *BucketCountPolicyAllowsUnencryptedObjectUploads `locationName:"bucketCountByObjectEncryptionRequirement" type:"structure"` + + // Provides information about the number of S3 buckets that are and aren't shared + // with other AWS accounts. BucketCountBySharedAccessType *BucketCountBySharedAccessType `locationName:"bucketCountBySharedAccessType" type:"structure"` ClassifiableObjectCount *int64 `locationName:"classifiableObjectCount" type:"long"` @@ -10173,6 +10241,12 @@ func (s *GetBucketStatisticsOutput) SetBucketCountByEncryptionType(v *BucketCoun return s } +// SetBucketCountByObjectEncryptionRequirement sets the BucketCountByObjectEncryptionRequirement field's value. +func (s *GetBucketStatisticsOutput) SetBucketCountByObjectEncryptionRequirement(v *BucketCountPolicyAllowsUnencryptedObjectUploads) *GetBucketStatisticsOutput { + s.BucketCountByObjectEncryptionRequirement = v + return s +} + // SetBucketCountBySharedAccessType sets the BucketCountBySharedAccessType field's value. func (s *GetBucketStatisticsOutput) SetBucketCountBySharedAccessType(v *BucketCountBySharedAccessType) *GetBucketStatisticsOutput { s.BucketCountBySharedAccessType = v @@ -12718,6 +12792,8 @@ type ObjectCountByEncryptionType struct { S3Managed *int64 `locationName:"s3Managed" type:"long"` Unencrypted *int64 `locationName:"unencrypted" type:"long"` + + Unknown *int64 `locationName:"unknown" type:"long"` } // String returns the string representation @@ -12754,6 +12830,12 @@ func (s *ObjectCountByEncryptionType) SetUnencrypted(v int64) *ObjectCountByEncr return s } +// SetUnknown sets the Unknown field's value. +func (s *ObjectCountByEncryptionType) SetUnknown(v int64) *ObjectCountByEncryptionType { + s.Unknown = &v + return s +} + // Provides information about the total storage size (in bytes) or number of // objects that Amazon Macie can't analyze in one or more S3 buckets. In a BucketMetadata // object, this data is for a specific bucket. In a GetBucketStatisticsResponse @@ -13297,6 +13379,8 @@ func (s *ResourcesAffected) SetS3Object(v *S3Object) *ResourcesAffected { type S3Bucket struct { _ struct{} `type:"structure"` + AllowsUnencryptedObjectUploads *string `locationName:"allowsUnencryptedObjectUploads" type:"string" enum:"AllowsUnencryptedObjectUploads"` + Arn *string `locationName:"arn" type:"string"` CreatedAt *time.Time `locationName:"createdAt" type:"timestamp" timestampFormat:"iso8601"` @@ -13330,6 +13414,12 @@ func (s S3Bucket) GoString() string { return s.String() } +// SetAllowsUnencryptedObjectUploads sets the AllowsUnencryptedObjectUploads field's value. +func (s *S3Bucket) SetAllowsUnencryptedObjectUploads(v string) *S3Bucket { + s.AllowsUnencryptedObjectUploads = &v + return s +} + // SetArn sets the Arn field's value. func (s *S3Bucket) SetArn(v string) *S3Bucket { s.Arn = &v @@ -15478,6 +15568,26 @@ func AdminStatus_Values() []string { } } +const ( + // AllowsUnencryptedObjectUploadsTrue is a AllowsUnencryptedObjectUploads enum value + AllowsUnencryptedObjectUploadsTrue = "TRUE" + + // AllowsUnencryptedObjectUploadsFalse is a AllowsUnencryptedObjectUploads enum value + AllowsUnencryptedObjectUploadsFalse = "FALSE" + + // AllowsUnencryptedObjectUploadsUnknown is a AllowsUnencryptedObjectUploads enum value + AllowsUnencryptedObjectUploadsUnknown = "UNKNOWN" +) + +// AllowsUnencryptedObjectUploads_Values returns all elements of the AllowsUnencryptedObjectUploads enum +func AllowsUnencryptedObjectUploads_Values() []string { + return []string{ + AllowsUnencryptedObjectUploadsTrue, + AllowsUnencryptedObjectUploadsFalse, + AllowsUnencryptedObjectUploadsUnknown, + } +} + // The type of currency that the data for an Amazon Macie usage metric is reported // in. Possible values are: const ( diff --git a/service/organizations/api.go b/service/organizations/api.go index 655f28a39c..c7497d4f89 100644 --- a/service/organizations/api.go +++ b/service/organizations/api.go @@ -372,7 +372,7 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -439,7 +439,7 @@ func (c *Organizations) AttachPolicyRequest(input *AttachPolicyInput) (req *requ // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -890,8 +890,8 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // operation. // // * Check the AWS CloudTrail log for the CreateAccountResult event. For -// information on using AWS CloudTrail with AWS Organizations, see Monitoring -// the Activity in Your Organization (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_monitoring.html) +// information on using AWS CloudTrail with AWS Organizations, see Logging +// and monitoring in AWS Organizations (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_security_incident-response.html#orgs_cloudtrail-integration) // in the AWS Organizations User Guide. // // The user who calls the API to create an account must have the organizations:CreateAccount @@ -980,7 +980,7 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -1047,7 +1047,7 @@ func (c *Organizations) CreateAccountRequest(input *CreateAccountInput) (req *re // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -1418,7 +1418,7 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -1485,7 +1485,7 @@ func (c *Organizations) CreateGovCloudAccountRequest(input *CreateGovCloudAccoun // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -1761,7 +1761,7 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -1828,7 +1828,7 @@ func (c *Organizations) CreateOrganizationRequest(input *CreateOrganizationInput // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -2099,7 +2099,7 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -2166,7 +2166,7 @@ func (c *Organizations) CreateOrganizationalUnitRequest(input *CreateOrganizatio // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -2435,7 +2435,7 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -2502,7 +2502,7 @@ func (c *Organizations) CreatePolicyRequest(input *CreatePolicyInput) (req *requ // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -3572,7 +3572,7 @@ func (c *Organizations) DeregisterDelegatedAdministratorRequest(input *Deregiste // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -3639,7 +3639,7 @@ func (c *Organizations) DeregisterDelegatedAdministratorRequest(input *Deregiste // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -4277,7 +4277,7 @@ func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectiveP // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -4344,7 +4344,7 @@ func (c *Organizations) DescribeEffectivePolicyRequest(input *DescribeEffectiveP // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -5294,7 +5294,7 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -5361,7 +5361,7 @@ func (c *Organizations) DetachPolicyRequest(input *DetachPolicyInput) (req *requ // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -5686,7 +5686,7 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -5753,7 +5753,7 @@ func (c *Organizations) DisableAWSServiceAccessRequest(input *DisableAWSServiceA // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -6025,7 +6025,7 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -6092,7 +6092,7 @@ func (c *Organizations) DisablePolicyTypeRequest(input *DisablePolicyTypeInput) // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -6383,7 +6383,7 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -6450,7 +6450,7 @@ func (c *Organizations) EnableAWSServiceAccessRequest(input *EnableAWSServiceAcc // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -6974,7 +6974,7 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -7041,7 +7041,7 @@ func (c *Organizations) EnablePolicyTypeRequest(input *EnablePolicyTypeInput) (r // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -7392,7 +7392,7 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -7459,7 +7459,7 @@ func (c *Organizations) InviteAccountToOrganizationRequest(input *InviteAccountT // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -7724,6 +7724,10 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // to the account object in the organization are deleted. AWS accounts outside // of an organization do not support tags. // +// * A newly created account has a waiting period before it can be removed +// from its organization. If you get an error that indicates that a wait +// period is required, then try again in a few days. +// // 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. @@ -7763,7 +7767,7 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -7830,7 +7834,7 @@ func (c *Organizations) LeaveOrganizationRequest(input *LeaveOrganizationInput) // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -8102,7 +8106,7 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -8169,7 +8173,7 @@ func (c *Organizations) ListAWSServiceAccessForOrganizationRequest(input *ListAW // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -9474,7 +9478,7 @@ func (c *Organizations) ListDelegatedAdministratorsRequest(input *ListDelegatedA // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -9541,7 +9545,7 @@ func (c *Organizations) ListDelegatedAdministratorsRequest(input *ListDelegatedA // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -9863,7 +9867,7 @@ func (c *Organizations) ListDelegatedServicesForAccountRequest(input *ListDelega // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -9930,7 +9934,7 @@ func (c *Organizations) ListDelegatedServicesForAccountRequest(input *ListDelega // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -12704,7 +12708,7 @@ func (c *Organizations) RegisterDelegatedAdministratorRequest(input *RegisterDel // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -12771,7 +12775,7 @@ func (c *Organizations) RegisterDelegatedAdministratorRequest(input *RegisterDel // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -13066,7 +13070,7 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -13133,7 +13137,7 @@ func (c *Organizations) RemoveAccountFromOrganizationRequest(input *RemoveAccoun // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -13408,7 +13412,7 @@ func (c *Organizations) TagResourceRequest(input *TagResourceInput) (req *reques // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -13475,7 +13479,7 @@ func (c *Organizations) TagResourceRequest(input *TagResourceInput) (req *reques // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -13745,7 +13749,7 @@ func (c *Organizations) UntagResourceRequest(input *UntagResourceInput) (req *re // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -13812,7 +13816,7 @@ func (c *Organizations) UntagResourceRequest(input *UntagResourceInput) (req *re // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -14261,7 +14265,7 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -14328,7 +14332,7 @@ func (c *Organizations) UpdatePolicyRequest(input *UpdatePolicyInput) (req *requ // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -15458,7 +15462,7 @@ func (s *ConcurrentModificationException) RequestID() string { // Some of the reasons in the following list might not be applicable to this // specific API or operation. // -// * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management +// * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -15525,7 +15529,7 @@ func (s *ConcurrentModificationException) RequestID() string { // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions -// in China. To create an organization, the master must have an valid business +// in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you @@ -15832,8 +15836,8 @@ type CreateAccountStatus struct { // If the request failed, a description of the reason for the failure. // - // * ACCOUNT_LIMIT_EXCEEDED: The account could not be created because you - // have reached the limit on the number of accounts in your organization. + // * ACCOUNT_LIMIT_EXCEEDED: The account couldn't be created because you + // reached the limit on the number of accounts in your organization. // // * CONCURRENT_ACCOUNT_MODIFICATION: You already submitted a request with // the same information. @@ -15859,7 +15863,8 @@ type CreateAccountStatus struct { // you provided is not valid. // // * INTERNAL_FAILURE: The account could not be created because of an internal - // failure. Try again later. If the problem persists, contact Customer Support. + // failure. Try again later. If the problem persists, contact AWS Customer + // Support. // // * MISSING_BUSINESS_VALIDATION: The AWS account that owns your organization // has not received Business Validation. @@ -15889,7 +15894,7 @@ type CreateAccountStatus struct { // The date and time that the request was made for the account creation. RequestedTimestamp *time.Time `type:"timestamp"` - // The status of the request. + // The status of the asynchronous request to create an AWS account. State *string `type:"string" enum:"CreateAccountState"` } @@ -16662,8 +16667,8 @@ type DelegatedService struct { // The date that the account became a delegated administrator for this service. DelegationEnabledDate *time.Time `type:"timestamp"` - // The name of a service that can request an operation for the specified service. - // This is typically in the form of a URL, such as: servicename.amazonaws.com. + // The name of an AWS service that can request an operation for the specified + // service. This is typically in the form of a URL, such as: servicename.amazonaws.com. ServicePrincipal *string `min:"1" type:"string"` } diff --git a/service/organizations/doc.go b/service/organizations/doc.go index 0cd7cc997c..8ca6de911b 100644 --- a/service/organizations/doc.go +++ b/service/organizations/doc.go @@ -3,7 +3,53 @@ // Package organizations provides the client and types for making API // requests to AWS Organizations. // -// AWS Organizations +// AWS Organizations is a web service that enables you to consolidate your multiple +// AWS accounts into an organization and centrally manage your accounts and +// their resources. +// +// This guide provides descriptions of the Organizations operations. For more +// information about using this service, see the AWS Organizations User Guide +// (http://docs.aws.amazon.com/organizations/latest/userguide/orgs_introduction.html). +// +// Support and feedback for AWS Organizations +// +// We welcome your feedback. Send your comments to feedback-awsorganizations@amazon.com +// (mailto:feedback-awsorganizations@amazon.com) or post your feedback and questions +// in the AWS Organizations support forum (http://forums.aws.amazon.com/forum.jspa?forumID=219). +// For more information about the AWS support forums, see Forums Help (http://forums.aws.amazon.com/help.jspa). +// +// Endpoint to call When using the AWS CLI or the AWS SDK +// +// For the current release of Organizations, specify the us-east-1 region for +// all AWS API and AWS CLI calls made from the commercial AWS Regions outside +// of China. If calling from one of the AWS Regions in China, then specify cn-northwest-1. +// You can do this in the AWS CLI by using these parameters and commands: +// +// * Use the following parameter with each command to specify both the endpoint +// and its region: --endpoint-url https://organizations.us-east-1.amazonaws.com +// (from commercial AWS Regions outside of China) or --endpoint-url https://organizations.cn-northwest-1.amazonaws.com.cn +// (from AWS Regions in China) +// +// * Use the default endpoint, but configure your default region with this +// command: aws configure set default.region us-east-1 (from commercial AWS +// Regions outside of China) or aws configure set default.region cn-northwest-1 +// (from AWS Regions in China) +// +// * Use the following parameter with each command to specify the endpoint: +// --region us-east-1 (from commercial AWS Regions outside of China) or --region +// cn-northwest-1 (from AWS Regions in China) +// +// Recording API Requests +// +// AWS Organizations supports AWS CloudTrail, a service that records AWS API +// calls for your AWS account and delivers log files to an Amazon S3 bucket. +// By using information collected by AWS CloudTrail, you can determine which +// requests the Organizations service received, who made the request and when, +// and so on. For more about AWS Organizations and its support for AWS CloudTrail, +// see Logging AWS Organizations Events with AWS CloudTrail (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_incident-response.html#orgs_cloudtrail-integration) +// in the AWS Organizations User Guide. To learn more about AWS CloudTrail, +// including how to turn it on and find your log files, see the AWS CloudTrail +// User Guide (http://docs.aws.amazon.com/awscloudtrail/latest/userguide/what_is_cloud_trail_top_level.html). // // See https://docs.aws.amazon.com/goto/WebAPI/organizations-2016-11-28 for more information on this service. // diff --git a/service/organizations/errors.go b/service/organizations/errors.go index d5a932b2bc..6380ad5946 100644 --- a/service/organizations/errors.go +++ b/service/organizations/errors.go @@ -96,7 +96,7 @@ const ( // Some of the reasons in the following list might not be applicable to this // specific API or operation. // - // * ACCOUNT_CANNOT_LEAVE_ORGANIZAION: You attempted to remove the management + // * ACCOUNT_CANNOT_LEAVE_ORGANIZATION: You attempted to remove the management // account from the organization. You can't remove the management account. // Instead, after you remove all member accounts, delete the organization // itself. @@ -163,7 +163,7 @@ const ( // with the same marketplace. // // * MASTER_ACCOUNT_MISSING_BUSINESS_LICENSE: Applies only to the AWS Regions - // in China. To create an organization, the master must have an valid business + // in China. To create an organization, the master must have a valid business // license. For more information, contact customer support. // // * MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you