Skip to content

Commit 06563d4

Browse files
author
Ben Fortuna
committed
Refactoring
1 parent 07b717d commit 06563d4

File tree

46 files changed

+13
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+13
-275
lines changed

‎Makefile‎

Lines changed: 13 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -21,71 +21,34 @@ clean:
2121

2222
validate:
2323
$(TERRAFORM) init && $(TERRAFORM) validate && \
24-
$(TERRAFORM) init modules/cloudfront-request-rewrite && $(TERRAFORM) validate modules/cloudfront-request-rewrite && \
25-
$(TERRAFORM) init modules/dynamodb-table-import && $(TERRAFORM) validate modules/dynamodb-table-import && \
26-
$(TERRAFORM) init modules/dynamodb-table-put && $(TERRAFORM) validate modules/dynamodb-table-put && \
27-
$(TERRAFORM) init modules/ec2-ami-deletion && $(TERRAFORM) validate modules/ec2-ami-deletion && \
28-
$(TERRAFORM) init modules/ec2-instance-cycle && $(TERRAFORM) validate modules/ec2-instance-cycle && \
29-
$(TERRAFORM) init modules/iam-user-keyrotation && $(TERRAFORM) validate modules/iam-user-keyrotation && \
30-
$(TERRAFORM) init modules/rds-cluster-cycle && $(TERRAFORM) validate modules/rds-cluster-cycle && \
31-
$(TERRAFORM) init modules/rds-cluster-snapshot && $(TERRAFORM) validate modules/rds-cluster-snapshot && \
32-
$(TERRAFORM) init modules/rds-instance-cycle && $(TERRAFORM) validate modules/rds-instance-cycle && \
33-
$(TERRAFORM) init modules/rds-instance-snapshot && $(TERRAFORM) validate modules/rds-instance-snapshot
24+
$(TERRAFORM) init modules/cloudfront-request-rewrite && $(TERRAFORM) validate modules/cloudfront-request-rewrite
3425

3526
test: validate
3627
$(CHECKOV) -d /work && \
37-
$(CHECKOV) -d /work/modules/cloudfront-request-rewrite && \
38-
$(CHECKOV) -d /work/modules/dynamodb-table-import && \
39-
$(CHECKOV) -d /work/modules/dynamodb-table-put && \
40-
$(CHECKOV) -d /work/modules/ec2-ami-deletion && \
41-
$(CHECKOV) -d /work/modules/ec2-instance-cycle && \
42-
$(CHECKOV) -d /work/modules/iam-user-keyrotation && \
43-
$(CHECKOV) -d /work/modules/rds-cluster-cycle && \
44-
$(CHECKOV) -d /work/modules/rds-cluster-snapshot && \
45-
$(CHECKOV) -d /work/modules/rds-instance-cycle && \
46-
$(CHECKOV) -d /work/modules/rds-instance-snapshot
28+
$(CHECKOV) -d /work/modules/cloudfront-request-rewrite
4729

4830
$(TFSEC) /work && \
49-
$(TFSEC) /work/modules/cloudfront-request-rewrite && \
50-
$(TFSEC) /work/modules/dynamodb-table-import && \
51-
$(TFSEC) /work/modules/dynamodb-table-put && \
52-
$(TFSEC) /work/modules/ec2-ami-deletion && \
53-
$(TFSEC) /work/modules/ec2-instance-cycle && \
54-
$(TFSEC) /work/modules/iam-user-keyrotation && \
55-
$(TFSEC) /work/modules/rds-cluster-cycle && \
56-
$(TFSEC) /work/modules/rds-cluster-snapshot && \
57-
$(TFSEC) /work/modules/rds-instance-cycle && \
58-
$(TFSEC) /work/modules/rds-instance-snapshot
59-
31+
$(TFSEC) /work/modules/cloudfront-request-rewrite
6032

6133
diagram:
6234
$(DIAGRAMS) diagram.py
6335

6436
docs: diagram
6537
$(TERRAFORM_DOCS) markdown ./ >./README.md && \
66-
$(TERRAFORM_DOCS) markdown ./modules/cloudfront-request-rewrite >./modules/cloudfront-request-rewrite/README.md && \
67-
$(TERRAFORM_DOCS) markdown ./modules/dynamodb-table-import >./modules/dynamodb-table-import/README.md && \
68-
$(TERRAFORM_DOCS) markdown ./modules/dynamodb-table-put >./modules/dynamodb-table-put/README.md && \
69-
$(TERRAFORM_DOCS) markdown ./modules/ec2-ami-deletion >./modules/ec2-ami-deletion/README.md && \
70-
$(TERRAFORM_DOCS) markdown ./modules/ec2-instance-cycle >./modules/ec2-instance-cycle/README.md && \
71-
$(TERRAFORM_DOCS) markdown ./modules/iam-user-keyrotation >./modules/iam-user-keyrotation/README.md && \
72-
$(TERRAFORM_DOCS) markdown ./modules/rds-cluster-cycle >./modules/rds-cluster-cycle/README.md && \
73-
$(TERRAFORM_DOCS) markdown ./modules/rds-cluster-snapshot >./modules/rds-cluster-snapshot/README.md && \
74-
$(TERRAFORM_DOCS) markdown ./modules/rds-instance-cycle >./modules/rds-instance-cycle/README.md && \
75-
$(TERRAFORM_DOCS) markdown ./modules/rds-instance-snapshot >./modules/rds-instance-snapshot/README.md
38+
$(TERRAFORM_DOCS) markdown ./modules/cloudfront-request-rewrite >./modules/cloudfront-request-rewrite/README.md
7639

7740
format:
7841
$(TERRAFORM) fmt -list=true ./ && \
7942
$(TERRAFORM) fmt -list=true ./modules/cloudfront-request-rewrite && \
80-
$(TERRAFORM) fmt -list=true ./modules/dynamodb-table-import && \
81-
$(TERRAFORM) fmt -list=true ./modules/dynamodb-table-put && \
82-
$(TERRAFORM) fmt -list=true ./modules/ec2-ami-deletion && \
83-
$(TERRAFORM) fmt -list=true ./modules/ec2-instance-cycle && \
84-
$(TERRAFORM) fmt -list=true ./modules/iam-user-keyrotation && \
85-
$(TERRAFORM) fmt -list=true ./modules/rds-cluster-cycle && \
86-
$(TERRAFORM) fmt -list=true ./modules/rds-cluster-snapshot && \
87-
$(TERRAFORM) fmt -list=true ./modules/rds-instance-cycle && \
88-
$(TERRAFORM) fmt -list=true ./modules/rds-instance-snapshot
43+
$(TERRAFORM) fmt -list=true ./examples/dynamodb-table-import && \
44+
$(TERRAFORM) fmt -list=true ./examples/dynamodb-table-put && \
45+
$(TERRAFORM) fmt -list=true ./examples/ec2-ami-deletion && \
46+
$(TERRAFORM) fmt -list=true ./examples/ec2-instance-cycle && \
47+
$(TERRAFORM) fmt -list=true ./examples/iam-user-keyrotation && \
48+
$(TERRAFORM) fmt -list=true ./examples/rds-cluster-cycle && \
49+
$(TERRAFORM) fmt -list=true ./examples/rds-cluster-snapshot && \
50+
$(TERRAFORM) fmt -list=true ./examples/rds-instance-cycle && \
51+
$(TERRAFORM) fmt -list=true ./examples/rds-instance-snapshot
8952

9053
example:
9154
$(TERRAFORM) init examples/$(EXAMPLE) && $(TERRAFORM) plan examples/$(EXAMPLE)

modules/dynamodb-table-import/lambda_handler.py renamed to examples/dynamodb-table-import/lambda_handler.py

File renamed without changes.

modules/dynamodb-table-import/main.tf renamed to examples/dynamodb-table-import/main.tf

File renamed without changes.

modules/dynamodb-table-import/outputs.tf renamed to examples/dynamodb-table-import/outputs.tf

File renamed without changes.

modules/dynamodb-table-import/vars.tf renamed to examples/dynamodb-table-import/vars.tf

File renamed without changes.

modules/dynamodb-table-put/lambda_handler.py renamed to examples/dynamodb-table-put/lambda_handler.py

File renamed without changes.

modules/dynamodb-table-put/main.tf renamed to examples/dynamodb-table-put/main.tf

File renamed without changes.

modules/dynamodb-table-put/outputs.tf renamed to examples/dynamodb-table-put/outputs.tf

File renamed without changes.

modules/dynamodb-table-put/vars.tf renamed to examples/dynamodb-table-put/vars.tf

File renamed without changes.

modules/ec2-ami-deletion/lambda_handler.py renamed to examples/ec2-ami-deletion/lambda_handler.py

File renamed without changes.

0 commit comments

Comments
 (0)