From 27ee1e47a3a9c9c3fc5b037faea81d7f5875d3f5 Mon Sep 17 00:00:00 2001 From: Armando Martinez Date: Thu, 7 Jan 2021 11:50:27 -0800 Subject: [PATCH] updated/cleaned circleci and readme to allow tf14 --- .circleci/config.yml | 7 ++++--- .pre-commit-config.yaml | 8 ++++---- README.md | 6 +++--- go.mod | 2 +- versions.tf | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c783961..6ec84c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,12 @@ version: 2.1 -references: - circleci: &circleci trussworks/circleci:6986bb9022e5a83599feb66a7128a2d0fa12732a jobs: validate: docker: - - image: *circleci + - auth: + password: $DOCKER_PASSWORD + username: $DOCKER_USERNAME + - image: trussworks/circleci:efb1042e31538677779971798e0912390f699e72 steps: - checkout - restore_cache: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 07915bd..08cdf7e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 @@ -20,18 +20,18 @@ 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.31.0 + rev: v1.45.0 hooks: - id: terraform_docs - id: terraform_fmt - repo: git://github.com/golangci/golangci-lint - rev: v1.30.0 + rev: v1.33.0 hooks: - id: golangci-lint diff --git a/README.md b/README.md index 9cfc36b..f4daa00 100644 --- a/README.md +++ b/README.md @@ -89,14 +89,14 @@ module "github_terraform_aws_ou_scp" { | Name | Version | |------|---------| -| terraform | ~> 0.12.0 | -| aws | ~> 2.70 | +| terraform | >= 0.13.0 | +| aws | >= 3.0 | ## Providers | Name | Version | |------|---------| -| aws | ~> 2.70 | +| aws | >= 3.0 | ## Inputs diff --git a/go.mod b/go.mod index c119d5c..042cff1 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module terraform_aws_ou_ouscp -go 1.14 +go 1.15 diff --git a/versions.tf b/versions.tf index d7ce6c1..9fdbc79 100644 --- a/versions.tf +++ b/versions.tf @@ -1,7 +1,7 @@ terraform { - required_version = "~> 0.12.0" + required_version = ">= 0.13.0" required_providers { - aws = "~> 2.70" + aws = ">= 3.0" } }