Skip to content

Commit

Permalink
Merge pull request #19 from trussworks/am-updating-version-restraints…
Browse files Browse the repository at this point in the history
…-and-cleanup

updated/cleaned circleci and readme to allow tf14
  • Loading branch information
mdrummerboy09 committed Jan 7, 2021
2 parents 90993de + 5a730d6 commit 878baa9
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 14 deletions.
11 changes: 7 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
version: 2.1

jobs:
validate:
docker:
- auth:
password: $DOCKER_PASSWORD
username: $DOCKER_USERNAME
image: trussworks/circleci:6986bb9022e5a83599feb66a7128a2d0fa12732a
- auth:
password: $DOCKER_PASSWORD
username: $DOCKER_USERNAME
- image: trussworks/circleci:efb1042e31538677779971798e0912390f699e72

steps:
- checkout
- restore_cache:
Expand Down
11 changes: 7 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repos:
types: [go]

- 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 @@ -20,18 +20,21 @@ repos:
- id: trailing-whitespace

- repo: git://github.com/igorshubovych/markdownlint-cli
rev: v0.24.0
rev: v0.26.0

hooks:
- id: markdownlint

- repo: git://github.com/antonbabenko/pre-commit-terraform
rev: v1.43.0
rev: v1.45.0

hooks:
- id: terraform_docs
- id: terraform_fmt

- repo: git://github.com/golangci/golangci-lint
rev: v1.31.0
rev: v1.33.0

hooks:
- id: golangci-lint

Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,15 @@ module "github_terraform_aws_ou_scp" {

| Name | Version |
|------|---------|
| terraform | >= 0.12.7, < 0.14 |
| aws | >= 2.68, < 4.0 |
| terraform | >= 0.13.0 |
| aws | >= 3.0 |

## Providers

| Name | Version |
|------|---------|
| aws | >= 2.68, < 4.0 |
| aws | >= 3.0 |


## Inputs

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module terraform_aws_ou_ouscp

go 1.14
go 1.15
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.12.7, < 0.14"
required_version = ">= 0.13.0"

required_providers {
aws = ">= 2.68, < 4.0"
aws = ">= 3.0"
}
}

0 comments on commit 878baa9

Please sign in to comment.