diff --git a/providers/aws/resources/aws.lr b/providers/aws/resources/aws.lr index 0cc7064b07..7a1087fe95 100644 --- a/providers/aws/resources/aws.lr +++ b/providers/aws/resources/aws.lr @@ -2033,6 +2033,8 @@ private aws.rds.dbcluster @defaults("id region") { latestRestorableTime time // Backup setting for the database cluster backupSettings() []aws.rds.backupsetting + // The life cycle type for the database engine. By default, this value is set to `open-source-rds-extended-support`, which enrolls your DB engine into Amazon RDS Extended Support. At the end of standard support, you can avoid charges for Extended Support by setting the value to `open-source-rds-extended-support-disabled`. In this case, creating the DB engine will fail if the DB major version is past its end of standard support date. + engineLifecycleSupport string } // Amazon RDS snapshot @@ -2131,6 +2133,8 @@ private aws.rds.dbinstance @defaults("id region engine engineVersion") { backupSettings() []aws.rds.backupsetting // Subnet for the RDS instance subnets() []aws.vpc.subnet + // The life cycle type for the database engine. By default, this value is set to `open-source-rds-extended-support`, which enrolls your DB engine into Amazon RDS Extended Support. At the end of standard support, you can avoid charges for Extended Support by setting the value to `open-source-rds-extended-support-disabled`. In this case, creating the DB engine will fail if the DB major version is past its end of standard support date. + engineLifecycleSupport string } // Amazon ElastiCache diff --git a/providers/aws/resources/aws.lr.go b/providers/aws/resources/aws.lr.go index 3b2347c90e..6aa0defa05 100644 --- a/providers/aws/resources/aws.lr.go +++ b/providers/aws/resources/aws.lr.go @@ -3075,6 +3075,9 @@ var getDataFields = map[string]func(r plugin.Resource) *plugin.DataRes{ "aws.rds.dbcluster.backupSettings": func(r plugin.Resource) *plugin.DataRes { return (r.(*mqlAwsRdsDbcluster).GetBackupSettings()).ToDataRes(types.Array(types.Resource("aws.rds.backupsetting"))) }, + "aws.rds.dbcluster.engineLifecycleSupport": func(r plugin.Resource) *plugin.DataRes { + return (r.(*mqlAwsRdsDbcluster).GetEngineLifecycleSupport()).ToDataRes(types.String) + }, "aws.rds.snapshot.arn": func(r plugin.Resource) *plugin.DataRes { return (r.(*mqlAwsRdsSnapshot).GetArn()).ToDataRes(types.String) }, @@ -3210,6 +3213,9 @@ var getDataFields = map[string]func(r plugin.Resource) *plugin.DataRes{ "aws.rds.dbinstance.subnets": func(r plugin.Resource) *plugin.DataRes { return (r.(*mqlAwsRdsDbinstance).GetSubnets()).ToDataRes(types.Array(types.Resource("aws.vpc.subnet"))) }, + "aws.rds.dbinstance.engineLifecycleSupport": func(r plugin.Resource) *plugin.DataRes { + return (r.(*mqlAwsRdsDbinstance).GetEngineLifecycleSupport()).ToDataRes(types.String) + }, "aws.elasticache.clusters": func(r plugin.Resource) *plugin.DataRes { return (r.(*mqlAwsElasticache).GetClusters()).ToDataRes(types.Array(types.Dict)) }, @@ -7981,6 +7987,10 @@ var setDataFields = map[string]func(r plugin.Resource, v *llx.RawData) bool { r.(*mqlAwsRdsDbcluster).BackupSettings, ok = plugin.RawToTValue[[]interface{}](v.Value, v.Error) return }, + "aws.rds.dbcluster.engineLifecycleSupport": func(r plugin.Resource, v *llx.RawData) (ok bool) { + r.(*mqlAwsRdsDbcluster).EngineLifecycleSupport, ok = plugin.RawToTValue[string](v.Value, v.Error) + return + }, "aws.rds.snapshot.__id": func(r plugin.Resource, v *llx.RawData) (ok bool) { r.(*mqlAwsRdsSnapshot).__id, ok = v.Value.(string) return @@ -8169,6 +8179,10 @@ var setDataFields = map[string]func(r plugin.Resource, v *llx.RawData) bool { r.(*mqlAwsRdsDbinstance).Subnets, ok = plugin.RawToTValue[[]interface{}](v.Value, v.Error) return }, + "aws.rds.dbinstance.engineLifecycleSupport": func(r plugin.Resource, v *llx.RawData) (ok bool) { + r.(*mqlAwsRdsDbinstance).EngineLifecycleSupport, ok = plugin.RawToTValue[string](v.Value, v.Error) + return + }, "aws.elasticache.__id": func(r plugin.Resource, v *llx.RawData) (ok bool) { r.(*mqlAwsElasticache).__id, ok = v.Value.(string) return @@ -20454,6 +20468,7 @@ type mqlAwsRdsDbcluster struct { MasterUsername plugin.TValue[string] LatestRestorableTime plugin.TValue[*time.Time] BackupSettings plugin.TValue[[]interface{}] + EngineLifecycleSupport plugin.TValue[string] } // createAwsRdsDbcluster creates a new instance of this resource @@ -20629,6 +20644,10 @@ func (c *mqlAwsRdsDbcluster) GetBackupSettings() *plugin.TValue[[]interface{}] { }) } +func (c *mqlAwsRdsDbcluster) GetEngineLifecycleSupport() *plugin.TValue[string] { + return &c.EngineLifecycleSupport +} + // mqlAwsRdsSnapshot for the aws.rds.snapshot resource type mqlAwsRdsSnapshot struct { MqlRuntime *plugin.Runtime @@ -20781,6 +20800,7 @@ type mqlAwsRdsDbinstance struct { LatestRestorableTime plugin.TValue[*time.Time] BackupSettings plugin.TValue[[]interface{}] Subnets plugin.TValue[[]interface{}] + EngineLifecycleSupport plugin.TValue[string] } // createAwsRdsDbinstance creates a new instance of this resource @@ -20980,6 +21000,10 @@ func (c *mqlAwsRdsDbinstance) GetSubnets() *plugin.TValue[[]interface{}] { }) } +func (c *mqlAwsRdsDbinstance) GetEngineLifecycleSupport() *plugin.TValue[string] { + return &c.EngineLifecycleSupport +} + // mqlAwsElasticache for the aws.elasticache resource type mqlAwsElasticache struct { MqlRuntime *plugin.Runtime diff --git a/providers/aws/resources/aws.lr.manifest.yaml b/providers/aws/resources/aws.lr.manifest.yaml index 0e22e53cb9..07b5aa33e3 100755 --- a/providers/aws/resources/aws.lr.manifest.yaml +++ b/providers/aws/resources/aws.lr.manifest.yaml @@ -2274,6 +2274,8 @@ resources: min_mondoo_version: 9.0.0 engine: min_mondoo_version: 9.0.0 + engineLifecycleSupport: + min_mondoo_version: 9.0.0 engineVersion: min_mondoo_version: 9.0.0 hostedZoneId: @@ -2335,6 +2337,8 @@ resources: min_mondoo_version: 9.0.0 engine: min_mondoo_version: 5.19.1 + engineLifecycleSupport: + min_mondoo_version: 9.0.0 engineVersion: min_mondoo_version: 9.0.0 enhancedMonitoringResourceArn: {} diff --git a/providers/aws/resources/aws_rds.go b/providers/aws/resources/aws_rds.go index 76fba203c8..8af3a35e4f 100644 --- a/providers/aws/resources/aws_rds.go +++ b/providers/aws/resources/aws_rds.go @@ -106,6 +106,7 @@ func (a *mqlAwsRds) getDbInstances(conn *connection.AwsConnection) []*jobpool.Jo "enabledCloudwatchLogsExports": llx.ArrayData(stringSliceInterface, types.String), "endpoint": llx.StringDataPtr(endpointAddress), "engine": llx.StringDataPtr(dbInstance.Engine), + "engineLifecycleSupport": llx.StringDataPtr(dbInstance.EngineLifecycleSupport), "engineVersion": llx.StringDataPtr(dbInstance.EngineVersion), "enhancedMonitoringResourceArn": llx.StringDataPtr(dbInstance.EnhancedMonitoringResourceArn), "id": llx.StringDataPtr(dbInstance.DBInstanceIdentifier), @@ -300,6 +301,7 @@ func (a *mqlAwsRds) getDbClusters(conn *connection.AwsConnection) []*jobpool.Job "deletionProtection": llx.BoolDataPtr(cluster.DeletionProtection), "endpoint": llx.StringDataPtr(cluster.Endpoint), "engine": llx.StringDataPtr(cluster.Engine), + "engineLifecycleSupport": llx.StringDataPtr(cluster.EngineLifecycleSupport), "engineVersion": llx.StringDataPtr(cluster.EngineVersion), "hostedZoneId": llx.StringDataPtr(cluster.HostedZoneId), "id": llx.StringDataPtr(cluster.DBClusterIdentifier),