aws-sdk-emr 1.48.0 → 1.52.0

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

@@ -33,6 +33,7 @@ module Aws::EMR
     AutoScalingPolicyStateChangeReason = Shapes::StructureShape.new(name: 'AutoScalingPolicyStateChangeReason')
     AutoScalingPolicyStateChangeReasonCode = Shapes::StringShape.new(name: 'AutoScalingPolicyStateChangeReasonCode')
     AutoScalingPolicyStatus = Shapes::StructureShape.new(name: 'AutoScalingPolicyStatus')
+    AutoTerminationPolicy = Shapes::StructureShape.new(name: 'AutoTerminationPolicy')
     BlockPublicAccessConfiguration = Shapes::StructureShape.new(name: 'BlockPublicAccessConfiguration')
     BlockPublicAccessConfigurationMetadata = Shapes::StructureShape.new(name: 'BlockPublicAccessConfigurationMetadata')
     Boolean = Shapes::BooleanShape.new(name: 'Boolean')
@@ -103,6 +104,8 @@ module Aws::EMR
     ExecutionEngineConfig = Shapes::StructureShape.new(name: 'ExecutionEngineConfig')
     ExecutionEngineType = Shapes::StringShape.new(name: 'ExecutionEngineType')
     FailureDetails = Shapes::StructureShape.new(name: 'FailureDetails')
+    GetAutoTerminationPolicyInput = Shapes::StructureShape.new(name: 'GetAutoTerminationPolicyInput')
+    GetAutoTerminationPolicyOutput = Shapes::StructureShape.new(name: 'GetAutoTerminationPolicyOutput')
     GetBlockPublicAccessConfigurationInput = Shapes::StructureShape.new(name: 'GetBlockPublicAccessConfigurationInput')
     GetBlockPublicAccessConfigurationOutput = Shapes::StructureShape.new(name: 'GetBlockPublicAccessConfigurationOutput')
     GetManagedScalingPolicyInput = Shapes::StructureShape.new(name: 'GetManagedScalingPolicyInput')
@@ -227,6 +230,8 @@ module Aws::EMR
     PortRanges = Shapes::ListShape.new(name: 'PortRanges')
     PutAutoScalingPolicyInput = Shapes::StructureShape.new(name: 'PutAutoScalingPolicyInput')
     PutAutoScalingPolicyOutput = Shapes::StructureShape.new(name: 'PutAutoScalingPolicyOutput')
+    PutAutoTerminationPolicyInput = Shapes::StructureShape.new(name: 'PutAutoTerminationPolicyInput')
+    PutAutoTerminationPolicyOutput = Shapes::StructureShape.new(name: 'PutAutoTerminationPolicyOutput')
     PutBlockPublicAccessConfigurationInput = Shapes::StructureShape.new(name: 'PutBlockPublicAccessConfigurationInput')
     PutBlockPublicAccessConfigurationOutput = Shapes::StructureShape.new(name: 'PutBlockPublicAccessConfigurationOutput')
     PutManagedScalingPolicyInput = Shapes::StructureShape.new(name: 'PutManagedScalingPolicyInput')
@@ -234,6 +239,8 @@ module Aws::EMR
     ReleaseLabelFilter = Shapes::StructureShape.new(name: 'ReleaseLabelFilter')
     RemoveAutoScalingPolicyInput = Shapes::StructureShape.new(name: 'RemoveAutoScalingPolicyInput')
     RemoveAutoScalingPolicyOutput = Shapes::StructureShape.new(name: 'RemoveAutoScalingPolicyOutput')
+    RemoveAutoTerminationPolicyInput = Shapes::StructureShape.new(name: 'RemoveAutoTerminationPolicyInput')
+    RemoveAutoTerminationPolicyOutput = Shapes::StructureShape.new(name: 'RemoveAutoTerminationPolicyOutput')
     RemoveManagedScalingPolicyInput = Shapes::StructureShape.new(name: 'RemoveManagedScalingPolicyInput')
     RemoveManagedScalingPolicyOutput = Shapes::StructureShape.new(name: 'RemoveManagedScalingPolicyOutput')
     RemoveTagsInput = Shapes::StructureShape.new(name: 'RemoveTagsInput')
@@ -364,6 +371,9 @@ module Aws::EMR
     AutoScalingPolicyStatus.add_member(:state_change_reason, Shapes::ShapeRef.new(shape: AutoScalingPolicyStateChangeReason, location_name: "StateChangeReason"))
     AutoScalingPolicyStatus.struct_class = Types::AutoScalingPolicyStatus
 
+    AutoTerminationPolicy.add_member(:idle_timeout, Shapes::ShapeRef.new(shape: Long, location_name: "IdleTimeout"))
+    AutoTerminationPolicy.struct_class = Types::AutoTerminationPolicy
+
     BlockPublicAccessConfiguration.add_member(:block_public_security_group_rules, Shapes::ShapeRef.new(shape: Boolean, required: true, location_name: "BlockPublicSecurityGroupRules"))
     BlockPublicAccessConfiguration.add_member(:permitted_public_security_group_rule_ranges, Shapes::ShapeRef.new(shape: PortRanges, location_name: "PermittedPublicSecurityGroupRuleRanges"))
     BlockPublicAccessConfiguration.struct_class = Types::BlockPublicAccessConfiguration
@@ -502,10 +512,12 @@ module Aws::EMR
     CreateStudioInput.add_member(:vpc_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, required: true, location_name: "VpcId"))
     CreateStudioInput.add_member(:subnet_ids, Shapes::ShapeRef.new(shape: SubnetIdList, required: true, location_name: "SubnetIds"))
     CreateStudioInput.add_member(:service_role, Shapes::ShapeRef.new(shape: XmlString, required: true, location_name: "ServiceRole"))
-    CreateStudioInput.add_member(:user_role, Shapes::ShapeRef.new(shape: XmlString, required: true, location_name: "UserRole"))
+    CreateStudioInput.add_member(:user_role, Shapes::ShapeRef.new(shape: XmlString, location_name: "UserRole"))
     CreateStudioInput.add_member(:workspace_security_group_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, required: true, location_name: "WorkspaceSecurityGroupId"))
     CreateStudioInput.add_member(:engine_security_group_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, required: true, location_name: "EngineSecurityGroupId"))
     CreateStudioInput.add_member(:default_s3_location, Shapes::ShapeRef.new(shape: XmlString, required: true, location_name: "DefaultS3Location"))
+    CreateStudioInput.add_member(:idp_auth_url, Shapes::ShapeRef.new(shape: XmlString, location_name: "IdpAuthUrl"))
+    CreateStudioInput.add_member(:idp_relay_state_parameter_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "IdpRelayStateParameterName"))
     CreateStudioInput.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CreateStudioInput.struct_class = Types::CreateStudioInput
 
@@ -635,6 +647,12 @@ module Aws::EMR
     FailureDetails.add_member(:log_file, Shapes::ShapeRef.new(shape: String, location_name: "LogFile"))
     FailureDetails.struct_class = Types::FailureDetails
 
+    GetAutoTerminationPolicyInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: ClusterId, required: true, location_name: "ClusterId"))
+    GetAutoTerminationPolicyInput.struct_class = Types::GetAutoTerminationPolicyInput
+
+    GetAutoTerminationPolicyOutput.add_member(:auto_termination_policy, Shapes::ShapeRef.new(shape: AutoTerminationPolicy, location_name: "AutoTerminationPolicy"))
+    GetAutoTerminationPolicyOutput.struct_class = Types::GetAutoTerminationPolicyOutput
+
     GetBlockPublicAccessConfigurationInput.struct_class = Types::GetBlockPublicAccessConfigurationInput
 
     GetBlockPublicAccessConfigurationOutput.add_member(:block_public_access_configuration, Shapes::ShapeRef.new(shape: BlockPublicAccessConfiguration, required: true, location_name: "BlockPublicAccessConfiguration"))
@@ -746,6 +764,7 @@ module Aws::EMR
     InstanceGroup.add_member(:ebs_optimized, Shapes::ShapeRef.new(shape: BooleanObject, location_name: "EbsOptimized"))
     InstanceGroup.add_member(:shrink_policy, Shapes::ShapeRef.new(shape: ShrinkPolicy, location_name: "ShrinkPolicy"))
     InstanceGroup.add_member(:auto_scaling_policy, Shapes::ShapeRef.new(shape: AutoScalingPolicyDescription, location_name: "AutoScalingPolicy"))
+    InstanceGroup.add_member(:custom_ami_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CustomAmiId"))
     InstanceGroup.struct_class = Types::InstanceGroup
 
     InstanceGroupConfig.add_member(:name, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "Name"))
@@ -757,6 +776,7 @@ module Aws::EMR
     InstanceGroupConfig.add_member(:configurations, Shapes::ShapeRef.new(shape: ConfigurationList, location_name: "Configurations"))
     InstanceGroupConfig.add_member(:ebs_configuration, Shapes::ShapeRef.new(shape: EbsConfiguration, location_name: "EbsConfiguration"))
     InstanceGroupConfig.add_member(:auto_scaling_policy, Shapes::ShapeRef.new(shape: AutoScalingPolicy, location_name: "AutoScalingPolicy"))
+    InstanceGroupConfig.add_member(:custom_ami_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CustomAmiId"))
     InstanceGroupConfig.struct_class = Types::InstanceGroupConfig
 
     InstanceGroupConfigList.member = Shapes::ShapeRef.new(shape: InstanceGroupConfig)
@@ -775,6 +795,7 @@ module Aws::EMR
     InstanceGroupDetail.add_member(:start_date_time, Shapes::ShapeRef.new(shape: Date, location_name: "StartDateTime"))
     InstanceGroupDetail.add_member(:ready_date_time, Shapes::ShapeRef.new(shape: Date, location_name: "ReadyDateTime"))
     InstanceGroupDetail.add_member(:end_date_time, Shapes::ShapeRef.new(shape: Date, location_name: "EndDateTime"))
+    InstanceGroupDetail.add_member(:custom_ami_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CustomAmiId"))
     InstanceGroupDetail.struct_class = Types::InstanceGroupDetail
 
     InstanceGroupDetailList.member = Shapes::ShapeRef.new(shape: InstanceGroupDetail)
@@ -837,6 +858,7 @@ module Aws::EMR
     InstanceTypeConfig.add_member(:bid_price_as_percentage_of_on_demand_price, Shapes::ShapeRef.new(shape: NonNegativeDouble, location_name: "BidPriceAsPercentageOfOnDemandPrice"))
     InstanceTypeConfig.add_member(:ebs_configuration, Shapes::ShapeRef.new(shape: EbsConfiguration, location_name: "EbsConfiguration"))
     InstanceTypeConfig.add_member(:configurations, Shapes::ShapeRef.new(shape: ConfigurationList, location_name: "Configurations"))
+    InstanceTypeConfig.add_member(:custom_ami_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CustomAmiId"))
     InstanceTypeConfig.struct_class = Types::InstanceTypeConfig
 
     InstanceTypeConfigList.member = Shapes::ShapeRef.new(shape: InstanceTypeConfig)
@@ -848,6 +870,7 @@ module Aws::EMR
     InstanceTypeSpecification.add_member(:configurations, Shapes::ShapeRef.new(shape: ConfigurationList, location_name: "Configurations"))
     InstanceTypeSpecification.add_member(:ebs_block_devices, Shapes::ShapeRef.new(shape: EbsBlockDeviceList, location_name: "EbsBlockDevices"))
     InstanceTypeSpecification.add_member(:ebs_optimized, Shapes::ShapeRef.new(shape: BooleanObject, location_name: "EbsOptimized"))
+    InstanceTypeSpecification.add_member(:custom_ami_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "CustomAmiId"))
     InstanceTypeSpecification.struct_class = Types::InstanceTypeSpecification
 
     InstanceTypeSpecificationList.member = Shapes::ShapeRef.new(shape: InstanceTypeSpecification)
@@ -1124,6 +1147,12 @@ module Aws::EMR
     PutAutoScalingPolicyOutput.add_member(:cluster_arn, Shapes::ShapeRef.new(shape: ArnType, location_name: "ClusterArn"))
     PutAutoScalingPolicyOutput.struct_class = Types::PutAutoScalingPolicyOutput
 
+    PutAutoTerminationPolicyInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: ClusterId, required: true, location_name: "ClusterId"))
+    PutAutoTerminationPolicyInput.add_member(:auto_termination_policy, Shapes::ShapeRef.new(shape: AutoTerminationPolicy, location_name: "AutoTerminationPolicy"))
+    PutAutoTerminationPolicyInput.struct_class = Types::PutAutoTerminationPolicyInput
+
+    PutAutoTerminationPolicyOutput.struct_class = Types::PutAutoTerminationPolicyOutput
+
     PutBlockPublicAccessConfigurationInput.add_member(:block_public_access_configuration, Shapes::ShapeRef.new(shape: BlockPublicAccessConfiguration, required: true, location_name: "BlockPublicAccessConfiguration"))
     PutBlockPublicAccessConfigurationInput.struct_class = Types::PutBlockPublicAccessConfigurationInput
 
@@ -1145,6 +1174,11 @@ module Aws::EMR
 
     RemoveAutoScalingPolicyOutput.struct_class = Types::RemoveAutoScalingPolicyOutput
 
+    RemoveAutoTerminationPolicyInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: ClusterId, required: true, location_name: "ClusterId"))
+    RemoveAutoTerminationPolicyInput.struct_class = Types::RemoveAutoTerminationPolicyInput
+
+    RemoveAutoTerminationPolicyOutput.struct_class = Types::RemoveAutoTerminationPolicyOutput
+
     RemoveManagedScalingPolicyInput.add_member(:cluster_id, Shapes::ShapeRef.new(shape: ClusterId, required: true, location_name: "ClusterId"))
     RemoveManagedScalingPolicyInput.struct_class = Types::RemoveManagedScalingPolicyInput
 
@@ -1183,6 +1217,7 @@ module Aws::EMR
     RunJobFlowInput.add_member(:step_concurrency_level, Shapes::ShapeRef.new(shape: Integer, location_name: "StepConcurrencyLevel"))
     RunJobFlowInput.add_member(:managed_scaling_policy, Shapes::ShapeRef.new(shape: ManagedScalingPolicy, location_name: "ManagedScalingPolicy"))
     RunJobFlowInput.add_member(:placement_group_configs, Shapes::ShapeRef.new(shape: PlacementGroupConfigList, location_name: "PlacementGroupConfigs"))
+    RunJobFlowInput.add_member(:auto_termination_policy, Shapes::ShapeRef.new(shape: AutoTerminationPolicy, location_name: "AutoTerminationPolicy"))
     RunJobFlowInput.struct_class = Types::RunJobFlowInput
 
     RunJobFlowOutput.add_member(:job_flow_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "JobFlowId"))
@@ -1358,6 +1393,8 @@ module Aws::EMR
     Studio.add_member(:url, Shapes::ShapeRef.new(shape: XmlString, location_name: "Url"))
     Studio.add_member(:creation_time, Shapes::ShapeRef.new(shape: Date, location_name: "CreationTime"))
     Studio.add_member(:default_s3_location, Shapes::ShapeRef.new(shape: XmlString, location_name: "DefaultS3Location"))
+    Studio.add_member(:idp_auth_url, Shapes::ShapeRef.new(shape: XmlString, location_name: "IdpAuthUrl"))
+    Studio.add_member(:idp_relay_state_parameter_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "IdpRelayStateParameterName"))
     Studio.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     Studio.struct_class = Types::Studio
 
@@ -1366,6 +1403,7 @@ module Aws::EMR
     StudioSummary.add_member(:vpc_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "VpcId"))
     StudioSummary.add_member(:description, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "Description"))
     StudioSummary.add_member(:url, Shapes::ShapeRef.new(shape: XmlStringMaxLen256, location_name: "Url"))
+    StudioSummary.add_member(:auth_mode, Shapes::ShapeRef.new(shape: AuthMode, location_name: "AuthMode"))
     StudioSummary.add_member(:creation_time, Shapes::ShapeRef.new(shape: Date, location_name: "CreationTime"))
     StudioSummary.struct_class = Types::StudioSummary
 
@@ -1423,7 +1461,7 @@ module Aws::EMR
         "jsonVersion" => "1.1",
         "protocol" => "json",
         "serviceAbbreviation" => "Amazon EMR",
-        "serviceFullName" => "Amazon Elastic MapReduce",
+        "serviceFullName" => "Amazon EMR",
         "serviceId" => "EMR",
         "signatureVersion" => "v4",
         "targetPrefix" => "ElasticMapReduce",
@@ -1608,6 +1646,14 @@ module Aws::EMR
         o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
       end)
 
+      api.add_operation(:get_auto_termination_policy, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetAutoTerminationPolicy"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetAutoTerminationPolicyInput)
+        o.output = Shapes::ShapeRef.new(shape: GetAutoTerminationPolicyOutput)
+      end)
+
       api.add_operation(:get_block_public_access_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBlockPublicAccessConfiguration"
         o.http_method = "POST"
@@ -1839,6 +1885,14 @@ module Aws::EMR
         o.output = Shapes::ShapeRef.new(shape: PutAutoScalingPolicyOutput)
       end)
 
+      api.add_operation(:put_auto_termination_policy, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "PutAutoTerminationPolicy"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: PutAutoTerminationPolicyInput)
+        o.output = Shapes::ShapeRef.new(shape: PutAutoTerminationPolicyOutput)
+      end)
+
       api.add_operation(:put_block_public_access_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBlockPublicAccessConfiguration"
         o.http_method = "POST"
@@ -1865,6 +1919,14 @@ module Aws::EMR
         o.output = Shapes::ShapeRef.new(shape: RemoveAutoScalingPolicyOutput)
       end)
 
+      api.add_operation(:remove_auto_termination_policy, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "RemoveAutoTerminationPolicy"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: RemoveAutoTerminationPolicyInput)
+        o.output = Shapes::ShapeRef.new(shape: RemoveAutoTerminationPolicyOutput)
+      end)
+
       api.add_operation(:remove_managed_scaling_policy, Seahorse::Model::Operation.new.tap do |o|
         o.name = "RemoveManagedScalingPolicy"
         o.http_method = "POST"

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

@@ -50,6 +50,7 @@ module Aws::EMR
     #                   },
     #                 },
     #               ],
+    #               custom_ami_id: "XmlStringMaxLen256",
     #             },
     #           ],
     #           launch_specifications: {
@@ -186,6 +187,7 @@ module Aws::EMR
     #                 },
     #               ],
     #             },
+    #             custom_ami_id: "XmlStringMaxLen256",
     #           },
     #         ],
     #         job_flow_id: "XmlStringMaxLen256", # required
@@ -290,7 +292,8 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # This input identifies a cluster and a list of tags to attach.
+    # This input identifies an Amazon EMR resource and a list of tags to
+    # attach.
     #
     # @note When making an API call, you may pass AddTagsInput
     #   data as a hash:
@@ -306,15 +309,15 @@ module Aws::EMR
     #       }
     #
     # @!attribute [rw] resource_id
-    #   The Amazon EMR resource identifier to which tags will be added. This
-    #   value must be a cluster identifier.
+    #   The Amazon EMR resource identifier to which tags will be added. For
+    #   example, a cluster identifier or an Amazon EMR Studio ID.
     #   @return [String]
     #
     # @!attribute [rw] tags
-    #   A list of tags to associate with a cluster and propagate to EC2
-    #   instances. Tags are user-defined key-value pairs that consist of a
-    #   required key string with a maximum of 128 characters, and an
-    #   optional value string with a maximum of 256 characters.
+    #   A list of tags to associate with a resource. Tags are user-defined
+    #   key-value pairs that consist of a required key string with a maximum
+    #   of 128 characters, and an optional value string with a maximum of
+    #   256 characters.
     #   @return [Array<Types::Tag>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/AddTagsInput AWS API Documentation
@@ -531,6 +534,36 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # An auto-termination policy for an Amazon EMR cluster. An
+    # auto-termination policy defines the amount of idle time in seconds
+    # after which a cluster automatically terminates. For alternative
+    # cluster termination options, see [Control cluster termination][1].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-plan-termination.html
+    #
+    # @note When making an API call, you may pass AutoTerminationPolicy
+    #   data as a hash:
+    #
+    #       {
+    #         idle_timeout: 1,
+    #       }
+    #
+    # @!attribute [rw] idle_timeout
+    #   Specifies the amount of idle time in seconds after which the cluster
+    #   automatically terminates. You can specify a minimum of 60 seconds
+    #   and a maximum of 604800 seconds (seven days).
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/AutoTerminationPolicy AWS API Documentation
+    #
+    class AutoTerminationPolicy < Struct.new(
+      :idle_timeout)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # A configuration for Amazon EMR block public access. When
     # `BlockPublicSecurityGroupRules` is set to `true`, Amazon EMR prevents
     # cluster creation if one of the cluster's security groups has a rule
@@ -892,21 +925,22 @@ module Aws::EMR
     #
     # @!attribute [rw] visible_to_all_users
     #   Indicates whether the cluster is visible to IAM principals in the
-    #   account associated with the cluster. When `true`, IAM principals in
-    #   the account can perform EMR cluster actions on the cluster that
-    #   their IAM policies allow. When `false`, only the IAM principal that
-    #   created the cluster and the account root user can perform EMR
+    #   Amazon Web Services account associated with the cluster. When
+    #   `true`, IAM principals in the Amazon Web Services account can
+    #   perform EMR cluster actions on the cluster that their IAM policies
+    #   allow. When `false`, only the IAM principal that created the cluster
+    #   and the Amazon Web Services account root user can perform EMR
     #   actions, regardless of IAM permissions policies attached to other
     #   IAM principals.
     #
-    #   The default value is `false` if a value is not provided when
-    #   creating a cluster using the EMR API RunJobFlow command or the CLI
-    #   [create-cluster][1] command. The default value is `true` when a
-    #   cluster is created using the Management Console. IAM principals that
-    #   are allowed to perform actions on the cluster can use the
-    #   SetVisibleToAllUsers action to change the value on a running
-    #   cluster. For more information, see [Understanding the EMR Cluster
-    #   VisibleToAllUsers Setting][2] in the *Amazon EMR Management Guide*.
+    #   The default value is `true` if a value is not provided when creating
+    #   a cluster using the EMR API RunJobFlow command, the CLI
+    #   [create-cluster][1] command, or the Amazon Web Services Management
+    #   Console. IAM principals that are allowed to perform actions on the
+    #   cluster can use the SetVisibleToAllUsers action to change the value
+    #   on a running cluster. For more information, see [Understanding the
+    #   EMR Cluster VisibleToAllUsers Setting][2] in the *Amazon
+    #   EMRManagement Guide*.
     #
     #
     #
@@ -923,8 +957,8 @@ module Aws::EMR
     #   @return [Array<Types::Tag>]
     #
     # @!attribute [rw] service_role
-    #   The IAM role that will be assumed by the Amazon EMR service to
-    #   access Amazon Web Services resources on your behalf.
+    #   The IAM role that Amazon EMR assumes in order to access Amazon Web
+    #   Services resources on your behalf.
     #   @return [String]
     #
     # @!attribute [rw] normalized_instance_hours
@@ -1378,10 +1412,12 @@ module Aws::EMR
     #         vpc_id: "XmlStringMaxLen256", # required
     #         subnet_ids: ["String"], # required
     #         service_role: "XmlString", # required
-    #         user_role: "XmlString", # required
+    #         user_role: "XmlString",
     #         workspace_security_group_id: "XmlStringMaxLen256", # required
     #         engine_security_group_id: "XmlStringMaxLen256", # required
     #         default_s3_location: "XmlString", # required
+    #         idp_auth_url: "XmlString",
+    #         idp_relay_state_parameter_name: "XmlStringMaxLen256",
     #         tags: [
     #           {
     #             key: "String",
@@ -1399,9 +1435,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] auth_mode
-    #   Specifies whether the Studio authenticates users using single
-    #   sign-on (SSO) or IAM. Amazon EMR Studio currently only supports SSO
-    #   authentication.
+    #   Specifies whether the Studio authenticates users using IAM or Amazon
+    #   Web Services SSO.
     #   @return [String]
     #
     # @!attribute [rw] vpc_id
@@ -1417,15 +1452,17 @@ module Aws::EMR
     #   @return [Array<String>]
     #
     # @!attribute [rw] service_role
-    #   The IAM role that will be assumed by the Amazon EMR Studio. The
-    #   service role provides a way for Amazon EMR Studio to interoperate
-    #   with other Amazon Web Services services.
+    #   The IAM role that the Amazon EMR Studio assumes. The service role
+    #   provides a way for Amazon EMR Studio to interoperate with other
+    #   Amazon Web Services services.
     #   @return [String]
     #
     # @!attribute [rw] user_role
-    #   The IAM user role that will be assumed by users and groups logged in
-    #   to an Amazon EMR Studio. The permissions attached to this IAM role
-    #   can be scoped down for each user or group using session policies.
+    #   The IAM user role that users and groups assume when logged in to an
+    #   Amazon EMR Studio. Only specify a `UserRole` when you use Amazon Web
+    #   Services SSO authentication. The permissions attached to the
+    #   `UserRole` can be scoped down for each user or group using session
+    #   policies.
     #   @return [String]
     #
     # @!attribute [rw] workspace_security_group_id
@@ -1446,6 +1483,22 @@ module Aws::EMR
     #   notebook files.
     #   @return [String]
     #
+    # @!attribute [rw] idp_auth_url
+    #   The authentication endpoint of your identity provider (IdP). Specify
+    #   this value when you use IAM authentication and want to let federated
+    #   users log in to a Studio with the Studio URL and credentials from
+    #   your IdP. Amazon EMR Studio redirects users to this endpoint to
+    #   enter credentials.
+    #   @return [String]
+    #
+    # @!attribute [rw] idp_relay_state_parameter_name
+    #   The name that your identity provider (IdP) uses for its `RelayState`
+    #   parameter. For example, `RelayState` or `TargetSource`. Specify this
+    #   value when you use IAM authentication and want to let federated
+    #   users log in to a Studio using the Studio URL. The `RelayState`
+    #   parameter differs by IdP.
+    #   @return [String]
+    #
     # @!attribute [rw] tags
     #   A list of tags to associate with the Amazon EMR Studio. Tags are
     #   user-defined key-value pairs that consist of a required key string
@@ -1466,6 +1519,8 @@ module Aws::EMR
       :workspace_security_group_id,
       :engine_security_group_id,
       :default_s3_location,
+      :idp_auth_url,
+      :idp_relay_state_parameter_name,
       :tags)
       SENSITIVE = []
       include Aws::Structure
@@ -1509,7 +1564,7 @@ module Aws::EMR
     #   Amazon Web Services SSO Identity Store. For more information, see
     #   [UserId][1] and [GroupId][2] in the *Amazon Web Services SSO
     #   Identity Store API Reference*. Either `IdentityName` or `IdentityId`
-    #   must be specified.
+    #   must be specified, but not both.
     #
     #
     #
@@ -1521,7 +1576,7 @@ module Aws::EMR
     #   The name of the user or group. For more information, see
     #   [UserName][1] and [DisplayName][2] in the *Amazon Web Services SSO
     #   Identity Store API Reference*. Either `IdentityName` or `IdentityId`
-    #   must be specified.
+    #   must be specified, but not both.
     #
     #
     #
@@ -2224,6 +2279,39 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass GetAutoTerminationPolicyInput
+    #   data as a hash:
+    #
+    #       {
+    #         cluster_id: "ClusterId", # required
+    #       }
+    #
+    # @!attribute [rw] cluster_id
+    #   Specifies the ID of the Amazon EMR cluster for which the
+    #   auto-termination policy will be fetched.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/GetAutoTerminationPolicyInput AWS API Documentation
+    #
+    class GetAutoTerminationPolicyInput < Struct.new(
+      :cluster_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] auto_termination_policy
+    #   Specifies the auto-termination policy that is attached to an Amazon
+    #   EMR cluster.
+    #   @return [Types::AutoTerminationPolicy]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/GetAutoTerminationPolicyOutput AWS API Documentation
+    #
+    class GetAutoTerminationPolicyOutput < Struct.new(
+      :auto_termination_policy)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @api private
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/GetBlockPublicAccessConfigurationInput AWS API Documentation
@@ -2690,6 +2778,7 @@ module Aws::EMR
     #                 },
     #               },
     #             ],
+    #             custom_ami_id: "XmlStringMaxLen256",
     #           },
     #         ],
     #         launch_specifications: {
@@ -3086,6 +3175,10 @@ module Aws::EMR
     #   PutAutoScalingPolicy.
     #   @return [Types::AutoScalingPolicyDescription]
     #
+    # @!attribute [rw] custom_ami_id
+    #   The custom AMI ID to use for the provisioned instance group.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/InstanceGroup AWS API Documentation
     #
     class InstanceGroup < Struct.new(
@@ -3105,7 +3198,8 @@ module Aws::EMR
       :ebs_block_devices,
       :ebs_optimized,
       :shrink_policy,
-      :auto_scaling_policy)
+      :auto_scaling_policy,
+      :custom_ami_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3184,6 +3278,7 @@ module Aws::EMR
     #             },
     #           ],
     #         },
+    #         custom_ami_id: "XmlStringMaxLen256",
     #       }
     #
     # @!attribute [rw] name
@@ -3236,6 +3331,10 @@ module Aws::EMR
     #   PutAutoScalingPolicy.
     #   @return [Types::AutoScalingPolicy]
     #
+    # @!attribute [rw] custom_ami_id
+    #   The custom AMI ID to use for the provisioned instance group.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/InstanceGroupConfig AWS API Documentation
     #
     class InstanceGroupConfig < Struct.new(
@@ -3247,7 +3346,8 @@ module Aws::EMR
       :instance_count,
       :configurations,
       :ebs_configuration,
-      :auto_scaling_policy)
+      :auto_scaling_policy,
+      :custom_ami_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3314,6 +3414,10 @@ module Aws::EMR
     #   The date/time the instance group was terminated.
     #   @return [Time]
     #
+    # @!attribute [rw] custom_ami_id
+    #   The custom AMI ID to use for the provisioned instance group.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/InstanceGroupDetail AWS API Documentation
     #
     class InstanceGroupDetail < Struct.new(
@@ -3330,7 +3434,8 @@ module Aws::EMR
       :creation_date_time,
       :start_date_time,
       :ready_date_time,
-      :end_date_time)
+      :end_date_time,
+      :custom_ami_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3621,6 +3726,7 @@ module Aws::EMR
     #             },
     #           },
     #         ],
+    #         custom_ami_id: "XmlStringMaxLen256",
     #       }
     #
     # @!attribute [rw] instance_type
@@ -3661,6 +3767,10 @@ module Aws::EMR
     #   and software that run on the cluster.
     #   @return [Array<Types::Configuration>]
     #
+    # @!attribute [rw] custom_ami_id
+    #   The custom AMI ID to use for the instance type.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/InstanceTypeConfig AWS API Documentation
     #
     class InstanceTypeConfig < Struct.new(
@@ -3669,7 +3779,8 @@ module Aws::EMR
       :bid_price,
       :bid_price_as_percentage_of_on_demand_price,
       :ebs_configuration,
-      :configurations)
+      :configurations,
+      :custom_ami_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3721,6 +3832,10 @@ module Aws::EMR
     #   EBS-optimized.
     #   @return [Boolean]
     #
+    # @!attribute [rw] custom_ami_id
+    #   The custom AMI ID to use for the instance type.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/InstanceTypeSpecification AWS API Documentation
     #
     class InstanceTypeSpecification < Struct.new(
@@ -3730,7 +3845,8 @@ module Aws::EMR
       :bid_price_as_percentage_of_on_demand_price,
       :configurations,
       :ebs_block_devices,
-      :ebs_optimized)
+      :ebs_optimized,
+      :custom_ami_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3825,20 +3941,22 @@ module Aws::EMR
     #
     # @!attribute [rw] visible_to_all_users
     #   Indicates whether the cluster is visible to IAM principals in the
-    #   account associated with the cluster. When `true`, IAM principals in
-    #   the account can perform EMR cluster actions that their IAM policies
-    #   allow. When `false`, only the IAM principal that created the cluster
-    #   and the account root user can perform EMR actions, regardless of IAM
-    #   permissions policies attached to other IAM principals.
+    #   Amazon Web Services account associated with the cluster. When
+    #   `true`, IAM principals in the Amazon Web Services account can
+    #   perform EMR cluster actions that their IAM policies allow. When
+    #   `false`, only the IAM principal that created the cluster and the
+    #   Amazon Web Services account root user can perform EMR actions,
+    #   regardless of IAM permissions policies attached to other IAM
+    #   principals.
     #
-    #   The default value is `false` if a value is not provided when
-    #   creating a cluster using the EMR API RunJobFlow command or the CLI
-    #   [create-cluster][1] command. The default value is `true` when a
-    #   cluster is created using the Management Console. IAM principals that
-    #   are authorized to perform actions on the cluster can use the
-    #   SetVisibleToAllUsers action to change the value on a running
-    #   cluster. For more information, see [Understanding the EMR Cluster
-    #   VisibleToAllUsers Setting][2] in the *Amazon EMR Management Guide*.
+    #   The default value is `true` if a value is not provided when creating
+    #   a cluster using the EMR API RunJobFlow command, the CLI
+    #   [create-cluster][1] command, or the Amazon Web Services Management
+    #   Console. IAM principals that are authorized to perform actions on
+    #   the cluster can use the SetVisibleToAllUsers action to change the
+    #   value on a running cluster. For more information, see [Understanding
+    #   the EMR Cluster VisibleToAllUsers Setting][2] in the *Amazon
+    #   EMRManagement Guide*.
     #
     #
     #
@@ -4026,6 +4144,7 @@ module Aws::EMR
     #                 },
     #               ],
     #             },
+    #             custom_ami_id: "XmlStringMaxLen256",
     #           },
     #         ],
     #         instance_fleets: [
@@ -4064,6 +4183,7 @@ module Aws::EMR
     #                     },
     #                   },
     #                 ],
+    #                 custom_ami_id: "XmlStringMaxLen256",
     #               },
     #             ],
     #             launch_specifications: {
@@ -4814,9 +4934,10 @@ module Aws::EMR
     #   which is usually the case for the first request of
     #   ListReleaseLabels, the first page of results are determined by other
     #   filtering parameters or by the latest version. The
-    #   `ListReleaseLabels` request fails if the identity (AWS AccountID)
-    #   and all filtering parameters are different from the original
-    #   request, or if the `NextToken` is expired or tampered with.
+    #   `ListReleaseLabels` request fails if the identity (Amazon Web
+    #   Services account ID) and all filtering parameters are different from
+    #   the original request, or if the `NextToken` is expired or tampered
+    #   with.
     #   @return [String]
     #
     # @!attribute [rw] max_results
@@ -5725,6 +5846,38 @@ module Aws::EMR
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass PutAutoTerminationPolicyInput
+    #   data as a hash:
+    #
+    #       {
+    #         cluster_id: "ClusterId", # required
+    #         auto_termination_policy: {
+    #           idle_timeout: 1,
+    #         },
+    #       }
+    #
+    # @!attribute [rw] cluster_id
+    #   Specifies the ID of the Amazon EMR cluster to which the
+    #   auto-termination policy will be attached.
+    #   @return [String]
+    #
+    # @!attribute [rw] auto_termination_policy
+    #   Specifies the auto-termination policy to attach to the cluster.
+    #   @return [Types::AutoTerminationPolicy]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/PutAutoTerminationPolicyInput AWS API Documentation
+    #
+    class PutAutoTerminationPolicyInput < Struct.new(
+      :cluster_id,
+      :auto_termination_policy)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/PutAutoTerminationPolicyOutput AWS API Documentation
+    #
+    class PutAutoTerminationPolicyOutput < Aws::EmptyStructure; end
+
     # @note When making an API call, you may pass PutBlockPublicAccessConfigurationInput
     #   data as a hash:
     #
@@ -5872,6 +6025,30 @@ module Aws::EMR
     #
     class RemoveAutoScalingPolicyOutput < Aws::EmptyStructure; end
 
+    # @note When making an API call, you may pass RemoveAutoTerminationPolicyInput
+    #   data as a hash:
+    #
+    #       {
+    #         cluster_id: "ClusterId", # required
+    #       }
+    #
+    # @!attribute [rw] cluster_id
+    #   Specifies the ID of the Amazon EMR cluster from which the
+    #   auto-termination policy will be removed.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RemoveAutoTerminationPolicyInput AWS API Documentation
+    #
+    class RemoveAutoTerminationPolicyInput < Struct.new(
+      :cluster_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RemoveAutoTerminationPolicyOutput AWS API Documentation
+    #
+    class RemoveAutoTerminationPolicyOutput < Aws::EmptyStructure; end
+
     # @note When making an API call, you may pass RemoveManagedScalingPolicyInput
     #   data as a hash:
     #
@@ -5896,7 +6073,8 @@ module Aws::EMR
     #
     class RemoveManagedScalingPolicyOutput < Aws::EmptyStructure; end
 
-    # This input identifies a cluster and a list of tags to remove.
+    # This input identifies an Amazon EMR resource and a list of tags to
+    # remove.
     #
     # @note When making an API call, you may pass RemoveTagsInput
     #   data as a hash:
@@ -5908,11 +6086,11 @@ module Aws::EMR
     #
     # @!attribute [rw] resource_id
     #   The Amazon EMR resource identifier from which tags will be removed.
-    #   This value must be a cluster identifier.
+    #   For example, a cluster identifier or an Amazon EMR Studio ID.
     #   @return [String]
     #
     # @!attribute [rw] tag_keys
-    #   A list of tag keys to remove from a resource.
+    #   A list of tag keys to remove from the resource.
     #   @return [Array<String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RemoveTagsInput AWS API Documentation
@@ -5924,7 +6102,7 @@ module Aws::EMR
       include Aws::Structure
     end
 
-    # This output indicates the result of removing tags from a resource.
+    # This output indicates the result of removing tags from the resource.
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RemoveTagsOutput AWS API Documentation
     #
@@ -6016,6 +6194,7 @@ module Aws::EMR
     #                   },
     #                 ],
     #               },
+    #               custom_ami_id: "XmlStringMaxLen256",
     #             },
     #           ],
     #           instance_fleets: [
@@ -6054,6 +6233,7 @@ module Aws::EMR
     #                       },
     #                     },
     #                   ],
+    #                   custom_ami_id: "XmlStringMaxLen256",
     #                 },
     #               ],
     #               launch_specifications: {
@@ -6182,6 +6362,9 @@ module Aws::EMR
     #             placement_strategy: "SPREAD", # accepts SPREAD, PARTITION, CLUSTER, NONE
     #           },
     #         ],
+    #         auto_termination_policy: {
+    #           idle_timeout: 1,
+    #         },
     #       }
     #
     # @!attribute [rw] name
@@ -6313,17 +6496,18 @@ module Aws::EMR
     #   @return [Array<Types::Configuration>]
     #
     # @!attribute [rw] visible_to_all_users
-    #   Set this value to `true` so that IAM principals in the account
-    #   associated with the cluster can perform EMR actions on the cluster
-    #   that their IAM policies allow. This value defaults to `false` for
-    #   clusters created using the EMR API or the CLI [create-cluster][1]
-    #   command.
+    #   Set this value to `true` so that IAM principals in the Amazon Web
+    #   Services account associated with the cluster can perform EMR actions
+    #   on the cluster that their IAM policies allow. This value defaults to
+    #   `true` for clusters created using the EMR API or the CLI
+    #   [create-cluster][1] command.
     #
     #   When set to `false`, only the IAM principal that created the cluster
-    #   and the account root user can perform EMR actions for the cluster,
-    #   regardless of the IAM permissions policies attached to other IAM
-    #   principals. For more information, see [Understanding the EMR Cluster
-    #   VisibleToAllUsers Setting][2] in the *Amazon EMR Management Guide*.
+    #   and the Amazon Web Services account root user can perform EMR
+    #   actions for the cluster, regardless of the IAM permissions policies
+    #   attached to other IAM principals. For more information, see
+    #   [Understanding the EMR Cluster VisibleToAllUsers Setting][2] in the
+    #   *Amazon EMRManagement Guide*.
     #
     #
     #
@@ -6339,8 +6523,8 @@ module Aws::EMR
     #   @return [String]
     #
     # @!attribute [rw] service_role
-    #   The IAM role that will be assumed by the Amazon EMR service to
-    #   access Amazon Web Services resources on your behalf.
+    #   The IAM role that Amazon EMR assumes in order to access Amazon Web
+    #   Services resources on your behalf.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -6438,6 +6622,17 @@ module Aws::EMR
     #   cluster.
     #   @return [Array<Types::PlacementGroupConfig>]
     #
+    # @!attribute [rw] auto_termination_policy
+    #   An auto-termination policy for an Amazon EMR cluster. An
+    #   auto-termination policy defines the amount of idle time in seconds
+    #   after which a cluster automatically terminates. For alternative
+    #   cluster termination options, see [Control cluster termination][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-plan-termination.html
+    #   @return [Types::AutoTerminationPolicy]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/RunJobFlowInput AWS API Documentation
     #
     class RunJobFlowInput < Struct.new(
@@ -6467,7 +6662,8 @@ module Aws::EMR
       :kerberos_attributes,
       :step_concurrency_level,
       :managed_scaling_policy,
-      :placement_group_configs)
+      :placement_group_configs,
+      :auto_termination_policy)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -6864,11 +7060,12 @@ module Aws::EMR
     #   @return [Array<String>]
     #
     # @!attribute [rw] visible_to_all_users
-    #   A value of `true` indicates that an IAM principal in the account can
-    #   perform EMR actions on the cluster that the IAM policies attached to
-    #   the principal allow. A value of `false` indicates that only the IAM
-    #   principal that created the cluster and the Amazon Web Services root
-    #   user can perform EMR actions on the cluster.
+    #   A value of `true` indicates that an IAM principal in the Amazon Web
+    #   Services account can perform EMR actions on the cluster that the IAM
+    #   policies attached to the principal allow. A value of `false`
+    #   indicates that only the IAM principal that created the cluster and
+    #   the Amazon Web Services root user can perform EMR actions on the
+    #   cluster.
     #   @return [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/elasticmapreduce-2009-03-31/SetVisibleToAllUsersInput AWS API Documentation
@@ -7480,7 +7677,7 @@ module Aws::EMR
     #
     # @!attribute [rw] auth_mode
     #   Specifies whether the Amazon EMR Studio authenticates users using
-    #   single sign-on (SSO) or IAM.
+    #   IAM or Amazon Web Services SSO.
     #   @return [String]
     #
     # @!attribute [rw] vpc_id
@@ -7498,7 +7695,8 @@ module Aws::EMR
     #
     # @!attribute [rw] user_role
     #   The name of the IAM role assumed by users logged in to the Amazon
-    #   EMR Studio.
+    #   EMR Studio. A Studio only requires a `UserRole` when you use IAM
+    #   authentication.
     #   @return [String]
     #
     # @!attribute [rw] workspace_security_group_id
@@ -7527,6 +7725,16 @@ module Aws::EMR
     #   notebook files.
     #   @return [String]
     #
+    # @!attribute [rw] idp_auth_url
+    #   Your identity provider's authentication endpoint. Amazon EMR Studio
+    #   redirects federated users to this endpoint for authentication when
+    #   logging in to a Studio with the Studio URL.
+    #   @return [String]
+    #
+    # @!attribute [rw] idp_relay_state_parameter_name
+    #   The name of your identity provider's `RelayState` parameter.
+    #   @return [String]
+    #
     # @!attribute [rw] tags
     #   A list of tags associated with the Amazon EMR Studio.
     #   @return [Array<Types::Tag>]
@@ -7548,6 +7756,8 @@ module Aws::EMR
       :url,
       :creation_time,
       :default_s3_location,
+      :idp_auth_url,
+      :idp_relay_state_parameter_name,
       :tags)
       SENSITIVE = []
       include Aws::Structure
@@ -7578,6 +7788,11 @@ module Aws::EMR
     #   The unique access URL of the Amazon EMR Studio.
     #   @return [String]
     #
+    # @!attribute [rw] auth_mode
+    #   Specifies whether the Studio authenticates users using IAM or Amazon
+    #   Web Services SSO.
+    #   @return [String]
+    #
     # @!attribute [rw] creation_time
     #   The time when the Amazon EMR Studio was created.
     #   @return [Time]
@@ -7590,6 +7805,7 @@ module Aws::EMR
       :vpc_id,
       :description,
       :url,
+      :auth_mode,
       :creation_time)
       SENSITIVE = []
       include Aws::Structure