Skip to content

Commit

Permalink
🐛 Fix ecs discovery.
Browse files Browse the repository at this point in the history
Signed-off-by: Preslav <preslav@mondoo.com>
  • Loading branch information
preslavgerchev committed Sep 17, 2024
1 parent 726d9d3 commit 0656545
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
15 changes: 10 additions & 5 deletions providers/aws/resources/aws_ecs.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ func (a *mqlAwsEcs) containers() ([]interface{}, error) {
return nil, err
}
for i := range tasks {
c := tasks[i].(*mqlAwsEcsTask).Containers
t := tasks[i].(*mqlAwsEcsTask)
c := t.GetContainers()
if c.Error != nil {
return nil, c.Error
}
containers = append(containers, c.Data...)
}
}
Expand All @@ -69,11 +73,12 @@ func (a *mqlAwsEcs) containerInstances() ([]interface{}, error) {
containerInstances := []interface{}{}

for i := range clusters {
ci, err := clusters[i].(*mqlAwsEcsCluster).containerInstances()
if err != nil {
return nil, err
c := clusters[i].(*mqlAwsEcsCluster)
ci := c.GetContainerInstances()
if ci.Error != nil {
return nil, ci.Error
}
containerInstances = append(containerInstances, ci...)
containerInstances = append(containerInstances, ci.Data...)

}
return containerInstances, nil
Expand Down
4 changes: 3 additions & 1 deletion providers/aws/resources/discovery_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ func addConnectionInfoToECSContainerAsset(container *mqlAwsEcsContainer, account
if publicIp != "" {
a.Connections = []*inventory.Config{{
Host: publicIp,
Type: "ssh",
Options: map[string]string{
"region": region,
"container_name": container.Name.Data,
Expand All @@ -555,7 +556,8 @@ func addConnectionInfoToECSContainerAsset(container *mqlAwsEcsContainer, account
log.Warn().Str("asset", a.Name).Msg("no public ip address found")
a = MqlObjectToAsset(accountId,
mqlObject{
name: container.Name.Data, labels: make(map[string]string),
name: container.Name.Data,
labels: make(map[string]string),
awsObject: awsObject{
account: accountId, region: container.Region.Data, arn: container.Arn.Data,
id: container.Arn.Data, service: "ecs", objectType: "container",
Expand Down

0 comments on commit 0656545

Please sign in to comment.