diff --git a/modules/terraform-cdp-aws-pre-reqs/README.md b/modules/terraform-cdp-aws-pre-reqs/README.md index 39b2585..9281e6e 100644 --- a/modules/terraform-cdp-aws-pre-reqs/README.md +++ b/modules/terraform-cdp-aws-pre-reqs/README.md @@ -17,7 +17,7 @@ | Name | Version | |------|---------| -| [aws](#provider\_aws) | ~> 4.0 | +| [aws](#provider\_aws) | 4.67.0 | | [external](#provider\_external) | 2.3.1 | | [http](#provider\_http) | 3.2.1 | | [local](#provider\_local) | 2.2.3 | @@ -127,6 +127,7 @@ | [datalake\_restore\_policy\_doc](#input\_datalake\_restore\_policy\_doc) | Location of Datalake Restore Data Access Policy | `string` | `null` | no | | [datalake\_restore\_policy\_name](#input\_datalake\_restore\_policy\_name) | Datalake restore Data Access Policy Name | `string` | `null` | no | | [datalake\_scale](#input\_datalake\_scale) | The scale of the datalake. Valid values are LIGHT\_DUTY, MEDIUM\_DUTY\_HA. | `string` | `null` | no | +| [datalake\_version](#input\_datalake\_version) | The Datalake Runtime version. Valid values are semantic versions, e.g. 7.2.16 | `string` | `"7.2.16"` | no | | [deploy\_cdp](#input\_deploy\_cdp) | Deploy the CDP environment as part of Terraform | `bool` | `true` | no | | [enable\_ccm\_tunnel](#input\_enable\_ccm\_tunnel) | Flag to enable Cluster Connectivity Manager tunnel. If false then access from Cloud to CDP Control Plane CIDRs is required from via SG ingress | `bool` | `true` | no | | [enable\_raz](#input\_enable\_raz) | Flag to enable Ranger Authorization Service (RAZ) | `bool` | `true` | no | diff --git a/modules/terraform-cdp-aws-pre-reqs/defaults.tf b/modules/terraform-cdp-aws-pre-reqs/defaults.tf index cb846c0..6a07d12 100644 --- a/modules/terraform-cdp-aws-pre-reqs/defaults.tf +++ b/modules/terraform-cdp-aws-pre-reqs/defaults.tf @@ -159,7 +159,7 @@ locals { datalake_backup_policy_doc_processed = replace( replace( data.http.datalake_backup_policy_doc.response_body, "$${ARN_PARTITION}", "aws"), - "", "${local.backup_storage.backup_storage_bucket}${local.storage_suffix}") + "$${BACKUP_LOCATION_BASE}", "${local.backup_storage.backup_storage_bucket}${local.storage_suffix}") # ...then assign either input or downloaded policy doc to var used in resource datalake_backup_policy_doc = coalesce(var.datalake_backup_policy_doc, local.datalake_backup_policy_doc_processed) @@ -172,7 +172,7 @@ locals { datalake_restore_policy_doc_processed = replace( replace( data.http.datalake_restore_policy_doc.response_body, "$${ARN_PARTITION}", "aws"), - "", "${local.backup_storage.backup_storage_bucket}${local.storage_suffix}") + "$${BACKUP_LOCATION_BASE}", "${local.backup_storage.backup_storage_bucket}${local.storage_suffix}") # ...then assign either input or downloaded policy doc to var used in resource datalake_restore_policy_doc = coalesce(var.datalake_restore_policy_doc, local.datalake_restore_policy_doc_processed) diff --git a/modules/terraform-cdp-aws-pre-reqs/playbook_setup_cdp.yml b/modules/terraform-cdp-aws-pre-reqs/playbook_setup_cdp.yml index d16f2e0..1f2c977 100644 --- a/modules/terraform-cdp-aws-pre-reqs/playbook_setup_cdp.yml +++ b/modules/terraform-cdp-aws-pre-reqs/playbook_setup_cdp.yml @@ -103,6 +103,7 @@ knox_sg: "{{ plat__aws_security_group_knox_id }}" log_location: "{{ plat__aws_log_location }}" log_identity: "{{ plat__aws_log_instance_profile_arn }}" + backup_location: "{{ plat__aws_backup_location }}" public_key_id: "{{ plat__public_key_id }}" workload_analytics: "{{ plat__workload_analytics }}" vpc_id: "{{ plat__aws_vpc_id }}" diff --git a/modules/terraform-cdp-aws-pre-reqs/templates/cdp_config.yml.tpl b/modules/terraform-cdp-aws-pre-reqs/templates/cdp_config.yml.tpl index 15d61a4..db424da 100644 --- a/modules/terraform-cdp-aws-pre-reqs/templates/cdp_config.yml.tpl +++ b/modules/terraform-cdp-aws-pre-reqs/templates/cdp_config.yml.tpl @@ -43,6 +43,7 @@ plat__aws_subnets_for_cdp: ${plat__aws_subnets_for_cdp} plat__aws_storage_location: ${plat__aws_storage_location} plat__aws_log_location: ${plat__aws_log_location} +plat__aws_backup_location: ${plat__aws_backup_location} plat__public_key_id: ${plat__public_key_id} plat__aws_security_group_default_id: ${plat__aws_security_group_default_id}