Skip to content

fix: incorrect ResourceType ref for service clinet init of AWS #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 30, 2025
Merged

fix: incorrect ResourceType ref for service clinet init of AWS #82

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e9c836
fix: incorrect ResourceType ref for service clinet init of AWS
j3ttt Sep 18, 2025
9935ef6
alibaba cloud
j3ttt Sep 18, 2025
2434804
Merge branch 'main' into fix/aws-0918
j3ttt Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 60 additions & 58 deletions collector/aws/collector/constant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,62 +16,64 @@
package collector

const (
EC2 string = "EC2"
ElasticIP string = "ElasticIP"
Bucket string = "Bucket"
EFSFileSystem string = "EFS File System"
FSxFileSystem string = "FSx File System"
RDS string = "RDS"
ElastiCache string = "ElastiCache"
SecurityGroup string = "Security Group"
NetworkAcl string = "Network ACL"
WebACL string = "Web ACL"
Vpc string = "VPC"
CLB string = "CLB"
ELB string = "ELB"
Domain string = "Domain"
Certificate string = "Certificate"
Secret string = "Secret"
SNSTopic string = "SNSTopic"
ResourceRecordSet string = "ResourceRecordSet"
CDN string = "CDN"
User string = "User"
IAMPolicy string = "IAM Policy"
UserGroup string = "User Group"
Role string = "Role"
AccountSettings string = "Account Settings"
Registry string = "Registry"
Repository string = "Repository"
KMS string = "KMS"
Config string = "Config"
GuardDuty string = "GuardDuty"
CloudTrail string = "CloudTrail"
Lambda string = "Lambda"
AutoScalingGroup string = "AutoScalingGroup"
ECSCluster string = "ECSCluster"
ECSTaskDefinition string = "ECSTaskDefinition"
EKSCluster string = "EKSCluster"
DynamoDBTable string = "DynamoDBTable"
CloudFormationStack string = "CloudFormationStack"
APIGatewayRestAPI string = "APIGatewayRestAPI"
APIGatewayV2API string = "APIGatewayV2API"
SQSQueue string = "SQSQueue"
CloudWatchAlarm string = "CloudWatchAlarm"
CloudWatchLogGroup string = "CloudWatchLogGroup"
Account string = "Account"
VPCEndpointService string = "VPCEndpointService"
FlowLog string = "FlowLog"
NetworkInterface string = "NetworkInterface"
AppStreamFleet string = "AppStreamFleet"
AccessAnalyzer string = "AccessAnalyzer"
CognitoUserPool string = "CognitoUserPool"
CognitoIdentityPool string = "CognitoIdentityPool"
FMS string = "FMS"
Inspector2 string = "Inspector2"
SecurityHub string = "SecurityHub"
MacieFinding string = "MacieFinding"
MacieJob string = "MacieJob"
MacieSession string = "MacieSession"
NetworkFirewall string = "NetworkFirewall"
OpenSearch string = "OpenSearch"
EC2 string = "EC2"
ElasticIP string = "ElasticIP"
Bucket string = "Bucket"
EFSFileSystem string = "EFS File System"
FSxFileSystem string = "FSx File System"
RDS string = "RDS"
ElastiCache string = "ElastiCache"
SecurityGroup string = "Security Group"
NetworkAcl string = "Network ACL"
WebACL string = "Web ACL"
Vpc string = "VPC"
CLB string = "CLB"
ELB string = "ELB"
Domain string = "Domain"
Certificate string = "Certificate"
Secret string = "Secret"
SNSTopic string = "SNSTopic"
ResourceRecordSet string = "ResourceRecordSet"
CDN string = "CDN"
User string = "User"
IAMPolicy string = "IAM Policy"
UserGroup string = "User Group"
Role string = "Role"
AccountSettings string = "Account Settings"
Registry string = "Registry"
Repository string = "Repository"
KMS string = "KMS"
Config string = "Config"
GuardDuty string = "GuardDuty"
CloudTrail string = "CloudTrail"
Lambda string = "Lambda"
AutoScalingGroup string = "AutoScalingGroup"
ECSCluster string = "ECSCluster"
ECSTaskDefinition string = "ECSTaskDefinition"
EKSCluster string = "EKSCluster"
DynamoDBTable string = "DynamoDBTable"
CloudFormationStack string = "CloudFormationStack"
APIGatewayRestAPI string = "APIGatewayRestAPI"
APIGatewayV2API string = "APIGatewayV2API"
SQSQueue string = "SQSQueue"
CloudWatchAlarm string = "CloudWatchAlarm"
CloudWatchLogGroup string = "CloudWatchLogGroup"
Account string = "Account"
VPCEndpointService string = "VPCEndpointService"
FlowLog string = "FlowLog"
NetworkInterface string = "NetworkInterface"
AppStreamFleet string = "AppStreamFleet"
AccessAnalyzer string = "AccessAnalyzer"
CognitoUserPool string = "CognitoUserPool"
CognitoIdentityPool string = "CognitoIdentityPool"
FMS string = "FMS"
Inspector2Finding string = "Inspector2Finding"
Inspector2Coverage string = "Inspector2Coverage"
SecurityHub string = "SecurityHub"
MacieFinding string = "MacieFinding"
MacieJob string = "MacieJob"
MacieSession string = "MacieSession"
NetworkFirewall string = "NetworkFirewall"
NetworkFirewallRuleGroup string = "NetworkFirewallRuleGroup"
OpenSearch string = "OpenSearch"
)
2 changes: 1 addition & 1 deletion collector/aws/collector/inspector2/coverage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
// GetCoverageResource returns AWS Inspector2 coverage resource definition
func GetCoverageResource() schema.Resource {
return schema.Resource{
ResourceType: collector.Inspector2,
ResourceType: collector.Inspector2Coverage,
ResourceTypeName: "Inspector2 Coverage",
ResourceGroupType: constant.SECURITY,
Desc: "https://docs.aws.amazon.com/inspector/v2/APIReference/API_ListCoverage.html",
Expand Down
2 changes: 1 addition & 1 deletion collector/aws/collector/inspector2/finding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
// GetFindingResource returns AWS Inspector2 finding resource definition
func GetFindingResource() schema.Resource {
return schema.Resource{
ResourceType: collector.Inspector2,
ResourceType: collector.Inspector2Finding,
ResourceTypeName: "Inspector2 Finding",
ResourceGroupType: constant.SECURITY,
Desc: "https://docs.aws.amazon.com/inspector/v2/APIReference/API_ListFindings.html",
Expand Down
2 changes: 1 addition & 1 deletion collector/aws/collector/networkfirewall/rulegroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
// GetRuleGroupResource returns AWS Network Firewall Rule Group resource definition
func GetRuleGroupResource() schema.Resource {
return schema.Resource{
ResourceType: collector.NetworkFirewall,
ResourceType: collector.NetworkFirewallRuleGroup,
ResourceTypeName: "Network Firewall Rule Group",
ResourceGroupType: constant.NET,
Desc: "https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_RuleGroup.html",
Expand Down
6 changes: 3 additions & 3 deletions collector/aws/collector/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func (s *Services) InitServices(cloudAccountParam schema.CloudAccountParam) (err
s.CLB = initCLBClient(cfg)
case FSxFileSystem:
s.FSx = initFSxClient(cfg)
case AccountSettings, UserGroup, Role, User:
case AccountSettings, UserGroup, Role, User, IAMPolicy:
s.IAM = initIAMClient(cfg)
case RDS:
s.RDS = initRDSClient(cfg)
Expand Down Expand Up @@ -235,13 +235,13 @@ func (s *Services) InitServices(cloudAccountParam schema.CloudAccountParam) (err
s.CognitoIdentity = initCognitoIdentityClient(cfg)
case FMS:
s.FMS = initFMSClient(cfg)
case Inspector2:
case Inspector2Coverage, Inspector2Finding:
s.Inspector2 = initInspector2Client(cfg)
case SecurityHub:
s.SecurityHub = initSecurityHubClient(cfg)
case MacieFinding, MacieJob, MacieSession:
s.Macie = initMacieClient(cfg)
case NetworkFirewall:
case NetworkFirewall, NetworkFirewallRuleGroup:
s.NetworkFirewall = initNetworkFirewallClient(cfg)
case OpenSearch:
s.OpenSearch = initOpenSearchClient(cfg)
Expand Down
Loading