diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index fac0b59..0421b55 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -10,4 +10,4 @@ on:
jobs:
validate:
- uses: trussworks/shared-actions/.github/workflows/validate.yml@main
+ uses: trussworks/shared-actions/.github/workflows/validate-tf.yml@main
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3818b55..bfd87bb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v3.4.0
+ rev: v4.4.0
hooks:
- id: check-json
- id: check-merge-conflict
@@ -10,14 +10,31 @@ repos:
args:
- --autofix
- id: trailing-whitespace
+ - id: check-symlinks
+ - id: end-of-file-fixer
+ - id: mixed-line-ending
+
+ - repo: https://github.com/executablebooks/mdformat
+ rev: 0.7.16
+ hooks:
+ - id: mdformat
+ additional_dependencies:
+ - mdformat-gfm
+ - mdformat-toc
+ # mdformat fights with terraform_docs
+ exclude: README.m(ark)?d(own)?
- repo: https://github.com/igorshubovych/markdownlint-cli
- rev: v0.26.0
+ rev: v0.33.0
hooks:
- id: markdownlint
+ - repo: https://github.com/detailyang/pre-commit-shell
+ rev: 1.0.5
+ hooks:
+ - id: shell-lint
+
- repo: https://github.com/antonbabenko/pre-commit-terraform
- rev: v1.75.0
+ rev: v1.77.1
hooks:
- - id: terraform_docs
- id: terraform_fmt
diff --git a/README.md b/README.md
index acfe476..8aecd9e 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,6 @@ Creates the following resources:
* CloudWatch Event to trigger Lambda function on a schedule.
* AWS Lambda function to actually delete excess manual RDS snapshots.
-## Terraform Versions
-
-Terraform 0.13 and later: Pin module version to ~> 3.X. Submit pull requests to master branch.
-
-Terraform 0.12: Pin module version to ~> 2.X. Submit pull requests to terraform012 branch.
## Usage
@@ -33,12 +28,12 @@ module "rds-snapshot-cleaner" {
}
```
-
+
## Requirements
| Name | Version |
|------|---------|
-| [terraform](#requirement\_terraform) | >= 0.13.0 |
+| [terraform](#requirement\_terraform) | >= 1.0 |
| [aws](#requirement\_aws) | >= 3.0 |
## Providers
@@ -87,4 +82,4 @@ No modules.
## Outputs
No outputs.
-
\ No newline at end of file
+
diff --git a/main.tf b/main.tf
index e75d3e0..23f004e 100644
--- a/main.tf
+++ b/main.tf
@@ -160,4 +160,3 @@ resource "aws_lambda_function" "main" {
Environment = var.environment
}
}
-
diff --git a/versions.tf b/versions.tf
index 9fdbc79..99d5c63 100644
--- a/versions.tf
+++ b/versions.tf
@@ -1,5 +1,5 @@
terraform {
- required_version = ">= 0.13.0"
+ required_version = ">= 1.0"
required_providers {
aws = ">= 3.0"