Merge pull request #32 from bhumi46/testgrid

[MOSIP-42509] Updated postgresql-setup.sh

Author: bhumi46

terraform/base-infra/aws/main.tf

@@ -55,7 +55,7 @@ resource "aws_subnet" "private" {
     Type        = "Private"
     Environment = var.environment
     Project     = var.project_name
-    AZ          = var.availability_zones[count.index % length(var.availability_zones)]  
+    AZ          = var.availability_zones[count.index % length(var.availability_zones)]
   }
 }
 
@@ -229,7 +229,7 @@ resource "aws_instance" "jumpserver" {
     Environment = var.environment
     Project     = var.project_name
   }
-  
+
   depends_on = [aws_internet_gateway.main]
 }
 
@@ -238,7 +238,7 @@ resource "aws_eip" "jumpserver" {
   count    = var.create_jumpserver_eip ? 1 : 0
   domain   = "vpc"
   instance = aws_instance.jumpserver.id
-  
+
   tags = {
     Name        = "${var.jumpserver_name}-eip"
     Environment = var.environment

terraform/base-infra/aws/outputs.tf

@@ -35,43 +35,43 @@ output "jumpserver_security_group_id" {
 output "cloud_specific" {
   description = "AWS-specific outputs"
   value = {
-    vpc_id                = aws_vpc.main.id
-    vpc_cidr              = aws_vpc.main.cidr_block
-    internet_gateway_id   = aws_internet_gateway.main.id
-    nat_gateway_ids       = var.enable_nat_gateway ? aws_nat_gateway.main[*].id : []
-    public_route_table_id = aws_route_table.public.id
+    vpc_id                  = aws_vpc.main.id
+    vpc_cidr                = aws_vpc.main.cidr_block
+    internet_gateway_id     = aws_internet_gateway.main.id
+    nat_gateway_ids         = var.enable_nat_gateway ? aws_nat_gateway.main[*].id : []
+    public_route_table_id   = aws_route_table.public.id
     private_route_table_ids = var.enable_nat_gateway ? aws_route_table.private[*].id : []
-    jumpserver_id         = aws_instance.jumpserver.id
-    jumpserver_public_ip  = var.create_jumpserver_eip ? aws_eip.jumpserver[0].public_ip : aws_instance.jumpserver.public_ip
-    jumpserver_private_ip = aws_instance.jumpserver.private_ip
+    jumpserver_id           = aws_instance.jumpserver.id
+    jumpserver_public_ip    = var.create_jumpserver_eip ? aws_eip.jumpserver[0].public_ip : aws_instance.jumpserver.public_ip
+    jumpserver_private_ip   = aws_instance.jumpserver.private_ip
   }
 }
 
 output "wireguard_info" {
   description = "WireGuard configuration information"
   value = var.enable_wireguard_setup ? {
-    enabled = true
-    peers   = var.wireguard_peers
-    port    = 51820
-    jumpserver_ip = var.create_jumpserver_eip ? aws_eip.jumpserver[0].public_ip : aws_instance.jumpserver.public_ip
+    enabled         = true
+    peers           = var.wireguard_peers
+    port            = 51820
+    jumpserver_ip   = var.create_jumpserver_eip ? aws_eip.jumpserver[0].public_ip : aws_instance.jumpserver.public_ip
     config_location = "/home/ubuntu/wireguard/config"
-    setup_log = "/var/log/jumpserver-setup.log"
-    status_file = "/home/ubuntu/jumpserver-setup-complete.txt"
-    message = "WireGuard setup is enabled and configured"
+    setup_log       = "/var/log/jumpserver-setup.log"
+    status_file     = "/home/ubuntu/jumpserver-setup-complete.txt"
+    message         = "WireGuard setup is enabled and configured"
     helpful_commands = [
       "ssh ubuntu@${var.create_jumpserver_eip ? aws_eip.jumpserver[0].public_ip : aws_instance.jumpserver.public_ip} 'sudo docker logs wireguard'",
       "ssh ubuntu@${var.create_jumpserver_eip ? aws_eip.jumpserver[0].public_ip : aws_instance.jumpserver.public_ip} './get-wireguard-configs.sh'",
       "ssh ubuntu@${var.create_jumpserver_eip ? aws_eip.jumpserver[0].public_ip : aws_instance.jumpserver.public_ip} 'ls /home/ubuntu/wireguard/config/'"
     ]
-  } : {
-    enabled = false
-    peers   = 0
-    port    = 0
-    jumpserver_ip = ""
-    config_location = ""
-    setup_log = ""
-    status_file = ""
-    message = "WireGuard setup is disabled"
+    } : {
+    enabled          = false
+    peers            = 0
+    port             = 0
+    jumpserver_ip    = ""
+    config_location  = ""
+    setup_log        = ""
+    status_file      = ""
+    message          = "WireGuard setup is disabled"
     helpful_commands = []
   }
 }

terraform/base-infra/azure/main.tf

@@ -5,7 +5,7 @@
 # Placeholder resource to prevent module errors
 resource "null_resource" "azure_placeholder" {
   count = 1
-  
+
   provisioner "local-exec" {
     command = "echo 'Azure base infrastructure module - placeholder implementation'"
   }

terraform/base-infra/gcp/main.tf

@@ -5,7 +5,7 @@
 # Placeholder resource to prevent module errors
 resource "null_resource" "gcp_placeholder" {
   count = 1
-  
+
   provisioner "local-exec" {
     command = "echo 'GCP base infrastructure module - placeholder implementation'"
   }

terraform/base-infra/main.tf

@@ -21,10 +21,10 @@ module "aws_network" {
   availability_zones = local.availability_zones
   environment        = var.environment
   project_name       = var.project_name
-  
+
   # MOSIP-specific variables
-  jumpserver_name    = var.jumpserver_name
-  mosip_email_id     = var.mosip_email_id
+  jumpserver_name = var.jumpserver_name
+  mosip_email_id  = var.mosip_email_id
 
   # Jump server variables
   ssh_key_name             = var.ssh_key_name

terraform/base-infra/variables.tf

@@ -3,7 +3,7 @@ variable "cloud_provider" {
   description = "Cloud provider to deploy infrastructure (aws, azure, gcp)"
   type        = string
   default     = "aws"
-  
+
   validation {
     condition     = contains(["aws", "azure", "gcp"], var.cloud_provider)
     error_message = "Valid values for cloud_provider are: aws, azure, gcp"
@@ -170,7 +170,7 @@ variable "region" {
 variable "jumpserver_ami_id" {
   description = "The AMI ID to use for the jump server (required)"
   type        = string
-  
+
   validation {
     condition     = length(var.jumpserver_ami_id) > 0
     error_message = "The jumpserver_ami_id value is required and cannot be empty."

terraform/implementations/aws/observ-infra/aws.tfvars

@@ -37,8 +37,8 @@ nginx_instance_type = "t3a.large"
 # Optional: Exclude specific AZs due to known capacity issues
 # Leave empty for fully dynamic behavior (recommended)
 # Add AZs only if you experience repeated capacity issues
-k8s_capacity_excluded_azs = []     # e.g., ["ap-south-1a"] if needed  
-nginx_capacity_excluded_azs = []   # e.g., ["ap-south-1a"] if needed
+k8s_capacity_excluded_azs   = [] # e.g., ["ap-south-1a"] if needed  
+nginx_capacity_excluded_azs = [] # e.g., ["ap-south-1a"] if needed
 
 # AMI ID (Ubuntu 24.04 LTS in ap-south-1)
 ami = "ami-0ad21ae1d0696ad58"
@@ -50,11 +50,11 @@ zone_id = "Z090954828SJIEL6P5406"
 vpc_name = "mosip-boxes"
 
 # Minimal storage configuration
-nginx_node_root_volume_size   = 20  # Smaller than infra (24)
-nginx_node_ebs_volume_size    = 100 # Smaller than infra (300)
+nginx_node_root_volume_size = 20  # Smaller than infra (24)
+nginx_node_ebs_volume_size  = 100 # Smaller than infra (300)
 # Second EBS volume for PostgreSQL (disabled for observ-infra)
-nginx_node_ebs_volume_size_2  = 0   # Disabled for observability infrastructure
-k8s_instance_root_volume_size = 32  # Smaller than infra (64)
+nginx_node_ebs_volume_size_2  = 0  # Disabled for observability infrastructure
+k8s_instance_root_volume_size = 32 # Smaller than infra (64)
 
 # Subdomains for observability services
 subdomain_public = []
@@ -83,15 +83,15 @@ enable_rancher_import = false
 rancher_import_url    = "\"kubectl apply -f https://rancher.mosip.net/v3/import/dzshvnb6br7qtf267zsrr9xsw6tnb2vt4x68g79r2wzsnfgvkjq2jk_c-m-b5249w76.yaml\""
 
 # Security group CIDRs
-network_cidr   = "10.0.0.0/16"   # Use your actual VPC CIDR
-WIREGUARD_CIDR = "10.0.0.0/24"   # Use your actual WireGuard VPN CIDR
+network_cidr   = "10.0.0.0/16" # Use your actual VPC CIDR
+WIREGUARD_CIDR = "10.0.0.0/24" # Use your actual WireGuard VPN CIDR
 
 # PostgreSQL Configuration (used when second EBS volume is enabled)
 postgresql_version = "15"
-storage_device = "/dev/nvme2n1"
-mount_point = "/srv/postgres"
-postgresql_port = "5433"
+storage_device     = "/dev/nvme2n1"
+mount_point        = "/srv/postgres"
+postgresql_port    = "5433"
 
 # MOSIP Infrastructure Repository Configuration
 mosip_infra_repo_url = "https://github.com/bhumi46/mosip-infra.git"
-mosip_infra_branch = "main"
+mosip_infra_branch   = "main"

terraform/implementations/aws/observ-infra/main.tf

@@ -49,8 +49,8 @@ module "mosip_observ_infra" {
   nginx_node_ebs_volume_size_2  = var.nginx_node_ebs_volume_size_2
   k8s_instance_root_volume_size = var.k8s_instance_root_volume_size
 
-  network_cidr                  = var.network_cidr
-  WIREGUARD_CIDR                = var.WIREGUARD_CIDR
+  network_cidr   = var.network_cidr
+  WIREGUARD_CIDR = var.WIREGUARD_CIDR
 
   # Rancher and Keycloak Configuration (passed through to module)
   enable_rancher_keycloak_integration = var.enable_rancher_keycloak_integration

terraform/implementations/azure/base-infra/azure.tfvars

@@ -39,11 +39,11 @@ private_subnets = ["10.1.10.0/24", "10.1.11.0/24"]
 availability_zones = ["1", "2"]
 
 # Environment metadata
-environment = "dev"
+environment  = "dev"
 project_name = "mosip"
 
 # Azure-specific options
-enable_nat_gateway = false
-single_nat_gateway = true
+enable_nat_gateway   = false
+single_nat_gateway   = true
 enable_dns_hostnames = true
-enable_dns_support = true
+enable_dns_support   = true

terraform/implementations/azure/base-infra/main.tf

@@ -123,20 +123,20 @@ module "base_infrastructure" {
 
   # Resource naming
   jumpserver_name = var.jumpserver_name
-  
+
   # Network configuration
   network_name       = var.network_name
   network_cidr       = var.network_cidr
   public_subnets     = var.public_subnets
   private_subnets    = var.private_subnets
   availability_zones = var.availability_zones
-  
+
   # Jump server configuration
   ssh_key_name             = var.ssh_key_name
   jumpserver_instance_type = var.jumpserver_instance_type
   jumpserver_ami_id        = var.jumpserver_ami_id
   create_jumpserver_eip    = var.create_jumpserver_eip
-  
+
   # Environment metadata
   environment    = var.environment
   project_name   = var.project_name