fix merge conflict

Author: wellsiau-aws

.project_automation/functional_tests/entrypoint.sh

@@ -32,16 +32,6 @@ post_entrypoint() {
 #********** Pre-entrypoint helper *************
 pre_entrypoint
 
-<<<<<<< before updating
-export AWS_DEFAULT_REGION=eu-west-1
-
-#********** Checkov Analysis *************
-echo "Running Checkov Analysis"
-terraform init
-terraform plan -out tf.plan
-terraform show -json tf.plan  > tf.json 
-checkov --config-file ${PROJECT_PATH}/.config/.checkov.yml
-=======
 #********** Functional Test *************
 /bin/bash ${PROJECT_PATH}/.project_automation/functional_tests/functional_tests.sh
 if [ $? -eq 0 ]
@@ -52,7 +42,6 @@ else
     echo "Functional test failed"
     EXIT_CODE=1
 fi
->>>>>>> after updating
 
 #********** Post-entrypoint helper *************
 post_entrypoint

.project_automation/static_tests/entrypoint.sh

@@ -32,28 +32,9 @@ post_entrypoint() {
 #********** Pre-entrypoint helper *************
 pre_entrypoint
 
-<<<<<<< before updating
-#********** tflint ********************
-echo 'Starting tflint'
-tflint --init --config ${PROJECT_PATH}/.config/.tflint.hcl
-MYLINT=$(tflint --force --config ${PROJECT_PATH}/.config/.tflint.hcl)
-if [ -z "$MYLINT" ]
-then
-    echo "Success - tflint found no linting issues!"
-else
-    echo "Failure - tflint found linting issues!"
-    echo "$MYLINT"
-    exit 1
-fi
-#********** tfsec *********************
-echo 'Starting tfsec'
-MYTFSEC=$(tfsec . --config-file ${PROJECT_PATH}/.config/.tfsec.yml || true)
-if [[ $MYTFSEC == *"No problems detected!"* ]];
-=======
 #********** Static Test *************
 /bin/bash ${PROJECT_PATH}/.project_automation/static_tests/static_tests.sh
 if [ $? -eq 0 ]
->>>>>>> after updating
 then
     echo "Static test completed"
     EXIT_CODE=0
@@ -62,36 +43,8 @@ else
     EXIT_CODE=1
 fi
 
-<<<<<<< before updating
-#********** Markdown Lint **************
-echo 'Starting markdown lint'
-MYMDL=$(mdl --config ${PROJECT_PATH}/.config/.mdlrc .header.md examples/*/.header.md || true)
-if [ -z "$MYMDL" ]
-then
-    echo "Success - markdown lint found no linting issues!"
-else
-    echo "Failure - markdown lint found linting issues!"
-    echo "$MYMDL"
-    exit 1
-fi
-#********** Terraform Docs *************
-echo 'Starting terraform-docs'
-TDOCS="$(terraform-docs --config ${PROJECT_PATH}/.config/.terraform-docs.yaml --lockfile=false ./)"
-git add -N README.md
-GDIFF="$(git diff --compact-summary)"
-if [ -z "$GDIFF" ]
-then
-    echo "Success - Terraform Docs creation verified!"
-else
-    echo "Failure - Terraform Docs creation failed, ensure you have precommit installed and running before submitting the Pull Request"
-    exit 1
-fi
-#***************************************
-echo "End of Static Tests"
-=======
 #********** Post-entrypoint helper *************
 post_entrypoint
 
 #********** Exit Code *************
 exit $EXIT_CODE
->>>>>>> after updating