Skip to content

CCM-16073 - Integration test fixes #152

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.

Sign up for GitHub

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
mjewildnhs wants to merge 3 commits into
base: feature/CCM-16073
Choose a base branch
from
Open

CCM-16073 - Integration test fixes #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e2a358
Fix http URL schema validation failure - check valid URL instead
mjewildnhs Apr 17, 2026
4ee8e1b
ALB/webhook uses https for mTLS and non mTLS - remove http endpoint
mjewildnhs Apr 17, 2026
69ec81c
Revert "Fix http URL schema validation failure - check valid URL inst…
mjewildnhs Apr 17, 2026
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 infrastructure/terraform/components/callbacks/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ locals {
targets = [
for target in try(client.targets, []) :
merge(target, {
invocationEndpoint = try(target.mtls.enabled, false) ? "https://${aws_lb.mock_webhook_mtls[0].dns_name}/${target.targetId}" : "http://${aws_lb.mock_webhook_mtls[0].dns_name}/${target.targetId}"
invocationEndpoint = "https://${aws_lb.mock_webhook_mtls[0].dns_name}/${target.targetId}"
apiKey = merge(target.apiKey, { headerValue = random_password.mock_webhook_api_key[0].result })
})
]
Expand Down
27 changes: 1 addition & 26 deletions infrastructure/terraform/components/callbacks/module_mock_webhook_alb_mtls.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,7 @@ resource "aws_vpc_security_group_ingress_rule" "mock_webhook_alb_https" {
from_port = 443
to_port = 443
ip_protocol = "tcp"
description = "Allow HTTPS Client Lambda to reach mock webhook via mTLS"
tags = local.default_tags
}

resource "aws_vpc_security_group_ingress_rule" "mock_webhook_alb_http" {
count = var.deploy_mock_clients ? 1 : 0
security_group_id = aws_security_group.mock_webhook_alb[0].id
referenced_security_group_id = aws_security_group.https_client_lambda.id
from_port = 80
to_port = 80
ip_protocol = "tcp"
description = "Allow HTTPS Client Lambda to reach mock webhook without mTLS"
description = "Allow HTTPS Client Lambda to reach mock webhook (mTLS and non-mTLS)"
tags = local.default_tags
}

Expand Down Expand Up @@ -102,17 +91,3 @@ resource "aws_lb_listener" "mock_webhook_mtls" {

tags = local.default_tags
}

resource "aws_lb_listener" "mock_webhook_http" {
count = var.deploy_mock_clients ? 1 : 0
load_balancer_arn = aws_lb.mock_webhook_mtls[0].arn
port = 80
protocol = "HTTP"

default_action {
type = "forward"
target_group_arn = aws_lb_target_group.mock_webhook_mtls[0].arn
}

tags = local.default_tags
}
Loading