⭐ Add new properties to aws.rds.dbInstances (#2006)

* Add new properties to aws.rds.dbInstances Add a few important things for asset inventory. - Storage type - Storage IOPS - Storage amount allocated - Engine Version - Availability zone - Creation Date Signed-off-by: Tim Smith <[email protected]> * Review update Signed-off-by: Tim Smith <[email protected]> --------- Signed-off-by: Tim Smith <[email protected]>
mondoohq · Oct 2, 2023 · fda5ca6 · fda5ca6
1 parent 2cf293a
commit fda5ca6
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 12 deletions.
diff --git a/providers/aws/resources/aws.lr b/providers/aws/resources/aws.lr
@@ -1204,7 +1204,7 @@ private aws.rds.snapshot @defaults("arn") {
 }
 
 // Amazon RDS Database Instance
-private aws.rds.dbinstance @defaults("arn") {
+private aws.rds.dbinstance @defaults("id region engine engineVersion") {
   // ARN for the database instance
   arn string
   // Name of the database instance
@@ -1215,8 +1215,16 @@ private aws.rds.dbinstance @defaults("arn") {
   snapshots() []aws.rds.snapshot
   // Denotes whether the instance is encrypted
   storageEncrypted bool
+  // The amount of storage, in GiB, provisioned on the instance
+  storageAllocated int
+  // The storage IOPS provisioned on the instance
+  storageIops int
+  // The type of storage provisioned on the instance
+  storageType string
   // Region where the instance exists
   region string
+  // Availability zone where the instance exists
+  availabilityZone string
   // Denotes whether or not the instance is publicly accessible
   publiclyAccessible bool
   // List of log types the instance is configured to export to cloudwatch logs
@@ -1237,12 +1245,16 @@ private aws.rds.dbinstance @defaults("arn") {
   dbInstanceIdentifier string
   // Name of the database engine for this DB instance
   engine string
+  // The version of the database engine for this DB instance
+  engineVersion string
   // List of VPC security group elements that the DB instance belongs to
   securityGroups []aws.ec2.securitygroup
   // Current state of this database
   status string
   // Indicates whether minor version patches are applied automatically
   autoMinorVersionUpgrade bool
+  // The creation date of the RDS instance
+  creationDate time
 }
 
 // Amazon ElastiCache

diff --git a/providers/aws/resources/aws.lr.go b/providers/aws/resources/aws.lr.go
diff --git a/providers/aws/resources/aws.lr.manifest.yaml b/providers/aws/resources/aws.lr.manifest.yaml
@@ -1802,7 +1802,11 @@ resources:
       arn: {}
       autoMinorVersionUpgrade:
         min_mondoo_version: 8.22.0
+      availabilityZone:
+        min_mondoo_version: 9.0.0
       backupRetentionPeriod: {}
+      creationDate:
+        min_mondoo_version: 9.0.0
       dbInstanceClass:
         min_mondoo_version: 5.19.1
       dbInstanceIdentifier:
@@ -1811,6 +1815,8 @@ resources:
       enabledCloudwatchLogsExports: {}
       engine:
         min_mondoo_version: 5.19.1
+      engineVersion:
+        min_mondoo_version: 9.0.0
       enhancedMonitoringResourceArn: {}
       id: {}
       multiAZ: {}
@@ -1822,7 +1828,13 @@ resources:
       snapshots: {}
       status:
         min_mondoo_version: 5.19.1
+      storageAllocated:
+        min_mondoo_version: 9.0.0
       storageEncrypted: {}
+      storageIops:
+        min_mondoo_version: 9.0.0
+      storageType:
+        min_mondoo_version: 9.0.0
       tags: {}
     is_private: true
     min_mondoo_version: 5.15.0

diff --git a/providers/aws/resources/aws_rds.go b/providers/aws/resources/aws_rds.go
@@ -90,23 +90,29 @@ func (a *mqlAwsRds) getDbInstances(conn *connection.AwsConnection) []*jobpool.Jo
 					mqlDBInstance, err := CreateResource(a.MqlRuntime, "aws.rds.dbinstance",
 						map[string]*llx.RawData{
 							"arn":                           llx.StringData(convert.ToString(dbInstance.DBInstanceArn)),
-							"name":                          llx.StringData(convert.ToString(dbInstance.DBName)),
+							"autoMinorVersionUpgrade":       llx.BoolData(dbInstance.AutoMinorVersionUpgrade),
+							"availabilityZone":              llx.StringData(convert.ToString(dbInstance.AvailabilityZone)),
 							"backupRetentionPeriod":         llx.IntData(int64(dbInstance.BackupRetentionPeriod)),
-							"storageEncrypted":              llx.BoolData(dbInstance.StorageEncrypted),
-							"region":                        llx.StringData(regionVal),
-							"publiclyAccessible":            llx.BoolData(dbInstance.PubliclyAccessible),
+							"dbInstanceClass":               llx.StringData(convert.ToString(dbInstance.DBInstanceClass)),
+							"dbInstanceIdentifier":          llx.StringData(convert.ToString(dbInstance.DBInstanceIdentifier)),
+							"deletionProtection":            llx.BoolData(dbInstance.DeletionProtection),
 							"enabledCloudwatchLogsExports":  llx.ArrayData(stringSliceInterface, types.String),
+							"engine":                        llx.StringDataPtr(dbInstance.Engine),
+							"engineVersion":                 llx.StringData(convert.ToString(dbInstance.EngineVersion)),
 							"enhancedMonitoringResourceArn": llx.StringData(convert.ToString(dbInstance.EnhancedMonitoringResourceArn)),
-							"multiAZ":                       llx.BoolData(dbInstance.MultiAZ),
 							"id":                            llx.StringData(convert.ToString(dbInstance.DBInstanceIdentifier)),
-							"deletionProtection":            llx.BoolData(dbInstance.DeletionProtection),
-							"tags":                          llx.MapData(rdsTagsToMap(dbInstance.TagList), types.String),
-							"dbInstanceClass":               llx.StringData(convert.ToString(dbInstance.DBInstanceClass)),
-							"dbInstanceIdentifier":          llx.StringData(convert.ToString(dbInstance.DBInstanceIdentifier)),
-							"engine":                        llx.StringData(convert.ToString(dbInstance.Engine)),
+							"multiAZ":                       llx.BoolData(dbInstance.MultiAZ),
+							"name":                          llx.StringData(convert.ToString(dbInstance.DBName)),
+							"publiclyAccessible":            llx.BoolData(dbInstance.PubliclyAccessible),
+							"region":                        llx.StringData(regionVal),
 							"securityGroups":                llx.ArrayData(sgs, types.Resource("aws.ec2.securitygroup")),
 							"status":                        llx.StringData(convert.ToString(dbInstance.DBInstanceStatus)),
-							"autoMinorVersionUpgrade":       llx.BoolData(dbInstance.AutoMinorVersionUpgrade),
+							"storageAllocated":              llx.IntData(int64(dbInstance.AllocatedStorage)),
+							"storageEncrypted":              llx.BoolData(dbInstance.StorageEncrypted),
+							"storageType":                   llx.StringData(convert.ToString(dbInstance.StorageType)),
+							"storageIops":                   llx.IntData(convert.ToInt64From32(dbInstance.Iops)),
+							"tags":                          llx.MapData(rdsTagsToMap(dbInstance.TagList), types.String),
+							"creationDate":                  llx.TimeData(toTime(dbInstance.InstanceCreateTime)),
 						})
 					if err != nil {
 						return nil, err