Update test prefix in tests

Author: gabedos

.gitlab-ci.yml

@@ -1,5 +1,3 @@
-image: registry.ddbuild.io/images/mirror/golang:1.23.4
-
 stages:
   - test
 
@@ -12,13 +10,6 @@ tests:
     - mkdir -p ~/.aws
     - apt-get update && apt-get install -y unzip curl jq
 
-    # Setup opentofu (open source Terraform)
-    # - curl -L https://github.com/opentofu/opentofu/releases/download/v1.9.1/tofu_1.9.1_linux_amd64.tar.gz -o tofu.tar.gz
-    # - tar -xzf tofu.tar.gz
-    # - mv tofu /usr/local/bin/tofu
-    # - chmod +x /usr/local/bin/tofu
-    # - tofu version
-
     # 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

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")
 

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")

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")

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")
 

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")
 

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")
 

tests/main_test.go

@@ -9,7 +9,6 @@ import (
 	"log"
 	"os"
 	"testing"
-	"time"
 
 	"github.com/gruntwork-io/terratest/modules/terraform"
 	"github.com/stretchr/testify/suite"
@@ -19,6 +18,7 @@ import (
 type ECSFargateSuite struct {
 	suite.Suite
 	terraformOptions *terraform.Options
+	testPrefix       string
 }
 
 // TestECSFargateSuite is the entry point for the test suite
@@ -31,10 +31,10 @@ func (s *ECSFargateSuite) SetupSuite() {
 	log.Println("Setting up test suite resources...")
 
 	// All resources must be prefixed with terraform-test
-	testPrefix := "terraform-test"
+	s.testPrefix = "terraform-test"
 	ciJobID := os.Getenv("CI_JOB_ID")
 	if ciJobID != "" {
-		testPrefix = testPrefix + "-" + ciJobID
+		s.testPrefix = s.testPrefix + "-" + ciJobID
 	}
 
 	// Define the Terraform options for the suite
@@ -46,19 +46,20 @@ func (s *ECSFargateSuite) SetupSuite() {
 			"dd_api_key":  "test-api-key",
 			"dd_service":  "test-service",
 			"dd_site":     "datadoghq.com",
-			"test_prefix": testPrefix,
+			"test_prefix": s.testPrefix,
 		},
 		RetryableTerraformErrors: map[string]string{
-			"couldn't find resource": "ECS eventually consistent or task definition not yet propagated",
+			"couldn't find resource": "terratest could not find the resource",
 		},
-		NoColor:            true,
-		MaxRetries:         2,
-		TimeBetweenRetries: 10 * time.Second,
-		Lock:               true,
+		// NoColor:            true,
+		// MaxRetries:         0,
+		// TimeBetweenRetries: 10 * time.Second,
+		// Lock:               true,
 	}
 
 	// Run terraform init and apply
-	terraform.InitAndApply(s.T(), s.terraformOptions)
+	terraform.Init(s.T(), s.terraformOptions)
+	terraform.Apply(s.T(), s.terraformOptions)
 }
 
 // TearDownSuite is run once at the end of the test suite