Skip to content
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

GitHub Actions Code Formatter workflow #9085

Merged
merged 1 commit into from
Dec 16, 2024
Merged

GitHub Actions Code Formatter workflow #9085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 28 additions & 4 deletions terraform/environments/digital-prison-reporting/application_variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,13 @@
"setup_sonatype_secrets": true,
"setup_scheduled_action_iam_role": true,
"setup_redshift_schedule": true,
"dps_domains": ["dps-activities", "dps-case-notes", "dps-basm", "dps-inc-reporting", "dps-csip"],
"dps_domains": [
"dps-activities",
"dps-case-notes",
"dps-basm",
"dps-inc-reporting",
"dps-csip"
],
"alarms": {
"setup_cw_alarms": true,
"redshift": {
Expand Down Expand Up @@ -270,7 +276,13 @@
"setup_sonatype_secrets": false,
"setup_scheduled_action_iam_role": true,
"setup_redshift_schedule": true,
"dps_domains": ["dps-activities", "dps-case-notes", "dps-basm", "dps-inc-reporting", "dps-csip"],
"dps_domains": [
"dps-activities",
"dps-case-notes",
"dps-basm",
"dps-inc-reporting",
"dps-csip"
],
"alarms": {
"setup_cw_alarms": true,
"redshift": {
Expand Down Expand Up @@ -448,7 +460,13 @@
"setup_scheduled_action_iam_role": true,
"setup_redshift_schedule": true,
"enable_redshift_health_check": true,
"dps_domains": ["dps-activities", "dps-case-notes", "dps-basm", "dps-inc-reporting", "dps-csip"],
"dps_domains": [
"dps-activities",
"dps-case-notes",
"dps-basm",
"dps-inc-reporting",
"dps-csip"
],
"alarms": {
"setup_cw_alarms": true,
"redshift": {
Expand Down Expand Up @@ -642,7 +660,13 @@
"setup_sonatype_secrets": false,
"setup_scheduled_action_iam_role": false,
"setup_redshift_schedule": false,
"dps_domains": ["dps-activities", "dps-case-notes", "dps-basm", "dps-inc-reporting", "dps-csip"],
"dps_domains": [
"dps-activities",
"dps-case-notes",
"dps-basm",
"dps-inc-reporting",
"dps-csip"
],
"alarms": {
"setup_cw_alarms": true,
"redshift": {
Expand Down
40 changes: 20 additions & 20 deletions terraform/environments/mojfin/mojfin-networking.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ resource "aws_security_group" "mojfin" {
dynamic "ingress" {
for_each = local.environment == "preproduction" ? [] : [local.cidr_ire_workspace]
content {
description = "Ireland Shared Services Inbound - Workspaces etc"
from_port = 1521
to_port = 1521
protocol = "tcp"
cidr_blocks = [ingress.value]
description = "Ireland Shared Services Inbound - Workspaces etc"
from_port = 1521
to_port = 1521
protocol = "tcp"
cidr_blocks = [ingress.value]
}
}

Expand All @@ -44,22 +44,22 @@ resource "aws_security_group" "mojfin" {
dynamic "ingress" {
for_each = local.environment == "preproduction" ? [] : [local.cp_vpc_cidr]
content {
description = "Cloud Platform VPC Internal Traffic inbound"
from_port = 1521
to_port = 1521
protocol = "tcp"
cidr_blocks = [ingress.value]
description = "Cloud Platform VPC Internal Traffic inbound"
from_port = 1521
to_port = 1521
protocol = "tcp"
cidr_blocks = [ingress.value]
}
}

dynamic "ingress" {
for_each = local.environment == "preproduction" ? [] : [local.analytic_platform_cidr]
content {
description = "Connectivity Analytic Platform (Airflow) use of Transit Gateway to MoJFin"
from_port = 1521
to_port = 1521
protocol = "tcp"
cidr_blocks = [ingress.value]
description = "Connectivity Analytic Platform (Airflow) use of Transit Gateway to MoJFin"
from_port = 1521
to_port = 1521
protocol = "tcp"
cidr_blocks = [ingress.value]
}
}

Expand All @@ -74,11 +74,11 @@ resource "aws_security_group" "mojfin" {
dynamic "ingress" {
for_each = local.environment == "preproduction" ? [] : [local.lz_vpc]
content {
description = "Temp rule for DBlinks, remove rule once the other DBs have been migrated to MP"
from_port = 1521
to_port = 1521
protocol = "tcp"
cidr_blocks = [ingress.value]
description = "Temp rule for DBlinks, remove rule once the other DBs have been migrated to MP"
from_port = 1521
to_port = 1521
protocol = "tcp"
cidr_blocks = [ingress.value]
}
}

Expand Down
8 changes: 4 additions & 4 deletions terraform/environments/oas/ec2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ resource "aws_security_group" "ec2" {
cidr_blocks = [local.application_data.accounts[local.environment].inbound_cidr_lz]
}
ingress {
description = "SSH from the Bastion"
from_port = 22
to_port = 22
protocol = "tcp"
description = "SSH from the Bastion"
from_port = 22
to_port = 22
protocol = "tcp"
security_groups = [module.bastion_linux.bastion_security_group]
}

Expand Down
12 changes: 6 additions & 6 deletions terraform/environments/ppud/lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ resource "aws_lambda_function" "terraform_lambda_func_send_cpu_graph_dev" {
reserved_concurrent_executions = 5
# code_signing_config_arn = "arn:aws:lambda:eu-west-2:${local.environment_management.account_ids["ppud-development"]}:code-signing-config:csc-0c7136ccff2de748f"
dead_letter_config {
target_arn = aws_sqs_queue.lambda_queue_dev[0].arn
target_arn = aws_sqs_queue.lambda_queue_dev[0].arn
}
tracing_config {
mode = "Active"
Expand Down Expand Up @@ -468,7 +468,7 @@ resource "aws_lambda_function" "terraform_lambda_func_send_cpu_graph_prod" {
reserved_concurrent_executions = 5
# code_signing_config_arn = "arn:aws:lambda:eu-west-2:${local.environment_management.account_ids["ppud-production"]}:code-signing-config:csc-0bafee04a642a41c1"
dead_letter_config {
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
}
tracing_config {
mode = "Active"
Expand Down Expand Up @@ -531,7 +531,7 @@ resource "aws_lambda_function" "terraform_lambda_func_ppud_email_report_prod" {
reserved_concurrent_executions = 5
# code_signing_config_arn = "arn:aws:lambda:eu-west-2:${local.environment_management.account_ids["ppud-production"]}:code-signing-config:csc-0bafee04a642a41c1"
dead_letter_config {
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
}
tracing_config {
mode = "Active"
Expand Down Expand Up @@ -687,7 +687,7 @@ resource "aws_lambda_function" "terraform_lambda_func_send_memory_graph_prod" {
reserved_concurrent_executions = 5
# code_signing_config_arn = "arn:aws:lambda:eu-west-2:${local.environment_management.account_ids["ppud-production"]}:code-signing-config:csc-0bafee04a642a41c1"
dead_letter_config {
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
}
tracing_config {
mode = "Active"
Expand Down Expand Up @@ -739,7 +739,7 @@ resource "aws_lambda_function" "terraform_lambda_func_disk_info_report_prod" {
reserved_concurrent_executions = 5
# code_signing_config_arn = "arn:aws:lambda:eu-west-2:${local.environment_management.account_ids["ppud-production"]}:code-signing-config:csc-0bafee04a642a41c1"
dead_letter_config {
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
}
tracing_config {
mode = "Active"
Expand Down Expand Up @@ -791,7 +791,7 @@ resource "aws_lambda_function" "terraform_lambda_func_disk_read_write_report_pro
reserved_concurrent_executions = 5
# code_signing_config_arn = "arn:aws:lambda:eu-west-2:${local.environment_management.account_ids["ppud-production"]}:code-signing-config:csc-0bafee04a642a41c1"
dead_letter_config {
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
target_arn = aws_sqs_queue.lambda_queue_prod[0].arn
}
tracing_config {
mode = "Active"
Expand Down
6 changes: 3 additions & 3 deletions terraform/environments/tribunals/asg-shared.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ resource "aws_instance" "tribunals_backup" {
}

tags = {
Environment = local.environment
Name = "tribunals-backup-instance"
Role = "Backup"
Environment = local.environment
Name = "tribunals-backup-instance"
Role = "Backup"
}
}

Expand Down
4 changes: 2 additions & 2 deletions terraform/environments/tribunals/load_balancer.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ resource "aws_lb_target_group_attachment" "tribunals_target_group_attachment" {
for_each = aws_lb_target_group.tribunals_target_group
target_group_arn = each.value.arn
# target_id points to primary ec2 instance, change "primary_instance" to "backup_instance" in order to point at backup ec2 instance
target_id = data.aws_instances.primary_instance.ids[0]
port = each.value.port
target_id = data.aws_instances.primary_instance.ids[0]
port = each.value.port
}

resource "aws_lb_listener" "tribunals_lb" {
Expand Down
4 changes: 2 additions & 2 deletions terraform/environments/tribunals/load_balancer_sftp.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ resource "aws_lb_target_group_attachment" "tribunals_target_group_attachment_sft
for_each = aws_lb_target_group.tribunals_target_group_sftp
target_group_arn = each.value.arn
# target_id points to primary ec2 instance, change "primary_instance" to "backup_instance" in order to point at backup ec2 instance
target_id = data.aws_instances.primary_instance.ids[0]
port = each.value.port
target_id = data.aws_instances.primary_instance.ids[0]
port = each.value.port
}
Loading