Merge pull request #105 from aws-ia/ephemeral_project-updates

wellsiau-aws · web-flow · commit ad72497b6052 · 2024-04-02T08:25:46.000-07:00
Updates from project type
diff --git a/.config/.tfsec/launch_configuration_imdsv2_tfchecks.json b/.config/.tfsec/launch_configuration_imdsv2_tfchecks.json
diff --git a/.config/.tfsec/launch_template_imdsv2_tfchecks.json b/.config/.tfsec/launch_template_imdsv2_tfchecks.json
diff --git a/.config/.tfsec/no_launch_config_tfchecks.json b/.config/.tfsec/no_launch_config_tfchecks.json
diff --git a/.config/.tfsec/sg_no_embedded_egress_rules_tfchecks.json b/.config/.tfsec/sg_no_embedded_egress_rules_tfchecks.json
diff --git a/.config/.tfsec/sg_no_embedded_ingress_rules_tfchecks.json b/.config/.tfsec/sg_no_embedded_ingress_rules_tfchecks.json
diff --git a/.config/functional_tests/post-entrypoint-helpers.sh b/.config/functional_tests/post-entrypoint-helpers.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+## NOTE: this script runs at the end of functional test
+## Use this to load any configurations after the functional test 
+## TIPS: avoid modifying the .project_automation/functional_test/entrypoint.sh
+## migrate any customization you did on entrypoint.sh to this helper script
+echo "Executing Post-Entrypoint Helpers"
diff --git a/.config/functional_tests/pre-entrypoint-helpers.sh b/.config/functional_tests/pre-entrypoint-helpers.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+## NOTE: this script runs at the start of functional test
+## use this to load any configuration before the functional test 
+## TIPS: avoid modifying the .project_automation/functional_test/entrypoint.sh
+## migrate any customization you did on entrypoint.sh to this helper script
+echo "Executing Pre-Entrypoint Helpers"
diff --git a/.config/static_tests/post-entrypoint-helpers.sh b/.config/static_tests/post-entrypoint-helpers.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+## NOTE: this script runs at the end of static test
+## Use this to load any configurations after the static test 
+## TIPS: avoid modifying the .project_automation/static_test/entrypoint.sh
+## migrate any customization you did on entrypoint.sh to this helper script
+echo "Executing Post-Entrypoint Helpers"
diff --git a/.config/static_tests/pre-entrypoint-helpers.sh b/.config/static_tests/pre-entrypoint-helpers.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+## NOTE: this script runs at the start of static test
+## use this to load any configuration before the static test 
+## TIPS: avoid modifying the .project_automation/static_test/entrypoint.sh
+## migrate any customization you did on entrypoint.sh to this helper script
+echo "Executing Pre-Entrypoint Helpers"
+
+#********** TFC Env Vars *************
+export AWS_DEFAULT_REGION=us-east-1
+export TFE_TOKEN=`aws secretsmanager get-secret-value --secret-id abp/tfc/token | jq -r ".SecretString"`
+export TF_TOKEN_app_terraform_io=`aws secretsmanager get-secret-value --secret-id abp/tfc/token | jq -r ".SecretString"`
+
+#********** MAKEFILE *************
+echo "Build the lambda function packages"
+make all
+
+#********** Get tfvars from SSM *************
+echo "Get *.tfvars from SSM parameter"
+aws ssm get-parameter \
+  --name "/abp/tfc/functional/tfvars" \
+  --with-decryption \
+  --query "Parameter.Value" \
+  --output "text" \
+  --region "us-east-1" >> functional_test.tfvars
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,6 +1,6 @@
 # This file is auto-generated, changes will be overwritten
-_commit: v0.1.2
-_src_path: /task/fda2926f-d695-11ee-a46e-46fb9214c7b7/projecttype
+_commit: v0.1.3
+_src_path: /task/8be08035-e60c-11ee-ab69-16475233b5d9/projecttype
 starting_version: v0.0.0
 version_file: VERSION
 
diff --git a/.project_automation/functional_tests/Dockerfile b/.project_automation/functional_tests/Dockerfile
@@ -1,12 +1,10 @@
 FROM public.ecr.aws/codebuild/amazonlinux2-x86_64-standard:4.0
-ENV TERRAFORM_VERSION=1.4.2
+ENV TERRAFORM_VERSION=1.7.4
 ENV GO_VERSION=1.20.2
 RUN cd /tmp && \
     wget https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
     unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin && chmod 755 /usr/local/bin/terraform
 
-RUN curl -s https://raw.githubusercontent.com/aquasecurity/tfsec/master/scripts/install_linux.sh | bash
-
 RUN cd /tmp && \
     wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz && \
-    tar -C /usr/local/bin -xzf go${GO_VERSION}.linux-amd64.tar.gz && chmod 755 /usr/local/bin/go
+    tar -C /usr/local/bin -xzf go${GO_VERSION}.linux-amd64.tar.gz && chmod 755 /usr/local/bin/go
diff --git a/.project_automation/functional_tests/entrypoint.sh b/.project_automation/functional_tests/entrypoint.sh
@@ -1,45 +1,50 @@
-#!/bin/bash -e
+#!/bin/bash
+
+## WARNING: DO NOT modify the content of entrypoint.sh
+# Use ./config/functional_tests/pre-entrypoint-helpers.sh or ./config/functional_tests/post-entrypoint-helpers.sh 
+# to load any customizations or additional configurations
 
 ## NOTE: paths may differ when running in a managed task. To ensure behavior is consistent between
 # managed and local tasks always use these variables for the project and project type path
 PROJECT_PATH=${BASE_PATH}/project
 PROJECT_TYPE_PATH=${BASE_PATH}/projecttype
 
-echo "Starting Functional Tests"
-
-cd ${PROJECT_PATH}
-
-#********** TFC Env Vars *************
-export AWS_DEFAULT_REGION=us-east-1
-export TFE_TOKEN=`aws secretsmanager get-secret-value --secret-id abp/tfc/token | jq -r ".SecretString"`
-export TF_TOKEN_app_terraform_io=`aws secretsmanager get-secret-value --secret-id abp/tfc/token | jq -r ".SecretString"`
-
-#********** MAKEFILE *************
-echo "Build the lambda function packages"
-make all
-
-#********** Get tfvars from SSM *************
-echo "Get *.tfvars from SSM parameter"
-aws ssm get-parameter \
-  --name "/abp/tfc/functional/tfvars" \
-  --with-decryption \
-  --query "Parameter.Value" \
-  --output "text" \
-  --region "us-east-1" >> functional_test.tfvars
-
-#********** Terratest execution **********
-echo "Running Terratest"
-export GOPROXY=https://goproxy.io,direct
-cd test
-rm -f go.mod
-go mod init github.com/aws-ia/terraform-project-ephemeral
-go mod tidy
-go install github.com/gruntwork-io/terratest/modules/terraform
-go test -timeout 45m
-
-#********** CLEANUP *************
-echo "Cleaning up all temp files and artifacts"
-cd ${PROJECT_PATH}
-make clean
-
-echo "End of Functional Tests"
+#********** helper functions *************
+pre_entrypoint() {
+    if [ -f ${PROJECT_PATH}/.config/functional_tests/pre-entrypoint-helpers.sh ]; then
+        echo "Pre-entrypoint helper found"
+        source ${PROJECT_PATH}/.config/functional_tests/pre-entrypoint-helpers.sh
+        echo "Pre-entrypoint helper loaded"
+    else
+        echo "Pre-entrypoint helper not found - skipped"
+    fi
+}
+post_entrypoint() {
+    if [ -f ${PROJECT_PATH}/.config/functional_tests/post-entrypoint-helpers.sh ]; then
+        echo "Post-entrypoint helper found"
+        source ${PROJECT_PATH}/.config/functional_tests/post-entrypoint-helpers.sh        
+        echo "Post-entrypoint helper loaded"
+    else
+        echo "Post-entrypoint helper not found - skipped"
+    fi
+}
+
+#********** Pre-entrypoint helper *************
+pre_entrypoint
+
+#********** Functional Test *************
+/bin/bash ${PROJECT_PATH}/.project_automation/functional_tests/functional_tests.sh
+if [ $? -eq 0 ]
+then
+    echo "Functional test completed"
+    EXIT_CODE=0
+else
+    echo "Functional test failed"
+    EXIT_CODE=1
+fi
+
+#********** Post-entrypoint helper *************
+post_entrypoint
+
+#********** Exit Code *************
+exit $EXIT_CODE
diff --git a/.project_automation/functional_tests/functional_tests.sh b/.project_automation/functional_tests/functional_tests.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+## NOTE: paths may differ when running in a managed task. To ensure behavior is consistent between
+# managed and local tasks always use these variables for the project and project type path
+PROJECT_PATH=${BASE_PATH}/project
+PROJECT_TYPE_PATH=${BASE_PATH}/projecttype
+
+echo "Starting Functional Tests"
+
+#********** Terratest execution **********
+cd ${PROJECT_PATH}
+echo "Running Terratest"
+cd test
+rm -f go.mod
+go mod init github.com/aws-ia/terraform-project-ephemeral
+go mod tidy
+go install github.com/gruntwork-io/terratest/modules/terraform
+go test -timeout 45m
+
+echo "End of Functional Tests"
diff --git a/.project_automation/static_tests/entrypoint.sh b/.project_automation/static_tests/entrypoint.sh
@@ -1,67 +1,50 @@
-#!/bin/bash -e
+#!/bin/bash
+
+## WARNING: DO NOT modify the content of entrypoint.sh
+# Use ./config/static_tests/pre-entrypoint-helpers.sh or ./config/static_tests/post-entrypoint-helpers.sh 
+# to load any customizations or additional configurations
 
 ## NOTE: paths may differ when running in a managed task. To ensure behavior is consistent between
 # managed and local tasks always use these variables for the project and project type path
 PROJECT_PATH=${BASE_PATH}/project
 PROJECT_TYPE_PATH=${BASE_PATH}/projecttype
 
-echo "Starting Static Tests"
+#********** helper functions *************
+pre_entrypoint() {
+    if [ -f ${PROJECT_PATH}/.config/static_tests/pre-entrypoint-helpers.sh ]; then
+        echo "Pre-entrypoint helper found"
+        source ${PROJECT_PATH}/.config/static_tests/pre-entrypoint-helpers.sh
+        echo "Pre-entrypoint helper loaded"
+    else
+        echo "Pre-entrypoint helper not found - skipped"
+    fi
+}
+post_entrypoint() {
+    if [ -f ${PROJECT_PATH}/.config/static_tests/post-entrypoint-helpers.sh ]; then
+        echo "Post-entrypoint helper found"
+        source ${PROJECT_PATH}/.config/static_tests/post-entrypoint-helpers.sh        
+        echo "Post-entrypoint helper loaded"
+    else
+        echo "Post-entrypoint helper not found - skipped"
+    fi
+}
 
-cd ${PROJECT_PATH}
-terraform init
-terraform validate
+#********** Pre-entrypoint helper *************
+pre_entrypoint
 
-#********** tflint ********************
-echo 'Starting tflint'
-tflint --init --config ${PROJECT_PATH}/.config/.tflint.hcl
-MYLINT=$(tflint --force --config ${PROJECT_PATH}/.config/.tflint.hcl)
-if [ -z "$MYLINT" ]
+#********** Static Test *************
+/bin/bash ${PROJECT_PATH}/.project_automation/static_tests/static_tests.sh
+if [ $? -eq 0 ]
 then
-    echo "Success - tflint found no linting issues!"
+    echo "Static test completed"
+    EXIT_CODE=0
 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!"* ]];
-then
-    echo "Success - tfsec found no security issues!"
-    echo "$MYTFSEC"
-else
-    echo "Failure - tfsec found security issues!"
-    echo "$MYTFSEC"
-    exit 1
+    echo "Static test failed"
+    EXIT_CODE=1
 fi
 
-#********** Checkov Analysis *************
-echo "Running Checkov Analysis"
-checkov --config-file ${PROJECT_PATH}/.config/.checkov.yml
+#********** Post-entrypoint helper *************
+post_entrypoint
 
-#********** 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"
+#********** Exit Code *************
+exit $EXIT_CODE
diff --git a/.project_automation/static_tests/static_tests.sh b/.project_automation/static_tests/static_tests.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+## NOTE: paths may differ when running in a managed task. To ensure behavior is consistent between
+# managed and local tasks always use these variables for the project and project type path
+PROJECT_PATH=${BASE_PATH}/project
+PROJECT_TYPE_PATH=${BASE_PATH}/projecttype
+
+echo "Starting Static Tests"
+
+#********** Terraform Validate *************
+cd ${PROJECT_PATH}
+terraform init
+terraform validate
+if [ $? -eq 0 ]
+then
+    echo "Success - Terraform validate"
+else
+    echo "Failure - Terraform validate"
+    exit 1
+fi
+
+#********** 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 --custom-check-dir ${PROJECT_PATH}/.config/.tfsec)
+if [[ $MYTFSEC == *"No problems detected!"* ]];
+then
+    echo "Success - tfsec found no security issues!"
+    echo "$MYTFSEC"
+else
+    echo "Failure - tfsec found security issues!"
+    echo "$MYTFSEC"
+    exit 1
+fi
+
+#********** Checkov Analysis *************
+echo "Running Checkov Analysis"
+checkov --config-file ${PROJECT_PATH}/.config/.checkov.yml
+if [ $? -eq 0 ]
+then
+    echo "Success - Checkov found no issues!"
+else
+    echo "Failure - Checkov found issues!"
+    exit 1
+fi
+
+#********** Markdown Lint **************
+echo 'Starting markdown lint'
+MYMDL=$(mdl --config ${PROJECT_PATH}/.config/.mdlrc .header.md examples/*/.header.md)
+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. TIPS: false error may occur if you have unstaged files in your repo"
+    echo "$GDIFF"
+    exit 1
+fi
+
+#***************************************
+echo "End of Static Tests"
