From d5fdfc4f8938a431889f028f407d71b85f82462c Mon Sep 17 00:00:00 2001
From: Jim Enright <jenright@cloudera.com>
Date: Wed, 13 Mar 2024 14:18:57 +0000
Subject: [PATCH 1/7] Update CDP provider version and add async variables for
 CDP env and DL

Signed-off-by: Jim Enright <jenright@cloudera.com>
---
 .../examples/ex01-minimal_inputs/main.tf        |  2 +-
 .../examples/ex02-existing-vpc/main.tf          |  2 +-
 .../examples/ex03-create-keypair/main.tf        |  2 +-
 modules/terraform-cdp-deploy/README.md          |  4 +++-
 .../examples/ex01-aws-basic/main.tf             |  5 ++++-
 .../examples/ex01-aws-basic/variables.tf        | 15 +++++++++++++++
 .../examples/ex02-azure-basic/main.tf           |  3 +++
 .../examples/ex02-azure-basic/variables.tf      | 15 +++++++++++++++
 .../examples/ex03-gcp-basic/main.tf             |  3 +++
 .../examples/ex03-gcp-basic/variables.tf        | 17 ++++++++++++++++-
 modules/terraform-cdp-deploy/main.tf            |  6 ++++++
 .../modules/aws/provider.tf                     |  2 +-
 .../modules/aws/variables.tf                    | 16 +++++++++++++++-
 .../modules/azure/provider.tf                   |  2 +-
 .../modules/azure/variables.tf                  | 14 ++++++++++++++
 .../terraform-cdp-deploy/modules/gcp/main.tf    |  2 ++
 .../modules/gcp/provider.tf                     |  2 +-
 .../modules/gcp/variables.tf                    | 14 ++++++++++++++
 modules/terraform-cdp-deploy/provider.tf        |  2 +-
 modules/terraform-cdp-deploy/variables.tf       | 16 ++++++++++++++++
 20 files changed, 133 insertions(+), 11 deletions(-)

diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
index c3e8c7c..31931de 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
@@ -38,7 +38,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.4.2"
+      version = "0.5.4"
     }
   }
 }
diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
index a6cc886..cda5257 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
@@ -51,7 +51,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.4.2"
+      version = "0.5.4"
     }
   }
 }
diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
index a198939..345d256 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
@@ -58,7 +58,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.4.2"
+      version = "0.5.4"
     }
   }
 }
diff --git a/modules/terraform-cdp-deploy/README.md b/modules/terraform-cdp-deploy/README.md
index 9934b51..f82c79a 100644
--- a/modules/terraform-cdp-deploy/README.md
+++ b/modules/terraform-cdp-deploy/README.md
@@ -20,7 +20,7 @@ In each directory an example `terraform.tfvars.sample` values file is included t
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
-| <a name="requirement_cdp"></a> [cdp](#requirement\_cdp) | 0.4.2 |
+| <a name="requirement_cdp"></a> [cdp](#requirement\_cdp) | 0.5.4 |
 
 ## Providers
 
@@ -82,6 +82,7 @@ No resources.
 | <a name="input_cdp_admin_group_name"></a> [cdp\_admin\_group\_name](#input\_cdp\_admin\_group\_name) | Name of the CDP IAM Admin Group associated with the environment. Defaults to '<env\_prefix>-cdp-admin-group' if not specified. | `string` | `null` | no |
 | <a name="input_cdp_user_group_name"></a> [cdp\_user\_group\_name](#input\_cdp\_user\_group\_name) | Name of the CDP IAM User Group associated with the environment. Defaults to '<env\_prefix>-cdp-user-group' if not specified. | `string` | `null` | no |
 | <a name="input_cdp_xacccount_credential_name"></a> [cdp\_xacccount\_credential\_name](#input\_cdp\_xacccount\_credential\_name) | Name of the CDP Cross Account Credential. Defaults to '<env\_prefix>-xaccount-cred' if not specified. | `string` | `null` | 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_custom_instance_groups"></a> [datalake\_custom\_instance\_groups](#input\_datalake\_custom\_instance\_groups) | A set of custom instance groups for the datalake. Only applicable for CDP deployment on AWS and GCP. | <pre>list(<br>    object({<br>      name          = string,<br>      instance_type = optional(string)<br>    })<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>  })</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 |
@@ -98,6 +99,7 @@ No resources.
 | <a name="input_encryption_key_url"></a> [encryption\_key\_url](#input\_encryption\_key\_url) | URL of the key which will be used to encrypt the Azure Managed Disks. Only applicable for CDP deployment on Azure. | `string` | `null` | no |
 | <a name="input_endpoint_access_scheme"></a> [endpoint\_access\_scheme](#input\_endpoint\_access\_scheme) | The scheme for the workload endpoint gateway. PUBLIC creates an external endpoint that can be accessed over the Internet. PRIVATE which restricts the traffic to be internal to the VPC / Vnet. Relevant in Private Networks. | `string` | `null` | no |
 | <a name="input_env_tags"></a> [env\_tags](#input\_env\_tags) | Tags applied to provisioned resources | `map(any)` | `null` | no |
+| <a name="input_environment_async_creation"></a> [environment\_async\_creation](#input\_environment\_async\_creation) | Flag to specify if Terraform should wait for CDP environment resource creation/deletion | `bool` | `false` | no |
 | <a name="input_environment_name"></a> [environment\_name](#input\_environment\_name) | Name of the CDP environment. Defaults to '<env\_prefix>-cdp-env' if not specified. | `string` | `null` | no |
 | <a name="input_environment_polling_timeout"></a> [environment\_polling\_timeout](#input\_environment\_polling\_timeout) | Timeout value in minutes for how long to poll for CDP Environment resource creation/deletion | `number` | `60` | no |
 | <a name="input_freeipa_catalog"></a> [freeipa\_catalog](#input\_freeipa\_catalog) | Image catalog to use for FreeIPA image selection | `string` | `null` | no |
diff --git a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
index c6e2080..9a3ef15 100644
--- a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
+++ b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
@@ -50,6 +50,9 @@ module "cdp_deploy" {
   keypair_name        = var.aws_key_pair
   deployment_template = var.deployment_template
 
+  environment_async_creation = var.environment_async_creation
+  datalake_async_creation    = var.datalake_async_creation
+
   # From pre-reqs module output
   aws_vpc_id             = module.cdp_aws_prereqs.aws_vpc_id
   aws_public_subnet_ids  = module.cdp_aws_prereqs.aws_public_subnet_ids
@@ -79,7 +82,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.4.2"
+      version = "0.5.4"
     }
   }
 }
diff --git a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/variables.tf b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/variables.tf
index 7ceaf8f..997a1ff 100644
--- a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/variables.tf
+++ b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/variables.tf
@@ -45,6 +45,21 @@ variable "deployment_template" {
   description = "Deployment Pattern to use for Cloud resources and CDP"
 }
 
+variable "environment_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP environment resource creation/deletion"
+
+  default = false
+}
+
+variable "datalake_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP datalake resource creation/deletion"
+
+  default = false
+}
 # ------- Network Resources -------
 variable "ingress_extra_cidrs_and_ports" {
   type = object({
diff --git a/modules/terraform-cdp-deploy/examples/ex02-azure-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex02-azure-basic/main.tf
index 94109de..37f9d08 100755
--- a/modules/terraform-cdp-deploy/examples/ex02-azure-basic/main.tf
+++ b/modules/terraform-cdp-deploy/examples/ex02-azure-basic/main.tf
@@ -51,6 +51,9 @@ module "cdp_deploy" {
   public_key_text     = var.public_key_text
   deployment_template = var.deployment_template
 
+  environment_async_creation = var.environment_async_creation
+  datalake_async_creation    = var.datalake_async_creation
+
   # From pre-reqs module output
   azure_subscription_id = module.cdp_azure_prereqs.azure_subscription_id
   azure_tenant_id       = module.cdp_azure_prereqs.azure_tenant_id
diff --git a/modules/terraform-cdp-deploy/examples/ex02-azure-basic/variables.tf b/modules/terraform-cdp-deploy/examples/ex02-azure-basic/variables.tf
index 9d2d625..78943cd 100755
--- a/modules/terraform-cdp-deploy/examples/ex02-azure-basic/variables.tf
+++ b/modules/terraform-cdp-deploy/examples/ex02-azure-basic/variables.tf
@@ -36,6 +36,21 @@ variable "deployment_template" {
   description = "Deployment Pattern to use for Cloud resources and CDP"
 }
 
+variable "environment_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP environment resource creation/deletion"
+
+  default = false
+}
+
+variable "datalake_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP datalake resource creation/deletion"
+
+  default = false
+}
 # ------- Network Resources -------
 variable "ingress_extra_cidrs_and_ports" {
   type = object({
diff --git a/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf
index 6f4da50..ce4b04b 100755
--- a/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf
+++ b/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf
@@ -45,6 +45,9 @@ module "cdp_deploy" {
   public_key_text     = var.public_key_text
   deployment_template = var.deployment_template
 
+  environment_async_creation = var.environment_async_creation
+  datalake_async_creation    = var.datalake_async_creation
+
   # From pre-reqs module output
   gcp_network_name     = module.cdp_gcp_prereqs.gcp_vpc_name
   gcp_cdp_subnet_names = module.cdp_gcp_prereqs.gcp_cdp_subnet_names
diff --git a/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/variables.tf b/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/variables.tf
index df2dbe0..27996d9 100755
--- a/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/variables.tf
+++ b/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/variables.tf
@@ -41,7 +41,22 @@ variable "deployment_template" {
   description = "Deployment Pattern to use for Cloud resources and CDP"
 }
 
-# # ------- Network Resources -------
+variable "environment_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP environment resource creation/deletion"
+
+  default = false
+}
+
+variable "datalake_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP datalake resource creation/deletion"
+
+  default = false
+}
+# ------- Network Resources -------
 variable "ingress_extra_cidrs_and_ports" {
   type = object({
     cidrs = list(string)
diff --git a/modules/terraform-cdp-deploy/main.tf b/modules/terraform-cdp-deploy/main.tf
index 18ab762..71bacf3 100644
--- a/modules/terraform-cdp-deploy/main.tf
+++ b/modules/terraform-cdp-deploy/main.tf
@@ -39,7 +39,9 @@ module "cdp_on_aws" {
   workload_analytics     = var.workload_analytics
   endpoint_access_scheme = local.endpoint_access_scheme
 
+  environment_async_creation  = var.environment_async_creation
   environment_polling_timeout = var.environment_polling_timeout
+  datalake_async_creation     = var.datalake_async_creation
   datalake_polling_timeout    = var.datalake_polling_timeout
 
   region            = var.region
@@ -104,7 +106,9 @@ module "cdp_on_azure" {
   workload_analytics     = var.workload_analytics
   endpoint_access_scheme = local.endpoint_access_scheme
 
+  environment_async_creation  = var.environment_async_creation
   environment_polling_timeout = var.environment_polling_timeout
+  datalake_async_creation     = var.datalake_async_creation
   datalake_polling_timeout    = var.datalake_polling_timeout
 
   use_single_resource_group = var.use_single_resource_group
@@ -184,7 +188,9 @@ module "cdp_on_gcp" {
   workload_analytics     = var.workload_analytics
   endpoint_access_scheme = local.endpoint_access_scheme
 
+  environment_async_creation  = var.environment_async_creation
   environment_polling_timeout = var.environment_polling_timeout
+  datalake_async_creation     = var.datalake_async_creation
   datalake_polling_timeout    = var.datalake_polling_timeout
 
   use_public_ips = local.use_public_ips
diff --git a/modules/terraform-cdp-deploy/modules/aws/provider.tf b/modules/terraform-cdp-deploy/modules/aws/provider.tf
index 1f0a70b..53103c0 100644
--- a/modules/terraform-cdp-deploy/modules/aws/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/aws/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.4.2"
+      version = "0.5.4"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/aws/variables.tf b/modules/terraform-cdp-deploy/modules/aws/variables.tf
index c956875..af7f2b0 100644
--- a/modules/terraform-cdp-deploy/modules/aws/variables.tf
+++ b/modules/terraform-cdp-deploy/modules/aws/variables.tf
@@ -71,10 +71,17 @@ variable "multiaz" {
 
 }
 
+variable "environment_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP environment resource creation/deletion"
+
+}
+
 variable "environment_polling_timeout" {
   type = number
 
-  description = " Timeout value in minutes for how long to poll for CDP Environment resource creation/deletion"
+  description = "Timeout value in minutes for how long to poll for CDP Environment resource creation/deletion"
 
 }
 
@@ -201,6 +208,13 @@ variable "datalake_recipes" {
 
 }
 
+variable "datalake_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP datalake resource creation/deletion"
+
+}
+
 variable "datalake_polling_timeout" {
   type = number
 
diff --git a/modules/terraform-cdp-deploy/modules/azure/provider.tf b/modules/terraform-cdp-deploy/modules/azure/provider.tf
index 1f0a70b..53103c0 100644
--- a/modules/terraform-cdp-deploy/modules/azure/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.4.2"
+      version = "0.5.4"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/azure/variables.tf b/modules/terraform-cdp-deploy/modules/azure/variables.tf
index fa7e7c5..74266fc 100644
--- a/modules/terraform-cdp-deploy/modules/azure/variables.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/variables.tf
@@ -64,6 +64,13 @@ variable "enable_raz" {
 
 }
 
+variable "environment_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP environment resource creation/deletion"
+
+}
+
 variable "environment_polling_timeout" {
   type = number
 
@@ -197,6 +204,13 @@ variable "datalake_recipes" {
 
 }
 
+variable "datalake_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP datalake resource creation/deletion"
+
+}
+
 variable "datalake_polling_timeout" {
   type = number
 
diff --git a/modules/terraform-cdp-deploy/modules/gcp/main.tf b/modules/terraform-cdp-deploy/modules/gcp/main.tf
index c6663fa..567dae4 100644
--- a/modules/terraform-cdp-deploy/modules/gcp/main.tf
+++ b/modules/terraform-cdp-deploy/modules/gcp/main.tf
@@ -62,6 +62,7 @@ resource "cdp_environments_gcp_environment" "cdp_env" {
 
 
   polling_options = {
+    async           = var.environment_async_creation
     polling_timeout = var.environment_polling_timeout
   }
 
@@ -136,6 +137,7 @@ resource "cdp_datalake_gcp_datalake" "cdp_datalake" {
   recipes                = null
 
   polling_options = {
+    async           = var.datalake_async_creation
     polling_timeout = var.datalake_polling_timeout
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/gcp/provider.tf b/modules/terraform-cdp-deploy/modules/gcp/provider.tf
index 1f0a70b..53103c0 100644
--- a/modules/terraform-cdp-deploy/modules/gcp/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/gcp/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.4.2"
+      version = "0.5.4"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/gcp/variables.tf b/modules/terraform-cdp-deploy/modules/gcp/variables.tf
index b240262..3823670 100644
--- a/modules/terraform-cdp-deploy/modules/gcp/variables.tf
+++ b/modules/terraform-cdp-deploy/modules/gcp/variables.tf
@@ -64,6 +64,13 @@ variable "report_deployment_logs" {
 
 }
 
+variable "environment_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP environment resource creation/deletion"
+
+}
+
 variable "environment_polling_timeout" {
   type = number
 
@@ -172,6 +179,13 @@ variable "datalake_recipes" {
 
 }
 
+variable "datalake_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP datalake resource creation/deletion"
+
+}
+
 variable "datalake_polling_timeout" {
   type = number
 
diff --git a/modules/terraform-cdp-deploy/provider.tf b/modules/terraform-cdp-deploy/provider.tf
index 1f0a70b..53103c0 100644
--- a/modules/terraform-cdp-deploy/provider.tf
+++ b/modules/terraform-cdp-deploy/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.4.2"
+      version = "0.5.4"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/variables.tf b/modules/terraform-cdp-deploy/variables.tf
index 69ce7f3..eab8612 100644
--- a/modules/terraform-cdp-deploy/variables.tf
+++ b/modules/terraform-cdp-deploy/variables.tf
@@ -106,6 +106,14 @@ variable "enable_raz" {
   default = true
 }
 
+variable "environment_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP environment resource creation/deletion"
+
+  default = false
+}
+
 variable "environment_polling_timeout" {
   type = number
 
@@ -251,6 +259,14 @@ variable "datalake_recipes" {
   default = null
 }
 
+variable "datalake_async_creation" {
+  type = bool
+
+  description = "Flag to specify if Terraform should wait for CDP datalake resource creation/deletion"
+
+  default = false
+}
+
 variable "datalake_polling_timeout" {
   type = number
 

From c7ba3133cbf4161a6830782a2c3e5425a9e0c0fe Mon Sep 17 00:00:00 2001
From: Jim Enright <jenright@cloudera.com>
Date: Wed, 13 Mar 2024 16:16:21 +0000
Subject: [PATCH 2/7] Add async variables for CDP env and DL

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

diff --git a/modules/terraform-cdp-deploy/modules/aws/main.tf b/modules/terraform-cdp-deploy/modules/aws/main.tf
index f61c85f..c4fa606 100644
--- a/modules/terraform-cdp-deploy/modules/aws/main.tf
+++ b/modules/terraform-cdp-deploy/modules/aws/main.tf
@@ -64,6 +64,7 @@ resource "cdp_environments_aws_environment" "cdp_env" {
   encryption_key_arn = var.encryption_key_arn
 
   polling_options = {
+    async           = var.environment_async_creation
     polling_timeout = var.environment_polling_timeout
   }
 
@@ -139,6 +140,7 @@ resource "cdp_datalake_aws_datalake" "cdp_datalake" {
   recipes                = var.datalake_recipes
 
   polling_options = {
+    async           = var.datalake_async_creation
     polling_timeout = var.datalake_polling_timeout
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/azure/main.tf b/modules/terraform-cdp-deploy/modules/azure/main.tf
index c64674f..0e0056a 100644
--- a/modules/terraform-cdp-deploy/modules/azure/main.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/main.tf
@@ -77,6 +77,7 @@ resource "cdp_environments_azure_environment" "cdp_env" {
   encryption_key_url                 = var.encryption_key_url
 
   polling_options = {
+    async           = var.environment_async_creation
     polling_timeout = var.environment_polling_timeout
   }
 
@@ -151,6 +152,7 @@ resource "cdp_datalake_azure_datalake" "cdp_datalake" {
   recipes      = var.datalake_recipes
 
   polling_options = {
+    async           = var.datalake_async_creation
     polling_timeout = var.datalake_polling_timeout
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/gcp/main.tf b/modules/terraform-cdp-deploy/modules/gcp/main.tf
index 567dae4..3a4d0db 100644
--- a/modules/terraform-cdp-deploy/modules/gcp/main.tf
+++ b/modules/terraform-cdp-deploy/modules/gcp/main.tf
@@ -134,7 +134,7 @@ resource "cdp_datalake_gcp_datalake" "cdp_datalake" {
   custom_instance_groups = var.datalake_custom_instance_groups
   image                  = var.datalake_image
   java_version           = var.datalake_java_version
-  recipes                = null
+  recipes                = var.datalake_recipes
 
   polling_options = {
     async           = var.datalake_async_creation

From 289c2b15ef0fa8c1e278adf3be5b468b416ad6f7 Mon Sep 17 00:00:00 2001
From: Jim Enright <jenright@cloudera.com>
Date: Thu, 14 Mar 2024 17:14:53 +0000
Subject: [PATCH 3/7] Update CDP provider version and add encryption_at_host
 parameter

Signed-off-by: Jim Enright <jenright@cloudera.com>
---
 .../examples/ex01-minimal_inputs/main.tf                   | 2 +-
 .../examples/ex02-existing-vpc/main.tf                     | 2 +-
 .../examples/ex03-create-keypair/main.tf                   | 2 +-
 modules/terraform-cdp-deploy/README.md                     | 3 ++-
 .../terraform-cdp-deploy/examples/ex01-aws-basic/main.tf   | 2 +-
 modules/terraform-cdp-deploy/main.tf                       | 1 +
 modules/terraform-cdp-deploy/modules/aws/provider.tf       | 2 +-
 modules/terraform-cdp-deploy/modules/azure/main.tf         | 1 +
 modules/terraform-cdp-deploy/modules/azure/provider.tf     | 2 +-
 modules/terraform-cdp-deploy/modules/azure/variables.tf    | 7 +++++++
 modules/terraform-cdp-deploy/modules/gcp/provider.tf       | 2 +-
 modules/terraform-cdp-deploy/provider.tf                   | 2 +-
 modules/terraform-cdp-deploy/variables.tf                  | 7 +++++++
 13 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
index 31931de..9895a74 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
@@ -38,7 +38,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.4"
+      version = "0.5.5"
     }
   }
 }
diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
index cda5257..80e1150 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
@@ -51,7 +51,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.4"
+      version = "0.5.5"
     }
   }
 }
diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
index 345d256..999392b 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
@@ -58,7 +58,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.4"
+      version = "0.5.5"
     }
   }
 }
diff --git a/modules/terraform-cdp-deploy/README.md b/modules/terraform-cdp-deploy/README.md
index f82c79a..4fe3d56 100644
--- a/modules/terraform-cdp-deploy/README.md
+++ b/modules/terraform-cdp-deploy/README.md
@@ -20,7 +20,7 @@ In each directory an example `terraform.tfvars.sample` values file is included t
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
-| <a name="requirement_cdp"></a> [cdp](#requirement\_cdp) | 0.5.4 |
+| <a name="requirement_cdp"></a> [cdp](#requirement\_cdp) | 0.5.5 |
 
 ## Providers
 
@@ -94,6 +94,7 @@ No resources.
 | <a name="input_enable_ccm_tunnel"></a> [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 |
 | <a name="input_enable_outbound_load_balancer"></a> [enable\_outbound\_load\_balancer](#input\_enable\_outbound\_load\_balancer) | Create outbound load balancers for Azure environments. Only applicable for CDP deployment on Azure. | `bool` | `null` | no |
 | <a name="input_enable_raz"></a> [enable\_raz](#input\_enable\_raz) | Flag to enable Ranger Authorization Service (RAZ) | `bool` | `true` | no |
+| <a name="input_encryption_at_host"></a> [encryption\_at\_host](#input\_encryption\_at\_host) | Provision resources with host encryption enabled. Only applicable for CDP deployment on Azure. | `bool` | `null` | no |
 | <a name="input_encryption_key_arn"></a> [encryption\_key\_arn](#input\_encryption\_key\_arn) | ARN of the AWS KMS CMK to use for the server-side encryption of AWS storage resources. Only applicable for CDP deployment on AWS. | `string` | `null` | no |
 | <a name="input_encryption_key_resource_group_name"></a> [encryption\_key\_resource\_group\_name](#input\_encryption\_key\_resource\_group\_name) | Name of the existing Azure resource group hosting the Azure Key Vault containing customer managed key which will be used to encrypt the Azure Managed Disk. Only applicable for CDP deployment on Azure. | `string` | `null` | no |
 | <a name="input_encryption_key_url"></a> [encryption\_key\_url](#input\_encryption\_key\_url) | URL of the key which will be used to encrypt the Azure Managed Disks. Only applicable for CDP deployment on Azure. | `string` | `null` | no |
diff --git a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
index 9a3ef15..31bc15c 100644
--- a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
+++ b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
@@ -82,7 +82,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.4"
+      version = "0.5.5"
     }
   }
 }
diff --git a/modules/terraform-cdp-deploy/main.tf b/modules/terraform-cdp-deploy/main.tf
index 71bacf3..689f16e 100644
--- a/modules/terraform-cdp-deploy/main.tf
+++ b/modules/terraform-cdp-deploy/main.tf
@@ -148,6 +148,7 @@ module "cdp_on_azure" {
 
   encryption_key_resource_group_name = var.encryption_key_resource_group_name
   encryption_key_url                 = var.encryption_key_url
+  encryption_at_host                 = var.encryption_at_host
 
   azure_aks_private_dns_zone_id      = var.azure_aks_private_dns_zone_id
   azure_database_private_dns_zone_id = var.azure_database_private_dns_zone_id
diff --git a/modules/terraform-cdp-deploy/modules/aws/provider.tf b/modules/terraform-cdp-deploy/modules/aws/provider.tf
index 53103c0..4a32712 100644
--- a/modules/terraform-cdp-deploy/modules/aws/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/aws/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.4"
+      version = "0.5.5"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/azure/main.tf b/modules/terraform-cdp-deploy/modules/azure/main.tf
index 0e0056a..7e69277 100644
--- a/modules/terraform-cdp-deploy/modules/azure/main.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/main.tf
@@ -75,6 +75,7 @@ resource "cdp_environments_azure_environment" "cdp_env" {
   enable_outbound_load_balancer      = var.enable_outbound_load_balancer
   encryption_key_resource_group_name = var.encryption_key_resource_group_name
   encryption_key_url                 = var.encryption_key_url
+  encryption_at_host                 = var.encryption_at_host
 
   polling_options = {
     async           = var.environment_async_creation
diff --git a/modules/terraform-cdp-deploy/modules/azure/provider.tf b/modules/terraform-cdp-deploy/modules/azure/provider.tf
index 53103c0..4a32712 100644
--- a/modules/terraform-cdp-deploy/modules/azure/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.4"
+      version = "0.5.5"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/azure/variables.tf b/modules/terraform-cdp-deploy/modules/azure/variables.tf
index 74266fc..c1f54b6 100644
--- a/modules/terraform-cdp-deploy/modules/azure/variables.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/variables.tf
@@ -142,6 +142,13 @@ variable "encryption_key_url" {
 
 }
 
+variable "encryption_at_host" {
+  type = bool
+
+  description = "Provision resources with host encryption enabled"
+
+}
+
 variable "proxy_config_name" {
   type = string
 
diff --git a/modules/terraform-cdp-deploy/modules/gcp/provider.tf b/modules/terraform-cdp-deploy/modules/gcp/provider.tf
index 53103c0..4a32712 100644
--- a/modules/terraform-cdp-deploy/modules/gcp/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/gcp/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.4"
+      version = "0.5.5"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/provider.tf b/modules/terraform-cdp-deploy/provider.tf
index 53103c0..4a32712 100644
--- a/modules/terraform-cdp-deploy/provider.tf
+++ b/modules/terraform-cdp-deploy/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.4"
+      version = "0.5.5"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/variables.tf b/modules/terraform-cdp-deploy/variables.tf
index eab8612..f10edc6 100644
--- a/modules/terraform-cdp-deploy/variables.tf
+++ b/modules/terraform-cdp-deploy/variables.tf
@@ -330,6 +330,13 @@ variable "encryption_key_url" {
   default = null
 }
 
+variable "encryption_at_host" {
+  type = bool
+
+  description = "Provision resources with host encryption enabled. Only applicable for CDP deployment on Azure."
+
+  default = null
+}
 # ------- Cloud Service Provider Settings - General -------
 variable "region" {
   type        = string

From 4e3606cb8662ab0916d10e006e4804c10ee93fb5 Mon Sep 17 00:00:00 2001
From: Jim Enright <jenright@cloudera.com>
Date: Wed, 3 Apr 2024 12:53:55 +0100
Subject: [PATCH 4/7] Update CDP provider version

Signed-off-by: Jim Enright <jenright@cloudera.com>
---
 .../examples/ex01-minimal_inputs/main.tf                        | 2 +-
 .../examples/ex02-existing-vpc/main.tf                          | 2 +-
 .../examples/ex03-create-keypair/main.tf                        | 2 +-
 modules/terraform-cdp-deploy/README.md                          | 2 +-
 modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf    | 2 +-
 modules/terraform-cdp-deploy/modules/aws/provider.tf            | 2 +-
 modules/terraform-cdp-deploy/modules/azure/provider.tf          | 2 +-
 modules/terraform-cdp-deploy/modules/gcp/provider.tf            | 2 +-
 modules/terraform-cdp-deploy/provider.tf                        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
index 9895a74..0d72600 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
@@ -38,7 +38,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.5"
+      version = "0.5.7"
     }
   }
 }
diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
index 80e1150..2dd3589 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
@@ -51,7 +51,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.5"
+      version = "0.5.7"
     }
   }
 }
diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
index 999392b..a26db20 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
@@ -58,7 +58,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.5"
+      version = "0.5.7"
     }
   }
 }
diff --git a/modules/terraform-cdp-deploy/README.md b/modules/terraform-cdp-deploy/README.md
index 4fe3d56..b11c317 100644
--- a/modules/terraform-cdp-deploy/README.md
+++ b/modules/terraform-cdp-deploy/README.md
@@ -20,7 +20,7 @@ In each directory an example `terraform.tfvars.sample` values file is included t
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
-| <a name="requirement_cdp"></a> [cdp](#requirement\_cdp) | 0.5.5 |
+| <a name="requirement_cdp"></a> [cdp](#requirement\_cdp) | 0.5.7 |
 
 ## Providers
 
diff --git a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
index 31bc15c..44b44c4 100644
--- a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
+++ b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
@@ -82,7 +82,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.5"
+      version = "0.5.7"
     }
   }
 }
diff --git a/modules/terraform-cdp-deploy/modules/aws/provider.tf b/modules/terraform-cdp-deploy/modules/aws/provider.tf
index 4a32712..0ce7711 100644
--- a/modules/terraform-cdp-deploy/modules/aws/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/aws/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.5"
+      version = "0.5.7"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/azure/provider.tf b/modules/terraform-cdp-deploy/modules/azure/provider.tf
index 4a32712..0ce7711 100644
--- a/modules/terraform-cdp-deploy/modules/azure/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.5"
+      version = "0.5.7"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/gcp/provider.tf b/modules/terraform-cdp-deploy/modules/gcp/provider.tf
index 4a32712..0ce7711 100644
--- a/modules/terraform-cdp-deploy/modules/gcp/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/gcp/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.5"
+      version = "0.5.7"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/provider.tf b/modules/terraform-cdp-deploy/provider.tf
index 4a32712..0ce7711 100644
--- a/modules/terraform-cdp-deploy/provider.tf
+++ b/modules/terraform-cdp-deploy/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.5"
+      version = "0.5.7"
     }
   }
 

From e317746e10cf6b10a0790b07ffdd2e4ed2680e64 Mon Sep 17 00:00:00 2001
From: Jim Enright <jenright@cloudera.com>
Date: Wed, 3 Apr 2024 12:54:29 +0100
Subject: [PATCH 5/7] Add multiaz parameter for Azure

Signed-off-by: Jim Enright <jenright@cloudera.com>
---
 modules/terraform-cdp-deploy/main.tf                    | 1 +
 modules/terraform-cdp-deploy/modules/azure/main.tf      | 2 ++
 modules/terraform-cdp-deploy/modules/azure/variables.tf | 7 +++++++
 modules/terraform-cdp-deploy/variables.tf               | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/terraform-cdp-deploy/main.tf b/modules/terraform-cdp-deploy/main.tf
index 689f16e..cf20c9f 100644
--- a/modules/terraform-cdp-deploy/main.tf
+++ b/modules/terraform-cdp-deploy/main.tf
@@ -102,6 +102,7 @@ module "cdp_on_azure" {
   datalake_version       = var.datalake_version
   enable_ccm_tunnel      = var.enable_ccm_tunnel
   enable_raz             = var.enable_raz
+  multiaz                = var.multiaz
   freeipa_instances      = var.freeipa_instances
   workload_analytics     = var.workload_analytics
   endpoint_access_scheme = local.endpoint_access_scheme
diff --git a/modules/terraform-cdp-deploy/modules/azure/main.tf b/modules/terraform-cdp-deploy/modules/azure/main.tf
index 7e69277..99ece14 100644
--- a/modules/terraform-cdp-deploy/modules/azure/main.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/main.tf
@@ -62,6 +62,7 @@ resource "cdp_environments_azure_environment" "cdp_env" {
 
   freeipa = {
     instance_count_by_group = var.freeipa_instances
+    multi_az                = var.multiaz
     catalog                 = var.freeipa_catalog
     image_id                = var.freeipa_image_id
     instance_type           = var.freeipa_instance_type
@@ -147,6 +148,7 @@ resource "cdp_datalake_azure_datalake" "cdp_datalake" {
   runtime           = var.datalake_version == "latest" ? null : var.datalake_version
   scale             = var.datalake_scale
   enable_ranger_raz = var.enable_raz
+  multi_az          = var.datalake_scale == "LIGHT_DUTY" ? null : var.multiaz
 
   image        = var.datalake_image
   java_version = var.datalake_java_version
diff --git a/modules/terraform-cdp-deploy/modules/azure/variables.tf b/modules/terraform-cdp-deploy/modules/azure/variables.tf
index c1f54b6..9f16076 100644
--- a/modules/terraform-cdp-deploy/modules/azure/variables.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/variables.tf
@@ -64,6 +64,13 @@ variable "enable_raz" {
 
 }
 
+variable "multiaz" {
+  type = bool
+
+  description = "Flag to specify that the FreeIPA and DataLake instances will be deployed across multi-availability zones"
+
+}
+
 variable "environment_async_creation" {
   type = bool
 
diff --git a/modules/terraform-cdp-deploy/variables.tf b/modules/terraform-cdp-deploy/variables.tf
index f10edc6..be74c17 100644
--- a/modules/terraform-cdp-deploy/variables.tf
+++ b/modules/terraform-cdp-deploy/variables.tf
@@ -125,7 +125,7 @@ variable "environment_polling_timeout" {
 variable "multiaz" {
   type = bool
 
-  description = "Flag to specify that the FreeIPA and DataLake instances will be deployed across multi-availability zones. "
+  description = "Flag to specify that the FreeIPA and DataLake instances will be deployed across multi-availability zones."
 
   default = true
 }

From 0d6ace1883b34ff8271a51f371a9cf6d1229df3f Mon Sep 17 00:00:00 2001
From: Jim Enright <jenright@cloudera.com>
Date: Wed, 3 Apr 2024 12:55:46 +0100
Subject: [PATCH 6/7] Update README for cdp-deploy module

Signed-off-by: Jim Enright <jenright@cloudera.com>
---
 modules/terraform-cdp-deploy/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/terraform-cdp-deploy/README.md b/modules/terraform-cdp-deploy/README.md
index b11c317..6b6753f 100644
--- a/modules/terraform-cdp-deploy/README.md
+++ b/modules/terraform-cdp-deploy/README.md
@@ -62,6 +62,7 @@ No resources.
 | <a name="input_aws_vpc_id"></a> [aws\_vpc\_id](#input\_aws\_vpc\_id) | AWS Virtual Private Network ID. Required for CDP deployment on AWS. | `string` | `null` | no |
 | <a name="input_aws_xaccount_role_arn"></a> [aws\_xaccount\_role\_arn](#input\_aws\_xaccount\_role\_arn) | Cross Account Role ARN. Required for CDP deployment on AWS. | `string` | `null` | no |
 | <a name="input_azure_aks_private_dns_zone_id"></a> [azure\_aks\_private\_dns\_zone\_id](#input\_azure\_aks\_private\_dns\_zone\_id) | The ID of an existing private DNS zone used for the AKS. | `string` | `null` | no |
+| <a name="input_azure_cdp_flexible_server_delegated_subnet_names"></a> [azure\_cdp\_flexible\_server\_delegated\_subnet\_names](#input\_azure\_cdp\_flexible\_server\_delegated\_subnet\_names) | List of Azure Subnet Names delegated for Private Flexible servers. Required for CDP deployment on Azure. | `list(any)` | `null` | no |
 | <a name="input_azure_cdp_gateway_subnet_names"></a> [azure\_cdp\_gateway\_subnet\_names](#input\_azure\_cdp\_gateway\_subnet\_names) | List of Azure Subnet Names CDP Endpoint Access Gateway. Required for CDP deployment on Azure. | `list(any)` | `null` | no |
 | <a name="input_azure_cdp_subnet_names"></a> [azure\_cdp\_subnet\_names](#input\_azure\_cdp\_subnet\_names) | List of Azure Subnet Names for CDP Resources. Required for CDP deployment on Azure. | `list(any)` | `null` | no |
 | <a name="input_azure_create_private_endpoints"></a> [azure\_create\_private\_endpoints](#input\_azure\_create\_private\_endpoints) | Flag to specify that Azure Postgres will be configured with Private Endpoint and a Private DNS Zone. | `bool` | `null` | no |

From 414eb785b14e6e3d37bd224ca136978135cd2660 Mon Sep 17 00:00:00 2001
From: Jim Enright <jenright@cloudera.com>
Date: Fri, 5 Apr 2024 09:19:59 +0100
Subject: [PATCH 7/7] Update CDP provider version

Signed-off-by: Jim Enright <jenright@cloudera.com>
---
 .../examples/ex01-minimal_inputs/main.tf                        | 2 +-
 .../examples/ex02-existing-vpc/main.tf                          | 2 +-
 .../examples/ex03-create-keypair/main.tf                        | 2 +-
 modules/terraform-cdp-deploy/README.md                          | 2 +-
 modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf    | 2 +-
 modules/terraform-cdp-deploy/modules/aws/provider.tf            | 2 +-
 modules/terraform-cdp-deploy/modules/azure/provider.tf          | 2 +-
 modules/terraform-cdp-deploy/modules/gcp/provider.tf            | 2 +-
 modules/terraform-cdp-deploy/provider.tf                        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
index 0d72600..8572dcb 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex01-minimal_inputs/main.tf
@@ -38,7 +38,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.7"
+      version = "0.5.8"
     }
   }
 }
diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
index 2dd3589..1b48013 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex02-existing-vpc/main.tf
@@ -51,7 +51,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.7"
+      version = "0.5.8"
     }
   }
 }
diff --git a/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf b/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
index a26db20..35c0222 100644
--- a/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
+++ b/modules/terraform-cdp-aws-pre-reqs/examples/ex03-create-keypair/main.tf
@@ -58,7 +58,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.7"
+      version = "0.5.8"
     }
   }
 }
diff --git a/modules/terraform-cdp-deploy/README.md b/modules/terraform-cdp-deploy/README.md
index 6b6753f..384cea7 100644
--- a/modules/terraform-cdp-deploy/README.md
+++ b/modules/terraform-cdp-deploy/README.md
@@ -20,7 +20,7 @@ In each directory an example `terraform.tfvars.sample` values file is included t
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
-| <a name="requirement_cdp"></a> [cdp](#requirement\_cdp) | 0.5.7 |
+| <a name="requirement_cdp"></a> [cdp](#requirement\_cdp) | 0.5.8 |
 
 ## Providers
 
diff --git a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
index 44b44c4..62f0319 100644
--- a/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
+++ b/modules/terraform-cdp-deploy/examples/ex01-aws-basic/main.tf
@@ -82,7 +82,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.7"
+      version = "0.5.8"
     }
   }
 }
diff --git a/modules/terraform-cdp-deploy/modules/aws/provider.tf b/modules/terraform-cdp-deploy/modules/aws/provider.tf
index 0ce7711..e4cdd91 100644
--- a/modules/terraform-cdp-deploy/modules/aws/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/aws/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.7"
+      version = "0.5.8"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/azure/provider.tf b/modules/terraform-cdp-deploy/modules/azure/provider.tf
index 0ce7711..e4cdd91 100644
--- a/modules/terraform-cdp-deploy/modules/azure/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/azure/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.7"
+      version = "0.5.8"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/modules/gcp/provider.tf b/modules/terraform-cdp-deploy/modules/gcp/provider.tf
index 0ce7711..e4cdd91 100644
--- a/modules/terraform-cdp-deploy/modules/gcp/provider.tf
+++ b/modules/terraform-cdp-deploy/modules/gcp/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.7"
+      version = "0.5.8"
     }
   }
 
diff --git a/modules/terraform-cdp-deploy/provider.tf b/modules/terraform-cdp-deploy/provider.tf
index 0ce7711..e4cdd91 100644
--- a/modules/terraform-cdp-deploy/provider.tf
+++ b/modules/terraform-cdp-deploy/provider.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     cdp = {
       source  = "cloudera/cdp"
-      version = "0.5.7"
+      version = "0.5.8"
     }
   }