Skip to content

Commit c6c15d6

Browse files
dpfeifdpfeif
authored
Merge pull request #31 from datarootsio/open-pr-here
Remove provider
2 parents e928c92 + e1cf18c commit c6c15d6

File tree

11 files changed

+41
-26
lines changed

11 files changed

+41
-26
lines changed

‎.github/workflows/terraform-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- uses: hashicorp/setup-terraform@v1
2020
with:
21-
terraform_version: 0.13.4
21+
terraform_version: 0.15.4
2222

2323
- name: Terraform Init
2424
run: terraform init
@@ -40,7 +40,7 @@ jobs:
4040
AWS_DEFAULT_REGION: eu-west-1
4141
name: "Tests"
4242
runs-on: ubuntu-latest
43-
if: ${{ github.event_name == 'pull_request' && github.base_ref == 'main' && (github.actor == 'samueldumont' || github.actor == 'nicogelders')}}
43+
if: ${{ github.event_name == 'pull_request' && github.base_ref == 'main' && github.head_ref == 'open-pr-here' }}
4444
steps:
4545
- name: "Checkout"
4646
uses: actions/checkout@master
@@ -55,6 +55,10 @@ jobs:
5555
args: --timeout=3m0s
5656
version: ${{ env.golangci_lint_version }}
5757

58+
- uses: hashicorp/setup-terraform@v1
59+
with:
60+
terraform_version: 0.15.4
61+
5862
- name: "go test"
5963
run: |
6064
go test -v -timeout ${{ env.tests_timeout }} ./...

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Maintained by dataroots](https://img.shields.io/badge/maintained%20by-dataroots-%2300b189)](https://dataroots.io)
22
[![Airflow version](https://img.shields.io/badge/Apache%20Airflow-2.0.1-e27d60.svg)](https://airflow.apache.org/)
3-
[![Terraform 0.13](https://img.shields.io/badge/terraform-0.13-%23623CE4)](https://www.terraform.io)
3+
[![Terraform 0.15](https://img.shields.io/badge/terraform-0.15-%23623CE4)](https://www.terraform.io)
44
[![Terraform Registry](https://img.shields.io/badge/terraform-registry-%23623CE4)](https://registry.terraform.io/modules/datarootsio/ecs-airflow/aws)
55
[![Tests](https://github.com/datarootsio/terraform-aws-ecs-airflow/workflows/tests/badge.svg?branch=main)](https://github.com/datarootsio/terraform-aws-ecs-airflow/actions)
66
[![Go Report Card](https://goreportcard.com/badge/github.com/datarootsio/terraform-aws-ecs-airflow)](https://goreportcard.com/report/github.com/datarootsio/terraform-aws-ecs-airflow)
@@ -76,7 +76,7 @@ For now the only authentication option is 'RBAC'. When enabling this, this modul
7676

7777
| Name | Version |
7878
|------|---------|
79-
| terraform | ~> 0.13 |
79+
| terraform | ~> 0.15 |
8080
| aws | ~> 3.12.0 |
8181

8282
## Providers
@@ -165,4 +165,4 @@ Make sure you branch from the 'open-pr-here' branch, and submit a PR back to the
165165

166166
## License
167167

168-
MIT license. Please see [LICENSE](LICENSE.md) for details.
168+
MIT license. Please see [LICENSE](LICENSE.md) for details.

‎examples/basic-local-with-requirements/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = "~> 0.13"
2+
required_version = "~> 0.15"
33
required_providers {
44
aws = {
55
source = "hashicorp/aws"
@@ -36,4 +36,4 @@ module "airflow" {
3636

3737
output "airflow_alb_dns" {
3838
value = module.airflow.airflow_alb_dns
39-
}
39+
}

‎examples/basic-sequential-rbac/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = "~> 0.13"
2+
required_version = "~> 0.15"
33
required_providers {
44
aws = {
55
source = "hashicorp/aws"
@@ -32,4 +32,4 @@ module "airflow" {
3232

3333
output "airflow_alb_dns" {
3434
value = module.airflow.airflow_alb_dns
35-
}
35+
}

‎examples/basic-sequential/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = "~> 0.13"
2+
required_version = "~> 0.15"
33
required_providers {
44
aws = {
55
source = "hashicorp/aws"
@@ -30,4 +30,4 @@ module "airflow" {
3030

3131
output "airflow_alb_dns" {
3232
value = module.airflow.airflow_alb_dns
33-
}
33+
}

‎go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ require (
77
github.com/aws/aws-sdk-go v1.35.11
88
github.com/go-errors/errors v1.1.1 // indirect
99
github.com/go-sql-driver/mysql v1.5.0 // indirect
10-
github.com/google/go-cmp v0.5.2 // indirect
10+
github.com/google/go-cmp v0.5.5 // indirect
1111
github.com/google/uuid v1.1.2 // indirect
1212
github.com/gruntwork-io/terratest v0.30.11
1313
github.com/stretchr/testify v1.6.1
1414
github.com/urfave/cli v1.22.4 // indirect
1515
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
1616
golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
17-
golang.org/x/sys v0.0.0-20201020230747-6e5568b54d1a // indirect
17+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
18+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
1819
google.golang.org/appengine v1.6.7 // indirect
1920
gopkg.in/yaml.v2 v2.3.0 // indirect
2021
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect

‎go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
182182
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
183183
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
184184
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
185-
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
186-
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
185+
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
186+
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
187187
github.com/google/go-containerregistry v0.0.0-20200110202235-f4fb41bf00a3/go.mod h1:2wIuQute9+hhWqvL3vEI7YB0EKluF4WcPzI1eAliazk=
188188
github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
189189
github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
@@ -482,8 +482,8 @@ golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7w
482482
golang.org/x/sys v0.0.0-20200107162124-548cf772de50 h1:YvQ10rzcqWXLlJZ3XCUoO25savxmscf4+SC+ZqiCHhA=
483483
golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
484484
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
485-
golang.org/x/sys v0.0.0-20201020230747-6e5568b54d1a h1:e3IU37lwO4aq3uoRKINC7JikojFmE5gO7xhfxs8VC34=
486-
golang.org/x/sys v0.0.0-20201020230747-6e5568b54d1a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
485+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
486+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
487487
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
488488
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
489489
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -526,6 +526,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
526526
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
527527
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
528528
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
529+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
530+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
529531
gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
530532
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
531533
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=

‎main.tf

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
terraform {
2-
required_version = "~> 0.13"
2+
required_version = "~> 0.15"
33
required_providers {
44
aws = {
5-
source = "hashicorp/aws"
5+
source = "hashicorp/aws"
6+
version = "~> 3.12.0"
67
}
78
}
89
}
9-
10-
provider "aws" {
11-
version = "~> 3.12.0"
12-
region = var.region
13-
}

‎test/preexisting/main.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,11 @@ locals {
7676
}
7777

7878
terraform {
79-
required_version = "~> 0.13"
79+
required_version = "~> 0.15"
8080
required_providers {
8181
aws = {
8282
source = "hashicorp/aws"
83+
version = "~> 3.12.0"
8384
}
8485
}
8586
}
@@ -186,4 +187,4 @@ output "certificate_arn" {
186187

187188
output "postgres_uri" {
188189
value = "${aws_db_instance.airflow.address}:${aws_db_instance.airflow.port}/${aws_db_instance.airflow.name}"
189-
}
190+
}

‎test/provider.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Provider to initialize tests
2+
3+
provider "aws" {
4+
region = var.region
5+
}

0 commit comments

Comments
 (0)