fix(aws): Add db_engine_version_description to aws_rds_engine_versions primary key (#6851)

candiduslynx · web-flow · commit 779be9866bee · 2023-01-17T17:36:14.000Z
diff --git a/plugins/source/aws/docs/tables/aws_rds_engine_versions.md b/plugins/source/aws/docs/tables/aws_rds_engine_versions.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBEngineVersion.html
 
-The composite primary key for this table is (**account_id**, **region**, **engine**, **engine_version**).
+The composite primary key for this table is (**account_id**, **region**, **engine**, **engine_version**, **db_engine_version_description**).
 
 ## Relations
 
@@ -21,13 +21,13 @@ The following tables depend on aws_rds_engine_versions:
 |region (PK)|String|
 |engine (PK)|String|
 |engine_version (PK)|String|
+|db_engine_version_description (PK)|String|
 |tag_list|JSON|
 |create_time|Timestamp|
 |custom_db_engine_version_manifest|String|
 |db_engine_description|String|
 |db_engine_media_type|String|
 |db_engine_version_arn|String|
-|db_engine_version_description|String|
 |db_parameter_group_family|String|
 |database_installation_files_s3_bucket_name|String|
 |database_installation_files_s3_prefix|String|
diff --git a/plugins/source/aws/resources/services/rds/engine_versions.go b/plugins/source/aws/resources/services/rds/engine_versions.go
@@ -12,7 +12,7 @@ func EngineVersions() *schema.Table {
 		Name:        "aws_rds_engine_versions",
 		Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBEngineVersion.html`,
 		Resolver:    fetchRdsEngineVersions,
-		Transform:   transformers.TransformWithStruct(&types.DBEngineVersion{}, transformers.WithSkipFields("TagList")),
+		Transform:   transformers.TransformWithStruct(&types.DBEngineVersion{}),
 		Multiplex:   client.ServiceAccountRegionMultiplexer("rds"),
 		Columns: []schema.Column{
 			{
@@ -47,6 +47,14 @@ func EngineVersions() *schema.Table {
 					PrimaryKey: true,
 				},
 			},
+			{
+				Name:     "db_engine_version_description",
+				Type:     schema.TypeString,
+				Resolver: schema.PathResolver("DBEngineVersionDescription"),
+				CreationOptions: schema.ColumnCreationOptions{
+					PrimaryKey: true,
+				},
+			},
 			{
 				Name:     "tag_list",
 				Type:     schema.TypeJSON,
