ci: AWS_DEFAULT_REGION environment variable (#36)

jasonwalsh · everops-kevin · web-flow · commit 0649a56b033a · 2020-06-24T13:33:05.000-04:00
* add efs vol support

* fix tests?

* ci: hard-code AWS region in actions workflow

Co-authored-by: Kevin Mahoney &lt;kevin.mahoney@everops.com&gt;
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -2,7 +2,7 @@ jobs:
   lint:
     env:
       AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
-      AWS_DEFAULT_REGION: "${{ secrets.AWS_DEFAULT_REGION }}"
+      AWS_DEFAULT_REGION: us-east-1
       AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -2,7 +2,7 @@ jobs:
   test:
     env:
       AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
-      AWS_DEFAULT_REGION: "${{ secrets.AWS_DEFAULT_REGION }}"
+      AWS_DEFAULT_REGION: us-east-1
       AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
     runs-on: ubuntu-latest
     steps:
diff --git a/main.tf b/main.tf
@@ -170,6 +170,13 @@ resource "aws_ecs_task_definition" "ecs_task_definition" {
           scope         = lookup(docker_volume_configuration.value, "scope", null)
         }
       }
+      dynamic "efs_volume_configuration" {
+        for_each = lookup(volume.value, "efs_volume_configuration", [])
+        content {
+          file_system_id = lookup(efs_volume_configuration.value, "file_system_id", null)
+          root_directory = lookup(efs_volume_configuration.value, "root_directory", null)
+        }
+      }
     }
   }
 
diff --git a/terraform.tfvars b/terraform.tfvars
diff --git a/test/terraform_ecs_task_definition_test.go b/test/terraform_ecs_task_definition_test.go
@@ -17,7 +17,7 @@ func TestSingleContainerDefinition(t *testing.T) {
 	t.Parallel()
 	options := &terraform.Options{
 		TerraformDir: "..",
-		VarFiles:     []string{"varfile.tfvars"},
+		VarFiles:     []string{"test/varfile.tfvars"},
 	}
 	defer terraform.Destroy(t, options)
 	terraform.InitAndApply(t, options)
diff --git a/test/varfile.tfvars b/test/varfile.tfvars

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,13 @@ resource "aws_ecs_task_definition" "ecs_task_definition" {`
`170`	`170`	`scope = lookup(docker_volume_configuration.value, "scope", null)`
`171`	`171`	`}`
`172`	`172`	`}`
	`173`	`+ dynamic "efs_volume_configuration" {`
	`174`	`+ for_each = lookup(volume.value, "efs_volume_configuration", [])`
	`175`	`+ content {`
	`176`	`+ file_system_id = lookup(efs_volume_configuration.value, "file_system_id", null)`
	`177`	`+ root_directory = lookup(efs_volume_configuration.value, "root_directory", null)`
	`178`	`+ }`
	`179`	`+ }`
`173`	`180`	`}`
`174`	`181`	`}`
`175`	`182`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func TestSingleContainerDefinition(t *testing.T) {`
`17`	`17`	`t.Parallel()`
`18`	`18`	`options := &terraform.Options{`
`19`	`19`	`TerraformDir: "..",`
`20`		`- VarFiles: []string{"varfile.tfvars"},`
	`20`	`+ VarFiles: []string{"test/varfile.tfvars"},`
`21`	`21`	`}`
`22`	`22`	`defer terraform.Destroy(t, options)`
`23`	`23`	`terraform.InitAndApply(t, options)`