Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion providers/aws/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
var Config = plugin.Provider{
Name: "aws",
ID: "go.mondoo.com/cnquery/v9/providers/aws",
Version: "13.5.0",
Version: "13.5.1",
ConnectionTypes: []string{provider.DefaultConnectionType, string(awsec2ebsconn.EBSConnectionType)},
Connectors: []plugin.Connector{
{
Expand Down
2 changes: 2 additions & 0 deletions providers/aws/resources/aws.lr
Original file line number Diff line number Diff line change
Expand Up @@ -2994,6 +2994,8 @@ private aws.ecs.taskDefinition.containerDefinition @defaults("name image") {
cpu int
// Port mappings for the container
portMappings() []aws.ecs.taskDefinition.containerDefinition.portMapping
// Whether the container uses an init process (from linuxParameters)
initProcessEnabled bool
}

// Amazon ECS Task Definition Container Environment Variable
Expand Down
12 changes: 12 additions & 0 deletions providers/aws/resources/aws.lr.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions providers/aws/resources/aws.lr.versions
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,7 @@ aws.ecs.taskDefinition.containerDefinition.environmentVariable 11.15.2
aws.ecs.taskDefinition.containerDefinition.environmentVariable.name 11.15.2
aws.ecs.taskDefinition.containerDefinition.environmentVariable.value 11.15.2
aws.ecs.taskDefinition.containerDefinition.image 11.15.2
aws.ecs.taskDefinition.containerDefinition.initProcessEnabled 13.5.1
aws.ecs.taskDefinition.containerDefinition.logConfiguration 11.15.2
aws.ecs.taskDefinition.containerDefinition.logConfiguration.logDriver 11.15.2
aws.ecs.taskDefinition.containerDefinition.logConfiguration.options 11.15.2
Expand Down
6 changes: 6 additions & 0 deletions providers/aws/resources/aws_ecs.go
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,11 @@ func (a *mqlAwsEcs) createContainerDefinitionResource(taskDefArn string, cd *ecs
memory = int64(*cd.Memory)
}
cpu := int64(cd.Cpu)
// AWS defaults initProcessEnabled to false when LinuxParameters is nil
initProcessEnabled := false
if cd.LinuxParameters != nil && cd.LinuxParameters.InitProcessEnabled != nil {
initProcessEnabled = *cd.LinuxParameters.InitProcessEnabled
}

// Create environment variables
envVars := []any{}
Expand Down Expand Up @@ -974,6 +979,7 @@ func (a *mqlAwsEcs) createContainerDefinitionResource(taskDefArn string, cd *ecs
"memory": llx.IntData(memory),
"cpu": llx.IntData(cpu),
"portMappings": llx.ArrayData(portMappings, types.Resource("aws.ecs.taskDefinition.containerDefinition.portMapping")),
"initProcessEnabled": llx.BoolData(initProcessEnabled),
})
}

Expand Down
Loading