diff --git a/groups/heritage-shared-infrastructure/README.md b/groups/heritage-shared-infrastructure/README.md index 014d71c..3fd7e9d 100644 --- a/groups/heritage-shared-infrastructure/README.md +++ b/groups/heritage-shared-infrastructure/README.md @@ -4,7 +4,6 @@ Hosts the following RDS instances as these are shared across multiple services. * BCD * CHData * CHD -* WCK * CICS * FES @@ -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 diff --git a/groups/heritage-shared-infrastructure/data.tf b/groups/heritage-shared-infrastructure/data.tf index 2ebfeb1..33f3393 100644 --- a/groups/heritage-shared-infrastructure/data.tf +++ b/groups/heritage-shared-infrastructure/data.tf @@ -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 @@ -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" } diff --git a/groups/heritage-shared-infrastructure/locals.tf b/groups/heritage-shared-infrastructure/locals.tf index 8912d16..eb79076 100644 --- a/groups/heritage-shared-infrastructure/locals.tf +++ b/groups/heritage-shared-infrastructure/locals.tf @@ -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 } @@ -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 = { @@ -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([ diff --git a/groups/heritage-shared-infrastructure/profiles/heritage-development-eu-west-2/vars b/groups/heritage-shared-infrastructure/profiles/heritage-development-eu-west-2/vars index 8ca811d..73b63ee 100644 --- a/groups/heritage-shared-infrastructure/profiles/heritage-development-eu-west-2/vars +++ b/groups/heritage-shared-infrastructure/profiles/heritage-development-eu-west-2/vars @@ -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 @@ -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" @@ -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*" ] } @@ -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 * * ? *)" } } @@ -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 = "" } } diff --git a/groups/heritage-shared-infrastructure/profiles/heritage-live-eu-west-2/vars b/groups/heritage-shared-infrastructure/profiles/heritage-live-eu-west-2/vars index 766b600..64660f3 100644 --- a/groups/heritage-shared-infrastructure/profiles/heritage-live-eu-west-2/vars +++ b/groups/heritage-shared-infrastructure/profiles/heritage-live-eu-west-2/vars @@ -119,41 +119,6 @@ rds_databases = { } ] }, - wck = { - instance_class = "db.m5.large" - allocated_storage = 300 - backup_retention_period = 14 - multi_az = true - engine = "oracle-se2" - major_engine_version = "19" - engine_version = "19" - auto_minor_version_upgrade = false - license_model = "license-included" - rds_maintenance_window = "Sat:10:00-Sat:13: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" - }, - ] - } - ] - }, cics = { instance_class = "db.m5.large" allocated_storage = 30 @@ -418,81 +383,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" @@ -600,14 +490,6 @@ rds_ingress_groups = { cics = [ "sgr-cics-asg*", "sgr-windows-workloads-bus-obj-1-server*" - ], - wck = [ - "sgr-ewf-fe-asg*", - "sgr-ewf-bep-asg*", - "ewf-frontend-tuxedo*", - "sgr-chd-bep-asg*", - "sgr-wck-fe-asg*", - "sgr-wck-bep-asg*" ] } @@ -631,11 +513,6 @@ rds_start_stop_schedule = { rds_schedule_enable = false rds_start_schedule = "" rds_stop_schedule = "" - }, - wck = { - rds_schedule_enable = false - rds_start_schedule = "" - rds_stop_schedule = "" } } @@ -659,10 +536,5 @@ rds_cloudwatch_alarms = { alarm_actions_enabled = true alarm_topic_name = "Email_Alerts" alarm_topic_name_ooh = "Phonecall_Alerts" - }, - wck = { - alarm_actions_enabled = true - alarm_topic_name = "Email_Alerts" - alarm_topic_name_ooh = "Phonecall_Alerts" } } diff --git a/groups/heritage-shared-infrastructure/profiles/heritage-staging-eu-west-2/vars b/groups/heritage-shared-infrastructure/profiles/heritage-staging-eu-west-2/vars index 1afee94..7eb9b83 100644 --- a/groups/heritage-shared-infrastructure/profiles/heritage-staging-eu-west-2/vars +++ b/groups/heritage-shared-infrastructure/profiles/heritage-staging-eu-west-2/vars @@ -118,41 +118,6 @@ rds_databases = { }, ] }, - wck = { - instance_class = "db.m5.large" - allocated_storage = 30 - backup_retention_period = 2 - multi_az = false - engine = "oracle-se2" - major_engine_version = "19" - engine_version = "19" - auto_minor_version_upgrade = false - license_model = "license-included" - rds_maintenance_window = "Wed:00:00-Wed:03: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" - }, - ] - }, - ] - }, cics = { instance_class = "db.m5.large" allocated_storage = 30 @@ -416,82 +381,7 @@ parameter_group_settings = { name = "workarea_size_policy" 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" @@ -598,14 +488,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*" ] } @@ -629,11 +511,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 * * ? *)" } } @@ -657,10 +534,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 = "" } } diff --git a/groups/sessions/data.tf b/groups/sessions/data.tf index 343d06b..535d779 100644 --- a/groups/sessions/data.tf +++ b/groups/sessions/data.tf @@ -61,20 +61,6 @@ data "aws_security_group" "ceu_bep_asg" { } } -data "aws_security_group" "wck_fe_asg" { - filter { - name = "group-name" - values = ["sgr-wck-fe-asg*"] - } -} - -data "aws_security_group" "wck_bep_asg" { - filter { - name = "group-name" - values = ["sgr-wck-bep-asg*"] - } -} - data "aws_route53_zone" "private_zone" { name = local.internal_fqdn private_zone = true diff --git a/groups/sessions/rds.tf b/groups/sessions/rds.tf index cd27406..ffad401 100644 --- a/groups/sessions/rds.tf +++ b/groups/sessions/rds.tf @@ -71,20 +71,6 @@ module "rds_security_group" { description = "Frontend CHD" source_security_group_id = data.aws_security_group.chd_fe_asg.id }, - { - from_port = 1521 - to_port = 1521 - protocol = "tcp" - description = "Frontend WCK" - source_security_group_id = data.aws_security_group.wck_fe_asg.id - }, - { - from_port = 1521 - to_port = 1521 - protocol = "tcp" - description = "Backend WCK" - source_security_group_id = data.aws_security_group.wck_bep_asg.id - }, ] egress_rules = ["all-all"]