Skip to content

Commit

Permalink
Remove Webcheck resources
Browse files Browse the repository at this point in the history
  • Loading branch information
marcransome committed Jan 16, 2024
1 parent 782b537 commit 172ed34
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 443 deletions.
2 changes: 0 additions & 2 deletions groups/heritage-shared-infrastructure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Hosts the following RDS instances as these are shared across multiple services.
* BCD
* CHData
* CHD
* WCK
* CICS
* FES

Expand Down Expand Up @@ -58,7 +57,6 @@ Hosts the following RDS instances as these are shared across multiple services.
| [vault_generic_secret.cics_rds](https://registry.terraform.io/providers/hashicorp/vault/latest/docs/data-sources/generic_secret) | data source |
| [vault_generic_secret.fes_rds](https://registry.terraform.io/providers/hashicorp/vault/latest/docs/data-sources/generic_secret) | data source |
| [vault_generic_secret.internal_cidrs](https://registry.terraform.io/providers/hashicorp/vault/latest/docs/data-sources/generic_secret) | data source |
| [vault_generic_secret.wck_rds](https://registry.terraform.io/providers/hashicorp/vault/latest/docs/data-sources/generic_secret) | data source |

## Inputs

Expand Down
13 changes: 0 additions & 13 deletions groups/heritage-shared-infrastructure/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,6 @@ data "aws_security_group" "rds_ingress_cics" {
}
}

data "aws_security_group" "rds_ingress_wck" {
count = length(var.rds_ingress_groups["wck"])
filter {
name = "group-name"
values = [var.rds_ingress_groups["wck"][count.index]]
}
}


data "aws_route53_zone" "private_zone" {
name = local.internal_fqdn
private_zone = true
Expand All @@ -85,10 +76,6 @@ data "vault_generic_secret" "chd_rds" {
path = "applications/${var.aws_profile}/chd/rds"
}

data "vault_generic_secret" "wck_rds" {
path = "applications/${var.aws_profile}/wck/rds"
}

data "vault_generic_secret" "cics_rds" {
path = "applications/${var.aws_profile}/cics/rds"
}
Expand Down
12 changes: 0 additions & 12 deletions groups/heritage-shared-infrastructure/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ locals {
bcd = data.vault_generic_secret.bcd_rds.data
chdata = data.vault_generic_secret.chdata_rds.data
chd = data.vault_generic_secret.chd_rds.data
wck = data.vault_generic_secret.wck_rds.data
cics = data.vault_generic_secret.cics_rds.data
fes = data.vault_generic_secret.fes_rds.data
}
Expand Down Expand Up @@ -52,15 +51,6 @@ locals {
source_security_group_id = sg_data.id
}
])
"wck" = flatten([
for sg_data in data.aws_security_group.rds_ingress_wck : {
from_port = 1521
to_port = 1521
protocol = "tcp"
description = "Access from ${sg_data.tags.Name}"
source_security_group_id = sg_data.id
}
])
}

rds_databases_requiring_app_access = {
Expand All @@ -69,12 +59,10 @@ locals {

chd_dba_dev_ingress_cidrs_list = jsondecode(data.vault_generic_secret.chd_rds.data_json)["dba-dev-cidrs"]
chdata_dba_dev_ingress_cidrs_list = jsondecode(data.vault_generic_secret.chdata_rds.data_json)["dba-dev-cidrs"]
wck_dba_dev_ingress_cidrs_list = jsondecode(data.vault_generic_secret.wck_rds.data_json)["dba-dev-cidrs"]

dba_dev_ingress_instances_map = {
chd = local.chd_dba_dev_ingress_cidrs_list,
chdata = local.chdata_dba_dev_ingress_cidrs_list,
wck = local.wck_dba_dev_ingress_cidrs_list
}

dba_dev_ingress_rules_map = merge([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,44 +130,6 @@ rds_databases = {
}
]
},
wck = {
instance_class = "db.t3.medium"
allocated_storage = 20
backup_retention_period = 2
multi_az = false
engine = "oracle-se2"
major_engine_version = "19"
engine_version = "19"
auto_minor_version_upgrade = true
license_model = "license-included"
rds_maintenance_window = "sun:12:00-sun:15:00"
rds_backup_window = "03:00-06:00"
rds_log_exports = [
"alert",
"audit",
"listener",
"trace"
],
rds_onpremise_access = [
"192.168.90.0/24",
"192.168.70.0/24"
]
rds_app_access = []
per_instance_options = [
{
option_name = "Timezone"
option_settings = [
{
name = "TIME_ZONE"
value = "Europe/London"
},
]
},
{
option_name = "JVM"
}
]
},
cics = {
instance_class = "db.t3.medium"
allocated_storage = 20
Expand Down Expand Up @@ -432,81 +394,6 @@ parameter_group_settings = {
value = "AUTO"
},
],
wck = [
{
name = "aq_tm_processes"
value = "6"
},
{
name = "compatible"
value = "19.0.0"
apply_method = "pending-reboot"
},
{
name = "db_file_multiblock_read_count"
value = "64"
},
{
name = "job_queue_processes"
value = "1000"
},
{
name = "nls_length_semantics"
value = "CHAR"
},
{
name = "open_cursors"
value = "3000"
},
{
name = "parallel_max_servers"
value = "20"
},
{
name = "parallel_min_servers"
value = "10"
},
{
name = "pga_aggregate_limit"
value = "2147483648"
apply_method = "pending-reboot"
},
{
name = "processes"
value = "4400"
apply_method = "pending-reboot"
},
{
name = "remote_dependencies_mode"
value = "SIGNATURE"
},
{
name = "sessions"
value = "6720"
apply_method = "pending-reboot"
},
{
name = "sqlnetora.sqlnet.allowed_logon_version_client"
value = "10"
},
{
name = "sqlnetora.sqlnet.allowed_logon_version_server"
value = "10"
},
{
name = "timed_statistics"
value = "TRUE"
apply_method = "pending-reboot"
},
{
name = "undo_retention"
value = "900"
},
{
name = "workarea_size_policy"
value = "AUTO"
},
],
cics = [
{
name = "aq_tm_processes"
Expand Down Expand Up @@ -609,14 +496,6 @@ rds_ingress_groups = {
],
cics = [
"sgr-cics-asg*"
],
wck = [
"sgr-ewf-fe-asg*",
"sgr-ewf-bep-asg*",
"ewf-frontend-tuxedo*",
"sgr-chd-bep-asg*",
"sgr-wck-fe-asg*",
"sgr-wck-bep-asg*"
]
}

Expand All @@ -640,11 +519,6 @@ rds_start_stop_schedule = {
rds_schedule_enable = true
rds_start_schedule = "cron(0 5 * * ? *)"
rds_stop_schedule = "cron(0 21 * * ? *)"
},
wck = {
rds_schedule_enable = true
rds_start_schedule = "cron(0 5 * * ? *)"
rds_stop_schedule = "cron(0 21 * * ? *)"
}
}

Expand All @@ -668,10 +542,5 @@ rds_cloudwatch_alarms = {
alarm_actions_enabled = false
alarm_topic_name = ""
alarm_topic_name_ooh = ""
},
wck = {
alarm_actions_enabled = false
alarm_topic_name = ""
alarm_topic_name_ooh = ""
}
}
Loading

0 comments on commit 172ed34

Please sign in to comment.