From 21bcb1932e8bb45dafaec87059f12ee0f0bfca03 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Thu, 27 Jul 2023 18:42:23 +0100 Subject: [PATCH] Add outputs for storage containers/buckets to AWS and Azure pre-reqs Signed-off-by: Jim Enright --- modules/terraform-cdp-aws-pre-reqs/README.md | 5 ++- modules/terraform-cdp-aws-pre-reqs/outputs.tf | 18 ++++++++++ .../terraform-cdp-azure-pre-reqs/README.md | 6 ++++ .../terraform-cdp-azure-pre-reqs/outputs.tf | 36 +++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/modules/terraform-cdp-aws-pre-reqs/README.md b/modules/terraform-cdp-aws-pre-reqs/README.md index a4193dc..54f509b 100644 --- a/modules/terraform-cdp-aws-pre-reqs/README.md +++ b/modules/terraform-cdp-aws-pre-reqs/README.md @@ -77,7 +77,6 @@ In each directory an example `terraform.tfvars.sample` values file is included t | [aws_iam_role_policy_attachment.cdp_xaccount_role_attach](https://registry.terraform.io/providers/hashicorp/aws/4.67.0/docs/resources/iam_role_policy_attachment) | resource | | [aws_s3_bucket.cdp_storage_locations](https://registry.terraform.io/providers/hashicorp/aws/4.67.0/docs/resources/s3_bucket) | resource | | [aws_s3_object.cdp_backup_storage_object](https://registry.terraform.io/providers/hashicorp/aws/4.67.0/docs/resources/s3_object) | resource | -| [aws_s3_object.cdp_data_storage_object](https://registry.terraform.io/providers/hashicorp/aws/4.67.0/docs/resources/s3_object) | resource | | [aws_s3_object.cdp_log_storage_object](https://registry.terraform.io/providers/hashicorp/aws/4.67.0/docs/resources/s3_object) | resource | | [aws_security_group.cdp_default_sg](https://registry.terraform.io/providers/hashicorp/aws/4.67.0/docs/resources/security_group) | resource | | [aws_security_group.cdp_knox_sg](https://registry.terraform.io/providers/hashicorp/aws/4.67.0/docs/resources/security_group) | resource | @@ -133,6 +132,7 @@ In each directory an example `terraform.tfvars.sample` values file is included t | [datalake\_backup\_policy\_name](#input\_datalake\_backup\_policy\_name) | Datalake backup Data Access Policy Name | `string` | `null` | no | | [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 | +| [enable\_nat\_gateway](#input\_enable\_nat\_gateway) | Enable creation of the NAT Gateways for Private Subnets | `bool` | `false` | no | | [env\_tags](#input\_env\_tags) | Tags applied to provised resources | `map(any)` | `null` | no | | [idbroker\_policy\_name](#input\_idbroker\_policy\_name) | IDBroker Policy name | `string` | `null` | no | | [idbroker\_role\_name](#input\_idbroker\_role\_name) | IDBroker service role Name | `string` | `null` | no | @@ -157,12 +157,15 @@ In each directory an example `terraform.tfvars.sample` values file is included t | Name | Description | |------|-------------| +| [aws\_backup\_storage\_bucket](#output\_aws\_backup\_storage\_bucket) | AWS backup storage bucket | | [aws\_backup\_storage\_location](#output\_aws\_backup\_storage\_location) | AWS backup storage location | +| [aws\_data\_storage\_bucket](#output\_aws\_data\_storage\_bucket) | AWS data storage bucket | | [aws\_data\_storage\_location](#output\_aws\_data\_storage\_location) | AWS data storage location | | [aws\_datalake\_admin\_role\_arn](#output\_aws\_datalake\_admin\_role\_arn) | Datalake Admin role ARN | | [aws\_default\_route\_table\_id](#output\_aws\_default\_route\_table\_id) | AWS default route table ID | | [aws\_idbroker\_instance\_profile\_arn](#output\_aws\_idbroker\_instance\_profile\_arn) | IDBroker instance profile ARN | | [aws\_log\_instance\_profile\_arn](#output\_aws\_log\_instance\_profile\_arn) | Log instance profile ARN | +| [aws\_log\_storage\_bucket](#output\_aws\_log\_storage\_bucket) | AWS log storage bucket | | [aws\_log\_storage\_location](#output\_aws\_log\_storage\_location) | AWS log storage location | | [aws\_private\_route\_table\_ids](#output\_aws\_private\_route\_table\_ids) | AWS private route table IDs | | [aws\_private\_subnet\_ids](#output\_aws\_private\_subnet\_ids) | AWS private subnet IDs | diff --git a/modules/terraform-cdp-aws-pre-reqs/outputs.tf b/modules/terraform-cdp-aws-pre-reqs/outputs.tf index 45f1352..4f7b7fe 100644 --- a/modules/terraform-cdp-aws-pre-reqs/outputs.tf +++ b/modules/terraform-cdp-aws-pre-reqs/outputs.tf @@ -68,18 +68,36 @@ output "aws_vpc_subnets" { description = "List of subnets associated with the CDP VPC" } +output "aws_data_storage_bucket" { + value = "${local.data_storage.data_storage_bucket}${local.storage_suffix}" + + description = "AWS data storage bucket" +} + output "aws_data_storage_location" { value = "s3a://${local.data_storage.data_storage_bucket}${local.storage_suffix}/${local.data_storage.data_storage_object}" description = "AWS data storage location" } +output "aws_log_storage_bucket" { + value = "${local.log_storage.log_storage_bucket}${local.storage_suffix}" + + description = "AWS log storage bucket" +} + output "aws_log_storage_location" { value = "s3a://${local.log_storage.log_storage_bucket}${local.storage_suffix}/${local.log_storage.log_storage_object}" description = "AWS log storage location" } +output "aws_backup_storage_bucket" { + value = "${local.backup_storage.backup_storage_bucket}${local.storage_suffix}" + + description = "AWS backup storage bucket" +} + output "aws_backup_storage_location" { value = "s3a://${local.backup_storage.backup_storage_bucket}${local.storage_suffix}/${local.backup_storage.backup_storage_object}" diff --git a/modules/terraform-cdp-azure-pre-reqs/README.md b/modules/terraform-cdp-azure-pre-reqs/README.md index fe8949f..5b53527 100644 --- a/modules/terraform-cdp-azure-pre-reqs/README.md +++ b/modules/terraform-cdp-azure-pre-reqs/README.md @@ -115,13 +115,19 @@ In each directory an example `terraform.tfvars.sample` values file is included t | Name | Description | |------|-------------| +| [azure\_backup\_storage\_account](#output\_azure\_backup\_storage\_account) | Azure backup storage account name | +| [azure\_backup\_storage\_container](#output\_azure\_backup\_storage\_container) | Azure backup storage container name | | [azure\_backup\_storage\_location](#output\_azure\_backup\_storage\_location) | Azure backup storage location | | [azure\_cdp\_gateway\_subnet\_names](#output\_azure\_cdp\_gateway\_subnet\_names) | Azure Virtual Subnet Names for CDP Endpoint Access Gateway | | [azure\_cdp\_subnet\_names](#output\_azure\_cdp\_subnet\_names) | Azure Virtual Subnet Names for CDP Resources | +| [azure\_data\_storage\_account](#output\_azure\_data\_storage\_account) | Azure data storage account name | +| [azure\_data\_storage\_container](#output\_azure\_data\_storage\_container) | Azure data storage container name | | [azure\_data\_storage\_location](#output\_azure\_data\_storage\_location) | Azure data storage location | | [azure\_datalakeadmin\_identity\_id](#output\_azure\_datalakeadmin\_identity\_id) | Datalake Admin Managed Identity ID | | [azure\_idbroker\_identity\_id](#output\_azure\_idbroker\_identity\_id) | IDBroker Managed Identity ID | | [azure\_log\_identity\_id](#output\_azure\_log\_identity\_id) | Log Data Access Managed Identity ID | +| [azure\_log\_storage\_account](#output\_azure\_log\_storage\_account) | Azure log storage account name | +| [azure\_log\_storage\_container](#output\_azure\_log\_storage\_container) | Azure log storage container name | | [azure\_log\_storage\_location](#output\_azure\_log\_storage\_location) | Azure log storage location | | [azure\_ranger\_audit\_identity\_id](#output\_azure\_ranger\_audit\_identity\_id) | Ranger Audit Managed Identity ID | | [azure\_raz\_identity\_id](#output\_azure\_raz\_identity\_id) | RAZ Managed Identity ID. Value returned if RAZ is enabled | diff --git a/modules/terraform-cdp-azure-pre-reqs/outputs.tf b/modules/terraform-cdp-azure-pre-reqs/outputs.tf index 303c491..80a0b14 100644 --- a/modules/terraform-cdp-azure-pre-reqs/outputs.tf +++ b/modules/terraform-cdp-azure-pre-reqs/outputs.tf @@ -60,6 +60,18 @@ output "azure_security_group_knox_uri" { description = "Azure Knox Security Group URI" } +output "azure_data_storage_account" { + value = azurerm_storage_container.cdp_data_storage.storage_account_name + + description = "Azure data storage account name" +} + +output "azure_data_storage_container" { + value = azurerm_storage_container.cdp_data_storage.name + + description = "Azure data storage container name" +} + output "azure_data_storage_location" { value = "abfs://${azurerm_storage_container.cdp_data_storage.name}@${azurerm_storage_container.cdp_data_storage.storage_account_name}.dfs.core.windows.net" @@ -67,6 +79,18 @@ output "azure_data_storage_location" { } +output "azure_log_storage_account" { + value = azurerm_storage_container.cdp_log_storage.storage_account_name + + description = "Azure log storage account name" +} + +output "azure_log_storage_container" { + value = azurerm_storage_container.cdp_log_storage.name + + description = "Azure log storage container name" +} + output "azure_log_storage_location" { value = "abfs://${azurerm_storage_container.cdp_log_storage.name}@${azurerm_storage_container.cdp_log_storage.storage_account_name}.dfs.core.windows.net" @@ -74,6 +98,18 @@ output "azure_log_storage_location" { } +output "azure_backup_storage_account" { + value = azurerm_storage_container.cdp_backup_storage.storage_account_name + + description = "Azure backup storage account name" +} + +output "azure_backup_storage_container" { + value = azurerm_storage_container.cdp_backup_storage.name + + description = "Azure backup storage container name" +} + output "azure_backup_storage_location" { value = "abfs://${azurerm_storage_container.cdp_backup_storage.name}@${azurerm_storage_container.cdp_backup_storage.storage_account_name}.dfs.core.windows.net"