Merge pull request #5 from trussworks/cg_pin

Pin tf version to 0.12 family. Update pre-commit.
trussworks · Aug 13, 2020 · 82e24f7 · 82e24f7
2 parents 7df2228 + f85cbec
commit 82e24f7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,8 +1,12 @@
-version: 2
+version: 2.1
+
+references:
+  circleci_docker_primary: &circleci_docker_primary trussworks/circleci-docker-primary:822fac1c30f3bb7d5d595bed5d2dc86265c4f2f0
+
 jobs:
   validate:
     docker:
-      - image: trussworks/circleci-docker-primary:4013bb8c2428b3e2755d90a922abb2a6cea37ab4
+      - image: *circleci_docker_primary
     steps:
       - checkout
       - restore_cache:
@@ -17,7 +21,7 @@ jobs:
             - ~/.cache/pre-commit
 
 workflows:
-  version: 2
+  version: 2.1
   validate:
     jobs:
       - validate
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v3.2.0
     hooks:
       - id: check-json
       - id: check-merge-conflict
@@ -12,12 +12,12 @@ repos:
       - id: trailing-whitespace
 
   - repo: git://github.com/igorshubovych/markdownlint-cli
-    rev: v0.22.0
+    rev: v0.23.2
     hooks:
       - id: markdownlint
 
   - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.27.0
+    rev: v1.31.0
     hooks:
       - id: terraform_docs
       - id: terraform_fmt
diff --git a/README.md b/README.md
@@ -40,16 +40,23 @@ module "cloudtrail_alarms" {
 ```
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+| Name | Version |
+|------|---------|
+| terraform | ~> 0.12.0 |
+| aws | ~> 2.70 |
+
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | n/a |
+| aws | ~> 2.70 |
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|------|---------|:-----:|
+|------|-------------|------|---------|:--------:|
 | alarm\_namespace | Namespace for generated Cloudwatch alarms | `string` | `"CISBenchmark"` | no |
 | alarm\_sns\_topic\_arn | SNS topic ARN for generated alarms | `string` | n/a | yes |
 | aws\_config\_changes | Toggle AWS Config changes alarm | `bool` | `true` | no |

diff --git a/versions.tf b/versions.tf
@@ -1,3 +1,7 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = "~> 0.12.0"
+
+  required_providers {
+    aws = "~> 2.70"
+  }
 }