Misc clean up

Author: gabedos

.gitlab-ci.yml

@@ -12,7 +12,7 @@ tests:
 
     # 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
+    - unzip terraform.zip > /dev/null
     - mv terraform /usr/local/bin/terraform
     - chmod +x /usr/local/bin/terraform
     - terraform version

modules/ecs_fargate/main.tf

@@ -39,7 +39,7 @@ resource "aws_ecs_task_definition" "this" {
 
   family = var.family
 
-  # Fargate incompatible parameter
+  # Fargate incompatible parameter on v6.0.0
   # dynamic "inference_accelerator" {
   #   for_each = var.inference_accelerator != null ? var.inference_accelerator : []
 

modules/ecs_fargate/outputs.tf

@@ -35,8 +35,7 @@ output "family" {
 
 output "inference_accelerator" {
   description = "Inference accelerator settings."
-  # value       = aws_ecs_task_definition.this.inference_accelerator
-  value = []
+  value       = null
 }
 
 output "ipc_mode" {

smoke_tests/ecs_fargate/null.tf

@@ -1,5 +1,3 @@
 provider "aws" {
-  region      = "us-east-1"
-  retry_mode  = "standard"
-  max_retries = 10
+  region = "us-east-1"
 }

smoke_tests/ecs_fargate/provider.tf

@@ -49,17 +49,12 @@ func (s *ECSFargateSuite) SetupSuite() {
 			"test_prefix": s.testPrefix,
 		},
 		RetryableTerraformErrors: map[string]string{
-			"couldn't find resource": "terratest could not find the resource",
+			"couldn't find resource": "terratest could not find the resource. check for access denied errors in cloudtrial",
 		},
-		// NoColor:            true,
-		// MaxRetries:         0,
-		// TimeBetweenRetries: 10 * time.Second,
-		// Lock:               true,
 	}
 
 	// Run terraform init and apply
-	terraform.Init(s.T(), s.terraformOptions)
-	terraform.Apply(s.T(), s.terraformOptions)
+	terraform.InitAndApply(s.T(), s.terraformOptions)
 }
 
 // TearDownSuite is run once at the end of the test suite