aws-sdk-athena 1.61.0 → 1.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c7359948a71cd049a1c7b30871d6630e4749f1fc253927069badb35c283981
-  data.tar.gz: 3fc88e310166a64959391dc8b023c0692ffc003324b4dc12af3715338473b735
+  metadata.gz: a47b687a2ae8a057806cd5aae61746ef130002dc40297337f4661af13a38a3a1
+  data.tar.gz: 0d540a5dac835c0b3b7f3d12ca0cc94d529d5a6fc839dc5e9fa8862cc2f99e9d
 SHA512:
-  metadata.gz: f51c14c31fa92aba69489d57a666a9dcecfe4e45b6a308bc1a4bb73f0719121b570769f40a8ea11eaad79809b5394a60c58337c4e1d5fdd5dd0265b9834dc963
-  data.tar.gz: 6cbc2ae3c603818522995e7c99257c5a9c0f91f930f1ba0a218792bf50fb9b27127518485e02e7e257cc7d16ad636683ea91a70cde458a31be0e0ddbc0c7c37b
+  metadata.gz: d6cb3f6a82d68f0cb41d1e74b6e1ada0e216eefd8f7750f334096d5dc4acf78f804140c6ab89af2b98ba85e6384db2acac49b1b8e111a7b9fba0521b2dd03682
+  data.tar.gz: 814575e5c05532df2dcee0120eb3ce135602f87c760b5dafff73ef2633d4668e291f21e27c3bd7185ee1efce7f69a30bd7af63488cc549910909ff0afe0c0dfe

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Unreleased Changes
 ------------------
 
+1.63.0 (2023-03-27)
+------------------
+
+* Feature - Enforces a minimal level of encryption for the workgroup for query and calculation results that are written to Amazon S3. When enabled, workgroup users can set encryption only to the minimum level set by the administrator or higher when they submit queries.
+
+1.62.0 (2023-03-08)
+------------------
+
+* Feature - A new field SubstatementType is added to GetQueryExecution API, so customers have an error free way to detect the query type and interpret the result.
+
 1.61.0 (2023-01-18)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.61.0
+1.63.0

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

@@ -531,6 +531,7 @@ module Aws::Athena
     #   resp.query_executions[0].engine_version.effective_engine_version #=> String
     #   resp.query_executions[0].execution_parameters #=> Array
     #   resp.query_executions[0].execution_parameters[0] #=> String
+    #   resp.query_executions[0].substatement_type #=> String
     #   resp.unprocessed_query_execution_ids #=> Array
     #   resp.unprocessed_query_execution_ids[0].query_execution_id #=> String
     #   resp.unprocessed_query_execution_ids[0].error_code #=> String
@@ -793,6 +794,12 @@ module Aws::Athena
     # Gets an authentication token and the URL at which the notebook can be
     # accessed. During programmatic access, `CreatePresignedNotebookUrl`
     # must be called every 10 minutes to refresh the authentication token.
+    # For information about granting programmatic access, see [Grant
+    # programmatic access][1].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/athena/latest/ug/setting-up.html#setting-up-grant-programmatic-access
     #
     # @option params [required, String] :session_id
     #   The session ID.
@@ -824,24 +831,22 @@ module Aws::Athena
       req.send_request(options)
     end
 
-    # Creates a workgroup with the specified name. Only one of
-    # `Configurations` or `Configuration` can be specified; `Configurations`
-    # for a workgroup with multi engine support (for example, an Apache
-    # Spark enabled workgroup) or `Configuration` for an Athena SQL
-    # workgroup.
+    # Creates a workgroup with the specified name. A workgroup can be an
+    # Apache Spark enabled workgroup or an Athena SQL workgroup.
     #
     # @option params [required, String] :name
     #   The workgroup name.
     #
     # @option params [Types::WorkGroupConfiguration] :configuration
     #   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
+    #   workgroup or Spark enabled Athena workgroup. Athena SQL workgroup
+    #   configuration includes the location in Amazon S3 where query and
+    #   calculation 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.
     #
     # @option params [String] :description
@@ -882,6 +887,7 @@ module Aws::Athena
     #       customer_content_encryption_configuration: {
     #         kms_key: "KmsKey", # required
     #       },
+    #       enable_minimum_encryption_configuration: false,
     #     },
     #     description: "WorkGroupDescriptionString",
     #     tags: [
@@ -1013,7 +1019,7 @@ module Aws::Athena
     #
     # @option params [Boolean] :recursive_delete_option
     #   The option to delete the workgroup and its contents even if the
-    #   workgroup contains any named queries or query executions.
+    #   workgroup contains any named queries, query executions, or notebooks.
     #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
@@ -1115,8 +1121,7 @@ module Aws::Athena
       req.send_request(options)
     end
 
-    # Retrieves a pre-signed URL to a copy of the code that was executed for
-    # the calculation.
+    # Retrieves the unencrypted code that was executed for the calculation.
     #
     # @option params [required, String] :calculation_execution_id
     #   The calculation execution UUID.
@@ -1402,6 +1407,7 @@ module Aws::Athena
     #   resp.query_execution.engine_version.effective_engine_version #=> String
     #   resp.query_execution.execution_parameters #=> Array
     #   resp.query_execution.execution_parameters[0] #=> String
+    #   resp.query_execution.substatement_type #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetQueryExecution AWS API Documentation
     #
@@ -1414,9 +1420,10 @@ module Aws::Athena
 
     # Streams the results of a single query execution specified by
     # `QueryExecutionId` from the Athena query results location in Amazon
-    # S3. For more information, see [Query Results][1] in the *Amazon Athena
-    # User Guide*. This request does not execute the query but returns
-    # results. Use StartQueryExecution to run a query.
+    # S3. For more information, see [Working with query results, recent
+    # queries, and output files][1] in the *Amazon Athena User Guide*. This
+    # request does not execute the query but returns results. Use
+    # StartQueryExecution to run a query.
     #
     # To stream query results successfully, the IAM principal with
     # permission to call `GetQueryResults` also must have permissions to the
@@ -1721,6 +1728,7 @@ module Aws::Athena
     #   resp.work_group.configuration.additional_configuration #=> String
     #   resp.work_group.configuration.execution_role #=> String
     #   resp.work_group.configuration.customer_content_encryption_configuration.kms_key #=> String
+    #   resp.work_group.configuration.enable_minimum_encryption_configuration #=> Boolean
     #   resp.work_group.description #=> String
     #   resp.work_group.creation_time #=> Time
     #
@@ -1788,7 +1796,7 @@ module Aws::Athena
     end
 
     # Returns the supported DPU sizes for the supported application runtimes
-    # (for example, `Jupyter 1.0`).
+    # (for example, `Athena notebook version 1`).
     #
     # @option params [Integer] :max_results
     #   Specifies the maximum number of results to return.
@@ -1904,6 +1912,11 @@ module Aws::Athena
 
     # Lists the data catalogs in the current Amazon Web Services account.
     #
+    # <note markdown="1"> In the Athena console, data catalogs are listed as "data sources" on
+    # the **Data sources** page under the **Data source name** column.
+    #
+    #  </note>
+    #
     # @option params [String] :next_token
     #   A token generated by the Athena service that specifies where to
     #   continue pagination if a previous request was truncated. To obtain the
@@ -2032,9 +2045,9 @@ module Aws::Athena
       req.send_request(options)
     end
 
-    # Lists, in descending order, the executors that have been submitted to
-    # a session. Newer executors are listed first; older executors are
-    # listed later. The result can be optionally filtered by state.
+    # Lists, in descending order, the executors that joined a session. Newer
+    # executors are listed first; older executors are listed later. The
+    # result can be optionally filtered by state.
     #
     # @option params [required, String] :session_id
     #   The session ID.
@@ -2599,8 +2612,7 @@ module Aws::Athena
     end
 
     # Submits calculations for execution within a session. You can supply
-    # the code to run as an inline code block within the request or as an
-    # Amazon S3 URL.
+    # the code to run as an inline code block within the request.
     #
     # @option params [required, String] :session_id
     #   The session ID.
@@ -2772,9 +2784,12 @@ module Aws::Athena
     #   parameter mappings.
     #
     # @option params [String] :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`.
+    #   The notebook version. This value is supplied automatically for
+    #   notebook sessions in the Athena console and is not required for
+    #   programmatic session access. The only valid notebook version is
+    #   `Athena notebook version 1`. If you specify a value for
+    #   `NotebookVersion`, you must also specify a value for `NotebookId`. See
+    #   EngineConfiguration$AdditionalConfigs.
     #
     # @option params [Integer] :session_idle_timeout_in_minutes
     #   The idle timeout in minutes for the session.
@@ -2917,7 +2932,7 @@ module Aws::Athena
     #
     #
     #
-    # [1]: https://aws.amazon.com/answers/account-management/aws-tagging-strategies/
+    # [1]: https://docs.aws.amazon.com/whitepapers/latest/tagging-best-practices/tagging-best-practices.html
     #
     # @option params [required, String] :resource_arn
     #   Specifies the ARN of the Athena resource (workgroup or data catalog)
@@ -3122,7 +3137,8 @@ module Aws::Athena
     #   The notebook content type. Currently, the only valid type is `IPYNB`.
     #
     # @option params [String] :session_id
-    #   The ID of the session in which the notebook will be updated.
+    #   The active notebook session ID. Required if the notebook has an active
+    #   session.
     #
     # @option params [String] :client_request_token
     #   A unique case-sensitive string used to ensure the request to create
@@ -3227,11 +3243,7 @@ module Aws::Athena
     end
 
     # Updates the workgroup with the specified name. The workgroup's name
-    # cannot be changed. Only one of `ConfigurationsUpdates` or
-    # `ConfigurationUpdates` can be specified; `ConfigurationsUpdates` for a
-    # workgroup with multi engine support (for example, an Apache Spark
-    # enabled workgroup) or `ConfigurationUpdates` for an Athena SQL
-    # workgroup.
+    # cannot be changed. Only `ConfigurationUpdates` can be specified.
     #
     # @option params [required, String] :work_group
     #   The specified workgroup that will be updated.
@@ -3283,6 +3295,7 @@ module Aws::Athena
     #       customer_content_encryption_configuration: {
     #         kms_key: "KmsKey", # required
     #       },
+    #       enable_minimum_encryption_configuration: false,
     #     },
     #     state: "ENABLED", # accepts ENABLED, DISABLED
     #   })
@@ -3309,7 +3322,7 @@ module Aws::Athena
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-athena'
-      context[:gem_version] = '1.61.0'
+      context[:gem_version] = '1.63.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -870,6 +870,7 @@ module Aws::Athena
     QueryExecution.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, location_name: "WorkGroup"))
     QueryExecution.add_member(:engine_version, Shapes::ShapeRef.new(shape: EngineVersion, location_name: "EngineVersion"))
     QueryExecution.add_member(:execution_parameters, Shapes::ShapeRef.new(shape: ExecutionParameters, location_name: "ExecutionParameters"))
+    QueryExecution.add_member(:substatement_type, Shapes::ShapeRef.new(shape: String, location_name: "SubstatementType"))
     QueryExecution.struct_class = Types::QueryExecution
 
     QueryExecutionContext.add_member(:database, Shapes::ShapeRef.new(shape: DatabaseString, location_name: "Database"))
@@ -1183,6 +1184,7 @@ module Aws::Athena
     WorkGroupConfiguration.add_member(:additional_configuration, Shapes::ShapeRef.new(shape: NameString, location_name: "AdditionalConfiguration"))
     WorkGroupConfiguration.add_member(:execution_role, Shapes::ShapeRef.new(shape: RoleArn, location_name: "ExecutionRole"))
     WorkGroupConfiguration.add_member(:customer_content_encryption_configuration, Shapes::ShapeRef.new(shape: CustomerContentEncryptionConfiguration, location_name: "CustomerContentEncryptionConfiguration"))
+    WorkGroupConfiguration.add_member(:enable_minimum_encryption_configuration, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "EnableMinimumEncryptionConfiguration"))
     WorkGroupConfiguration.struct_class = Types::WorkGroupConfiguration
 
     WorkGroupConfigurationUpdates.add_member(:enforce_work_group_configuration, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "EnforceWorkGroupConfiguration"))
@@ -1196,6 +1198,7 @@ module Aws::Athena
     WorkGroupConfigurationUpdates.add_member(:additional_configuration, Shapes::ShapeRef.new(shape: NameString, location_name: "AdditionalConfiguration"))
     WorkGroupConfigurationUpdates.add_member(:execution_role, Shapes::ShapeRef.new(shape: RoleArn, location_name: "ExecutionRole"))
     WorkGroupConfigurationUpdates.add_member(:customer_content_encryption_configuration, Shapes::ShapeRef.new(shape: CustomerContentEncryptionConfiguration, location_name: "CustomerContentEncryptionConfiguration"))
+    WorkGroupConfigurationUpdates.add_member(:enable_minimum_encryption_configuration, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "EnableMinimumEncryptionConfiguration"))
     WorkGroupConfigurationUpdates.struct_class = Types::WorkGroupConfigurationUpdates
 
     WorkGroupSummary.add_member(:name, Shapes::ShapeRef.new(shape: WorkGroupName, location_name: "Name"))

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

@@ -50,9 +50,6 @@ module Aws::Athena
 
     def initialize(options = {})
       self[:region] = options[:region]
-      if self[:region].nil?
-        raise ArgumentError, "Missing required EndpointParameter: :region"
-      end
       self[:use_dual_stack] = options[:use_dual_stack]
       self[:use_dual_stack] = false if self[:use_dual_stack].nil?
       if self[:use_dual_stack].nil?

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

@@ -14,36 +14,39 @@ module Aws::Athena
       use_dual_stack = parameters.use_dual_stack
       use_fips = parameters.use_fips
       endpoint = parameters.endpoint
-      if (partition_result = Aws::Endpoints::Matchers.aws_partition(region))
-        if Aws::Endpoints::Matchers.set?(endpoint)
-          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
-            raise ArgumentError, "Invalid Configuration: FIPS and custom endpoint are not supported"
-          end
-          if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
-            raise ArgumentError, "Invalid Configuration: Dualstack and custom endpoint are not supported"
-          end
-          return Aws::Endpoints::Endpoint.new(url: endpoint, headers: {}, properties: {})
-        end
-        if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true) && Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
-          if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS")) && Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
-            return Aws::Endpoints::Endpoint.new(url: "https://athena-fips.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
-          end
-          raise ArgumentError, "FIPS and DualStack are enabled, but this partition does not support one or both"
-        end
+      if Aws::Endpoints::Matchers.set?(endpoint)
         if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
-          if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"))
-            return Aws::Endpoints::Endpoint.new(url: "https://athena-fips.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
-          end
-          raise ArgumentError, "FIPS is enabled but this partition does not support FIPS"
+          raise ArgumentError, "Invalid Configuration: FIPS and custom endpoint are not supported"
         end
         if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
-          if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
-            return Aws::Endpoints::Endpoint.new(url: "https://athena.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+          raise ArgumentError, "Invalid Configuration: Dualstack and custom endpoint are not supported"
+        end
+        return Aws::Endpoints::Endpoint.new(url: endpoint, headers: {}, properties: {})
+      end
+      if Aws::Endpoints::Matchers.set?(region)
+        if (partition_result = Aws::Endpoints::Matchers.aws_partition(region))
+          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true) && Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
+            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS")) && Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
+              return Aws::Endpoints::Endpoint.new(url: "https://athena-fips.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+            end
+            raise ArgumentError, "FIPS and DualStack are enabled, but this partition does not support one or both"
+          end
+          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
+            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"))
+              return Aws::Endpoints::Endpoint.new(url: "https://athena-fips.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
+            end
+            raise ArgumentError, "FIPS is enabled but this partition does not support FIPS"
+          end
+          if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
+            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
+              return Aws::Endpoints::Endpoint.new(url: "https://athena.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+            end
+            raise ArgumentError, "DualStack is enabled but this partition does not support DualStack"
           end
-          raise ArgumentError, "DualStack is enabled but this partition does not support DualStack"
+          return Aws::Endpoints::Endpoint.new(url: "https://athena.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
         end
-        return Aws::Endpoints::Endpoint.new(url: "https://athena.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
       end
+      raise ArgumentError, "Invalid Configuration: Missing Region"
       raise ArgumentError, 'No endpoint could be resolved'
 
     end

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

@@ -45,8 +45,8 @@ module Aws::Athena
     # 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`).
+    #   The name of the supported application runtime (for example, `Athena
+    #   notebook version 1`).
     #   @return [String]
     #
     # @!attribute [rw] supported_dpu_sizes
@@ -690,13 +690,15 @@ module Aws::Athena
     #
     # @!attribute [rw] configuration
     #   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
+    #   workgroup or Spark enabled Athena workgroup. Athena SQL workgroup
+    #   configuration includes the location in Amazon S3 where query and
+    #   calculation 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]
     #
@@ -743,6 +745,11 @@ module Aws::Athena
     # Contains information about a data catalog in an Amazon Web Services
     # account.
     #
+    # <note markdown="1"> In the Athena console, data catalogs are listed as "data sources" on
+    # the **Data sources** page under the **Data source name** column.
+    #
+    #  </note>
+    #
     # @!attribute [rw] name
     #   The name of the data catalog. The catalog name must be unique for
     #   the Amazon Web Services account and can use a maximum of 127
@@ -952,7 +959,8 @@ module Aws::Athena
     #
     # @!attribute [rw] recursive_delete_option
     #   The option to delete the workgroup and its contents even if the
-    #   workgroup contains any named queries or query executions.
+    #   workgroup contains any named queries, query executions, or
+    #   notebooks.
     #   @return [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/DeleteWorkGroupInput AWS API Documentation
@@ -968,8 +976,9 @@ module Aws::Athena
     #
     class DeleteWorkGroupOutput < Aws::EmptyStructure; end
 
-    # If query results are encrypted in Amazon S3, indicates the encryption
-    # option used (for example, `SSE_KMS` or `CSE_KMS`) and key information.
+    # If query and calculation results are encrypted in Amazon S3, indicates
+    # the encryption option used (for example, `SSE_KMS` or `CSE_KMS`) and
+    # key information.
     #
     # @!attribute [rw] encryption_option
     #   Indicates whether Amazon S3 server-side encryption with Amazon
@@ -1017,11 +1026,11 @@ module Aws::Athena
     #
     # @!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.
+    #   mappings in the form of key-value pairs. To specify an Athena
+    #   notebook that the Jupyter server will download and serve, specify a
+    #   value for the StartSessionRequest$NotebookVersion field, and then
+    #   add a key named `NotebookId` to `AdditionalConfigs` that has the
+    #   value of the Athena notebook ID.
     #   @return [Hash<String,String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/EngineConfiguration AWS API Documentation
@@ -1040,8 +1049,8 @@ module Aws::Athena
     #
     # @!attribute [rw] selected_engine_version
     #   The engine version requested by the user. Possible values are
-    #   determined by the output of `ListEngineVersions`, including Auto.
-    #   The default is Auto.
+    #   determined by the output of `ListEngineVersions`, including AUTO.
+    #   The default is AUTO.
     #   @return [String]
     #
     # @!attribute [rw] effective_engine_version
@@ -1176,7 +1185,7 @@ module Aws::Athena
     end
 
     # @!attribute [rw] code_block
-    #   A pre-signed URL to the code that executed the calculation.
+    #   The unencrypted code that was executed for the calculation.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetCalculationExecutionCodeResponse AWS API Documentation
@@ -1698,7 +1707,7 @@ module Aws::Athena
     end
 
     # @!attribute [rw] notebook_id
-    #   The ID of the notebook to import.
+    #   The ID assigned to the imported notebook.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ImportNotebookOutput AWS API Documentation
@@ -2676,12 +2685,12 @@ module Aws::Athena
     #   @return [String]
     #
     # @!attribute [rw] result_configuration
-    #   The location in Amazon S3 where query results were stored and the
-    #   encryption option, if any, used for query results. These are known
-    #   as "client-side settings". If workgroup settings override
-    #   client-side settings, then the query uses the location for the query
-    #   results and the encryption configuration that are specified for the
-    #   workgroup.
+    #   The location in Amazon S3 where query and calculation results are
+    #   stored and the encryption option, if any, used for query results.
+    #   These are known as "client-side settings". If workgroup settings
+    #   override client-side settings, then the query uses the location for
+    #   the query results and the encryption configuration that are
+    #   specified for the workgroup.
     #   @return [Types::ResultConfiguration]
     #
     # @!attribute [rw] result_reuse_configuration
@@ -2718,6 +2727,10 @@ module Aws::Athena
     #   which the parameters occur.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] substatement_type
+    #   The kind of query statement that was run.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/QueryExecution AWS API Documentation
     #
     class QueryExecution < Struct.new(
@@ -2731,7 +2744,8 @@ module Aws::Athena
       :statistics,
       :work_group,
       :engine_version,
-      :execution_parameters)
+      :execution_parameters,
+      :substatement_type)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -3086,19 +3100,21 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # The location in Amazon S3 where query results are stored and the
-    # encryption option, if any, used for query results. These are known as
-    # "client-side settings". If workgroup settings override client-side
-    # settings, then the query uses the workgroup settings.
+    # The location in Amazon S3 where query and calculation results are
+    # stored and the encryption option, if any, used for query and
+    # calculation results. These are known as "client-side settings". If
+    # workgroup settings override client-side settings, then the query uses
+    # the workgroup settings.
     #
     # @!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
-    #   the query results location using one of the ways: either for
-    #   individual queries using either this setting (client-side), or in
-    #   the workgroup, using WorkGroupConfiguration. If none of them is set,
-    #   Athena issues an error that no output location is provided. For more
-    #   information, see [Query Results][1]. If workgroup settings override
+    #   The location in Amazon S3 where your query and calculation results
+    #   are stored, such as `s3://path/to/query/bucket/`. To run the query,
+    #   you must specify the query results location using one of the ways:
+    #   either for individual queries using either this setting
+    #   (client-side), or in the workgroup, using WorkGroupConfiguration. If
+    #   none of them is set, Athena issues an error that no output location
+    #   is provided. For more information, see [Working with query results,
+    #   recent queries, and output files][1]. If workgroup settings override
     #   client-side settings, then the query uses the settings specified for
     #   the workgroup. See
     #   WorkGroupConfiguration$EnforceWorkGroupConfiguration.
@@ -3109,12 +3125,13 @@ module Aws::Athena
     #   @return [String]
     #
     # @!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. This is a client-side setting. If workgroup settings
-    #   override client-side settings, then the query uses the encryption
-    #   configuration that is specified for the workgroup, and also uses the
-    #   location for storing query results specified in the workgroup. See
+    #   If query and calculation results are encrypted in Amazon S3,
+    #   indicates the encryption option used (for example, `SSE_KMS` or
+    #   `CSE_KMS`) and key information. This is a client-side setting. If
+    #   workgroup settings override client-side settings, then the query
+    #   uses the encryption configuration that is specified for the
+    #   workgroup, and also uses the location for storing query results
+    #   specified in the workgroup. See
     #   WorkGroupConfiguration$EnforceWorkGroupConfiguration and [Workgroup
     #   Settings Override Client-Side Settings][1].
     #
@@ -3175,12 +3192,13 @@ module Aws::Athena
     # location and encryption configuration for the query results.
     #
     # @!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
-    #   Results][1] If workgroup settings override client-side settings,
-    #   then the query uses the location for the query results and the
-    #   encryption configuration that are specified for the workgroup. The
-    #   "workgroup settings override" is specified in
+    #   The location in Amazon S3 where your query and calculation results
+    #   are stored, such as `s3://path/to/query/bucket/`. For more
+    #   information, see [Working with query results, recent queries, and
+    #   output files][1]. If workgroup settings override client-side
+    #   settings, then the query uses the location for the query results and
+    #   the encryption configuration that are specified for the workgroup.
+    #   The "workgroup settings override" is specified in
     #   `EnforceWorkGroupConfiguration` (true/false) in the
     #   `WorkGroupConfiguration`. See
     #   WorkGroupConfiguration$EnforceWorkGroupConfiguration.
@@ -3206,7 +3224,7 @@ module Aws::Athena
     #   @return [Boolean]
     #
     # @!attribute [rw] encryption_configuration
-    #   The encryption configuration for the query results.
+    #   The encryption configuration for query and calculation results.
     #   @return [Types::EncryptionConfiguration]
     #
     # @!attribute [rw] remove_encryption_configuration
@@ -3427,9 +3445,9 @@ module Aws::Athena
     #   @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.
+    #   If query and calculation 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
@@ -3443,7 +3461,7 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # Contains statistics for a notebook session.
+    # Contains statistics for a session.
     #
     # @!attribute [rw] dpu_execution_in_millis
     #   The data processing unit execution time for a session in
@@ -3458,7 +3476,7 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # Contains information about the status of a notebook session.
+    # Contains information about the status of a session.
     #
     # @!attribute [rw] start_date_time
     #   The date and time that the session started.
@@ -3518,7 +3536,7 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # Contains summary information about a notebook session.
+    # Contains summary information about a session.
     #
     # @!attribute [rw] session_id
     #   The session ID.
@@ -3717,9 +3735,12 @@ module Aws::Athena
     #   @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`.
+    #   The notebook version. This value is supplied automatically for
+    #   notebook sessions in the Athena console and is not required for
+    #   programmatic session access. The only valid notebook version is
+    #   `Athena notebook version 1`. If you specify a value for
+    #   `NotebookVersion`, you must also specify a value for `NotebookId`.
+    #   See EngineConfiguration$AdditionalConfigs.
     #   @return [String]
     #
     # @!attribute [rw] session_idle_timeout_in_minutes
@@ -3907,7 +3928,7 @@ module Aws::Athena
     #
     #
     #
-    # [1]: https://aws.amazon.com/answers/account-management/aws-tagging-strategies/
+    # [1]: https://docs.aws.amazon.com/whitepapers/latest/tagging-best-practices/tagging-best-practices.html
     #
     # @!attribute [rw] key
     #   A tag key. The tag key length is from 1 to 128 Unicode characters in
@@ -4233,7 +4254,8 @@ module Aws::Athena
     #   @return [String]
     #
     # @!attribute [rw] session_id
-    #   The ID of the session in which the notebook will be updated.
+    #   The active notebook session ID. Required if the notebook has an
+    #   active session.
     #   @return [String]
     #
     # @!attribute [rw] client_request_token
@@ -4380,12 +4402,12 @@ module Aws::Athena
     #
     # @!attribute [rw] configuration
     #   The configuration of the workgroup, which includes the location in
-    #   Amazon S3 where query results are stored, the encryption
-    #   configuration, if any, used for query results; whether the Amazon
-    #   CloudWatch Metrics are enabled for the workgroup; whether workgroup
-    #   settings override client-side settings; and the data usage limits
-    #   for the amount of data scanned per query or per workgroup. The
-    #   workgroup settings override is specified in
+    #   Amazon S3 where query and calculation results are stored, the
+    #   encryption configuration, if any, used for query and calculation
+    #   results; whether the Amazon CloudWatch Metrics are enabled for the
+    #   workgroup; whether workgroup settings override client-side settings;
+    #   and the data usage limits for the amount of data scanned per query
+    #   or per workgroup. The workgroup settings override is specified in
     #   `EnforceWorkGroupConfiguration` (true/false) in the
     #   `WorkGroupConfiguration`. See
     #   WorkGroupConfiguration$EnforceWorkGroupConfiguration.
@@ -4412,24 +4434,27 @@ module Aws::Athena
     end
 
     # The configuration of the workgroup, which includes the location in
-    # Amazon S3 where query results are stored, the encryption option, if
-    # any, used for query results, whether the Amazon CloudWatch Metrics are
-    # enabled for the workgroup and whether workgroup settings override
-    # query settings, and the data usage limits for the amount of data
-    # scanned per query or per workgroup. The workgroup settings override is
-    # specified in `EnforceWorkGroupConfiguration` (true/false) in the
+    # Amazon S3 where query and calculation results are stored, the
+    # encryption option, if any, used for query and calculation results,
+    # whether the Amazon CloudWatch Metrics are enabled for the workgroup
+    # and whether workgroup settings override query settings, and the data
+    # usage limits for the amount of data scanned per query or per
+    # workgroup. The workgroup settings override is specified in
+    # `EnforceWorkGroupConfiguration` (true/false) in the
     # `WorkGroupConfiguration`. See
     # WorkGroupConfiguration$EnforceWorkGroupConfiguration.
     #
     # @!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,
-    #   if any, used for query results. To run the query, you must specify
-    #   the query results location using one of the ways: either in the
-    #   workgroup using this setting, or for individual queries
-    #   (client-side), using ResultConfiguration$OutputLocation. If none of
-    #   them is set, Athena issues an error that no output location is
-    #   provided. For more information, see [Query Results][1].
+    #   Amazon S3 where query and calculation results are stored and the
+    #   encryption option, if any, used for query and calculation results.
+    #   To run the query, you must specify the query results location using
+    #   one of the ways: either in the workgroup using this setting, or for
+    #   individual queries (client-side), using
+    #   ResultConfiguration$OutputLocation. If none of them is set, Athena
+    #   issues an error that no output location is provided. For more
+    #   information, see [Working with query results, recent queries, and
+    #   output files][1].
     #
     #
     #
@@ -4483,7 +4508,7 @@ module Aws::Athena
     #   @return [String]
     #
     # @!attribute [rw] execution_role
-    #   Role used in a notebook session for accessing the user's resources.
+    #   Role used in a session for accessing the user's resources.
     #   @return [String]
     #
     # @!attribute [rw] customer_content_encryption_configuration
@@ -4491,6 +4516,19 @@ module Aws::Athena
     #   stores in Athena.
     #   @return [Types::CustomerContentEncryptionConfiguration]
     #
+    # @!attribute [rw] enable_minimum_encryption_configuration
+    #   Enforces a minimal level of encryption for the workgroup for query
+    #   and calculation results that are written to Amazon S3. When enabled,
+    #   workgroup users can set encryption only to the minimum level set by
+    #   the administrator or higher when they submit queries.
+    #
+    #   The `EnforceWorkGroupConfiguration` setting takes precedence over
+    #   the `EnableMinimumEncryptionConfiguration` flag. This means that if
+    #   `EnforceWorkGroupConfiguration` is true, the
+    #   `EnableMinimumEncryptionConfiguration` flag is ignored, and the
+    #   workgroup configuration for encryption is used.
+    #   @return [Boolean]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/WorkGroupConfiguration AWS API Documentation
     #
     class WorkGroupConfiguration < Struct.new(
@@ -4502,18 +4540,19 @@ module Aws::Athena
       :engine_version,
       :additional_configuration,
       :execution_role,
-      :customer_content_encryption_configuration)
+      :customer_content_encryption_configuration,
+      :enable_minimum_encryption_configuration)
       SENSITIVE = []
       include Aws::Structure
     end
 
     # The configuration information that will be updated for this workgroup,
-    # which includes the location in Amazon S3 where query results are
-    # stored, the encryption option, if any, used for query results, whether
-    # the Amazon CloudWatch Metrics are enabled for the workgroup, whether
-    # the workgroup settings override the client-side settings, and the data
-    # usage limit for the amount of bytes scanned per query, if it is
-    # specified.
+    # which includes the location in Amazon S3 where query and calculation
+    # results are stored, the encryption option, if any, used for query
+    # results, whether the Amazon CloudWatch Metrics are enabled for the
+    # workgroup, whether the workgroup settings override the client-side
+    # settings, and the data usage limit for the amount of bytes scanned per
+    # query, if it is specified.
     #
     # @!attribute [rw] enforce_work_group_configuration
     #   If set to "true", the settings for the workgroup override
@@ -4587,6 +4626,20 @@ module Aws::Athena
     #   stores in Athena.
     #   @return [Types::CustomerContentEncryptionConfiguration]
     #
+    # @!attribute [rw] enable_minimum_encryption_configuration
+    #   Enforces a minimal level of encryption for the workgroup for query
+    #   and calculation results that are written to Amazon S3. When enabled,
+    #   workgroup users can set encryption only to the minimum level set by
+    #   the administrator or higher when they submit queries. This setting
+    #   does not apply to Spark-enabled workgroups.
+    #
+    #   The `EnforceWorkGroupConfiguration` setting takes precedence over
+    #   the `EnableMinimumEncryptionConfiguration` flag. This means that if
+    #   `EnforceWorkGroupConfiguration` is true, the
+    #   `EnableMinimumEncryptionConfiguration` flag is ignored, and the
+    #   workgroup configuration for encryption is used.
+    #   @return [Boolean]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/WorkGroupConfigurationUpdates AWS API Documentation
     #
     class WorkGroupConfigurationUpdates < Struct.new(
@@ -4600,7 +4653,8 @@ module Aws::Athena
       :remove_customer_content_encryption_configuration,
       :additional_configuration,
       :execution_role,
-      :customer_content_encryption_configuration)
+      :customer_content_encryption_configuration,
+      :enable_minimum_encryption_configuration)
       SENSITIVE = []
       include Aws::Structure
     end

data/lib/aws-sdk-athena.rb

@@ -52,6 +52,6 @@ require_relative 'aws-sdk-athena/customizations'
 # @!group service
 module Aws::Athena
 
-  GEM_VERSION = '1.61.0'
+  GEM_VERSION = '1.63.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-athena
 version: !ruby/object:Gem::Version
-  version: 1.61.0
+  version: 1.63.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core