From 9303a62c5a96f2be9377314ca280989fd5005ed2 Mon Sep 17 00:00:00 2001
From: Jim Enright <jenright@cloudera.com>
Date: Mon, 30 Sep 2024 13:18:59 +0100
Subject: [PATCH] Rebase and update catalog_name parameter

Signed-off-by: Jim Enright <jenright@cloudera.com>
---
 modules/terraform-cdp-deploy/README.md                  | 2 +-
 modules/terraform-cdp-deploy/modules/aws/variables.tf   | 2 +-
 modules/terraform-cdp-deploy/modules/azure/variables.tf | 2 +-
 modules/terraform-cdp-deploy/modules/gcp/variables.tf   | 2 +-
 modules/terraform-cdp-deploy/variables.tf               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/terraform-cdp-deploy/README.md b/modules/terraform-cdp-deploy/README.md
index c93c1da..bc63d03 100644
--- a/modules/terraform-cdp-deploy/README.md
+++ b/modules/terraform-cdp-deploy/README.md
@@ -91,7 +91,7 @@ No resources.
 | <a name="input_create_cdp_credential"></a> [create\_cdp\_credential](#input\_create\_cdp\_credential) | Flag to specify if the CDP Cross Account Credential should be created. If set to false then cdp\_xacccount\_credential\_name should be a valid pre-existing credential. | `bool` | `true` | no |
 | <a name="input_datalake_async_creation"></a> [datalake\_async\_creation](#input\_datalake\_async\_creation) | Flag to specify if Terraform should wait for CDP datalake resource creation/deletion | `bool` | `false` | no |
 | <a name="input_datalake_call_failure_threshold"></a> [datalake\_call\_failure\_threshold](#input\_datalake\_call\_failure\_threshold) | Threshold value that specifies how many times should a single CDP Datalake API call failure happen before giving up the polling | `number` | `3` | no |
-| <a name="input_datalake_image"></a> [datalake\_image](#input\_datalake\_image) | The image to use for the datalake. Can only be used when the 'datalake\_version' parameter is set to null. You can use 'catalog' name and/or 'id' for selecting an image. | <pre>object({<br>    id      = optional(string)<br>    catalog = optional(string)<br>  })</pre> | `null` | no |
+| <a name="input_datalake_image"></a> [datalake\_image](#input\_datalake\_image) | The image to use for the datalake. Can only be used when the 'datalake\_version' parameter is set to null. You can use 'catalog' name and/or 'id' for selecting an image. | <pre>object({<br>    id      = optional(string)<br>    catalog = optional(string)<br>    os      = optional(string)<br>  })</pre> | `null` | no |
 | <a name="input_datalake_java_version"></a> [datalake\_java\_version](#input\_datalake\_java\_version) | The Java major version to use on the datalake cluster. | `number` | `null` | no |
 | <a name="input_datalake_name"></a> [datalake\_name](#input\_datalake\_name) | Name of the CDP datalake. Defaults to '<env\_prefix>-<aw\|az\|gc\|>-dl' if not specified. | `string` | `null` | no |
 | <a name="input_datalake_polling_timeout"></a> [datalake\_polling\_timeout](#input\_datalake\_polling\_timeout) | Timeout value in minutes for how long to poll for CDP datalake resource creation/deletion | `number` | `90` | no |
diff --git a/modules/terraform-cdp-deploy/modules/aws/variables.tf b/modules/terraform-cdp-deploy/modules/aws/variables.tf
index ce899bb..609fd5f 100644
--- a/modules/terraform-cdp-deploy/modules/aws/variables.tf
+++ b/modules/terraform-cdp-deploy/modules/aws/variables.tf
@@ -205,7 +205,7 @@ variable "datalake_version" {
 variable "datalake_image" {
   type = object({
     id      = optional(string)
-    catalog = optional(string)
+    catalog_name = optional(string)
     os      = optional(string)
   })
 
diff --git a/modules/terraform-cdp-deploy/modules/azure/variables.tf b/modules/terraform-cdp-deploy/modules/azure/variables.tf
index 0b03a29..d846757 100644
--- a/modules/terraform-cdp-deploy/modules/azure/variables.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/variables.tf
@@ -239,7 +239,7 @@ variable "datalake_version" {
 variable "datalake_image" {
   type = object({
     id      = optional(string)
-    catalog = optional(string)
+    catalog_name = optional(string)
     os      = optional(string)
   })
 
diff --git a/modules/terraform-cdp-deploy/modules/gcp/variables.tf b/modules/terraform-cdp-deploy/modules/gcp/variables.tf
index be517a6..47167e4 100644
--- a/modules/terraform-cdp-deploy/modules/gcp/variables.tf
+++ b/modules/terraform-cdp-deploy/modules/gcp/variables.tf
@@ -171,7 +171,7 @@ variable "datalake_java_version" {
 variable "datalake_image" {
   type = object({
     id      = optional(string)
-    catalog = optional(string)
+    catalog_name = optional(string)
     os      = optional(string)
   })
 
diff --git a/modules/terraform-cdp-deploy/variables.tf b/modules/terraform-cdp-deploy/variables.tf
index 2dcaf0b..4c703df 100644
--- a/modules/terraform-cdp-deploy/variables.tf
+++ b/modules/terraform-cdp-deploy/variables.tf
@@ -270,7 +270,7 @@ variable "endpoint_access_scheme" {
 variable "datalake_image" {
   type = object({
     id      = optional(string)
-    catalog = optional(string)
+    catalog_name = optional(string)
     os      = optional(string)
   })