chore: merge dependson and test for rofs volume mounts

Author: Mathew-Estafanous

modules/ecs_fargate/datadog.tf

@@ -256,13 +256,6 @@ locals {
     }
   ] : []
 
-  rofs_agent_depends_on = var.dd_readonly_root_filesystem ? [
-    {
-      condition     = "SUCCESS"
-      containerName = "init-volume"
-    }
-  ] : []
-
   # Volume configuration for task
   apm_dsd_volume = local.is_apm_dsd_volume ? [
     {
@@ -353,6 +346,16 @@ locals {
     local.dd_environment,
   )
 
+  dd_agent_dependency = concat(
+    var.dd_readonly_root_filesystem ? [
+      {
+        condition     = "SUCCESS"
+        containerName = "init-volume"
+      }
+    ] : [],
+    try(var.dd_log_collection.fluentbit_config.is_log_router_dependency_enabled, false) && local.dd_firelens_log_configuration != null ? local.log_router_dependency : [],
+  )
+
   # Datadog Agent container definition
   dd_agent_container = concat(
     var.dd_readonly_root_filesystem ? [
@@ -404,11 +407,9 @@ locals {
             }
           ],
 
-          dependsOn = local.rofs_agent_depends_on,
-
           mountPoints      = local.dd_agent_mount,
           logConfiguration = local.dd_firelens_log_configuration,
-          dependsOn        = try(var.dd_log_collection.fluentbit_config.is_log_router_dependency_enabled, false) && local.dd_firelens_log_configuration != null ? local.log_router_dependency : [],
+          dependsOn        = local.dd_agent_dependency
           systemControls   = []
           volumesFrom      = []
         },

smoke_tests/ecs_fargate/logging-only.tf

@@ -15,6 +15,8 @@ module "dd_task_logging_only" {
   dd_service   = var.dd_service
   dd_essential = true
 
+  dd_readonly_root_filesystem = false
+
   dd_dogstatsd = {
     enabled = false,
   }

tests/all_dd_inputs_test.go

@@ -27,6 +27,10 @@ func (s *ECSFargateSuite) TestAllDDInputs() {
 	s.NoError(err, "Failed to parse container definitions")
 	s.Equal(7, len(containers), "Expected 6 containers in the task definition")
 
+	initContainer, found := GetContainer(containers, "init-volume")
+	s.True(found, "Container init-volume not found in definitions")
+	AssertMountPoint(s.T(), initContainer, MountInitVolume)
+
 	// Test Agent Container
 	agentContainer, found := GetContainer(containers, "datadog-agent")
 	s.True(found, "Container datadog-agent not found in definitions")
@@ -37,6 +41,9 @@ func (s *ECSFargateSuite) TestAllDDInputs() {
 	AssertPortMapping(s.T(), agentContainer, PortUDP)
 	AssertPortMapping(s.T(), agentContainer, PortTCP)
 	AssertMountPoint(s.T(), agentContainer, MountDdSocket)
+	AssertMountPoint(s.T(), agentContainer, MountAgentConfig)
+	AssertMountPoint(s.T(), agentContainer, MountAgentTmp)
+	AssertMountPoint(s.T(), agentContainer, MountAgentRun)
 	AssertContainerDependency(s.T(), agentContainer, DependencyLogRouter)
 
 	expectedAgentEnvvars := map[string]string{

tests/logging_only_test.go

@@ -26,7 +26,7 @@ func (s *ECSFargateSuite) TestLoggingOnly() {
 
 	err := json.Unmarshal([]byte(task["container_definitions"]), &containers)
 	s.NoError(err, "Failed to parse container definitions")
-	s.Equal(3, len(containers), "Expected 2 containers in the task definition")
+	s.Equal(2, len(containers), "Expected 2 containers in the task definition")
 
 	// Test Agent Container
 	agentContainer, found := GetContainer(containers, "datadog-agent")
@@ -73,7 +73,7 @@ func (s *ECSFargateSuite) TestLoggingOnly() {
 	s.Equal("datadog-log-router", *agentContainer.DependsOn[0].ContainerName, "Agent should depend on datadog-log-router")
 	s.Equal(types.ContainerConditionHealthy, agentContainer.DependsOn[0].Condition, "Agent should depend on log router being healthy")
 
-	s.Equal(3, len(agentContainer.MountPoints), "Expected 3 mount points for datadog-agent")
+	s.Equal(0, len(agentContainer.MountPoints), "Expected 2 mount points for datadog-agent")
 
 	// Test Log Router Container
 	logRouterContainer, found := GetContainer(containers, "datadog-log-router")

tests/utils.go

@@ -16,6 +16,10 @@ import (
 var (
 	MountDdSocket       = types.MountPoint{SourceVolume: aws.String("dd-sockets"), ContainerPath: aws.String("/var/run/datadog"), ReadOnly: aws.Bool(false)}
 	MountCWS            = types.MountPoint{SourceVolume: aws.String("cws-instrumentation-volume"), ContainerPath: aws.String("/cws-instrumentation-volume"), ReadOnly: aws.Bool(false)}
+	MountInitVolume     = types.MountPoint{SourceVolume: aws.String("agent-config"), ContainerPath: aws.String("/agent-config"), ReadOnly: aws.Bool(false)}
+	MountAgentConfig    = types.MountPoint{SourceVolume: aws.String("agent-config"), ContainerPath: aws.String("/etc/datadog-agent"), ReadOnly: aws.Bool(false)}
+	MountAgentTmp       = types.MountPoint{SourceVolume: aws.String("agent-tmp"), ContainerPath: aws.String("/tmp"), ReadOnly: aws.Bool(false)}
+	MountAgentRun       = types.MountPoint{SourceVolume: aws.String("agent-run"), ContainerPath: aws.String("/opt/datadog-agent/run"), ReadOnly: aws.Bool(false)}
 	PortTCP             = types.PortMapping{ContainerPort: aws.Int32(8126), HostPort: aws.Int32(8126), Protocol: types.TransportProtocolTcp}
 	PortUDP             = types.PortMapping{ContainerPort: aws.Int32(8125), HostPort: aws.Int32(8125), Protocol: types.TransportProtocolUdp}
 	DependencyAgent     = types.ContainerDependency{ContainerName: aws.String("datadog-agent"), Condition: types.ContainerConditionHealthy}