Skip to content

Commit

Permalink
Merge pull request #69 from trussworks/mk-terraform014
Browse files Browse the repository at this point in the history
Relax version constraints
  • Loading branch information
Michael Kania authored Jan 4, 2021
2 parents 5c30626 + 72517e1 commit f007172
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

references:
circleci: &circleci trussworks/circleci:29ab89fdada1f85c5d8fb685a2c71660f0c5f60c
circleci: &circleci trussworks/circleci:efb1042e31538677779971798e0912390f699e72

jobs:
terratest:
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.3.0
rev: v3.4.0
hooks:
- id: check-json
- id: check-merge-conflict
Expand All @@ -12,7 +12,7 @@ repos:
- id: trailing-whitespace

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

Expand All @@ -23,6 +23,6 @@ repos:
- id: terraform_fmt

- repo: git://github.com/golangci/golangci-lint
rev: v1.33.0
rev: v1.34.1
hooks:
- id: golangci-lint
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,15 @@ Creates the following resources:

### NOTES

* SES is only available in us-east-1, us-west-2, and eu-west-1
* SES is only available in a [limited number of AWS Regions](https://docs.aws.amazon.com/general/latest/gr/ses.html).
* SES out of the box locks the service in development mode; please see this documentation on how to make it production ready. Until the service is in production mode you can only send emails to confirmed email accounts denoted in `from_addresses`

## 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.0.2. Submit pull-requests to terraform011 branch.

## Usage

See [examples](examples/) for functional examples on how to use this module.
Expand Down Expand Up @@ -66,14 +64,14 @@ data "aws_route53_zone" "SES_domain" {

| 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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/trussworks/terraform-aws-ses-domain

go 1.13
go 1.15

require (
github.com/gruntwork-io/terratest v0.31.2
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 f007172

Please sign in to comment.