Updated Test

Author: RussellGilmore

tests/dns-only/main.tf

@@ -8,11 +8,17 @@ variable "region" {
   type        = string
 }
 
+variable "instance_name" {
+  description = "The name of the instance"
+  type        = string
+}
+
 module "red-instance" {
   source = "../../red-instance"
 
-  project_name = var.project_name
-  region       = var.region
+  project_name  = var.project_name
+  region        = var.region
+  instance_name = var.instance_name
 
   # Custom AMI and instance configuration
   ami_name      = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250305"

tests/full-force/main.tf

@@ -8,11 +8,17 @@ variable "region" {
   type        = string
 }
 
+variable "instance_name" {
+  description = "The name of the instance"
+  type        = string
+}
+
 module "red-instance" {
   source = "../../red-instance"
 
-  project_name = var.project_name
-  region       = var.region
+  project_name  = var.project_name
+  region        = var.region
+  instance_name = var.instance_name
 
   # Custom AMI and instance configuration
   ami_name      = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250305"

tests/red_instance_test.go

@@ -24,12 +24,14 @@ func TestDNSOnlyFeature(t *testing.T) {
 
 	// Generate a unique project name for the test
 	projectName := fmt.Sprintf("red-dns-%s", strings.ToLower(random.UniqueId()))
+	instanceName := fmt.Sprintf("red-%s", strings.ToLower(random.UniqueId()))
 
 	terraformOptions := &terraform.Options{
 		TerraformDir: "./dns-only",
 		Vars: map[string]interface{}{
-			"region":       awsRegion,
-			"project_name": projectName,
+			"region":        awsRegion,
+			"project_name":  projectName,
+			"instance_name": instanceName,
 		},
 	}
 
@@ -78,12 +80,14 @@ func TestAllFeaturesEnabled(t *testing.T) {
 
 	// Generate a unique project name and S3 bucket name for the test
 	projectName := fmt.Sprintf("red-full-%s", strings.ToLower(random.UniqueId()))
+	instanceName := fmt.Sprintf("red-%s", strings.ToLower(random.UniqueId()))
 
 	terraformOptions := &terraform.Options{
 		TerraformDir: "./full-force",
 		Vars: map[string]interface{}{
-			"region":       awsRegion,
-			"project_name": projectName,
+			"region":        awsRegion,
+			"project_name":  projectName,
+			"instance_name": instanceName,
 		},
 	}
 
@@ -128,7 +132,6 @@ func TestAllFeaturesEnabled(t *testing.T) {
 func TestFeatureCombinations(t *testing.T) {
 	testDirs := []string{
 		"dns-only",
-		"s3-access",
 		"full-force",
 	}
 
@@ -146,6 +149,7 @@ func TestFeatureCombinations(t *testing.T) {
 
 				// Generate a unique project name for the test
 				projectName := fmt.Sprintf("red-%s-%s", testDir, strings.ToLower(random.UniqueId()))
+				instanceName := fmt.Sprintf("red-%s", strings.ToLower(random.UniqueId()))
 
 				// Make sure the test directory exists
 				testDirPath := filepath.Join(".", testDir)
@@ -157,8 +161,9 @@ func TestFeatureCombinations(t *testing.T) {
 				terraformOptions := &terraform.Options{
 					TerraformDir: testDirPath,
 					Vars: map[string]interface{}{
-						"region":       awsRegion,
-						"project_name": projectName,
+						"region":        awsRegion,
+						"project_name":  projectName,
+						"instance_name": instanceName,
 					},
 				}