[*/Makefile] include Makefile.* (cloudposse#92)

* Update makefiles with include * Use native terraform with tfenv
ravikanumuri9 · Jan 14, 2019 · 2c9b53e · 2c9b53e
1 parent 11a275c
commit 2c9b53e
Show file tree

Hide file tree

Showing 27 changed files with 94 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -67,9 +67,11 @@ We recommend that you start with your clean `terraform-root-module` repo. Then s
 Here's a good example of a `Makefile` for a terraform project:
 
 ```
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/README.yaml b/README.yaml
@@ -102,9 +102,11 @@ introduction: |-
  Here's a good example of a `Makefile` for a terraform project:
 
  ```
+ -include Makefile.*
+
  ## Initialize terraform remote state
  init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
  ## Clean up the project
  clean:

diff --git a/aws/account-dns/Makefile b/aws/account-dns/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/account-settings/Makefile b/aws/account-settings/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/accounts/Makefile b/aws/accounts/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/acm-cloudfront/Makefile b/aws/acm-cloudfront/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/acm/Makefile b/aws/acm/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/artifacts/Makefile b/aws/artifacts/Makefile
@@ -1,8 +1,17 @@
-plan:
- @tfenv terraform $@
+-include Makefile.*
 
-apply:
- @tfenv terraform $@
+## Initialize terraform remote state
+init:
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
-destroy:
- @tfenv terraform $@
+## Clean up the project
+clean:
+ rm -rf .terraform *.tfstate*
+
+## Pass arguments through to terraform which require remote state
+apply console destroy graph plan output providers show: init
+ terraform $@
+
+## Pass arguments through to terraform which do not require remote state
+get fmt validate version:
+ terraform $@
diff --git a/aws/audit-cloudtrail/Makefile b/aws/audit-cloudtrail/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/backing-services/Makefile b/aws/backing-services/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/bootstrap/Makefile b/aws/bootstrap/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/chamber/Makefile b/aws/chamber/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/cloudtrail/Makefile b/aws/cloudtrail/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/docs/Makefile b/aws/docs/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/ecr/Makefile b/aws/ecr/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/eks-backing-services-peering/Makefile b/aws/eks-backing-services-peering/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/eks/Makefile b/aws/eks/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/iam/Makefile b/aws/iam/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/kops-aws-platform/Makefile b/aws/kops-aws-platform/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/kops/Makefile b/aws/kops/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean: kops/clean

diff --git a/aws/organization/Makefile b/aws/organization/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/root-dns/Makefile b/aws/root-dns/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/root-iam/Makefile b/aws/root-iam/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/ses/Makefile b/aws/ses/Makefile
@@ -1,7 +1,9 @@
+-include Makefile.*
 -include .terraform/modules/**/Makefile.ses
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/tfstate-backend/Makefile b/aws/tfstate-backend/Makefile
@@ -1,8 +1,10 @@
+-include Makefile.*
+
 ## Initialize the terraform state backend
 init:
  @aws s3 ls s3://${TF_BUCKET}/tfstate-backend/terraform.tfstate > /dev/null || \
  scripts/$@.sh
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Destroy the configuration (only works if `force_destroy=true`)
 destroy:
@@ -17,7 +19,7 @@ clean:
  rm -rf .terraform *.tfstate*
 
 ## Pass arguments through to terraform which require remote state
-apply console destroy graph plan output providers show: init
+apply console graph plan output providers show: init
  terraform $@
 
 ## Pass arguments through to terraform which do not require remote state

diff --git a/aws/users/Makefile b/aws/users/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean:

diff --git a/aws/vpc-peering/Makefile b/aws/vpc-peering/Makefile
@@ -1,6 +1,8 @@
+-include Makefile.*
+
 ## Initialize terraform remote state
 init:
- [ -f .terraform/terraform.tfstate ] || init-terraform
+ [ -f .terraform/terraform.tfstate ] || terraform $@
 
 ## Clean up the project
 clean: