Skip to content

Commit daf5ee0

Browse files
authored
fix: upgrade dependencies (#379)
* Upgrade terraform * upgrade semantic release dependencies * Add tfenv file * Adjust contribution guide
1 parent e0370dd commit daf5ee0

File tree

10 files changed

+1309
-2298
lines changed

10 files changed

+1309
-2298
lines changed

.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ on:
55
- master
66
- develop
77
pull_request:
8-
98

109
jobs:
1110
verify_module:
1211
name: Verify module
1312
strategy:
1413
matrix:
15-
terraform: [0.13.6]
14+
terraform: [1.0.8]
1615
runs-on: ubuntu-latest
1716
container:
1817
image: hashicorp/terraform:${{ matrix.terraform }}
@@ -26,7 +25,7 @@ jobs:
2625
strategy:
2726
fail-fast: false
2827
matrix:
29-
terraform: [0.13.6, 0.14.5, 0.15.5, 1.0.2]
28+
terraform: [0.13.0, 0.14.0, 0.15.0, 1.0.8]
3029
example: ["runner-default", "runner-docker", "runner-pre-registered", "runner-public"]
3130
defaults:
3231
run:
@@ -37,7 +36,8 @@ jobs:
3736
steps:
3837
- uses: actions/checkout@v2
3938
- run: terraform init -get -backend=false -input=false
40-
- run: terraform fmt -recursive -check=true -write=false
39+
- if: contains(matrix.terraform, '1.0.')
40+
run: terraform fmt -recursive -check=true -write=false
4141
- run: terraform validate
4242

4343

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
repos:
22
- repo: git://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.47.0
3+
rev: v1.52.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_tflint
77
- id: terraform_docs
88
- repo: git://github.com/pre-commit/pre-commit-hooks
9-
rev: v2.5.0
9+
rev: v4.0.1
1010
hooks:
1111
- id: check-merge-conflict

.release/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
"conventional-changelog-conventionalcommits": "^4.5.0",
1616
"semantic-release": "^17.3.9"
1717
}
18-
}
18+
}

.release/yarn.lock

+1,282-2,276
Large diffs are not rendered by default.

.terraform-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.0.8

CONTRIBUTING.md

+13-7
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,30 @@ We appreciate your thought to contribute to open source. :heart: We want to make
77
- Submitting a fix
88
- Proposing new features
99

10-
## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests
10+
We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests
1111
Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:
1212

13-
1. Fork the repo and create your branch from `master`.
14-
2. If you've added code that should be tested, add tests.
15-
3. If you've changed APIs, update the documentation.
16-
4. Ensure the test suite passes.
17-
5. Make sure your code lints.
18-
6. Issue that pull request!
13+
1. Fork the repo and create your branch from `develop`.
14+
2. If you've added code, check one of the examples.
15+
3. Make sure your code lints.
16+
4. Raise a pull request.
17+
18+
## Terraform version
19+
20+
For development the terraform version is locked via [tfenv](https://github.com/tfutils/tfenv).
1921

2022
## Coding Style
23+
2124
We use the [Terraform Style conventions](https://www.terraform.io/docs/configuration/style.html). They are enforced with CI scripts.
2225

2326
## Documentation
27+
2428
We use [pre-commit](https://pre-commit.com/) to update the Terraform inputs and outputs in the documentation via [terraform-docs](https://github.com/terraform-docs/terraform-docs). Ensure you have installed those components.
2529

2630
## Testing
31+
2732
No automated tests are available. The example directory takes care of a few scenario's.
2833

2934
## License
35+
3036
By contributing, you agree that your contributions will be licensed under its MIT License.

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,15 @@ terraform destroy
244244

245245
| Name | Version |
246246
|------|---------|
247-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
247+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
248248
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.35.0 |
249249

250250
## Providers
251251

252252
| Name | Version |
253253
|------|---------|
254-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 3.61.0 |
255-
| <a name="provider_null"></a> [null](#provider\_null) | 3.1.0 |
254+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.35.0 |
255+
| <a name="provider_null"></a> [null](#provider\_null) | n/a |
256256

257257
## Modules
258258

examples/.terraform-version

-1
This file was deleted.

main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ resource "aws_ssm_parameter" "runner_sentry_dsn" {
5050
}
5151

5252
locals {
53-
enable_asg_recreation = var.enable_forced_updates != null ? ! var.enable_forced_updates : var.enable_asg_recreation
53+
enable_asg_recreation = var.enable_forced_updates != null ? !var.enable_forced_updates : var.enable_asg_recreation
5454

5555
template_user_data = templatefile("${path.module}/template/user-data.tpl",
5656
{
@@ -139,7 +139,7 @@ locals {
139139
runners_root_size = var.runners_root_size
140140
runners_iam_instance_profile_name = var.runners_iam_instance_profile_name
141141
runners_use_private_address_only = var.runners_use_private_address
142-
runners_use_private_address = ! var.runners_use_private_address
142+
runners_use_private_address = !var.runners_use_private_address
143143
runners_request_spot_instance = var.runners_request_spot_instance
144144
runners_environment_vars = jsonencode(var.runners_environment_vars)
145145
runners_pre_build_script = var.runners_pre_build_script

versions.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
21
terraform {
3-
required_version = ">= 0.12"
2+
required_version = ">= 0.13.0"
43
required_providers {
54
aws = {
65
version = ">= 3.35.0"

0 commit comments

Comments
 (0)