Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
.PHONY: all security lint format documentation documentation-examples validate-all validate validate-examples init examples tests

default: all

all:
all:
$(MAKE) init
$(MAKE) validate
$(MAKE) tests
Expand All @@ -34,15 +34,15 @@ examples:
$(MAKE) format
$(MAKE) documentation

documentation:
documentation:
@echo "--> Generating documentation"
@terraform-docs .
$(MAKE) documentation-modules
$(MAKE) documentation-examples

documentation-modules:
@echo "--> Generating documentation for modules"
@find . -type d -regex '.*/modules/[a-za-z\-_$$]*' -not -path '*.terraform*' 2>/dev/null | while read -r dir; do \
@find . -type d -regex '.*/modules/[a-za-z\-\_]*' -not -path '*.terraform*' 2>/dev/null | while read -r dir; do \
echo "--> Generating documentation for module: $$dir"; \
terraform-docs $$dir; \
done;
Expand All @@ -67,7 +67,7 @@ upgrade-terraform-example-providers:
done; \
fi

init:
init:
@echo "--> Running terraform init"
@terraform init -backend=false
@find . -type f -name "*.tf" -not -path '*.terraform*' -exec dirname {} \; | sort -u | while read -r dir; do \
Expand All @@ -87,7 +87,7 @@ security-modules:
echo "--> Validating $$dir"; \
terraform init -backend=false; \
trivy config --format table --exit-code 1 --severity CRITICAL,HIGH --ignorefile .trivyignore $$dir; \
done;
done;

security-examples:
@echo "--> Running Security checks on examples"
Expand All @@ -97,8 +97,8 @@ security-examples:
trivy config --format table --exit-code 1 --severity CRITICAL,HIGH --ignorefile .trivyignore $$dir; \
done;

tests:
@echo "--> Running Terraform Tests"
tests:
@echo "--> Running Terraform Tests"
@terraform test

validate:
Expand All @@ -111,7 +111,7 @@ validate:

validate-modules:
@echo "--> Running terraform validate on modules"
@find . -type d -regex '.*/modules/[a-zA-Z\-_$$]*' -not -path '*.terraform*' 2>/dev/null | while read -r dir; do \
@find . -type d -regex './modules/[a-zA-Z\-]*' -not -path '*.terraform*' 2>/dev/null | while read -r dir; do \
echo "--> Validating Module $$dir"; \
terraform -chdir=$$dir init -backend=false; \
terraform -chdir=$$dir validate; \
Expand All @@ -123,7 +123,7 @@ validate-examples:
echo "--> Validating $$dir"; \
terraform -chdir=$$dir init -backend=false; \
terraform -chdir=$$dir validate; \
done;
done;

validate-commits:
@echo "--> Running commitlint against the main branch"
Expand All @@ -132,7 +132,7 @@ validate-commits:

lint:
@echo "--> Running tflint"
@tflint --init
@tflint --init
@tflint -f compact
$(MAKE) lint-modules
$(MAKE) lint-examples
Expand All @@ -151,9 +151,9 @@ lint-examples:
echo "--> Linting $$dir"; \
tflint --chdir=$$dir --init; \
tflint --chdir=$$dir -f compact; \
done;
done;

format:
format:
@echo "--> Running terraform fmt"
@terraform fmt -recursive -write=true

Expand Down
67 changes: 0 additions & 67 deletions examples/provider/.terraform.lock.hcl

This file was deleted.

48 changes: 0 additions & 48 deletions examples/remote_state/.terraform.lock.hcl

This file was deleted.

25 changes: 0 additions & 25 deletions examples/role/.terraform.lock.hcl

This file was deleted.

67 changes: 0 additions & 67 deletions examples/test-bitbucket/.terraform.lock.hcl

This file was deleted.

43 changes: 0 additions & 43 deletions modules/provider/.terraform.lock.hcl

This file was deleted.

21 changes: 2 additions & 19 deletions modules/provider/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,12 @@ No modules.
| <a name="output_providers"></a> [providers](#output_providers) | n/a |

<!-- BEGIN_TF_DOCS -->
## Requirements

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.87.0 |
| <a name="provider_tls"></a> [tls](#provider\_tls) | 4.0.6 |

## Modules

No modules.

## Resources

| Name | Type |
|------|------|
| [aws_iam_openid_connect_provider.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_openid_connect_provider) | resource |
| [tls_certificate.thumbprint](https://registry.terraform.io/providers/hashicorp/tls/latest/docs/data-sources/certificate) | data source |
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
| <a name="provider_tls"></a> [tls](#provider\_tls) | n/a |

## Inputs

Expand Down
Loading