fix: resource id would be empty when jsonPath get the wrong way (#72)

Author: j3ttt

collector/aws/collector/ec2/flowlog.go

@@ -34,8 +34,8 @@ func GetFlowLogResource() schema.Resource {
 		Desc:               "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeFlowLogs.html",
 		ResourceDetailFunc: GetFlowLogDetail,
 		RowField: schema.RowField{
-			ResourceId:   "$.FlowLogId",
-			ResourceName: "$.FlowLogId",
+			ResourceId:   "$.FlowLog.FlowLogId",
+			ResourceName: "$.FlowLog.FlowLogId",
 		},
 		Dimension: schema.Regional,
 	}

collector/aws/collector/ec2/networkinterface.go

@@ -34,8 +34,8 @@ func GetNetworkInterfaceResource() schema.Resource {
 		Desc:               "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeNetworkInterfaces.html",
 		ResourceDetailFunc: GetNetworkInterfaceDetail,
 		RowField: schema.RowField{
-			ResourceId:   "$.NetworkInterfaceId",
-			ResourceName: "$.NetworkInterfaceId",
+			ResourceId:   "$.NetworkInterface.NetworkInterfaceId",
+			ResourceName: "$.NetworkInterface.NetworkInterfaceId",
 		},
 		Dimension: schema.Regional,
 	}

collector/aws/collector/guardduty/detector.go

@@ -36,15 +36,16 @@ func GetDetectorResource() schema.Resource {
 		Desc:               `https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html`,
 		ResourceDetailFunc: GetDetectorDetail,
 		RowField: schema.RowField{
-			ResourceId:   "$.Detector.DetectorId",
-			ResourceName: "$.Detector.DetectorId", // No friendly name
+			ResourceId:   "$.DetectorId",
+			ResourceName: "$.DetectorId", // No friendly name
 		},
 		Dimension: schema.Regional,
 	}
 }
 
 // DetectorDetail aggregates all information for a single GuardDuty detector.
 type DetectorDetail struct {
+	DetectorId    string
 	Detector      *guardduty.GetDetectorOutput
 	Administrator *types.Administrator
 	Tags          map[string]string
@@ -76,6 +77,7 @@ func GetDetectorDetail(ctx context.Context, service schema.ServiceInterface, res
 		}
 
 		res <- &DetectorDetail{
+			DetectorId:    detectorId,
 			Detector:      detector,
 			Administrator: administrator,
 			Tags:          tags,

collector/aws/collector/iam/account_settings.go

@@ -35,8 +35,8 @@ func GetAccountSettingsResource() schema.Resource {
 		Desc:               `https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetAccountSummary.html`,
 		ResourceDetailFunc: GetAccountSettingsDetail,
 		RowField: schema.RowField{
-			ResourceId:   "", // AccountID would be
-			ResourceName: "", // AccountID would be
+			ResourceId:   "$.AccountId", // AccountID would be
+			ResourceName: "$.AccountId", // AccountID would be
 		},
 		Regions:   []string{"ap-northeast-1", "cn-north-1"},
 		Dimension: schema.Regional,
@@ -48,6 +48,8 @@ type AccountSettingsDetail struct {
 
 	AccountSummary map[string]int32
 
+	AccountId string
+
 	// todo
 	//EnabledFeatures []types.FeatureType
 }
@@ -83,6 +85,7 @@ func describeAccountSettingsDetail(ctx context.Context, c *iam.Client) (AccountS
 	return AccountSettingsDetail{
 		PasswordPolicy: passwordPolicy,
 		AccountSummary: accountSummary,
+		AccountId:      log.GetCloudAccountId(ctx),
 	}, nil
 }
 

collector/aws/collector/opensearch/domain.go

@@ -35,8 +35,8 @@ func GetDomainResource() schema.Resource {
 		Desc:               "https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_DomainStatus.html",
 		ResourceDetailFunc: GetDomainDetail,
 		RowField: schema.RowField{
-			ResourceId:   "$.Domain.DomainId",
-			ResourceName: "$.Domain.DomainName",
+			ResourceId:   "$.DomainStatus.DomainId",
+			ResourceName: "$.DomainStatus.DomainName",
 		},
 		Dimension: schema.Regional,
 	}

collector/aws/collector/sqs/queue.go

@@ -37,8 +37,8 @@ func GetSQSQueueResource() schema.Resource {
 		Desc:               "https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_ListQueues.html",
 		ResourceDetailFunc: GetSQSQueueDetail,
 		RowField: schema.RowField{
-			ResourceId:   "$.Queue.QueueUrl",
-			ResourceName: "$.Queue.Name",
+			ResourceId:   "$.Url",
+			ResourceName: "$.Name",
 		},
 		Dimension: schema.Regional,
 	}
@@ -99,7 +99,7 @@ func describeSQSQueueDetail(ctx context.Context, client *sqs.Client, queue SQSQu
 	} else {
 		tags = tagMap
 	}
-	
+
 	queue.Attributes = attributes
 	queue.Policy = policy
 	queue.Tags = tags