diff --git a/AUTHORS.md b/AUTHORS.md
index 6b7c9629..0a152505 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -53,3 +53,4 @@ Moto is written by Steve Pulec with contributions from:
* [Jim Shields](https://github.com/jimjshields)
* [William Richard](https://github.com/william-richard)
* [Alex Casalboni](https://github.com/alexcasalboni)
+* [Jon Beilke](https://github.com/jrbeilke)
diff --git a/moto/rds/models.py b/moto/rds/models.py
index 77deff09..feecefe0 100644
--- a/moto/rds/models.py
+++ b/moto/rds/models.py
@@ -48,6 +48,10 @@ class Database(BaseModel):
if self.publicly_accessible is None:
self.publicly_accessible = True
+ self.copy_tags_to_snapshot = kwargs.get("copy_tags_to_snapshot")
+ if self.copy_tags_to_snapshot is None:
+ self.copy_tags_to_snapshot = False
+
self.backup_retention_period = kwargs.get("backup_retention_period")
if self.backup_retention_period is None:
self.backup_retention_period = 1
@@ -137,6 +141,7 @@ class Database(BaseModel):
"multi_az": properties.get("MultiAZ"),
"port": properties.get('Port', 3306),
"publicly_accessible": properties.get("PubliclyAccessible"),
+ "copy_tags_to_snapshot": properties.get("CopyTagsToSnapshot"),
"region": region_name,
"security_groups": security_groups,
"storage_encrypted": properties.get("StorageEncrypted"),
@@ -217,6 +222,7 @@ class Database(BaseModel):
{% endif %}
{{ database.publicly_accessible }}
+ {{ database.copy_tags_to_snapshot }}
{{ database.auto_minor_version_upgrade }}
{{ database.allocated_storage }}
{{ database.storage_encrypted }}
diff --git a/moto/rds2/models.py b/moto/rds2/models.py
index 3fc4b6d6..c656f5ec 100644
--- a/moto/rds2/models.py
+++ b/moto/rds2/models.py
@@ -73,6 +73,9 @@ class Database(BaseModel):
self.publicly_accessible = kwargs.get("publicly_accessible")
if self.publicly_accessible is None:
self.publicly_accessible = True
+ self.copy_tags_to_snapshot = kwargs.get("copy_tags_to_snapshot")
+ if self.copy_tags_to_snapshot is None:
+ self.copy_tags_to_snapshot = False
self.backup_retention_period = kwargs.get("backup_retention_period")
if self.backup_retention_period is None:
self.backup_retention_period = 1
@@ -208,6 +211,7 @@ class Database(BaseModel):
{% endif %}
{{ database.publicly_accessible }}
+ {{ database.copy_tags_to_snapshot }}
{{ database.auto_minor_version_upgrade }}
{{ database.allocated_storage }}
{{ database.storage_encrypted }}
@@ -304,6 +308,7 @@ class Database(BaseModel):
"db_parameter_group_name": properties.get('DBParameterGroupName'),
"port": properties.get('Port', 3306),
"publicly_accessible": properties.get("PubliclyAccessible"),
+ "copy_tags_to_snapshot": properties.get("CopyTagsToSnapshot"),
"region": region_name,
"security_groups": security_groups,
"storage_encrypted": properties.get("StorageEncrypted"),
@@ -362,6 +367,7 @@ class Database(BaseModel):
"PreferredBackupWindow": "{{ database.preferred_backup_window }}",
"PreferredMaintenanceWindow": "{{ database.preferred_maintenance_window }}",
"PubliclyAccessible": "{{ database.publicly_accessible }}",
+ "CopyTagsToSnapshot": "{{ database.copy_tags_to_snapshot }}",
"AllocatedStorage": "{{ database.allocated_storage }}",
"Endpoint": {
"Address": "{{ database.address }}",
@@ -691,6 +697,8 @@ class RDS2Backend(BaseBackend):
raise DBSnapshotAlreadyExistsError(db_snapshot_identifier)
if len(self.snapshots) >= int(os.environ.get('MOTO_RDS_SNAPSHOT_LIMIT', '100')):
raise SnapshotQuotaExceededError()
+ if not database.copy_tags_to_snapshot:
+ tags = None
snapshot = Snapshot(database, db_snapshot_identifier, tags)
self.snapshots[db_snapshot_identifier] = snapshot
return snapshot
diff --git a/tests/test_rds2/test_rds2.py b/tests/test_rds2/test_rds2.py
index 80dcd4f5..7fecfeca 100644
--- a/tests/test_rds2/test_rds2.py
+++ b/tests/test_rds2/test_rds2.py
@@ -33,6 +33,7 @@ def test_create_database():
db_instance['DBInstanceIdentifier'].should.equal("db-master-1")
db_instance['IAMDatabaseAuthenticationEnabled'].should.equal(False)
db_instance['DbiResourceId'].should.contain("db-")
+ db_instance['CopyTagsToSnapshot'].should.equal(False)
@mock_rds2
@@ -339,6 +340,49 @@ def test_create_db_snapshots():
snapshot.get('Engine').should.equal('postgres')
snapshot.get('DBInstanceIdentifier').should.equal('db-primary-1')
snapshot.get('DBSnapshotIdentifier').should.equal('g-1')
+ result = conn.list_tags_for_resource(ResourceName=snapshot['DBSnapshot']['DBSnapshotArn'])
+ result['TagList'].should.equal([])
+
+
+@mock_rds2
+def test_create_db_snapshots_copy_tags():
+ conn = boto3.client('rds', region_name='us-west-2')
+ conn.create_db_snapshot.when.called_with(
+ DBInstanceIdentifier='db-primary-1',
+ DBSnapshotIdentifier='snapshot-1').should.throw(ClientError)
+
+ conn.create_db_instance(DBInstanceIdentifier='db-primary-1',
+ AllocatedStorage=10,
+ Engine='postgres',
+ DBName='staging-postgres',
+ DBInstanceClass='db.m1.small',
+ MasterUsername='root',
+ MasterUserPassword='hunter2',
+ Port=1234,
+ DBSecurityGroups=["my_sg"],
+ CopyTagsToSnapshot=True,
+ Tags=[
+ {
+ 'Key': 'foo',
+ 'Value': 'bar',
+ },
+ {
+ 'Key': 'foo1',
+ 'Value': 'bar1',
+ },
+ ])
+
+ snapshot = conn.create_db_snapshot(DBInstanceIdentifier='db-primary-1',
+ DBSnapshotIdentifier='g-1').get('DBSnapshot')
+
+ snapshot.get('Engine').should.equal('postgres')
+ snapshot.get('DBInstanceIdentifier').should.equal('db-primary-1')
+ snapshot.get('DBSnapshotIdentifier').should.equal('g-1')
+ result = conn.list_tags_for_resource(ResourceName=snapshot['DBSnapshot']['DBSnapshotArn'])
+ result['TagList'].should.equal([{'Value': 'bar',
+ 'Key': 'foo'},
+ {'Value': 'bar1',
+ 'Key': 'foo1'}])
@mock_rds2