aws-sdk-elasticbeanstalk 1.27.0 → 1.32.1

data/lib/aws-sdk-elasticbeanstalk/client_api.rb

@@ -37,6 +37,7 @@ module Aws::ElasticBeanstalk
     ApplicationVersionStatus = Shapes::StringShape.new(name: 'ApplicationVersionStatus')
     ApplyEnvironmentManagedActionRequest = Shapes::StructureShape.new(name: 'ApplyEnvironmentManagedActionRequest')
     ApplyEnvironmentManagedActionResult = Shapes::StructureShape.new(name: 'ApplyEnvironmentManagedActionResult')
+    AssociateEnvironmentOperationsRoleMessage = Shapes::StructureShape.new(name: 'AssociateEnvironmentOperationsRoleMessage')
     AutoCreateApplication = Shapes::BooleanShape.new(name: 'AutoCreateApplication')
     AutoScalingGroup = Shapes::StructureShape.new(name: 'AutoScalingGroup')
     AutoScalingGroupList = Shapes::ListShape.new(name: 'AutoScalingGroupList')
@@ -44,6 +45,8 @@ module Aws::ElasticBeanstalk
     AvailableSolutionStackNamesList = Shapes::ListShape.new(name: 'AvailableSolutionStackNamesList')
     BoxedBoolean = Shapes::BooleanShape.new(name: 'BoxedBoolean')
     BoxedInt = Shapes::IntegerShape.new(name: 'BoxedInt')
+    BranchName = Shapes::StringShape.new(name: 'BranchName')
+    BranchOrder = Shapes::IntegerShape.new(name: 'BranchOrder')
     BuildConfiguration = Shapes::StructureShape.new(name: 'BuildConfiguration')
     Builder = Shapes::StructureShape.new(name: 'Builder')
     CPUUtilization = Shapes::StructureShape.new(name: 'CPUUtilization')
@@ -114,6 +117,7 @@ module Aws::ElasticBeanstalk
     DescribePlatformVersionRequest = Shapes::StructureShape.new(name: 'DescribePlatformVersionRequest')
     DescribePlatformVersionResult = Shapes::StructureShape.new(name: 'DescribePlatformVersionResult')
     Description = Shapes::StringShape.new(name: 'Description')
+    DisassociateEnvironmentOperationsRoleMessage = Shapes::StructureShape.new(name: 'DisassociateEnvironmentOperationsRoleMessage')
     Ec2InstanceId = Shapes::StringShape.new(name: 'Ec2InstanceId')
     ElasticBeanstalkServiceException = Shapes::StructureShape.new(name: 'ElasticBeanstalkServiceException')
     EndpointURL = Shapes::StringShape.new(name: 'EndpointURL')
@@ -170,6 +174,8 @@ module Aws::ElasticBeanstalk
     LaunchTemplateList = Shapes::ListShape.new(name: 'LaunchTemplateList')
     LaunchedAt = Shapes::TimestampShape.new(name: 'LaunchedAt')
     ListAvailableSolutionStacksResultMessage = Shapes::StructureShape.new(name: 'ListAvailableSolutionStacksResultMessage')
+    ListPlatformBranchesRequest = Shapes::StructureShape.new(name: 'ListPlatformBranchesRequest')
+    ListPlatformBranchesResult = Shapes::StructureShape.new(name: 'ListPlatformBranchesResult')
     ListPlatformVersionsRequest = Shapes::StructureShape.new(name: 'ListPlatformVersionsRequest')
     ListPlatformVersionsResult = Shapes::StructureShape.new(name: 'ListPlatformVersionsResult')
     ListTagsForResourceMessage = Shapes::StructureShape.new(name: 'ListTagsForResourceMessage')
@@ -198,6 +204,7 @@ module Aws::ElasticBeanstalk
     OperatingSystemName = Shapes::StringShape.new(name: 'OperatingSystemName')
     OperatingSystemVersion = Shapes::StringShape.new(name: 'OperatingSystemVersion')
     OperationInProgressException = Shapes::StructureShape.new(name: 'OperationInProgressException')
+    OperationsRole = Shapes::StringShape.new(name: 'OperationsRole')
     OptionNamespace = Shapes::StringShape.new(name: 'OptionNamespace')
     OptionRestrictionMaxLength = Shapes::IntegerShape.new(name: 'OptionRestrictionMaxLength')
     OptionRestrictionMaxValue = Shapes::IntegerShape.new(name: 'OptionRestrictionMaxValue')
@@ -206,6 +213,10 @@ module Aws::ElasticBeanstalk
     OptionSpecification = Shapes::StructureShape.new(name: 'OptionSpecification')
     OptionsSpecifierList = Shapes::ListShape.new(name: 'OptionsSpecifierList')
     PlatformArn = Shapes::StringShape.new(name: 'PlatformArn')
+    PlatformBranchLifecycleState = Shapes::StringShape.new(name: 'PlatformBranchLifecycleState')
+    PlatformBranchMaxRecords = Shapes::IntegerShape.new(name: 'PlatformBranchMaxRecords')
+    PlatformBranchSummary = Shapes::StructureShape.new(name: 'PlatformBranchSummary')
+    PlatformBranchSummaryList = Shapes::ListShape.new(name: 'PlatformBranchSummaryList')
     PlatformCategory = Shapes::StringShape.new(name: 'PlatformCategory')
     PlatformDescription = Shapes::StructureShape.new(name: 'PlatformDescription')
     PlatformFilter = Shapes::StructureShape.new(name: 'PlatformFilter')
@@ -216,6 +227,7 @@ module Aws::ElasticBeanstalk
     PlatformFilters = Shapes::ListShape.new(name: 'PlatformFilters')
     PlatformFramework = Shapes::StructureShape.new(name: 'PlatformFramework')
     PlatformFrameworks = Shapes::ListShape.new(name: 'PlatformFrameworks')
+    PlatformLifecycleState = Shapes::StringShape.new(name: 'PlatformLifecycleState')
     PlatformMaxRecords = Shapes::IntegerShape.new(name: 'PlatformMaxRecords')
     PlatformName = Shapes::StringShape.new(name: 'PlatformName')
     PlatformOwner = Shapes::StringShape.new(name: 'PlatformOwner')
@@ -252,6 +264,12 @@ module Aws::ElasticBeanstalk
     S3LocationNotInServiceRegionException = Shapes::StructureShape.new(name: 'S3LocationNotInServiceRegionException')
     S3SubscriptionRequiredException = Shapes::StructureShape.new(name: 'S3SubscriptionRequiredException')
     SampleTimestamp = Shapes::TimestampShape.new(name: 'SampleTimestamp')
+    SearchFilter = Shapes::StructureShape.new(name: 'SearchFilter')
+    SearchFilterAttribute = Shapes::StringShape.new(name: 'SearchFilterAttribute')
+    SearchFilterOperator = Shapes::StringShape.new(name: 'SearchFilterOperator')
+    SearchFilterValue = Shapes::StringShape.new(name: 'SearchFilterValue')
+    SearchFilterValues = Shapes::ListShape.new(name: 'SearchFilterValues')
+    SearchFilters = Shapes::ListShape.new(name: 'SearchFilters')
     SingleInstanceHealth = Shapes::StructureShape.new(name: 'SingleInstanceHealth')
     SolutionStackDescription = Shapes::StructureShape.new(name: 'SolutionStackDescription')
     SolutionStackFileTypeList = Shapes::ListShape.new(name: 'SolutionStackFileTypeList')
@@ -384,6 +402,10 @@ module Aws::ElasticBeanstalk
     ApplyEnvironmentManagedActionResult.add_member(:status, Shapes::ShapeRef.new(shape: String, location_name: "Status"))
     ApplyEnvironmentManagedActionResult.struct_class = Types::ApplyEnvironmentManagedActionResult
 
+    AssociateEnvironmentOperationsRoleMessage.add_member(:environment_name, Shapes::ShapeRef.new(shape: EnvironmentName, required: true, location_name: "EnvironmentName"))
+    AssociateEnvironmentOperationsRoleMessage.add_member(:operations_role, Shapes::ShapeRef.new(shape: OperationsRole, required: true, location_name: "OperationsRole"))
+    AssociateEnvironmentOperationsRoleMessage.struct_class = Types::AssociateEnvironmentOperationsRoleMessage
+
     AutoScalingGroup.add_member(:name, Shapes::ShapeRef.new(shape: ResourceId, location_name: "Name"))
     AutoScalingGroup.struct_class = Types::AutoScalingGroup
 
@@ -522,6 +544,7 @@ module Aws::ElasticBeanstalk
     CreateEnvironmentMessage.add_member(:platform_arn, Shapes::ShapeRef.new(shape: PlatformArn, location_name: "PlatformArn"))
     CreateEnvironmentMessage.add_member(:option_settings, Shapes::ShapeRef.new(shape: ConfigurationOptionSettingsList, location_name: "OptionSettings"))
     CreateEnvironmentMessage.add_member(:options_to_remove, Shapes::ShapeRef.new(shape: OptionsSpecifierList, location_name: "OptionsToRemove"))
+    CreateEnvironmentMessage.add_member(:operations_role, Shapes::ShapeRef.new(shape: OperationsRole, location_name: "OperationsRole"))
     CreateEnvironmentMessage.struct_class = Types::CreateEnvironmentMessage
 
     CreatePlatformVersionRequest.add_member(:platform_name, Shapes::ShapeRef.new(shape: PlatformName, required: true, location_name: "PlatformName"))
@@ -677,6 +700,9 @@ module Aws::ElasticBeanstalk
     DescribePlatformVersionResult.add_member(:platform_description, Shapes::ShapeRef.new(shape: PlatformDescription, location_name: "PlatformDescription"))
     DescribePlatformVersionResult.struct_class = Types::DescribePlatformVersionResult
 
+    DisassociateEnvironmentOperationsRoleMessage.add_member(:environment_name, Shapes::ShapeRef.new(shape: EnvironmentName, required: true, location_name: "EnvironmentName"))
+    DisassociateEnvironmentOperationsRoleMessage.struct_class = Types::DisassociateEnvironmentOperationsRoleMessage
+
     ElasticBeanstalkServiceException.add_member(:message, Shapes::ShapeRef.new(shape: ExceptionMessage, location_name: "message"))
     ElasticBeanstalkServiceException.struct_class = Types::ElasticBeanstalkServiceException
 
@@ -700,6 +726,7 @@ module Aws::ElasticBeanstalk
     EnvironmentDescription.add_member(:tier, Shapes::ShapeRef.new(shape: EnvironmentTier, location_name: "Tier"))
     EnvironmentDescription.add_member(:environment_links, Shapes::ShapeRef.new(shape: EnvironmentLinks, location_name: "EnvironmentLinks"))
     EnvironmentDescription.add_member(:environment_arn, Shapes::ShapeRef.new(shape: EnvironmentArn, location_name: "EnvironmentArn"))
+    EnvironmentDescription.add_member(:operations_role, Shapes::ShapeRef.new(shape: OperationsRole, location_name: "OperationsRole"))
     EnvironmentDescription.struct_class = Types::EnvironmentDescription
 
     EnvironmentDescriptionsList.member = Shapes::ShapeRef.new(shape: EnvironmentDescription)
@@ -813,6 +840,15 @@ module Aws::ElasticBeanstalk
     ListAvailableSolutionStacksResultMessage.add_member(:solution_stack_details, Shapes::ShapeRef.new(shape: AvailableSolutionStackDetailsList, location_name: "SolutionStackDetails"))
     ListAvailableSolutionStacksResultMessage.struct_class = Types::ListAvailableSolutionStacksResultMessage
 
+    ListPlatformBranchesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: SearchFilters, location_name: "Filters"))
+    ListPlatformBranchesRequest.add_member(:max_records, Shapes::ShapeRef.new(shape: PlatformBranchMaxRecords, location_name: "MaxRecords"))
+    ListPlatformBranchesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "NextToken"))
+    ListPlatformBranchesRequest.struct_class = Types::ListPlatformBranchesRequest
+
+    ListPlatformBranchesResult.add_member(:platform_branch_summary_list, Shapes::ShapeRef.new(shape: PlatformBranchSummaryList, location_name: "PlatformBranchSummaryList"))
+    ListPlatformBranchesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "NextToken"))
+    ListPlatformBranchesResult.struct_class = Types::ListPlatformBranchesResult
+
     ListPlatformVersionsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: PlatformFilters, location_name: "Filters"))
     ListPlatformVersionsRequest.add_member(:max_records, Shapes::ShapeRef.new(shape: PlatformMaxRecords, location_name: "MaxRecords"))
     ListPlatformVersionsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "NextToken"))
@@ -889,6 +925,15 @@ module Aws::ElasticBeanstalk
 
     OptionsSpecifierList.member = Shapes::ShapeRef.new(shape: OptionSpecification)
 
+    PlatformBranchSummary.add_member(:platform_name, Shapes::ShapeRef.new(shape: PlatformName, location_name: "PlatformName"))
+    PlatformBranchSummary.add_member(:branch_name, Shapes::ShapeRef.new(shape: BranchName, location_name: "BranchName"))
+    PlatformBranchSummary.add_member(:lifecycle_state, Shapes::ShapeRef.new(shape: PlatformBranchLifecycleState, location_name: "LifecycleState"))
+    PlatformBranchSummary.add_member(:branch_order, Shapes::ShapeRef.new(shape: BranchOrder, location_name: "BranchOrder"))
+    PlatformBranchSummary.add_member(:supported_tier_list, Shapes::ShapeRef.new(shape: SupportedTierList, location_name: "SupportedTierList"))
+    PlatformBranchSummary.struct_class = Types::PlatformBranchSummary
+
+    PlatformBranchSummaryList.member = Shapes::ShapeRef.new(shape: PlatformBranchSummary)
+
     PlatformDescription.add_member(:platform_arn, Shapes::ShapeRef.new(shape: PlatformArn, location_name: "PlatformArn"))
     PlatformDescription.add_member(:platform_owner, Shapes::ShapeRef.new(shape: PlatformOwner, location_name: "PlatformOwner"))
     PlatformDescription.add_member(:platform_name, Shapes::ShapeRef.new(shape: PlatformName, location_name: "PlatformName"))
@@ -907,6 +952,9 @@ module Aws::ElasticBeanstalk
     PlatformDescription.add_member(:custom_ami_list, Shapes::ShapeRef.new(shape: CustomAmiList, location_name: "CustomAmiList"))
     PlatformDescription.add_member(:supported_tier_list, Shapes::ShapeRef.new(shape: SupportedTierList, location_name: "SupportedTierList"))
     PlatformDescription.add_member(:supported_addon_list, Shapes::ShapeRef.new(shape: SupportedAddonList, location_name: "SupportedAddonList"))
+    PlatformDescription.add_member(:platform_lifecycle_state, Shapes::ShapeRef.new(shape: PlatformLifecycleState, location_name: "PlatformLifecycleState"))
+    PlatformDescription.add_member(:platform_branch_name, Shapes::ShapeRef.new(shape: BranchName, location_name: "PlatformBranchName"))
+    PlatformDescription.add_member(:platform_branch_lifecycle_state, Shapes::ShapeRef.new(shape: PlatformBranchLifecycleState, location_name: "PlatformBranchLifecycleState"))
     PlatformDescription.struct_class = Types::PlatformDescription
 
     PlatformFilter.add_member(:type, Shapes::ShapeRef.new(shape: PlatformFilterType, location_name: "Type"))
@@ -938,6 +986,10 @@ module Aws::ElasticBeanstalk
     PlatformSummary.add_member(:operating_system_version, Shapes::ShapeRef.new(shape: OperatingSystemVersion, location_name: "OperatingSystemVersion"))
     PlatformSummary.add_member(:supported_tier_list, Shapes::ShapeRef.new(shape: SupportedTierList, location_name: "SupportedTierList"))
     PlatformSummary.add_member(:supported_addon_list, Shapes::ShapeRef.new(shape: SupportedAddonList, location_name: "SupportedAddonList"))
+    PlatformSummary.add_member(:platform_lifecycle_state, Shapes::ShapeRef.new(shape: PlatformLifecycleState, location_name: "PlatformLifecycleState"))
+    PlatformSummary.add_member(:platform_version, Shapes::ShapeRef.new(shape: PlatformVersion, location_name: "PlatformVersion"))
+    PlatformSummary.add_member(:platform_branch_name, Shapes::ShapeRef.new(shape: BranchName, location_name: "PlatformBranchName"))
+    PlatformSummary.add_member(:platform_branch_lifecycle_state, Shapes::ShapeRef.new(shape: PlatformBranchLifecycleState, location_name: "PlatformBranchLifecycleState"))
     PlatformSummary.struct_class = Types::PlatformSummary
 
     PlatformSummaryList.member = Shapes::ShapeRef.new(shape: PlatformSummary)
@@ -997,6 +1049,15 @@ module Aws::ElasticBeanstalk
 
     S3SubscriptionRequiredException.struct_class = Types::S3SubscriptionRequiredException
 
+    SearchFilter.add_member(:attribute, Shapes::ShapeRef.new(shape: SearchFilterAttribute, location_name: "Attribute"))
+    SearchFilter.add_member(:operator, Shapes::ShapeRef.new(shape: SearchFilterOperator, location_name: "Operator"))
+    SearchFilter.add_member(:values, Shapes::ShapeRef.new(shape: SearchFilterValues, location_name: "Values"))
+    SearchFilter.struct_class = Types::SearchFilter
+
+    SearchFilterValues.member = Shapes::ShapeRef.new(shape: SearchFilterValue)
+
+    SearchFilters.member = Shapes::ShapeRef.new(shape: SearchFilter)
+
     SingleInstanceHealth.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, location_name: "InstanceId"))
     SingleInstanceHealth.add_member(:health_status, Shapes::ShapeRef.new(shape: String, location_name: "HealthStatus"))
     SingleInstanceHealth.add_member(:color, Shapes::ShapeRef.new(shape: String, location_name: "Color"))
@@ -1175,6 +1236,15 @@ module Aws::ElasticBeanstalk
         o.errors << Shapes::ShapeRef.new(shape: ManagedActionInvalidStateException)
       end)
 
+      api.add_operation(:associate_environment_operations_role, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "AssociateEnvironmentOperationsRole"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: AssociateEnvironmentOperationsRoleMessage)
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.errors << Shapes::ShapeRef.new(shape: InsufficientPrivilegesException)
+      end)
+
       api.add_operation(:check_dns_availability, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CheckDNSAvailability"
         o.http_method = "POST"
@@ -1430,6 +1500,15 @@ module Aws::ElasticBeanstalk
         o.errors << Shapes::ShapeRef.new(shape: ElasticBeanstalkServiceException)
       end)
 
+      api.add_operation(:disassociate_environment_operations_role, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DisassociateEnvironmentOperationsRole"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DisassociateEnvironmentOperationsRoleMessage)
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.errors << Shapes::ShapeRef.new(shape: InsufficientPrivilegesException)
+      end)
+
       api.add_operation(:list_available_solution_stacks, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListAvailableSolutionStacks"
         o.http_method = "POST"
@@ -1438,6 +1517,20 @@ module Aws::ElasticBeanstalk
         o.output = Shapes::ShapeRef.new(shape: ListAvailableSolutionStacksResultMessage)
       end)
 
+      api.add_operation(:list_platform_branches, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListPlatformBranches"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ListPlatformBranchesRequest)
+        o.output = Shapes::ShapeRef.new(shape: ListPlatformBranchesResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_records",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:list_platform_versions, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListPlatformVersions"
         o.http_method = "POST"

data/lib/aws-sdk-elasticbeanstalk/resource.rb

@@ -6,13 +6,7 @@
 # WARNING ABOUT GENERATED CODE
 
 module Aws::ElasticBeanstalk
-  # This class provides a resource oriented interface for ElasticBeanstalk.
-  # To create a resource object:
-  #     resource = Aws::ElasticBeanstalk::Resource.new(region: 'us-west-2')
-  # You can supply a client object with custom configuration that will be used for all resource operations.
-  # If you do not pass +:client+, a default client will be constructed.
-  #     client = Aws::ElasticBeanstalk::Client.new(region: 'us-west-2')
-  #     resource = Aws::ElasticBeanstalk::Resource.new(client: client)
+
   class Resource
 
     # @param options ({})

data/lib/aws-sdk-elasticbeanstalk/types.rb

@@ -145,7 +145,7 @@ module Aws::ElasticBeanstalk
 
     # The resource lifecycle configuration for an application. Defines
     # lifecycle settings for resources that belong to the application, and
-    # the service role that Elastic Beanstalk assumes in order to apply
+    # the service role that AWS Elastic Beanstalk assumes in order to apply
     # lifecycle settings. The version lifecycle configuration defines
     # lifecycle settings for application versions.
     #
@@ -184,7 +184,7 @@ module Aws::ElasticBeanstalk
     #   @return [String]
     #
     # @!attribute [rw] version_lifecycle_config
-    #   The application version lifecycle configuration.
+    #   Defines lifecycle settings for application versions.
     #   @return [Types::ApplicationVersionLifecycleConfig]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/ApplicationResourceLifecycleConfig AWS API Documentation
@@ -431,6 +431,33 @@ module Aws::ElasticBeanstalk
       include Aws::Structure
     end
 
+    # Request to add or change the operations role used by an environment.
+    #
+    # @note When making an API call, you may pass AssociateEnvironmentOperationsRoleMessage
+    #   data as a hash:
+    #
+    #       {
+    #         environment_name: "EnvironmentName", # required
+    #         operations_role: "OperationsRole", # required
+    #       }
+    #
+    # @!attribute [rw] environment_name
+    #   The name of the environment to which to set the operations role.
+    #   @return [String]
+    #
+    # @!attribute [rw] operations_role
+    #   The Amazon Resource Name (ARN) of an existing IAM role to be used as
+    #   the environment's operations role.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/AssociateEnvironmentOperationsRoleMessage AWS API Documentation
+    #
+    class AssociateEnvironmentOperationsRoleMessage < Struct.new(
+      :environment_name,
+      :operations_role)
+      include Aws::Structure
+    end
+
     # Describes an Auto Scaling launch configuration.
     #
     # @!attribute [rw] name
@@ -787,8 +814,9 @@ module Aws::ElasticBeanstalk
     end
 
     # A specification identifying an individual configuration option along
-    # with its current value. For a list of possible option values, go to
-    # [Option Values][1] in the *AWS Elastic Beanstalk Developer Guide*.
+    # with its current value. For a list of possible namespaces and option
+    # values, see [Option Values][1] in the *AWS Elastic Beanstalk Developer
+    # Guide*.
     #
     #
     #
@@ -805,12 +833,12 @@ module Aws::ElasticBeanstalk
     #       }
     #
     # @!attribute [rw] resource_name
-    #   A unique resource name for a time-based scaling configuration
-    #   option.
+    #   A unique resource name for the option setting. Use it for a
+    #   time–based scaling configuration option.
     #   @return [String]
     #
     # @!attribute [rw] namespace
-    #   A unique namespace identifying the option's associated AWS
+    #   A unique namespace that identifies the option's associated AWS
     #   resource.
     #   @return [String]
     #
@@ -840,7 +868,7 @@ module Aws::ElasticBeanstalk
     #   @return [String]
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the platform.
+    #   The ARN of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] options
@@ -863,7 +891,7 @@ module Aws::ElasticBeanstalk
     #   @return [String]
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the platform.
+    #   The ARN of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] application_name
@@ -991,19 +1019,15 @@ module Aws::ElasticBeanstalk
     #       }
     #
     # @!attribute [rw] application_name
-    #   The name of the application.
-    #
-    #   Constraint: This name must be unique within your account. If the
-    #   specified name already exists, the action returns an
-    #   `InvalidParameterValue` error.
+    #   The name of the application. Must be unique within your account.
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   Describes the application.
+    #   Your description of the application.
     #   @return [String]
     #
     # @!attribute [rw] resource_lifecycle_config
-    #   Specify an application resource lifecycle configuration to prevent
+    #   Specifies an application resource lifecycle configuration to prevent
     #   your application from accumulating too many versions.
     #   @return [Types::ApplicationResourceLifecycleConfig]
     #
@@ -1074,7 +1098,7 @@ module Aws::ElasticBeanstalk
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   Describes this version.
+    #   A description of this application version.
     #   @return [String]
     #
     # @!attribute [rw] source_build_information
@@ -1179,74 +1203,91 @@ module Aws::ElasticBeanstalk
     #       }
     #
     # @!attribute [rw] application_name
-    #   The name of the application to associate with this configuration
-    #   template. If no application is found with this name, AWS Elastic
-    #   Beanstalk returns an `InvalidParameterValue` error.
+    #   The name of the Elastic Beanstalk application to associate with this
+    #   configuration template.
     #   @return [String]
     #
     # @!attribute [rw] template_name
     #   The name of the configuration template.
     #
     #   Constraint: This name must be unique per application.
-    #
-    #   Default: If a configuration template already exists with this name,
-    #   AWS Elastic Beanstalk returns an `InvalidParameterValue` error.
     #   @return [String]
     #
     # @!attribute [rw] solution_stack_name
-    #   The name of the solution stack used by this configuration. The
-    #   solution stack specifies the operating system, architecture, and
-    #   application server for a configuration template. It determines the
-    #   set of configuration options as well as the possible and default
-    #   values.
+    #   The name of an Elastic Beanstalk solution stack (platform version)
+    #   that this configuration uses. For example, `64bit Amazon Linux
+    #   2013.09 running Tomcat 7 Java 7`. A solution stack specifies the
+    #   operating system, runtime, and application server for a
+    #   configuration template. It also determines the set of configuration
+    #   options as well as the possible and default values. For more
+    #   information, see [Supported Platforms][1] in the *AWS Elastic
+    #   Beanstalk Developer Guide*.
+    #
+    #   You must specify `SolutionStackName` if you don't specify
+    #   `PlatformArn`, `EnvironmentId`, or `SourceConfiguration`.
+    #
+    #   Use the [ `ListAvailableSolutionStacks` ][2] API to obtain a list of
+    #   available solution stacks.
     #
-    #   Use ListAvailableSolutionStacks to obtain a list of available
-    #   solution stacks.
     #
-    #   A solution stack name or a source configuration parameter must be
-    #   specified, otherwise AWS Elastic Beanstalk returns an
-    #   `InvalidParameterValue` error.
     #
-    #   If a solution stack name is not specified and the source
-    #   configuration parameter is specified, AWS Elastic Beanstalk uses the
-    #   same solution stack as the source configuration template.
+    #   [1]: https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/concepts.platforms.html
+    #   [2]: https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ListAvailableSolutionStacks.html
     #   @return [String]
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the custom platform.
+    #   The Amazon Resource Name (ARN) of the custom platform. For more
+    #   information, see [ Custom Platforms][1] in the *AWS Elastic
+    #   Beanstalk Developer Guide*.
+    #
+    #   <note markdown="1"> If you specify `PlatformArn`, then don't specify
+    #   `SolutionStackName`.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/custom-platforms.html
     #   @return [String]
     #
     # @!attribute [rw] source_configuration
-    #   If specified, AWS Elastic Beanstalk uses the configuration values
-    #   from the specified configuration template to create a new
-    #   configuration.
+    #   An Elastic Beanstalk configuration template to base this one on. If
+    #   specified, Elastic Beanstalk uses the configuration values from the
+    #   specified configuration template to create a new configuration.
     #
-    #   Values specified in the `OptionSettings` parameter of this call
-    #   overrides any values obtained from the `SourceConfiguration`.
+    #   Values specified in `OptionSettings` override any values obtained
+    #   from the `SourceConfiguration`.
     #
-    #   If no configuration template is found, returns an
-    #   `InvalidParameterValue` error.
+    #   You must specify `SourceConfiguration` if you don't specify
+    #   `PlatformArn`, `EnvironmentId`, or `SolutionStackName`.
     #
-    #   Constraint: If both the solution stack name parameter and the source
-    #   configuration parameters are specified, the solution stack of the
-    #   source configuration template must match the specified solution
-    #   stack name or else AWS Elastic Beanstalk returns an
-    #   `InvalidParameterCombination` error.
+    #   Constraint: If both solution stack name and source configuration are
+    #   specified, the solution stack of the source configuration template
+    #   must match the specified solution stack name.
     #   @return [Types::SourceConfiguration]
     #
     # @!attribute [rw] environment_id
-    #   The ID of the environment used with this configuration template.
+    #   The ID of an environment whose settings you want to use to create
+    #   the configuration template. You must specify `EnvironmentId` if you
+    #   don't specify `PlatformArn`, `SolutionStackName`, or
+    #   `SourceConfiguration`.
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   Describes this configuration.
+    #   An optional description for this configuration.
     #   @return [String]
     #
     # @!attribute [rw] option_settings
-    #   If specified, AWS Elastic Beanstalk sets the specified configuration
-    #   option to the requested value. The new value overrides the value
+    #   Option values for the Elastic Beanstalk configuration, such as the
+    #   instance type. If specified, these values override the values
     #   obtained from the solution stack or the source configuration
-    #   template.
+    #   template. For a complete list of Elastic Beanstalk configuration
+    #   options, see [Option Values][1] in the *AWS Elastic Beanstalk
+    #   Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html
     #   @return [Array<Types::ConfigurationOptionSetting>]
     #
     # @!attribute [rw] tags
@@ -1307,27 +1348,24 @@ module Aws::ElasticBeanstalk
     #             option_name: "ConfigurationOptionName",
     #           },
     #         ],
+    #         operations_role: "OperationsRole",
     #       }
     #
     # @!attribute [rw] application_name
-    #   The name of the application that contains the version to be
-    #   deployed.
-    #
-    #   If no application is found with this name, `CreateEnvironment`
-    #   returns an `InvalidParameterValue` error.
+    #   The name of the application that is associated with this
+    #   environment.
     #   @return [String]
     #
     # @!attribute [rw] environment_name
-    #   A unique name for the deployment environment. Used in the
-    #   application URL.
+    #   A unique name for the environment.
     #
     #   Constraint: Must be from 4 to 40 characters in length. The name can
-    #   contain only letters, numbers, and hyphens. It cannot start or end
+    #   contain only letters, numbers, and hyphens. It can't start or end
     #   with a hyphen. This name must be unique within a region in your
-    #   account. If the specified name already exists in the region, AWS
-    #   Elastic Beanstalk returns an `InvalidParameterValue` error.
+    #   account. If the specified name already exists in the region, Elastic
+    #   Beanstalk returns an `InvalidParameterValue` error.
     #
-    #   Default: If the CNAME parameter is not specified, the environment
+    #   If you don't specify the `CNAMEPrefix` parameter, the environment
     #   name becomes part of the CNAME, and therefore part of the visible
     #   URL for your application.
     #   @return [String]
@@ -1344,18 +1382,22 @@ module Aws::ElasticBeanstalk
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   Describes this environment.
+    #   Your description for this environment.
     #   @return [String]
     #
     # @!attribute [rw] cname_prefix
     #   If specified, the environment attempts to use this value as the
-    #   prefix for the CNAME. If not specified, the CNAME is generated
-    #   automatically by appending a random alphanumeric string to the
-    #   environment name.
+    #   prefix for the CNAME in your Elastic Beanstalk environment URL. If
+    #   not specified, the CNAME is generated automatically by appending a
+    #   random alphanumeric string to the environment name.
     #   @return [String]
     #
     # @!attribute [rw] tier
-    #   This specifies the tier to use for creating this environment.
+    #   Specifies the tier to use in creating this environment. The
+    #   environment tier that you choose determines whether Elastic
+    #   Beanstalk provisions resources to support a web application that
+    #   handles HTTP(S) requests or a web application that handles
+    #   background-processing tasks.
     #   @return [Types::EnvironmentTier]
     #
     # @!attribute [rw] tags
@@ -1365,35 +1407,50 @@ module Aws::ElasticBeanstalk
     # @!attribute [rw] version_label
     #   The name of the application version to deploy.
     #
-    #   If the specified application has no associated application versions,
-    #   AWS Elastic Beanstalk `UpdateEnvironment` returns an
-    #   `InvalidParameterValue` error.
-    #
-    #   Default: If not specified, AWS Elastic Beanstalk attempts to launch
-    #   the sample application in the container.
+    #   Default: If not specified, Elastic Beanstalk attempts to deploy the
+    #   sample application.
     #   @return [String]
     #
     # @!attribute [rw] template_name
-    #   The name of the configuration template to use in deployment. If no
-    #   configuration template is found with this name, AWS Elastic
-    #   Beanstalk returns an `InvalidParameterValue` error.
+    #   The name of the Elastic Beanstalk configuration template to use with
+    #   the environment.
+    #
+    #   <note markdown="1"> If you specify `TemplateName`, then don't specify
+    #   `SolutionStackName`.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] solution_stack_name
-    #   This is an alternative to specifying a template name. If specified,
-    #   AWS Elastic Beanstalk sets the configuration values to the default
-    #   values associated with the specified solution stack.
+    #   The name of an Elastic Beanstalk solution stack (platform version)
+    #   to use with the environment. If specified, Elastic Beanstalk sets
+    #   the configuration values to the default values associated with the
+    #   specified solution stack. For a list of current solution stacks, see
+    #   [Elastic Beanstalk Supported Platforms][1] in the *AWS Elastic
+    #   Beanstalk Platforms* guide.
     #
-    #   For a list of current solution stacks, see [Elastic Beanstalk
-    #   Supported Platforms][1].
+    #   <note markdown="1"> If you specify `SolutionStackName`, don't specify `PlatformArn` or
+    #   `TemplateName`.
     #
+    #    </note>
     #
     #
-    #   [1]: https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/concepts.platforms.html
+    #
+    #   [1]: https://docs.aws.amazon.com/elasticbeanstalk/latest/platforms/platforms-supported.html
     #   @return [String]
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the platform.
+    #   The Amazon Resource Name (ARN) of the custom platform to use with
+    #   the environment. For more information, see [Custom Platforms][1] in
+    #   the *AWS Elastic Beanstalk Developer Guide*.
+    #
+    #   <note markdown="1"> If you specify `PlatformArn`, don't specify `SolutionStackName`.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/custom-platforms.html
     #   @return [String]
     #
     # @!attribute [rw] option_settings
@@ -1408,6 +1465,21 @@ module Aws::ElasticBeanstalk
     #   the configuration set for this new environment.
     #   @return [Array<Types::OptionSpecification>]
     #
+    # @!attribute [rw] operations_role
+    #   The Amazon Resource Name (ARN) of an existing IAM role to be used as
+    #   the environment's operations role. If specified, Elastic Beanstalk
+    #   uses the operations role for permissions to downstream services
+    #   during this call and during subsequent calls acting on this
+    #   environment. To specify an operations role, you must have the
+    #   `iam:PassRole` permission for the role. For more information, see
+    #   [Operations roles][1] in the *AWS Elastic Beanstalk Developer
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/iam-operationsrole.html
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/CreateEnvironmentMessage AWS API Documentation
     #
     class CreateEnvironmentMessage < Struct.new(
@@ -1423,7 +1495,8 @@ module Aws::ElasticBeanstalk
       :solution_stack_name,
       :platform_arn,
       :option_settings,
-      :options_to_remove)
+      :options_to_remove,
+      :operations_role)
       include Aws::Structure
     end
 
@@ -2276,7 +2349,9 @@ module Aws::ElasticBeanstalk
     #   @return [String]
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the version of the custom platform.
+    #   The ARN of a custom platform version. If specified, AWS Elastic
+    #   Beanstalk restricts the returned descriptions to those associated
+    #   with this custom platform version.
     #   @return [String]
     #
     # @!attribute [rw] request_id
@@ -2404,7 +2479,7 @@ module Aws::ElasticBeanstalk
     #       }
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the version of the platform.
+    #   The ARN of the platform version.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/DescribePlatformVersionRequest AWS API Documentation
@@ -2415,7 +2490,7 @@ module Aws::ElasticBeanstalk
     end
 
     # @!attribute [rw] platform_description
-    #   Detailed information about the version of the platform.
+    #   Detailed information about the platform version.
     #   @return [Types::PlatformDescription]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/DescribePlatformVersionResult AWS API Documentation
@@ -2425,6 +2500,27 @@ module Aws::ElasticBeanstalk
       include Aws::Structure
     end
 
+    # Request to disassociate the operations role from an environment.
+    #
+    # @note When making an API call, you may pass DisassociateEnvironmentOperationsRoleMessage
+    #   data as a hash:
+    #
+    #       {
+    #         environment_name: "EnvironmentName", # required
+    #       }
+    #
+    # @!attribute [rw] environment_name
+    #   The name of the environment from which to disassociate the
+    #   operations role.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/DisassociateEnvironmentOperationsRoleMessage AWS API Documentation
+    #
+    class DisassociateEnvironmentOperationsRoleMessage < Struct.new(
+      :environment_name)
+      include Aws::Structure
+    end
+
     # A generic service exception has occurred.
     #
     # @!attribute [rw] message
@@ -2461,7 +2557,7 @@ module Aws::ElasticBeanstalk
     #   @return [String]
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the platform.
+    #   The ARN of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] template_name
@@ -2564,6 +2660,16 @@ module Aws::ElasticBeanstalk
     #   other API requests that require an ARN.
     #   @return [String]
     #
+    # @!attribute [rw] operations_role
+    #   The Amazon Resource Name (ARN) of the environment's operations
+    #   role. For more information, see [Operations roles][1] in the *AWS
+    #   Elastic Beanstalk Developer Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/iam-operationsrole.html
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/EnvironmentDescription AWS API Documentation
     #
     class EnvironmentDescription < Struct.new(
@@ -2586,7 +2692,8 @@ module Aws::ElasticBeanstalk
       :resources,
       :tier,
       :environment_links,
-      :environment_arn)
+      :environment_arn,
+      :operations_role)
       include Aws::Structure
     end
 
@@ -2821,7 +2928,7 @@ module Aws::ElasticBeanstalk
     #   @return [String]
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the platform.
+    #   The ARN of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] request_id
@@ -3056,6 +3163,101 @@ module Aws::ElasticBeanstalk
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ListPlatformBranchesRequest
+    #   data as a hash:
+    #
+    #       {
+    #         filters: [
+    #           {
+    #             attribute: "SearchFilterAttribute",
+    #             operator: "SearchFilterOperator",
+    #             values: ["SearchFilterValue"],
+    #           },
+    #         ],
+    #         max_records: 1,
+    #         next_token: "Token",
+    #       }
+    #
+    # @!attribute [rw] filters
+    #   Criteria for restricting the resulting list of platform branches.
+    #   The filter is evaluated as a logical conjunction (AND) of the
+    #   separate `SearchFilter` terms.
+    #
+    #   The following list shows valid attribute values for each of the
+    #   `SearchFilter` terms. Most operators take a single value. The `in`
+    #   and `not_in` operators can take multiple values.
+    #
+    #   * `Attribute = BranchName`\:
+    #
+    #     * `Operator`\: `=` \| `!=` \| `begins_with` \| `ends_with` \|
+    #       `contains` \| `in` \| `not_in`
+    #
+    #     ^
+    #
+    #   * `Attribute = LifecycleState`\:
+    #
+    #     * `Operator`\: `=` \| `!=` \| `in` \| `not_in`
+    #
+    #     * `Values`\: `beta` \| `supported` \| `deprecated` \| `retired`
+    #
+    #   * `Attribute = PlatformName`\:
+    #
+    #     * `Operator`\: `=` \| `!=` \| `begins_with` \| `ends_with` \|
+    #       `contains` \| `in` \| `not_in`
+    #
+    #     ^
+    #
+    #   * `Attribute = TierType`\:
+    #
+    #     * `Operator`\: `=` \| `!=`
+    #
+    #     * `Values`\: `WebServer/Standard` \| `Worker/SQS/HTTP`
+    #
+    #   Array size: limited to 10 `SearchFilter` objects.
+    #
+    #   Within each `SearchFilter` item, the `Values` array is limited to 10
+    #   items.
+    #   @return [Array<Types::SearchFilter>]
+    #
+    # @!attribute [rw] max_records
+    #   The maximum number of platform branch values returned in one call.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   For a paginated request. Specify a token from a previous response
+    #   page to retrieve the next response page. All other parameter values
+    #   must be identical to the ones specified in the initial request.
+    #
+    #   If no `NextToken` is specified, the first page is retrieved.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/ListPlatformBranchesRequest AWS API Documentation
+    #
+    class ListPlatformBranchesRequest < Struct.new(
+      :filters,
+      :max_records,
+      :next_token)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] platform_branch_summary_list
+    #   Summary information about the platform branches.
+    #   @return [Array<Types::PlatformBranchSummary>]
+    #
+    # @!attribute [rw] next_token
+    #   In a paginated request, if this value isn't `null`, it's the token
+    #   that you can pass in a subsequent request to get the next response
+    #   page.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/ListPlatformBranchesResult AWS API Documentation
+    #
+    class ListPlatformBranchesResult < Struct.new(
+      :platform_branch_summary_list,
+      :next_token)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListPlatformVersionsRequest
     #   data as a hash:
     #
@@ -3072,17 +3274,21 @@ module Aws::ElasticBeanstalk
     #       }
     #
     # @!attribute [rw] filters
-    #   List only the platforms where the platform member value relates to
-    #   one of the supplied values.
+    #   Criteria for restricting the resulting list of platform versions.
+    #   The filter is interpreted as a logical conjunction (AND) of the
+    #   separate `PlatformFilter` terms.
     #   @return [Array<Types::PlatformFilter>]
     #
     # @!attribute [rw] max_records
-    #   The maximum number of platform values returned in one call.
+    #   The maximum number of platform version values returned in one call.
     #   @return [Integer]
     #
     # @!attribute [rw] next_token
-    #   The starting index into the remaining list of platforms. Use the
-    #   `NextToken` value from a previous `ListPlatformVersion` call.
+    #   For a paginated request. Specify a token from a previous response
+    #   page to retrieve the next response page. All other parameter values
+    #   must be identical to the ones specified in the initial request.
+    #
+    #   If no `NextToken` is specified, the first page is retrieved.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/ListPlatformVersionsRequest AWS API Documentation
@@ -3095,13 +3301,13 @@ module Aws::ElasticBeanstalk
     end
 
     # @!attribute [rw] platform_summary_list
-    #   Detailed information about the platforms.
+    #   Summary information about the platform versions.
     #   @return [Array<Types::PlatformSummary>]
     #
     # @!attribute [rw] next_token
-    #   The starting index into the remaining list of platforms. if this
-    #   value is not `null`, you can use it in a subsequent
-    #   `ListPlatformVersion` call.
+    #   In a paginated request, if this value isn't `null`, it's the token
+    #   that you can pass in a subsequent request to get the next response
+    #   page.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/ListPlatformVersionsResult AWS API Documentation
@@ -3123,7 +3329,7 @@ module Aws::ElasticBeanstalk
     #   The Amazon Resource Name (ARN) of the resouce for which a tag list
     #   is requested.
     #
-    #   Must be the ARN of an Elastic Beanstalk environment.
+    #   Must be the ARN of an Elastic Beanstalk resource.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/ListTagsForResourceMessage AWS API Documentation
@@ -3405,80 +3611,143 @@ module Aws::ElasticBeanstalk
       include Aws::Structure
     end
 
-    # Detailed information about a platform.
+    # Summary information about a platform branch.
+    #
+    # @!attribute [rw] platform_name
+    #   The name of the platform to which this platform branch belongs.
+    #   @return [String]
+    #
+    # @!attribute [rw] branch_name
+    #   The name of the platform branch.
+    #   @return [String]
+    #
+    # @!attribute [rw] lifecycle_state
+    #   The support life cycle state of the platform branch.
+    #
+    #   Possible values: `beta` \| `supported` \| `deprecated` \| `retired`
+    #   @return [String]
+    #
+    # @!attribute [rw] branch_order
+    #   An ordinal number that designates the order in which platform
+    #   branches have been added to a platform. This can be helpful, for
+    #   example, if your code calls the `ListPlatformBranches` action and
+    #   then displays a list of platform branches.
+    #
+    #   A larger `BranchOrder` value designates a newer platform branch
+    #   within the platform.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] supported_tier_list
+    #   The environment tiers that platform versions in this branch support.
+    #
+    #   Possible values: `WebServer/Standard` \| `Worker/SQS/HTTP`
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/PlatformBranchSummary AWS API Documentation
+    #
+    class PlatformBranchSummary < Struct.new(
+      :platform_name,
+      :branch_name,
+      :lifecycle_state,
+      :branch_order,
+      :supported_tier_list)
+      include Aws::Structure
+    end
+
+    # Detailed information about a platform version.
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the platform.
+    #   The ARN of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] platform_owner
-    #   The AWS account ID of the person who created the platform.
+    #   The AWS account ID of the person who created the platform version.
     #   @return [String]
     #
     # @!attribute [rw] platform_name
-    #   The name of the platform.
+    #   The name of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] platform_version
-    #   The version of the platform.
+    #   The version of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] solution_stack_name
-    #   The name of the solution stack used by the platform.
+    #   The name of the solution stack used by the platform version.
     #   @return [String]
     #
     # @!attribute [rw] platform_status
-    #   The status of the platform.
+    #   The status of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] date_created
-    #   The date when the platform was created.
+    #   The date when the platform version was created.
     #   @return [Time]
     #
     # @!attribute [rw] date_updated
-    #   The date when the platform was last updated.
+    #   The date when the platform version was last updated.
     #   @return [Time]
     #
     # @!attribute [rw] platform_category
-    #   The category of the platform.
+    #   The category of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   The description of the platform.
+    #   The description of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] maintainer
-    #   Information about the maintainer of the platform.
+    #   Information about the maintainer of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] operating_system_name
-    #   The operating system used by the platform.
+    #   The operating system used by the platform version.
     #   @return [String]
     #
     # @!attribute [rw] operating_system_version
-    #   The version of the operating system used by the platform.
+    #   The version of the operating system used by the platform version.
     #   @return [String]
     #
     # @!attribute [rw] programming_languages
-    #   The programming languages supported by the platform.
+    #   The programming languages supported by the platform version.
     #   @return [Array<Types::PlatformProgrammingLanguage>]
     #
     # @!attribute [rw] frameworks
-    #   The frameworks supported by the platform.
+    #   The frameworks supported by the platform version.
     #   @return [Array<Types::PlatformFramework>]
     #
     # @!attribute [rw] custom_ami_list
-    #   The custom AMIs supported by the platform.
+    #   The custom AMIs supported by the platform version.
     #   @return [Array<Types::CustomAmi>]
     #
     # @!attribute [rw] supported_tier_list
-    #   The tiers supported by the platform.
+    #   The tiers supported by the platform version.
     #   @return [Array<String>]
     #
     # @!attribute [rw] supported_addon_list
-    #   The additions supported by the platform.
+    #   The additions supported by the platform version.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] platform_lifecycle_state
+    #   The state of the platform version in its lifecycle.
+    #
+    #   Possible values: `Recommended` \| `null`
+    #
+    #   If a null value is returned, the platform version isn't the
+    #   recommended one for its branch. Each platform branch has a single
+    #   recommended platform version, typically the most recent one.
+    #   @return [String]
+    #
+    # @!attribute [rw] platform_branch_name
+    #   The platform branch to which the platform version belongs.
+    #   @return [String]
+    #
+    # @!attribute [rw] platform_branch_lifecycle_state
+    #   The state of the platform version's branch in its lifecycle.
+    #
+    #   Possible values: `Beta` \| `Supported` \| `Deprecated` \| `Retired`
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/PlatformDescription AWS API Documentation
     #
     class PlatformDescription < Struct.new(
@@ -3499,16 +3768,17 @@ module Aws::ElasticBeanstalk
       :frameworks,
       :custom_ami_list,
       :supported_tier_list,
-      :supported_addon_list)
+      :supported_addon_list,
+      :platform_lifecycle_state,
+      :platform_branch_name,
+      :platform_branch_lifecycle_state)
       include Aws::Structure
     end
 
-    # Specify criteria to restrict the results when listing custom
-    # platforms.
-    #
-    # The filter is evaluated as the expression:
+    # Describes criteria to restrict the results when listing platform
+    # versions.
     #
-    # `Type` `Operator` `Values[i]`
+    # The filter is evaluated as follows: `Type Operator Values[1]`
     #
     # @note When making an API call, you may pass PlatformFilter
     #   data as a hash:
@@ -3520,24 +3790,38 @@ module Aws::ElasticBeanstalk
     #       }
     #
     # @!attribute [rw] type
-    #   The custom platform attribute to which the filter values are
+    #   The platform version attribute to which the filter values are
     #   applied.
     #
-    #   Valid Values: `PlatformName` \| `PlatformVersion` \|
-    #   `PlatformStatus` \| `PlatformOwner`
+    #   Valid values: `PlatformName` \| `PlatformVersion` \|
+    #   `PlatformStatus` \| `PlatformBranchName` \| `PlatformLifecycleState`
+    #   \| `PlatformOwner` \| `SupportedTier` \| `SupportedAddon` \|
+    #   `ProgrammingLanguageName` \| `OperatingSystemName`
     #   @return [String]
     #
     # @!attribute [rw] operator
     #   The operator to apply to the `Type` with each of the `Values`.
     #
-    #   Valid Values: `=` (equal to) \| `!=` (not equal to) \| `<` (less
-    #   than) \| `<=` (less than or equal to) \| `>` (greater than) \| `>=`
-    #   (greater than or equal to) \| `contains` \| `begins_with` \|
-    #   `ends_with`
+    #   Valid values: `=` \| `!=` \| `<` \| `<=` \| `>` \| `>=` \|
+    #   `contains` \| `begins_with` \| `ends_with`
     #   @return [String]
     #
     # @!attribute [rw] values
-    #   The list of values applied to the custom platform attribute.
+    #   The list of values applied to the filtering platform version
+    #   attribute. Only one value is supported for all current operators.
+    #
+    #   The following list shows valid filter values for some filter
+    #   attributes.
+    #
+    #   * `PlatformStatus`\: `Creating` \| `Failed` \| `Ready` \| `Deleting`
+    #     \| `Deleted`
+    #
+    #   * `PlatformLifecycleState`\: `recommended`
+    #
+    #   * `SupportedTier`\: `WebServer/Standard` \| `Worker/SQS/HTTP`
+    #
+    #   * `SupportedAddon`\: `Log/S3` \| `Monitoring/Healthd` \|
+    #     `WorkerDaemon/SQSD`
     #   @return [Array<String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/PlatformFilter AWS API Documentation
@@ -3549,7 +3833,7 @@ module Aws::ElasticBeanstalk
       include Aws::Structure
     end
 
-    # A framework supported by the custom platform.
+    # A framework supported by the platform.
     #
     # @!attribute [rw] name
     #   The name of the framework.
@@ -3585,41 +3869,64 @@ module Aws::ElasticBeanstalk
       include Aws::Structure
     end
 
-    # Detailed information about a platform.
+    # Summary information about a platform version.
     #
     # @!attribute [rw] platform_arn
-    #   The ARN of the platform.
+    #   The ARN of the platform version.
     #   @return [String]
     #
     # @!attribute [rw] platform_owner
-    #   The AWS account ID of the person who created the platform.
+    #   The AWS account ID of the person who created the platform version.
     #   @return [String]
     #
     # @!attribute [rw] platform_status
-    #   The status of the platform. You can create an environment from the
-    #   platform once it is ready.
+    #   The status of the platform version. You can create an environment
+    #   from the platform version once it is ready.
     #   @return [String]
     #
     # @!attribute [rw] platform_category
-    #   The category of platform.
+    #   The category of platform version.
     #   @return [String]
     #
     # @!attribute [rw] operating_system_name
-    #   The operating system used by the platform.
+    #   The operating system used by the platform version.
     #   @return [String]
     #
     # @!attribute [rw] operating_system_version
-    #   The version of the operating system used by the platform.
+    #   The version of the operating system used by the platform version.
     #   @return [String]
     #
     # @!attribute [rw] supported_tier_list
-    #   The tiers in which the platform runs.
+    #   The tiers in which the platform version runs.
     #   @return [Array<String>]
     #
     # @!attribute [rw] supported_addon_list
-    #   The additions associated with the platform.
+    #   The additions associated with the platform version.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] platform_lifecycle_state
+    #   The state of the platform version in its lifecycle.
+    #
+    #   Possible values: `recommended` \| empty
+    #
+    #   If an empty value is returned, the platform version is supported but
+    #   isn't the recommended one for its branch.
+    #   @return [String]
+    #
+    # @!attribute [rw] platform_version
+    #   The version string of the platform version.
+    #   @return [String]
+    #
+    # @!attribute [rw] platform_branch_name
+    #   The platform branch to which the platform version belongs.
+    #   @return [String]
+    #
+    # @!attribute [rw] platform_branch_lifecycle_state
+    #   The state of the platform version's branch in its lifecycle.
+    #
+    #   Possible values: `beta` \| `supported` \| `deprecated` \| `retired`
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/PlatformSummary AWS API Documentation
     #
     class PlatformSummary < Struct.new(
@@ -3630,7 +3937,11 @@ module Aws::ElasticBeanstalk
       :operating_system_name,
       :operating_system_version,
       :supported_tier_list,
-      :supported_addon_list)
+      :supported_addon_list,
+      :platform_lifecycle_state,
+      :platform_version,
+      :platform_branch_name,
+      :platform_branch_lifecycle_state)
       include Aws::Structure
     end
 
@@ -3797,7 +4108,7 @@ module Aws::ElasticBeanstalk
     end
 
     # @!attribute [rw] resource_arn
-    #   The Amazon Resource Name (ARN) of the resouce for which a tag list
+    #   The Amazon Resource Name (ARN) of the resource for which a tag list
     #   was requested.
     #   @return [String]
     #
@@ -3957,6 +4268,53 @@ module Aws::ElasticBeanstalk
     #
     class S3SubscriptionRequiredException < Aws::EmptyStructure; end
 
+    # Describes criteria to restrict a list of results.
+    #
+    # For operators that apply a single value to the attribute, the filter
+    # is evaluated as follows: `Attribute Operator Values[1]`
+    #
+    # Some operators, e.g. `in`, can apply multiple values. In this case,
+    # the filter is evaluated as a logical union (OR) of applications of the
+    # operator to the attribute with each one of the values: `(Attribute
+    # Operator Values[1]) OR (Attribute Operator Values[2]) OR ...`
+    #
+    # The valid values for attributes of `SearchFilter` depend on the API
+    # action. For valid values, see the reference page for the API action
+    # you're calling that takes a `SearchFilter` parameter.
+    #
+    # @note When making an API call, you may pass SearchFilter
+    #   data as a hash:
+    #
+    #       {
+    #         attribute: "SearchFilterAttribute",
+    #         operator: "SearchFilterOperator",
+    #         values: ["SearchFilterValue"],
+    #       }
+    #
+    # @!attribute [rw] attribute
+    #   The result attribute to which the filter values are applied. Valid
+    #   values vary by API action.
+    #   @return [String]
+    #
+    # @!attribute [rw] operator
+    #   The operator to apply to the `Attribute` with each of the `Values`.
+    #   Valid values vary by `Attribute`.
+    #   @return [String]
+    #
+    # @!attribute [rw] values
+    #   The list of values applied to the `Attribute` and `Operator`
+    #   attributes. Number of values and valid values vary by `Attribute`.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/SearchFilter AWS API Documentation
+    #
+    class SearchFilter < Struct.new(
+      :attribute,
+      :operator,
+      :values)
+      include Aws::Structure
+    end
+
     # Detailed health information about an Amazon EC2 instance in your
     # Elastic Beanstalk environment.
     #
@@ -4102,7 +4460,7 @@ module Aws::ElasticBeanstalk
     #
     class SourceBundleDeletionException < Aws::EmptyStructure; end
 
-    # A specification for an environment configuration
+    # A specification for an environment configuration.
     #
     # @note When making an API call, you may pass SourceConfiguration
     #   data as a hash:
@@ -4731,19 +5089,23 @@ module Aws::ElasticBeanstalk
     # @!attribute [rw] resource_arn
     #   The Amazon Resource Name (ARN) of the resouce to be updated.
     #
-    #   Must be the ARN of an Elastic Beanstalk environment.
+    #   Must be the ARN of an Elastic Beanstalk resource.
     #   @return [String]
     #
     # @!attribute [rw] tags_to_add
-    #   A list of tags to add or update.
+    #   A list of tags to add or update. If a key of an existing tag is
+    #   added, the tag's value is updated.
     #
-    #   If a key of an existing tag is added, the tag's value is updated.
+    #   Specify at least one of these parameters: `TagsToAdd`,
+    #   `TagsToRemove`.
     #   @return [Array<Types::Tag>]
     #
     # @!attribute [rw] tags_to_remove
-    #   A list of tag keys to remove.
+    #   A list of tag keys to remove. If a tag key doesn't exist, it is
+    #   silently ignored.
     #
-    #   If a tag key doesn't exist, it is silently ignored.
+    #   Specify at least one of these parameters: `TagsToAdd`,
+    #   `TagsToRemove`.
     #   @return [Array<String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticbeanstalk-2010-12-01/UpdateTagsForResourceMessage AWS API Documentation