Skip to content

Commit

Permalink
Merge pull request #1874 from ministryofjustice/date_2023_04_05
Browse files Browse the repository at this point in the history
GitHub Actions Code Formatter workflow
  • Loading branch information
davidkelliott authored Apr 5, 2023
2 parents b96aea8 + 08867ce commit fbde20a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
"rds_multi_az": "false",
"rds_iam_database_authentication_enabled": "false",
"rds_monitoring_interval": "0",
"rds_enabled_cloudwatch_logs_exports": [
"alert",
"audit"
],
"rds_enabled_cloudwatch_logs_exports": ["alert", "audit"],
"rds_performance_insights_enabled": "false",
"rds_skip_final_snapshot": "true",
"rds_apply_immediately": "true"
Expand All @@ -36,4 +33,3 @@
}
}
}

6 changes: 3 additions & 3 deletions terraform/environments/oasys/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ locals {
config = merge(module.baseline_presets.ec2_instance.config.db, {
ami_name = "oasys_oracle_db_*"
})
instance = module.baseline_presets.ec2_instance.instance.default_db
instance = module.baseline_presets.ec2_instance.instance.default_db
autoscaling_schedules = {}
autoscaling_group = module.baseline_presets.ec2_autoscaling_group
user_data_cloud_init = module.baseline_presets.ec2_instance.user_data_cloud_init.ssm_agent_ansible_no_tags
autoscaling_group = module.baseline_presets.ec2_autoscaling_group
user_data_cloud_init = module.baseline_presets.ec2_instance.user_data_cloud_init.ssm_agent_ansible_no_tags
ebs_volumes = {
"/dev/sdb" = { # /u01
size = 100
Expand Down
2 changes: 1 addition & 1 deletion terraform/environments/oasys/locals_development.tf
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ locals {

dev-oasys-db = merge(local.database, {
autoscaling_schedules = module.baseline_presets.ec2_autoscaling_schedules.working_hours
tags = local.database_tags
tags = local.database_tags
})
}

Expand Down
8 changes: 4 additions & 4 deletions terraform/environments/xhibit-portal/importmachine.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ resource "aws_security_group" "importmachine" {

ingress {

description = "from all"
from_port = 0
to_port = 0
protocol = "-1"
description = "from all"
from_port = 0
to_port = 0
protocol = "-1"
security_groups = [aws_security_group.prtg_lb.id]
}

Expand Down

0 comments on commit fbde20a

Please sign in to comment.