chore: Gitlab e2e tests (#26)

gabedos · web-flow · commit ceb4be65ed1c · 2025-06-25T18:35:52.000-04:00
* gitlab e2e tests

* Update tags

* install opentofu

* AWS cross account config

* Install AWC CLI

* nit clean up

* Use unique identifier in test resources

* Remove inference accelerator

* 10 second sleep

* Add retry in terraform options

* Retryable Terraform Errors

* Increase retry

* Replace opentofu with tf

* Enable locking

* Update the provider retries

* Null blocker

* Update test prefix in tests

* Pin the AWS CLI version

* Misc clean up

* Use base image with awscli
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,24 @@
+stages:
+  - test
+
+tests:
+  stage: test
+  image: registry.ddbuild.io/ci-containers-project:v50051243-ace27e7-v1.22
+  tags:
+    - "arch:amd64"
+  before_script:
+    # Setup Terraform
+    - curl -fsSL https://releases.hashicorp.com/terraform/1.6.6/terraform_1.6.6_linux_amd64.zip -o terraform.zip
+    - unzip terraform.zip > /dev/null
+    - mv terraform /usr/local/bin/terraform
+    - chmod +x /usr/local/bin/terraform
+    - terraform version
+
+    # Setup AWS credentials
+    - echo "Assuming ddbuild-terraform-aws-ecs-datadog role"
+    - roleoutput=$(aws sts assume-role --role-arn arn:aws:iam::669783387624:role/ddbuild-terraform-aws-ecs-datadog --external-id ddbuild-terraform-aws-ecs-datadog-ci --role-session-name terraform-aws-ecs-datadog-ci)
+    - export AWS_ACCESS_KEY_ID="$(echo "$roleoutput" | jq -r '.Credentials.AccessKeyId')"
+    - export AWS_SECRET_ACCESS_KEY="$(echo "$roleoutput" | jq -r '.Credentials.SecretAccessKey')"
+    - export AWS_SESSION_TOKEN="$(echo "$roleoutput" | jq -r '.Credentials.SessionToken')"
+  script:
+    - make test
diff --git a/modules/ecs_fargate/main.tf b/modules/ecs_fargate/main.tf
@@ -39,15 +39,15 @@ resource "aws_ecs_task_definition" "this" {
 
   family = var.family
 
-  # Fargate incompatible parameter
-  dynamic "inference_accelerator" {
-    for_each = var.inference_accelerator != null ? var.inference_accelerator : []
-
-    content {
-      device_name = inference_accelerator.value.device_name
-      device_type = inference_accelerator.value.device_type
-    }
-  }
+  # Fargate incompatible parameter on v6.0.0
+  # dynamic "inference_accelerator" {
+  #   for_each = var.inference_accelerator != null ? var.inference_accelerator : []
+
+  #   content {
+  #     device_name = inference_accelerator.value.device_name
+  #     device_type = inference_accelerator.value.device_type
+  #   }
+  # }
 
   # Fargate incompatible parameter
   ipc_mode     = var.ipc_mode
diff --git a/modules/ecs_fargate/outputs.tf b/modules/ecs_fargate/outputs.tf
@@ -35,7 +35,7 @@ output "family" {
 
 output "inference_accelerator" {
   description = "Inference accelerator settings."
-  value       = aws_ecs_task_definition.this.inference_accelerator
+  value       = null
 }
 
 output "ipc_mode" {
diff --git a/smoke_tests/ecs_fargate/all-dd-disabled.tf b/smoke_tests/ecs_fargate/all-dd-disabled.tf
@@ -36,7 +36,7 @@ module "dd_task_all_dd_disabled" {
     enabled = false,
   }
 
-  family = "terraform-test-all-dd-disabled"
+  family = "${var.test_prefix}-all-dd-disabled"
   container_definitions = jsonencode([
     {
       name : "dummy-container",
diff --git a/smoke_tests/ecs_fargate/all-dd-inputs.tf b/smoke_tests/ecs_fargate/all-dd-inputs.tf
@@ -57,7 +57,7 @@ module "dd_task_all_dd_inputs" {
   }
 
   # Configure Task Definition
-  family = "terraform-test-all-dd-inputs"
+  family = "${var.test_prefix}-all-dd-inputs"
   container_definitions = jsonencode([
     {
       name      = "datadog-dogstatsd-app",
diff --git a/smoke_tests/ecs_fargate/all-ecs-inputs.tf b/smoke_tests/ecs_fargate/all-ecs-inputs.tf
@@ -8,7 +8,7 @@
 ################################################################################
 
 resource "aws_efs_file_system" "fs" {
-  creation_token   = "my-efs-file-system"
+  creation_token   = "${var.test_prefix}-efs-file-system"
   performance_mode = "generalPurpose"
   tags = {
     Name = "MyEFSFileSystem"
@@ -32,7 +32,7 @@ resource "aws_efs_access_point" "fs" {
 }
 
 resource "aws_iam_role" "ecs_task_role" {
-  name = "terraform-test-ecs-task-role"
+  name = "${var.test_prefix}-ecs-task-role"
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -49,7 +49,7 @@ resource "aws_iam_role" "ecs_task_role" {
 }
 
 resource "aws_iam_policy" "ecs_task_policy" {
-  name        = "terraform-test-ecs-task-policy"
+  name        = "${var.test_prefix}-ecs-task-policy"
   description = "Policy for ECS task role to access EFS"
   policy = jsonencode({
     Version = "2012-10-17"
@@ -82,7 +82,7 @@ module "dd_task_all_ecs_inputs" {
   dd_site    = var.dd_site
   dd_service = var.dd_service
 
-  family = "terraform-test-all-ecs-inputs"
+  family = "${var.test_prefix}-all-ecs-inputs"
   container_definitions = jsonencode([
     {
       name      = "datadog-dummy-app",
diff --git a/smoke_tests/ecs_fargate/all-null.tf b/smoke_tests/ecs_fargate/all-null.tf
@@ -13,7 +13,7 @@ module "dd_task_all_null" {
 
   # Required values
   dd_api_key = var.dd_api_key
-  family     = "terraform-test-all-null"
+  family     = "${var.test_prefix}-all-null"
   container_definitions = jsonencode([
     {
       name : "dummy-container",
diff --git a/smoke_tests/ecs_fargate/all-windows.tf b/smoke_tests/ecs_fargate/all-windows.tf
@@ -24,7 +24,7 @@ module "dd_task_all_windows" {
     enabled = true
   }
 
-  family = "terraform-test-all-windows"
+  family = "${var.test_prefix}-all-windows"
   container_definitions = jsonencode([
     {
       name      = "datadog-dogstatsd-app",
diff --git a/smoke_tests/ecs_fargate/apm-dsd-tcp-udp.tf b/smoke_tests/ecs_fargate/apm-dsd-tcp-udp.tf
@@ -28,7 +28,7 @@ module "dd_task_apm_dsd_tcp_udp" {
     socket_enabled = false,
   }
 
-  family = "terraform-test-apm-dsd-tcp-udp"
+  family = "${var.test_prefix}-apm-dsd-tcp-udp"
   container_definitions = jsonencode([
     {
       name      = "datadog-dogstatsd-app",
diff --git a/smoke_tests/ecs_fargate/cws-only.tf b/smoke_tests/ecs_fargate/cws-only.tf
@@ -35,7 +35,7 @@ module "dd_task_cws_only" {
     enabled = true,
   }
 
-  family = "terraform-test-cws-only"
+  family = "${var.test_prefix}-cws-only"
   container_definitions = jsonencode([
     {
       name      = "datadog-cws-app",
diff --git a/smoke_tests/ecs_fargate/logging-only.tf b/smoke_tests/ecs_fargate/logging-only.tf
@@ -34,7 +34,7 @@ module "dd_task_logging_only" {
     }
   }
 
-  family                = "terraform-test-logging-only"
+  family                = "${var.test_prefix}-logging-only"
   container_definitions = jsonencode([])
 
   requires_compatibilities = ["FARGATE"]
diff --git a/smoke_tests/ecs_fargate/provider.tf b/smoke_tests/ecs_fargate/provider.tf
@@ -0,0 +1,3 @@
+provider "aws" {
+  region = "us-east-1"
+}
diff --git a/smoke_tests/ecs_fargate/variables.tf b/smoke_tests/ecs_fargate/variables.tf
@@ -18,4 +18,10 @@ variable "dd_site" {
   description = "Datadog Site"
   type        = string
   default     = "datadoghq.com"
-}
+}
+
+variable "test_prefix" {
+  description = "The ECS task family name prefix"
+  type        = string
+  default     = "terraform-test"
+}
diff --git a/tests/all_dd_disabled_test.go b/tests/all_dd_disabled_test.go
@@ -20,7 +20,7 @@ func (s *ECSFargateSuite) TestAllDDDisabled() {
 	// Retrieve the task output for the "all-dd-disabled" module
 	var containers []types.ContainerDefinition
 	task := terraform.OutputMap(s.T(), s.terraformOptions, "all-dd-disabled")
-	s.Equal("terraform-test-all-dd-disabled", task["family"], "Unexpected task family name")
+	s.Equal(s.testPrefix+"-all-dd-disabled", task["family"], "Unexpected task family name")
 	s.Equal(string(types.NetworkModeAwsvpc), task["network_mode"], "Unexpected network mode")
 	s.Equal(string(types.PidModeTask), task["pid_mode"], "Unexpected PID mode")
 
diff --git a/tests/all_dd_inputs_test.go b/tests/all_dd_inputs_test.go
@@ -21,6 +21,8 @@ func (s *ECSFargateSuite) TestAllDDInputs() {
 	var containers []types.ContainerDefinition
 	task := terraform.OutputMap(s.T(), s.terraformOptions, "all-dd-inputs")
 
+	s.Equal(s.testPrefix+"-all-dd-inputs", task["family"], "Unexpected task family name")
+
 	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")
diff --git a/tests/all_ecs_inputs_test.go b/tests/all_ecs_inputs_test.go
@@ -18,7 +18,7 @@ func (s *ECSFargateSuite) TestAllECSInputs() {
 	// Retrieve the task output for the "all-ecs-inputs" module
 	task := terraform.OutputMap(s.T(), s.terraformOptions, "all-ecs-inputs")
 
-	s.Equal("terraform-test-all-ecs-inputs", task["family"], "Unexpected task family name")
+	s.Equal(s.testPrefix+"-all-ecs-inputs", task["family"], "Unexpected task family name")
 	s.Equal("256", task["cpu"], "Unexpected CPU value")
 	s.Equal("512", task["memory"], "Unexpected memory value")
 	s.Equal("awsvpc", task["network_mode"], "Unexpected network mode")
diff --git a/tests/all_windows_test.go b/tests/all_windows_test.go
@@ -20,7 +20,7 @@ func (s *ECSFargateSuite) TestAllWindows() {
 	// Retrieve the task output for the "all-windows" module
 	var containers []types.ContainerDefinition
 	task := terraform.OutputMap(s.T(), s.terraformOptions, "all-windows")
-	s.Equal("terraform-test-all-windows", task["family"], "Unexpected task family name")
+	s.Equal(s.testPrefix+"-all-windows", task["family"], "Unexpected task family name")
 	s.Equal(string(types.NetworkModeAwsvpc), task["network_mode"], "Unexpected network mode")
 	s.Equal(string(types.PidModeTask), task["pid_mode"], "Unexpected PID mode")
 
diff --git a/tests/apm_dsd_tcp_udp_test.go b/tests/apm_dsd_tcp_udp_test.go
@@ -20,7 +20,7 @@ func (s *ECSFargateSuite) TestApmDsdTcpUdp() {
 	// Retrieve the task output for the "apm-dsd-tcp-udp" module
 	var containers []types.ContainerDefinition
 	task := terraform.OutputMap(s.T(), s.terraformOptions, "apm-dsd-tcp-udp")
-	s.Equal("terraform-test-apm-dsd-tcp-udp", task["family"], "Unexpected task family name")
+	s.Equal(s.testPrefix+"-apm-dsd-tcp-udp", task["family"], "Unexpected task family name")
 	s.Equal(string(types.NetworkModeAwsvpc), task["network_mode"], "Unexpected network mode")
 	s.Equal(string(types.PidModeTask), task["pid_mode"], "Unexpected PID mode")
 
diff --git a/tests/logging_only_test.go b/tests/logging_only_test.go
@@ -20,7 +20,7 @@ func (s *ECSFargateSuite) TestLoggingOnly() {
 	// Retrieve the task output for the "logging-only" module
 	var containers []types.ContainerDefinition
 	task := terraform.OutputMap(s.T(), s.terraformOptions, "logging-only")
-	s.Equal("terraform-test-logging-only", task["family"], "Unexpected task family name")
+	s.Equal(s.testPrefix+"-logging-only", task["family"], "Unexpected task family name")
 	s.Equal(string(types.NetworkModeAwsvpc), task["network_mode"], "Unexpected network mode")
 	s.Equal(string(types.PidModeTask), task["pid_mode"], "Unexpected PID mode")
 
diff --git a/tests/main_test.go b/tests/main_test.go
@@ -7,6 +7,7 @@ package test
 
 import (
 	"log"
+	"os"
 	"testing"
 
 	"github.com/gruntwork-io/terratest/modules/terraform"
@@ -17,6 +18,7 @@ import (
 type ECSFargateSuite struct {
 	suite.Suite
 	terraformOptions *terraform.Options
+	testPrefix       string
 }
 
 // TestECSFargateSuite is the entry point for the test suite
@@ -28,17 +30,27 @@ func TestECSFargateSuite(t *testing.T) {
 func (s *ECSFargateSuite) SetupSuite() {
 	log.Println("Setting up test suite resources...")
 
+	// All resources must be prefixed with terraform-test
+	s.testPrefix = "terraform-test"
+	ciJobID := os.Getenv("CI_JOB_ID")
+	if ciJobID != "" {
+		s.testPrefix = s.testPrefix + "-" + ciJobID
+	}
+
 	// Define the Terraform options for the suite
 	s.terraformOptions = &terraform.Options{
 		// Path to the smoke_tests directory
 		TerraformDir: "../smoke_tests/ecs_fargate",
 		// Variables to pass to the Terraform module
 		Vars: map[string]interface{}{
-			"dd_api_key": "test-api-key",
-			"dd_service": "test-service",
-			"dd_site":    "datadoghq.com",
+			"dd_api_key":  "test-api-key",
+			"dd_service":  "test-service",
+			"dd_site":     "datadoghq.com",
+			"test_prefix": s.testPrefix,
+		},
+		RetryableTerraformErrors: map[string]string{
+			"couldn't find resource": "terratest could not find the resource. check for access denied errors in cloudtrial",
 		},
-		NoColor: true,
 	}
 
 	// Run terraform init and apply

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ output "family" {`
`35`	`35`
`36`	`36`	`output "inference_accelerator" {`
`37`	`37`	`description = "Inference accelerator settings."`
`38`		`- value = aws_ecs_task_definition.this.inference_accelerator`
	`38`	`+ value = null`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`output "ipc_mode" {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ module "dd_task_all_dd_disabled" {`
`36`	`36`	`enabled = false,`
`37`	`37`	`}`
`38`	`38`
`39`		`- family = "terraform-test-all-dd-disabled"`
	`39`	`+ family = "${var.test_prefix}-all-dd-disabled"`
`40`	`40`	`container_definitions = jsonencode([`
`41`	`41`	`{`
`42`	`42`	`name : "dummy-container",`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ module "dd_task_all_dd_inputs" {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`# Configure Task Definition`
`60`		`- family = "terraform-test-all-dd-inputs"`
	`60`	`+ family = "${var.test_prefix}-all-dd-inputs"`
`61`	`61`	`container_definitions = jsonencode([`
`62`	`62`	`{`
`63`	`63`	`name = "datadog-dogstatsd-app",`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ module "dd_task_all_null" {`
`13`	`13`
`14`	`14`	`# Required values`
`15`	`15`	`dd_api_key = var.dd_api_key`
`16`		`- family = "terraform-test-all-null"`
	`16`	`+ family = "${var.test_prefix}-all-null"`
`17`	`17`	`container_definitions = jsonencode([`
`18`	`18`	`{`
`19`	`19`	`name : "dummy-container",`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ module "dd_task_all_windows" {`
`24`	`24`	`enabled = true`
`25`	`25`	`}`
`26`	`26`
`27`		`- family = "terraform-test-all-windows"`
	`27`	`+ family = "${var.test_prefix}-all-windows"`
`28`	`28`	`container_definitions = jsonencode([`
`29`	`29`	`{`
`30`	`30`	`name = "datadog-dogstatsd-app",`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ module "dd_task_apm_dsd_tcp_udp" {`
`28`	`28`	`socket_enabled = false,`
`29`	`29`	`}`
`30`	`30`
`31`		`- family = "terraform-test-apm-dsd-tcp-udp"`
	`31`	`+ family = "${var.test_prefix}-apm-dsd-tcp-udp"`
`32`	`32`	`container_definitions = jsonencode([`
`33`	`33`	`{`
`34`	`34`	`name = "datadog-dogstatsd-app",`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ module "dd_task_cws_only" {`
`35`	`35`	`enabled = true,`
`36`	`36`	`}`
`37`	`37`
`38`		`- family = "terraform-test-cws-only"`
	`38`	`+ family = "${var.test_prefix}-cws-only"`
`39`	`39`	`container_definitions = jsonencode([`
`40`	`40`	`{`
`41`	`41`	`name = "datadog-cws-app",`