Merge branch 'develop' into eks

# Conflicts:
#	stack/vpc.py

Author: dpoirier

CHANGELOG.rst

@@ -21,7 +21,7 @@ What's new in 2.0.0:
 
 * Add support for Elastic Kubernetes Service (EKS).
 * Re-purpose use_aes256_encryption flag to support encryption across S3, RDS, Elasticache (Redis only), and RDS (thanks @dsummersl)
-* Add support for Customer Managed CMKs with ``CustomerManagedCmkArn`` parameter
+* Add support for Customer Managed CMKs with ``CustomerManagedCmkArn`` parameter (not applied to public buckets)
 * Add configurable ContainerVolumeSize to change root volume size of EC2 instances (thanks @dsummersl)
 * Change generated template output from JSON to YAML (thanks @cchurch)
 * The stack no longer prompts for a ``SECRET_KEY`` if it won't be used for the stack type in question.
@@ -35,6 +35,10 @@ What's new in 2.0.0:
 * Add parameters to customize VPC and subnet IPv4 CIDR blocks (**It is generally not possible to change the CIDR blocks for an existing stack.**).
 * Add RDS and ElastiCache endpoint outputs.
 * Add CustomAppCertificateArn parameter to allow association with an existing ACM certificate.
+* Add VPC Endpoint for S3.
+* Add DatabaseReplication parameter to add a database replica (** this will fail if DatabaseBackupRetentionDays is 0.**).
+* Add optional SFTP server, including S3 bucket, transfer server, and user role and scopedown policy to use when creating
+  users in the transfer server.
 
 
 `1.4.0`_ (2019-08-05)

README.rst

@@ -340,6 +340,8 @@ These environment variables are:
 * ``DATABASE_URL``: The URL to the RDS instance created as part of this stack. If ``(none)`` is
   selected for the ``DatabaseClass`` during stack creation, the value of this variable will be
   an empty string (``''``).
+* ``DATABASE_REPLICA_URL``: The URL to the RDS database replica instance. This is an empty string
+  if there's no replica database.
 * ``CACHE_URL``: The URL to the Redis or Memcached instance created as part of this stack (may be
   used as a cache or session storage, e.g.). If using Redis, note that it supports multiple
   databases and no database ID is included as part of the URL, so you should append a forward slash

stack/__init__.py

@@ -1,5 +1,6 @@
 import os
 
+from . import sftp  # noqa: F401
 from . import assets  # noqa: F401
 from . import cache  # noqa: F401
 from . import database  # noqa: F401