test: fix expected container and volume mount count

Author: Mathew-Estafanous

tests/all_dd_disabled_test.go

@@ -26,7 +26,7 @@ func (s *ECSFargateSuite) TestAllDDDisabled() {
 
 	err := json.Unmarshal([]byte(task["container_definitions"]), &containers)
 	s.NoError(err, "Failed to parse container definitions")
-	s.Equal(2, len(containers), "Expected 2 containers in the task definition")
+	s.Equal(3, len(containers), "Expected 2 containers in the task definition")
 
 	// Test Agent Container
 	agentContainer, found := GetContainer(containers, "datadog-agent")
@@ -59,8 +59,11 @@ func (s *ECSFargateSuite) TestAllDDDisabled() {
 	s.Equal(int32(3), *agentContainer.HealthCheck.Retries, "Agent health check retries should be 3")
 	s.Equal(int32(60), *agentContainer.HealthCheck.StartPeriod, "Agent health check start period should be 60")
 
-	// Verify no mount points (apm/dsd volumes should not be present)
-	s.Equal(0, len(agentContainer.MountPoints), "Expected no mount points for datadog-agent when features are disabled")
+	s.Equal(3, len(agentContainer.MountPoints), "Expected 3 mount points when features are disabled")
+	// Verify none are apm/dsd volume mount points
+	for _, mountPoint := range agentContainer.MountPoints {
+		s.NotEqual("dd-socket", *mountPoint.SourceVolume, "Mount point should not be dd-socket")
+	}
 
 	// Test dummy container
 	dummyContainer, found := GetContainer(containers, "dummy-container")

tests/all_dd_inputs_test.go

@@ -25,7 +25,7 @@ func (s *ECSFargateSuite) TestAllDDInputs() {
 
 	err := json.Unmarshal([]byte(task["container_definitions"]), &containers)
 	s.NoError(err, "Failed to parse container definitions")
-	s.Equal(6, len(containers), "Expected 6 containers in the task definition")
+	s.Equal(7, len(containers), "Expected 6 containers in the task definition")
 
 	// Test Agent Container
 	agentContainer, found := GetContainer(containers, "datadog-agent")

tests/apm_dsd_tcp_udp_test.go

@@ -26,7 +26,7 @@ func (s *ECSFargateSuite) TestApmDsdTcpUdp() {
 
 	err := json.Unmarshal([]byte(task["container_definitions"]), &containers)
 	s.NoError(err, "Failed to parse container definitions")
-	s.Equal(3, len(containers), "Expected 3 containers in the task definition")
+	s.Equal(4, len(containers), "Expected 3 containers in the task definition")
 
 	// Test Agent Container
 	agentContainer, found := GetContainer(containers, "datadog-agent")
@@ -60,8 +60,11 @@ func (s *ECSFargateSuite) TestApmDsdTcpUdp() {
 	}
 	AssertNotEnvVars(s.T(), agentContainer, disabledSocketEnvVars)
 
-	// Verify no mount points (as sockets are not used)
-	s.Equal(0, len(agentContainer.MountPoints), "Expected no mount points for datadog-agent when socket is disabled")
+	s.Equal(3, len(agentContainer.MountPoints), "Expected 3 mount points when socket is disabled")
+	// Verify none are apm/dsd volume mount points
+	for _, mountPoint := range agentContainer.MountPoints {
+		s.NotEqual("dd-socket", *mountPoint.SourceVolume, "Mount point should not be dd-socket")
+	}
 
 	// Test DogStatsD App Container
 	dogstatsdContainer, found := GetContainer(containers, "datadog-dogstatsd-app")

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(2, len(containers), "Expected 2 containers in the task definition")
+	s.Equal(3, len(containers), "Expected 2 containers in the task definition")
 
 	// Test Agent Container
 	agentContainer, found := GetContainer(containers, "datadog-agent")
@@ -73,8 +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")
 
-	// Verify no mount points
-	s.Equal(0, len(agentContainer.MountPoints), "Expected no mount points for datadog-agent")
+	s.Equal(3, len(agentContainer.MountPoints), "Expected 3 mount points for datadog-agent")
 
 	// Test Log Router Container
 	logRouterContainer, found := GetContainer(containers, "datadog-log-router")

tests/ust_docker_labels_test.go

@@ -25,7 +25,7 @@ func (s *ECSFargateSuite) TestUSTDockerLabels() {
 
 	err := json.Unmarshal([]byte(task["container_definitions"]), &containers)
 	s.NoError(err, "Failed to parse container definitions")
-	s.Equal(4, len(containers), "Expected 4 containers in the task definition (1 app container + 3 agent sidecar)")
+	s.Equal(5, len(containers), "Expected 4 containers in the task definition (1 app container + 3 agent sidecar)")
 
 	// Expected UST docker labels that should be present on all application containers
 	expectedUSTLabels := map[string]string{