refactor: streamline variable declarations in mpc-party and mpc-network-consumer modules

Signed-off-by: Ghislain Cheng <ghislain.cheng@zama.ai>

Author: maxnovawind

examples/mpc-network-consumer/main.tf

@@ -4,10 +4,6 @@
 module "vpc_endpoint_consumer" {
   source = "git::https://github.com/zama-ai/terraform-mpc-modules.git//modules/vpc-endpoint-consumer?ref=v0.1.7"
 
-  # Network environment configuration
-  network_environment      = var.network_environment
-  enable_region_validation = var.enable_region_validation
-
   # Partner services configuration
   party_services = var.party_services
 
@@ -18,7 +14,6 @@ module "vpc_endpoint_consumer" {
   security_group_ids = var.security_group_ids
 
   # VPC Interface Endpoint configuration
-  endpoint_policy     = null
   private_dns_enabled = var.private_dns_enabled
   route_table_ids     = []
 

examples/mpc-network-consumer/terraform.tfvars.example

@@ -1,9 +1,5 @@
 # AWS Configuration
-aws_region         = "eu-west-1"
-enable_region_validation = false
-
-# Network Environment Configuration
-network_environment = "testnet"
+aws_region = "eu-west-1"
 
 # Cluster Configuration
 cluster_name = "zws-dev"

examples/mpc-network-consumer/variables.tf

@@ -1,15 +1,3 @@
-# Network Environment Configuration
-variable "network_environment" {
-  description = "MPC network environment that determines region constraints"
-  type        = string
-  default     = "testnet"
-
-  validation {
-    condition     = contains(["testnet", "mainnet"], var.network_environment)
-    error_message = "Network environment must be either 'testnet' or 'mainnet'."
-  }
-}
-
 variable "aws_region" {
   description = "AWS region where resources will be created"
   type        = string
@@ -22,12 +10,6 @@ variable "aws_profile" {
   default     = "token-zws-dev"
 }
 
-variable "enable_region_validation" {
-  type        = bool
-  description = "Whether to enable region validation"
-  default     = true
-}
-
 # MPC Cluster Configuration
 variable "cluster_name" {
   description = "Name of the MPC cluster"

examples/mpc-party/main.tf

@@ -7,8 +7,7 @@ module "mpc_party" {
   source = "git::https://github.com/zama-ai/terraform-mpc-modules.git//modules/mpc-party?ref=v0.1.7"
 
   # Network environment configuration
-  network_environment      = var.network_environment
-  enable_region_validation = var.enable_region_validation
+  network_environment = var.network_environment
 
   # Party configuration
   party_id      = var.party_id
@@ -77,33 +76,24 @@ module "mpc_party" {
   nitro_enclaves_override_memory_mib = var.nitro_enclaves_override_memory_mib
 
   # RDS Configuration
-  enable_rds                                = var.enable_rds
-  rds_db_name                               = var.rds_db_name
-  rds_create_monitoring_role                = var.rds_create_monitoring_role
-  rds_manage_master_user_password           = var.rds_manage_master_user_password
-  rds_username                              = var.rds_username
-  rds_engine                                = var.rds_engine
-  rds_engine_version                        = var.rds_engine_version
-  rds_instance_class                        = var.rds_instance_class
-  rds_allocated_storage                     = var.rds_allocated_storage
-  rds_max_allocated_storage                 = var.rds_max_allocated_storage
-  rds_multi_az                              = var.rds_multi_az
-  rds_backup_retention_period               = var.rds_backup_retention_period
-  rds_maintenance_window                    = var.rds_maintenance_window
-  rds_monitoring_interval                   = var.rds_monitoring_interval
-  rds_monitoring_role_arn                   = var.rds_monitoring_role_arn
-  rds_performance_insights_enabled          = var.rds_performance_insights_enabled
-  rds_performance_insights_kms_key_id       = var.rds_performance_insights_kms_key_id
-  rds_performance_insights_retention_period = var.rds_performance_insights_retention_period
-  rds_blue_green_update_enabled             = var.rds_blue_green_update_enabled
-  rds_parameters                            = var.rds_parameters
-  rds_snapshot_identifier                   = var.rds_snapshot_identifier
-  rds_final_snapshot_enabled                = var.rds_final_snapshot_enabled
-  rds_k8s_secret_name                       = var.rds_k8s_secret_name
-  rds_k8s_secret_namespace                  = var.rds_k8s_secret_namespace
-  rds_allowed_cidr_blocks                   = var.rds_allowed_cidr_blocks
-  rds_vpc_id                                = var.rds_vpc_id
-  rds_deletion_protection                   = var.rds_deletion_protection
+  enable_rds                  = var.enable_rds
+  rds_db_name                 = var.rds_db_name
+  rds_create_monitoring_role  = var.rds_create_monitoring_role
+  rds_username                = var.rds_username
+  rds_engine                  = var.rds_engine
+  rds_engine_version          = var.rds_engine_version
+  rds_instance_class          = var.rds_instance_class
+  rds_allocated_storage       = var.rds_allocated_storage
+  rds_max_allocated_storage   = var.rds_max_allocated_storage
+  rds_multi_az                = var.rds_multi_az
+  rds_backup_retention_period = var.rds_backup_retention_period
+  rds_maintenance_window      = var.rds_maintenance_window
+  rds_monitoring_interval     = var.rds_monitoring_interval
+  rds_monitoring_role_arn     = var.rds_monitoring_role_arn
+  rds_parameters              = var.rds_parameters
+  rds_allowed_cidr_blocks     = var.rds_allowed_cidr_blocks
+  rds_vpc_id                  = var.rds_vpc_id
+  rds_deletion_protection     = var.rds_deletion_protection
 
   # Tagging
   common_tags = merge(var.additional_tags, {

examples/mpc-party/terraform.tfvars.example

@@ -2,8 +2,7 @@
 network_environment = "testnet"
 
 # AWS Configuration
-aws_region               = "eu-west-1"
-enable_region_validation = false
+aws_region = "eu-west-1"
 
 # MPC Party Configuration
 party_id = 1
@@ -37,10 +36,8 @@ additional_tags = {
 
 # RDS Configuration
 enable_rds              = true
-rds_prefix              = "zama" # Use your organization prefix here
 rds_db_name             = "kmsconnector"
 rds_username            = "kmsconnector"
-rds_enable_master_password_rotation = true # To change to 'false' on second apply only (there is a bug when initializing the value to 'false')
 rds_deletion_protection = false # Allow deletion of RDS instance
 
 # Node Group Configuration

examples/mpc-party/variables.tf

@@ -22,12 +22,6 @@ variable "aws_profile" {
   default     = "token-zws-dev"
 }
 
-variable "enable_region_validation" {
-  type        = bool
-  description = "Whether to enable region validation"
-  default     = true
-}
-
 # MPC Party Configuration
 variable "party_id" {
   description = "Party ID for the MPC service"
@@ -286,12 +280,6 @@ variable "rds_username" {
   default     = "kmsconnector"
 }
 
-variable "rds_manage_master_user_password" {
-  description = "Whether to manage the master user password"
-  type        = bool
-  default     = false
-}
-
 variable "rds_engine" {
   description = "Engine for the RDS database"
   type        = string
@@ -358,30 +346,6 @@ variable "rds_monitoring_role_arn" {
   default     = null
 }
 
-variable "rds_performance_insights_enabled" {
-  description = "Whether to enable performance insights for the RDS database"
-  type        = bool
-  default     = false
-}
-
-variable "rds_performance_insights_kms_key_id" {
-  description = "KMS key ID for performance insights"
-  type        = string
-  default     = null
-}
-
-variable "rds_performance_insights_retention_period" {
-  description = "Retention period for performance insights"
-  type        = number
-  default     = 7
-}
-
-variable "rds_blue_green_update_enabled" {
-  description = "Whether to enable blue-green update for the RDS database"
-  type        = bool
-  default     = false
-}
-
 variable "use_eks_cluster_authentication" {
   description = "Whether to use EKS cluster authentication"
   type        = bool
@@ -394,30 +358,6 @@ variable "rds_parameters" {
   default     = []
 }
 
-variable "rds_snapshot_identifier" {
-  description = "Snapshot identifier for the RDS database"
-  type        = string
-  default     = null
-}
-
-variable "rds_final_snapshot_enabled" {
-  description = "Whether to enable final snapshot for the RDS database"
-  type        = bool
-  default     = false
-}
-
-variable "rds_k8s_secret_name" {
-  description = "Name of the Kubernetes secret for the RDS database"
-  type        = string
-  default     = "rds-credentials"
-}
-
-variable "rds_k8s_secret_namespace" {
-  description = "Namespace of the Kubernetes secret for the RDS database"
-  type        = string
-  default     = "mpc-party"
-}
-
 variable "rds_allowed_cidr_blocks" {
   description = "Allowed CIDR blocks for the RDS database"
   type        = list(string)