aws-sdk-athena 1.7.0 → 1.8.0

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

@@ -16,16 +16,22 @@ module Aws::Athena
     BatchGetQueryExecutionInput = Shapes::StructureShape.new(name: 'BatchGetQueryExecutionInput')
     BatchGetQueryExecutionOutput = Shapes::StructureShape.new(name: 'BatchGetQueryExecutionOutput')
     Boolean = Shapes::BooleanShape.new(name: 'Boolean')
+    BoxedBoolean = Shapes::BooleanShape.new(name: 'BoxedBoolean')
+    BytesScannedCutoffValue = Shapes::IntegerShape.new(name: 'BytesScannedCutoffValue')
     ColumnInfo = Shapes::StructureShape.new(name: 'ColumnInfo')
     ColumnInfoList = Shapes::ListShape.new(name: 'ColumnInfoList')
     ColumnNullable = Shapes::StringShape.new(name: 'ColumnNullable')
     CreateNamedQueryInput = Shapes::StructureShape.new(name: 'CreateNamedQueryInput')
     CreateNamedQueryOutput = Shapes::StructureShape.new(name: 'CreateNamedQueryOutput')
+    CreateWorkGroupInput = Shapes::StructureShape.new(name: 'CreateWorkGroupInput')
+    CreateWorkGroupOutput = Shapes::StructureShape.new(name: 'CreateWorkGroupOutput')
     DatabaseString = Shapes::StringShape.new(name: 'DatabaseString')
     Date = Shapes::TimestampShape.new(name: 'Date')
     Datum = Shapes::StructureShape.new(name: 'Datum')
     DeleteNamedQueryInput = Shapes::StructureShape.new(name: 'DeleteNamedQueryInput')
     DeleteNamedQueryOutput = Shapes::StructureShape.new(name: 'DeleteNamedQueryOutput')
+    DeleteWorkGroupInput = Shapes::StructureShape.new(name: 'DeleteWorkGroupInput')
+    DeleteWorkGroupOutput = Shapes::StructureShape.new(name: 'DeleteWorkGroupOutput')
     DescriptionString = Shapes::StringShape.new(name: 'DescriptionString')
     EncryptionConfiguration = Shapes::StructureShape.new(name: 'EncryptionConfiguration')
     EncryptionOption = Shapes::StringShape.new(name: 'EncryptionOption')
@@ -37,6 +43,8 @@ module Aws::Athena
     GetQueryExecutionOutput = Shapes::StructureShape.new(name: 'GetQueryExecutionOutput')
     GetQueryResultsInput = Shapes::StructureShape.new(name: 'GetQueryResultsInput')
     GetQueryResultsOutput = Shapes::StructureShape.new(name: 'GetQueryResultsOutput')
+    GetWorkGroupInput = Shapes::StructureShape.new(name: 'GetWorkGroupInput')
+    GetWorkGroupOutput = Shapes::StructureShape.new(name: 'GetWorkGroupOutput')
     IdempotencyToken = Shapes::StringShape.new(name: 'IdempotencyToken')
     Integer = Shapes::IntegerShape.new(name: 'Integer')
     InternalServerException = Shapes::StructureShape.new(name: 'InternalServerException')
@@ -45,10 +53,13 @@ module Aws::Athena
     ListNamedQueriesOutput = Shapes::StructureShape.new(name: 'ListNamedQueriesOutput')
     ListQueryExecutionsInput = Shapes::StructureShape.new(name: 'ListQueryExecutionsInput')
     ListQueryExecutionsOutput = Shapes::StructureShape.new(name: 'ListQueryExecutionsOutput')
+    ListWorkGroupsInput = Shapes::StructureShape.new(name: 'ListWorkGroupsInput')
+    ListWorkGroupsOutput = Shapes::StructureShape.new(name: 'ListWorkGroupsOutput')
     Long = Shapes::IntegerShape.new(name: 'Long')
     MaxNamedQueriesCount = Shapes::IntegerShape.new(name: 'MaxNamedQueriesCount')
     MaxQueryExecutionsCount = Shapes::IntegerShape.new(name: 'MaxQueryExecutionsCount')
     MaxQueryResults = Shapes::IntegerShape.new(name: 'MaxQueryResults')
+    MaxWorkGroupsCount = Shapes::IntegerShape.new(name: 'MaxWorkGroupsCount')
     NameString = Shapes::StringShape.new(name: 'NameString')
     NamedQuery = Shapes::StructureShape.new(name: 'NamedQuery')
     NamedQueryId = Shapes::StringShape.new(name: 'NamedQueryId')
@@ -64,6 +75,7 @@ module Aws::Athena
     QueryExecutionStatus = Shapes::StructureShape.new(name: 'QueryExecutionStatus')
     QueryString = Shapes::StringShape.new(name: 'QueryString')
     ResultConfiguration = Shapes::StructureShape.new(name: 'ResultConfiguration')
+    ResultConfigurationUpdates = Shapes::StructureShape.new(name: 'ResultConfigurationUpdates')
     ResultSet = Shapes::StructureShape.new(name: 'ResultSet')
     ResultSetMetadata = Shapes::StructureShape.new(name: 'ResultSetMetadata')
     Row = Shapes::StructureShape.new(name: 'Row')
@@ -81,6 +93,16 @@ module Aws::Athena
     UnprocessedNamedQueryIdList = Shapes::ListShape.new(name: 'UnprocessedNamedQueryIdList')
     UnprocessedQueryExecutionId = Shapes::StructureShape.new(name: 'UnprocessedQueryExecutionId')
     UnprocessedQueryExecutionIdList = Shapes::ListShape.new(name: 'UnprocessedQueryExecutionIdList')
+    UpdateWorkGroupInput = Shapes::StructureShape.new(name: 'UpdateWorkGroupInput')
+    UpdateWorkGroupOutput = Shapes::StructureShape.new(name: 'UpdateWorkGroupOutput')
+    WorkGroup = Shapes::StructureShape.new(name: 'WorkGroup')
+    WorkGroupConfiguration = Shapes::StructureShape.new(name: 'WorkGroupConfiguration')
+    WorkGroupConfigurationUpdates = Shapes::StructureShape.new(name: 'WorkGroupConfigurationUpdates')
+    WorkGroupDescriptionString = Shapes::StringShape.new(name: 'WorkGroupDescriptionString')
+    WorkGroupName = Shapes::StringShape.new(name: 'WorkGroupName')
+    WorkGroupState = Shapes::StringShape.new(name: 'WorkGroupState')
+    WorkGroupSummary = Shapes::StructureShape.new(name: 'WorkGroupSummary')
+    WorkGroupsList = Shapes::ListShape.new(name: 'WorkGroupsList')
     datumList = Shapes::ListShape.new(name: 'datumList')
     datumString = Shapes::StringShape.new(name: 'datumString')
 
@@ -117,11 +139,19 @@ module Aws::Athena
     CreateNamedQueryInput.add_member(:database, Shapes::ShapeRef.new(shape: DatabaseString, required: true, location_name: "Database"))
     CreateNamedQueryInput.add_member(:query_string, Shapes::ShapeRef.new(shape: QueryString, required: true, location_name: "QueryString"))
     CreateNamedQueryInput.add_member(:client_request_token, Shapes::ShapeRef.new(shape: IdempotencyToken, location_name: "ClientRequestToken", metadata: {"idempotencyToken"=>true}))
+    CreateNamedQueryInput.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, location_name: "WorkGroup"))
     CreateNamedQueryInput.struct_class = Types::CreateNamedQueryInput
 
     CreateNamedQueryOutput.add_member(:named_query_id, Shapes::ShapeRef.new(shape: NamedQueryId, location_name: "NamedQueryId"))
     CreateNamedQueryOutput.struct_class = Types::CreateNamedQueryOutput
 
+    CreateWorkGroupInput.add_member(:name, Shapes::ShapeRef.new(shape: WorkGroupName, required: true, location_name: "Name"))
+    CreateWorkGroupInput.add_member(:configuration, Shapes::ShapeRef.new(shape: WorkGroupConfiguration, location_name: "Configuration"))
+    CreateWorkGroupInput.add_member(:description, Shapes::ShapeRef.new(shape: WorkGroupDescriptionString, location_name: "Description"))
+    CreateWorkGroupInput.struct_class = Types::CreateWorkGroupInput
+
+    CreateWorkGroupOutput.struct_class = Types::CreateWorkGroupOutput
+
     Datum.add_member(:var_char_value, Shapes::ShapeRef.new(shape: datumString, location_name: "VarCharValue"))
     Datum.struct_class = Types::Datum
 
@@ -130,6 +160,12 @@ module Aws::Athena
 
     DeleteNamedQueryOutput.struct_class = Types::DeleteNamedQueryOutput
 
+    DeleteWorkGroupInput.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, required: true, location_name: "WorkGroup"))
+    DeleteWorkGroupInput.add_member(:recursive_delete_option, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "RecursiveDeleteOption"))
+    DeleteWorkGroupInput.struct_class = Types::DeleteWorkGroupInput
+
+    DeleteWorkGroupOutput.struct_class = Types::DeleteWorkGroupOutput
+
     EncryptionConfiguration.add_member(:encryption_option, Shapes::ShapeRef.new(shape: EncryptionOption, required: true, location_name: "EncryptionOption"))
     EncryptionConfiguration.add_member(:kms_key, Shapes::ShapeRef.new(shape: String, location_name: "KmsKey"))
     EncryptionConfiguration.struct_class = Types::EncryptionConfiguration
@@ -156,8 +192,15 @@ module Aws::Athena
     GetQueryResultsOutput.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "NextToken"))
     GetQueryResultsOutput.struct_class = Types::GetQueryResultsOutput
 
+    GetWorkGroupInput.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, required: true, location_name: "WorkGroup"))
+    GetWorkGroupInput.struct_class = Types::GetWorkGroupInput
+
+    GetWorkGroupOutput.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroup, location_name: "WorkGroup"))
+    GetWorkGroupOutput.struct_class = Types::GetWorkGroupOutput
+
     ListNamedQueriesInput.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "NextToken"))
     ListNamedQueriesInput.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxNamedQueriesCount, location_name: "MaxResults"))
+    ListNamedQueriesInput.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, location_name: "WorkGroup"))
     ListNamedQueriesInput.struct_class = Types::ListNamedQueriesInput
 
     ListNamedQueriesOutput.add_member(:named_query_ids, Shapes::ShapeRef.new(shape: NamedQueryIdList, location_name: "NamedQueryIds"))
@@ -166,17 +209,27 @@ module Aws::Athena
 
     ListQueryExecutionsInput.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "NextToken"))
     ListQueryExecutionsInput.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxQueryExecutionsCount, location_name: "MaxResults"))
+    ListQueryExecutionsInput.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, location_name: "WorkGroup"))
     ListQueryExecutionsInput.struct_class = Types::ListQueryExecutionsInput
 
     ListQueryExecutionsOutput.add_member(:query_execution_ids, Shapes::ShapeRef.new(shape: QueryExecutionIdList, location_name: "QueryExecutionIds"))
     ListQueryExecutionsOutput.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "NextToken"))
     ListQueryExecutionsOutput.struct_class = Types::ListQueryExecutionsOutput
 
+    ListWorkGroupsInput.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "NextToken"))
+    ListWorkGroupsInput.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxWorkGroupsCount, location_name: "MaxResults"))
+    ListWorkGroupsInput.struct_class = Types::ListWorkGroupsInput
+
+    ListWorkGroupsOutput.add_member(:work_groups, Shapes::ShapeRef.new(shape: WorkGroupsList, location_name: "WorkGroups"))
+    ListWorkGroupsOutput.add_member(:next_token, Shapes::ShapeRef.new(shape: Token, location_name: "NextToken"))
+    ListWorkGroupsOutput.struct_class = Types::ListWorkGroupsOutput
+
     NamedQuery.add_member(:name, Shapes::ShapeRef.new(shape: NameString, required: true, location_name: "Name"))
     NamedQuery.add_member(:description, Shapes::ShapeRef.new(shape: DescriptionString, location_name: "Description"))
     NamedQuery.add_member(:database, Shapes::ShapeRef.new(shape: DatabaseString, required: true, location_name: "Database"))
     NamedQuery.add_member(:query_string, Shapes::ShapeRef.new(shape: QueryString, required: true, location_name: "QueryString"))
     NamedQuery.add_member(:named_query_id, Shapes::ShapeRef.new(shape: NamedQueryId, location_name: "NamedQueryId"))
+    NamedQuery.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, location_name: "WorkGroup"))
     NamedQuery.struct_class = Types::NamedQuery
 
     NamedQueryIdList.member = Shapes::ShapeRef.new(shape: NamedQueryId)
@@ -190,6 +243,7 @@ module Aws::Athena
     QueryExecution.add_member(:query_execution_context, Shapes::ShapeRef.new(shape: QueryExecutionContext, location_name: "QueryExecutionContext"))
     QueryExecution.add_member(:status, Shapes::ShapeRef.new(shape: QueryExecutionStatus, location_name: "Status"))
     QueryExecution.add_member(:statistics, Shapes::ShapeRef.new(shape: QueryExecutionStatistics, location_name: "Statistics"))
+    QueryExecution.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, location_name: "WorkGroup"))
     QueryExecution.struct_class = Types::QueryExecution
 
     QueryExecutionContext.add_member(:database, Shapes::ShapeRef.new(shape: DatabaseString, location_name: "Database"))
@@ -209,10 +263,16 @@ module Aws::Athena
     QueryExecutionStatus.add_member(:completion_date_time, Shapes::ShapeRef.new(shape: Date, location_name: "CompletionDateTime"))
     QueryExecutionStatus.struct_class = Types::QueryExecutionStatus
 
-    ResultConfiguration.add_member(:output_location, Shapes::ShapeRef.new(shape: String, required: true, location_name: "OutputLocation"))
+    ResultConfiguration.add_member(:output_location, Shapes::ShapeRef.new(shape: String, location_name: "OutputLocation"))
     ResultConfiguration.add_member(:encryption_configuration, Shapes::ShapeRef.new(shape: EncryptionConfiguration, location_name: "EncryptionConfiguration"))
     ResultConfiguration.struct_class = Types::ResultConfiguration
 
+    ResultConfigurationUpdates.add_member(:output_location, Shapes::ShapeRef.new(shape: String, location_name: "OutputLocation"))
+    ResultConfigurationUpdates.add_member(:remove_output_location, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "RemoveOutputLocation"))
+    ResultConfigurationUpdates.add_member(:encryption_configuration, Shapes::ShapeRef.new(shape: EncryptionConfiguration, location_name: "EncryptionConfiguration"))
+    ResultConfigurationUpdates.add_member(:remove_encryption_configuration, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "RemoveEncryptionConfiguration"))
+    ResultConfigurationUpdates.struct_class = Types::ResultConfigurationUpdates
+
     ResultSet.add_member(:rows, Shapes::ShapeRef.new(shape: RowList, location_name: "Rows"))
     ResultSet.add_member(:result_set_metadata, Shapes::ShapeRef.new(shape: ResultSetMetadata, location_name: "ResultSetMetadata"))
     ResultSet.struct_class = Types::ResultSet
@@ -228,7 +288,8 @@ module Aws::Athena
     StartQueryExecutionInput.add_member(:query_string, Shapes::ShapeRef.new(shape: QueryString, required: true, location_name: "QueryString"))
     StartQueryExecutionInput.add_member(:client_request_token, Shapes::ShapeRef.new(shape: IdempotencyToken, location_name: "ClientRequestToken", metadata: {"idempotencyToken"=>true}))
     StartQueryExecutionInput.add_member(:query_execution_context, Shapes::ShapeRef.new(shape: QueryExecutionContext, location_name: "QueryExecutionContext"))
-    StartQueryExecutionInput.add_member(:result_configuration, Shapes::ShapeRef.new(shape: ResultConfiguration, required: true, location_name: "ResultConfiguration"))
+    StartQueryExecutionInput.add_member(:result_configuration, Shapes::ShapeRef.new(shape: ResultConfiguration, location_name: "ResultConfiguration"))
+    StartQueryExecutionInput.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, location_name: "WorkGroup"))
     StartQueryExecutionInput.struct_class = Types::StartQueryExecutionInput
 
     StartQueryExecutionOutput.add_member(:query_execution_id, Shapes::ShapeRef.new(shape: QueryExecutionId, location_name: "QueryExecutionId"))
@@ -253,6 +314,42 @@ module Aws::Athena
 
     UnprocessedQueryExecutionIdList.member = Shapes::ShapeRef.new(shape: UnprocessedQueryExecutionId)
 
+    UpdateWorkGroupInput.add_member(:work_group, Shapes::ShapeRef.new(shape: WorkGroupName, required: true, location_name: "WorkGroup"))
+    UpdateWorkGroupInput.add_member(:description, Shapes::ShapeRef.new(shape: WorkGroupDescriptionString, location_name: "Description"))
+    UpdateWorkGroupInput.add_member(:configuration_updates, Shapes::ShapeRef.new(shape: WorkGroupConfigurationUpdates, location_name: "ConfigurationUpdates"))
+    UpdateWorkGroupInput.add_member(:state, Shapes::ShapeRef.new(shape: WorkGroupState, location_name: "State"))
+    UpdateWorkGroupInput.struct_class = Types::UpdateWorkGroupInput
+
+    UpdateWorkGroupOutput.struct_class = Types::UpdateWorkGroupOutput
+
+    WorkGroup.add_member(:name, Shapes::ShapeRef.new(shape: WorkGroupName, required: true, location_name: "Name"))
+    WorkGroup.add_member(:state, Shapes::ShapeRef.new(shape: WorkGroupState, location_name: "State"))
+    WorkGroup.add_member(:configuration, Shapes::ShapeRef.new(shape: WorkGroupConfiguration, location_name: "Configuration"))
+    WorkGroup.add_member(:description, Shapes::ShapeRef.new(shape: WorkGroupDescriptionString, location_name: "Description"))
+    WorkGroup.add_member(:creation_time, Shapes::ShapeRef.new(shape: Date, location_name: "CreationTime"))
+    WorkGroup.struct_class = Types::WorkGroup
+
+    WorkGroupConfiguration.add_member(:result_configuration, Shapes::ShapeRef.new(shape: ResultConfiguration, location_name: "ResultConfiguration"))
+    WorkGroupConfiguration.add_member(:enforce_work_group_configuration, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "EnforceWorkGroupConfiguration"))
+    WorkGroupConfiguration.add_member(:publish_cloud_watch_metrics_enabled, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "PublishCloudWatchMetricsEnabled"))
+    WorkGroupConfiguration.add_member(:bytes_scanned_cutoff_per_query, Shapes::ShapeRef.new(shape: BytesScannedCutoffValue, location_name: "BytesScannedCutoffPerQuery"))
+    WorkGroupConfiguration.struct_class = Types::WorkGroupConfiguration
+
+    WorkGroupConfigurationUpdates.add_member(:enforce_work_group_configuration, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "EnforceWorkGroupConfiguration"))
+    WorkGroupConfigurationUpdates.add_member(:result_configuration_updates, Shapes::ShapeRef.new(shape: ResultConfigurationUpdates, location_name: "ResultConfigurationUpdates"))
+    WorkGroupConfigurationUpdates.add_member(:publish_cloud_watch_metrics_enabled, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "PublishCloudWatchMetricsEnabled"))
+    WorkGroupConfigurationUpdates.add_member(:bytes_scanned_cutoff_per_query, Shapes::ShapeRef.new(shape: BytesScannedCutoffValue, location_name: "BytesScannedCutoffPerQuery"))
+    WorkGroupConfigurationUpdates.add_member(:remove_bytes_scanned_cutoff_per_query, Shapes::ShapeRef.new(shape: BoxedBoolean, location_name: "RemoveBytesScannedCutoffPerQuery"))
+    WorkGroupConfigurationUpdates.struct_class = Types::WorkGroupConfigurationUpdates
+
+    WorkGroupSummary.add_member(:name, Shapes::ShapeRef.new(shape: WorkGroupName, location_name: "Name"))
+    WorkGroupSummary.add_member(:state, Shapes::ShapeRef.new(shape: WorkGroupState, location_name: "State"))
+    WorkGroupSummary.add_member(:description, Shapes::ShapeRef.new(shape: WorkGroupDescriptionString, location_name: "Description"))
+    WorkGroupSummary.add_member(:creation_time, Shapes::ShapeRef.new(shape: Date, location_name: "CreationTime"))
+    WorkGroupSummary.struct_class = Types::WorkGroupSummary
+
+    WorkGroupsList.member = Shapes::ShapeRef.new(shape: WorkGroupSummary)
+
     datumList.member = Shapes::ShapeRef.new(shape: Datum)
 
 
@@ -303,6 +400,16 @@ module Aws::Athena
         o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
       end)
 
+      api.add_operation(:create_work_group, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateWorkGroup"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateWorkGroupInput)
+        o.output = Shapes::ShapeRef.new(shape: CreateWorkGroupOutput)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
+      end)
+
       api.add_operation(:delete_named_query, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteNamedQuery"
         o.http_method = "POST"
@@ -313,6 +420,16 @@ module Aws::Athena
         o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
       end)
 
+      api.add_operation(:delete_work_group, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteWorkGroup"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteWorkGroupInput)
+        o.output = Shapes::ShapeRef.new(shape: DeleteWorkGroupOutput)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
+      end)
+
       api.add_operation(:get_named_query, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetNamedQuery"
         o.http_method = "POST"
@@ -349,6 +466,16 @@ module Aws::Athena
         )
       end)
 
+      api.add_operation(:get_work_group, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetWorkGroup"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetWorkGroupInput)
+        o.output = Shapes::ShapeRef.new(shape: GetWorkGroupOutput)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
+      end)
+
       api.add_operation(:list_named_queries, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListNamedQueries"
         o.http_method = "POST"
@@ -381,6 +508,22 @@ module Aws::Athena
         )
       end)
 
+      api.add_operation(:list_work_groups, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListWorkGroups"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ListWorkGroupsInput)
+        o.output = Shapes::ShapeRef.new(shape: ListWorkGroupsOutput)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:start_query_execution, Seahorse::Model::Operation.new.tap do |o|
         o.name = "StartQueryExecution"
         o.http_method = "POST"
@@ -401,6 +544,16 @@ module Aws::Athena
         o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
       end)
+
+      api.add_operation(:update_work_group, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "UpdateWorkGroup"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: UpdateWorkGroupInput)
+        o.output = Shapes::ShapeRef.new(shape: UpdateWorkGroupOutput)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidRequestException)
+      end)
     end
 
   end

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

@@ -145,14 +145,15 @@ module Aws::Athena
     #         database: "DatabaseString", # required
     #         query_string: "QueryString", # required
     #         client_request_token: "IdempotencyToken",
+    #         work_group: "WorkGroupName",
     #       }
     #
     # @!attribute [rw] name
-    #   The plain language name for the query.
+    #   The query name.
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A brief explanation of the query.
+    #   The query description.
     #   @return [String]
     #
     # @!attribute [rw] database
@@ -160,7 +161,7 @@ module Aws::Athena
     #   @return [String]
     #
     # @!attribute [rw] query_string
-    #   The text of the query itself. In other words, all query statements.
+    #   The contents of the query with all query statements.
     #   @return [String]
     #
     # @!attribute [rw] client_request_token
@@ -179,6 +180,10 @@ module Aws::Athena
     #   not need to pass this option.
     #   @return [String]
     #
+    # @!attribute [rw] work_group
+    #   The name of the workgroup in which the named query is being created.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CreateNamedQueryInput AWS API Documentation
     #
     class CreateNamedQueryInput < Struct.new(
@@ -186,7 +191,8 @@ module Aws::Athena
       :description,
       :database,
       :query_string,
-      :client_request_token)
+      :client_request_token,
+      :work_group)
       include Aws::Structure
     end
 
@@ -201,6 +207,59 @@ module Aws::Athena
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass CreateWorkGroupInput
+    #   data as a hash:
+    #
+    #       {
+    #         name: "WorkGroupName", # required
+    #         configuration: {
+    #           result_configuration: {
+    #             output_location: "String",
+    #             encryption_configuration: {
+    #               encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
+    #               kms_key: "String",
+    #             },
+    #           },
+    #           enforce_work_group_configuration: false,
+    #           publish_cloud_watch_metrics_enabled: false,
+    #           bytes_scanned_cutoff_per_query: 1,
+    #         },
+    #         description: "WorkGroupDescriptionString",
+    #       }
+    #
+    # @!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
+    #   WorkGroupConfiguration$EnforceWorkGroupConfiguration.
+    #   @return [Types::WorkGroupConfiguration]
+    #
+    # @!attribute [rw] description
+    #   The workgroup description.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CreateWorkGroupInput AWS API Documentation
+    #
+    class CreateWorkGroupInput < Struct.new(
+      :name,
+      :configuration,
+      :description)
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/CreateWorkGroupOutput AWS API Documentation
+    #
+    class CreateWorkGroupOutput < Aws::EmptyStructure; end
+
     # A piece of data (a field in the table).
     #
     # @!attribute [rw] var_char_value
@@ -239,6 +298,35 @@ module Aws::Athena
     #
     class DeleteNamedQueryOutput < 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]
+    #
+    # @!attribute [rw] recursive_delete_option
+    #   The option to delete the workgroup and its contents even if the
+    #   workgroup contains any named queries.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/DeleteWorkGroupInput AWS API Documentation
+    #
+    class DeleteWorkGroupInput < Struct.new(
+      :work_group,
+      :recursive_delete_option)
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/DeleteWorkGroupOutput AWS API Documentation
+    #
+    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.
     #
@@ -255,6 +343,11 @@ module Aws::Athena
     #   S3-managed keys (`SSE-S3`), server-side encryption with KMS-managed
     #   keys (`SSE-KMS`), or client-side encryption with KMS-managed keys
     #   (CSE-KMS) is used.
+    #
+    #   If a query runs in a workgroup and the workgroup overrides
+    #   client-side settings, then the workgroup's setting for encryption
+    #   is used. It specifies whether query results must be encrypted, for
+    #   all queries that run in this workgroup.
     #   @return [String]
     #
     # @!attribute [rw] kms_key
@@ -379,12 +472,42 @@ 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]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetWorkGroupInput AWS API Documentation
+    #
+    class GetWorkGroupInput < Struct.new(
+      :work_group)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] work_group
+    #   Information about the workgroup.
+    #   @return [Types::WorkGroup]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/GetWorkGroupOutput AWS API Documentation
+    #
+    class GetWorkGroupOutput < Struct.new(
+      :work_group)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ListNamedQueriesInput
     #   data as a hash:
     #
     #       {
     #         next_token: "Token",
     #         max_results: 1,
+    #         work_group: "WorkGroupName",
     #       }
     #
     # @!attribute [rw] next_token
@@ -396,11 +519,17 @@ module Aws::Athena
     #   The maximum number of queries to return in this request.
     #   @return [Integer]
     #
+    # @!attribute [rw] work_group
+    #   The name of the workgroup from which the named queries are being
+    #   returned.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListNamedQueriesInput AWS API Documentation
     #
     class ListNamedQueriesInput < Struct.new(
       :next_token,
-      :max_results)
+      :max_results,
+      :work_group)
       include Aws::Structure
     end
 
@@ -426,6 +555,7 @@ module Aws::Athena
     #       {
     #         next_token: "Token",
     #         max_results: 1,
+    #         work_group: "WorkGroupName",
     #       }
     #
     # @!attribute [rw] next_token
@@ -437,11 +567,16 @@ module Aws::Athena
     #   The maximum number of query executions to return in this request.
     #   @return [Integer]
     #
+    # @!attribute [rw] work_group
+    #   The name of the workgroup from which queries are being returned.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListQueryExecutionsInput AWS API Documentation
     #
     class ListQueryExecutionsInput < Struct.new(
       :next_token,
-      :max_results)
+      :max_results,
+      :work_group)
       include Aws::Structure
     end
 
@@ -461,15 +596,56 @@ module Aws::Athena
       include Aws::Structure
     end
 
-    # A query, where `QueryString` is the SQL query statements that comprise
-    # the query.
+    # @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 to be used by the next request if this request is truncated.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of workgroups to return in this request.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListWorkGroupsInput AWS API Documentation
+    #
+    class ListWorkGroupsInput < Struct.new(
+      :next_token,
+      :max_results)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] work_groups
+    #   The list of workgroups, including their names, descriptions,
+    #   creation times, and states.
+    #   @return [Array<Types::WorkGroupSummary>]
+    #
+    # @!attribute [rw] next_token
+    #   A token to be used by the next request if this request is truncated.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ListWorkGroupsOutput AWS API Documentation
+    #
+    class ListWorkGroupsOutput < Struct.new(
+      :work_groups,
+      :next_token)
+      include Aws::Structure
+    end
+
+    # A query, where `QueryString` is the list of SQL query statements that
+    # comprise the query.
     #
     # @!attribute [rw] name
-    #   The plain-language name of the query.
+    #   The query name.
     #   @return [String]
     #
     # @!attribute [rw] description
-    #   A brief description of the query.
+    #   The query description.
     #   @return [String]
     #
     # @!attribute [rw] database
@@ -484,6 +660,10 @@ module Aws::Athena
     #   The unique identifier of the query.
     #   @return [String]
     #
+    # @!attribute [rw] work_group
+    #   The name of the workgroup that contains the named query.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/NamedQuery AWS API Documentation
     #
     class NamedQuery < Struct.new(
@@ -491,7 +671,8 @@ module Aws::Athena
       :description,
       :database,
       :query_string,
-      :named_query_id)
+      :named_query_id,
+      :work_group)
       include Aws::Structure
     end
 
@@ -515,7 +696,11 @@ module Aws::Athena
     #
     # @!attribute [rw] result_configuration
     #   The location in Amazon S3 where query results were stored and the
-    #   encryption option, if any, used for query results.
+    #   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] query_execution_context
@@ -533,6 +718,10 @@ module Aws::Athena
     #   run.
     #   @return [Types::QueryExecutionStatistics]
     #
+    # @!attribute [rw] work_group
+    #   The name of the workgroup in which the query ran.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/QueryExecution AWS API Documentation
     #
     class QueryExecution < Struct.new(
@@ -542,7 +731,8 @@ module Aws::Athena
       :result_configuration,
       :query_execution_context,
       :status,
-      :statistics)
+      :statistics,
+      :work_group)
       include Aws::Structure
     end
 
@@ -594,10 +784,10 @@ module Aws::Athena
     #   used by Athena and is reserved for future use. `RUNNING` indicates
     #   that the query has been submitted to the service, and Athena will
     #   execute the query as soon as resources are available. `SUCCEEDED`
-    #   indicates that the query completed without error. `FAILED` indicates
-    #   that the query experienced an error and did not complete
-    #   processing.`CANCELLED` indicates that user input interrupted query
-    #   execution.
+    #   indicates that the query completed without errors. `FAILED`
+    #   indicates that the query experienced an error and did not complete
+    #   processing. `CANCELLED` indicates that a user input interrupted
+    #   query execution.
     #   @return [String]
     #
     # @!attribute [rw] state_change_reason
@@ -623,13 +813,16 @@ module Aws::Athena
     end
 
     # The location in Amazon S3 where query results are stored and the
-    # encryption option, if any, used for query results.
+    # 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.
     #
     # @note When making an API call, you may pass ResultConfiguration
     #   data as a hash:
     #
     #       {
-    #         output_location: "String", # required
+    #         output_location: "String",
     #         encryption_configuration: {
     #           encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
     #           kms_key: "String",
@@ -639,17 +832,32 @@ module Aws::Athena
     # @!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 [Queries
-    #   and Query Result Files. ][1]
+    #   and Query Result 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.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/athena/latest/ug/querying.html
+    #   [1]: https://docs.aws.amazon.com/athena/latest/ug/querying.html
     #   @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.
+    #   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].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html
     #   @return [Types::EncryptionConfiguration]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/ResultConfiguration AWS API Documentation
@@ -660,6 +868,83 @@ module Aws::Athena
       include Aws::Structure
     end
 
+    # 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: "String",
+    #         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,
+    #       }
+    #
+    # @!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 [Queries
+    #   and Query Result 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.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/athena/latest/ug/querying.html
+    #   @return [String]
+    #
+    # @!attribute [rw] remove_output_location
+    #   If set to "true", indicates that the previously-specified query
+    #   results location (also known as a client-side setting) for queries
+    #   in this workgroup should be ignored and set to null. If set to
+    #   "false" or not set, and a value is present in the OutputLocation
+    #   in ResultConfigurationUpdates (the client-side setting), the
+    #   OutputLocation in the workgroup's ResultConfiguration will be
+    #   updated with the new value. For more information, see [Workgroup
+    #   Settings Override Client-Side Settings][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] encryption_configuration
+    #   The encryption configuration for the query results.
+    #   @return [Types::EncryptionConfiguration]
+    #
+    # @!attribute [rw] remove_encryption_configuration
+    #   If set to "true", indicates that the previously-specified
+    #   encryption configuration (also known as the client-side setting) for
+    #   queries in this workgroup should be ignored and set to null. If set
+    #   to "false" or not set, and a value is present in the
+    #   EncryptionConfiguration in ResultConfigurationUpdates (the
+    #   client-side setting), the EncryptionConfiguration in the
+    #   workgroup's ResultConfiguration will be updated with the new value.
+    #   For more information, see [Workgroup Settings Override Client-Side
+    #   Settings][1].
+    #
+    #
+    #
+    #   [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)
+      include Aws::Structure
+    end
+
     # The metadata and rows that comprise a query result set. The metadata
     # describes the column structure and data types.
     #
@@ -716,13 +1001,14 @@ module Aws::Athena
     #         query_execution_context: {
     #           database: "DatabaseString",
     #         },
-    #         result_configuration: { # required
-    #           output_location: "String", # required
+    #         result_configuration: {
+    #           output_location: "String",
     #           encryption_configuration: {
     #             encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
     #             kms_key: "String",
     #           },
     #         },
+    #         work_group: "WorkGroupName",
     #       }
     #
     # @!attribute [rw] query_string
@@ -751,16 +1037,26 @@ module Aws::Athena
     #
     # @!attribute [rw] result_configuration
     #   Specifies information about where and how to save the results of the
-    #   query execution.
+    #   query execution. If the query runs in a workgroup, then workgroup's
+    #   settings may override query settings. This affects the query results
+    #   location. The workgroup settings override is specified in
+    #   EnforceWorkGroupConfiguration (true/false) in the
+    #   WorkGroupConfiguration. See
+    #   WorkGroupConfiguration$EnforceWorkGroupConfiguration.
     #   @return [Types::ResultConfiguration]
     #
+    # @!attribute [rw] work_group
+    #   The name of the workgroup in which the query is being started.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/StartQueryExecutionInput AWS API Documentation
     #
     class StartQueryExecutionInput < Struct.new(
       :query_string,
       :client_request_token,
       :query_execution_context,
-      :result_configuration)
+      :result_configuration,
+      :work_group)
       include Aws::Structure
     end
 
@@ -850,5 +1146,274 @@ module Aws::Athena
       include Aws::Structure
     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: "String",
+    #             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,
+    #           },
+    #           publish_cloud_watch_metrics_enabled: false,
+    #           bytes_scanned_cutoff_per_query: 1,
+    #           remove_bytes_scanned_cutoff_per_query: false,
+    #         },
+    #         state: "ENABLED", # accepts ENABLED, DISABLED
+    #       }
+    #
+    # @!attribute [rw] work_group
+    #   The specified workgroup that will be updated.
+    #   @return [String]
+    #
+    # @!attribute [rw] description
+    #   The workgroup description.
+    #   @return [String]
+    #
+    # @!attribute [rw] configuration_updates
+    #   The workgroup configuration that will be updated for the given
+    #   workgroup.
+    #   @return [Types::WorkGroupConfigurationUpdates]
+    #
+    # @!attribute [rw] state
+    #   The workgroup state that will be updated for the given workgroup.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/UpdateWorkGroupInput AWS API Documentation
+    #
+    class UpdateWorkGroupInput < Struct.new(
+      :work_group,
+      :description,
+      :configuration_updates,
+      :state)
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/UpdateWorkGroupOutput AWS API Documentation
+    #
+    class UpdateWorkGroupOutput < Aws::EmptyStructure; end
+
+    # A workgroup, which contains a name, description, creation time, state,
+    # and other configuration, listed under WorkGroup$Configuration. Each
+    # workgroup enables you to isolate queries for you or your group of
+    # users from other queries in the same account, to configure the query
+    # results location and the encryption configuration (known as workgroup
+    # settings), to enable sending query metrics to Amazon CloudWatch, and
+    # to establish per-query data usage control limits for all queries in a
+    # workgroup. The workgroup settings override is specified in
+    # EnforceWorkGroupConfiguration (true/false) in the
+    # WorkGroupConfiguration. See
+    # WorkGroupConfiguration$EnforceWorkGroupConfiguration.
+    #
+    # @!attribute [rw] name
+    #   The workgroup name.
+    #   @return [String]
+    #
+    # @!attribute [rw] state
+    #   The state of the workgroup: ENABLED or DISABLED.
+    #   @return [String]
+    #
+    # @!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 limit for
+    #   the amount of data scanned per query, if it is specified. The
+    #   workgroup settings override is specified in
+    #   EnforceWorkGroupConfiguration (true/false) in the
+    #   WorkGroupConfiguration. See
+    #   WorkGroupConfiguration$EnforceWorkGroupConfiguration.
+    #   @return [Types::WorkGroupConfiguration]
+    #
+    # @!attribute [rw] description
+    #   The workgroup description.
+    #   @return [String]
+    #
+    # @!attribute [rw] creation_time
+    #   The date and time the workgroup was created.
+    #   @return [Time]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/WorkGroup AWS API Documentation
+    #
+    class WorkGroup < Struct.new(
+      :name,
+      :state,
+      :configuration,
+      :description,
+      :creation_time)
+      include Aws::Structure
+    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 limit for the amount of data
+    # scanned per query, if it is specified. The workgroup settings override
+    # is specified in EnforceWorkGroupConfiguration (true/false) in the
+    # WorkGroupConfiguration. See
+    # WorkGroupConfiguration$EnforceWorkGroupConfiguration.
+    #
+    # @note When making an API call, you may pass WorkGroupConfiguration
+    #   data as a hash:
+    #
+    #       {
+    #         result_configuration: {
+    #           output_location: "String",
+    #           encryption_configuration: {
+    #             encryption_option: "SSE_S3", # required, accepts SSE_S3, SSE_KMS, CSE_KMS
+    #             kms_key: "String",
+    #           },
+    #         },
+    #         enforce_work_group_configuration: false,
+    #         publish_cloud_watch_metrics_enabled: false,
+    #         bytes_scanned_cutoff_per_query: 1,
+    #       }
+    #
+    # @!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.
+    #   @return [Types::ResultConfiguration]
+    #
+    # @!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
+    #   used. For more information, see [Workgroup Settings Override
+    #   Client-Side Settings][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] publish_cloud_watch_metrics_enabled
+    #   Indicates that the Amazon CloudWatch metrics are enabled for the
+    #   workgroup.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] bytes_scanned_cutoff_per_query
+    #   The upper data usage limit (cutoff) for the amount of bytes a single
+    #   query in a workgroup is allowed to scan.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/WorkGroupConfiguration AWS API Documentation
+    #
+    class WorkGroupConfiguration < Struct.new(
+      :result_configuration,
+      :enforce_work_group_configuration,
+      :publish_cloud_watch_metrics_enabled,
+      :bytes_scanned_cutoff_per_query)
+      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.
+    #
+    # @note When making an API call, you may pass WorkGroupConfigurationUpdates
+    #   data as a hash:
+    #
+    #       {
+    #         enforce_work_group_configuration: false,
+    #         result_configuration_updates: {
+    #           output_location: "String",
+    #           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,
+    #         },
+    #         publish_cloud_watch_metrics_enabled: false,
+    #         bytes_scanned_cutoff_per_query: 1,
+    #         remove_bytes_scanned_cutoff_per_query: false,
+    #       }
+    #
+    # @!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
+    #   used. For more information, see [Workgroup Settings Override
+    #   Client-Side Settings][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] result_configuration_updates
+    #   The result configuration information about the queries in this
+    #   workgroup that will be updated. Includes the updated results
+    #   location and an updated option for encrypting query results.
+    #   @return [Types::ResultConfigurationUpdates]
+    #
+    # @!attribute [rw] publish_cloud_watch_metrics_enabled
+    #   Indicates whether this workgroup enables publishing metrics to
+    #   Amazon CloudWatch.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] bytes_scanned_cutoff_per_query
+    #   The upper limit (cutoff) for the amount of bytes a single query in a
+    #   workgroup is allowed to scan.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] remove_bytes_scanned_cutoff_per_query
+    #   Indicates that the data usage control limit per query is removed.
+    #   WorkGroupConfiguration$BytesScannedCutoffPerQuery
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/WorkGroupConfigurationUpdates AWS API Documentation
+    #
+    class WorkGroupConfigurationUpdates < Struct.new(
+      :enforce_work_group_configuration,
+      :result_configuration_updates,
+      :publish_cloud_watch_metrics_enabled,
+      :bytes_scanned_cutoff_per_query,
+      :remove_bytes_scanned_cutoff_per_query)
+      include Aws::Structure
+    end
+
+    # The summary information for the workgroup, which includes its name,
+    # state, description, and the date and time it was created.
+    #
+    # @!attribute [rw] name
+    #   The name of the workgroup.
+    #   @return [String]
+    #
+    # @!attribute [rw] state
+    #   The state of the workgroup.
+    #   @return [String]
+    #
+    # @!attribute [rw] description
+    #   The workgroup description.
+    #   @return [String]
+    #
+    # @!attribute [rw] creation_time
+    #   The workgroup creation date and time.
+    #   @return [Time]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/WorkGroupSummary AWS API Documentation
+    #
+    class WorkGroupSummary < Struct.new(
+      :name,
+      :state,
+      :description,
+      :creation_time)
+      include Aws::Structure
+    end
+
   end
 end