handle storage size also

Author: rr0hit

modules/postgres/rds/0.2/facets.yaml

@@ -93,6 +93,7 @@ spec:
               x-ui-placeholder: "Select writer instance type"
           required:
           - instance
+          - allocated_storage
         reader:
           type: object
           title: Reader
@@ -150,14 +151,20 @@ spec:
               minimum: 0
           required:
           - instance
-    storage_type:
-      type: string
-      title: Storage Type
-      description: EBS volume type for database storage
-      default: "gp3"
-      enum:
-        - "gp2"
-        - "gp3"
+        allocated_storage:
+          type: integer
+          title: Allocated Storage
+          description: The allocated storage in gibibytes (GiB)
+          minimum: 20
+          maximum: 65536
+        storage_type:
+          type: string
+          title: Storage Type
+          description: EBS volume type for database storage
+          default: "gp3"
+          enum:
+            - "gp2"
+            - "gp3"
     db_names:
       type: array
       title: Database Names
@@ -233,7 +240,6 @@ spec:
   x-ui-order:
   - postgres_version
   - size
-  - storage_type
   - db_names
   - db_schemas
   - use_snapshot

modules/postgres/rds/0.2/main.tf

@@ -23,8 +23,8 @@ locals {
   user_defined_tags     = lookup(local.metadata, "tags", {})
   tags                  = merge(local.user_defined_tags, var.environment.cloud_tags)
   iops                  = local.storage_type == "gp2" ? null : local.storage_type == "gp3" && local.allocated_storage < 400 ? null : lookup(local.advanced_rds_postgres, "iops", 12000) < 12000 ? 12000 : lookup(local.advanced_rds_postgres, "iops", 12000)
-  allocated_storage     = lookup(local.advanced_rds_postgres, "allocated_storage", 50)
-  storage_type          = lookup(var.instance.spec, "storage_type", lookup(local.advanced_rds_postgres, "storage_type", "gp3"))
+  allocated_storage     = lookup(local.instance_size, "allocated_storage", lookup(local.advanced_rds_postgres, "allocated_storage", 50))
+  storage_type          = lookup(local.instance_size, "storage_type", lookup(local.advanced_rds_postgres, "storage_type", "gp3"))
   max_allocated_storage = lookup(local.advanced_rds_postgres, "max_allocated_storage", 200)
   multi_az              = lookup(local.advanced_rds_postgres, "multi_az", false)
   availability_zone     = local.multi_az ? null : lookup(local.advanced_rds_postgres, "availability_zone", null) == null ? var.inputs.network_details.attributes.legacy_outputs.vpc_details.azs[0] : lookup(local.advanced_rds_postgres, "availability_zone", null)