Repository: cloud-custodian/cloud-custodian

Issue:
aws - rds - remove tag augmentation

rds now includes tags for resources in default output, we can drop our tag augmentation now

https://awsapichanges.info/archive/changes/5fc292-rds.html



Discussion:

Resolving patch:
diff --git a/c7n/resources/rds.py b/c7n/resources/rds.py
--- a/c7n/resources/rds.py
+++ b/c7n/resources/rds.py
@@ -70,8 +70,9 @@
 class DescribeRDS(DescribeSource):
 
     def augment(self, dbs):
-        return universal_augment(
-            self.manager, super(DescribeRDS, self).augment(dbs))
+        for d in dbs:
+            d['Tags'] = d.pop('TagList', ())
+        return dbs
 
 
 @resources.register('rds')
@@ -953,8 +954,9 @@ def process(self, resources):
 class DescribeRDSSnapshot(DescribeSource):
 
     def augment(self, snaps):
-        return universal_augment(
-            self.manager, super(DescribeRDSSnapshot, self).augment(snaps))
+        for s in snaps:
+            s['Tags'] = s.pop('TagList', ())
+        return snaps
 
 
 @resources.register('rds-snapshot')
diff --git a/c7n/resources/rdscluster.py b/c7n/resources/rdscluster.py
--- a/c7n/resources/rdscluster.py
+++ b/c7n/resources/rdscluster.py
@@ -12,7 +12,6 @@
 import c7n.filters.vpc as net_filters
 from c7n.manager import resources
 from c7n.query import ConfigSource, QueryResourceManager, TypeInfo, DescribeSource
-from c7n import tags
 from .aws import shape_validate
 from c7n.exceptions import PolicyValidationError
 from c7n.utils import (
@@ -24,7 +23,9 @@
 class DescribeCluster(DescribeSource):
 
     def augment(self, resources):
-        return tags.universal_augment(self.manager, resources)
+        for r in resources:
+            r['Tags'] = r.pop('TagList', ())
+        return resources
 
 
 @resources.register('rds-cluster')
@@ -355,7 +356,9 @@ def get_resources(self, resource_ids, cache=True):
                 'Values': resource_ids}]).get('DBClusterSnapshots', ())
 
     def augment(self, resources):
-        return tags.universal_augment(self.manager, resources)
+        for r in resources:
+            r['Tags'] = r.pop('TagList', ())
+        return resources
 
 
 class ConfigClusterSnapshot(ConfigSource):


Test patch:
diff --git a/tests/data/placebo/test_rds_cluster_snapshot_get_resources/rds.DescribeDBClusterSnapshots_1.json b/tests/data/placebo/test_rds_cluster_snapshot_get_resources/rds.DescribeDBClusterSnapshots_1.json
--- a/tests/data/placebo/test_rds_cluster_snapshot_get_resources/rds.DescribeDBClusterSnapshots_1.json
+++ b/tests/data/placebo/test_rds_cluster_snapshot_get_resources/rds.DescribeDBClusterSnapshots_1.json
@@ -43,7 +43,13 @@
                 "StorageEncrypted": true,
                 "KmsKeyId": "arn:aws:kms:us-east-1:644160558196:key/b10f842a-feb7-4318-92d5-0640a75b7688",
                 "DBClusterSnapshotArn": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-04-27-05-58",
-                "IAMDatabaseAuthenticationEnabled": false
+                "IAMDatabaseAuthenticationEnabled": false,
+                "TagList": [
+                    {
+                        "Key": "Owner",
+                        "Value": "kapil"
+                    }
+                ]
             },
             {
                 "AvailabilityZones": [
@@ -94,4 +100,4 @@
         ],
         "ResponseMetadata": {}
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_cluster_snapshot_get_resources/tagging.GetResources_1.json b/tests/data/placebo/test_rds_cluster_snapshot_get_resources/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_cluster_snapshot_get_resources/tagging.GetResources_1.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "PaginationToken": "",
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-04-21-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-04-23-05-59",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-04-22-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-04-27-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-04-26-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:verify",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-04-25-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-04-24-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            }
-        ],
-        "ResponseMetadata": {}
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_delete/rds.DescribeDBInstances_1.json b/tests/data/placebo/test_rds_delete/rds.DescribeDBInstances_1.json
--- a/tests/data/placebo/test_rds_delete/rds.DescribeDBInstances_1.json
+++ b/tests/data/placebo/test_rds_delete/rds.DescribeDBInstances_1.json
@@ -108,7 +108,25 @@
                 "KmsKeyId": "arn:aws:kms:us-west-2:644160558196:key/1ec621db-4406-4cb9-8e85-812386071791", 
                 "DBInstanceClass": "db.m4.xlarge", 
                 "DbInstancePort": 0, 
-                "DBInstanceIdentifier": "test-test"
+                "DBInstanceIdentifier": "test-test",
+                "TagList": [
+                    {
+                        "Value": "test", 
+                        "Key": "Owner"
+                    }, 
+                    {
+                        "Value": "postgres", 
+                        "Key": "Platform"
+                    }, 
+                    {
+                        "Value": "Resource does not meet policy: delete@2017/09/14", 
+                        "Key": "custodian_next"
+                    }, 
+                    {
+                        "Value": "yes", 
+                        "Key": "custodian_upgrade"
+                    }
+                ]		
             }
         ], 
         "ResponseMetadata": {
@@ -124,4 +142,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_delete/tagging.GetResources_1.json b/tests/data/placebo/test_rds_delete/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_delete/tagging.GetResources_1.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-west-2:644160558196:db:test-test", 
-                "Tags": [
-                    {
-                        "Value": "test", 
-                        "Key": "Owner"
-                    }, 
-                    {
-                        "Value": "postgres", 
-                        "Key": "Platform"
-                    }, 
-                    {
-                        "Value": "Resource does not meet policy: delete@2017/09/14", 
-                        "Key": "custodian_next"
-                    }, 
-                    {
-                        "Value": "yes", 
-                        "Key": "custodian_upgrade"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "7e41627f-9896-11e7-ba7c-573e850e8431", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "7e41627f-9896-11e7-ba7c-573e850e8431", 
-                "date": "Wed, 13 Sep 2017 15:16:18 GMT", 
-                "content-length": "319", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_delete_copy_restore/rds.DescribeDBSnapshots_1.json b/tests/data/placebo/test_rds_delete_copy_restore/rds.DescribeDBSnapshots_1.json
--- a/tests/data/placebo/test_rds_delete_copy_restore/rds.DescribeDBSnapshots_1.json
+++ b/tests/data/placebo/test_rds_delete_copy_restore/rds.DescribeDBSnapshots_1.json
@@ -43,7 +43,45 @@
                 "SnapshotType": "manual", 
                 "IAMDatabaseAuthenticationEnabled": false, 
                 "Port": 5432, 
-                "DBInstanceIdentifier": "mxtest"
+                "DBInstanceIdentifier": "mxtest",
+                "TagList": [
+                    {
+                        "Value": "gp2",
+                        "Key": "StorageType"
+                    },
+                    {
+                        "Value": "default.postgres9.5",
+                        "Key": "ParameterGroupName"
+                    },
+                    {
+                        "Value": "sg-aa6c90c3",
+                        "Key": "VPCSecurityGroups"
+                    },
+                    {
+                        "Value": "default:postgres-9-5",
+                        "Key": "OptionGroupName"
+                    },
+                    {
+                        "Value": "db.m4.large",
+                        "Key": "InstanceClass"
+                    },
+                    {
+                        "Value": "default",
+                        "Key": "DBSubnetGroupName"
+                    },
+                    {
+                        "Value": "other",
+                        "Key": "workload-type"
+                    },
+                    {
+                        "Value": "False",
+                        "Key": "MultiAZ"
+                    },
+                    {
+                        "Value": "Testing",
+                        "Key": "AppName"
+                    }
+                ]
             }
         ]
     }
diff --git a/tests/data/placebo/test_rds_delete_copy_restore/tagging.GetResources_1.json b/tests/data/placebo/test_rds_delete_copy_restore/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_delete_copy_restore/tagging.GetResources_1.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-west-2:644160558196:db:test-test", 
-                "Tags": [
-                    {
-                        "Value": "hello", 
-                        "Key": "test-this"
-                    }, 
-                    {
-                        "Value": "production", 
-                        "Key": "workload-type"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "bed27a38-9742-11e7-8210-dd0e2d1c96ab", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "bed27a38-9742-11e7-8210-dd0e2d1c96ab", 
-                "date": "Mon, 11 Sep 2017 22:44:18 GMT", 
-                "content-length": "205", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_delete_copy_restore/tagging.GetResources_2.json b/tests/data/placebo/test_rds_delete_copy_restore/tagging.GetResources_2.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_delete_copy_restore/tagging.GetResources_2.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-2:644160558196:snapshot:final-mxtest-2017-05-25",
-                "Tags": [
-                    {
-                        "Value": "gp2",
-                        "Key": "StorageType"
-                    },
-                    {
-                        "Value": "default.postgres9.5",
-                        "Key": "ParameterGroupName"
-                    },
-                    {
-                        "Value": "sg-aa6c90c3",
-                        "Key": "VPCSecurityGroups"
-                    },
-                    {
-                        "Value": "default:postgres-9-5",
-                        "Key": "OptionGroupName"
-                    },
-                    {
-                        "Value": "db.m4.large",
-                        "Key": "InstanceClass"
-                    },
-                    {
-                        "Value": "default",
-                        "Key": "DBSubnetGroupName"
-                    },
-                    {
-                        "Value": "other",
-                        "Key": "workload-type"
-                    },
-                    {
-                        "Value": "False",
-                        "Key": "MultiAZ"
-                    },
-                    {
-                        "Value": "Testing",
-                        "Key": "AppName"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "bed27a38-9742-11e7-8210-dd0e2d1c96ab", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "bed27a38-9742-11e7-8210-dd0e2d1c96ab", 
-                "date": "Mon, 11 Sep 2017 22:44:18 GMT", 
-                "content-length": "205", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_mark_and_match/rds.DescribeDBInstances_1.json b/tests/data/placebo/test_rds_mark_and_match/rds.DescribeDBInstances_1.json
--- a/tests/data/placebo/test_rds_mark_and_match/rds.DescribeDBInstances_1.json
+++ b/tests/data/placebo/test_rds_mark_and_match/rds.DescribeDBInstances_1.json
@@ -106,7 +106,17 @@
                 "KmsKeyId": "arn:aws:kms:us-east-1:644160558196:key/b10f842a-feb7-4318-92d5-0640a75b7688", 
                 "DBInstanceClass": "db.m4.xlarge", 
                 "DbInstancePort": 0, 
-                "DBInstanceIdentifier": "test-03"
+                "DBInstanceIdentifier": "test-03",
+                "TagList": [
+                    {
+                        "Value": "postgres", 
+                        "Key": "Platform"
+                    }, 
+                    {
+                        "Value": "production", 
+                        "Key": "workload-type"
+                    }
+                ]		
             }
         ], 
         "ResponseMetadata": {
@@ -122,4 +132,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_mark_and_match/rds.DescribeDBInstances_2.json b/tests/data/placebo/test_rds_mark_and_match/rds.DescribeDBInstances_2.json
--- a/tests/data/placebo/test_rds_mark_and_match/rds.DescribeDBInstances_2.json
+++ b/tests/data/placebo/test_rds_mark_and_match/rds.DescribeDBInstances_2.json
@@ -106,7 +106,21 @@
                 "KmsKeyId": "arn:aws:kms:us-east-1:644160558196:key/b10f842a-feb7-4318-92d5-0640a75b7688", 
                 "DBInstanceClass": "db.m4.xlarge", 
                 "DbInstancePort": 0, 
-                "DBInstanceIdentifier": "test-03"
+                "DBInstanceIdentifier": "test-03",
+                "TagList": [
+                    {
+                        "Value": "postgres", 
+                        "Key": "Platform"
+                    }, 
+                    {
+                        "Value": "Resource does not meet policy: delete@2017/09/16", 
+                        "Key": "custodian_next"
+                    }, 
+                    {
+                        "Value": "production", 
+                        "Key": "workload-type"
+                    }
+                ]
             }
         ], 
         "ResponseMetadata": {
@@ -122,4 +136,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_mark_and_match/tagging.GetResources_1.json b/tests/data/placebo/test_rds_mark_and_match/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_mark_and_match/tagging.GetResources_1.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:db:test-03", 
-                "Tags": [
-                    {
-                        "Value": "postgres", 
-                        "Key": "Platform"
-                    }, 
-                    {
-                        "Value": "production", 
-                        "Key": "workload-type"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "8250d6c3-9a26-11e7-89f9-3fc36f9dd79a", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "8250d6c3-9a26-11e7-89f9-3fc36f9dd79a", 
-                "date": "Fri, 15 Sep 2017 14:59:44 GMT", 
-                "content-length": "205", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_mark_and_match/tagging.GetResources_2.json b/tests/data/placebo/test_rds_mark_and_match/tagging.GetResources_2.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_mark_and_match/tagging.GetResources_2.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:db:test-03", 
-                "Tags": [
-                    {
-                        "Value": "postgres", 
-                        "Key": "Platform"
-                    }, 
-                    {
-                        "Value": "Resource does not meet policy: delete@2017/09/16", 
-                        "Key": "custodian_next"
-                    }, 
-                    {
-                        "Value": "production", 
-                        "Key": "workload-type"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "831dea38-9a26-11e7-8d37-8f93ccc7fa78", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "831dea38-9a26-11e7-8d37-8f93ccc7fa78", 
-                "date": "Fri, 15 Sep 2017 14:59:45 GMT", 
-                "content-length": "289", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_marked_hours/rds.DescribeDBInstances_1.json b/tests/data/placebo/test_rds_marked_hours/rds.DescribeDBInstances_1.json
--- a/tests/data/placebo/test_rds_marked_hours/rds.DescribeDBInstances_1.json
+++ b/tests/data/placebo/test_rds_marked_hours/rds.DescribeDBInstances_1.json
@@ -93,7 +93,18 @@
                 "StorageEncrypted": false, 
                 "DBInstanceClass": "db.t2.micro", 
                 "DbInstancePort": 0, 
-                "DBInstanceIdentifier": "db1"
+                "DBInstanceIdentifier": "db1",
+                "TagList": [
+                    {
+                        "Value": "Resource does not meet policy: delete@2018/05/09 1520 UTC", 
+                        "Key": "maid_status"
+                    }, 
+                    {
+                        "Value": "other", 
+                        "Key": "workload-type"
+                    }
+                ]
+		
             }
         ], 
         "ResponseMetadata": {
@@ -109,4 +120,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_marked_hours/tagging.GetResources_1.json b/tests/data/placebo/test_rds_marked_hours/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_marked_hours/tagging.GetResources_1.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:123456789012:db:db1",
-                "Tags": [
-                    {
-                        "Value": "Resource does not meet policy: delete@2018/05/09 1520 UTC", 
-                        "Key": "maid_status"
-                    }, 
-                    {
-                        "Value": "other", 
-                        "Key": "workload-type"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "95af44b7-53a9-11e8-9f0a-9da08d4dc7eb", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "95af44b7-53a9-11e8-9f0a-9da08d4dc7eb", 
-                "date": "Wed, 09 May 2018 16:54:05 GMT", 
-                "content-length": "248", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_minor_upgrade_do/rds.DescribeDBInstances_1.json b/tests/data/placebo/test_rds_minor_upgrade_do/rds.DescribeDBInstances_1.json
--- a/tests/data/placebo/test_rds_minor_upgrade_do/rds.DescribeDBInstances_1.json
+++ b/tests/data/placebo/test_rds_minor_upgrade_do/rds.DescribeDBInstances_1.json
@@ -90,7 +90,17 @@
                 "KmsKeyId": "arn:aws:kms:us-east-1:644160558196:key/b10f842a-feb7-4318-92d5-0640a75b7688", 
                 "DBInstanceClass": "db.m4.xlarge", 
                 "DbInstancePort": 0, 
-                "DBInstanceIdentifier": "c7n-mysql-test-03"
+                "DBInstanceIdentifier": "c7n-mysql-test-03",
+                "TagList": [
+                    {
+                        "Value": "Resource does not meet policy: upgrade@2017/09/19", 
+                        "Key": "custodian_upgrade"
+                    }, 
+                    {
+                        "Value": "production", 
+                        "Key": "workload-type"
+                    }
+                ]
             }, 
             {
                 "PubliclyAccessible": false, 
@@ -221,4 +231,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_minor_upgrade_do/tagging.GetResources_1.json b/tests/data/placebo/test_rds_minor_upgrade_do/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_minor_upgrade_do/tagging.GetResources_1.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:db:c7n-mysql-test-03", 
-                "Tags": [
-                    {
-                        "Value": "Resource does not meet policy: upgrade@2017/09/19", 
-                        "Key": "custodian_upgrade"
-                    }, 
-                    {
-                        "Value": "production", 
-                        "Key": "workload-type"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "a1ed75d5-9a29-11e7-86e5-35504b1a866c", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "a1ed75d5-9a29-11e7-86e5-35504b1a866c", 
-                "date": "Fri, 15 Sep 2017 15:22:05 GMT", 
-                "content-length": "265", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_snapshot_tag_filter/rds.DescribeDBSnapshots_1.json b/tests/data/placebo/test_rds_snapshot_tag_filter/rds.DescribeDBSnapshots_1.json
--- a/tests/data/placebo/test_rds_snapshot_tag_filter/rds.DescribeDBSnapshots_1.json
+++ b/tests/data/placebo/test_rds_snapshot_tag_filter/rds.DescribeDBSnapshots_1.json
@@ -42,7 +42,21 @@
                 "EngineVersion": "9.4.5",
                 "SnapshotType": "manual",
                 "Port": 5432,
-                "DBInstanceIdentifier": "abc-restore"
+                "DBInstanceIdentifier": "abc-restore",
+                "TagList": [
+                    {
+                        "Value": "other",
+                        "Key": "workload-type"
+                    },
+                    {
+                        "Value": "test-value",
+                        "Key": "test-key"
+                    },
+                    {
+                        "Value": "Resource does not meet policy: delete@12/12/2012",
+                        "Key": "maid_status"
+                    }
+                ]
             }
         ]
     }
diff --git a/tests/data/placebo/test_rds_snapshot_tag_filter/tagging.GetResources_1.json b/tests/data/placebo/test_rds_snapshot_tag_filter/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_snapshot_tag_filter/tagging.GetResources_1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:snapshot:abc-restore-final-snapshot",
-                "Tags": [
-                    {
-                        "Value": "other",
-                        "Key": "workload-type"
-                    },
-                    {
-                        "Value": "test-value",
-                        "Key": "test-key"
-                    },
-                    {
-                        "Value": "Resource does not meet policy: delete@12/12/2012",
-                        "Key": "maid_status"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "bed27a38-9742-11e7-8210-dd0e2d1c96ab", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "bed27a38-9742-11e7-8210-dd0e2d1c96ab", 
-                "date": "Mon, 11 Sep 2017 22:44:18 GMT", 
-                "content-length": "205", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_tag_and_remove/rds.DescribeDBInstances_1.json b/tests/data/placebo/test_rds_tag_and_remove/rds.DescribeDBInstances_1.json
--- a/tests/data/placebo/test_rds_tag_and_remove/rds.DescribeDBInstances_1.json
+++ b/tests/data/placebo/test_rds_tag_and_remove/rds.DescribeDBInstances_1.json
@@ -106,7 +106,21 @@
                 "KmsKeyId": "arn:aws:kms:us-east-1:644160558196:key/b10f842a-feb7-4318-92d5-0640a75b7688", 
                 "DBInstanceClass": "db.m4.xlarge", 
                 "DbInstancePort": 0, 
-                "DBInstanceIdentifier": "test-03"
+                "DBInstanceIdentifier": "test-03",
+                "TagList": [
+                    {
+                        "Value": "postgres", 
+                        "Key": "Platform"
+                    }, 
+                    {
+                        "Value": "Resource does not meet policy: delete@2017/09/16", 
+                        "Key": "custodian_next"
+                    }, 
+                    {
+                        "Value": "production", 
+                        "Key": "workload-type"
+                    }
+                ]		
             }
         ], 
         "ResponseMetadata": {
@@ -122,4 +136,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_tag_and_remove/rds.DescribeDBInstances_2.json b/tests/data/placebo/test_rds_tag_and_remove/rds.DescribeDBInstances_2.json
--- a/tests/data/placebo/test_rds_tag_and_remove/rds.DescribeDBInstances_2.json
+++ b/tests/data/placebo/test_rds_tag_and_remove/rds.DescribeDBInstances_2.json
@@ -106,7 +106,26 @@
                 "KmsKeyId": "arn:aws:kms:us-east-1:644160558196:key/b10f842a-feb7-4318-92d5-0640a75b7688", 
                 "DBInstanceClass": "db.m4.xlarge", 
                 "DbInstancePort": 0, 
-                "DBInstanceIdentifier": "test-03"
+                "DBInstanceIdentifier": "test-03",
+                "TagList": [
+                    {
+                        "Value": "postgres", 
+                        "Key": "Platform"
+                    }, 
+                    {
+                        "Value": "Resource does not meet policy: delete@2017/09/16", 
+                        "Key": "custodian_next"
+                    }, 
+                    {
+                        "Value": "production", 
+                        "Key": "workload-type"
+                    }, 
+                    {
+                        "Value": "hello world", 
+                        "Key": "xyz"
+                    }
+                ]
+		
             }
         ], 
         "ResponseMetadata": {
@@ -122,4 +141,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_tag_and_remove/tagging.GetResources_2.json b/tests/data/placebo/test_rds_tag_and_remove/tagging.GetResources_2.json
--- a/tests/data/placebo/test_rds_tag_and_remove/tagging.GetResources_2.json
+++ b/tests/data/placebo/test_rds_tag_and_remove/tagging.GetResources_2.json
@@ -37,4 +37,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_tag_trim/rds.DescribeDBInstances_1.json b/tests/data/placebo/test_rds_tag_trim/rds.DescribeDBInstances_1.json
--- a/tests/data/placebo/test_rds_tag_trim/rds.DescribeDBInstances_1.json
+++ b/tests/data/placebo/test_rds_tag_trim/rds.DescribeDBInstances_1.json
@@ -114,7 +114,29 @@
                 "KmsKeyId": "arn:aws:kms:us-east-1:644160558196:key/b10f842a-feb7-4318-92d5-0640a75b7688", 
                 "DBInstanceClass": "db.m4.xlarge", 
                 "DbInstancePort": 0, 
-                "DBInstanceIdentifier": "test-03"
+                "DBInstanceIdentifier": "test-03",
+                "TagList": [
+                    {
+                        "Value": "test-test", 
+                        "Key": "Name"
+                    }, 
+                    {
+                        "Value": "test", 
+                        "Key": "Owner"
+                    }, 
+                    {
+                        "Value": "postgres", 
+                        "Key": "Platform"
+                    }, 
+                    {
+                        "Value": "Resource does not meet policy: delete@2017/09/16", 
+                        "Key": "custodian_next"
+                    }, 
+                    {
+                        "Value": "production", 
+                        "Key": "workload-type"
+                    }
+                ]		
             }
         ], 
         "ResponseMetadata": {
@@ -130,4 +152,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_tag_trim/tagging.GetResources_1.json b/tests/data/placebo/test_rds_tag_trim/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_tag_trim/tagging.GetResources_1.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:db:test-03", 
-                "Tags": [
-                    {
-                        "Value": "test-test", 
-                        "Key": "Name"
-                    }, 
-                    {
-                        "Value": "test", 
-                        "Key": "Owner"
-                    }, 
-                    {
-                        "Value": "postgres", 
-                        "Key": "Platform"
-                    }, 
-                    {
-                        "Value": "Resource does not meet policy: delete@2017/09/16", 
-                        "Key": "custodian_next"
-                    }, 
-                    {
-                        "Value": "production", 
-                        "Key": "workload-type"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "f015293a-9a27-11e7-9fbd-eda3764941fe", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "f015293a-9a27-11e7-9fbd-eda3764941fe", 
-                "date": "Fri, 15 Sep 2017 15:09:57 GMT", 
-                "content-length": "355", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rds_tags/rds.DescribeDBInstances_1.json b/tests/data/placebo/test_rds_tags/rds.DescribeDBInstances_1.json
--- a/tests/data/placebo/test_rds_tags/rds.DescribeDBInstances_1.json
+++ b/tests/data/placebo/test_rds_tags/rds.DescribeDBInstances_1.json
@@ -104,7 +104,21 @@
                 "KmsKeyId": "arn:aws:kms:us-east-1:644160558196:key/b10f842a-feb7-4318-92d5-0640a75b7688", 
                 "DBInstanceClass": "db.m4.xlarge", 
                 "DbInstancePort": 0, 
-                "DBInstanceIdentifier": "test-03"
+                "DBInstanceIdentifier": "test-03",
+                "TagList": [
+                    {
+                        "Value": "postgres", 
+                        "Key": "Platform"
+                    }, 
+                    {
+                        "Value": "Resource does not meet policy: delete@2017/09/16", 
+                        "Key": "custodian_next"
+                    }, 
+                    {
+                        "Value": "production", 
+                        "Key": "workload-type"
+                    }
+                ]		
             }
         ], 
         "ResponseMetadata": {
@@ -120,4 +134,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rds_tags/tagging.GetResources_1.json b/tests/data/placebo/test_rds_tags/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rds_tags/tagging.GetResources_1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "PaginationToken": "", 
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:db:test-03", 
-                "Tags": [
-                    {
-                        "Value": "postgres", 
-                        "Key": "Platform"
-                    }, 
-                    {
-                        "Value": "Resource does not meet policy: delete@2017/09/16", 
-                        "Key": "custodian_next"
-                    }, 
-                    {
-                        "Value": "production", 
-                        "Key": "workload-type"
-                    }
-                ]
-            }
-        ], 
-        "ResponseMetadata": {
-            "RetryAttempts": 0, 
-            "HTTPStatusCode": 200, 
-            "RequestId": "bb2cd9af-9a27-11e7-8408-dda097f73b77", 
-            "HTTPHeaders": {
-                "x-amzn-requestid": "bb2cd9af-9a27-11e7-8408-dda097f73b77", 
-                "date": "Fri, 15 Sep 2017 15:08:28 GMT", 
-                "content-length": "289", 
-                "content-type": "application/x-amz-json-1.1"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rdscluster_mark_and_match/rds.DescribeDBClusters_2.json b/tests/data/placebo/test_rdscluster_mark_and_match/rds.DescribeDBClusters_2.json
--- a/tests/data/placebo/test_rdscluster_mark_and_match/rds.DescribeDBClusters_2.json
+++ b/tests/data/placebo/test_rdscluster_mark_and_match/rds.DescribeDBClusters_2.json
@@ -80,7 +80,13 @@
                     "us-east-2b", 
                     "us-east-2c"
                 ], 
-                "Port": 3306
+                "Port": 3306,
+                "TagList": [
+		    {
+			"Value": "Resource does not meet policy: delete@2017/07/19", 
+			"Key": "custodian_next"
+		    }
+                ]	
             }
         ], 
         "ResponseMetadata": {
@@ -96,4 +102,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rdscluster_mark_and_match/rds.DescribeDBClusters_3.json b/tests/data/placebo/test_rdscluster_mark_and_match/rds.DescribeDBClusters_3.json
--- a/tests/data/placebo/test_rdscluster_mark_and_match/rds.DescribeDBClusters_3.json
+++ b/tests/data/placebo/test_rdscluster_mark_and_match/rds.DescribeDBClusters_3.json
@@ -80,7 +80,13 @@
                     "us-east-2b", 
                     "us-east-2c"
                 ], 
-                "Port": 3306
+                "Port": 3306,
+                "TagList": [
+		    {
+			"Value": "Resource does not meet policy: delete@2017/07/19", 
+			"Key": "custodian_next"
+		    }
+                ]
             }
         ], 
         "ResponseMetadata": {
@@ -96,4 +102,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rdscluster_mark_and_match/tagging.GetResources_1.json b/tests/data/placebo/test_rdscluster_mark_and_match/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rdscluster_mark_and_match/tagging.GetResources_1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {"ResourceTagMappingList": []}
-}
diff --git a/tests/data/placebo/test_rdscluster_mark_and_match/tagging.GetResources_2.json b/tests/data/placebo/test_rdscluster_mark_and_match/tagging.GetResources_2.json
deleted file mode 100644
--- a/tests/data/placebo/test_rdscluster_mark_and_match/tagging.GetResources_2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-2:123456789012:cluster:c7ntest",
-                "Tags": [
-		    {
-			"Value": "Resource does not meet policy: delete@2017/07/19", 
-			"Key": "custodian_next"
-		    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/tests/data/placebo/test_rdscluster_mark_and_match/tagging.GetResources_3.json b/tests/data/placebo/test_rdscluster_mark_and_match/tagging.GetResources_3.json
deleted file mode 100644
--- a/tests/data/placebo/test_rdscluster_mark_and_match/tagging.GetResources_3.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-2:123456789012:cluster:c7ntest",
-                "Tags": [
-		    {
-			"Value": "Resource does not meet policy: delete@2017/07/19", 
-			"Key": "custodian_next"
-		    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/tests/data/placebo/test_rdscluster_snapshot_config/rds.DescribeDBClusterSnapshots_1.json b/tests/data/placebo/test_rdscluster_snapshot_config/rds.DescribeDBClusterSnapshots_1.json
--- a/tests/data/placebo/test_rdscluster_snapshot_config/rds.DescribeDBClusterSnapshots_1.json
+++ b/tests/data/placebo/test_rdscluster_snapshot_config/rds.DescribeDBClusterSnapshots_1.json
@@ -43,9 +43,15 @@
                 "StorageEncrypted": true,
                 "KmsKeyId": "arn:aws:kms:us-east-1:644160558196:key/b10f842a-feb7-4318-92d5-0640a75b7688",
                 "DBClusterSnapshotArn": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:verify",
-                "IAMDatabaseAuthenticationEnabled": false
+                "IAMDatabaseAuthenticationEnabled": false,
+                "TagList": [
+                    {
+                        "Key": "Owner",
+                        "Value": "kapil"
+                    }
+                ]
             }
         ],
         "ResponseMetadata": {}
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rdscluster_snapshot_config/tagging.GetResources_1.json b/tests/data/placebo/test_rdscluster_snapshot_config/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rdscluster_snapshot_config/tagging.GetResources_1.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "PaginationToken": "",
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-05-26-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-05-21-05-59",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-05-25-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-05-24-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-05-23-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:verify",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-05-27-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            },
-            {
-                "ResourceARN": "arn:aws:rds:us-east-1:644160558196:cluster-snapshot:rds:database-1-2020-05-22-05-58",
-                "Tags": [
-                    {
-                        "Key": "Owner",
-                        "Value": "kapil"
-                    }
-                ]
-            }
-        ],
-        "ResponseMetadata": {}
-    }
-}
\ No newline at end of file
diff --git a/tests/data/placebo/test_rdscluster_tag_and_remove/rds.DescribeDBClusters_2.json b/tests/data/placebo/test_rdscluster_tag_and_remove/rds.DescribeDBClusters_2.json
--- a/tests/data/placebo/test_rdscluster_tag_and_remove/rds.DescribeDBClusters_2.json
+++ b/tests/data/placebo/test_rdscluster_tag_and_remove/rds.DescribeDBClusters_2.json
@@ -80,7 +80,13 @@
                     "us-east-2b", 
                     "us-east-2c"
                 ], 
-                "Port": 3306
+                "Port": 3306,
+                "TagList": [
+		    {
+			"Value": "hello world",
+			"Key": "xyz"
+		    }
+                ]
             }
         ], 
         "ResponseMetadata": {
@@ -96,4 +102,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/placebo/test_rdscluster_tag_and_remove/tagging.GetResources_1.json b/tests/data/placebo/test_rdscluster_tag_and_remove/tagging.GetResources_1.json
deleted file mode 100644
--- a/tests/data/placebo/test_rdscluster_tag_and_remove/tagging.GetResources_1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {"ResourceTagMappingList": []}
-}
diff --git a/tests/data/placebo/test_rdscluster_tag_and_remove/tagging.GetResources_2.json b/tests/data/placebo/test_rdscluster_tag_and_remove/tagging.GetResources_2.json
deleted file mode 100644
--- a/tests/data/placebo/test_rdscluster_tag_and_remove/tagging.GetResources_2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200, 
-    "data": {
-        "ResourceTagMappingList": [
-            {
-                "ResourceARN": "arn:aws:rds:us-east-2:123456789012:cluster:c7ntest",
-                "Tags": [
-		    {
-			"Value": "hello world",
-			"Key": "xyz"
-		    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/tests/data/placebo/test_rdscluster_tag_augment/rds.DescribeDBClusters_1.json b/tests/data/placebo/test_rdscluster_tag_augment/rds.DescribeDBClusters_1.json
--- a/tests/data/placebo/test_rdscluster_tag_augment/rds.DescribeDBClusters_1.json
+++ b/tests/data/placebo/test_rdscluster_tag_augment/rds.DescribeDBClusters_1.json
@@ -73,7 +73,13 @@
                     "us-east-1b", 
                     "us-east-1e"
                 ], 
-                "Port": 3306
+                "Port": 3306,
+                "TagList": [
+                    {
+                        "Value": "cbar", 
+                        "Key": "cfoo"
+                    }
+                ]
             }
         ], 
         "ResponseMetadata": {
@@ -89,4 +95,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/test_rds.py b/tests/test_rds.py
--- a/tests/test_rds.py
+++ b/tests/test_rds.py
@@ -66,6 +66,7 @@ def test_rds_start(self):
             },
             session_factory=session_factory,
         )
+
         resources = p.run()
         self.assertEqual(len(resources), 1)
         self.assertEqual(resources[0]["DBInstanceStatus"], "stopped")