Repository navigation
fix(webhook): replace matcher config chunks before deleting the old ones #5521
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
Open
atsikham
wants to merge
6
commits into
github-aws-runners:main
Choose a base branch
from
atsikham:fix/webhook-matcher-config-chunk-replacement
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+252
−15
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
03890f8
fix(webhook): replace matcher config chunks before deleting the old ones
atsikham b1cdade
Merge branch 'main' into fix/webhook-matcher-config-chunk-replacement
edersonbrilhante 220f851
fix(webhook): hash chunk layout and order Lambdas after their SSM policy
atsikham ea63169
Merge branch 'main' into fix/webhook-matcher-config-chunk-replacement
atsikham 000bcc0
Merge branch 'main' into fix/webhook-matcher-config-chunk-replacement
atsikham e19f317
test(multi-runner): make matcher config chunk tests pass on OpenTofu
atsikham File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
218 changes: 218 additions & 0 deletions
218
modules/multi-runner/tests/webhook-matcher-config.tftest.hcl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,218 @@ | ||
| mock_provider "aws" { | ||
| mock_data "aws_caller_identity" { | ||
| defaults = { | ||
| account_id = "123456789012" | ||
| } | ||
| } | ||
|
|
||
| mock_data "aws_iam_policy_document" { | ||
| defaults = { | ||
| json = "{\"Version\":\"2012-10-17\",\"Statement\":[]}" | ||
| } | ||
| } | ||
|
|
||
| mock_resource "aws_iam_role" { | ||
| defaults = { | ||
| arn = "arn:aws:iam::123456789012:role/test-role" | ||
| } | ||
| } | ||
|
|
||
| mock_resource "aws_cloudwatch_event_bus" { | ||
| defaults = { | ||
| arn = "arn:aws:events:eu-west-1:123456789012:event-bus/test" | ||
| } | ||
| } | ||
|
|
||
| mock_resource "aws_cloudwatch_event_rule" { | ||
| defaults = { | ||
| arn = "arn:aws:events:eu-west-1:123456789012:rule/test" | ||
| } | ||
| } | ||
|
|
||
| mock_resource "aws_lambda_function" { | ||
| defaults = { | ||
| arn = "arn:aws:lambda:eu-west-1:123456789012:function:test" | ||
| } | ||
| } | ||
|
|
||
| mock_resource "aws_sqs_queue" { | ||
| defaults = { | ||
| arn = "arn:aws:sqs:eu-west-1:123456789012:test" | ||
| } | ||
| } | ||
|
|
||
| mock_resource "aws_s3_bucket" { | ||
| defaults = { | ||
| arn = "arn:aws:s3:::test-runner-binaries" | ||
| id = "test-runner-binaries" | ||
| } | ||
| } | ||
|
|
||
| mock_resource "aws_apigatewayv2_api" { | ||
| defaults = { | ||
| execution_arn = "arn:aws:execute-api:eu-west-1:123456789012:test" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| mock_provider "random" {} | ||
| mock_provider "null" {} | ||
|
|
||
| variables { | ||
| aws_region = "eu-west-1" | ||
| vpc_id = "vpc-test" | ||
| subnet_ids = ["subnet-test"] | ||
|
|
||
| multi_runner_config = {} | ||
|
|
||
| github_app = { | ||
| key_base64_ssm = { | ||
| arn = "arn:aws:ssm:eu-west-1:123456789012:parameter/tests/github-app/key" | ||
| name = "/tests/github-app/key" | ||
| } | ||
| id_ssm = { | ||
| arn = "arn:aws:ssm:eu-west-1:123456789012:parameter/tests/github-app/id" | ||
| name = "/tests/github-app/id" | ||
| } | ||
| webhook_secret_ssm = { | ||
| arn = "arn:aws:ssm:eu-west-1:123456789012:parameter/tests/github-app/webhook-secret" | ||
| name = "/tests/github-app/webhook-secret" | ||
| } | ||
| } | ||
|
|
||
| lambda_s3_bucket = "test-lambda-artifacts" | ||
| runners_lambda_zip = "README.md" | ||
| runners_lambda_s3_key = "runners.zip" | ||
| webhook_lambda_s3_key = "webhook.zip" | ||
| syncer_lambda_s3_key = "runner-binaries-syncer.zip" | ||
| } | ||
|
|
||
| run "matcher_config_chunk_names_include_config_hash" { | ||
| command = apply | ||
|
|
||
| variables { | ||
| multi_runner_config = { | ||
| stable = { | ||
| runner_config = { | ||
| runner_os = "linux" | ||
| runner_architecture = "x64" | ||
| instance_types = ["m5.large"] | ||
| runners_maximum_count = 1 | ||
| } | ||
| matcherConfig = { | ||
| labelMatchers = [["first-label"]] | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| assert { | ||
| condition = alltrue([ | ||
| for path in split(":", output.webhook.lambda.environment[0].variables["PARAMETER_RUNNER_MATCHER_CONFIG_PATH"]) : | ||
| can(regex("/runner-matcher-config-[0-9a-f]{12}-[0-9]+$", path)) | ||
| ]) | ||
| error_message = "Matcher config chunk names must contain the config hash and the chunk index." | ||
| } | ||
| } | ||
|
|
||
| run "unchanged_matcher_config_keeps_chunk_names" { | ||
| command = apply | ||
|
|
||
| variables { | ||
| previous_matcher_config_path = run.matcher_config_chunk_names_include_config_hash.webhook.lambda.environment[0].variables["PARAMETER_RUNNER_MATCHER_CONFIG_PATH"] | ||
|
|
||
| multi_runner_config = { | ||
| stable = { | ||
| runner_config = { | ||
| runner_os = "linux" | ||
| runner_architecture = "x64" | ||
| instance_types = ["m5.large"] | ||
| runners_maximum_count = 1 | ||
| } | ||
| matcherConfig = { | ||
| labelMatchers = [["first-label"]] | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| assert { | ||
| condition = output.webhook.lambda.environment[0].variables["PARAMETER_RUNNER_MATCHER_CONFIG_PATH"] == var.previous_matcher_config_path | ||
| error_message = "An unchanged matcher config must keep the same chunk names." | ||
| } | ||
| } | ||
|
|
||
| run "changed_matcher_config_uses_new_chunk_names" { | ||
| command = apply | ||
|
|
||
| variables { | ||
| previous_matcher_config_path = run.unchanged_matcher_config_keeps_chunk_names.webhook.lambda.environment[0].variables["PARAMETER_RUNNER_MATCHER_CONFIG_PATH"] | ||
|
|
||
| multi_runner_config = { | ||
| stable = { | ||
| runner_config = { | ||
| runner_os = "linux" | ||
| runner_architecture = "x64" | ||
| instance_types = ["m5.large"] | ||
| runners_maximum_count = 1 | ||
| } | ||
| matcherConfig = { | ||
| labelMatchers = [["second-label"]] | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| assert { | ||
| condition = output.webhook.lambda.environment[0].variables["PARAMETER_RUNNER_MATCHER_CONFIG_PATH"] != var.previous_matcher_config_path | ||
| error_message = "A changed matcher config must use new chunk names." | ||
| } | ||
| } | ||
|
|
||
| run "restore_original_matcher_config" { | ||
| command = apply | ||
|
|
||
| variables { | ||
| multi_runner_config = { | ||
| stable = { | ||
| runner_config = { | ||
| runner_os = "linux" | ||
| runner_architecture = "x64" | ||
| instance_types = ["m5.large"] | ||
| runners_maximum_count = 1 | ||
| } | ||
| matcherConfig = { | ||
| labelMatchers = [["first-label"]] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| run "changed_parameter_tier_uses_new_chunk_names" { | ||
| command = apply | ||
|
|
||
| variables { | ||
| previous_matcher_config_path = run.restore_original_matcher_config.webhook.lambda.environment[0].variables["PARAMETER_RUNNER_MATCHER_CONFIG_PATH"] | ||
|
|
||
| matcher_config_parameter_store_tier = "Advanced" | ||
| multi_runner_config = { | ||
| stable = { | ||
| runner_config = { | ||
| runner_os = "linux" | ||
| runner_architecture = "x64" | ||
| instance_types = ["m5.large"] | ||
| runners_maximum_count = 1 | ||
| } | ||
| matcherConfig = { | ||
| labelMatchers = [["first-label"]] | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| assert { | ||
| condition = output.webhook.lambda.environment[0].variables["PARAMETER_RUNNER_MATCHER_CONFIG_PATH"] != var.previous_matcher_config_path | ||
| error_message = "A changed parameter tier must use new chunk names." | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.