aws - rds - remove tag augmentation where builtin (#6332)

cloud-custodian · Dec 9, 2020 · 19e9a3e · 19e9a3e
1 parent 7947653
commit 19e9a3e
Show file tree

Hide file tree

Showing 38 changed files with 266 additions and 638 deletions.
diff --git 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
@@ -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):

diff --git a/...ata/placebo/test_rds_cluster_snapshot_get_resources/rds.DescribeDBClusterSnapshots_1.json b/...ata/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": {}
     }
-}
+}
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
diff --git 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 @@
             }
         }
     }
-}
+}
diff --git a/tests/data/placebo/test_rds_delete/tagging.GetResources_1.json b/tests/data/placebo/test_rds_delete/tagging.GetResources_1.json
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
@@ -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
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