aws-sdk-redshift 1.64.0 → 1.65.0

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

@@ -30,6 +30,12 @@ module Aws::Redshift
     AttributeNameList = Shapes::ListShape.new(name: 'AttributeNameList')
     AttributeValueList = Shapes::ListShape.new(name: 'AttributeValueList')
     AttributeValueTarget = Shapes::StructureShape.new(name: 'AttributeValueTarget')
+    AuthenticationProfile = Shapes::StructureShape.new(name: 'AuthenticationProfile')
+    AuthenticationProfileAlreadyExistsFault = Shapes::StructureShape.new(name: 'AuthenticationProfileAlreadyExistsFault')
+    AuthenticationProfileList = Shapes::ListShape.new(name: 'AuthenticationProfileList')
+    AuthenticationProfileNameString = Shapes::StringShape.new(name: 'AuthenticationProfileNameString')
+    AuthenticationProfileNotFoundFault = Shapes::StructureShape.new(name: 'AuthenticationProfileNotFoundFault')
+    AuthenticationProfileQuotaExceededFault = Shapes::StructureShape.new(name: 'AuthenticationProfileQuotaExceededFault')
     AuthorizationAlreadyExistsFault = Shapes::StructureShape.new(name: 'AuthorizationAlreadyExistsFault')
     AuthorizationNotFoundFault = Shapes::StructureShape.new(name: 'AuthorizationNotFoundFault')
     AuthorizationQuotaExceededFault = Shapes::StructureShape.new(name: 'AuthorizationQuotaExceededFault')
@@ -106,6 +112,8 @@ module Aws::Redshift
     CopyClusterSnapshotMessage = Shapes::StructureShape.new(name: 'CopyClusterSnapshotMessage')
     CopyClusterSnapshotResult = Shapes::StructureShape.new(name: 'CopyClusterSnapshotResult')
     CopyToRegionDisabledFault = Shapes::StructureShape.new(name: 'CopyToRegionDisabledFault')
+    CreateAuthenticationProfileMessage = Shapes::StructureShape.new(name: 'CreateAuthenticationProfileMessage')
+    CreateAuthenticationProfileResult = Shapes::StructureShape.new(name: 'CreateAuthenticationProfileResult')
     CreateClusterMessage = Shapes::StructureShape.new(name: 'CreateClusterMessage')
     CreateClusterParameterGroupMessage = Shapes::StructureShape.new(name: 'CreateClusterParameterGroupMessage')
     CreateClusterParameterGroupResult = Shapes::StructureShape.new(name: 'CreateClusterParameterGroupResult')
@@ -135,6 +143,8 @@ module Aws::Redshift
     DefaultClusterParameters = Shapes::StructureShape.new(name: 'DefaultClusterParameters')
     DeferredMaintenanceWindow = Shapes::StructureShape.new(name: 'DeferredMaintenanceWindow')
     DeferredMaintenanceWindowsList = Shapes::ListShape.new(name: 'DeferredMaintenanceWindowsList')
+    DeleteAuthenticationProfileMessage = Shapes::StructureShape.new(name: 'DeleteAuthenticationProfileMessage')
+    DeleteAuthenticationProfileResult = Shapes::StructureShape.new(name: 'DeleteAuthenticationProfileResult')
     DeleteClusterMessage = Shapes::StructureShape.new(name: 'DeleteClusterMessage')
     DeleteClusterParameterGroupMessage = Shapes::StructureShape.new(name: 'DeleteClusterParameterGroupMessage')
     DeleteClusterResult = Shapes::StructureShape.new(name: 'DeleteClusterResult')
@@ -155,6 +165,8 @@ module Aws::Redshift
     DependentServiceRequestThrottlingFault = Shapes::StructureShape.new(name: 'DependentServiceRequestThrottlingFault')
     DependentServiceUnavailableFault = Shapes::StructureShape.new(name: 'DependentServiceUnavailableFault')
     DescribeAccountAttributesMessage = Shapes::StructureShape.new(name: 'DescribeAccountAttributesMessage')
+    DescribeAuthenticationProfilesMessage = Shapes::StructureShape.new(name: 'DescribeAuthenticationProfilesMessage')
+    DescribeAuthenticationProfilesResult = Shapes::StructureShape.new(name: 'DescribeAuthenticationProfilesResult')
     DescribeClusterDbRevisionsMessage = Shapes::StructureShape.new(name: 'DescribeClusterDbRevisionsMessage')
     DescribeClusterParameterGroupsMessage = Shapes::StructureShape.new(name: 'DescribeClusterParameterGroupsMessage')
     DescribeClusterParametersMessage = Shapes::StructureShape.new(name: 'DescribeClusterParametersMessage')
@@ -255,6 +267,7 @@ module Aws::Redshift
     InsufficientS3BucketPolicyFault = Shapes::StructureShape.new(name: 'InsufficientS3BucketPolicyFault')
     Integer = Shapes::IntegerShape.new(name: 'Integer')
     IntegerOptional = Shapes::IntegerShape.new(name: 'IntegerOptional')
+    InvalidAuthenticationProfileRequestFault = Shapes::StructureShape.new(name: 'InvalidAuthenticationProfileRequestFault')
     InvalidAuthorizationStateFault = Shapes::StructureShape.new(name: 'InvalidAuthorizationStateFault')
     InvalidClusterParameterGroupStateFault = Shapes::StructureShape.new(name: 'InvalidClusterParameterGroupStateFault')
     InvalidClusterSecurityGroupStateFault = Shapes::StructureShape.new(name: 'InvalidClusterSecurityGroupStateFault')
@@ -290,6 +303,8 @@ module Aws::Redshift
     Mode = Shapes::StringShape.new(name: 'Mode')
     ModifyAquaInputMessage = Shapes::StructureShape.new(name: 'ModifyAquaInputMessage')
     ModifyAquaOutputMessage = Shapes::StructureShape.new(name: 'ModifyAquaOutputMessage')
+    ModifyAuthenticationProfileMessage = Shapes::StructureShape.new(name: 'ModifyAuthenticationProfileMessage')
+    ModifyAuthenticationProfileResult = Shapes::StructureShape.new(name: 'ModifyAuthenticationProfileResult')
     ModifyClusterDbRevisionMessage = Shapes::StructureShape.new(name: 'ModifyClusterDbRevisionMessage')
     ModifyClusterDbRevisionResult = Shapes::StructureShape.new(name: 'ModifyClusterDbRevisionResult')
     ModifyClusterIamRolesMessage = Shapes::StructureShape.new(name: 'ModifyClusterIamRolesMessage')
@@ -530,6 +545,18 @@ module Aws::Redshift
     AttributeValueTarget.add_member(:attribute_value, Shapes::ShapeRef.new(shape: String, location_name: "AttributeValue"))
     AttributeValueTarget.struct_class = Types::AttributeValueTarget
 
+    AuthenticationProfile.add_member(:authentication_profile_name, Shapes::ShapeRef.new(shape: AuthenticationProfileNameString, location_name: "AuthenticationProfileName"))
+    AuthenticationProfile.add_member(:authentication_profile_content, Shapes::ShapeRef.new(shape: String, location_name: "AuthenticationProfileContent"))
+    AuthenticationProfile.struct_class = Types::AuthenticationProfile
+
+    AuthenticationProfileAlreadyExistsFault.struct_class = Types::AuthenticationProfileAlreadyExistsFault
+
+    AuthenticationProfileList.member = Shapes::ShapeRef.new(shape: AuthenticationProfile)
+
+    AuthenticationProfileNotFoundFault.struct_class = Types::AuthenticationProfileNotFoundFault
+
+    AuthenticationProfileQuotaExceededFault.struct_class = Types::AuthenticationProfileQuotaExceededFault
+
     AuthorizationAlreadyExistsFault.struct_class = Types::AuthorizationAlreadyExistsFault
 
     AuthorizationNotFoundFault.struct_class = Types::AuthorizationNotFoundFault
@@ -814,6 +841,14 @@ module Aws::Redshift
 
     CopyToRegionDisabledFault.struct_class = Types::CopyToRegionDisabledFault
 
+    CreateAuthenticationProfileMessage.add_member(:authentication_profile_name, Shapes::ShapeRef.new(shape: AuthenticationProfileNameString, required: true, location_name: "AuthenticationProfileName"))
+    CreateAuthenticationProfileMessage.add_member(:authentication_profile_content, Shapes::ShapeRef.new(shape: String, required: true, location_name: "AuthenticationProfileContent"))
+    CreateAuthenticationProfileMessage.struct_class = Types::CreateAuthenticationProfileMessage
+
+    CreateAuthenticationProfileResult.add_member(:authentication_profile_name, Shapes::ShapeRef.new(shape: AuthenticationProfileNameString, location_name: "AuthenticationProfileName"))
+    CreateAuthenticationProfileResult.add_member(:authentication_profile_content, Shapes::ShapeRef.new(shape: String, location_name: "AuthenticationProfileContent"))
+    CreateAuthenticationProfileResult.struct_class = Types::CreateAuthenticationProfileResult
+
     CreateClusterMessage.add_member(:db_name, Shapes::ShapeRef.new(shape: String, location_name: "DBName"))
     CreateClusterMessage.add_member(:cluster_identifier, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ClusterIdentifier"))
     CreateClusterMessage.add_member(:cluster_type, Shapes::ShapeRef.new(shape: String, location_name: "ClusterType"))
@@ -990,6 +1025,12 @@ module Aws::Redshift
 
     DeferredMaintenanceWindowsList.member = Shapes::ShapeRef.new(shape: DeferredMaintenanceWindow, location_name: "DeferredMaintenanceWindow")
 
+    DeleteAuthenticationProfileMessage.add_member(:authentication_profile_name, Shapes::ShapeRef.new(shape: AuthenticationProfileNameString, required: true, location_name: "AuthenticationProfileName"))
+    DeleteAuthenticationProfileMessage.struct_class = Types::DeleteAuthenticationProfileMessage
+
+    DeleteAuthenticationProfileResult.add_member(:authentication_profile_name, Shapes::ShapeRef.new(shape: AuthenticationProfileNameString, location_name: "AuthenticationProfileName"))
+    DeleteAuthenticationProfileResult.struct_class = Types::DeleteAuthenticationProfileResult
+
     DeleteClusterMessage.add_member(:cluster_identifier, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ClusterIdentifier"))
     DeleteClusterMessage.add_member(:skip_final_cluster_snapshot, Shapes::ShapeRef.new(shape: Boolean, location_name: "SkipFinalClusterSnapshot"))
     DeleteClusterMessage.add_member(:final_cluster_snapshot_identifier, Shapes::ShapeRef.new(shape: String, location_name: "FinalClusterSnapshotIdentifier"))
@@ -1052,6 +1093,12 @@ module Aws::Redshift
     DescribeAccountAttributesMessage.add_member(:attribute_names, Shapes::ShapeRef.new(shape: AttributeNameList, location_name: "AttributeNames"))
     DescribeAccountAttributesMessage.struct_class = Types::DescribeAccountAttributesMessage
 
+    DescribeAuthenticationProfilesMessage.add_member(:authentication_profile_name, Shapes::ShapeRef.new(shape: AuthenticationProfileNameString, location_name: "AuthenticationProfileName"))
+    DescribeAuthenticationProfilesMessage.struct_class = Types::DescribeAuthenticationProfilesMessage
+
+    DescribeAuthenticationProfilesResult.add_member(:authentication_profiles, Shapes::ShapeRef.new(shape: AuthenticationProfileList, location_name: "AuthenticationProfiles"))
+    DescribeAuthenticationProfilesResult.struct_class = Types::DescribeAuthenticationProfilesResult
+
     DescribeClusterDbRevisionsMessage.add_member(:cluster_identifier, Shapes::ShapeRef.new(shape: String, location_name: "ClusterIdentifier"))
     DescribeClusterDbRevisionsMessage.add_member(:max_records, Shapes::ShapeRef.new(shape: IntegerOptional, location_name: "MaxRecords"))
     DescribeClusterDbRevisionsMessage.add_member(:marker, Shapes::ShapeRef.new(shape: String, location_name: "Marker"))
@@ -1492,6 +1539,8 @@ module Aws::Redshift
 
     InsufficientS3BucketPolicyFault.struct_class = Types::InsufficientS3BucketPolicyFault
 
+    InvalidAuthenticationProfileRequestFault.struct_class = Types::InvalidAuthenticationProfileRequestFault
+
     InvalidAuthorizationStateFault.struct_class = Types::InvalidAuthorizationStateFault
 
     InvalidClusterParameterGroupStateFault.struct_class = Types::InvalidClusterParameterGroupStateFault
@@ -1568,6 +1617,14 @@ module Aws::Redshift
     ModifyAquaOutputMessage.add_member(:aqua_configuration, Shapes::ShapeRef.new(shape: AquaConfiguration, location_name: "AquaConfiguration"))
     ModifyAquaOutputMessage.struct_class = Types::ModifyAquaOutputMessage
 
+    ModifyAuthenticationProfileMessage.add_member(:authentication_profile_name, Shapes::ShapeRef.new(shape: AuthenticationProfileNameString, required: true, location_name: "AuthenticationProfileName"))
+    ModifyAuthenticationProfileMessage.add_member(:authentication_profile_content, Shapes::ShapeRef.new(shape: String, required: true, location_name: "AuthenticationProfileContent"))
+    ModifyAuthenticationProfileMessage.struct_class = Types::ModifyAuthenticationProfileMessage
+
+    ModifyAuthenticationProfileResult.add_member(:authentication_profile_name, Shapes::ShapeRef.new(shape: AuthenticationProfileNameString, location_name: "AuthenticationProfileName"))
+    ModifyAuthenticationProfileResult.add_member(:authentication_profile_content, Shapes::ShapeRef.new(shape: String, location_name: "AuthenticationProfileContent"))
+    ModifyAuthenticationProfileResult.struct_class = Types::ModifyAuthenticationProfileResult
+
     ModifyClusterDbRevisionMessage.add_member(:cluster_identifier, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ClusterIdentifier"))
     ModifyClusterDbRevisionMessage.add_member(:revision_target, Shapes::ShapeRef.new(shape: String, required: true, location_name: "RevisionTarget"))
     ModifyClusterDbRevisionMessage.struct_class = Types::ModifyClusterDbRevisionMessage
@@ -2427,6 +2484,17 @@ module Aws::Redshift
         o.errors << Shapes::ShapeRef.new(shape: InvalidRetentionPeriodFault)
       end)
 
+      api.add_operation(:create_authentication_profile, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateAuthenticationProfile"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateAuthenticationProfileMessage)
+        o.output = Shapes::ShapeRef.new(shape: CreateAuthenticationProfileResult)
+        o.errors << Shapes::ShapeRef.new(shape: AuthenticationProfileAlreadyExistsFault)
+        o.errors << Shapes::ShapeRef.new(shape: AuthenticationProfileQuotaExceededFault)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidAuthenticationProfileRequestFault)
+      end)
+
       api.add_operation(:create_cluster, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateCluster"
         o.http_method = "POST"
@@ -2642,6 +2710,16 @@ module Aws::Redshift
         o.errors << Shapes::ShapeRef.new(shape: UnsupportedOperationFault)
       end)
 
+      api.add_operation(:delete_authentication_profile, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteAuthenticationProfile"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteAuthenticationProfileMessage)
+        o.output = Shapes::ShapeRef.new(shape: DeleteAuthenticationProfileResult)
+        o.errors << Shapes::ShapeRef.new(shape: AuthenticationProfileNotFoundFault)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidAuthenticationProfileRequestFault)
+      end)
+
       api.add_operation(:delete_cluster, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteCluster"
         o.http_method = "POST"
@@ -2808,6 +2886,16 @@ module Aws::Redshift
         o.output = Shapes::ShapeRef.new(shape: AccountAttributeList)
       end)
 
+      api.add_operation(:describe_authentication_profiles, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeAuthenticationProfiles"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeAuthenticationProfilesMessage)
+        o.output = Shapes::ShapeRef.new(shape: DescribeAuthenticationProfilesResult)
+        o.errors << Shapes::ShapeRef.new(shape: AuthenticationProfileNotFoundFault)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidAuthenticationProfileRequestFault)
+      end)
+
       api.add_operation(:describe_cluster_db_revisions, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeClusterDbRevisions"
         o.http_method = "POST"
@@ -3359,6 +3447,17 @@ module Aws::Redshift
         o.errors << Shapes::ShapeRef.new(shape: UnsupportedOperationFault)
       end)
 
+      api.add_operation(:modify_authentication_profile, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyAuthenticationProfile"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyAuthenticationProfileMessage)
+        o.output = Shapes::ShapeRef.new(shape: ModifyAuthenticationProfileResult)
+        o.errors << Shapes::ShapeRef.new(shape: AuthenticationProfileNotFoundFault)
+        o.errors << Shapes::ShapeRef.new(shape: AuthenticationProfileQuotaExceededFault)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidAuthenticationProfileRequestFault)
+      end)
+
       api.add_operation(:modify_cluster, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifyCluster"
         o.http_method = "POST"

data/lib/aws-sdk-redshift/errors.rb

@@ -29,6 +29,9 @@ module Aws::Redshift
   # ## Error Classes
   # * {AccessToClusterDeniedFault}
   # * {AccessToSnapshotDeniedFault}
+  # * {AuthenticationProfileAlreadyExistsFault}
+  # * {AuthenticationProfileNotFoundFault}
+  # * {AuthenticationProfileQuotaExceededFault}
   # * {AuthorizationAlreadyExistsFault}
   # * {AuthorizationNotFoundFault}
   # * {AuthorizationQuotaExceededFault}
@@ -73,6 +76,7 @@ module Aws::Redshift
   # * {IncompatibleOrderableOptions}
   # * {InsufficientClusterCapacityFault}
   # * {InsufficientS3BucketPolicyFault}
+  # * {InvalidAuthenticationProfileRequestFault}
   # * {InvalidAuthorizationStateFault}
   # * {InvalidClusterParameterGroupStateFault}
   # * {InvalidClusterSecurityGroupStateFault}
@@ -173,6 +177,36 @@ module Aws::Redshift
       end
     end
 
+    class AuthenticationProfileAlreadyExistsFault < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::Redshift::Types::AuthenticationProfileAlreadyExistsFault] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
+    class AuthenticationProfileNotFoundFault < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::Redshift::Types::AuthenticationProfileNotFoundFault] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
+    class AuthenticationProfileQuotaExceededFault < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::Redshift::Types::AuthenticationProfileQuotaExceededFault] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
     class AuthorizationAlreadyExistsFault < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context
@@ -613,6 +647,16 @@ module Aws::Redshift
       end
     end
 
+    class InvalidAuthenticationProfileRequestFault < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::Redshift::Types::InvalidAuthenticationProfileRequestFault] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+    end
+
     class InvalidAuthorizationStateFault < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context

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

@@ -93,17 +93,16 @@ module Aws::Redshift
       include Aws::Structure
     end
 
-    # Describes an AWS customer account authorized to restore a snapshot.
+    # Describes an account authorized to restore a snapshot.
     #
     # @!attribute [rw] account_id
-    #   The identifier of an AWS customer account authorized to restore a
-    #   snapshot.
+    #   The identifier of an account authorized to restore a snapshot.
     #   @return [String]
     #
     # @!attribute [rw] account_alias
-    #   The identifier of an AWS support account authorized to restore a
-    #   snapshot. For AWS support, the identifier is
-    #   `amazon-redshift-support`.
+    #   The identifier of an Amazon Web Services support account authorized
+    #   to restore a snapshot. For Amazon Web Services Support, the
+    #   identifier is `amazon-redshift-support`.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/AccountWithRestoreAccess AWS API Documentation
@@ -132,8 +131,8 @@ module Aws::Redshift
     #   The value represents how the cluster is configured to use AQUA.
     #   Possible values include the following.
     #
-    #   * enabled - Use AQUA if it is available for the current AWS Region
-    #     and Amazon Redshift node type.
+    #   * enabled - Use AQUA if it is available for the current Region and
+    #     Amazon Redshift node type.
     #
     #   * disabled - Don't use AQUA.
     #
@@ -163,6 +162,47 @@ module Aws::Redshift
       include Aws::Structure
     end
 
+    # Describes an authentication profile.
+    #
+    # @!attribute [rw] authentication_profile_name
+    #   The name of the authentication profile.
+    #   @return [String]
+    #
+    # @!attribute [rw] authentication_profile_content
+    #   The content of the authentication profile in JSON format. The
+    #   maximum length of the JSON string is determined by a quota for your
+    #   account.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/AuthenticationProfile AWS API Documentation
+    #
+    class AuthenticationProfile < Struct.new(
+      :authentication_profile_name,
+      :authentication_profile_content)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The authentication profile already exists.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/AuthenticationProfileAlreadyExistsFault AWS API Documentation
+    #
+    class AuthenticationProfileAlreadyExistsFault < Aws::EmptyStructure; end
+
+    # The authentication profile can't be found.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/AuthenticationProfileNotFoundFault AWS API Documentation
+    #
+    class AuthenticationProfileNotFoundFault < Aws::EmptyStructure; end
+
+    # The size or number of authentication profiles has exceeded the quota.
+    # The maximum length of the JSON string and maximum number of
+    # authentication profiles is determined by a quota for your account.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/AuthenticationProfileQuotaExceededFault AWS API Documentation
+    #
+    class AuthenticationProfileQuotaExceededFault < Aws::EmptyStructure; end
+
     # The specified CIDR block or EC2 security group is already authorized
     # for the specified cluster security group.
     #
@@ -208,9 +248,9 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] ec2_security_group_owner_id
-    #   The AWS account number of the owner of the security group specified
-    #   by the *EC2SecurityGroupName* parameter. The AWS Access Key ID is
-    #   not an acceptable value.
+    #   The account number of the owner of the security group specified by
+    #   the *EC2SecurityGroupName* parameter. The Amazon Web Services Access
+    #   Key ID is not an acceptable value.
     #
     #   Example: `111122223333`
     #   @return [String]
@@ -252,7 +292,7 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] account
-    #   The AWS account ID to grant access to.
+    #   The account ID to grant access to.
     #   @return [String]
     #
     # @!attribute [rw] vpc_ids
@@ -290,10 +330,10 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] account_with_restore_access
-    #   The identifier of the AWS customer account authorized to restore the
-    #   specified snapshot.
+    #   The identifier of the account authorized to restore the specified
+    #   snapshot.
     #
-    #   To share a snapshot with AWS support, specify
+    #   To share a snapshot with Amazon Web Services Support, specify
     #   amazon-redshift-support.
     #   @return [String]
     #
@@ -551,8 +591,8 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] master_username
-    #   The master user name for the cluster. This name is used to connect
-    #   to the database that is specified in the **DBName** parameter.
+    #   The admin user name for the cluster. This name is used to connect to
+    #   the database that is specified in the **DBName** parameter.
     #   @return [String]
     #
     # @!attribute [rw] db_name
@@ -698,8 +738,8 @@ module Aws::Redshift
     #   @return [Array<Types::Tag>]
     #
     # @!attribute [rw] kms_key_id
-    #   The AWS Key Management Service (AWS KMS) key ID of the encryption
-    #   key used to encrypt data in the cluster.
+    #   The Key Management Service (KMS) key ID of the encryption key used
+    #   to encrypt data in the cluster.
     #   @return [String]
     #
     # @!attribute [rw] enhanced_vpc_routing
@@ -719,8 +759,8 @@ module Aws::Redshift
     #   @return [Boolean]
     #
     # @!attribute [rw] iam_roles
-    #   A list of AWS Identity and Access Management (IAM) roles that can be
-    #   used by the cluster to access other AWS services.
+    #   A list of Identity and Access Management (IAM) roles that can be
+    #   used by the cluster to access other Amazon Web Services services.
     #   @return [Array<Types::ClusterIamRole>]
     #
     # @!attribute [rw] pending_actions
@@ -953,8 +993,9 @@ module Aws::Redshift
       include Aws::Structure
     end
 
-    # An AWS Identity and Access Management (IAM) role that can be used by
-    # the associated Amazon Redshift cluster to access other AWS services.
+    # An Identity and Access Management (IAM) role that can be used by the
+    # associated Amazon Redshift cluster to access other Amazon Web Services
+    # services.
     #
     # @!attribute [rw] iam_role_arn
     #   The Amazon Resource Name (ARN) of the IAM role, for example,
@@ -1626,7 +1667,7 @@ module Aws::Redshift
     #
     #   * Cannot end with a hyphen or contain two consecutive hyphens.
     #
-    #   * Must be unique for the AWS account that is making the request.
+    #   * Must be unique for the account that is making the request.
     #   @return [String]
     #
     # @!attribute [rw] manual_snapshot_retention_period
@@ -1668,6 +1709,50 @@ module Aws::Redshift
     #
     class CopyToRegionDisabledFault < Aws::EmptyStructure; end
 
+    # @note When making an API call, you may pass CreateAuthenticationProfileMessage
+    #   data as a hash:
+    #
+    #       {
+    #         authentication_profile_name: "AuthenticationProfileNameString", # required
+    #         authentication_profile_content: "String", # required
+    #       }
+    #
+    # @!attribute [rw] authentication_profile_name
+    #   The name of the authentication profile to be created.
+    #   @return [String]
+    #
+    # @!attribute [rw] authentication_profile_content
+    #   The content of the authentication profile in JSON format. The
+    #   maximum length of the JSON string is determined by a quota for your
+    #   account.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/CreateAuthenticationProfileMessage AWS API Documentation
+    #
+    class CreateAuthenticationProfileMessage < Struct.new(
+      :authentication_profile_name,
+      :authentication_profile_content)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] authentication_profile_name
+    #   The name of the authentication profile that was created.
+    #   @return [String]
+    #
+    # @!attribute [rw] authentication_profile_content
+    #   The content of the authentication profile in JSON format.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/CreateAuthenticationProfileResult AWS API Documentation
+    #
+    class CreateAuthenticationProfileResult < Struct.new(
+      :authentication_profile_name,
+      :authentication_profile_content)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateClusterMessage
     #   data as a hash:
     #
@@ -1754,7 +1839,7 @@ module Aws::Redshift
     #
     #   * Cannot end with a hyphen or contain two consecutive hyphens.
     #
-    #   * Must be unique for all clusters within an AWS account.
+    #   * Must be unique for all clusters within an account.
     #
     #   Example: `myexamplecluster`
     #   @return [String]
@@ -1786,8 +1871,8 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] master_username
-    #   The user name associated with the master user account for the
-    #   cluster that is being created.
+    #   The user name associated with the admin user account for the cluster
+    #   that is being created.
     #
     #   Constraints:
     #
@@ -1806,7 +1891,7 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] master_user_password
-    #   The password associated with the master user account for the cluster
+    #   The password associated with the admin user account for the cluster
     #   that is being created.
     #
     #   Constraints:
@@ -2021,8 +2106,8 @@ module Aws::Redshift
     #   @return [Array<Types::Tag>]
     #
     # @!attribute [rw] kms_key_id
-    #   The AWS Key Management Service (KMS) key ID of the encryption key
-    #   that you want to use to encrypt data in the cluster.
+    #   The Key Management Service (KMS) key ID of the encryption key that
+    #   you want to use to encrypt data in the cluster.
     #   @return [String]
     #
     # @!attribute [rw] enhanced_vpc_routing
@@ -2046,10 +2131,10 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] iam_roles
-    #   A list of AWS Identity and Access Management (IAM) roles that can be
-    #   used by the cluster to access other AWS services. You must supply
-    #   the IAM roles in their Amazon Resource Name (ARN) format. You can
-    #   supply up to 10 IAM roles in a single request.
+    #   A list of Identity and Access Management (IAM) roles that can be
+    #   used by the cluster to access other Amazon Web Services services.
+    #   You must supply the IAM roles in their Amazon Resource Name (ARN)
+    #   format. You can supply up to 10 IAM roles in a single request.
     #
     #   A cluster can have up to 10 IAM roles associated with it at any
     #   time.
@@ -2075,8 +2160,8 @@ module Aws::Redshift
     #   (Advanced Query Accelerator) when it is created. Possible values
     #   include the following.
     #
-    #   * enabled - Use AQUA if it is available for the current AWS Region
-    #     and Amazon Redshift node type.
+    #   * enabled - Use AQUA if it is available for the current Region and
+    #     Amazon Redshift node type.
     #
     #   * disabled - Don't use AQUA.
     #
@@ -2148,7 +2233,7 @@ module Aws::Redshift
     #
     #   * Cannot end with a hyphen or contain two consecutive hyphens.
     #
-    #   * Must be unique withing your AWS account.
+    #   * Must be unique withing your account.
     #
     #   <note markdown="1"> This value is stored as a lower-case string.
     #
@@ -2162,11 +2247,11 @@ module Aws::Redshift
     #
     #   To get a list of valid parameter group family names, you can call
     #   DescribeClusterParameterGroups. By default, Amazon Redshift returns
-    #   a list of all the parameter groups that are owned by your AWS
-    #   account, including the default parameter groups for each Amazon
-    #   Redshift engine version. The parameter group family names associated
-    #   with the default parameter groups provide you the valid values. For
-    #   example, a valid family name is "redshift-1.0".
+    #   a list of all the parameter groups that are owned by your account,
+    #   including the default parameter groups for each Amazon Redshift
+    #   engine version. The parameter group family names associated with the
+    #   default parameter groups provide you the valid values. For example,
+    #   a valid family name is "redshift-1.0".
     #   @return [String]
     #
     # @!attribute [rw] description
@@ -2237,7 +2322,7 @@ module Aws::Redshift
     #   * Must not be "Default".
     #
     #   * Must be unique for all security groups that are created by your
-    #     AWS account.
+    #     account.
     #
     #   Example: `examplesecuritygroup`
     #   @return [String]
@@ -2289,7 +2374,7 @@ module Aws::Redshift
     #
     # @!attribute [rw] snapshot_identifier
     #   A unique identifier for the snapshot that you are requesting. This
-    #   identifier must be unique for all snapshots within the AWS account.
+    #   identifier must be unique for all snapshots within the account.
     #
     #   Constraints:
     #
@@ -2369,7 +2454,7 @@ module Aws::Redshift
     #
     #   * Must not be "Default".
     #
-    #   * Must be unique for all subnet groups that are created by your AWS
+    #   * Must be unique for all subnet groups that are created by your
     #     account.
     #
     #   Example: `examplesubnetgroup`
@@ -2427,8 +2512,8 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] resource_owner
-    #   The AWS account ID of the owner of the cluster. This is only
-    #   required if the cluster is in another AWS account.
+    #   The account ID of the owner of the cluster. This is only required if
+    #   the cluster is in another account.
     #   @return [String]
     #
     # @!attribute [rw] endpoint_name
@@ -2505,9 +2590,8 @@ module Aws::Redshift
     #   The type of source that will be generating the events. For example,
     #   if you want to be notified of events generated by a cluster, you
     #   would set this parameter to cluster. If this value is not specified,
-    #   events are returned for all Amazon Redshift objects in your AWS
-    #   account. You must specify a source type in order to specify source
-    #   IDs.
+    #   events are returned for all Amazon Redshift objects in your account.
+    #   You must specify a source type in order to specify source IDs.
     #
     #   Valid values: cluster, cluster-parameter-group,
     #   cluster-security-group, cluster-snapshot, and scheduled-action.
@@ -2806,7 +2890,7 @@ module Aws::Redshift
     #
     # @!attribute [rw] snapshot_copy_grant_name
     #   The name of the snapshot copy grant. This name must be unique in the
-    #   region for the AWS account.
+    #   region for the account.
     #
     #   Constraints:
     #
@@ -2818,7 +2902,7 @@ module Aws::Redshift
     #
     #   * Cannot end with a hyphen or contain two consecutive hyphens.
     #
-    #   * Must be unique for all clusters within an AWS account.
+    #   * Must be unique for all clusters within an account.
     #   @return [String]
     #
     # @!attribute [rw] kms_key_id
@@ -2844,7 +2928,7 @@ module Aws::Redshift
     # @!attribute [rw] snapshot_copy_grant
     #   The snapshot copy grant that grants Amazon Redshift permission to
     #   encrypt copied snapshots with the specified customer master key
-    #   (CMK) from AWS KMS in the destination region.
+    #   (CMK) from Amazon Web Services KMS in the destination region.
     #
     #   For more information about managing snapshot copy grants, go to
     #   [Amazon Redshift Database Encryption][1] in the *Amazon Redshift
@@ -3143,6 +3227,37 @@ module Aws::Redshift
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DeleteAuthenticationProfileMessage
+    #   data as a hash:
+    #
+    #       {
+    #         authentication_profile_name: "AuthenticationProfileNameString", # required
+    #       }
+    #
+    # @!attribute [rw] authentication_profile_name
+    #   The name of the authentication profile to delete.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DeleteAuthenticationProfileMessage AWS API Documentation
+    #
+    class DeleteAuthenticationProfileMessage < Struct.new(
+      :authentication_profile_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] authentication_profile_name
+    #   The name of the authentication profile that was deleted.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DeleteAuthenticationProfileResult AWS API Documentation
+    #
+    class DeleteAuthenticationProfileResult < Struct.new(
+      :authentication_profile_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DeleteClusterMessage
     #   data as a hash:
     #
@@ -3554,6 +3669,38 @@ module Aws::Redshift
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribeAuthenticationProfilesMessage
+    #   data as a hash:
+    #
+    #       {
+    #         authentication_profile_name: "AuthenticationProfileNameString",
+    #       }
+    #
+    # @!attribute [rw] authentication_profile_name
+    #   The name of the authentication profile to describe. If not specified
+    #   then all authentication profiles owned by the account are listed.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeAuthenticationProfilesMessage AWS API Documentation
+    #
+    class DescribeAuthenticationProfilesMessage < Struct.new(
+      :authentication_profile_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] authentication_profiles
+    #   The list of authentication profiles.
+    #   @return [Array<Types::AuthenticationProfile>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeAuthenticationProfilesResult AWS API Documentation
+    #
+    class DescribeAuthenticationProfilesResult < Struct.new(
+      :authentication_profiles)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DescribeClusterDbRevisionsMessage
     #   data as a hash:
     #
@@ -3638,10 +3785,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeClusterParameterGroups request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @!attribute [rw] tag_keys
@@ -3717,10 +3864,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeClusterParameters request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeClusterParametersMessage AWS API Documentation
@@ -3769,10 +3916,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeClusterSecurityGroups request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #
     #   Constraints: You can specify either the **ClusterSecurityGroupName**
     #   parameter or the **Marker** parameter, but not both.
@@ -3892,17 +4039,17 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeClusterSnapshots request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @!attribute [rw] owner_account
-    #   The AWS customer account used to create or copy the snapshot. Use
-    #   this field to filter the results to snapshots owned by a particular
-    #   account. To describe snapshots you own, either specify your AWS
-    #   customer account, or do not specify the parameter.
+    #   The account used to create or copy the snapshot. Use this field to
+    #   filter the results to snapshots owned by a particular account. To
+    #   describe snapshots you own, either specify your account, or do not
+    #   specify the parameter.
     #   @return [String]
     #
     # @!attribute [rw] tag_keys
@@ -4000,10 +4147,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeClusterSubnetGroups request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @!attribute [rw] tag_keys
@@ -4121,10 +4268,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeClusterVersions request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeClusterVersionsMessage AWS API Documentation
@@ -4172,10 +4319,11 @@ module Aws::Redshift
     # @!attribute [rw] marker
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a DescribeClusters
-    #   request exceed the value specified in `MaxRecords`, AWS returns a
-    #   value in the `Marker` field of the response. You can retrieve the
-    #   next set of response records by providing the returned marker value
-    #   in the `Marker` parameter and retrying the request.
+    #   request exceed the value specified in `MaxRecords`, Amazon Web
+    #   Services returns a value in the `Marker` field of the response. You
+    #   can retrieve the next set of response records by providing the
+    #   returned marker value in the `Marker` parameter and retrying the
+    #   request.
     #
     #   Constraints: You can specify either the **ClusterIdentifier**
     #   parameter or the **Marker** parameter, but not both.
@@ -4241,10 +4389,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeDefaultClusterParameters request exceed the value specified
-    #   in `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   in `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeDefaultClusterParametersMessage AWS API Documentation
@@ -4287,7 +4435,7 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] resource_owner
-    #   The AWS account ID of the owner of the cluster.
+    #   The account ID of the owner of the cluster.
     #   @return [String]
     #
     # @!attribute [rw] endpoint_name
@@ -4342,8 +4490,8 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] account
-    #   The AWS account ID of either the cluster owner (grantor) or grantee.
-    #   If `Grantee` parameter is true, then the `Account` value is of the
+    #   The Aaccount ID of either the cluster owner (grantor) or grantee. If
+    #   `Grantee` parameter is true, then the `Account` value is of the
     #   grantor.
     #   @return [String]
     #
@@ -4435,10 +4583,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeEventSubscriptions request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @!attribute [rw] tag_keys
@@ -4577,10 +4725,11 @@ module Aws::Redshift
     # @!attribute [rw] marker
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a DescribeEvents
-    #   request exceed the value specified in `MaxRecords`, AWS returns a
-    #   value in the `Marker` field of the response. You can retrieve the
-    #   next set of response records by providing the returned marker value
-    #   in the `Marker` parameter and retrying the request.
+    #   request exceed the value specified in `MaxRecords`, Amazon Web
+    #   Services returns a value in the `Marker` field of the response. You
+    #   can retrieve the next set of response records by providing the
+    #   returned marker value in the `Marker` parameter and retrying the
+    #   request.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeEventsMessage AWS API Documentation
@@ -4611,8 +4760,7 @@ module Aws::Redshift
     # @!attribute [rw] hsm_client_certificate_identifier
     #   The identifier of a specific HSM client certificate for which you
     #   want information. If no identifier is specified, information is
-    #   returned for all HSM client certificates owned by your AWS customer
-    #   account.
+    #   returned for all HSM client certificates owned by your account.
     #   @return [String]
     #
     # @!attribute [rw] max_records
@@ -4631,10 +4779,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeHsmClientCertificates request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @!attribute [rw] tag_keys
@@ -4683,7 +4831,7 @@ module Aws::Redshift
     # @!attribute [rw] hsm_configuration_identifier
     #   The identifier of a specific Amazon Redshift HSM configuration to be
     #   described. If no identifier is specified, information is returned
-    #   for all HSM configurations owned by your AWS customer account.
+    #   for all HSM configurations owned by your account.
     #   @return [String]
     #
     # @!attribute [rw] max_records
@@ -4702,10 +4850,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeHsmConfigurations request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @!attribute [rw] tag_keys
@@ -4800,9 +4948,9 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] owner_account
-    #   The AWS customer account used to create or copy the snapshot.
-    #   Required if you are restoring a snapshot you do not own, optional if
-    #   you own the snapshot.
+    #   The account used to create or copy the snapshot. Required if you are
+    #   restoring a snapshot you do not own, optional if you own the
+    #   snapshot.
     #   @return [String]
     #
     # @!attribute [rw] filters
@@ -4813,10 +4961,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeNodeConfigurationOptions request exceed the value specified
-    #   in `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   in `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @!attribute [rw] max_records
@@ -4886,10 +5034,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeOrderableClusterOptions request exceed the value specified
-    #   in `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   in `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeOrderableClusterOptionsMessage AWS API Documentation
@@ -4914,7 +5062,7 @@ module Aws::Redshift
     #       }
     #
     # @!attribute [rw] account_id
-    #   The AWS account ID that owns the cluster.
+    #   The Region ID that owns the cluster.
     #   @return [String]
     #
     # @!attribute [rw] cluster_identifier
@@ -4985,10 +5133,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeReservedNodeOfferings request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeReservedNodeOfferingsMessage AWS API Documentation
@@ -5029,10 +5177,11 @@ module Aws::Redshift
     # @!attribute [rw] marker
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a DescribeReservedNodes
-    #   request exceed the value specified in `MaxRecords`, AWS returns a
-    #   value in the `Marker` field of the response. You can retrieve the
-    #   next set of response records by providing the returned marker value
-    #   in the `Marker` parameter and retrying the request.
+    #   request exceed the value specified in `MaxRecords`, Amazon Web
+    #   Services returns a value in the `Marker` field of the response. You
+    #   can retrieve the next set of response records by providing the
+    #   returned marker value in the `Marker` parameter and retrying the
+    #   request.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/DescribeReservedNodesMessage AWS API Documentation
@@ -5056,7 +5205,7 @@ module Aws::Redshift
     #   The unique identifier of a cluster whose resize progress you are
     #   requesting. This parameter is case-sensitive.
     #
-    #   By default, resize operations for all clusters defined for an AWS
+    #   By default, resize operations for all clusters defined for an
     #   account are returned.
     #   @return [String]
     #
@@ -5120,10 +5269,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeScheduledActions request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @!attribute [rw] max_records
@@ -5186,10 +5335,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   `DescribeSnapshotCopyGrant` request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #
     #   Constraints: You can specify either the **SnapshotCopyGrantName**
     #   parameter or the **Marker** parameter, but not both.
@@ -5495,10 +5644,11 @@ module Aws::Redshift
     # @!attribute [rw] marker
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a DescribeUsageLimits
-    #   request exceed the value specified in `MaxRecords`, AWS returns a
-    #   value in the `Marker` field of the response. You can retrieve the
-    #   next set of response records by providing the returned marker value
-    #   in the `Marker` parameter and retrying the request.
+    #   request exceed the value specified in `MaxRecords`, Amazon Web
+    #   Services returns a value in the `Marker` field of the response. You
+    #   can retrieve the next set of response records by providing the
+    #   returned marker value in the `Marker` parameter and retrying the
+    #   request.
     #   @return [String]
     #
     # @!attribute [rw] tag_keys
@@ -5602,8 +5752,8 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] ec2_security_group_owner_id
-    #   The AWS ID of the owner of the EC2 security group specified in the
-    #   `EC2SecurityGroupName` field.
+    #   The account ID of the owner of the EC2 security group specified in
+    #   the `EC2SecurityGroupName` field.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -5717,9 +5867,9 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] destination_region
-    #   The destination AWS Region that you want to copy snapshots to.
+    #   The destination Region that you want to copy snapshots to.
     #
-    #   Constraints: Must be the name of a valid AWS Region. For more
+    #   Constraints: Must be the name of a valid Region. For more
     #   information, see [Regions and Endpoints][1] in the Amazon Web
     #   Services General Reference.
     #
@@ -5738,15 +5888,15 @@ module Aws::Redshift
     #   @return [Integer]
     #
     # @!attribute [rw] snapshot_copy_grant_name
-    #   The name of the snapshot copy grant to use when snapshots of an AWS
-    #   KMS-encrypted cluster are copied to the destination region.
+    #   The name of the snapshot copy grant to use when snapshots of an
+    #   Amazon Web Services KMS-encrypted cluster are copied to the
+    #   destination region.
     #   @return [String]
     #
     # @!attribute [rw] manual_snapshot_retention_period
     #   The number of days to retain newly copied snapshots in the
-    #   destination AWS Region after they are copied from the source AWS
-    #   Region. If the value is -1, the manual snapshot is retained
-    #   indefinitely.
+    #   destination Region after they are copied from the source Region. If
+    #   the value is -1, the manual snapshot is retained indefinitely.
     #
     #   The value must be either -1 or an integer between 1 and 3,653.
     #   @return [Integer]
@@ -5806,7 +5956,7 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] resource_owner
-    #   The AWS account ID of the owner of the cluster.
+    #   The account ID of the owner of the cluster.
     #   @return [String]
     #
     # @!attribute [rw] subnet_group_name
@@ -5888,14 +6038,14 @@ module Aws::Redshift
     class EndpointAlreadyExistsFault < Aws::EmptyStructure; end
 
     # Describes an endpoint authorization for authorizing Redshift-managed
-    # VPC endpoint access to a cluster across AWS accounts.
+    # VPC endpoint access to a cluster across accounts.
     #
     # @!attribute [rw] grantor
-    #   The AWS account ID of the cluster owner.
+    #   The account ID of the cluster owner.
     #   @return [String]
     #
     # @!attribute [rw] grantee
-    #   The AWS account ID of the grantee of the cluster.
+    #   The account ID of the grantee of the cluster.
     #   @return [String]
     #
     # @!attribute [rw] cluster_identifier
@@ -6117,8 +6267,8 @@ module Aws::Redshift
     # Describes event subscriptions.
     #
     # @!attribute [rw] customer_aws_id
-    #   The AWS customer account associated with the Amazon Redshift event
-    #   notification subscription.
+    #   The account associated with the Amazon Redshift event notification
+    #   subscription.
     #   @return [String]
     #
     # @!attribute [rw] cust_subscription_id
@@ -6694,6 +6844,14 @@ module Aws::Redshift
     #
     class InsufficientS3BucketPolicyFault < Aws::EmptyStructure; end
 
+    # The authentication profile request is not valid. The profile name
+    # can't be null or empty. The authentication profile API operation must
+    # be available in the Region.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/InvalidAuthenticationProfileRequestFault AWS API Documentation
+    #
+    class InvalidAuthenticationProfileRequestFault < Aws::EmptyStructure; end
+
     # The status of the authorization is not valid.
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/InvalidAuthorizationStateFault AWS API Documentation
@@ -6877,7 +7035,8 @@ module Aws::Redshift
     #
     class InvalidVPCNetworkStateFault < Aws::EmptyStructure; end
 
-    # The encryption key has exceeded its grant limit in AWS KMS.
+    # The encryption key has exceeded its grant limit in Amazon Web Services
+    # KMS.
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/LimitExceededFault AWS API Documentation
     #
@@ -6969,8 +7128,8 @@ module Aws::Redshift
     #   The new value of AQUA configuration status. Possible values include
     #   the following.
     #
-    #   * enabled - Use AQUA if it is available for the current AWS Region
-    #     and Amazon Redshift node type.
+    #   * enabled - Use AQUA if it is available for the current Region and
+    #     Amazon Redshift node type.
     #
     #   * disabled - Don't use AQUA.
     #
@@ -6998,6 +7157,50 @@ module Aws::Redshift
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ModifyAuthenticationProfileMessage
+    #   data as a hash:
+    #
+    #       {
+    #         authentication_profile_name: "AuthenticationProfileNameString", # required
+    #         authentication_profile_content: "String", # required
+    #       }
+    #
+    # @!attribute [rw] authentication_profile_name
+    #   The name of the authentication profile to replace.
+    #   @return [String]
+    #
+    # @!attribute [rw] authentication_profile_content
+    #   The new content of the authentication profile in JSON format. The
+    #   maximum length of the JSON string is determined by a quota for your
+    #   account.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/ModifyAuthenticationProfileMessage AWS API Documentation
+    #
+    class ModifyAuthenticationProfileMessage < Struct.new(
+      :authentication_profile_name,
+      :authentication_profile_content)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] authentication_profile_name
+    #   The name of the authentication profile that was replaced.
+    #   @return [String]
+    #
+    # @!attribute [rw] authentication_profile_content
+    #   The updated content of the authentication profile in JSON format.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/ModifyAuthenticationProfileResult AWS API Documentation
+    #
+    class ModifyAuthenticationProfileResult < Struct.new(
+      :authentication_profile_name,
+      :authentication_profile_content)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ModifyClusterDbRevisionMessage
     #   data as a hash:
     #
@@ -7258,14 +7461,14 @@ module Aws::Redshift
     #   @return [Array<String>]
     #
     # @!attribute [rw] master_user_password
-    #   The new password for the cluster master user. This change is
+    #   The new password for the cluster admin user. This change is
     #   asynchronously applied as soon as possible. Between the time of the
     #   request and the completion of the request, the `MasterUserPassword`
     #   element exists in the `PendingModifiedValues` element of the
     #   operation response.
     #
     #   <note markdown="1"> Operations never return the password, so this operation provides a
-    #   way to regain access to the master user account for a cluster if the
+    #   way to regain access to the admin user account for a cluster if the
     #   password is lost.
     #
     #    </note>
@@ -7394,7 +7597,7 @@ module Aws::Redshift
     #
     #   * Cannot end with a hyphen or contain two consecutive hyphens.
     #
-    #   * Must be unique for all clusters within an AWS account.
+    #   * Must be unique for all clusters within an account.
     #
     #   Example: `examplecluster`
     #   @return [String]
@@ -7455,8 +7658,8 @@ module Aws::Redshift
     #   @return [Boolean]
     #
     # @!attribute [rw] kms_key_id
-    #   The AWS Key Management Service (KMS) key ID of the encryption key
-    #   that you want to use to encrypt data in the cluster.
+    #   The Key Management Service (KMS) key ID of the encryption key that
+    #   you want to use to encrypt data in the cluster.
     #   @return [String]
     #
     # @!attribute [rw] availability_zone_relocation
@@ -7746,9 +7949,8 @@ module Aws::Redshift
     #   The type of source that will be generating the events. For example,
     #   if you want to be notified of events generated by a cluster, you
     #   would set this parameter to cluster. If this value is not specified,
-    #   events are returned for all Amazon Redshift objects in your AWS
-    #   account. You must specify a source type in order to specify source
-    #   IDs.
+    #   events are returned for all Amazon Redshift objects in your account.
+    #   You must specify a source type in order to specify source IDs.
     #
     #   Valid values: cluster, cluster-parameter-group,
     #   cluster-security-group, cluster-snapshot, and scheduled-action.
@@ -7906,7 +8108,7 @@ module Aws::Redshift
     # @!attribute [rw] cluster_identifier
     #   The unique identifier of the cluster for which you want to change
     #   the retention period for either automated or manual snapshots that
-    #   are copied to a destination AWS Region.
+    #   are copied to a destination Region.
     #
     #   Constraints: Must be the valid name of an existing cluster that has
     #   cross-region snapshot copy enabled.
@@ -7914,14 +8116,14 @@ module Aws::Redshift
     #
     # @!attribute [rw] retention_period
     #   The number of days to retain automated snapshots in the destination
-    #   AWS Region after they are copied from the source AWS Region.
+    #   Region after they are copied from the source Region.
     #
     #   By default, this only changes the retention period of copied
     #   automated snapshots.
     #
     #   If you decrease the retention period for automated snapshots that
-    #   are copied to a destination AWS Region, Amazon Redshift deletes any
-    #   existing automated snapshots that were copied to the destination AWS
+    #   are copied to a destination Region, Amazon Redshift deletes any
+    #   existing automated snapshots that were copied to the destination
     #   Region and that fall outside of the new retention period.
     #
     #   Constraints: Must be at least 1 and no more than 35 for automated
@@ -8350,7 +8552,7 @@ module Aws::Redshift
     #       }
     #
     # @!attribute [rw] account_id
-    #   The AWS account ID that owns the cluster.
+    #   The Region ID that owns the cluster.
     #   @return [String]
     #
     # @!attribute [rw] cluster_identifier
@@ -8439,8 +8641,8 @@ module Aws::Redshift
     # applied.
     #
     # @!attribute [rw] master_user_password
-    #   The pending or in-progress change of the master user password for
-    #   the cluster.
+    #   The pending or in-progress change of the admin user password for the
+    #   cluster.
     #   @return [String]
     #
     # @!attribute [rw] node_type
@@ -9157,7 +9359,7 @@ module Aws::Redshift
     #
     #   * Cannot end with a hyphen or contain two consecutive hyphens.
     #
-    #   * Must be unique for all clusters within an AWS account.
+    #   * Must be unique for all clusters within an account.
     #   @return [String]
     #
     # @!attribute [rw] snapshot_identifier
@@ -9211,9 +9413,9 @@ module Aws::Redshift
     #   @return [Boolean]
     #
     # @!attribute [rw] owner_account
-    #   The AWS customer account used to create or copy the snapshot.
-    #   Required if you are restoring a snapshot you do not own, optional if
-    #   you own the snapshot.
+    #   The account used to create or copy the snapshot. Required if you are
+    #   restoring a snapshot you do not own, optional if you own the
+    #   snapshot.
     #   @return [String]
     #
     # @!attribute [rw] hsm_client_certificate_identifier
@@ -9313,9 +9515,9 @@ module Aws::Redshift
     #   @return [Integer]
     #
     # @!attribute [rw] kms_key_id
-    #   The AWS Key Management Service (KMS) key ID of the encryption key
-    #   that you want to use to encrypt data in the cluster that you restore
-    #   from a shared snapshot.
+    #   The Key Management Service (KMS) key ID of the encryption key that
+    #   you want to use to encrypt data in the cluster that you restore from
+    #   a shared snapshot.
     #   @return [String]
     #
     # @!attribute [rw] node_type
@@ -9360,10 +9562,10 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] iam_roles
-    #   A list of AWS Identity and Access Management (IAM) roles that can be
-    #   used by the cluster to access other AWS services. You must supply
-    #   the IAM roles in their Amazon Resource Name (ARN) format. You can
-    #   supply up to 10 IAM roles in a single request.
+    #   A list of Identity and Access Management (IAM) roles that can be
+    #   used by the cluster to access other Amazon Web Services services.
+    #   You must supply the IAM roles in their Amazon Resource Name (ARN)
+    #   format. You can supply up to 10 IAM roles in a single request.
     #
     #   A cluster can have up to 10 IAM roles associated at any time.
     #   @return [Array<String>]
@@ -9398,8 +9600,8 @@ module Aws::Redshift
     #   (Advanced Query Accelerator) after the cluster is restored. Possible
     #   values include the following.
     #
-    #   * enabled - Use AQUA if it is available for the current AWS Region
-    #     and Amazon Redshift node type.
+    #   * enabled - Use AQUA if it is available for the current Region and
+    #     Amazon Redshift node type.
     #
     #   * disabled - Don't use AQUA.
     #
@@ -9681,11 +9883,11 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] ec2_security_group_owner_id
-    #   The AWS account number of the owner of the security group specified
-    #   in the `EC2SecurityGroupName` parameter. The AWS access key ID is
-    #   not an acceptable value. If `EC2SecurityGroupOwnerId` is specified,
-    #   `EC2SecurityGroupName` must also be provided. and `CIDRIP` cannot be
-    #   provided.
+    #   The account number of the owner of the security group specified in
+    #   the `EC2SecurityGroupName` parameter. The Amazon Web Services access
+    #   key ID is not an acceptable value. If `EC2SecurityGroupOwnerId` is
+    #   specified, `EC2SecurityGroupName` must also be provided. and
+    #   `CIDRIP` cannot be provided.
     #
     #   Example: `111122223333`
     #   @return [String]
@@ -9728,7 +9930,7 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] account
-    #   The AWS account ID whose access is to be revoked.
+    #   The account ID whose access is to be revoked.
     #   @return [String]
     #
     # @!attribute [rw] vpc_ids
@@ -9775,8 +9977,8 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] account_with_restore_access
-    #   The identifier of the AWS customer account that can no longer
-    #   restore the specified snapshot.
+    #   The identifier of the account that can no longer restore the
+    #   specified snapshot.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/RevokeSnapshotAccessMessage AWS API Documentation
@@ -10050,10 +10252,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   DescribeScheduledActions request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #   @return [String]
     #
     # @!attribute [rw] scheduled_actions
@@ -10110,7 +10312,7 @@ module Aws::Redshift
     #   @return [Time]
     #
     # @!attribute [rw] master_username
-    #   The master user name for the cluster.
+    #   The admin user name for the cluster.
     #   @return [String]
     #
     # @!attribute [rw] cluster_version
@@ -10151,9 +10353,9 @@ module Aws::Redshift
     #   @return [Boolean]
     #
     # @!attribute [rw] kms_key_id
-    #   The AWS Key Management Service (KMS) key ID of the encryption key
-    #   that was used to encrypt data in the cluster from which the snapshot
-    #   was taken.
+    #   The Key Management Service (KMS) key ID of the encryption key that
+    #   was used to encrypt data in the cluster from which the snapshot was
+    #   taken.
     #   @return [String]
     #
     # @!attribute [rw] encrypted_with_hsm
@@ -10163,16 +10365,16 @@ module Aws::Redshift
     #   @return [Boolean]
     #
     # @!attribute [rw] accounts_with_restore_access
-    #   A list of the AWS customer accounts authorized to restore the
-    #   snapshot. Returns `null` if no accounts are authorized. Visible only
-    #   to the snapshot owner.
+    #   A list of the accounts authorized to restore the snapshot. Returns
+    #   `null` if no accounts are authorized. Visible only to the snapshot
+    #   owner.
     #   @return [Array<Types::AccountWithRestoreAccess>]
     #
     # @!attribute [rw] owner_account
-    #   For manual snapshots, the AWS customer account used to create or
-    #   copy the snapshot. For automatic snapshots, the owner of the
-    #   cluster. The owner can perform all snapshot actions, such as sharing
-    #   a manual snapshot.
+    #   For manual snapshots, the account used to create or copy the
+    #   snapshot. For automatic snapshots, the owner of the cluster. The
+    #   owner can perform all snapshot actions, such as sharing a manual
+    #   snapshot.
     #   @return [String]
     #
     # @!attribute [rw] total_backup_size_in_mega_bytes
@@ -10316,7 +10518,7 @@ module Aws::Redshift
 
     # The snapshot copy grant that grants Amazon Redshift permission to
     # encrypt copied snapshots with the specified customer master key (CMK)
-    # from AWS KMS in the destination region.
+    # from Amazon Web Services KMS in the destination region.
     #
     # For more information about managing snapshot copy grants, go to
     # [Amazon Redshift Database Encryption][1] in the *Amazon Redshift
@@ -10331,8 +10533,8 @@ module Aws::Redshift
     #   @return [String]
     #
     # @!attribute [rw] kms_key_id
-    #   The unique identifier of the customer master key (CMK) in AWS KMS to
-    #   which Amazon Redshift is granted permission.
+    #   The unique identifier of the customer master key (CMK) in Amazon Web
+    #   Services KMS to which Amazon Redshift is granted permission.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -10360,10 +10562,10 @@ module Aws::Redshift
     #   An optional parameter that specifies the starting point to return a
     #   set of response records. When the results of a
     #   `DescribeSnapshotCopyGrant` request exceed the value specified in
-    #   `MaxRecords`, AWS returns a value in the `Marker` field of the
-    #   response. You can retrieve the next set of response records by
-    #   providing the returned marker value in the `Marker` parameter and
-    #   retrying the request.
+    #   `MaxRecords`, Amazon Web Services returns a value in the `Marker`
+    #   field of the response. You can retrieve the next set of response
+    #   records by providing the returned marker value in the `Marker`
+    #   parameter and retrying the request.
     #
     #   Constraints: You can specify either the **SnapshotCopyGrantName**
     #   parameter or the **Marker** parameter, but not both.
@@ -10390,8 +10592,8 @@ module Aws::Redshift
     #
     class SnapshotCopyGrantNotFoundFault < Aws::EmptyStructure; end
 
-    # The AWS account has exceeded the maximum number of snapshot copy
-    # grants in this region.
+    # The account has exceeded the maximum number of snapshot copy grants in
+    # this region.
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/redshift-2012-12-01/SnapshotCopyGrantQuotaExceededFault AWS API Documentation
     #
@@ -10942,7 +11144,7 @@ module Aws::Redshift
     #       }
     #
     # @!attribute [rw] account_id
-    #   The AWS account ID that owns the cluster.
+    #   The Region ID that owns the cluster.
     #   @return [String]
     #
     # @!attribute [rw] cluster_identifier