binbashar · exequielrafaela · Nov 13, 2020 · Nov 13, 2020 · Nov 13, 2020 · Nov 13, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 
 jobs:
   #
-  # Test 1 & Test 2
+  # Automated Tests
   #
   test-static-code-and-linting:
     machine:
@@ -26,8 +26,34 @@ jobs:
             git update-index --assume-unchanged "Makefile"
 
       - run:
-          name: Validate Terraform format
-          command: make format-check
+          name: test-dependencies
+          command: |
+            #
+            # Install pre-commit
+            pip install pre-commit
+            #
+            # Install terraform
+            sudo apt-get install unzip
+            wget https://releases.hashicorp.com/terraform/${TERRAFORM_VER}/terraform_${TERRAFORM_VER}_linux_amd64.zip
+            unzip terraform_${TERRAFORM_VER}_linux_amd64.zip
+            sudo mv terraform /usr/local/bin/
+            terraform --version
+            #
+            # Install terraform-docs
+            sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+            curl -Lo ./terraform-docs https://github.com/terraform-docs/terraform-docs/releases/download/v0.10.1/terraform-docs-v0.10.1-$(uname | tr '[:upper:]' '[:lower:]')-amd64
+            chmod +x ./terraform-docs
+            sudo mv ./terraform-docs /usr/local/bin/terraform-docs
+
+      - run:
+          name: test-terraform-format-and-docs-delegated-admin-mod
+          command: |
+            cd modules/delegated-admin && make pre-commit
+
+      - run:
+          name: test-terraform-format-and-docs-multiaccount-setup-mod
+          command: |
+            cd modules/multiaccount-setup && make pre-commit
 
       - run:
           name: Install awscli
@@ -55,9 +81,24 @@ jobs:
             cp /home/circleci/.aws/config /home/circleci/.aws/bb/config
 
       - run:
-          name: Lint Terraform code
-          command: make tflint-deep
+          name: test-terraform-linting-delegated-admin-mod
+          command: |
+            cd modules/delegated-admin && make tflint-deep
 
+      - run:
+          name: test-terraform-linting-multiaccount-setup-mod
+          command: |
+            cd modules/multiaccount-setup && make tflint-deep
+
+      - slack/notify:
+          event: fail
+          mentions: '@leverage-support'
+          template: basic_fail_1
+          channel: 'tools-ci'
+      - slack/notify:
+          event: pass
+          template: success_tagged_deploy_1
+          channel: 'tools-ci'
 
   #
   # Release
@@ -101,12 +142,23 @@ jobs:
               echo "==============================================================================================="
             fi
 
+      - slack/notify:
+          event: fail
+          mentions: '@leverage-support'
+          template: basic_fail_1
+          channel: 'tools-ci'
+      - slack/notify:
+          event: pass
+          template: success_tagged_deploy_1
+          channel: 'tools-ci'
+
 #
 # CircleCI orbs are open-source, shareable packages of parameterizable reusable
 # configuration elements, including jobs, commands, and executors.
 #
 orbs:
   sumologic: circleci/sumologic@1.0.6
+  slack: circleci/slack@4.1.1
 
 #
 # Jobs workflow

diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,48 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# we have to set line endings to LF for all bash scripts, otherwise, if you save
+# a script on Windows, it would have CRLF line breaks, which doesn’t work on
+# Linux. This is achieved by a combination of ‘.editorconfig’ defining how the
+# code is displayed in a text editor, and ‘.gitatttributes’, which controls how
+# the file is saved in source control.
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file && 2 space indentation
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
+trim_trailing_whitespace = true
+
+# Unix-style newlines with a newline ending every file && 2 space indentation
+[*.sh]
+end_of_line = lf
+indent_style = space
+indent_size = 2
+
+# Unix-style newlines with a newline ending every file && 2 space indentation
+[*.py]
+end_of_line = lf
+indent_style = space
+indent_size = 2
+
+[*.{tf,tfvars}]
+indent_size = 2
+indent_style = space
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false
+
+# Tab indentation && 2 space indentation
+[Makefile]
+tab_width = 2
+indent_style = tab
+
+[COMMIT_EDITMSG]
+max_line_length = 0
diff --git a/.gitallowed b/.gitallowed
@@ -0,0 +1,3 @@
+# https://github.com/awslabs/git-secrets
+*README.md
+examples/configure-guardduty/main.tf
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@
 !/.github
 !*.gitkeep
 !*.editorconfig
+!*.pre-commit-config.yaml
 
 # SSH keys #
 ############

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,24 @@
+default_language_version:
+    # force all unspecified python hooks to run python3
+    python: python3
+
+repos:
+  - repo: git://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+      - id: check-json
+      - id: check-merge-conflict
+      - id: check-yaml
+      - id: detect-private-key
+      - id: pretty-format-json
+        args:
+          - --autofix
+      - id: trailing-whitespace
+        args:
+          - --markdown-linebreak-ext=md
+
+  - repo: git://github.com/antonbabenko/pre-commit-terraform
+    rev: v1.43.0
+    hooks:
+      - id: terraform_fmt
+      - id: terraform_docs
diff --git a/examples/configure-guardduty/main.tf b/examples/configure-guardduty/main.tf
@@ -1,7 +1,7 @@
 #
 # Configure GuardDuty: this is intended to be done from an account that has
 # been designated to be a GuardDuty delegated admin.
-# 
+#
 # Important: since designating a GuardDuty delegated admin account automatically
 # enables GuardDuty in that account, you will need to import
 # "module.guardduty.aws_guardduty_detector.this" before you can properly use

diff --git a/modules/delegated-admin/README.md b/modules/delegated-admin/README.md
@@ -26,4 +26,5 @@ No requirements.
 ## Outputs
 
 No output.
+
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/modules/delegated-admin/makefile b/modules/delegated-admin/makefile
@@ -0,0 +1,4 @@
+MAKEFILES_DIR := ../../@bin/makefiles
+
+-include ${MAKEFILES_DIR}/terratest13/terratest13.mk
+-include ${MAKEFILES_DIR}/terraform13/terraform13.mk
diff --git a/modules/multiaccount-setup/README.md b/modules/multiaccount-setup/README.md
@@ -27,4 +27,5 @@ No requirements.
 ## Outputs
 
 No output.
+
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/modules/multiaccount-setup/makefile b/modules/multiaccount-setup/makefile
@@ -0,0 +1,4 @@
+MAKEFILES_DIR := ../../@bin/makefiles
+
+-include ${MAKEFILES_DIR}/terratest13/terratest13.mk
+-include ${MAKEFILES_DIR}/terraform13/terraform13.mk
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,4 +26,5 @@ No requirements.
		## Outputs

		No output.

		<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,5 @@ No requirements.
		## Outputs

		No output.

		<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->