aws-sdk-athena 1.57.0 → 1.59.0

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

@@ -20,13 +20,6 @@ module Aws::Athena
     #
     # [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html#object-ownership-overview
     #
-    # @note When making an API call, you may pass AclConfiguration
-    #   data as a hash:
-    #
-    #       {
-    #         s3_acl_option: "BUCKET_OWNER_FULL_CONTROL", # required, accepts BUCKET_OWNER_FULL_CONTROL
-    #       }
-    #
     # @!attribute [rw] s3_acl_option
     #   The Amazon S3 canned ACL that Athena should specify when storing
     #   query results. Currently the only supported canned ACL is
@@ -49,6 +42,27 @@ module Aws::Athena
       include Aws::Structure
     end
 
+    # Contains the application runtime IDs and their supported DPU sizes.
+    #
+    # @!attribute [rw] application_runtime_id
+    #   The name of the supported application runtime (for example, `Jupyter
+    #   1.0`).
+    #   @return [String]
+    #
+    # @!attribute [rw] supported_dpu_sizes
+    #   A list of the supported DPU sizes that the application runtime
+    #   supports.
+    #   @return [Array<Integer>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ApplicationDPUSizes AWS API Documentation
+    #
+    class ApplicationDPUSizes < Struct.new(
+      :application_runtime_id,
+      :supported_dpu_sizes)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Provides information about an Athena query error. The `AthenaError`
     # feature provides standardized error information to help you understand
     # failed queries and take steps after a query failure occurs.
@@ -98,13 +112,6 @@ module Aws::Athena
 
     # Contains an array of named query IDs.
     #
-    # @note When making an API call, you may pass BatchGetNamedQueryInput
-    #   data as a hash:
-    #
-    #       {
-    #         named_query_ids: ["NamedQueryId"], # required
-    #       }
-    #
     # @!attribute [rw] named_query_ids
     #   An array of query IDs.
     #   @return [Array<String>]
@@ -134,14 +141,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass BatchGetPreparedStatementInput
-    #   data as a hash:
-    #
-    #       {
-    #         prepared_statement_names: ["StatementName"], # required
-    #         work_group: "WorkGroupName", # required
-    #       }
-    #
     # @!attribute [rw] prepared_statement_names
     #   A list of prepared statement names to return.
     #   @return [Array<String>]
@@ -179,13 +178,6 @@ module Aws::Athena
 
     # Contains an array of query execution IDs.
     #
-    # @note When making an API call, you may pass BatchGetQueryExecutionInput
-    #   data as a hash:
-    #
-    #       {
-    #         query_execution_ids: ["QueryExecutionId"], # required
-    #       }
-    #
     # @!attribute [rw] query_execution_ids
     #   An array of query execution IDs.
     #   @return [Array<String>]
@@ -215,6 +207,143 @@ module Aws::Athena
       include Aws::Structure
     end
 
+    # Contains configuration information for the calculation.
+    #
+    # @!attribute [rw] code_block
+    #   A string that contains the code for the calculation.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CalculationConfiguration AWS API Documentation
+    #
+    class CalculationConfiguration < Struct.new(
+      :code_block)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains information about an application-specific calculation result.
+    #
+    # @!attribute [rw] std_out_s3_uri
+    #   The Amazon S3 location of the `stdout` file for the calculation.
+    #   @return [String]
+    #
+    # @!attribute [rw] std_error_s3_uri
+    #   The Amazon S3 location of the `stderr` error messages file for the
+    #   calculation.
+    #   @return [String]
+    #
+    # @!attribute [rw] result_s3_uri
+    #   The Amazon S3 location of the folder for the calculation results.
+    #   @return [String]
+    #
+    # @!attribute [rw] result_type
+    #   The data format of the calculation result.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CalculationResult AWS API Documentation
+    #
+    class CalculationResult < Struct.new(
+      :std_out_s3_uri,
+      :std_error_s3_uri,
+      :result_s3_uri,
+      :result_type)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains statistics for a notebook calculation.
+    #
+    # @!attribute [rw] dpu_execution_in_millis
+    #   The data processing unit execution time in milliseconds for the
+    #   calculation.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] progress
+    #   The progress of the calculation.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CalculationStatistics AWS API Documentation
+    #
+    class CalculationStatistics < Struct.new(
+      :dpu_execution_in_millis,
+      :progress)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains information about the status of a notebook calculation.
+    #
+    # @!attribute [rw] submission_date_time
+    #   The date and time the calculation was submitted for processing.
+    #   @return [Time]
+    #
+    # @!attribute [rw] completion_date_time
+    #   The date and time the calculation completed processing.
+    #   @return [Time]
+    #
+    # @!attribute [rw] state
+    #   The state of the calculation execution. A description of each state
+    #   follows.
+    #
+    #   `CREATING` - The calculation is in the process of being created.
+    #
+    #   `CREATED` - The calculation has been created and is ready to run.
+    #
+    #   `QUEUED` - The calculation has been queued for processing.
+    #
+    #   `RUNNING` - The calculation is running.
+    #
+    #   `CANCELING` - A request to cancel the calculation has been received
+    #   and the system is working to stop it.
+    #
+    #   `CANCELED` - The calculation is no longer running as the result of a
+    #   cancel request.
+    #
+    #   `COMPLETED` - The calculation has completed without error.
+    #
+    #   `FAILED` - The calculation failed and is no longer running.
+    #   @return [String]
+    #
+    # @!attribute [rw] state_change_reason
+    #   The reason for the calculation state change (for example, the
+    #   calculation was canceled because the session was terminated).
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CalculationStatus AWS API Documentation
+    #
+    class CalculationStatus < Struct.new(
+      :submission_date_time,
+      :completion_date_time,
+      :state,
+      :state_change_reason)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Summary information for a notebook calculation.
+    #
+    # @!attribute [rw] calculation_execution_id
+    #   The calculation execution UUID.
+    #   @return [String]
+    #
+    # @!attribute [rw] description
+    #   A description of the calculation.
+    #   @return [String]
+    #
+    # @!attribute [rw] status
+    #   Contains information about the status of the calculation.
+    #   @return [Types::CalculationStatus]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CalculationSummary AWS API Documentation
+    #
+    class CalculationSummary < Struct.new(
+      :calculation_execution_id,
+      :description,
+      :status)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Contains metadata for a column in a table.
     #
     # @!attribute [rw] name
@@ -300,24 +429,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass CreateDataCatalogInput
-    #   data as a hash:
-    #
-    #       {
-    #         name: "CatalogNameString", # required
-    #         type: "LAMBDA", # required, accepts LAMBDA, GLUE, HIVE
-    #         description: "DescriptionString",
-    #         parameters: {
-    #           "KeyString" => "ParametersMapValue",
-    #         },
-    #         tags: [
-    #           {
-    #             key: "TagKey",
-    #             value: "TagValue",
-    #           },
-    #         ],
-    #       }
-    #
     # @!attribute [rw] name
     #   The name of the data catalog to create. The catalog name must be
     #   unique for the Amazon Web Services account and can use a maximum of
@@ -402,18 +513,6 @@ module Aws::Athena
     #
     class CreateDataCatalogOutput < Aws::EmptyStructure; end
 
-    # @note When making an API call, you may pass CreateNamedQueryInput
-    #   data as a hash:
-    #
-    #       {
-    #         name: "NameString", # required
-    #         description: "DescriptionString",
-    #         database: "DatabaseString", # required
-    #         query_string: "QueryString", # required
-    #         client_request_token: "IdempotencyToken",
-    #         work_group: "WorkGroupName",
-    #       }
-    #
     # @!attribute [rw] name
     #   The query name.
     #   @return [String]
@@ -476,16 +575,49 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass CreatePreparedStatementInput
-    #   data as a hash:
+    # @!attribute [rw] work_group
+    #   The name of the Spark enabled workgroup in which the notebook will
+    #   be created.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   The name of the `ipynb` file to be created in the Spark workgroup,
+    #   without the `.ipynb` extension.
+    #   @return [String]
+    #
+    # @!attribute [rw] client_request_token
+    #   A unique case-sensitive string used to ensure the request to create
+    #   the notebook is idempotent (executes only once).
+    #
+    #   This token is listed as not required because Amazon Web Services
+    #   SDKs (for example the Amazon Web Services SDK for Java)
+    #   auto-generate the token for you. If you are not using the Amazon Web
+    #   Services SDK or the Amazon Web Services CLI, you must provide this
+    #   token or the action will fail.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CreateNotebookInput AWS API Documentation
+    #
+    class CreateNotebookInput < Struct.new(
+      :work_group,
+      :name,
+      :client_request_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] notebook_id
+    #   A unique identifier for the notebook.
+    #   @return [String]
     #
-    #       {
-    #         statement_name: "StatementName", # required
-    #         work_group: "WorkGroupName", # required
-    #         query_statement: "QueryString", # required
-    #         description: "DescriptionString",
-    #       }
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CreateNotebookOutput AWS API Documentation
     #
+    class CreateNotebookOutput < Struct.new(
+      :notebook_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] statement_name
     #   The name of the prepared statement.
     #   @return [String]
@@ -517,54 +649,54 @@ module Aws::Athena
     #
     class CreatePreparedStatementOutput < Aws::EmptyStructure; end
 
-    # @note When making an API call, you may pass CreateWorkGroupInput
-    #   data as a hash:
-    #
-    #       {
-    #         name: "WorkGroupName", # required
-    #         configuration: {
-    #           result_configuration: {
-    #             output_location: "ResultOutputLocation",
-    #             encryption_configuration: {
-    #               encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
-    #               kms_key: "String",
-    #             },
-    #             expected_bucket_owner: "AwsAccountId",
-    #             acl_configuration: {
-    #               s3_acl_option: "BUCKET_OWNER_FULL_CONTROL", # required, accepts BUCKET_OWNER_FULL_CONTROL
-    #             },
-    #           },
-    #           enforce_work_group_configuration: false,
-    #           publish_cloud_watch_metrics_enabled: false,
-    #           bytes_scanned_cutoff_per_query: 1,
-    #           requester_pays_enabled: false,
-    #           engine_version: {
-    #             selected_engine_version: "NameString",
-    #             effective_engine_version: "NameString",
-    #           },
-    #         },
-    #         description: "WorkGroupDescriptionString",
-    #         tags: [
-    #           {
-    #             key: "TagKey",
-    #             value: "TagValue",
-    #           },
-    #         ],
-    #       }
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CreatePresignedNotebookUrlRequest AWS API Documentation
+    #
+    class CreatePresignedNotebookUrlRequest < Struct.new(
+      :session_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] notebook_url
+    #   The URL of the notebook. The URL includes the authentication token
+    #   and notebook file name and points directly to the opened notebook.
+    #   @return [String]
+    #
+    # @!attribute [rw] auth_token
+    #   The authentication token for the notebook.
+    #   @return [String]
+    #
+    # @!attribute [rw] auth_token_expiration_time
+    #   The UTC epoch time when the authentication token expires.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CreatePresignedNotebookUrlResponse AWS API Documentation
     #
+    class CreatePresignedNotebookUrlResponse < Struct.new(
+      :notebook_url,
+      :auth_token,
+      :auth_token_expiration_time)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] name
     #   The workgroup name.
     #   @return [String]
     #
     # @!attribute [rw] configuration
-    #   The configuration for the workgroup, which includes the location in
-    #   Amazon S3 where query results are stored, the encryption
-    #   configuration, if any, used for encrypting query results, whether
-    #   the Amazon CloudWatch Metrics are enabled for the workgroup, the
-    #   limit for the amount of bytes scanned (cutoff) per query, if it is
-    #   specified, and whether workgroup's settings (specified with
-    #   `EnforceWorkGroupConfiguration`) in the `WorkGroupConfiguration`
-    #   override client-side settings. See
+    #   Contains configuration information for creating an Athena SQL
+    #   workgroup, which includes the location in Amazon S3 where query
+    #   results are stored, the encryption configuration, if any, used for
+    #   encrypting query results, whether the Amazon CloudWatch Metrics are
+    #   enabled for the workgroup, the limit for the amount of bytes scanned
+    #   (cutoff) per query, if it is specified, and whether workgroup's
+    #   settings (specified with `EnforceWorkGroupConfiguration`) in the
+    #   `WorkGroupConfiguration` override client-side settings. See
     #   WorkGroupConfiguration$EnforceWorkGroupConfiguration.
     #   @return [Types::WorkGroupConfiguration]
     #
@@ -592,6 +724,22 @@ module Aws::Athena
     #
     class CreateWorkGroupOutput < Aws::EmptyStructure; end
 
+    # Specifies the KMS key that is used to encrypt the user's data stores
+    # in Athena.
+    #
+    # @!attribute [rw] kms_key
+    #   The KMS key that is used to encrypt the user's data stores in
+    #   Athena.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CustomerContentEncryptionConfiguration AWS API Documentation
+    #
+    class CustomerContentEncryptionConfiguration < Struct.new(
+      :kms_key)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Contains information about a data catalog in an Amazon Web Services
     # account.
     #
@@ -726,13 +874,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass DeleteDataCatalogInput
-    #   data as a hash:
-    #
-    #       {
-    #         name: "CatalogNameString", # required
-    #       }
-    #
     # @!attribute [rw] name
     #   The name of the data catalog to delete.
     #   @return [String]
@@ -749,13 +890,6 @@ module Aws::Athena
     #
     class DeleteDataCatalogOutput < Aws::EmptyStructure; end
 
-    # @note When making an API call, you may pass DeleteNamedQueryInput
-    #   data as a hash:
-    #
-    #       {
-    #         named_query_id: "NamedQueryId", # required
-    #       }
-    #
     # @!attribute [rw] named_query_id
     #   The unique ID of the query to delete.
     #
@@ -775,14 +909,22 @@ module Aws::Athena
     #
     class DeleteNamedQueryOutput < Aws::EmptyStructure; end
 
-    # @note When making an API call, you may pass DeletePreparedStatementInput
-    #   data as a hash:
+    # @!attribute [rw] notebook_id
+    #   The ID of the notebook to delete.
+    #   @return [String]
     #
-    #       {
-    #         statement_name: "StatementName", # required
-    #         work_group: "WorkGroupName", # required
-    #       }
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/DeleteNotebookInput AWS API Documentation
+    #
+    class DeleteNotebookInput < Struct.new(
+      :notebook_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/DeleteNotebookOutput AWS API Documentation
     #
+    class DeleteNotebookOutput < Aws::EmptyStructure; end
+
     # @!attribute [rw] statement_name
     #   The name of the prepared statement to delete.
     #   @return [String]
@@ -804,14 +946,6 @@ module Aws::Athena
     #
     class DeletePreparedStatementOutput < Aws::EmptyStructure; end
 
-    # @note When making an API call, you may pass DeleteWorkGroupInput
-    #   data as a hash:
-    #
-    #       {
-    #         work_group: "WorkGroupName", # required
-    #         recursive_delete_option: false,
-    #       }
-    #
     # @!attribute [rw] work_group
     #   The unique name of the workgroup to delete.
     #   @return [String]
@@ -837,14 +971,6 @@ module Aws::Athena
     # If query results are encrypted in Amazon S3, indicates the encryption
     # option used (for example, `SSE_KMS` or `CSE_KMS`) and key information.
     #
-    # @note When making an API call, you may pass EncryptionConfiguration
-    #   data as a hash:
-    #
-    #       {
-    #         encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
-    #         kms_key: "String",
-    #       }
-    #
     # @!attribute [rw] encryption_option
     #   Indicates whether Amazon S3 server-side encryption with Amazon
     #   S3-managed keys (`SSE_S3`), server-side encryption with KMS-managed
@@ -870,15 +996,47 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # The Athena engine version for running queries.
+    # Contains data processing unit (DPU) configuration settings and
+    # parameter mappings for a notebook engine.
+    #
+    # @!attribute [rw] coordinator_dpu_size
+    #   The number of DPUs to use for the coordinator. A coordinator is a
+    #   special executor that orchestrates processing work and manages other
+    #   executors in a notebook session.
+    #   @return [Integer]
     #
-    # @note When making an API call, you may pass EngineVersion
-    #   data as a hash:
+    # @!attribute [rw] max_concurrent_dpus
+    #   The maximum number of DPUs that can run concurrently.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] default_executor_dpu_size
+    #   The default number of DPUs to use for executors. An executor is the
+    #   smallest unit of compute that a notebook session can request from
+    #   Athena.
+    #   @return [Integer]
     #
-    #       {
-    #         selected_engine_version: "NameString",
-    #         effective_engine_version: "NameString",
-    #       }
+    # @!attribute [rw] additional_configs
+    #   Contains additional notebook engine `MAP<string, string>` parameter
+    #   mappings in the form of key-value pairs. To specify an Amazon S3 URI
+    #   that the Jupyter server will download and serve, specify a value for
+    #   the StartSessionRequest$NotebookVersion field, and then add a key
+    #   named `NotebookFileURI` to `AdditionalConfigs` that has value of the
+    #   Amazon S3 URI.
+    #   @return [Hash<String,String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/EngineConfiguration AWS API Documentation
+    #
+    class EngineConfiguration < Struct.new(
+      :coordinator_dpu_size,
+      :max_concurrent_dpus,
+      :default_executor_dpu_size,
+      :additional_configs)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The Athena engine version for running queries, or the PySpark engine
+    # version for running sessions.
     #
     # @!attribute [rw] selected_engine_version
     #   The engine version requested by the user. Possible values are
@@ -905,126 +1063,330 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass GetDataCatalogInput
-    #   data as a hash:
+    # Contains summary information about an executor.
     #
-    #       {
-    #         name: "CatalogNameString", # required
-    #       }
+    # @!attribute [rw] executor_id
+    #   The UUID of the executor.
+    #   @return [String]
     #
-    # @!attribute [rw] name
-    #   The name of the data catalog to return.
+    # @!attribute [rw] executor_type
+    #   The type of executor used for the application (`COORDINATOR`,
+    #   `GATEWAY`, or `WORKER`).
     #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetDataCatalogInput AWS API Documentation
+    # @!attribute [rw] start_date_time
+    #   The date and time that the executor started.
+    #   @return [Integer]
     #
-    class GetDataCatalogInput < Struct.new(
-      :name)
+    # @!attribute [rw] termination_date_time
+    #   The date and time that the executor was terminated.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] executor_state
+    #   The processing state of the executor. A description of each state
+    #   follows.
+    #
+    #   `CREATING` - The executor is being started, including acquiring
+    #   resources.
+    #
+    #   `CREATED` - The executor has been started.
+    #
+    #   `REGISTERED` - The executor has been registered.
+    #
+    #   `TERMINATING` - The executor is in the process of shutting down.
+    #
+    #   `TERMINATED` - The executor is no longer running.
+    #
+    #   `FAILED` - Due to a failure, the executor is no longer running.
+    #   @return [String]
+    #
+    # @!attribute [rw] executor_size
+    #   The smallest unit of compute that a session can request from Athena.
+    #   Size is measured in data processing unit (DPU) values, a relative
+    #   measure of processing power.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ExecutorsSummary AWS API Documentation
+    #
+    class ExecutorsSummary < Struct.new(
+      :executor_id,
+      :executor_type,
+      :start_date_time,
+      :termination_date_time,
+      :executor_state,
+      :executor_size)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @!attribute [rw] data_catalog
-    #   The data catalog returned.
-    #   @return [Types::DataCatalog]
+    # @!attribute [rw] notebook_id
+    #   The ID of the notebook to export.
+    #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetDataCatalogOutput AWS API Documentation
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ExportNotebookInput AWS API Documentation
     #
-    class GetDataCatalogOutput < Struct.new(
-      :data_catalog)
+    class ExportNotebookInput < Struct.new(
+      :notebook_id)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass GetDatabaseInput
-    #   data as a hash:
-    #
-    #       {
-    #         catalog_name: "CatalogNameString", # required
-    #         database_name: "NameString", # required
-    #       }
-    #
-    # @!attribute [rw] catalog_name
-    #   The name of the data catalog that contains the database to return.
-    #   @return [String]
+    # @!attribute [rw] notebook_metadata
+    #   The notebook metadata, including notebook ID, notebook name, and
+    #   workgroup name.
+    #   @return [Types::NotebookMetadata]
     #
-    # @!attribute [rw] database_name
-    #   The name of the database to return.
+    # @!attribute [rw] payload
+    #   The content of the exported notebook.
     #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetDatabaseInput AWS API Documentation
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ExportNotebookOutput AWS API Documentation
     #
-    class GetDatabaseInput < Struct.new(
-      :catalog_name,
-      :database_name)
+    class ExportNotebookOutput < Struct.new(
+      :notebook_metadata,
+      :payload)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @!attribute [rw] database
-    #   The database returned.
-    #   @return [Types::Database]
+    # A string for searching notebook names.
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetDatabaseOutput AWS API Documentation
+    # @!attribute [rw] name
+    #   The name of the notebook to search for.
+    #   @return [String]
     #
-    class GetDatabaseOutput < Struct.new(
-      :database)
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/FilterDefinition AWS API Documentation
+    #
+    class FilterDefinition < Struct.new(
+      :name)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass GetNamedQueryInput
-    #   data as a hash:
+    # @!attribute [rw] calculation_execution_id
+    #   The calculation execution UUID.
+    #   @return [String]
     #
-    #       {
-    #         named_query_id: "NamedQueryId", # required
-    #       }
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetCalculationExecutionCodeRequest AWS API Documentation
     #
-    # @!attribute [rw] named_query_id
-    #   The unique ID of the query. Use ListNamedQueries to get query IDs.
+    class GetCalculationExecutionCodeRequest < Struct.new(
+      :calculation_execution_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] code_block
+    #   A pre-signed URL to the code that executed the calculation.
     #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetNamedQueryInput AWS API Documentation
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetCalculationExecutionCodeResponse AWS API Documentation
     #
-    class GetNamedQueryInput < Struct.new(
-      :named_query_id)
+    class GetCalculationExecutionCodeResponse < Struct.new(
+      :code_block)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @!attribute [rw] named_query
-    #   Information about the query.
-    #   @return [Types::NamedQuery]
+    # @!attribute [rw] calculation_execution_id
+    #   The calculation execution UUID.
+    #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetNamedQueryOutput AWS API Documentation
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetCalculationExecutionRequest AWS API Documentation
     #
-    class GetNamedQueryOutput < Struct.new(
-      :named_query)
+    class GetCalculationExecutionRequest < Struct.new(
+      :calculation_execution_id)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass GetPreparedStatementInput
-    #   data as a hash:
+    # @!attribute [rw] calculation_execution_id
+    #   The calculation execution UUID.
+    #   @return [String]
     #
-    #       {
-    #         statement_name: "StatementName", # required
-    #         work_group: "WorkGroupName", # required
-    #       }
+    # @!attribute [rw] session_id
+    #   The session ID that the calculation ran in.
+    #   @return [String]
     #
-    # @!attribute [rw] statement_name
-    #   The name of the prepared statement to retrieve.
+    # @!attribute [rw] description
+    #   The description of the calculation execution.
     #   @return [String]
     #
-    # @!attribute [rw] work_group
-    #   The workgroup to which the statement to be retrieved belongs.
+    # @!attribute [rw] working_directory
+    #   The Amazon S3 location in which calculation results are stored.
     #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetPreparedStatementInput AWS API Documentation
+    # @!attribute [rw] status
+    #   Contains information about the status of the calculation.
+    #   @return [Types::CalculationStatus]
     #
-    class GetPreparedStatementInput < Struct.new(
-      :statement_name,
-      :work_group)
+    # @!attribute [rw] statistics
+    #   Contains information about the data processing unit (DPU) execution
+    #   time and progress. This field is populated only when statistics are
+    #   available.
+    #   @return [Types::CalculationStatistics]
+    #
+    # @!attribute [rw] result
+    #   Contains result information. This field is populated only if the
+    #   calculation is completed.
+    #   @return [Types::CalculationResult]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetCalculationExecutionResponse AWS API Documentation
+    #
+    class GetCalculationExecutionResponse < Struct.new(
+      :calculation_execution_id,
+      :session_id,
+      :description,
+      :working_directory,
+      :status,
+      :statistics,
+      :result)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] calculation_execution_id
+    #   The calculation execution UUID.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetCalculationExecutionStatusRequest AWS API Documentation
+    #
+    class GetCalculationExecutionStatusRequest < Struct.new(
+      :calculation_execution_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] status
+    #   Contains information about the calculation execution status.
+    #   @return [Types::CalculationStatus]
+    #
+    # @!attribute [rw] statistics
+    #   Contains information about the DPU execution time and progress.
+    #   @return [Types::CalculationStatistics]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetCalculationExecutionStatusResponse AWS API Documentation
+    #
+    class GetCalculationExecutionStatusResponse < Struct.new(
+      :status,
+      :statistics)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] name
+    #   The name of the data catalog to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetDataCatalogInput AWS API Documentation
+    #
+    class GetDataCatalogInput < Struct.new(
+      :name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] data_catalog
+    #   The data catalog returned.
+    #   @return [Types::DataCatalog]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetDataCatalogOutput AWS API Documentation
+    #
+    class GetDataCatalogOutput < Struct.new(
+      :data_catalog)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] catalog_name
+    #   The name of the data catalog that contains the database to return.
+    #   @return [String]
+    #
+    # @!attribute [rw] database_name
+    #   The name of the database to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetDatabaseInput AWS API Documentation
+    #
+    class GetDatabaseInput < Struct.new(
+      :catalog_name,
+      :database_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] database
+    #   The database returned.
+    #   @return [Types::Database]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetDatabaseOutput AWS API Documentation
+    #
+    class GetDatabaseOutput < Struct.new(
+      :database)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] named_query_id
+    #   The unique ID of the query. Use ListNamedQueries to get query IDs.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetNamedQueryInput AWS API Documentation
+    #
+    class GetNamedQueryInput < Struct.new(
+      :named_query_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] named_query
+    #   Information about the query.
+    #   @return [Types::NamedQuery]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetNamedQueryOutput AWS API Documentation
+    #
+    class GetNamedQueryOutput < Struct.new(
+      :named_query)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] notebook_id
+    #   The ID of the notebook whose metadata is to be retrieved.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetNotebookMetadataInput AWS API Documentation
+    #
+    class GetNotebookMetadataInput < Struct.new(
+      :notebook_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] notebook_metadata
+    #   The metadata that is returned for the specified notebook ID.
+    #   @return [Types::NotebookMetadata]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetNotebookMetadataOutput AWS API Documentation
+    #
+    class GetNotebookMetadataOutput < Struct.new(
+      :notebook_metadata)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] statement_name
+    #   The name of the prepared statement to retrieve.
+    #   @return [String]
+    #
+    # @!attribute [rw] work_group
+    #   The workgroup to which the statement to be retrieved belongs.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetPreparedStatementInput AWS API Documentation
+    #
+    class GetPreparedStatementInput < Struct.new(
+      :statement_name,
+      :work_group)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1041,13 +1403,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass GetQueryExecutionInput
-    #   data as a hash:
-    #
-    #       {
-    #         query_execution_id: "QueryExecutionId", # required
-    #       }
-    #
     # @!attribute [rw] query_execution_id
     #   The unique ID of the query execution.
     #   @return [String]
@@ -1072,15 +1427,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass GetQueryResultsInput
-    #   data as a hash:
-    #
-    #       {
-    #         query_execution_id: "QueryExecutionId", # required
-    #         next_token: "Token",
-    #         max_results: 1,
-    #       }
-    #
     # @!attribute [rw] query_execution_id
     #   The unique ID of the query execution.
     #   @return [String]
@@ -1132,13 +1478,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass GetQueryRuntimeStatisticsInput
-    #   data as a hash:
-    #
-    #       {
-    #         query_execution_id: "QueryExecutionId", # required
-    #       }
-    #
     # @!attribute [rw] query_execution_id
     #   The unique ID of the query execution.
     #   @return [String]
@@ -1163,15 +1502,102 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass GetTableMetadataInput
-    #   data as a hash:
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetSessionRequest AWS API Documentation
+    #
+    class GetSessionRequest < Struct.new(
+      :session_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] description
+    #   The session description.
+    #   @return [String]
+    #
+    # @!attribute [rw] work_group
+    #   The workgroup to which the session belongs.
+    #   @return [String]
+    #
+    # @!attribute [rw] engine_version
+    #   The engine version used by the session (for example, `PySpark engine
+    #   version 3`). You can get a list of engine versions by calling
+    #   ListEngineVersions.
+    #   @return [String]
+    #
+    # @!attribute [rw] engine_configuration
+    #   Contains engine configuration information like DPU usage.
+    #   @return [Types::EngineConfiguration]
+    #
+    # @!attribute [rw] notebook_version
+    #   The notebook version.
+    #   @return [String]
+    #
+    # @!attribute [rw] session_configuration
+    #   Contains the workgroup configuration information used by the
+    #   session.
+    #   @return [Types::SessionConfiguration]
+    #
+    # @!attribute [rw] status
+    #   Contains information about the status of the session.
+    #   @return [Types::SessionStatus]
+    #
+    # @!attribute [rw] statistics
+    #   Contains the DPU execution time.
+    #   @return [Types::SessionStatistics]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetSessionResponse AWS API Documentation
+    #
+    class GetSessionResponse < Struct.new(
+      :session_id,
+      :description,
+      :work_group,
+      :engine_version,
+      :engine_configuration,
+      :notebook_version,
+      :session_configuration,
+      :status,
+      :statistics)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
     #
-    #       {
-    #         catalog_name: "CatalogNameString", # required
-    #         database_name: "NameString", # required
-    #         table_name: "NameString", # required
-    #       }
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetSessionStatusRequest AWS API Documentation
+    #
+    class GetSessionStatusRequest < Struct.new(
+      :session_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
     #
+    # @!attribute [rw] status
+    #   Contains information about the status of the session.
+    #   @return [Types::SessionStatus]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetSessionStatusResponse AWS API Documentation
+    #
+    class GetSessionStatusResponse < Struct.new(
+      :session_id,
+      :status)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] catalog_name
     #   The name of the data catalog that contains the database and table
     #   metadata to return.
@@ -1207,13 +1633,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass GetWorkGroupInput
-    #   data as a hash:
-    #
-    #       {
-    #         work_group: "WorkGroupName", # required
-    #       }
-    #
     # @!attribute [rw] work_group
     #   The name of the workgroup.
     #   @return [String]
@@ -1238,6 +1657,58 @@ module Aws::Athena
       include Aws::Structure
     end
 
+    # @!attribute [rw] work_group
+    #   The name of the Spark enabled workgroup to import the notebook to.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   The name of the notebook to import.
+    #   @return [String]
+    #
+    # @!attribute [rw] payload
+    #   The notebook content to be imported.
+    #   @return [String]
+    #
+    # @!attribute [rw] type
+    #   The notebook content type. Currently, the only valid type is
+    #   `IPYNB`.
+    #   @return [String]
+    #
+    # @!attribute [rw] client_request_token
+    #   A unique case-sensitive string used to ensure the request to import
+    #   the notebook is idempotent (executes only once).
+    #
+    #   This token is listed as not required because Amazon Web Services
+    #   SDKs (for example the Amazon Web Services SDK for Java)
+    #   auto-generate the token for you. If you are not using the Amazon Web
+    #   Services SDK or the Amazon Web Services CLI, you must provide this
+    #   token or the action will fail.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ImportNotebookInput AWS API Documentation
+    #
+    class ImportNotebookInput < Struct.new(
+      :work_group,
+      :name,
+      :payload,
+      :type,
+      :client_request_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] notebook_id
+    #   The ID of the notebook to import.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ImportNotebookOutput AWS API Documentation
+    #
+    class ImportNotebookOutput < Struct.new(
+      :notebook_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Indicates a platform issue, which may be due to a transient condition
     # or outage.
     #
@@ -1272,14 +1743,114 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass ListDataCatalogsInput
-    #   data as a hash:
+    # @!attribute [rw] max_results
+    #   Specifies the maximum number of results to return.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListApplicationDPUSizesInput AWS API Documentation
+    #
+    class ListApplicationDPUSizesInput < Struct.new(
+      :max_results,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] application_dpu_sizes
+    #   A list of the supported DPU sizes that the application runtime
+    #   supports.
+    #   @return [Array<Types::ApplicationDPUSizes>]
+    #
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListApplicationDPUSizesOutput AWS API Documentation
+    #
+    class ListApplicationDPUSizesOutput < Struct.new(
+      :application_dpu_sizes,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] state_filter
+    #   A filter for a specific calculation execution state. A description
+    #   of each state follows.
+    #
+    #   `CREATING` - The calculation is in the process of being created.
+    #
+    #   `CREATED` - The calculation has been created and is ready to run.
+    #
+    #   `QUEUED` - The calculation has been queued for processing.
+    #
+    #   `RUNNING` - The calculation is running.
+    #
+    #   `CANCELING` - A request to cancel the calculation has been received
+    #   and the system is working to stop it.
+    #
+    #   `CANCELED` - The calculation is no longer running as the result of a
+    #   cancel request.
+    #
+    #   `COMPLETED` - The calculation has completed without error.
+    #
+    #   `FAILED` - The calculation failed and is no longer running.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of calculation executions to return.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListCalculationExecutionsRequest AWS API Documentation
+    #
+    class ListCalculationExecutionsRequest < Struct.new(
+      :session_id,
+      :state_filter,
+      :max_results,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
+    #
+    # @!attribute [rw] calculations
+    #   A list of CalculationSummary objects.
+    #   @return [Array<Types::CalculationSummary>]
     #
-    #       {
-    #         next_token: "Token",
-    #         max_results: 1,
-    #       }
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListCalculationExecutionsResponse AWS API Documentation
     #
+    class ListCalculationExecutionsResponse < Struct.new(
+      :next_token,
+      :calculations)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] next_token
     #   A token generated by the Athena service that specifies where to
     #   continue pagination if a previous request was truncated. To obtain
@@ -1320,15 +1891,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass ListDatabasesInput
-    #   data as a hash:
-    #
-    #       {
-    #         catalog_name: "CatalogNameString", # required
-    #         next_token: "Token",
-    #         max_results: 1,
-    #       }
-    #
     # @!attribute [rw] catalog_name
     #   The name of the data catalog that contains the databases to return.
     #   @return [String]
@@ -1374,14 +1936,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass ListEngineVersionsInput
-    #   data as a hash:
-    #
-    #       {
-    #         next_token: "Token",
-    #         max_results: 1,
-    #       }
-    #
     # @!attribute [rw] next_token
     #   A token generated by the Athena service that specifies where to
     #   continue pagination if a previous request was truncated. To obtain
@@ -1422,15 +1976,75 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass ListNamedQueriesInput
-    #   data as a hash:
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] executor_state_filter
+    #   A filter for a specific executor state. A description of each state
+    #   follows.
+    #
+    #   `CREATING` - The executor is being started, including acquiring
+    #   resources.
+    #
+    #   `CREATED` - The executor has been started.
+    #
+    #   `REGISTERED` - The executor has been registered.
+    #
+    #   `TERMINATING` - The executor is in the process of shutting down.
     #
-    #       {
-    #         next_token: "Token",
-    #         max_results: 1,
-    #         work_group: "WorkGroupName",
-    #       }
+    #   `TERMINATED` - The executor is no longer running.
+    #
+    #   `FAILED` - Due to a failure, the executor is no longer running.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of executors to return.
+    #   @return [Integer]
     #
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListExecutorsRequest AWS API Documentation
+    #
+    class ListExecutorsRequest < Struct.new(
+      :session_id,
+      :executor_state_filter,
+      :max_results,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
+    #
+    # @!attribute [rw] executors_summary
+    #   Contains summary information about the executor.
+    #   @return [Array<Types::ExecutorsSummary>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListExecutorsResponse AWS API Documentation
+    #
+    class ListExecutorsResponse < Struct.new(
+      :session_id,
+      :next_token,
+      :executors_summary)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] next_token
     #   A token generated by the Athena service that specifies where to
     #   continue pagination if a previous request was truncated. To obtain
@@ -1453,14 +2067,108 @@ module Aws::Athena
     class ListNamedQueriesInput < Struct.new(
       :next_token,
       :max_results,
-      :work_group)
+      :work_group)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] named_query_ids
+    #   The list of unique query IDs.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListNamedQueriesOutput AWS API Documentation
+    #
+    class ListNamedQueriesOutput < Struct.new(
+      :named_query_ids,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] filters
+    #   Search filter string.
+    #   @return [Types::FilterDefinition]
+    #
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   Specifies the maximum number of results to return.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] work_group
+    #   The name of the Spark enabled workgroup to retrieve notebook
+    #   metadata for.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListNotebookMetadataInput AWS API Documentation
+    #
+    class ListNotebookMetadataInput < Struct.new(
+      :filters,
+      :next_token,
+      :max_results,
+      :work_group)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
+    #
+    # @!attribute [rw] notebook_metadata_list
+    #   The list of notebook metadata for the specified workgroup.
+    #   @return [Array<Types::NotebookMetadata>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListNotebookMetadataOutput AWS API Documentation
+    #
+    class ListNotebookMetadataOutput < Struct.new(
+      :next_token,
+      :notebook_metadata_list)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] notebook_id
+    #   The ID of the notebook to list sessions for.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of notebook sessions to return.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListNotebookSessionsRequest AWS API Documentation
+    #
+    class ListNotebookSessionsRequest < Struct.new(
+      :notebook_id,
+      :max_results,
+      :next_token)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @!attribute [rw] named_query_ids
-    #   The list of unique query IDs.
-    #   @return [Array<String>]
+    # @!attribute [rw] notebook_sessions_list
+    #   A list of the sessions belonging to the notebook.
+    #   @return [Array<Types::NotebookSessionSummary>]
     #
     # @!attribute [rw] next_token
     #   A token generated by the Athena service that specifies where to
@@ -1469,24 +2177,15 @@ module Aws::Athena
     #   object of the previous page call.
     #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListNamedQueriesOutput AWS API Documentation
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListNotebookSessionsResponse AWS API Documentation
     #
-    class ListNamedQueriesOutput < Struct.new(
-      :named_query_ids,
+    class ListNotebookSessionsResponse < Struct.new(
+      :notebook_sessions_list,
       :next_token)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass ListPreparedStatementsInput
-    #   data as a hash:
-    #
-    #       {
-    #         work_group: "WorkGroupName", # required
-    #         next_token: "Token",
-    #         max_results: 1,
-    #       }
-    #
     # @!attribute [rw] work_group
     #   The workgroup to list the prepared statements for.
     #   @return [String]
@@ -1532,15 +2231,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass ListQueryExecutionsInput
-    #   data as a hash:
-    #
-    #       {
-    #         next_token: "Token",
-    #         max_results: 1,
-    #         work_group: "WorkGroupName",
-    #       }
-    #
     # @!attribute [rw] next_token
     #   A token generated by the Athena service that specifies where to
     #   continue pagination if a previous request was truncated. To obtain
@@ -1585,17 +2275,76 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass ListTableMetadataInput
-    #   data as a hash:
+    # @!attribute [rw] work_group
+    #   The workgroup to which the session belongs.
+    #   @return [String]
+    #
+    # @!attribute [rw] state_filter
+    #   A filter for a specific session state. A description of each state
+    #   follows.
+    #
+    #   `CREATING` - The session is being started, including acquiring
+    #   resources.
+    #
+    #   `CREATED` - The session has been started.
+    #
+    #   `IDLE` - The session is able to accept a calculation.
+    #
+    #   `BUSY` - The session is processing another task and is unable to
+    #   accept a calculation.
+    #
+    #   `TERMINATING` - The session is in the process of shutting down.
+    #
+    #   `TERMINATED` - The session and its resources are no longer running.
+    #
+    #   `DEGRADED` - The session has no healthy coordinators.
+    #
+    #   `FAILED` - Due to a failure, the session and its resources are no
+    #   longer running.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of sessions to return.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListSessionsRequest AWS API Documentation
+    #
+    class ListSessionsRequest < Struct.new(
+      :work_group,
+      :state_filter,
+      :max_results,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_token
+    #   A token generated by the Athena service that specifies where to
+    #   continue pagination if a previous request was truncated. To obtain
+    #   the next set of pages, pass in the `NextToken` from the response
+    #   object of the previous page call.
+    #   @return [String]
     #
-    #       {
-    #         catalog_name: "CatalogNameString", # required
-    #         database_name: "NameString", # required
-    #         expression: "ExpressionString",
-    #         next_token: "Token",
-    #         max_results: 1,
-    #       }
+    # @!attribute [rw] sessions
+    #   A list of sessions.
+    #   @return [Array<Types::SessionSummary>]
     #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListSessionsResponse AWS API Documentation
+    #
+    class ListSessionsResponse < Struct.new(
+      :next_token,
+      :sessions)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] catalog_name
     #   The name of the data catalog for which table metadata should be
     #   returned.
@@ -1654,15 +2403,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass ListTagsForResourceInput
-    #   data as a hash:
-    #
-    #       {
-    #         resource_arn: "AmazonResourceName", # required
-    #         next_token: "Token",
-    #         max_results: 1,
-    #       }
-    #
     # @!attribute [rw] resource_arn
     #   Lists the tags for the resource with the specified ARN.
     #   @return [String]
@@ -1705,14 +2445,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass ListWorkGroupsInput
-    #   data as a hash:
-    #
-    #       {
-    #         next_token: "Token",
-    #         max_results: 1,
-    #       }
-    #
     # @!attribute [rw] next_token
     #   A token generated by the Athena service that specifies where to
     #   continue pagination if a previous request was truncated. To obtain
@@ -1812,6 +2544,66 @@ module Aws::Athena
       include Aws::Structure
     end
 
+    # Contains metadata for notebook, including the notebook name, ID,
+    # workgroup, and time created.
+    #
+    # @!attribute [rw] notebook_id
+    #   The notebook ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   The name of the notebook.
+    #   @return [String]
+    #
+    # @!attribute [rw] work_group
+    #   The name of the Spark enabled workgroup to which the notebook
+    #   belongs.
+    #   @return [String]
+    #
+    # @!attribute [rw] creation_time
+    #   The time when the notebook was created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] type
+    #   The type of notebook. Currently, the only valid type is `IPYNB`.
+    #   @return [String]
+    #
+    # @!attribute [rw] last_modified_time
+    #   The time when the notebook was last modified.
+    #   @return [Time]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/NotebookMetadata AWS API Documentation
+    #
+    class NotebookMetadata < Struct.new(
+      :notebook_id,
+      :name,
+      :work_group,
+      :creation_time,
+      :type,
+      :last_modified_time)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains the notebook session ID and notebook session creation time.
+    #
+    # @!attribute [rw] session_id
+    #   The notebook session ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] creation_time
+    #   The time when the notebook session was created.
+    #   @return [Time]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/NotebookSessionSummary AWS API Documentation
+    #
+    class NotebookSessionSummary < Struct.new(
+      :session_id,
+      :creation_time)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # A prepared SQL statement for use with Athena.
     #
     # @!attribute [rw] statement_name
@@ -1892,6 +2684,11 @@ module Aws::Athena
     #   workgroup.
     #   @return [Types::ResultConfiguration]
     #
+    # @!attribute [rw] result_reuse_configuration
+    #   Specifies the query result reuse behavior that was used for the
+    #   query.
+    #   @return [Types::ResultReuseConfiguration]
+    #
     # @!attribute [rw] query_execution_context
     #   The database in which the query execution occurred.
     #   @return [Types::QueryExecutionContext]
@@ -1928,6 +2725,7 @@ module Aws::Athena
       :query,
       :statement_type,
       :result_configuration,
+      :result_reuse_configuration,
       :query_execution_context,
       :status,
       :statistics,
@@ -1941,14 +2739,6 @@ module Aws::Athena
     # The database and data catalog context in which the query execution
     # occurs.
     #
-    # @note When making an API call, you may pass QueryExecutionContext
-    #   data as a hash:
-    #
-    #       {
-    #         database: "DatabaseString",
-    #         catalog: "CatalogNameString",
-    #       }
-    #
     # @!attribute [rw] database
     #   The name of the database used in the query execution. The database
     #   must exist in the catalog.
@@ -2017,6 +2807,11 @@ module Aws::Athena
     #   the query results after the query engine finished running the query.
     #   @return [Integer]
     #
+    # @!attribute [rw] result_reuse_information
+    #   Contains information about whether previous query results were
+    #   reused for the query.
+    #   @return [Types::ResultReuseInformation]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/QueryExecutionStatistics AWS API Documentation
     #
     class QueryExecutionStatistics < Struct.new(
@@ -2026,7 +2821,8 @@ module Aws::Athena
       :total_execution_time_in_millis,
       :query_queue_time_in_millis,
       :query_planning_time_in_millis,
-      :service_processing_time_in_millis)
+      :service_processing_time_in_millis,
+      :result_reuse_information)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -2295,21 +3091,6 @@ module Aws::Athena
     # "client-side settings". If workgroup settings override client-side
     # settings, then the query uses the workgroup settings.
     #
-    # @note When making an API call, you may pass ResultConfiguration
-    #   data as a hash:
-    #
-    #       {
-    #         output_location: "ResultOutputLocation",
-    #         encryption_configuration: {
-    #           encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
-    #           kms_key: "String",
-    #         },
-    #         expected_bucket_owner: "AwsAccountId",
-    #         acl_configuration: {
-    #           s3_acl_option: "BUCKET_OWNER_FULL_CONTROL", # required, accepts BUCKET_OWNER_FULL_CONTROL
-    #         },
-    #       }
-    #
     # @!attribute [rw] output_location
     #   The location in Amazon S3 where your query results are stored, such
     #   as `s3://path/to/query/bucket/`. To run the query, you must specify
@@ -2393,25 +3174,6 @@ module Aws::Athena
     # The information about the updates in the query results, such as output
     # location and encryption configuration for the query results.
     #
-    # @note When making an API call, you may pass ResultConfigurationUpdates
-    #   data as a hash:
-    #
-    #       {
-    #         output_location: "ResultOutputLocation",
-    #         remove_output_location: false,
-    #         encryption_configuration: {
-    #           encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
-    #           kms_key: "String",
-    #         },
-    #         remove_encryption_configuration: false,
-    #         expected_bucket_owner: "AwsAccountId",
-    #         remove_expected_bucket_owner: false,
-    #         acl_configuration: {
-    #           s3_acl_option: "BUCKET_OWNER_FULL_CONTROL", # required, accepts BUCKET_OWNER_FULL_CONTROL
-    #         },
-    #         remove_acl_configuration: false,
-    #       }
-    #
     # @!attribute [rw] output_location
     #   The location in Amazon S3 where your query results are stored, such
     #   as `s3://path/to/query/bucket/`. For more information, see [Query
@@ -2514,101 +3276,358 @@ module Aws::Athena
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html
-    #   @return [Boolean]
+    #   [1]: https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultConfigurationUpdates AWS API Documentation
+    #
+    class ResultConfigurationUpdates < Struct.new(
+      :output_location,
+      :remove_output_location,
+      :encryption_configuration,
+      :remove_encryption_configuration,
+      :expected_bucket_owner,
+      :remove_expected_bucket_owner,
+      :acl_configuration,
+      :remove_acl_configuration)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Specifies whether previous query results are reused, and if so, their
+    # maximum age.
+    #
+    # @!attribute [rw] enabled
+    #   True if previous query results can be reused when the query is run;
+    #   otherwise, false. The default is false.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] max_age_in_minutes
+    #   Specifies, in minutes, the maximum age of a previous query result
+    #   that Athena should consider for reuse. The default is 60.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultReuseByAgeConfiguration AWS API Documentation
+    #
+    class ResultReuseByAgeConfiguration < Struct.new(
+      :enabled,
+      :max_age_in_minutes)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Specifies the query result reuse behavior for the query.
+    #
+    # @!attribute [rw] result_reuse_by_age_configuration
+    #   Specifies whether previous query results are reused, and if so,
+    #   their maximum age.
+    #   @return [Types::ResultReuseByAgeConfiguration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultReuseConfiguration AWS API Documentation
+    #
+    class ResultReuseConfiguration < Struct.new(
+      :result_reuse_by_age_configuration)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains information about whether the result of a previous query was
+    # reused.
+    #
+    # @!attribute [rw] reused_previous_result
+    #   True if a previous query result was reused; false if the result was
+    #   generated from a new run of the query.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultReuseInformation AWS API Documentation
+    #
+    class ResultReuseInformation < Struct.new(
+      :reused_previous_result)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The metadata and rows that make up a query result set. The metadata
+    # describes the column structure and data types. To return a `ResultSet`
+    # object, use GetQueryResults.
+    #
+    # @!attribute [rw] rows
+    #   The rows in the table.
+    #   @return [Array<Types::Row>]
+    #
+    # @!attribute [rw] result_set_metadata
+    #   The metadata that describes the column structure and data types of a
+    #   table of query results.
+    #   @return [Types::ResultSetMetadata]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultSet AWS API Documentation
+    #
+    class ResultSet < Struct.new(
+      :rows,
+      :result_set_metadata)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The metadata that describes the column structure and data types of a
+    # table of query results. To return a `ResultSetMetadata` object, use
+    # GetQueryResults.
+    #
+    # @!attribute [rw] column_info
+    #   Information about the columns returned in a query result metadata.
+    #   @return [Array<Types::ColumnInfo>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultSetMetadata AWS API Documentation
+    #
+    class ResultSetMetadata < Struct.new(
+      :column_info)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The rows that make up a query result table.
+    #
+    # @!attribute [rw] data
+    #   The data that populates a row in a query result table.
+    #   @return [Array<Types::Datum>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/Row AWS API Documentation
+    #
+    class Row < Struct.new(
+      :data)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The specified session already exists.
+    #
+    # @!attribute [rw] message
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/SessionAlreadyExistsException AWS API Documentation
+    #
+    class SessionAlreadyExistsException < Struct.new(
+      :message)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains session configuration information.
+    #
+    # @!attribute [rw] execution_role
+    #   The ARN of the execution role used for the session.
+    #   @return [String]
+    #
+    # @!attribute [rw] working_directory
+    #   The Amazon S3 location that stores information for the notebook.
+    #   @return [String]
+    #
+    # @!attribute [rw] idle_timeout_seconds
+    #   The idle timeout in seconds for the session.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] encryption_configuration
+    #   If query results are encrypted in Amazon S3, indicates the
+    #   encryption option used (for example, `SSE_KMS` or `CSE_KMS`) and key
+    #   information.
+    #   @return [Types::EncryptionConfiguration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/SessionConfiguration AWS API Documentation
+    #
+    class SessionConfiguration < Struct.new(
+      :execution_role,
+      :working_directory,
+      :idle_timeout_seconds,
+      :encryption_configuration)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains statistics for a notebook session.
+    #
+    # @!attribute [rw] dpu_execution_in_millis
+    #   The data processing unit execution time for a session in
+    #   milliseconds.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/SessionStatistics AWS API Documentation
+    #
+    class SessionStatistics < Struct.new(
+      :dpu_execution_in_millis)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains information about the status of a notebook session.
+    #
+    # @!attribute [rw] start_date_time
+    #   The date and time that the session started.
+    #   @return [Time]
+    #
+    # @!attribute [rw] last_modified_date_time
+    #   The most recent date and time that the session was modified.
+    #   @return [Time]
+    #
+    # @!attribute [rw] end_date_time
+    #   The date and time that the session ended.
+    #   @return [Time]
+    #
+    # @!attribute [rw] idle_since_date_time
+    #   The date and time starting at which the session became idle. Can be
+    #   empty if the session is not currently idle.
+    #   @return [Time]
+    #
+    # @!attribute [rw] state
+    #   The state of the session. A description of each state follows.
+    #
+    #   `CREATING` - The session is being started, including acquiring
+    #   resources.
+    #
+    #   `CREATED` - The session has been started.
+    #
+    #   `IDLE` - The session is able to accept a calculation.
+    #
+    #   `BUSY` - The session is processing another task and is unable to
+    #   accept a calculation.
+    #
+    #   `TERMINATING` - The session is in the process of shutting down.
+    #
+    #   `TERMINATED` - The session and its resources are no longer running.
+    #
+    #   `DEGRADED` - The session has no healthy coordinators.
+    #
+    #   `FAILED` - Due to a failure, the session and its resources are no
+    #   longer running.
+    #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultConfigurationUpdates AWS API Documentation
+    # @!attribute [rw] state_change_reason
+    #   The reason for the session state change (for example, canceled
+    #   because the session was terminated).
+    #   @return [String]
     #
-    class ResultConfigurationUpdates < Struct.new(
-      :output_location,
-      :remove_output_location,
-      :encryption_configuration,
-      :remove_encryption_configuration,
-      :expected_bucket_owner,
-      :remove_expected_bucket_owner,
-      :acl_configuration,
-      :remove_acl_configuration)
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/SessionStatus AWS API Documentation
+    #
+    class SessionStatus < Struct.new(
+      :start_date_time,
+      :last_modified_date_time,
+      :end_date_time,
+      :idle_since_date_time,
+      :state,
+      :state_change_reason)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # The metadata and rows that make up a query result set. The metadata
-    # describes the column structure and data types. To return a `ResultSet`
-    # object, use GetQueryResults.
+    # Contains summary information about a notebook session.
     #
-    # @!attribute [rw] rows
-    #   The rows in the table.
-    #   @return [Array<Types::Row>]
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
     #
-    # @!attribute [rw] result_set_metadata
-    #   The metadata that describes the column structure and data types of a
-    #   table of query results.
-    #   @return [Types::ResultSetMetadata]
+    # @!attribute [rw] description
+    #   The session description.
+    #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultSet AWS API Documentation
+    # @!attribute [rw] engine_version
+    #   The engine version used by the session (for example, `PySpark engine
+    #   version 3`).
+    #   @return [Types::EngineVersion]
     #
-    class ResultSet < Struct.new(
-      :rows,
-      :result_set_metadata)
+    # @!attribute [rw] notebook_version
+    #   The notebook version.
+    #   @return [String]
+    #
+    # @!attribute [rw] status
+    #   Contains information about the session status.
+    #   @return [Types::SessionStatus]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/SessionSummary AWS API Documentation
+    #
+    class SessionSummary < Struct.new(
+      :session_id,
+      :description,
+      :engine_version,
+      :notebook_version,
+      :status)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # The metadata that describes the column structure and data types of a
-    # table of query results. To return a `ResultSetMetadata` object, use
-    # GetQueryResults.
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
     #
-    # @!attribute [rw] column_info
-    #   Information about the columns returned in a query result metadata.
-    #   @return [Array<Types::ColumnInfo>]
+    # @!attribute [rw] description
+    #   A description of the calculation.
+    #   @return [String]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultSetMetadata AWS API Documentation
+    # @!attribute [rw] calculation_configuration
+    #   Contains configuration information for the calculation.
+    #   @return [Types::CalculationConfiguration]
     #
-    class ResultSetMetadata < Struct.new(
-      :column_info)
+    # @!attribute [rw] code_block
+    #   A string that contains the code of the calculation.
+    #   @return [String]
+    #
+    # @!attribute [rw] client_request_token
+    #   A unique case-sensitive string used to ensure the request to create
+    #   the calculation is idempotent (executes only once). If another
+    #   `StartCalculationExecutionRequest` is received, the same response is
+    #   returned and another calculation is not created. If a parameter has
+    #   changed, an error is returned.
+    #
+    #   This token is listed as not required because Amazon Web Services
+    #   SDKs (for example the Amazon Web Services SDK for Java)
+    #   auto-generate the token for users. If you are not using the Amazon
+    #   Web Services SDK or the Amazon Web Services CLI, you must provide
+    #   this token or the action will fail.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/StartCalculationExecutionRequest AWS API Documentation
+    #
+    class StartCalculationExecutionRequest < Struct.new(
+      :session_id,
+      :description,
+      :calculation_configuration,
+      :code_block,
+      :client_request_token)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # The rows that make up a query result table.
+    # @!attribute [rw] calculation_execution_id
+    #   The calculation execution UUID.
+    #   @return [String]
     #
-    # @!attribute [rw] data
-    #   The data that populates a row in a query result table.
-    #   @return [Array<Types::Datum>]
+    # @!attribute [rw] state
+    #   `CREATING` - The calculation is in the process of being created.
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/Row AWS API Documentation
+    #   `CREATED` - The calculation has been created and is ready to run.
     #
-    class Row < Struct.new(
-      :data)
+    #   `QUEUED` - The calculation has been queued for processing.
+    #
+    #   `RUNNING` - The calculation is running.
+    #
+    #   `CANCELING` - A request to cancel the calculation has been received
+    #   and the system is working to stop it.
+    #
+    #   `CANCELED` - The calculation is no longer running as the result of a
+    #   cancel request.
+    #
+    #   `COMPLETED` - The calculation has completed without error.
+    #
+    #   `FAILED` - The calculation failed and is no longer running.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/StartCalculationExecutionResponse AWS API Documentation
+    #
+    class StartCalculationExecutionResponse < Struct.new(
+      :calculation_execution_id,
+      :state)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass StartQueryExecutionInput
-    #   data as a hash:
-    #
-    #       {
-    #         query_string: "QueryString", # required
-    #         client_request_token: "IdempotencyToken",
-    #         query_execution_context: {
-    #           database: "DatabaseString",
-    #           catalog: "CatalogNameString",
-    #         },
-    #         result_configuration: {
-    #           output_location: "ResultOutputLocation",
-    #           encryption_configuration: {
-    #             encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
-    #             kms_key: "String",
-    #           },
-    #           expected_bucket_owner: "AwsAccountId",
-    #           acl_configuration: {
-    #             s3_acl_option: "BUCKET_OWNER_FULL_CONTROL", # required, accepts BUCKET_OWNER_FULL_CONTROL
-    #           },
-    #         },
-    #         work_group: "WorkGroupName",
-    #         execution_parameters: ["ExecutionParameter"],
-    #       }
-    #
     # @!attribute [rw] query_string
     #   The SQL query statements to be executed.
     #   @return [String]
@@ -2654,6 +3673,10 @@ module Aws::Athena
     #   which the parameters occur.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] result_reuse_configuration
+    #   Specifies the query result reuse behavior for the query.
+    #   @return [Types::ResultReuseConfiguration]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/StartQueryExecutionInput AWS API Documentation
     #
     class StartQueryExecutionInput < Struct.new(
@@ -2662,7 +3685,8 @@ module Aws::Athena
       :query_execution_context,
       :result_configuration,
       :work_group,
-      :execution_parameters)
+      :execution_parameters,
+      :result_reuse_configuration)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -2679,13 +3703,132 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass StopQueryExecutionInput
-    #   data as a hash:
+    # @!attribute [rw] description
+    #   The session description.
+    #   @return [String]
+    #
+    # @!attribute [rw] work_group
+    #   The workgroup to which the session belongs.
+    #   @return [String]
+    #
+    # @!attribute [rw] engine_configuration
+    #   Contains engine data processing unit (DPU) configuration settings
+    #   and parameter mappings.
+    #   @return [Types::EngineConfiguration]
+    #
+    # @!attribute [rw] notebook_version
+    #   The notebook version. This value is required only when requesting
+    #   that a notebook server be started for the session. The only valid
+    #   notebook version is `Jupyter1.0`.
+    #   @return [String]
+    #
+    # @!attribute [rw] session_idle_timeout_in_minutes
+    #   The idle timeout in minutes for the session.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] client_request_token
+    #   A unique case-sensitive string used to ensure the request to create
+    #   the session is idempotent (executes only once). If another
+    #   `StartSessionRequest` is received, the same response is returned and
+    #   another session is not created. If a parameter has changed, an error
+    #   is returned.
+    #
+    #   This token is listed as not required because Amazon Web Services
+    #   SDKs (for example the Amazon Web Services SDK for Java)
+    #   auto-generate the token for users. If you are not using the Amazon
+    #   Web Services SDK or the Amazon Web Services CLI, you must provide
+    #   this token or the action will fail.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/StartSessionRequest AWS API Documentation
+    #
+    class StartSessionRequest < Struct.new(
+      :description,
+      :work_group,
+      :engine_configuration,
+      :notebook_version,
+      :session_idle_timeout_in_minutes,
+      :client_request_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] state
+    #   The state of the session. A description of each state follows.
+    #
+    #   `CREATING` - The session is being started, including acquiring
+    #   resources.
+    #
+    #   `CREATED` - The session has been started.
+    #
+    #   `IDLE` - The session is able to accept a calculation.
+    #
+    #   `BUSY` - The session is processing another task and is unable to
+    #   accept a calculation.
+    #
+    #   `TERMINATING` - The session is in the process of shutting down.
+    #
+    #   `TERMINATED` - The session and its resources are no longer running.
+    #
+    #   `DEGRADED` - The session has no healthy coordinators.
+    #
+    #   `FAILED` - Due to a failure, the session and its resources are no
+    #   longer running.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/StartSessionResponse AWS API Documentation
+    #
+    class StartSessionResponse < Struct.new(
+      :session_id,
+      :state)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] calculation_execution_id
+    #   The calculation execution UUID.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/StopCalculationExecutionRequest AWS API Documentation
+    #
+    class StopCalculationExecutionRequest < Struct.new(
+      :calculation_execution_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] state
+    #   `CREATING` - The calculation is in the process of being created.
+    #
+    #   `CREATED` - The calculation has been created and is ready to run.
+    #
+    #   `QUEUED` - The calculation has been queued for processing.
+    #
+    #   `RUNNING` - The calculation is running.
+    #
+    #   `CANCELING` - A request to cancel the calculation has been received
+    #   and the system is working to stop it.
+    #
+    #   `CANCELED` - The calculation is no longer running as the result of a
+    #   cancel request.
+    #
+    #   `COMPLETED` - The calculation has completed without error.
+    #
+    #   `FAILED` - The calculation failed and is no longer running.
+    #   @return [String]
     #
-    #       {
-    #         query_execution_id: "QueryExecutionId", # required
-    #       }
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/StopCalculationExecutionResponse AWS API Documentation
     #
+    class StopCalculationExecutionResponse < Struct.new(
+      :state)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] query_execution_id
     #   The unique ID of the query execution to stop.
     #
@@ -2766,14 +3909,6 @@ module Aws::Athena
     #
     # [1]: https://aws.amazon.com/answers/account-management/aws-tagging-strategies/
     #
-    # @note When making an API call, you may pass Tag
-    #   data as a hash:
-    #
-    #       {
-    #         key: "TagKey",
-    #         value: "TagValue",
-    #       }
-    #
     # @!attribute [rw] key
     #   A tag key. The tag key length is from 1 to 128 Unicode characters in
     #   UTF-8. You can use letters and numbers representable in UTF-8, and
@@ -2797,19 +3932,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass TagResourceInput
-    #   data as a hash:
-    #
-    #       {
-    #         resource_arn: "AmazonResourceName", # required
-    #         tags: [ # required
-    #           {
-    #             key: "TagKey",
-    #             value: "TagValue",
-    #           },
-    #         ],
-    #       }
-    #
     # @!attribute [rw] resource_arn
     #   Specifies the ARN of the Athena resource (workgroup or data catalog)
     #   to which tags are to be added.
@@ -2833,6 +3955,49 @@ module Aws::Athena
     #
     class TagResourceOutput < Aws::EmptyStructure; end
 
+    # @!attribute [rw] session_id
+    #   The session ID.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/TerminateSessionRequest AWS API Documentation
+    #
+    class TerminateSessionRequest < Struct.new(
+      :session_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] state
+    #   The state of the session. A description of each state follows.
+    #
+    #   `CREATING` - The session is being started, including acquiring
+    #   resources.
+    #
+    #   `CREATED` - The session has been started.
+    #
+    #   `IDLE` - The session is able to accept a calculation.
+    #
+    #   `BUSY` - The session is processing another task and is unable to
+    #   accept a calculation.
+    #
+    #   `TERMINATING` - The session is in the process of shutting down.
+    #
+    #   `TERMINATED` - The session and its resources are no longer running.
+    #
+    #   `DEGRADED` - The session has no healthy coordinators.
+    #
+    #   `FAILED` - Due to a failure, the session and its resources are no
+    #   longer running.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/TerminateSessionResponse AWS API Documentation
+    #
+    class TerminateSessionResponse < Struct.new(
+      :state)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Indicates that the request was throttled.
     #
     # @!attribute [rw] message
@@ -2940,14 +4105,6 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # @note When making an API call, you may pass UntagResourceInput
-    #   data as a hash:
-    #
-    #       {
-    #         resource_arn: "AmazonResourceName", # required
-    #         tag_keys: ["TagKey"], # required
-    #       }
-    #
     # @!attribute [rw] resource_arn
     #   Specifies the ARN of the resource from which tags are to be removed.
     #   @return [String]
@@ -2970,18 +4127,6 @@ module Aws::Athena
     #
     class UntagResourceOutput < Aws::EmptyStructure; end
 
-    # @note When making an API call, you may pass UpdateDataCatalogInput
-    #   data as a hash:
-    #
-    #       {
-    #         name: "CatalogNameString", # required
-    #         type: "LAMBDA", # required, accepts LAMBDA, GLUE, HIVE
-    #         description: "DescriptionString",
-    #         parameters: {
-    #           "KeyString" => "ParametersMapValue",
-    #         },
-    #       }
-    #
     # @!attribute [rw] name
     #   The name of the data catalog to update. The catalog name must be
     #   unique for the Amazon Web Services account and can use a maximum of
@@ -3043,16 +4188,6 @@ module Aws::Athena
     #
     class UpdateDataCatalogOutput < Aws::EmptyStructure; end
 
-    # @note When making an API call, you may pass UpdateNamedQueryInput
-    #   data as a hash:
-    #
-    #       {
-    #         named_query_id: "NamedQueryId", # required
-    #         name: "NameString", # required
-    #         description: "NamedQueryDescriptionString",
-    #         query_string: "QueryString", # required
-    #       }
-    #
     # @!attribute [rw] named_query_id
     #   The unique identifier (UUID) of the query.
     #   @return [String]
@@ -3084,16 +4219,83 @@ module Aws::Athena
     #
     class UpdateNamedQueryOutput < Aws::EmptyStructure; end
 
-    # @note When making an API call, you may pass UpdatePreparedStatementInput
-    #   data as a hash:
+    # @!attribute [rw] notebook_id
+    #   The ID of the notebook to update.
+    #   @return [String]
+    #
+    # @!attribute [rw] payload
+    #   The updated content for the notebook.
+    #   @return [String]
+    #
+    # @!attribute [rw] type
+    #   The notebook content type. Currently, the only valid type is
+    #   `IPYNB`.
+    #   @return [String]
+    #
+    # @!attribute [rw] session_id
+    #   The ID of the session in which the notebook will be updated.
+    #   @return [String]
+    #
+    # @!attribute [rw] client_request_token
+    #   A unique case-sensitive string used to ensure the request to create
+    #   the notebook is idempotent (executes only once).
+    #
+    #   This token is listed as not required because Amazon Web Services
+    #   SDKs (for example the Amazon Web Services SDK for Java)
+    #   auto-generate the token for you. If you are not using the Amazon Web
+    #   Services SDK or the Amazon Web Services CLI, you must provide this
+    #   token or the action will fail.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/UpdateNotebookInput AWS API Documentation
+    #
+    class UpdateNotebookInput < Struct.new(
+      :notebook_id,
+      :payload,
+      :type,
+      :session_id,
+      :client_request_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] notebook_id
+    #   The ID of the notebook to update the metadata for.
+    #   @return [String]
+    #
+    # @!attribute [rw] client_request_token
+    #   A unique case-sensitive string used to ensure the request to create
+    #   the notebook is idempotent (executes only once).
+    #
+    #   This token is listed as not required because Amazon Web Services
+    #   SDKs (for example the Amazon Web Services SDK for Java)
+    #   auto-generate the token for you. If you are not using the Amazon Web
+    #   Services SDK or the Amazon Web Services CLI, you must provide this
+    #   token or the action will fail.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   The name to update the notebook to.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/UpdateNotebookMetadataInput AWS API Documentation
+    #
+    class UpdateNotebookMetadataInput < Struct.new(
+      :notebook_id,
+      :client_request_token,
+      :name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/UpdateNotebookMetadataOutput AWS API Documentation
     #
-    #       {
-    #         statement_name: "StatementName", # required
-    #         work_group: "WorkGroupName", # required
-    #         query_statement: "QueryString", # required
-    #         description: "DescriptionString",
-    #       }
+    class UpdateNotebookMetadataOutput < Aws::EmptyStructure; end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/UpdateNotebookOutput AWS API Documentation
     #
+    class UpdateNotebookOutput < Aws::EmptyStructure; end
+
     # @!attribute [rw] statement_name
     #   The name of the prepared statement.
     #   @return [String]
@@ -3125,41 +4327,6 @@ module Aws::Athena
     #
     class UpdatePreparedStatementOutput < Aws::EmptyStructure; end
 
-    # @note When making an API call, you may pass UpdateWorkGroupInput
-    #   data as a hash:
-    #
-    #       {
-    #         work_group: "WorkGroupName", # required
-    #         description: "WorkGroupDescriptionString",
-    #         configuration_updates: {
-    #           enforce_work_group_configuration: false,
-    #           result_configuration_updates: {
-    #             output_location: "ResultOutputLocation",
-    #             remove_output_location: false,
-    #             encryption_configuration: {
-    #               encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
-    #               kms_key: "String",
-    #             },
-    #             remove_encryption_configuration: false,
-    #             expected_bucket_owner: "AwsAccountId",
-    #             remove_expected_bucket_owner: false,
-    #             acl_configuration: {
-    #               s3_acl_option: "BUCKET_OWNER_FULL_CONTROL", # required, accepts BUCKET_OWNER_FULL_CONTROL
-    #             },
-    #             remove_acl_configuration: false,
-    #           },
-    #           publish_cloud_watch_metrics_enabled: false,
-    #           bytes_scanned_cutoff_per_query: 1,
-    #           remove_bytes_scanned_cutoff_per_query: false,
-    #           requester_pays_enabled: false,
-    #           engine_version: {
-    #             selected_engine_version: "NameString",
-    #             effective_engine_version: "NameString",
-    #           },
-    #         },
-    #         state: "ENABLED", # accepts ENABLED, DISABLED
-    #       }
-    #
     # @!attribute [rw] work_group
     #   The specified workgroup that will be updated.
     #   @return [String]
@@ -3169,8 +4336,7 @@ module Aws::Athena
     #   @return [String]
     #
     # @!attribute [rw] configuration_updates
-    #   The workgroup configuration that will be updated for the given
-    #   workgroup.
+    #   Contains configuration updates for an Athena SQL workgroup.
     #   @return [Types::WorkGroupConfigurationUpdates]
     #
     # @!attribute [rw] state
@@ -3255,31 +4421,6 @@ module Aws::Athena
     # `WorkGroupConfiguration`. See
     # WorkGroupConfiguration$EnforceWorkGroupConfiguration.
     #
-    # @note When making an API call, you may pass WorkGroupConfiguration
-    #   data as a hash:
-    #
-    #       {
-    #         result_configuration: {
-    #           output_location: "ResultOutputLocation",
-    #           encryption_configuration: {
-    #             encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
-    #             kms_key: "String",
-    #           },
-    #           expected_bucket_owner: "AwsAccountId",
-    #           acl_configuration: {
-    #             s3_acl_option: "BUCKET_OWNER_FULL_CONTROL", # required, accepts BUCKET_OWNER_FULL_CONTROL
-    #           },
-    #         },
-    #         enforce_work_group_configuration: false,
-    #         publish_cloud_watch_metrics_enabled: false,
-    #         bytes_scanned_cutoff_per_query: 1,
-    #         requester_pays_enabled: false,
-    #         engine_version: {
-    #           selected_engine_version: "NameString",
-    #           effective_engine_version: "NameString",
-    #         },
-    #       }
-    #
     # @!attribute [rw] result_configuration
     #   The configuration for the workgroup, which includes the location in
     #   Amazon S3 where query results are stored and the encryption option,
@@ -3336,6 +4477,20 @@ module Aws::Athena
     #   the preview engine regardless of this setting.
     #   @return [Types::EngineVersion]
     #
+    # @!attribute [rw] additional_configuration
+    #   Specifies a user defined JSON string that is passed to the notebook
+    #   engine.
+    #   @return [String]
+    #
+    # @!attribute [rw] execution_role
+    #   Role used in a notebook session for accessing the user's resources.
+    #   @return [String]
+    #
+    # @!attribute [rw] customer_content_encryption_configuration
+    #   Specifies the KMS key that is used to encrypt the user's data
+    #   stores in Athena.
+    #   @return [Types::CustomerContentEncryptionConfiguration]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/WorkGroupConfiguration AWS API Documentation
     #
     class WorkGroupConfiguration < Struct.new(
@@ -3344,7 +4499,10 @@ module Aws::Athena
       :publish_cloud_watch_metrics_enabled,
       :bytes_scanned_cutoff_per_query,
       :requester_pays_enabled,
-      :engine_version)
+      :engine_version,
+      :additional_configuration,
+      :execution_role,
+      :customer_content_encryption_configuration)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3357,36 +4515,6 @@ module Aws::Athena
     # usage limit for the amount of bytes scanned per query, if it is
     # specified.
     #
-    # @note When making an API call, you may pass WorkGroupConfigurationUpdates
-    #   data as a hash:
-    #
-    #       {
-    #         enforce_work_group_configuration: false,
-    #         result_configuration_updates: {
-    #           output_location: "ResultOutputLocation",
-    #           remove_output_location: false,
-    #           encryption_configuration: {
-    #             encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
-    #             kms_key: "String",
-    #           },
-    #           remove_encryption_configuration: false,
-    #           expected_bucket_owner: "AwsAccountId",
-    #           remove_expected_bucket_owner: false,
-    #           acl_configuration: {
-    #             s3_acl_option: "BUCKET_OWNER_FULL_CONTROL", # required, accepts BUCKET_OWNER_FULL_CONTROL
-    #           },
-    #           remove_acl_configuration: false,
-    #         },
-    #         publish_cloud_watch_metrics_enabled: false,
-    #         bytes_scanned_cutoff_per_query: 1,
-    #         remove_bytes_scanned_cutoff_per_query: false,
-    #         requester_pays_enabled: false,
-    #         engine_version: {
-    #           selected_engine_version: "NameString",
-    #           effective_engine_version: "NameString",
-    #         },
-    #       }
-    #
     # @!attribute [rw] enforce_work_group_configuration
     #   If set to "true", the settings for the workgroup override
     #   client-side settings. If set to "false" client-side settings are
@@ -3441,6 +4569,24 @@ module Aws::Athena
     #   the preview engine regardless of this setting.
     #   @return [Types::EngineVersion]
     #
+    # @!attribute [rw] remove_customer_content_encryption_configuration
+    #   Removes content encryption configuration for a workgroup.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] additional_configuration
+    #   Contains a user defined string in JSON format for a Spark-enabled
+    #   workgroup.
+    #   @return [String]
+    #
+    # @!attribute [rw] execution_role
+    #   Contains the ARN of the execution role for the workgroup
+    #   @return [String]
+    #
+    # @!attribute [rw] customer_content_encryption_configuration
+    #   Specifies the KMS key that is used to encrypt the user's data
+    #   stores in Athena.
+    #   @return [Types::CustomerContentEncryptionConfiguration]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/WorkGroupConfigurationUpdates AWS API Documentation
     #
     class WorkGroupConfigurationUpdates < Struct.new(
@@ -3450,7 +4596,11 @@ module Aws::Athena
       :bytes_scanned_cutoff_per_query,
       :remove_bytes_scanned_cutoff_per_query,
       :requester_pays_enabled,
-      :engine_version)
+      :engine_version,
+      :remove_customer_content_encryption_configuration,
+      :additional_configuration,
+      :execution_role,
+      :customer_content_encryption_configuration)
       SENSITIVE = []
       include Aws::Structure
     end