Merge pull request #4 from GSA/refactor

Refactor
GSA · Sep 27, 2019 · d521bf4 · d521bf4
2 parents b0e1d03 + f91b0f6
commit d521bf4
Show file tree

Hide file tree

Showing 21 changed files with 45 additions and 53 deletions.
diff --git a/Makefile b/Makefile
@@ -9,11 +9,27 @@ endif
 export appenv := $(shell echo "$(environment)" | tr '[:upper:]' '[:lower:]')
 export TF_VAR_appenv := $(appenv)
 
-.PHONY: test deploy lint_handler test_handler build_handler release_handler plan_terraform apply_terraform clean
+.PHONY: test deploy check lint_handler test_handler build_handler release_handler plan_terraform validate_terraform init_terraform apply_terraform apply_terraform_tests destroy_terraform_tests clean
 test: test_handler plan_terraform
 
 deploy: build_handler apply_terraform
 
+check:
+ifeq ($(strip $(backend_bucket)),)
+	@echo "backend_bucket must be provided"
+	@exit 1
+endif
+ifeq ($(strip $(TF_VAR_appenv)),)
+	@echo "TF_VAR_appenv must be provided"
+	@exit 1
+else
+	@echo "appenv: $(TF_VAR_appenv)"
+endif
+ifeq ($(strip $(backend_key)),)
+	@echo "backend_key must be provided"
+	@exit 1
+endif
+
 lint_handler:
 	make -C handler lint
 
@@ -26,17 +42,25 @@ build_handler:
 release_handler:
 	make -C handler release
 
-plan_terraform:
-	make -C terraform plan
+plan_terraform: validate_terraform
+	terraform plan
+	make -C tests plan
+
+validate_terraform: init_terraform
+	terraform validate
+
+init_terraform: check
+	[[ -d release ]] || mkdir release
+	[[ -e release/grace-inventory-lambda.zip ]] || touch release/grace-inventory-lambda.zip
+	terraform init -backend-config="bucket=$(backend_bucket)" -backend-config="key=$(backend_key)"
 
-apply_terraform:
-	make -C terraform apply
+apply_terraform: apply_terraform_tests
 
 apply_terraform_tests:
-	make -C terraform/tests apply
+	make -C tests apply
 
 destroy_terraform_tests:
-	make -C terraform/tests destroy
+	make -C tests destroy
 
 clean:
 	make -C handler clean
diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ download the binary release from Github or compile the handler locally.
 ```bash
 mkdir -p release
 cd release
-curl -L https://github.com/GSA/grace-inventory/releases/download/v0.1.0/grace-inventory-lambda.zip -o grace-inventory-lambda.zip
+curl -L https://github.com/GSA/grace-inventory/releases/download/v0.1.1/grace-inventory-lambda.zip -o grace-inventory-lambda.zip
 cd ..
 ```
 
@@ -148,7 +148,7 @@ include the following in your root terraform module:
 
 ```
 module "example_self" {
-  source       = "github.com/GSA/grace-inventory/terraform"
+  source       = "github.com/GSA/grace-inventory?ref=v0.1.1"
   source_file  = "../../release/grace-inventory-lambda.zip"
   appenv       = "environment"
   project_name = "your-project"

diff --git a/terraform/cloudwatch.tf → cloudwatch.tf b/terraform/cloudwatch.tf → cloudwatch.tf
diff --git a/terraform/examples/example-master.tf → examples/example-master.tf b/terraform/examples/example-master.tf → examples/example-master.tf
@@ -6,5 +6,5 @@ module "example_master" {
   accounts_info = ""
   source_file   = "../../release/grace-inventory-lambda.zip"
   appenv        = "development"
-  //project_name  = "grace"
+  project_name  = "grace"
 }
diff --git a/terraform/examples/example-mgmt-all.tf → examples/example-mgmt-all.tf b/terraform/examples/example-mgmt-all.tf → examples/example-mgmt-all.tf
@@ -9,5 +9,5 @@ module "example_mgmt_all" {
   master_role_name  = "AssumableRole"
   source_file       = "../../release/grace-inventory-lambda.zip"
   appenv            = "development"
-  //project_name      = "grace"
+  project_name      = "grace"
 }
diff --git a/examples/example-self.tf b/examples/example-self.tf
@@ -0,0 +1,8 @@
+// The default behavior is to inventory only the account the lambda function
+// is installed in (i.e. accounts_info = "self"
+module "example_self" {
+  source       = "github.com/GSA/grace-inventory/terraform"
+  source_file  = "../../release/grace-inventory-lambda.zip"
+  appenv       = "development"
+  project_name = "grace"
+}
diff --git a/terraform/examples/versions.tf → examples/versions.tf b/terraform/examples/versions.tf → examples/versions.tf
diff --git a/terraform/iam.tf → iam.tf b/terraform/iam.tf → iam.tf
diff --git a/terraform/kms.tf → kms.tf b/terraform/kms.tf → kms.tf
diff --git a/terraform/lambda.tf → lambda.tf b/terraform/lambda.tf → lambda.tf
diff --git a/terraform/main.tf → main.tf b/terraform/main.tf → main.tf
diff --git a/terraform/outputs.tf → outputs.tf b/terraform/outputs.tf → outputs.tf
diff --git a/terraform/s3.tf → s3.tf b/terraform/s3.tf → s3.tf
diff --git a/terraform/Makefile b/terraform/Makefile
diff --git a/terraform/examples/example-self.tf b/terraform/examples/example-self.tf
diff --git a/terraform/tests/Makefile → tests/Makefile b/terraform/tests/Makefile → tests/Makefile
diff --git a/terraform/tests/integration_test.tf → tests/integration_test.tf b/terraform/tests/integration_test.tf → tests/integration_test.tf
@@ -12,13 +12,13 @@ provider "aws" {
 // if accounts_info = "" and master_account_id and master_role_name are set
 // and the roles are assumable by the Lambda function's IAM role
 module "integration_test" {
-  // source            = "github.com/GSA/grace-inventory/terraform?ref=latest"
+  // source            = "github.com/GSA/grace-inventory?ref=latest"
   source            = "../"
   accounts_info     = "self"
   project_name      = "grace"
   appenv            = var.appenv
   master_account_id = var.master_account_id
   master_role_name  = var.master_role_name
   tenant_role_name  = var.tenant_role_name
-  source_file       = "../../release/grace-inventory-lambda.zip"
+  source_file       = "../release/grace-inventory-lambda.zip"
 }
diff --git a/terraform/tests/variables.tf → tests/variables.tf b/terraform/tests/variables.tf → tests/variables.tf
diff --git a/terraform/tests/versions.tf → tests/versions.tf b/terraform/tests/versions.tf → tests/versions.tf
diff --git a/terraform/variables.tf → variables.tf b/terraform/variables.tf → variables.tf
diff --git a/terraform/versions.tf → versions.tf b/terraform/versions.tf → versions.tf