Skip to content

Commit e7a5437

Browse files
committed
Use unique identifier in test resources
1 parent f0834da commit e7a5437

File tree

10 files changed

+28
-13
lines changed

10 files changed

+28
-13
lines changed

smoke_tests/ecs_fargate/all-dd-disabled.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module "dd_task_all_dd_disabled" {
3636
enabled = false,
3737
}
3838

39-
family = "terraform-test-all-dd-disabled"
39+
family = "${var.test_prefix}-all-dd-disabled"
4040
container_definitions = jsonencode([
4141
{
4242
name : "dummy-container",

smoke_tests/ecs_fargate/all-dd-inputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module "dd_task_all_dd_inputs" {
5757
}
5858

5959
# Configure Task Definition
60-
family = "terraform-test-all-dd-inputs"
60+
family = "${var.test_prefix}-all-dd-inputs"
6161
container_definitions = jsonencode([
6262
{
6363
name = "datadog-dogstatsd-app",

smoke_tests/ecs_fargate/all-ecs-inputs.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resource "aws_efs_access_point" "fs" {
3232
}
3333

3434
resource "aws_iam_role" "ecs_task_role" {
35-
name = "terraform-test-ecs-task-role"
35+
name = "${var.test_prefix}-ecs-task-role"
3636

3737
assume_role_policy = jsonencode({
3838
Version = "2012-10-17"
@@ -49,7 +49,7 @@ resource "aws_iam_role" "ecs_task_role" {
4949
}
5050

5151
resource "aws_iam_policy" "ecs_task_policy" {
52-
name = "terraform-test-ecs-task-policy"
52+
name = "${var.test_prefix}-ecs-task-policy"
5353
description = "Policy for ECS task role to access EFS"
5454
policy = jsonencode({
5555
Version = "2012-10-17"
@@ -82,7 +82,7 @@ module "dd_task_all_ecs_inputs" {
8282
dd_site = var.dd_site
8383
dd_service = var.dd_service
8484

85-
family = "terraform-test-all-ecs-inputs"
85+
family = "${var.test_prefix}-all-ecs-inputs"
8686
container_definitions = jsonencode([
8787
{
8888
name = "datadog-dummy-app",

smoke_tests/ecs_fargate/all-null.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module "dd_task_all_null" {
1313

1414
# Required values
1515
dd_api_key = var.dd_api_key
16-
family = "terraform-test-all-null"
16+
family = "${var.test_prefix}-all-null"
1717
container_definitions = jsonencode([
1818
{
1919
name : "dummy-container",

smoke_tests/ecs_fargate/all-windows.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module "dd_task_all_windows" {
2424
enabled = true
2525
}
2626

27-
family = "terraform-test-all-windows"
27+
family = "${var.test_prefix}-all-windows"
2828
container_definitions = jsonencode([
2929
{
3030
name = "datadog-dogstatsd-app",

smoke_tests/ecs_fargate/apm-dsd-tcp-udp.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module "dd_task_apm_dsd_tcp_udp" {
2828
socket_enabled = false,
2929
}
3030

31-
family = "terraform-test-apm-dsd-tcp-udp"
31+
family = "${var.test_prefix}-apm-dsd-tcp-udp"
3232
container_definitions = jsonencode([
3333
{
3434
name = "datadog-dogstatsd-app",

smoke_tests/ecs_fargate/cws-only.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module "dd_task_cws_only" {
3535
enabled = true,
3636
}
3737

38-
family = "terraform-test-cws-only"
38+
family = "${var.test_prefix}-cws-only"
3939
container_definitions = jsonencode([
4040
{
4141
name = "datadog-cws-app",

smoke_tests/ecs_fargate/logging-only.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module "dd_task_logging_only" {
3434
}
3535
}
3636

37-
family = "terraform-test-logging-only"
37+
family = "${var.test_prefix}-logging-only"
3838
container_definitions = jsonencode([])
3939

4040
requires_compatibilities = ["FARGATE"]

smoke_tests/ecs_fargate/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,10 @@ variable "dd_site" {
1818
description = "Datadog Site"
1919
type = string
2020
default = "datadoghq.com"
21+
}
22+
23+
variable "test_prefix" {
24+
description = "The ECS task family name prefix"
25+
type = string
26+
default = "terraform-test"
2127
}

tests/main_test.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package test
77

88
import (
99
"log"
10+
"os"
1011
"testing"
1112

1213
"github.com/gruntwork-io/terratest/modules/terraform"
@@ -28,15 +29,23 @@ func TestECSFargateSuite(t *testing.T) {
2829
func (s *ECSFargateSuite) SetupSuite() {
2930
log.Println("Setting up test suite resources...")
3031

32+
// All resources must be prefixed with terraform-test
33+
testPrefix := "terraform-test"
34+
ciJobID := os.Getenv("CI_JOB_ID")
35+
if ciJobID != "" {
36+
testPrefix = testPrefix + "-" + ciJobID
37+
}
38+
3139
// Define the Terraform options for the suite
3240
s.terraformOptions = &terraform.Options{
3341
// Path to the smoke_tests directory
3442
TerraformDir: "../smoke_tests/ecs_fargate",
3543
// Variables to pass to the Terraform module
3644
Vars: map[string]interface{}{
37-
"dd_api_key": "test-api-key",
38-
"dd_service": "test-service",
39-
"dd_site": "datadoghq.com",
45+
"dd_api_key": "test-api-key",
46+
"dd_service": "test-service",
47+
"dd_site": "datadoghq.com",
48+
"test_prefix": testPrefix,
4049
},
4150
NoColor: true,
4251
}

0 commit comments

Comments
 (0)