Merge pull request #341 from apex/add_aws_region

add passing aws_region var to Terraform
Fraudmarc · Mar 22, 2016 · 4fe6290 · 4fe6290
2 parents 4136853 + 6be3e44
commit 4fe6290
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/_examples/api-gateway/infrastructure/dev/main.tf b/_examples/api-gateway/infrastructure/dev/main.tf
@@ -1,4 +1,3 @@
-// Generated by `apex init`
 variable "aws_region" {}
 
 module "iam" {

diff --git a/boot/boilerplate/_boilerplate/infrastructure/_env/main.tf b/boot/boilerplate/_boilerplate/infrastructure/_env/main.tf
@@ -1,8 +1,9 @@
+variable "aws_region" {}
 
 module "iam" {
   source = "../modules/iam"
 }
 
 output "lambda_function_role_id" {
   value = "${module.iam.lambda_function_role_id}"
-}
+}
diff --git a/boot/boilerplate/_boilerplate/infrastructure/modules/iam/iam.tf b/boot/boilerplate/_boilerplate/infrastructure/modules/iam/iam.tf
@@ -1,6 +1,6 @@
 
 resource "aws_iam_role" "lambda_function" {
-  name = "lambda_function"
+  name = "apex_lambda_function"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",

diff --git a/boot/boilerplate/bindata.go b/boot/boilerplate/bindata.go
diff --git a/infra/infra.go b/infra/infra.go
@@ -49,6 +49,9 @@ func (p *Proxy) Run(args ...string) error {
 
 // functionVars returns the function ARN's as terraform -var arguments.
 func (p *Proxy) functionVars() (args []string) {
+	args = append(args, "-var")
+	args = append(args, fmt.Sprintf("aws_region=%s", p.Region))
+
 	for _, fn := range p.Functions {
 		config, err := fn.GetConfig()
 		if err != nil {
@@ -69,7 +72,7 @@ func (p *Proxy) shouldInjectVars(args []string) bool {
 		return false
 	}
 
-	return args[0] == "plan" || args[0] == "apply"
+	return args[0] == "plan" || args[0] == "apply" || args[0] == "destroy"
 }
 
 // Output fetches output variable `name` from terraform.