fix(aws)!: Add parent table ARNs as PKs to child tables for aws_resiliencehub_* tables (#7978)

candiduslynx · pull[bot] · commit 494992b24a57 · 2023-02-23T09:14:54.000Z
closes https://github.com/cloudquery/cloudquery-issues/issues/497 BEGIN_COMMIT_OVERRIDE fix(aws): Add parent table ARNs as PKs to child tables for `aws_resiliencehub_*` resources BREAKING-CHANGE: Add parent table ARNs as PKs to child tables for `aws_resiliencehub_*` resources fix(aws): Remove `account_id` and `region` columns from `aws_resiliencehub_*` PKs BREAKING-CHANGE: Remove `account_id` and `region` columns from `aws_resiliencehub_*` PKs fix(aws): Use `physical_resource_identifier` instead of `physical_resource_id` in `aws_resiliencehub_app_version_resources` and `aws_resiliencehub_app_version_resource_mappings` PKs BREAKING-CHANGE: Use `physical_resource_identifier` instead of `physical_resource_id` in `aws_resiliencehub_app_version_resources` and `aws_resiliencehub_app_version_resource_mappings` PKs END_COMMIT_OVERRIDE
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_alarm_recommendations.md b/plugins/source/aws/docs/tables/aws_resiliencehub_alarm_recommendations.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AlarmRecommendation.html
 
-The composite primary key for this table is (**account_id**, **region**, **name**).
+The composite primary key for this table is (**app_arn**, **assessment_arn**, **recommendation_id**).
 
 ## Relations
 
@@ -16,10 +16,12 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_
 |_cq_sync_time|Timestamp|
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
-|account_id (PK)|String|
-|region (PK)|String|
-|name (PK)|String|
-|recommendation_id|String|
+|account_id|String|
+|region|String|
+|app_arn (PK)|String|
+|assessment_arn (PK)|String|
+|name|String|
+|recommendation_id (PK)|String|
 |reference_id|String|
 |type|String|
 |app_component_name|String|
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_assessments.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_assessments.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AppAssessment.html
 
-The primary key for this table is **arn**.
+The composite primary key for this table is (**app_arn**, **arn**).
 
 ## Relations
 
@@ -26,11 +26,11 @@ The following tables depend on aws_resiliencehub_app_assessments:
 |_cq_parent_id|UUID|
 |account_id|String|
 |region|String|
+|app_arn (PK)|String|
 |arn (PK)|String|
 |assessment_arn|String|
 |assessment_status|String|
 |invoker|String|
-|app_arn|String|
 |app_version|String|
 |assessment_name|String|
 |compliance|JSON|
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_component_compliances.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_component_compliances.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AppComponentCompliance.html
 
-The composite primary key for this table is (**account_id**, **region**, **app_component_name**).
+The composite primary key for this table is (**app_arn**, **assessment_arn**, **app_component_name**).
 
 ## Relations
 
@@ -16,8 +16,10 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_
 |_cq_sync_time|Timestamp|
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
-|account_id (PK)|String|
-|region (PK)|String|
+|account_id|String|
+|region|String|
+|app_arn (PK)|String|
+|assessment_arn (PK)|String|
 |app_component_name (PK)|String|
 |compliance|JSON|
 |cost|JSON|
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resource_mappings.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resource_mappings.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_ResourceMapping.html
 
-The composite primary key for this table is (**account_id**, **region**, **physical_resource_id**).
+The composite primary key for this table is (**app_arn**, **app_version**, **physical_resource_identifier**).
 
 ## Relations
 
@@ -16,10 +16,13 @@ This table depends on [aws_resiliencehub_app_versions](aws_resiliencehub_app_ver
 |_cq_sync_time|Timestamp|
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
-|account_id (PK)|String|
-|region (PK)|String|
+|account_id|String|
+|region|String|
+|app_arn (PK)|String|
+|app_version (PK)|String|
+|physical_resource_identifier (PK)|String|
 |mapping_type|String|
-|physical_resource_id (PK)|JSON|
+|physical_resource_id|JSON|
 |app_registry_app_name|String|
 |logical_stack_name|String|
 |resource_group_name|String|
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resources.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resources.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_PhysicalResource.html
 
-The composite primary key for this table is (**account_id**, **region**, **physical_resource_id**).
+The composite primary key for this table is (**app_arn**, **app_version**, **physical_resource_identifier**).
 
 ## Relations
 
@@ -16,10 +16,13 @@ This table depends on [aws_resiliencehub_app_versions](aws_resiliencehub_app_ver
 |_cq_sync_time|Timestamp|
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
-|account_id (PK)|String|
-|region (PK)|String|
+|account_id|String|
+|region|String|
+|app_arn (PK)|String|
+|app_version (PK)|String|
+|physical_resource_identifier (PK)|String|
 |logical_resource_id|JSON|
-|physical_resource_id (PK)|JSON|
+|physical_resource_id|JSON|
 |resource_type|String|
 |app_components|JSON|
 |resource_name|String|
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_versions.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_versions.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AppVersionSummary.html
 
-The composite primary key for this table is (**account_id**, **region**, **app_version**).
+The composite primary key for this table is (**app_arn**, **app_version**).
 
 ## Relations
 
@@ -20,6 +20,7 @@ The following tables depend on aws_resiliencehub_app_versions:
 |_cq_sync_time|Timestamp|
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
-|account_id (PK)|String|
-|region (PK)|String|
+|account_id|String|
+|region|String|
+|app_arn (PK)|String|
 |app_version (PK)|String|
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_component_recommendations.md b/plugins/source/aws/docs/tables/aws_resiliencehub_component_recommendations.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_ComponentRecommendation.html
 
-The composite primary key for this table is (**account_id**, **region**, **app_component_name**).
+The composite primary key for this table is (**app_arn**, **assessment_arn**, **app_component_name**).
 
 ## Relations
 
@@ -16,8 +16,10 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_
 |_cq_sync_time|Timestamp|
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
-|account_id (PK)|String|
-|region (PK)|String|
+|account_id|String|
+|region|String|
+|app_arn (PK)|String|
+|assessment_arn (PK)|String|
 |app_component_name (PK)|String|
 |config_recommendations|JSON|
 |recommendation_status|String|
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_recommendation_templates.md b/plugins/source/aws/docs/tables/aws_resiliencehub_recommendation_templates.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_RecommendationTemplate.html
 
-The composite primary key for this table is (**account_id**, **region**, **name**).
+The composite primary key for this table is (**arn**, **assessment_arn**, **app_arn**).
 
 ## Relations
 
@@ -16,15 +16,16 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_
 |_cq_sync_time|Timestamp|
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
-|account_id (PK)|String|
-|region (PK)|String|
-|assessment_arn|String|
+|account_id|String|
+|region|String|
+|arn (PK)|String|
+|assessment_arn (PK)|String|
 |format|String|
-|name (PK)|String|
+|name|String|
 |recommendation_template_arn|String|
 |recommendation_types|StringArray|
 |status|String|
-|app_arn|String|
+|app_arn (PK)|String|
 |end_time|Timestamp|
 |message|String|
 |needs_replacements|Bool|
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_sop_recommendations.md b/plugins/source/aws/docs/tables/aws_resiliencehub_sop_recommendations.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_SopRecommendation.html
 
-The composite primary key for this table is (**account_id**, **region**, **recommendation_id**).
+The composite primary key for this table is (**app_arn**, **assessment_arn**, **recommendation_id**).
 
 ## Relations
 
@@ -16,8 +16,10 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_
 |_cq_sync_time|Timestamp|
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
-|account_id (PK)|String|
-|region (PK)|String|
+|account_id|String|
+|region|String|
+|app_arn (PK)|String|
+|assessment_arn (PK)|String|
 |recommendation_id (PK)|String|
 |reference_id|String|
 |service_type|String|
diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_test_recommendations.md b/plugins/source/aws/docs/tables/aws_resiliencehub_test_recommendations.md
@@ -2,7 +2,7 @@
 
 https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_TestRecommendation.html
 
-The composite primary key for this table is (**account_id**, **region**, **reference_id**).
+The composite primary key for this table is (**app_arn**, **assessment_arn**, **recommendation_id**).
 
 ## Relations
 
@@ -16,16 +16,18 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_
 |_cq_sync_time|Timestamp|
 |_cq_id|UUID|
 |_cq_parent_id|UUID|
-|account_id (PK)|String|
-|region (PK)|String|
-|reference_id (PK)|String|
+|account_id|String|
+|region|String|
+|app_arn (PK)|String|
+|assessment_arn (PK)|String|
+|reference_id|String|
 |app_component_name|String|
 |depends_on_alarms|StringArray|
 |description|String|
 |intent|String|
 |items|JSON|
 |name|String|
 |prerequisite|String|
-|recommendation_id|String|
+|recommendation_id (PK)|String|
 |risk|String|
 |type|String|
diff --git a/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go
@@ -12,11 +12,8 @@ func alarmRecommendations() *schema.Table {
 		Name:        "aws_resiliencehub_alarm_recommendations",
 		Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AlarmRecommendation.html`,
 		Resolver:    fetchAlarmRecommendations,
-		Transform:   transformers.TransformWithStruct(&types.AlarmRecommendation{}, transformers.WithPrimaryKeys("Name")),
+		Transform:   transformers.TransformWithStruct(&types.AlarmRecommendation{}, transformers.WithPrimaryKeys("RecommendationId")),
 		Multiplex:   client.ServiceAccountRegionMultiplexer("resiliencehub"),
-		Columns: []schema.Column{
-			client.DefaultAccountIDColumn(true),
-			client.DefaultRegionColumn(true),
-		},
+		Columns:     []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, assessmentARN},
 	}
 }
diff --git a/plugins/source/aws/resources/services/resiliencehub/app_assessments.go b/plugins/source/aws/resources/services/resiliencehub/app_assessments.go
@@ -15,18 +15,7 @@ func appAssesments() *schema.Table {
 		PreResourceResolver: describeAppAssessments,
 		Transform:           transformers.TransformWithStruct(&types.AppAssessment{}),
 		Multiplex:           client.ServiceAccountRegionMultiplexer("resiliencehub"),
-		Columns: []schema.Column{
-			client.DefaultAccountIDColumn(false),
-			client.DefaultRegionColumn(false),
-			{
-				Name:     "arn",
-				Type:     schema.TypeString,
-				Resolver: schema.PathResolver("AssessmentArn"),
-				CreationOptions: schema.ColumnCreationOptions{
-					PrimaryKey: true,
-				},
-			},
-		},
+		Columns:             []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARNTop, arnColumn("AssessmentArn")},
 		Relations: []*schema.Table{
 			appComponentCompliances(),
 			appComponentRecommendations(),
diff --git a/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go b/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go
@@ -14,9 +14,6 @@ func appComponentCompliances() *schema.Table {
 		Resolver:    fetchAppComponentCompliances,
 		Transform:   transformers.TransformWithStruct(&types.AppComponentCompliance{}, transformers.WithPrimaryKeys("AppComponentName")),
 		Multiplex:   client.ServiceAccountRegionMultiplexer("resiliencehub"),
-		Columns: []schema.Column{
-			client.DefaultAccountIDColumn(true),
-			client.DefaultRegionColumn(true),
-		},
+		Columns:     []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, assessmentARN},
 	}
 }
diff --git a/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go b/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go
@@ -12,11 +12,16 @@ func appVersionResourceMappings() *schema.Table {
 		Name:        "aws_resiliencehub_app_version_resource_mappings",
 		Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_ResourceMapping.html`,
 		Resolver:    fetchAppVersionResourceMappings,
-		Transform:   transformers.TransformWithStruct(&types.ResourceMapping{}, transformers.WithPrimaryKeys("PhysicalResourceId")),
+		Transform:   transformers.TransformWithStruct(&types.ResourceMapping{}),
 		Multiplex:   client.ServiceAccountRegionMultiplexer("resiliencehub"),
 		Columns: []schema.Column{
-			client.DefaultAccountIDColumn(true),
-			client.DefaultRegionColumn(true),
+			client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, appVersion,
+			{
+				Name:            "physical_resource_identifier",
+				Type:            schema.TypeString,
+				Resolver:        schema.PathResolver("PhysicalResourceId.Identifier"),
+				CreationOptions: schema.ColumnCreationOptions{PrimaryKey: true},
+			},
 		},
 	}
 }
diff --git a/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go b/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go
@@ -12,11 +12,16 @@ func appVersionResources() *schema.Table {
 		Name:        "aws_resiliencehub_app_version_resources",
 		Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_PhysicalResource.html`,
 		Resolver:    fetchAppVersionResources,
-		Transform:   transformers.TransformWithStruct(&types.PhysicalResource{}, transformers.WithPrimaryKeys("PhysicalResourceId")),
+		Transform:   transformers.TransformWithStruct(&types.PhysicalResource{}),
 		Multiplex:   client.ServiceAccountRegionMultiplexer("resiliencehub"),
 		Columns: []schema.Column{
-			client.DefaultAccountIDColumn(true),
-			client.DefaultRegionColumn(true),
+			client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, appVersion,
+			{
+				Name:            "physical_resource_identifier",
+				Type:            schema.TypeString,
+				Resolver:        schema.PathResolver("PhysicalResourceId.Identifier"),
+				CreationOptions: schema.ColumnCreationOptions{PrimaryKey: true},
+			},
 		},
 	}
 }
diff --git a/plugins/source/aws/resources/services/resiliencehub/app_version_resources_fetch.go b/plugins/source/aws/resources/services/resiliencehub/app_version_resources_fetch.go
@@ -2,6 +2,8 @@ package resiliencehub
 
 import (
 	"context"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/resiliencehub"
 	"github.com/aws/aws-sdk-go-v2/service/resiliencehub/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
@@ -14,6 +16,7 @@ func fetchAppVersionResources(ctx context.Context, meta schema.ClientMeta, paren
 	p := resiliencehub.NewListAppVersionResourcesPaginator(svc, &resiliencehub.ListAppVersionResourcesInput{
 		AppArn:     parent.Parent.Item.(*types.App).AppArn,
 		AppVersion: parent.Item.(types.AppVersionSummary).AppVersion,
+		MaxResults: aws.Int32(100),
 	})
 	for p.HasMorePages() {
 		out, err := p.NextPage(ctx)
diff --git a/plugins/source/aws/resources/services/resiliencehub/app_versions.go b/plugins/source/aws/resources/services/resiliencehub/app_versions.go
@@ -14,13 +14,7 @@ func appVersions() *schema.Table {
 		Resolver:    fetchAppVersions,
 		Transform:   transformers.TransformWithStruct(&types.AppVersionSummary{}, transformers.WithPrimaryKeys("AppVersion")),
 		Multiplex:   client.ServiceAccountRegionMultiplexer("resiliencehub"),
-		Columns: []schema.Column{
-			client.DefaultAccountIDColumn(true),
-			client.DefaultRegionColumn(true),
-		},
-		Relations: []*schema.Table{
-			appVersionResources(),
-			appVersionResourceMappings(),
-		},
+		Columns:     []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARNTop},
+		Relations:   []*schema.Table{appVersionResources(), appVersionResourceMappings()},
 	}
 }
diff --git a/plugins/source/aws/resources/services/resiliencehub/app_versions_fetch.go b/plugins/source/aws/resources/services/resiliencehub/app_versions_fetch.go
@@ -2,6 +2,7 @@ package resiliencehub
 
 import (
 	"context"
+
 	"github.com/aws/aws-sdk-go-v2/service/resiliencehub"
 	"github.com/aws/aws-sdk-go-v2/service/resiliencehub/types"
 	"github.com/cloudquery/cloudquery/plugins/source/aws/client"
diff --git a/plugins/source/aws/resources/services/resiliencehub/apps.go b/plugins/source/aws/resources/services/resiliencehub/apps.go
diff --git a/plugins/source/aws/resources/services/resiliencehub/columns.go b/plugins/source/aws/resources/services/resiliencehub/columns.go
diff --git a/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go
diff --git a/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go b/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go
diff --git a/plugins/source/aws/resources/services/resiliencehub/resiliency_policies.go b/plugins/source/aws/resources/services/resiliencehub/resiliency_policies.go
diff --git a/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go
diff --git a/plugins/source/aws/resources/services/resiliencehub/suggested_resiliency_policies.go b/plugins/source/aws/resources/services/resiliencehub/suggested_resiliency_policies.go
diff --git a/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go
