Skip to content

chore: Release #2601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 46 commits into from
Oct 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
ac046b8
feat: Experimental feature - Duplicate workflow job event to extra qu…
Oct 14, 2022
dad7896
Merge branch 'main' into develop
npalm Oct 14, 2022
1f3f4e2
chore: Bump hmarr/auto-approve-action from 2.4.0 to 3.0.0 (#2524)
dependabot[bot] Oct 18, 2022
9b15f2c
chore: Bump amannn/action-semantic-pull-request from 4 to 5 (#2525)
dependabot[bot] Oct 18, 2022
c8881e4
chore: Bump jest and @types/jest in /modules/runner-binaries-syncer/l…
dependabot[bot] Oct 18, 2022
3c602cd
chore: Bump @octokit/rest from 19.0.4 to 19.0.5 in /modules/runner-bi…
dependabot[bot] Oct 18, 2022
d53c864
chore: Bump aws-sdk from 2.1231.0 to 2.1234.0 in /modules/webhook/lam…
dependabot[bot] Oct 18, 2022
fbd4653
chore: Bump @types/aws-lambda from 8.10.106 to 8.10.107 in /modules/w…
dependabot[bot] Oct 18, 2022
ba8ed97
chore: Bump jest-mock from 29.1.2 to 29.2.0 in /modules/webhook/lambd…
dependabot[bot] Oct 18, 2022
b18d528
chore: Bump @trivago/prettier-plugin-sort-imports from 3.3.0 to 3.3.1…
dependabot[bot] Oct 18, 2022
f8e4d2a
chore: Bump @octokit/rest from 19.0.4 to 19.0.5 in /modules/webhook/l…
dependabot[bot] Oct 18, 2022
6c507ab
chore: Bump axios from 1.1.2 to 1.1.3 in /modules/runner-binaries-syn…
dependabot[bot] Oct 18, 2022
4844ea6
chore: Bump moment-timezone from 0.5.37 to 0.5.38 in /modules/runners…
dependabot[bot] Oct 18, 2022
1c5102b
chore: Bump @trivago/prettier-plugin-sort-imports from 3.3.0 to 3.3.1…
dependabot[bot] Oct 18, 2022
4bd5599
chore: Bump jest-mock from 29.1.2 to 29.2.0 in /modules/runners/lambd…
dependabot[bot] Oct 19, 2022
4d1173e
chore: Bump @octokit/auth-app from 4.0.6 to 4.0.7 in /modules/runners…
dependabot[bot] Oct 19, 2022
905b22d
chore: Bump aws-sdk from 2.1231.0 to 2.1235.0 in /modules/runners/lam…
dependabot[bot] Oct 19, 2022
e20b3f3
chore: Bump @types/node from 18.8.3 to 18.11.2 in /modules/runners/la…
dependabot[bot] Oct 19, 2022
c34072c
chore: Bump @types/aws-lambda from 8.10.106 to 8.10.108 in /modules/r…
dependabot[bot] Oct 19, 2022
e269602
chore: Bump @octokit/webhooks from 10.2.0 to 10.3.0 in /modules/webho…
dependabot[bot] Oct 19, 2022
91f6428
chore: Bump jest-mock from 29.1.2 to 29.2.1 in /modules/runner-binari…
dependabot[bot] Oct 19, 2022
ff5dd66
chore: Bump @trivago/prettier-plugin-sort-imports from 3.3.0 to 3.3.1…
dependabot[bot] Oct 19, 2022
45ff49a
chore: Bump aws-sdk from 2.1231.0 to 2.1235.0 in /modules/runner-bina…
dependabot[bot] Oct 19, 2022
af72465
chore: Bump @octokit/rest from 19.0.4 to 19.0.5 in /modules/runners/l…
dependabot[bot] Oct 19, 2022
d4badbd
chore: Bump @types/node from 18.8.4 to 18.11.2 in /modules/webhook/la…
dependabot[bot] Oct 19, 2022
aa0afdd
fix: replacing deprecated set-output in workflow (#2564)
tobiasehlert Oct 19, 2022
e3bacb0
chore: Bump @octokit/types from 7.5.1 to 8.0.0 in /modules/runners/la…
dependabot[bot] Oct 19, 2022
51ba7bf
chore: Bump @aws-sdk/client-ssm from 3.186.0 to 3.192.0 in /modules/w…
dependabot[bot] Oct 19, 2022
6d599a5
chore: Bump jest and @types/jest in /modules/runners/lambdas/runners …
dependabot[bot] Oct 20, 2022
5764f5b
chore: Bump @types/node from 18.8.4 to 18.11.2 in /modules/runner-bin…
dependabot[bot] Oct 20, 2022
68e2381
feat(runners): Add support for looking up runner AMI ID from an SSM p…
jpalomaki Oct 31, 2022
3fd5cec
chore: Bump hmarr/auto-approve-action from 3.0.0 to 3.1.0 (#2573)
dependabot[bot] Oct 31, 2022
757fa47
chore: Bump @types/node from 18.11.2 to 18.11.4 in /modules/runners/l…
dependabot[bot] Oct 31, 2022
00985bd
chore: Bump @aws-sdk/client-ssm from 3.192.0 to 3.194.0 in /modules/w…
dependabot[bot] Oct 31, 2022
483696b
chore: Bump @trivago/prettier-plugin-sort-imports from 3.3.1 to 3.4.0…
dependabot[bot] Oct 31, 2022
e7288c7
chore: Bump jest-mock from 29.2.0 to 29.2.1 in /modules/runners/lambd…
dependabot[bot] Oct 31, 2022
af12dfb
chore: Bump @trivago/prettier-plugin-sort-imports from 3.3.1 to 3.4.0…
dependabot[bot] Oct 31, 2022
2098d2f
chore: Bump @trivago/prettier-plugin-sort-imports from 3.3.1 to 3.4.0…
dependabot[bot] Oct 31, 2022
d8864bb
chore: Bump @octokit/webhooks from 10.3.0 to 10.3.1 in /modules/webho…
dependabot[bot] Oct 31, 2022
6f04e2f
chore: Bump @types/node from 18.11.2 to 18.11.8 in /modules/webhook/l…
dependabot[bot] Oct 31, 2022
2e8d371
chore: Bump @types/node from 18.11.2 to 18.11.8 in /modules/runner-bi…
dependabot[bot] Oct 31, 2022
63c7ccf
chore: Bump aws-sdk from 2.1235.0 to 2.1243.0 in /modules/runner-bina…
dependabot[bot] Oct 31, 2022
bdef8b6
chore: Bump @aws-sdk/client-ssm from 3.186.0 to 3.199.0 in /modules/r…
dependabot[bot] Oct 31, 2022
84ff831
chore: Bump aws-sdk from 2.1235.0 to 2.1243.0 in /modules/runners/lam…
dependabot[bot] Oct 31, 2022
b90d7fc
chore: Bump aws-sdk from 2.1234.0 to 2.1244.0 in /modules/webhook/lam…
dependabot[bot] Oct 31, 2022
505adf3
Merge branch 'main' into develop
npalm Oct 31, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
runs-on: ubuntu-latest
steps:
- uses: hmarr/auto-approve-action@v2.4.0
- uses: hmarr/auto-approve-action@v3.1.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
id: lambda
env:
LAMBDA: ${{ matrix.lambda }}
run: echo ::set-output name=name::${LAMBDA##*/}
run: echo "name=${LAMBDA##*/}" >> $GITHUB_OUTPUT
- uses: actions/checkout@v3
- name: Add zip
run: apt update && apt install zip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semantic-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: amannn/action-semantic-pull-request@v4
- uses: amannn/action-semantic-pull-request@v5
name: Check PR for Semantic Commit Message
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ export interface GithubWorkflowEvent {
This extendible format allows to add more fields to be added if needed.
You can configure the queue by setting properties to `workflow_job_events_queue_config`

NOTE: By default, a runner AMI update requires a re-apply of this terraform config (the runner AMI ID is looked up by a terraform data source). To avoid this, you can use `ami_id_ssm_parameter_name` to have the scale-up lambda dynamically lookup the runner AMI ID from an SSM parameter at instance launch time. Said SSM parameter is managed outside of this module (e.g. by a runner AMI build workflow).

## Examples

Examples are located in the [examples](./examples) directory. The following examples are provided:
Expand Down Expand Up @@ -419,6 +421,7 @@ We welcome any improvement to the standard module to make the default as secure
|------|-------------|------|---------|:--------:|
| <a name="input_ami_filter"></a> [ami\_filter](#input\_ami\_filter) | List of maps used to create the AMI filter for the action runner AMI. By default amazon linux 2 is used. | `map(list(string))` | `null` | no |
| <a name="input_ami_owners"></a> [ami\_owners](#input\_ami\_owners) | The list of owners used to select the AMI of action runner instances. | `list(string)` | <pre>[<br> "amazon"<br>]</pre> | no |
| <a name="input_ami_id_ssm_parameter_name"></a> [ami\_id\_ssm\_parameter\_name](#input\_ami\_id\_ssm\_parameter\_name) | Optional SSM parameter that contains the runner AMI ID to launch instances from. Overrides `ami_filter`. The parameter value is managed outside of this module (e.g. in a runner AMI build workflow). This allows for AMI updates without having to re-apply this terraform config. | `string` | `null` | no |
| <a name="input_aws_partition"></a> [aws\_partition](#input\_aws\_partition) | (optiona) partition in the arn namespace to use if not 'aws' | `string` | `"aws"` | no |
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS region. | `string` | n/a | yes |
| <a name="input_block_device_mappings"></a> [block\_device\_mappings](#input\_block\_device\_mappings) | The EC2 instance block device configuration. Takes the following keys: `device_name`, `delete_on_termination`, `volume_type`, `volume_size`, `encrypted`, `iops`, `throughput`, `kms_key_id`, `snapshot_id`. | <pre>list(object({<br> delete_on_termination = bool<br> device_name = string<br> encrypted = bool<br> iops = number<br> kms_key_id = string<br> snapshot_id = string<br> throughput = number<br> volume_size = number<br> volume_type = string<br> }))</pre> | <pre>[<br> {<br> "delete_on_termination": true,<br> "device_name": "/dev/xvda",<br> "encrypted": true,<br> "iops": null,<br> "kms_key_id": null,<br> "snapshot_id": null,<br> "throughput": null,<br> "volume_size": 30,<br> "volume_type": "gp3"<br> }<br>]</pre> | no |
Expand Down
4 changes: 4 additions & 0 deletions examples/prebuilt/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ module "runners" {
ami_filter = { name = [var.ami_name_filter] }
ami_owners = [data.aws_caller_identity.current.account_id]

# Look up runner AMI ID from an AWS SSM parameter (overrides ami_filter at instance launch time)
# NOTE: the parameter must be managed outside of this module (e.g. in a runner AMI build workflow)
# ami_id_ssm_parameter_name = "my-runner-ami-id"

# disable binary syncer since github agent is already installed in the AMI.
enable_runner_binaries_syncer = false

Expand Down
7 changes: 4 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,10 @@ module "runners" {
instance_max_spot_price = var.instance_max_spot_price
block_device_mappings = var.block_device_mappings

runner_architecture = var.runner_architecture
ami_filter = var.ami_filter
ami_owners = var.ami_owners
runner_architecture = var.runner_architecture
ami_filter = var.ami_filter
ami_owners = var.ami_owners
ami_id_ssm_parameter_name = var.ami_id_ssm_parameter_name

sqs_build_queue = aws_sqs_queue.queued_builds
github_app_parameters = local.github_app_parameters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
"format-check": "prettier --check \"**/*.ts\""
},
"devDependencies": {
"@octokit/rest": "^19.0.4",
"@trivago/prettier-plugin-sort-imports": "^3.3.0",
"@types/jest": "^27.5.0",
"@types/node": "^18.8.4",
"@octokit/rest": "^19.0.5",
"@trivago/prettier-plugin-sort-imports": "^3.4.0",
"@types/jest": "^29.1.2",
"@types/node": "^18.11.8",
"@types/request": "^2.48.8",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"@vercel/ncc": "^0.34.0",
"aws-sdk": "^2.1231.0",
"aws-sdk": "^2.1243.0",
"eslint": "^7.32.0",
"eslint-plugin-prettier": "4.2.1",
"jest": "^29.1",
"jest-mock": "^29.1.2",
"jest": "^29.2",
"jest-mock": "^29.2.1",
"prettier": "2.7.1",
"ts-jest": "^29.0.3",
"ts-node-dev": "^2.0.0",
"typescript": "^4.8.4"
},
"dependencies": {
"axios": "^1.1.2",
"axios": "^1.1.3",
"tslog": "^3.3.4"
}
}
Loading