Skip to content

Commit

Permalink
Merge pull request #20 from trussworks/am-updating-version-restraites…
Browse files Browse the repository at this point in the history
…-and-clean-up

updating version restrains to take tf14 and remove tf11 in readme
  • Loading branch information
mdrummerboy09 authored Jan 7, 2021
2 parents 72426d7 + 46fc0d1 commit 17a757d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
- auth:
password: $DOCKER_PASSWORD
username: $DOCKER_USERNAME
image: trussworks/circleci:29ab89fdada1f85c5d8fb685a2c71660f0c5f60c
image: trussworks/circleci:efb1042e31538677779971798e0912390f699e72
steps:
- checkout
- restore_cache:
Expand All @@ -17,8 +17,7 @@ jobs:
key: pre-commit-dot-cache-{{ checksum ".pre-commit-config.yaml" }}
paths:
- ~/.cache/pre-commit
references:
circleci: trussworks/circleci:29ab89fdada1f85c5d8fb685a2c71660f0c5f60c

version: 2.1
workflows:
validate:
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: git://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v3.4.0
hooks:
- id: check-json
- id: check-merge-conflict
Expand All @@ -12,12 +12,12 @@ repos:
- id: trailing-whitespace

- repo: git://github.com/igorshubovych/markdownlint-cli
rev: v0.23.2
rev: v0.26.0
hooks:
- id: markdownlint

- repo: git://github.com/antonbabenko/pre-commit-terraform
rev: v1.37.0
rev: v1.45.0
hooks:
- id: terraform_docs
- id: terraform_fmt
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@ Creates the following resources for anti-virus scanning:

## Terraform Versions

Terraform 0.13. Pin module version to `~> 3.X`. Submit pull-requests to `master` branch.
Terraform 0.13 and newer. 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.

Terraform 0.11. Pin module version to `~> 1.1.1`. Submit pull-requests to `terraform011` branch.

## Usage

```hcl
Expand Down Expand Up @@ -77,14 +75,14 @@ module "s3_anti_virus" {

| Name | Version |
|------|---------|
| terraform | ~> 0.13.0 |
| aws | ~> 3.0 |
| terraform | >= 0.13.0 |
| aws | >= 3.0 |

## Providers

| Name | Version |
|------|---------|
| aws | ~> 3.0 |
| aws | >= 3.0 |

## Inputs

Expand Down
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = "~> 0.13.0"
required_version = ">= 0.13.0"

required_providers {
aws = "~> 3.0"
aws = ">= 3.0"
}
}

0 comments on commit 17a757d

Please sign in to comment.