fix(aws)!: Add region to aws_docdb_engine_versions primary key (#6846)

candiduslynx · web-flow · commit 0f624abaeb0f · 2023-01-17T16:06:52.000Z
diff --git a/plugins/source/aws/docs/tables/aws_docdb_engine_versions.md b/plugins/source/aws/docs/tables/aws_docdb_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**, **engine**, **engine_version**).
+The composite primary key for this table is (**account_id**, **region**, **engine**, **engine_version**).
 
 ## Relations
 
@@ -19,11 +19,12 @@ The following tables depend on aws_docdb_engine_versions:
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
 |account_id (PK)|String|
-|engine (PK)|String|
-|engine_version (PK)|String|
+|region (PK)|String|
 |db_engine_description|String|
 |db_engine_version_description|String|
 |db_parameter_group_family|String|
+|engine (PK)|String|
+|engine_version (PK)|String|
 |exportable_log_types|StringArray|
 |supports_log_exports_to_cloudwatch_logs|Bool|
 |valid_upgrade_target|JSON|
diff --git a/plugins/source/aws/resources/services/docdb/engine_versions.go b/plugins/source/aws/resources/services/docdb/engine_versions.go
@@ -13,7 +13,8 @@ func EngineVersions() *schema.Table {
 		Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBEngineVersion.html`,
 		Resolver:    fetchDocdbEngineVersions,
 		Multiplex:   client.ServiceAccountRegionMultiplexer("docdb"),
-		Transform:   transformers.TransformWithStruct(&types.DBEngineVersion{}),
+		Transform: transformers.TransformWithStruct(&types.DBEngineVersion{},
+			transformers.WithPrimaryKeys("Engine", "EngineVersion")),
 		Columns: []schema.Column{
 			{
 				Name:     "account_id",
@@ -24,17 +25,9 @@ func EngineVersions() *schema.Table {
 				},
 			},
 			{
-				Name:     "engine",
+				Name:     "region",
 				Type:     schema.TypeString,
-				Resolver: schema.PathResolver("Engine"),
-				CreationOptions: schema.ColumnCreationOptions{
-					PrimaryKey: true,
-				},
-			},
-			{
-				Name:     "engine_version",
-				Type:     schema.TypeString,
-				Resolver: schema.PathResolver("EngineVersion"),
+				Resolver: client.ResolveAWSRegion,
 				CreationOptions: schema.ColumnCreationOptions{
 					PrimaryKey: true,
 				},
