Skip to content
This repository was archived by the owner on Jan 16, 2025. It is now read-only.

Commit d3cf753

Browse files
authored
Merge pull request #2013 from philips-labs/feat/aws-provider-4
feat: AWS Terraform provider 4.x
2 parents 86f4d55 + 2f84984 commit d3cf753

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+525
-341
lines changed

Diff for: .github/workflows/terraform.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Verify module
1616
strategy:
1717
matrix:
18-
terraform: [1.1.3, 'latest']
18+
terraform: [1.1.3, "latest"]
1919
runs-on: ubuntu-latest
2020
container:
2121
image: hashicorp/terraform:${{ matrix.terraform }}
@@ -44,8 +44,9 @@ jobs:
4444
strategy:
4545
fail-fast: false
4646
matrix:
47-
terraform: [1.0.11, 1.1.3, 'latest']
48-
example: ["default", "ubuntu", "prebuilt", "arm64", "ephemeral", "windows"]
47+
terraform: [1.0.11, 1.1.3, "latest"]
48+
example:
49+
["default", "ubuntu", "prebuilt", "arm64", "ephemeral", "windows"]
4950
defaults:
5051
run:
5152
working-directory: examples/${{ matrix.example }}

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*id_rsa*
99

1010
# other
11+
node_modules/
1112
.idea
1213
.DS_Store
1314
*.out

Diff for: README.md

+4-9
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44

55
This [Terraform](https://www.terraform.io/) module creates the required infrastructure needed to host [GitHub Actions](https://github.com/features/actions) self-hosted, auto-scaling runners on [AWS spot instances](https://aws.amazon.com/ec2/spot/). It provides the required logic to handle the life cycle for scaling up and down using a set of AWS Lambda functions. Runners are scaled down to zero to avoid costs when no workflows are active.
66

7-
> NEW: Ephemeral runners available as beta feature.
8-
9-
> NEW: Windows runners are available.
10-
11-
> NEW: Examples for custom AMI are available.
12-
7+
> BREAKING CHANGE: The module is upgraded to Terraform AWS provider 4.x. All new development will only support the new AWS Terraform provider. We keep a branch `terraform-aws-provider-3` to witch we welcome backports to AWS Terraform 3.x provider. Besides reviewing PR's we will do not any active checking on maintance on this branch. We strongly advise to update your deployment to the new provider version. For more details about upgrading see the [upgrade guide](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/guides/version-4-upgrade).
8+
139
- [Motivation](#motivation)
1410
- [Overview](#overview)
1511
- [Major configuration options.](#major-configuration-options)
@@ -364,13 +360,13 @@ In case the setup does not work as intended follow the trace of events:
364360
| Name | Version |
365361
|------|---------|
366362
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.1 |
367-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.50 |
363+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.0 |
368364

369365
## Providers
370366

371367
| Name | Version |
372368
|------|---------|
373-
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.50 |
369+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.0 |
374370
| <a name="provider_random"></a> [random](#provider\_random) | n/a |
375371

376372
## Modules
@@ -480,7 +476,6 @@ In case the setup does not work as intended follow the trace of events:
480476
| <a name="input_userdata_post_install"></a> [userdata\_post\_install](#input\_userdata\_post\_install) | Script to be ran after the GitHub Actions runner is installed on the EC2 instances | `string` | `""` | no |
481477
| <a name="input_userdata_pre_install"></a> [userdata\_pre\_install](#input\_userdata\_pre\_install) | Script to be ran before the GitHub Actions runner is installed on the EC2 instances | `string` | `""` | no |
482478
| <a name="input_userdata_template"></a> [userdata\_template](#input\_userdata\_template) | Alternative user-data template, replacing the default template. By providing your own user\_data you have to take care of installing all required software, including the action runner. Variables userdata\_pre/post\_install are ignored. | `string` | `null` | no |
483-
| <a name="input_volume_size"></a> [volume\_size](#input\_volume\_size) | (Deprecaated, use block\_device\_mappings. Size of runner volume, if set it overrides the value provide via block\_device\_mappings. | `number` | `null` | no |
484479
| <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | The VPC for security groups of the action runners. | `string` | n/a | yes |
485480
| <a name="input_webhook_lambda_s3_key"></a> [webhook\_lambda\_s3\_key](#input\_webhook\_lambda\_s3\_key) | S3 key for webhook lambda function. Required if using S3 bucket to specify lambdas. | `any` | `null` | no |
486481
| <a name="input_webhook_lambda_s3_object_version"></a> [webhook\_lambda\_s3\_object\_version](#input\_webhook\_lambda\_s3\_object\_version) | S3 object version for webhook lambda function. Useful if S3 versioning is enabled on source bucket. | `any` | `null` | no |

Diff for: examples/arm64/.terraform.lock.hcl

+44-40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: examples/arm64/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
aws = {
44
source = "hashicorp/aws"
5-
version = ">= 3.27"
5+
version = "~> 4.0"
66
}
77
local = {
88
source = "hashicorp/local"

Diff for: examples/default/.terraform.lock.hcl

+44-40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: examples/default/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
aws = {
44
source = "hashicorp/aws"
5-
version = ">= 3.71"
5+
version = "~> 4.0"
66
}
77
local = {
88
source = "hashicorp/local"

0 commit comments

Comments
 (0)