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

Updates from project type

Author: tbulding

.copier-answers.yml

@@ -1,6 +1,6 @@
 # This file is auto-generated, changes will be overwritten
-_commit: v0.0.1
-_src_path: /task/fcc9ea5c-e927-11ed-bba8-5e3d76a82673/projecttype
+_commit: v0.0.6
+_src_path: /task/85181ca7-edb8-11ed-83ce-460647dd8021/projecttype
 starting_version: v0.0.0
 version_file: VERSION
 

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+---
+fail_fast: false
+minimum_pre_commit_version: "2.6.0"
+repos:
+  -
+    repo: https://github.com/terraform-docs/terraform-docs
+    # To update run:
+    # pre-commit autoupdate --freeze
+    rev: 212db41760d7fc45d736d5eb94a483d0d2a12049  # frozen: v0.16.0
+    hooks:
+      - id: terraform-docs-go
+        args: 
+          - "--config=.terraform-docs.yaml"
+          - "--lockfile=false"
+          - "--recursive"
+          - "--recursive-path=examples/"
+          - "./"

.project_automation/publication/entrypoint.sh

@@ -18,3 +18,5 @@ else
   echo "creating new version"
   gh release create ${VERSION} --target ${BRANCH} --generate-notes
 fi
+
+

.project_automation/static_tests/Dockerfile

@@ -24,4 +24,4 @@ RUN gem install mdl
 
 ENV TERRAFORM_DOCS_VERSION=v0.16.0
 RUN wget https://github.com/terraform-docs/terraform-docs/releases/download/${TERRAFORM_DOCS_VERSION}/terraform-docs-${TERRAFORM_DOCS_VERSION}-linux-amd64.tar.gz && \
-    tar -C /usr/local/bin -xzf terraform-docs-${TERRAFORM_DOCS_VERSION}-linux-amd64.tar.gz && chmod +x /usr/local/bin/terraform-docs
+    tar -C /usr/local/bin -xzf terraform-docs-${TERRAFORM_DOCS_VERSION}-linux-amd64.tar.gz && chmod +x /usr/local/bin/terraform-docs

.project_automation/static_tests/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
 ## 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
@@ -11,13 +11,45 @@ cd ${PROJECT_PATH}
 terraform init
 terraform validate
 
+#********** tflint ********************
+echo 'Starting tflint'
 tflint --init
-tflint
-
+MYLINT=$(tflint --force)
+if [ -z "$MYLINT" ]
+then
+    echo "Success - tflint found no linting issues!"
+else
+    echo "Failure - tflint found linting issues!" 
+    echo "$MYLINT"
+    exit 1
+fi
+#********** tfsec *********************
+# tfsec will report to the console with success or Failure
+# therefore there is no need to provide such conditional stetements
+echo 'Starting tfsec'
 tfsec .
-
-mdl .header.md
-
-terraform-docs --lockfile=false ./
-
+#********** Markdown Lint **************
+echo 'Starting markdown lint'
+MYMDL=$(mdl .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 --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"

README.md

@@ -165,7 +165,7 @@ resource "aws_iam_policy" "policy" {
 | <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | The region from which this module will be executed. | `string` | n/a | yes |
 | <a name="input_tfc_org"></a> [tfc\_org](#input\_tfc\_org) | Terraform Organization name | `string` | n/a | yes |
 | <a name="input_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#input\_cloudwatch\_log\_group\_name) | RunTask CloudWatch log group name | `string` | `"/hashicorp/terraform/runtask/iam-access-analyzer/"` | no |
-| <a name="input_cloudwatch_log_group_retention"></a> [cloudwatch\_log\_group\_retention](#input\_cloudwatch\_log\_group\_retention) | Lambda CloudWatch log group retention period | `string` | `"30"` | no |
+| <a name="input_cloudwatch_log_group_retention"></a> [cloudwatch\_log\_group\_retention](#input\_cloudwatch\_log\_group\_retention) | Lambda CloudWatch log group retention period | `string` | `"365"` | no |
 | <a name="input_deploy_waf"></a> [deploy\_waf](#input\_deploy\_waf) | Set to true to deploy CloudFront and WAF in front of the Lambda function URL | `string` | `false` | no |
 | <a name="input_event_bus_name"></a> [event\_bus\_name](#input\_event\_bus\_name) | EventBridge event bus name | `string` | `"default"` | no |
 | <a name="input_event_source"></a> [event\_source](#input\_event\_source) | EventBridge source name | `string` | `"app.terraform.io"` | no |

examples/module_workspace/README.md

@@ -78,7 +78,10 @@ First step is to deploy the module into dedicated Terraform Cloud workspace. The
 
 ## Inputs
 
-No inputs.
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| <a name="input_tfc_org"></a> [tfc\_org](#input\_tfc\_org) | n/a | `string` | n/a | yes |
+| <a name="input_workspace_prefix"></a> [workspace\_prefix](#input\_workspace\_prefix) | n/a | `string` | n/a | yes |
 
 ## Outputs