Initial commit

Arunsai14 · Arunsai14 · commit eab9756bd74a · 2025-07-28T17:36:10.000+05:30
diff --git a/examples/cluster/outputs.tf b/examples/cluster/outputs.tf
@@ -1,14 +1,14 @@
-output "redshift_cluster_id" {
+output "cluster_id" {
   description = "The ID of the Redshift cluster"
-  value       = module.redshift.redshift_cluster_id
+  value       = module.redshift.cluster_id
 }
 
-output "redshift_cluster_endpoint" {
+output "cluster_endpoint" {
   description = "The connection endpoint for the Redshift cluster"
-  value       = module.redshift.redshift_cluster_endpoint
+  value       = module.redshift.cluster_endpoint
 }
 
-output "redshift_endpoint" {
+output "endpoint" {
   description = "The endpoint of the Redshift deployment (either cluster or serverless)"
-  value       = module.redshift.redshift_endpoint
+  value       = module.redshift.endpoint
 }
diff --git a/examples/rds-redshift-zero-etl/locals.tf b/examples/rds-redshift-zero-etl/locals.tf
@@ -0,0 +1,41 @@
+locals {
+
+  aurora_mysql_zerotetl_parameters = {
+    aurora_enhanced_binlog = {
+      value        = "1"
+      apply_method = "pending-reboot"
+    }
+    binlog_backup = {
+      value        = "0"
+      apply_method = "pending-reboot"
+    }
+    binlog_format = {
+      value        = "ROW"
+      apply_method = "pending-reboot"
+    }
+    binlog_replication_globaldb = {
+      value        = "0"
+      apply_method = "pending-reboot"
+    }
+    binlog_row_image = {
+      value        = "full"
+      apply_method = "pending-reboot"
+    }
+    binlog_row_metadata = {
+      value        = "full"
+      apply_method = "pending-reboot"
+    }
+    binlog_transaction_compression = {
+      value        = "OFF"
+      apply_method = "pending-reboot"
+    }
+    binlog_row_value_options = {
+      value        = ""
+      apply_method = "pending-reboot"
+    }
+    log_bin_trust_function_creators = {
+      value        = "1"
+      apply_method = "pending-reboot"
+    }
+  }
+}
diff --git a/examples/rds-redshift-zero-etl/main.tf b/examples/rds-redshift-zero-etl/main.tf
@@ -125,7 +125,7 @@ module "redshift" {
 resource "aws_rds_integration" "this" {
   integration_name = "zero-etl-integration-1"
   source_arn       = module.rds.arn
-  target_arn       = module.redshift.redshift_cluster_namespace_arn
+  target_arn       = module.redshift.cluster_namespace_arn
 
   # data_filter = ""
 
@@ -153,50 +153,8 @@ resource "aws_rds_cluster_parameter_group" "mysql_zerotetl" {
 
 }
 
-
-locals {
-
-  aurora_mysql_zerotetl_parameters = {
-    aurora_enhanced_binlog = {
-      value        = "1"
-      apply_method = "pending-reboot"
-    }
-    binlog_backup = {
-      value        = "0"
-      apply_method = "pending-reboot"
-    }
-    binlog_format = {
-      value        = "ROW"
-      apply_method = "pending-reboot"
-    }
-    binlog_replication_globaldb = {
-      value        = "0"
-      apply_method = "pending-reboot"
-    }
-    binlog_row_image = {
-      value        = "full"
-      apply_method = "pending-reboot"
-    }
-    binlog_row_metadata = {
-      value        = "full"
-      apply_method = "pending-reboot"
-    }
-    binlog_transaction_compression = {
-      value        = "OFF"
-      apply_method = "pending-reboot"
-    }
-    binlog_row_value_options = {
-      value        = ""
-      apply_method = "pending-reboot"
-    }
-    log_bin_trust_function_creators = {
-      value        = "1"
-      apply_method = "pending-reboot"
-    }
-  }
-}
 resource "aws_redshift_resource_policy" "account" {
-  resource_arn = module.redshift.redshift_cluster_namespace_arn
+  resource_arn = module.redshift.cluster_namespace_arn
   policy = jsonencode({
     Version = "2012-10-17"
     Statement = [{
@@ -205,7 +163,7 @@ resource "aws_redshift_resource_policy" "account" {
         AWS = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:root"
       }
       Action   = "redshift:CreateInboundIntegration"
-      Resource = module.redshift.redshift_cluster_namespace_arn
+      Resource = module.redshift.cluster_namespace_arn
       Sid      = ""
       },
       {
diff --git a/examples/rds-redshift-zero-etl/outputs.tf b/examples/rds-redshift-zero-etl/outputs.tf
@@ -17,7 +17,7 @@ output "arn" {
 
 
 # Redshift outputs
-output "redshift_cluster_arn" {
+output "cluster_arn" {
   description = "The ARN of the Redshift cluster"
-  value       = module.redshift.redshift_cluster_arn
+  value       = module.redshift.cluster_arn
 }
diff --git a/examples/serverless/outputs.tf b/examples/serverless/outputs.tf
@@ -9,15 +9,15 @@ output "kms_key_id" {
 }
 output "serverless_namespace_id" {
   description = "The ID of the Redshift Serverless namespace"
-  value       = module.redshift_serverless.redshift_serverless_namespace_id
+  value       = module.redshift_serverless.serverless_namespace_id
 }
 
 output "serverless_namespace_arn" {
   description = "The ARN of the Redshift Serverless namespace"
-  value       = module.redshift_serverless.redshift_serverless_namespace_arn
+  value       = module.redshift_serverless.serverless_namespace_arn
 }
 
 output "serverless_workgroup_arn" {
   description = "The ARN of the Redshift Serverless workgroup"
-  value       = module.redshift_serverless.redshift_serverless_workgroup_arn
+  value       = module.redshift_serverless.serverless_workgroup_arn
 }
diff --git a/main.tf b/main.tf
@@ -16,7 +16,6 @@ module "redshift_cluster" {
   cluster_identifier     = var.cluster_identifier
   database_name          = var.database_name
   master_username        = var.master_username
-  master_password        = var.master_password
   manage_user_password   = var.manage_user_password
   create_random_password = var.create_random_password
 
diff --git a/outputs.tf b/outputs.tf
@@ -3,82 +3,72 @@
 ###############################################################################
 
 # Conditional outputs for standard Redshift cluster
-output "redshift_cluster_id" {
+output "cluster_id" {
   description = "The ID of the Redshift cluster"
   value       = var.enable_serverless ? null : try(module.redshift_cluster[0].redshift_cluster_id, null)
 }
 
-output "redshift_cluster_arn" {
+output "cluster_arn" {
   description = "The ARN of the Redshift cluster"
   value       = var.enable_serverless ? null : try(module.redshift_cluster[0].redshift_cluster_arn, null)
 }
-output "redshift_cluster_namespace_arn" {
+output "cluster_namespace_arn" {
   description = "The ARN of the Redshift cluster"
   value       = var.enable_serverless ? null : try(module.redshift_cluster[0].redshift_cluster_namespace_arn, null)
 }
 
-output "redshift_cluster_endpoint" {
+output "cluster_endpoint" {
   description = "The connection endpoint for the Redshift cluster"
   value       = var.enable_serverless ? null : try(module.redshift_cluster[0].redshift_cluster_endpoint, null)
 }
 
-output "redshift_cluster_hostname" {
+output "cluster_hostname" {
   description = "The hostname of the Redshift cluster"
   value       = var.enable_serverless ? null : try(module.redshift_cluster[0].redshift_cluster_hostname, null)
 }
 
-output "redshift_cluster_port" {
+output "cluster_port" {
   description = "The port of the Redshift cluster"
   value       = var.enable_serverless ? null : try(module.redshift_cluster[0].redshift_cluster_port, null)
 }
 
-output "redshift_cluster_database_name" {
+output "cluster_database_name" {
   description = "The name of the default database in the Redshift cluster"
   value       = var.enable_serverless ? null : try(module.redshift_cluster[0].redshift_cluster_database_name, null)
 }
 
-output "redshift_cluster_security_group_id" {
+output "cluster_security_group_id" {
   description = "The ID of the security group associated with the Redshift cluster"
   value       = var.enable_serverless ? null : try(module.redshift_cluster[0].redshift_security_group_id, null)
 }
 
-output "redshift_subnet_group_id" {
-  description = "The ID of the Redshift subnet group"
-  value       = var.enable_serverless ? null : try(module.redshift_cluster[0].redshift_subnet_group_id, null)
-}
-
 # Conditional outputs for Redshift Serverless
-output "redshift_serverless_namespace_id" {
+output "serverless_namespace_id" {
   description = "The ID of the Redshift Serverless namespace"
   value       = var.enable_serverless ? try(module.redshift_serverless[0].redshift_serverless_namespace_id, null) : null
 }
 
-output "redshift_serverless_namespace_arn" {
+output "serverless_namespace_arn" {
   description = "The ARN of the Redshift Serverless namespace"
   value       = var.enable_serverless ? try(module.redshift_serverless[0].redshift_serverless_namespace_arn, null) : null
 }
 
-output "redshift_serverless_workgroup_id" {
+output "serverless_workgroup_id" {
   description = "The ID of the Redshift Serverless workgroup"
   value       = var.enable_serverless ? try(module.redshift_serverless[0].redshift_serverless_workgroup_id, null) : null
 }
 
-output "redshift_serverless_workgroup_arn" {
+output "serverless_workgroup_arn" {
   description = "The ARN of the Redshift Serverless workgroup"
   value       = var.enable_serverless ? try(module.redshift_serverless[0].redshift_serverless_workgroup_arn, null) : null
 }
-output "redshift_serverless_endpoint" {
+output "serverless_endpoint" {
   description = "The endpoint URL for the Redshift Serverless workgroup"
   value       = var.enable_serverless ? try(module.redshift_serverless[0].redshift_serverless_endpoint, null) : null
 }
 
 # Common outputs
-output "redshift_endpoint" {
+output "endpoint" {
   description = "The endpoint of the Redshift deployment (either cluster or serverless)"
   value       = var.enable_serverless ? try(module.redshift_serverless[0].redshift_serverless_endpoint, null) : try(module.redshift_cluster[0].redshift_cluster_endpoint, null)
 }
-
-output "redshift_database_name" {
-  description = "The name of the database in the Redshift deployment"
-  value       = var.database_name
-}
diff --git a/variables.tf b/variables.tf
@@ -98,12 +98,12 @@ variable "additional_security_group_ids" {
   type        = list(string)
   default     = []
 }
-variable "master_password" {
-  description = "Password for the master DB user. If null, a random password will be generated"
-  type        = string
-  sensitive   = true
-  default     = null
-}
+# variable "master_password" {
+#   description = "Password for the master DB user. If null, a random password will be generated"
+#   type        = string
+#   sensitive   = true
+#   default     = null
+# }
 
 variable "manage_user_password" {
   description = "Set to true to allow RDS to manage the master user password in Secrets Manager"

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`		`-output "redshift_cluster_id" {`
	`1`	`+output "cluster_id" {`
`2`	`2`	`description = "The ID of the Redshift cluster"`
`3`		`- value = module.redshift.redshift_cluster_id`
	`3`	`+ value = module.redshift.cluster_id`
`4`	`4`	`}`
`5`	`5`
`6`		`-output "redshift_cluster_endpoint" {`
	`6`	`+output "cluster_endpoint" {`
`7`	`7`	`description = "The connection endpoint for the Redshift cluster"`
`8`		`- value = module.redshift.redshift_cluster_endpoint`
	`8`	`+ value = module.redshift.cluster_endpoint`
`9`	`9`	`}`
`10`	`10`
`11`		`-output "redshift_endpoint" {`
	`11`	`+output "endpoint" {`
`12`	`12`	`description = "The endpoint of the Redshift deployment (either cluster or serverless)"`
`13`		`- value = module.redshift.redshift_endpoint`
	`13`	`+ value = module.redshift.endpoint`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ output "arn" {`
`17`	`17`
`18`	`18`
`19`	`19`	`# Redshift outputs`
`20`		`-output "redshift_cluster_arn" {`
	`20`	`+output "cluster_arn" {`
`21`	`21`	`description = "The ARN of the Redshift cluster"`
`22`		`- value = module.redshift.redshift_cluster_arn`
	`22`	`+ value = module.redshift.cluster_arn`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,15 @@ output "kms_key_id" {`
`9`	`9`	`}`
`10`	`10`	`output "serverless_namespace_id" {`
`11`	`11`	`description = "The ID of the Redshift Serverless namespace"`
`12`		`- value = module.redshift_serverless.redshift_serverless_namespace_id`
	`12`	`+ value = module.redshift_serverless.serverless_namespace_id`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`output "serverless_namespace_arn" {`
`16`	`16`	`description = "The ARN of the Redshift Serverless namespace"`
`17`		`- value = module.redshift_serverless.redshift_serverless_namespace_arn`
	`17`	`+ value = module.redshift_serverless.serverless_namespace_arn`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`output "serverless_workgroup_arn" {`
`21`	`21`	`description = "The ARN of the Redshift Serverless workgroup"`
`22`		`- value = module.redshift_serverless.redshift_serverless_workgroup_arn`
	`22`	`+ value = module.redshift_serverless.serverless_workgroup_arn`
`23`	`23`	`}`