aws-sdk-firehose 1.23.0 → 1.28.0

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

@@ -35,7 +35,9 @@ module Aws::Firehose
     DeliveryStreamARN = Shapes::StringShape.new(name: 'DeliveryStreamARN')
     DeliveryStreamDescription = Shapes::StructureShape.new(name: 'DeliveryStreamDescription')
     DeliveryStreamEncryptionConfiguration = Shapes::StructureShape.new(name: 'DeliveryStreamEncryptionConfiguration')
+    DeliveryStreamEncryptionConfigurationInput = Shapes::StructureShape.new(name: 'DeliveryStreamEncryptionConfigurationInput')
     DeliveryStreamEncryptionStatus = Shapes::StringShape.new(name: 'DeliveryStreamEncryptionStatus')
+    DeliveryStreamFailureType = Shapes::StringShape.new(name: 'DeliveryStreamFailureType')
     DeliveryStreamName = Shapes::StringShape.new(name: 'DeliveryStreamName')
     DeliveryStreamNameList = Shapes::ListShape.new(name: 'DeliveryStreamNameList')
     DeliveryStreamStatus = Shapes::StringShape.new(name: 'DeliveryStreamStatus')
@@ -69,6 +71,7 @@ module Aws::Firehose
     ExtendedS3DestinationConfiguration = Shapes::StructureShape.new(name: 'ExtendedS3DestinationConfiguration')
     ExtendedS3DestinationDescription = Shapes::StructureShape.new(name: 'ExtendedS3DestinationDescription')
     ExtendedS3DestinationUpdate = Shapes::StructureShape.new(name: 'ExtendedS3DestinationUpdate')
+    FailureDescription = Shapes::StructureShape.new(name: 'FailureDescription')
     HECAcknowledgmentTimeoutInSeconds = Shapes::IntegerShape.new(name: 'HECAcknowledgmentTimeoutInSeconds')
     HECEndpoint = Shapes::StringShape.new(name: 'HECEndpoint')
     HECEndpointType = Shapes::StringShape.new(name: 'HECEndpointType')
@@ -77,7 +80,9 @@ module Aws::Firehose
     InputFormatConfiguration = Shapes::StructureShape.new(name: 'InputFormatConfiguration')
     IntervalInSeconds = Shapes::IntegerShape.new(name: 'IntervalInSeconds')
     InvalidArgumentException = Shapes::StructureShape.new(name: 'InvalidArgumentException')
+    InvalidKMSResourceException = Shapes::StructureShape.new(name: 'InvalidKMSResourceException')
     KMSEncryptionConfig = Shapes::StructureShape.new(name: 'KMSEncryptionConfig')
+    KeyType = Shapes::StringShape.new(name: 'KeyType')
     KinesisStreamARN = Shapes::StringShape.new(name: 'KinesisStreamARN')
     KinesisStreamSourceConfiguration = Shapes::StructureShape.new(name: 'KinesisStreamSourceConfiguration')
     KinesisStreamSourceDescription = Shapes::StructureShape.new(name: 'KinesisStreamSourceDescription')
@@ -142,6 +147,7 @@ module Aws::Firehose
     S3DestinationDescription = Shapes::StructureShape.new(name: 'S3DestinationDescription')
     S3DestinationUpdate = Shapes::StructureShape.new(name: 'S3DestinationUpdate')
     SchemaConfiguration = Shapes::StructureShape.new(name: 'SchemaConfiguration')
+    SecurityGroupIdList = Shapes::ListShape.new(name: 'SecurityGroupIdList')
     Serializer = Shapes::StructureShape.new(name: 'Serializer')
     ServiceUnavailableException = Shapes::StructureShape.new(name: 'ServiceUnavailableException')
     SizeInMBs = Shapes::IntegerShape.new(name: 'SizeInMBs')
@@ -156,6 +162,7 @@ module Aws::Firehose
     StartDeliveryStreamEncryptionOutput = Shapes::StructureShape.new(name: 'StartDeliveryStreamEncryptionOutput')
     StopDeliveryStreamEncryptionInput = Shapes::StructureShape.new(name: 'StopDeliveryStreamEncryptionInput')
     StopDeliveryStreamEncryptionOutput = Shapes::StructureShape.new(name: 'StopDeliveryStreamEncryptionOutput')
+    SubnetIdList = Shapes::ListShape.new(name: 'SubnetIdList')
     Tag = Shapes::StructureShape.new(name: 'Tag')
     TagDeliveryStreamInput = Shapes::StructureShape.new(name: 'TagDeliveryStreamInput')
     TagDeliveryStreamInputTagList = Shapes::ListShape.new(name: 'TagDeliveryStreamInputTagList')
@@ -169,6 +176,8 @@ module Aws::Firehose
     UpdateDestinationInput = Shapes::StructureShape.new(name: 'UpdateDestinationInput')
     UpdateDestinationOutput = Shapes::StructureShape.new(name: 'UpdateDestinationOutput')
     Username = Shapes::StringShape.new(name: 'Username')
+    VpcConfiguration = Shapes::StructureShape.new(name: 'VpcConfiguration')
+    VpcConfigurationDescription = Shapes::StructureShape.new(name: 'VpcConfigurationDescription')
 
     BufferingHints.add_member(:size_in_m_bs, Shapes::ShapeRef.new(shape: SizeInMBs, location_name: "SizeInMBs"))
     BufferingHints.add_member(:interval_in_seconds, Shapes::ShapeRef.new(shape: IntervalInSeconds, location_name: "IntervalInSeconds"))
@@ -193,6 +202,7 @@ module Aws::Firehose
     CreateDeliveryStreamInput.add_member(:delivery_stream_name, Shapes::ShapeRef.new(shape: DeliveryStreamName, required: true, location_name: "DeliveryStreamName"))
     CreateDeliveryStreamInput.add_member(:delivery_stream_type, Shapes::ShapeRef.new(shape: DeliveryStreamType, location_name: "DeliveryStreamType"))
     CreateDeliveryStreamInput.add_member(:kinesis_stream_source_configuration, Shapes::ShapeRef.new(shape: KinesisStreamSourceConfiguration, location_name: "KinesisStreamSourceConfiguration"))
+    CreateDeliveryStreamInput.add_member(:delivery_stream_encryption_configuration_input, Shapes::ShapeRef.new(shape: DeliveryStreamEncryptionConfigurationInput, location_name: "DeliveryStreamEncryptionConfigurationInput"))
     CreateDeliveryStreamInput.add_member(:s3_destination_configuration, Shapes::ShapeRef.new(shape: S3DestinationConfiguration, deprecated: true, location_name: "S3DestinationConfiguration"))
     CreateDeliveryStreamInput.add_member(:extended_s3_destination_configuration, Shapes::ShapeRef.new(shape: ExtendedS3DestinationConfiguration, location_name: "ExtendedS3DestinationConfiguration"))
     CreateDeliveryStreamInput.add_member(:redshift_destination_configuration, Shapes::ShapeRef.new(shape: RedshiftDestinationConfiguration, location_name: "RedshiftDestinationConfiguration"))
@@ -211,6 +221,7 @@ module Aws::Firehose
     DataFormatConversionConfiguration.struct_class = Types::DataFormatConversionConfiguration
 
     DeleteDeliveryStreamInput.add_member(:delivery_stream_name, Shapes::ShapeRef.new(shape: DeliveryStreamName, required: true, location_name: "DeliveryStreamName"))
+    DeleteDeliveryStreamInput.add_member(:allow_force_delete, Shapes::ShapeRef.new(shape: BooleanObject, location_name: "AllowForceDelete"))
     DeleteDeliveryStreamInput.struct_class = Types::DeleteDeliveryStreamInput
 
     DeleteDeliveryStreamOutput.struct_class = Types::DeleteDeliveryStreamOutput
@@ -218,6 +229,7 @@ module Aws::Firehose
     DeliveryStreamDescription.add_member(:delivery_stream_name, Shapes::ShapeRef.new(shape: DeliveryStreamName, required: true, location_name: "DeliveryStreamName"))
     DeliveryStreamDescription.add_member(:delivery_stream_arn, Shapes::ShapeRef.new(shape: DeliveryStreamARN, required: true, location_name: "DeliveryStreamARN"))
     DeliveryStreamDescription.add_member(:delivery_stream_status, Shapes::ShapeRef.new(shape: DeliveryStreamStatus, required: true, location_name: "DeliveryStreamStatus"))
+    DeliveryStreamDescription.add_member(:failure_description, Shapes::ShapeRef.new(shape: FailureDescription, location_name: "FailureDescription"))
     DeliveryStreamDescription.add_member(:delivery_stream_encryption_configuration, Shapes::ShapeRef.new(shape: DeliveryStreamEncryptionConfiguration, location_name: "DeliveryStreamEncryptionConfiguration"))
     DeliveryStreamDescription.add_member(:delivery_stream_type, Shapes::ShapeRef.new(shape: DeliveryStreamType, required: true, location_name: "DeliveryStreamType"))
     DeliveryStreamDescription.add_member(:version_id, Shapes::ShapeRef.new(shape: DeliveryStreamVersionId, required: true, location_name: "VersionId"))
@@ -228,9 +240,16 @@ module Aws::Firehose
     DeliveryStreamDescription.add_member(:has_more_destinations, Shapes::ShapeRef.new(shape: BooleanObject, required: true, location_name: "HasMoreDestinations"))
     DeliveryStreamDescription.struct_class = Types::DeliveryStreamDescription
 
+    DeliveryStreamEncryptionConfiguration.add_member(:key_arn, Shapes::ShapeRef.new(shape: AWSKMSKeyARN, location_name: "KeyARN"))
+    DeliveryStreamEncryptionConfiguration.add_member(:key_type, Shapes::ShapeRef.new(shape: KeyType, location_name: "KeyType"))
     DeliveryStreamEncryptionConfiguration.add_member(:status, Shapes::ShapeRef.new(shape: DeliveryStreamEncryptionStatus, location_name: "Status"))
+    DeliveryStreamEncryptionConfiguration.add_member(:failure_description, Shapes::ShapeRef.new(shape: FailureDescription, location_name: "FailureDescription"))
     DeliveryStreamEncryptionConfiguration.struct_class = Types::DeliveryStreamEncryptionConfiguration
 
+    DeliveryStreamEncryptionConfigurationInput.add_member(:key_arn, Shapes::ShapeRef.new(shape: AWSKMSKeyARN, location_name: "KeyARN"))
+    DeliveryStreamEncryptionConfigurationInput.add_member(:key_type, Shapes::ShapeRef.new(shape: KeyType, required: true, location_name: "KeyType"))
+    DeliveryStreamEncryptionConfigurationInput.struct_class = Types::DeliveryStreamEncryptionConfigurationInput
+
     DeliveryStreamNameList.member = Shapes::ShapeRef.new(shape: DeliveryStreamName)
 
     DescribeDeliveryStreamInput.add_member(:delivery_stream_name, Shapes::ShapeRef.new(shape: DeliveryStreamName, required: true, location_name: "DeliveryStreamName"))
@@ -271,6 +290,7 @@ module Aws::Firehose
     ElasticsearchDestinationConfiguration.add_member(:s3_configuration, Shapes::ShapeRef.new(shape: S3DestinationConfiguration, required: true, location_name: "S3Configuration"))
     ElasticsearchDestinationConfiguration.add_member(:processing_configuration, Shapes::ShapeRef.new(shape: ProcessingConfiguration, location_name: "ProcessingConfiguration"))
     ElasticsearchDestinationConfiguration.add_member(:cloud_watch_logging_options, Shapes::ShapeRef.new(shape: CloudWatchLoggingOptions, location_name: "CloudWatchLoggingOptions"))
+    ElasticsearchDestinationConfiguration.add_member(:vpc_configuration, Shapes::ShapeRef.new(shape: VpcConfiguration, location_name: "VpcConfiguration"))
     ElasticsearchDestinationConfiguration.struct_class = Types::ElasticsearchDestinationConfiguration
 
     ElasticsearchDestinationDescription.add_member(:role_arn, Shapes::ShapeRef.new(shape: RoleARN, location_name: "RoleARN"))
@@ -285,6 +305,7 @@ module Aws::Firehose
     ElasticsearchDestinationDescription.add_member(:s3_destination_description, Shapes::ShapeRef.new(shape: S3DestinationDescription, location_name: "S3DestinationDescription"))
     ElasticsearchDestinationDescription.add_member(:processing_configuration, Shapes::ShapeRef.new(shape: ProcessingConfiguration, location_name: "ProcessingConfiguration"))
     ElasticsearchDestinationDescription.add_member(:cloud_watch_logging_options, Shapes::ShapeRef.new(shape: CloudWatchLoggingOptions, location_name: "CloudWatchLoggingOptions"))
+    ElasticsearchDestinationDescription.add_member(:vpc_configuration_description, Shapes::ShapeRef.new(shape: VpcConfigurationDescription, location_name: "VpcConfigurationDescription"))
     ElasticsearchDestinationDescription.struct_class = Types::ElasticsearchDestinationDescription
 
     ElasticsearchDestinationUpdate.add_member(:role_arn, Shapes::ShapeRef.new(shape: RoleARN, location_name: "RoleARN"))
@@ -349,6 +370,10 @@ module Aws::Firehose
     ExtendedS3DestinationUpdate.add_member(:data_format_conversion_configuration, Shapes::ShapeRef.new(shape: DataFormatConversionConfiguration, location_name: "DataFormatConversionConfiguration"))
     ExtendedS3DestinationUpdate.struct_class = Types::ExtendedS3DestinationUpdate
 
+    FailureDescription.add_member(:type, Shapes::ShapeRef.new(shape: DeliveryStreamFailureType, required: true, location_name: "Type"))
+    FailureDescription.add_member(:details, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "Details"))
+    FailureDescription.struct_class = Types::FailureDescription
+
     HiveJsonSerDe.add_member(:timestamp_formats, Shapes::ShapeRef.new(shape: ListOfNonEmptyStrings, location_name: "TimestampFormats"))
     HiveJsonSerDe.struct_class = Types::HiveJsonSerDe
 
@@ -358,6 +383,10 @@ module Aws::Firehose
     InvalidArgumentException.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "message"))
     InvalidArgumentException.struct_class = Types::InvalidArgumentException
 
+    InvalidKMSResourceException.add_member(:code, Shapes::ShapeRef.new(shape: ErrorCode, location_name: "code"))
+    InvalidKMSResourceException.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "message"))
+    InvalidKMSResourceException.struct_class = Types::InvalidKMSResourceException
+
     KMSEncryptionConfig.add_member(:awskms_key_arn, Shapes::ShapeRef.new(shape: AWSKMSKeyARN, required: true, location_name: "AWSKMSKeyARN"))
     KMSEncryptionConfig.struct_class = Types::KMSEncryptionConfig
 
@@ -555,6 +584,8 @@ module Aws::Firehose
     SchemaConfiguration.add_member(:version_id, Shapes::ShapeRef.new(shape: NonEmptyStringWithoutWhitespace, location_name: "VersionId"))
     SchemaConfiguration.struct_class = Types::SchemaConfiguration
 
+    SecurityGroupIdList.member = Shapes::ShapeRef.new(shape: NonEmptyStringWithoutWhitespace)
+
     Serializer.add_member(:parquet_ser_de, Shapes::ShapeRef.new(shape: ParquetSerDe, location_name: "ParquetSerDe"))
     Serializer.add_member(:orc_ser_de, Shapes::ShapeRef.new(shape: OrcSerDe, location_name: "OrcSerDe"))
     Serializer.struct_class = Types::Serializer
@@ -602,6 +633,7 @@ module Aws::Firehose
     SplunkRetryOptions.struct_class = Types::SplunkRetryOptions
 
     StartDeliveryStreamEncryptionInput.add_member(:delivery_stream_name, Shapes::ShapeRef.new(shape: DeliveryStreamName, required: true, location_name: "DeliveryStreamName"))
+    StartDeliveryStreamEncryptionInput.add_member(:delivery_stream_encryption_configuration_input, Shapes::ShapeRef.new(shape: DeliveryStreamEncryptionConfigurationInput, location_name: "DeliveryStreamEncryptionConfigurationInput"))
     StartDeliveryStreamEncryptionInput.struct_class = Types::StartDeliveryStreamEncryptionInput
 
     StartDeliveryStreamEncryptionOutput.struct_class = Types::StartDeliveryStreamEncryptionOutput
@@ -611,6 +643,8 @@ module Aws::Firehose
 
     StopDeliveryStreamEncryptionOutput.struct_class = Types::StopDeliveryStreamEncryptionOutput
 
+    SubnetIdList.member = Shapes::ShapeRef.new(shape: NonEmptyStringWithoutWhitespace)
+
     Tag.add_member(:key, Shapes::ShapeRef.new(shape: TagKey, required: true, location_name: "Key"))
     Tag.add_member(:value, Shapes::ShapeRef.new(shape: TagValue, location_name: "Value"))
     Tag.struct_class = Types::Tag
@@ -643,6 +677,17 @@ module Aws::Firehose
 
     UpdateDestinationOutput.struct_class = Types::UpdateDestinationOutput
 
+    VpcConfiguration.add_member(:subnet_ids, Shapes::ShapeRef.new(shape: SubnetIdList, required: true, location_name: "SubnetIds"))
+    VpcConfiguration.add_member(:role_arn, Shapes::ShapeRef.new(shape: RoleARN, required: true, location_name: "RoleARN"))
+    VpcConfiguration.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIdList, required: true, location_name: "SecurityGroupIds"))
+    VpcConfiguration.struct_class = Types::VpcConfiguration
+
+    VpcConfigurationDescription.add_member(:subnet_ids, Shapes::ShapeRef.new(shape: SubnetIdList, required: true, location_name: "SubnetIds"))
+    VpcConfigurationDescription.add_member(:role_arn, Shapes::ShapeRef.new(shape: RoleARN, required: true, location_name: "RoleARN"))
+    VpcConfigurationDescription.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIdList, required: true, location_name: "SecurityGroupIds"))
+    VpcConfigurationDescription.add_member(:vpc_id, Shapes::ShapeRef.new(shape: NonEmptyStringWithoutWhitespace, required: true, location_name: "VpcId"))
+    VpcConfigurationDescription.struct_class = Types::VpcConfigurationDescription
+
 
     # @api private
     API = Seahorse::Model::Api.new.tap do |api|
@@ -671,6 +716,7 @@ module Aws::Firehose
         o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
         o.errors << Shapes::ShapeRef.new(shape: LimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: ResourceInUseException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidKMSResourceException)
       end)
 
       api.add_operation(:delete_delivery_stream, Seahorse::Model::Operation.new.tap do |o|
@@ -719,6 +765,7 @@ module Aws::Firehose
         o.output = Shapes::ShapeRef.new(shape: PutRecordOutput)
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidKMSResourceException)
         o.errors << Shapes::ShapeRef.new(shape: ServiceUnavailableException)
       end)
 
@@ -730,6 +777,7 @@ module Aws::Firehose
         o.output = Shapes::ShapeRef.new(shape: PutRecordBatchOutput)
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidKMSResourceException)
         o.errors << Shapes::ShapeRef.new(shape: ServiceUnavailableException)
       end)
 
@@ -743,6 +791,7 @@ module Aws::Firehose
         o.errors << Shapes::ShapeRef.new(shape: ResourceInUseException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidArgumentException)
         o.errors << Shapes::ShapeRef.new(shape: LimitExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidKMSResourceException)
       end)
 
       api.add_operation(:stop_delivery_stream_encryption, Seahorse::Model::Operation.new.tap do |o|

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

@@ -6,6 +6,35 @@
 # WARNING ABOUT GENERATED CODE
 
 module Aws::Firehose
+
+  # When Firehose returns an error response, the Ruby SDK constructs and raises an error.
+  # These errors all extend Aws::Firehose::Errors::ServiceError < {Aws::Errors::ServiceError}
+  #
+  # You can rescue all Firehose errors using ServiceError:
+  #
+  #     begin
+  #       # do stuff
+  #     rescue Aws::Firehose::Errors::ServiceError
+  #       # rescues all Firehose API errors
+  #     end
+  #
+  #
+  # ## Request Context
+  # ServiceError objects have a {Aws::Errors::ServiceError#context #context} method that returns
+  # information about the request that generated the error.
+  # See {Seahorse::Client::RequestContext} for more information.
+  #
+  # ## Error Classes
+  # * {ConcurrentModificationException}
+  # * {InvalidArgumentException}
+  # * {InvalidKMSResourceException}
+  # * {LimitExceededException}
+  # * {ResourceInUseException}
+  # * {ResourceNotFoundException}
+  # * {ServiceUnavailableException}
+  #
+  # Additionally, error classes are dynamically generated for service errors based on the error code
+  # if they are not defined above.
   module Errors
 
     extend Aws::Errors::DynamicErrors
@@ -23,7 +52,6 @@ module Aws::Firehose
       def message
         @message || @data[:message]
       end
-
     end
 
     class InvalidArgumentException < ServiceError
@@ -39,7 +67,26 @@ module Aws::Firehose
       def message
         @message || @data[:message]
       end
+    end
 
+    class InvalidKMSResourceException < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::Firehose::Types::InvalidKMSResourceException] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+
+      # @return [String]
+      def code
+        @code || @data[:code]
+      end
+
+      # @return [String]
+      def message
+        @message || @data[:message]
+      end
     end
 
     class LimitExceededException < ServiceError
@@ -55,7 +102,6 @@ module Aws::Firehose
       def message
         @message || @data[:message]
       end
-
     end
 
     class ResourceInUseException < ServiceError
@@ -71,7 +117,6 @@ module Aws::Firehose
       def message
         @message || @data[:message]
       end
-
     end
 
     class ResourceNotFoundException < ServiceError
@@ -87,7 +132,6 @@ module Aws::Firehose
       def message
         @message || @data[:message]
       end
-
     end
 
     class ServiceUnavailableException < ServiceError
@@ -103,7 +147,6 @@ module Aws::Firehose
       def message
         @message || @data[:message]
       end
-
     end
 
   end

data/lib/aws-sdk-firehose/resource.rb

@@ -6,6 +6,7 @@
 # WARNING ABOUT GENERATED CODE
 
 module Aws::Firehose
+
   class Resource
 
     # @param options ({})

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

@@ -168,6 +168,10 @@ module Aws::Firehose
     #           kinesis_stream_arn: "KinesisStreamARN", # required
     #           role_arn: "RoleARN", # required
     #         },
+    #         delivery_stream_encryption_configuration_input: {
+    #           key_arn: "AWSKMSKeyARN",
+    #           key_type: "AWS_OWNED_CMK", # required, accepts AWS_OWNED_CMK, CUSTOMER_MANAGED_CMK
+    #         },
     #         s3_destination_configuration: {
     #           role_arn: "RoleARN", # required
     #           bucket_arn: "BucketARN", # required
@@ -177,7 +181,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -199,7 +203,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -235,7 +239,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -320,7 +324,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -357,7 +361,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -400,7 +404,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -432,6 +436,11 @@ module Aws::Firehose
     #             log_group_name: "LogGroupName",
     #             log_stream_name: "LogStreamName",
     #           },
+    #           vpc_configuration: {
+    #             subnet_ids: ["NonEmptyStringWithoutWhitespace"], # required
+    #             role_arn: "RoleARN", # required
+    #             security_group_ids: ["NonEmptyStringWithoutWhitespace"], # required
+    #           },
     #         },
     #         splunk_destination_configuration: {
     #           hec_endpoint: "HECEndpoint", # required
@@ -451,7 +460,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -517,6 +526,11 @@ module Aws::Firehose
     #   source stream.
     #   @return [Types::KinesisStreamSourceConfiguration]
     #
+    # @!attribute [rw] delivery_stream_encryption_configuration_input
+    #   Used to specify the type and Amazon Resource Name (ARN) of the KMS
+    #   key needed for Server-Side Encryption (SSE).
+    #   @return [Types::DeliveryStreamEncryptionConfigurationInput]
+    #
     # @!attribute [rw] s3_destination_configuration
     #   \[Deprecated\] The destination in Amazon S3. You can specify only
     #   one destination.
@@ -561,6 +575,7 @@ module Aws::Firehose
       :delivery_stream_name,
       :delivery_stream_type,
       :kinesis_stream_source_configuration,
+      :delivery_stream_encryption_configuration_input,
       :s3_destination_configuration,
       :extended_s3_destination_configuration,
       :redshift_destination_configuration,
@@ -648,17 +663,19 @@ module Aws::Firehose
     #
     # @!attribute [rw] schema_configuration
     #   Specifies the AWS Glue Data Catalog table that contains the column
-    #   information.
+    #   information. This parameter is required if `Enabled` is set to true.
     #   @return [Types::SchemaConfiguration]
     #
     # @!attribute [rw] input_format_configuration
     #   Specifies the deserializer that you want Kinesis Data Firehose to
-    #   use to convert the format of your data from JSON.
+    #   use to convert the format of your data from JSON. This parameter is
+    #   required if `Enabled` is set to true.
     #   @return [Types::InputFormatConfiguration]
     #
     # @!attribute [rw] output_format_configuration
     #   Specifies the serializer that you want Kinesis Data Firehose to use
     #   to convert the format of your data to the Parquet or ORC format.
+    #   This parameter is required if `Enabled` is set to true.
     #   @return [Types::OutputFormatConfiguration]
     #
     # @!attribute [rw] enabled
@@ -681,16 +698,35 @@ module Aws::Firehose
     #
     #       {
     #         delivery_stream_name: "DeliveryStreamName", # required
+    #         allow_force_delete: false,
     #       }
     #
     # @!attribute [rw] delivery_stream_name
     #   The name of the delivery stream.
     #   @return [String]
     #
+    # @!attribute [rw] allow_force_delete
+    #   Set this to true if you want to delete the delivery stream even if
+    #   Kinesis Data Firehose is unable to retire the grant for the CMK.
+    #   Kinesis Data Firehose might be unable to retire the grant due to a
+    #   customer error, such as when the CMK or the grant are in an invalid
+    #   state. If you force deletion, you can then use the [RevokeGrant][1]
+    #   operation to revoke the grant you gave to Kinesis Data Firehose. If
+    #   a failure to retire the grant happens due to an AWS KMS issue,
+    #   Kinesis Data Firehose keeps retrying the delete operation.
+    #
+    #   The default value is false.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/kms/latest/APIReference/API_RevokeGrant.html
+    #   @return [Boolean]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/DeleteDeliveryStreamInput AWS API Documentation
     #
     class DeleteDeliveryStreamInput < Struct.new(
-      :delivery_stream_name)
+      :delivery_stream_name,
+      :allow_force_delete)
       include Aws::Structure
     end
 
@@ -715,9 +751,19 @@ module Aws::Firehose
     #   @return [String]
     #
     # @!attribute [rw] delivery_stream_status
-    #   The status of the delivery stream.
+    #   The status of the delivery stream. If the status of a delivery
+    #   stream is `CREATING_FAILED`, this status doesn't change, and you
+    #   can't invoke `CreateDeliveryStream` again on it. However, you can
+    #   invoke the DeleteDeliveryStream operation to delete it.
     #   @return [String]
     #
+    # @!attribute [rw] failure_description
+    #   Provides details in case one of the following operations fails due
+    #   to an error related to KMS: CreateDeliveryStream,
+    #   DeleteDeliveryStream, StartDeliveryStreamEncryption,
+    #   StopDeliveryStreamEncryption.
+    #   @return [Types::FailureDescription]
+    #
     # @!attribute [rw] delivery_stream_encryption_configuration
     #   Indicates the server-side encryption (SSE) status for the delivery
     #   stream.
@@ -767,6 +813,7 @@ module Aws::Firehose
       :delivery_stream_name,
       :delivery_stream_arn,
       :delivery_stream_status,
+      :failure_description,
       :delivery_stream_encryption_configuration,
       :delivery_stream_type,
       :version_id,
@@ -778,18 +825,110 @@ module Aws::Firehose
       include Aws::Structure
     end
 
-    # Indicates the server-side encryption (SSE) status for the delivery
-    # stream.
+    # Contains information about the server-side encryption (SSE) status for
+    # the delivery stream, the type customer master key (CMK) in use, if
+    # any, and the ARN of the CMK. You can get
+    # `DeliveryStreamEncryptionConfiguration` by invoking the
+    # DescribeDeliveryStream operation.
+    #
+    # @!attribute [rw] key_arn
+    #   If `KeyType` is `CUSTOMER_MANAGED_CMK`, this field contains the ARN
+    #   of the customer managed CMK. If `KeyType` is `AWS_OWNED_CMK`,
+    #   `DeliveryStreamEncryptionConfiguration` doesn't contain a value for
+    #   `KeyARN`.
+    #   @return [String]
+    #
+    # @!attribute [rw] key_type
+    #   Indicates the type of customer master key (CMK) that is used for
+    #   encryption. The default setting is `AWS_OWNED_CMK`. For more
+    #   information about CMKs, see [Customer Master Keys (CMKs)][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys
+    #   @return [String]
     #
     # @!attribute [rw] status
-    #   For a full description of the different values of this status, see
-    #   StartDeliveryStreamEncryption and StopDeliveryStreamEncryption.
+    #   This is the server-side encryption (SSE) status for the delivery
+    #   stream. For a full description of the different values of this
+    #   status, see StartDeliveryStreamEncryption and
+    #   StopDeliveryStreamEncryption. If this status is `ENABLING_FAILED` or
+    #   `DISABLING_FAILED`, it is the status of the most recent attempt to
+    #   enable or disable SSE, respectively.
     #   @return [String]
     #
+    # @!attribute [rw] failure_description
+    #   Provides details in case one of the following operations fails due
+    #   to an error related to KMS: CreateDeliveryStream,
+    #   DeleteDeliveryStream, StartDeliveryStreamEncryption,
+    #   StopDeliveryStreamEncryption.
+    #   @return [Types::FailureDescription]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/DeliveryStreamEncryptionConfiguration AWS API Documentation
     #
     class DeliveryStreamEncryptionConfiguration < Struct.new(
-      :status)
+      :key_arn,
+      :key_type,
+      :status,
+      :failure_description)
+      include Aws::Structure
+    end
+
+    # Specifies the type and Amazon Resource Name (ARN) of the CMK to use
+    # for Server-Side Encryption (SSE).
+    #
+    # @note When making an API call, you may pass DeliveryStreamEncryptionConfigurationInput
+    #   data as a hash:
+    #
+    #       {
+    #         key_arn: "AWSKMSKeyARN",
+    #         key_type: "AWS_OWNED_CMK", # required, accepts AWS_OWNED_CMK, CUSTOMER_MANAGED_CMK
+    #       }
+    #
+    # @!attribute [rw] key_arn
+    #   If you set `KeyType` to `CUSTOMER_MANAGED_CMK`, you must specify the
+    #   Amazon Resource Name (ARN) of the CMK. If you set `KeyType` to
+    #   `AWS_OWNED_CMK`, Kinesis Data Firehose uses a service-account CMK.
+    #   @return [String]
+    #
+    # @!attribute [rw] key_type
+    #   Indicates the type of customer master key (CMK) to use for
+    #   encryption. The default setting is `AWS_OWNED_CMK`. For more
+    #   information about CMKs, see [Customer Master Keys (CMKs)][1]. When
+    #   you invoke CreateDeliveryStream or StartDeliveryStreamEncryption
+    #   with `KeyType` set to CUSTOMER\_MANAGED\_CMK, Kinesis Data Firehose
+    #   invokes the Amazon KMS operation [CreateGrant][2] to create a grant
+    #   that allows the Kinesis Data Firehose service to use the customer
+    #   managed CMK to perform encryption and decryption. Kinesis Data
+    #   Firehose manages that grant.
+    #
+    #   When you invoke StartDeliveryStreamEncryption to change the CMK for
+    #   a delivery stream that is encrypted with a customer managed CMK,
+    #   Kinesis Data Firehose schedules the grant it had on the old CMK for
+    #   retirement.
+    #
+    #   You can use a CMK of type CUSTOMER\_MANAGED\_CMK to encrypt up to
+    #   500 delivery streams. If a CreateDeliveryStream or
+    #   StartDeliveryStreamEncryption operation exceeds this limit, Kinesis
+    #   Data Firehose throws a `LimitExceededException`.
+    #
+    #   To encrypt your delivery stream, use symmetric CMKs. Kinesis Data
+    #   Firehose doesn't support asymmetric CMKs. For information about
+    #   symmetric and asymmetric CMKs, see [About Symmetric and Asymmetric
+    #   CMKs][3] in the AWS Key Management Service developer guide.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys
+    #   [2]: https://docs.aws.amazon.com/kms/latest/APIReference/API_CreateGrant.html
+    #   [3]: https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-concepts.html
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/DeliveryStreamEncryptionConfigurationInput AWS API Documentation
+    #
+    class DeliveryStreamEncryptionConfigurationInput < Struct.new(
+      :key_arn,
+      :key_type)
       include Aws::Structure
     end
 
@@ -992,7 +1131,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -1024,6 +1163,11 @@ module Aws::Firehose
     #           log_group_name: "LogGroupName",
     #           log_stream_name: "LogStreamName",
     #         },
+    #         vpc_configuration: {
+    #           subnet_ids: ["NonEmptyStringWithoutWhitespace"], # required
+    #           role_arn: "RoleARN", # required
+    #           security_group_ids: ["NonEmptyStringWithoutWhitespace"], # required
+    #         },
     #       }
     #
     # @!attribute [rw] role_arn
@@ -1121,6 +1265,10 @@ module Aws::Firehose
     #   The Amazon CloudWatch logging options for your delivery stream.
     #   @return [Types::CloudWatchLoggingOptions]
     #
+    # @!attribute [rw] vpc_configuration
+    #   The details of the VPC of the Amazon ES destination.
+    #   @return [Types::VpcConfiguration]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/ElasticsearchDestinationConfiguration AWS API Documentation
     #
     class ElasticsearchDestinationConfiguration < Struct.new(
@@ -1135,7 +1283,8 @@ module Aws::Firehose
       :s3_backup_mode,
       :s3_configuration,
       :processing_configuration,
-      :cloud_watch_logging_options)
+      :cloud_watch_logging_options,
+      :vpc_configuration)
       include Aws::Structure
     end
 
@@ -1207,6 +1356,10 @@ module Aws::Firehose
     #   The Amazon CloudWatch logging options.
     #   @return [Types::CloudWatchLoggingOptions]
     #
+    # @!attribute [rw] vpc_configuration_description
+    #   The details of the VPC of the Amazon ES destination.
+    #   @return [Types::VpcConfigurationDescription]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/ElasticsearchDestinationDescription AWS API Documentation
     #
     class ElasticsearchDestinationDescription < Struct.new(
@@ -1221,7 +1374,8 @@ module Aws::Firehose
       :s3_backup_mode,
       :s3_destination_description,
       :processing_configuration,
-      :cloud_watch_logging_options)
+      :cloud_watch_logging_options,
+      :vpc_configuration_description)
       include Aws::Structure
     end
 
@@ -1253,7 +1407,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -1455,7 +1609,7 @@ module Aws::Firehose
     #           size_in_m_bs: 1,
     #           interval_in_seconds: 1,
     #         },
-    #         compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #         compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #         encryption_configuration: {
     #           no_encryption_config: "NoEncryption", # accepts NoEncryption
     #           kms_encryption_config: {
@@ -1491,7 +1645,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -1759,7 +1913,7 @@ module Aws::Firehose
     #           size_in_m_bs: 1,
     #           interval_in_seconds: 1,
     #         },
-    #         compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #         compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #         encryption_configuration: {
     #           no_encryption_config: "NoEncryption", # accepts NoEncryption
     #           kms_encryption_config: {
@@ -1795,7 +1949,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -1953,6 +2107,26 @@ module Aws::Firehose
       include Aws::Structure
     end
 
+    # Provides details in case one of the following operations fails due to
+    # an error related to KMS: CreateDeliveryStream, DeleteDeliveryStream,
+    # StartDeliveryStreamEncryption, StopDeliveryStreamEncryption.
+    #
+    # @!attribute [rw] type
+    #   The type of error that caused the failure.
+    #   @return [String]
+    #
+    # @!attribute [rw] details
+    #   A message providing details about the error that caused the failure.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/FailureDescription AWS API Documentation
+    #
+    class FailureDescription < Struct.new(
+      :type,
+      :details)
+      include Aws::Structure
+    end
+
     # The native Hive / HCatalog JsonSerDe. Used by Kinesis Data Firehose
     # for deserializing data, which means converting it from the JSON format
     # in preparation for serializing it to the Parquet or ORC format. This
@@ -1990,7 +2164,8 @@ module Aws::Firehose
     end
 
     # Specifies the deserializer you want to use to convert the format of
-    # the input data.
+    # the input data. This parameter is required if `Enabled` is set to
+    # true.
     #
     # @note When making an API call, you may pass InputFormatConfiguration
     #   data as a hash:
@@ -2036,6 +2211,26 @@ module Aws::Firehose
       include Aws::Structure
     end
 
+    # Kinesis Data Firehose throws this exception when an attempt to put
+    # records or to start or stop delivery stream encryption fails. This
+    # happens when the KMS service throws one of the following exception
+    # types: `AccessDeniedException`, `InvalidStateException`,
+    # `DisabledException`, or `NotFoundException`.
+    #
+    # @!attribute [rw] code
+    #   @return [String]
+    #
+    # @!attribute [rw] message
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/InvalidKMSResourceException AWS API Documentation
+    #
+    class InvalidKMSResourceException < Struct.new(
+      :code,
+      :message)
+      include Aws::Structure
+    end
+
     # Describes an encryption key for a destination in Amazon S3.
     #
     # @note When making an API call, you may pass KMSEncryptionConfig
@@ -2424,7 +2619,8 @@ module Aws::Firehose
     end
 
     # Specifies the serializer that you want Kinesis Data Firehose to use to
-    # convert the format of your data before it writes it to Amazon S3.
+    # convert the format of your data before it writes it to Amazon S3. This
+    # parameter is required if `Enabled` is set to true.
     #
     # @note When making an API call, you may pass OutputFormatConfiguration
     #   data as a hash:
@@ -2504,7 +2700,7 @@ module Aws::Firehose
     #   The compression code to use over data blocks. The possible values
     #   are `UNCOMPRESSED`, `SNAPPY`, and `GZIP`, with the default being
     #   `SNAPPY`. Use `SNAPPY` for higher decompression speed. Use `GZIP` if
-    #   the compression ration is more important than speed.
+    #   the compression ratio is more important than speed.
     #   @return [String]
     #
     # @!attribute [rw] enable_dictionary_compression
@@ -2800,7 +2996,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -2837,7 +3033,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -3026,7 +3222,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -3063,7 +3259,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -3223,7 +3419,7 @@ module Aws::Firehose
     #           size_in_m_bs: 1,
     #           interval_in_seconds: 1,
     #         },
-    #         compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #         compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #         encryption_configuration: {
     #           no_encryption_config: "NoEncryption", # accepts NoEncryption
     #           kms_encryption_config: {
@@ -3403,7 +3599,7 @@ module Aws::Firehose
     #           size_in_m_bs: 1,
     #           interval_in_seconds: 1,
     #         },
-    #         compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #         compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #         encryption_configuration: {
     #           no_encryption_config: "NoEncryption", # accepts NoEncryption
     #           kms_encryption_config: {
@@ -3495,7 +3691,8 @@ module Aws::Firehose
     end
 
     # Specifies the schema to which you want Kinesis Data Firehose to
-    # configure your data before it writes it to Amazon S3.
+    # configure your data before it writes it to Amazon S3. This parameter
+    # is required if `Enabled` is set to true.
     #
     # @note When making an API call, you may pass SchemaConfiguration
     #   data as a hash:
@@ -3676,7 +3873,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -3861,7 +4058,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -3989,6 +4186,10 @@ module Aws::Firehose
     #
     #       {
     #         delivery_stream_name: "DeliveryStreamName", # required
+    #         delivery_stream_encryption_configuration_input: {
+    #           key_arn: "AWSKMSKeyARN",
+    #           key_type: "AWS_OWNED_CMK", # required, accepts AWS_OWNED_CMK, CUSTOMER_MANAGED_CMK
+    #         },
     #       }
     #
     # @!attribute [rw] delivery_stream_name
@@ -3996,10 +4197,16 @@ module Aws::Firehose
     #   server-side encryption (SSE).
     #   @return [String]
     #
+    # @!attribute [rw] delivery_stream_encryption_configuration_input
+    #   Used to specify the type and Amazon Resource Name (ARN) of the KMS
+    #   key needed for Server-Side Encryption (SSE).
+    #   @return [Types::DeliveryStreamEncryptionConfigurationInput]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/StartDeliveryStreamEncryptionInput AWS API Documentation
     #
     class StartDeliveryStreamEncryptionInput < Struct.new(
-      :delivery_stream_name)
+      :delivery_stream_name,
+      :delivery_stream_encryption_configuration_input)
       include Aws::Structure
     end
 
@@ -4139,7 +4346,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -4161,7 +4368,7 @@ module Aws::Firehose
     #             size_in_m_bs: 1,
     #             interval_in_seconds: 1,
     #           },
-    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #           compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #           encryption_configuration: {
     #             no_encryption_config: "NoEncryption", # accepts NoEncryption
     #             kms_encryption_config: {
@@ -4197,7 +4404,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -4282,7 +4489,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -4319,7 +4526,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -4361,7 +4568,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -4412,7 +4619,7 @@ module Aws::Firehose
     #               size_in_m_bs: 1,
     #               interval_in_seconds: 1,
     #             },
-    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy
+    #             compression_format: "UNCOMPRESSED", # accepts UNCOMPRESSED, GZIP, ZIP, Snappy, HADOOP_SNAPPY
     #             encryption_configuration: {
     #               no_encryption_config: "NoEncryption", # accepts NoEncryption
     #               kms_encryption_config: {
@@ -4503,5 +4710,107 @@ module Aws::Firehose
     #
     class UpdateDestinationOutput < Aws::EmptyStructure; end
 
+    # The details of the VPC of the Amazon ES destination.
+    #
+    # @note When making an API call, you may pass VpcConfiguration
+    #   data as a hash:
+    #
+    #       {
+    #         subnet_ids: ["NonEmptyStringWithoutWhitespace"], # required
+    #         role_arn: "RoleARN", # required
+    #         security_group_ids: ["NonEmptyStringWithoutWhitespace"], # required
+    #       }
+    #
+    # @!attribute [rw] subnet_ids
+    #   The IDs of the subnets that you want Kinesis Data Firehose to use to
+    #   create ENIs in the VPC of the Amazon ES destination. Make sure that
+    #   the routing tables and inbound and outbound rules allow traffic to
+    #   flow from the subnets whose IDs are specified here to the subnets
+    #   that have the destination Amazon ES endpoints. Kinesis Data Firehose
+    #   creates at least one ENI in each of the subnets that are specified
+    #   here. Do not delete or modify these ENIs.
+    #
+    #   The number of ENIs that Kinesis Data Firehose creates in the subnets
+    #   specified here scales up and down automatically based on throughput.
+    #   To enable Kinesis Data Firehose to scale up the number of ENIs to
+    #   match throughput, ensure that you have sufficient quota. To help you
+    #   calculate the quota you need, assume that Kinesis Data Firehose can
+    #   create up to three ENIs for this delivery stream for each of the
+    #   subnets specified here. For more information about ENI quota, see
+    #   [Network Interfaces ][1] in the Amazon VPC Quotas topic.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/vpc/latest/userguide/amazon-vpc-limits.html#vpc-limits-enis
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] role_arn
+    #   The ARN of the IAM role that you want the delivery stream to use to
+    #   create endpoints in the destination VPC.
+    #   @return [String]
+    #
+    # @!attribute [rw] security_group_ids
+    #   The IDs of the security groups that you want Kinesis Data Firehose
+    #   to use when it creates ENIs in the VPC of the Amazon ES destination.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/VpcConfiguration AWS API Documentation
+    #
+    class VpcConfiguration < Struct.new(
+      :subnet_ids,
+      :role_arn,
+      :security_group_ids)
+      include Aws::Structure
+    end
+
+    # The details of the VPC of the Amazon ES destination.
+    #
+    # @!attribute [rw] subnet_ids
+    #   The IDs of the subnets that Kinesis Data Firehose uses to create
+    #   ENIs in the VPC of the Amazon ES destination. Make sure that the
+    #   routing tables and inbound and outbound rules allow traffic to flow
+    #   from the subnets whose IDs are specified here to the subnets that
+    #   have the destination Amazon ES endpoints. Kinesis Data Firehose
+    #   creates at least one ENI in each of the subnets that are specified
+    #   here. Do not delete or modify these ENIs.
+    #
+    #   The number of ENIs that Kinesis Data Firehose creates in the subnets
+    #   specified here scales up and down automatically based on throughput.
+    #   To enable Kinesis Data Firehose to scale up the number of ENIs to
+    #   match throughput, ensure that you have sufficient quota. To help you
+    #   calculate the quota you need, assume that Kinesis Data Firehose can
+    #   create up to three ENIs for this delivery stream for each of the
+    #   subnets specified here. For more information about ENI quota, see
+    #   [Network Interfaces ][1] in the Amazon VPC Quotas topic.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/vpc/latest/userguide/amazon-vpc-limits.html#vpc-limits-enis
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] role_arn
+    #   The ARN of the IAM role that you want the delivery stream uses to
+    #   create endpoints in the destination VPC.
+    #   @return [String]
+    #
+    # @!attribute [rw] security_group_ids
+    #   The IDs of the security groups that Kinesis Data Firehose uses when
+    #   it creates ENIs in the VPC of the Amazon ES destination.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] vpc_id
+    #   The ID of the Amazon ES destination's VPC.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/firehose-2015-08-04/VpcConfigurationDescription AWS API Documentation
+    #
+    class VpcConfigurationDescription < Struct.new(
+      :subnet_ids,
+      :role_arn,
+      :security_group_ids,
+      :vpc_id)
+      include Aws::Structure
+    end
+
   end
 end