[mq] working branch - merge 32bc60c on top of main at f4e1f2a

{"baseBranch":"main","baseCommit":"f4e1f2afc254f36e62b155394c58d416c551190a","createdAt":"2024-10-18T14:55:04.757493Z","headSha":"32bc60cc3e9edf191f6ba967462642209ac8855f","id":"b38501e0-0480-4b10-b838-51cb6dcab35b","priority":"200","pullRequestNumber":"1200","queuedAt":"2024-10-18T14:55:04.756757Z","status":"STATUS_QUEUED"}
DataDog · Oct 18, 2024 · 4e5a2b3 · 4e5a2b3
2 parents 58fa338 + 32bc60c
commit 4e5a2b3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/components/datadog/agent/ecsFargate.go b/components/datadog/agent/ecsFargate.go
@@ -11,9 +11,8 @@ import (
 
 func ECSFargateLinuxContainerDefinition(e config.Env, image string, apiKeySSMParamName pulumi.StringInput, fakeintake *fakeintake.Fakeintake, logConfig ecs.TaskDefinitionLogConfigurationPtrInput) *ecs.TaskDefinitionContainerDefinitionArgs {
 	if image == "" {
-		image = dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "latest", false)
+		image = dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "", false)
 	}
-
 	return &ecs.TaskDefinitionContainerDefinitionArgs{
 		Cpu:       pulumi.IntPtr(0),
 		Name:      pulumi.String("datadog-agent"),
@@ -97,9 +96,8 @@ func ECSFargateLinuxContainerDefinition(e config.Env, image string, apiKeySSMPar
 // https://docs.aws.amazon.com/AmazonECS/latest/developerguide/tutorial-deploy-fluentbit-on-windows.html
 func ECSFargateWindowsContainerDefinition(e config.Env, image string, apiKeySSMParamName pulumi.StringInput, fakeintake *fakeintake.Fakeintake) *ecs.TaskDefinitionContainerDefinitionArgs {
 	if image == "" {
-		image = dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "latest", false)
+		image = dockerAgentFullImagePath(e, "public.ecr.aws/datadog/agent", "", false)
 	}
-
 	return &ecs.TaskDefinitionContainerDefinitionArgs{
 		Cpu:       pulumi.IntPtr(0),
 		Name:      pulumi.String("datadog-agent"),

diff --git a/components/datadog/apps/aspnetsample/ecs.go b/components/datadog/apps/aspnetsample/ecs.go
@@ -59,7 +59,7 @@ func FargateAppDefinition(e aws.Environment, clusterArn pulumi.StringInput, apiK
 		PortMappings: ecs.TaskDefinitionPortMappingArray{},
 	}
 
-	serverTaskDef, err := ecsClient.FargateWindowsTaskDefinitionWithAgent(e, "aspnet-fg-server", pulumi.String("aspnet-fg"), 1024, 2048, map[string]ecs.TaskDefinitionContainerDefinitionArgs{"aspnetsample": *serverContainer}, apiKeySSMParamName, fakeIntake, opts...)
+	serverTaskDef, err := ecsClient.FargateWindowsTaskDefinitionWithAgent(e, "aspnet-fg-server", pulumi.String("aspnet-fg"), 1024, 2048, map[string]ecs.TaskDefinitionContainerDefinitionArgs{"aspnetsample": *serverContainer}, apiKeySSMParamName, fakeIntake, "", opts...)
 	if err != nil {
 		return nil, err
 	}

diff --git a/components/datadog/apps/nginx/ecsFargate.go b/components/datadog/apps/nginx/ecsFargate.go
@@ -86,6 +86,7 @@ func FargateAppDefinition(e aws.Environment, clusterArn pulumi.StringInput, apiK
 		},
 		apiKeySSMParamName,
 		fakeIntake,
+		"",
 		opts...)
 	if err != nil {
 		return nil, err

diff --git a/components/datadog/apps/redis/ecsFargate.go b/components/datadog/apps/redis/ecsFargate.go
@@ -69,6 +69,7 @@ func FargateAppDefinition(e aws.Environment, clusterArn pulumi.StringInput, apiK
 		},
 		apiKeySSMParamName,
 		fakeIntake,
+		"",
 		opts...,
 	)
 	if err != nil {

diff --git a/resources/aws/ecs/fargateService.go b/resources/aws/ecs/fargateService.go
@@ -47,9 +47,10 @@ func FargateWindowsTaskDefinitionWithAgent(
 	containers map[string]ecs.TaskDefinitionContainerDefinitionArgs,
 	apiKeySSMParamName pulumi.StringInput,
 	fakeintake *fakeintake.Fakeintake,
+	image string,
 	opts ...pulumi.ResourceOption,
 ) (*ecs.FargateTaskDefinition, error) {
-	containers["datadog-agent"] = *agent.ECSFargateWindowsContainerDefinition(&e, "public.ecr.aws/datadog/agent:latest", apiKeySSMParamName, fakeintake)
+	containers["datadog-agent"] = *agent.ECSFargateWindowsContainerDefinition(&e, image, apiKeySSMParamName, fakeintake)
 	// aws-for-fluent-bit:windowsservercore-latest can only be used with cloudwatch logs.
 	return ecs.NewFargateTaskDefinition(e.Ctx(), e.Namer.ResourceName(name), &ecs.FargateTaskDefinitionArgs{
 		Containers: containers,
@@ -76,9 +77,10 @@ func FargateTaskDefinitionWithAgent(
 	containers map[string]ecs.TaskDefinitionContainerDefinitionArgs,
 	apiKeySSMParamName pulumi.StringInput,
 	fakeintake *fakeintake.Fakeintake,
+	image string,
 	opts ...pulumi.ResourceOption,
 ) (*ecs.FargateTaskDefinition, error) {
-	containers["datadog-agent"] = *agent.ECSFargateLinuxContainerDefinition(&e, "public.ecr.aws/datadog/agent:latest", apiKeySSMParamName, fakeintake, GetFirelensLogConfiguration(pulumi.String("datadog-agent"), pulumi.String("datadog-agent"), apiKeySSMParamName))
+	containers["datadog-agent"] = *agent.ECSFargateLinuxContainerDefinition(&e, image, apiKeySSMParamName, fakeintake, GetFirelensLogConfiguration(pulumi.String("datadog-agent"), pulumi.String("datadog-agent"), apiKeySSMParamName))
 	containers["log_router"] = *FargateFirelensContainerDefinition()
 
 	return ecs.NewFargateTaskDefinition(e.Ctx(), e.Namer.ResourceName(name), &ecs.FargateTaskDefinitionArgs{

diff --git a/scenarios/aws/fakeintake/fakeintake.go b/scenarios/aws/fakeintake/fakeintake.go
@@ -60,6 +60,7 @@ func NewECSFargateInstance(e aws.Environment, name string, option ...Option) (*f
 			map[string]awsxEcs.TaskDefinitionContainerDefinitionArgs{"fakeintake": *fargateLinuxContainerDefinition(params.ImageURL, apiKeyParam.Name, params.Memory-600, params.DDDevForwarding)},
 			apiKeyParam.Name,
 			nil,
+			"public.ecr.aws/datadog/agent:latest",
 			opts...,
 		)
 		if err != nil {