fix: remove configuration input variable as its not supported by ICD etcd (#41)

Author: akocbek

README.md

@@ -79,7 +79,6 @@ You need the following permissions to run this module.
 | <a name="input_auto_scaling"></a> [auto\_scaling](#input\_auto\_scaling) | Optional rules to allow the database to increase resources in response to usage. Only a single autoscaling block is allowed. Make sure you understand the effects of autoscaling, especially for production environments. See https://cloud.ibm.com/docs/databases-for-etcd?topic=databases-for-etcd-autoscaling in the IBM Cloud Docs. | <pre>object({<br>    disk = object({<br>      capacity_enabled             = optional(bool, false)<br>      free_space_less_than_percent = optional(number, 10)<br>      io_above_percent             = optional(number, 90)<br>      io_enabled                   = optional(bool, false)<br>      io_over_period               = optional(string, "15m")<br>      rate_increase_percent        = optional(number, 10)<br>      rate_limit_mb_per_member     = optional(number, 3670016)<br>      rate_period_seconds          = optional(number, 900)<br>      rate_units                   = optional(string, "mb")<br>    })<br>    memory = object({<br>      io_above_percent         = optional(number, 90)<br>      io_enabled               = optional(bool, false)<br>      io_over_period           = optional(string, "15m")<br>      rate_increase_percent    = optional(number, 10)<br>      rate_limit_mb_per_member = optional(number, 114688)<br>      rate_period_seconds      = optional(number, 900)<br>      rate_units               = optional(string, "mb")<br>    })<br>  })</pre> | `null` | no |
 | <a name="input_backup_encryption_key_crn"></a> [backup\_encryption\_key\_crn](#input\_backup\_encryption\_key\_crn) | The CRN of a Key Protect key, that you want to use for encrypting disk that holds deployment backups. Only used if var.kms\_encryption\_enabled is set to true. If no value passed, the value passed for the 'kms\_key\_crn' variable will be used. BYOK for backups is available only in US regions us-south and us-east, and eu-de. Only keys in the us-south and eu-de are durable to region failures. To ensure that your backups are available even if a region failure occurs, you must use a key from us-south or eu-de. Take note that Hyper Protect Crypto Services for IBM Cloud® Databases backups is not currently supported, so if no value is passed here, but a HPCS value is passed for var.kms\_key\_crn, databases backup encryption will use the default encryption keys. | `string` | `null` | no |
 | <a name="input_cbr_rules"></a> [cbr\_rules](#input\_cbr\_rules) | (Optional, list) List of CBR rules to create | <pre>list(object({<br>    description = string<br>    account_id  = string<br>    rule_contexts = list(object({<br>      attributes = optional(list(object({<br>        name  = string<br>        value = string<br>    }))) }))<br>    enforcement_mode = string<br>  }))</pre> | `[]` | no |
-| <a name="input_configuration"></a> [configuration](#input\_configuration) | Database Configuration | <pre>object({<br>    max_connections            = optional(number)<br>    max_prepared_transactions  = optional(number)<br>    deadlock_timeout           = optional(number)<br>    effective_io_concurrency   = optional(number)<br>    max_replication_slots      = optional(number)<br>    max_wal_senders            = optional(number)<br>    shared_buffers             = optional(number)<br>    synchronous_commit         = optional(string)<br>    wal_level                  = optional(string)<br>    archive_timeout            = optional(number)<br>    log_min_duration_statement = optional(number)<br>  })</pre> | `null` | no |
 | <a name="input_etcd_version"></a> [etcd\_version](#input\_etcd\_version) | Version of the etcd instance to provision. If no value passed, the current ICD preferred version is used. | `string` | `null` | no |
 | <a name="input_existing_kms_instance_guid"></a> [existing\_kms\_instance\_guid](#input\_existing\_kms\_instance\_guid) | The GUID of the Hyper Protect or Key Protect instance in which the key specified in var.kms\_key\_crn and var.backup\_encryption\_key\_crn is coming from. Only required if var.kms\_encryption\_enabled is 'true', var.skip\_iam\_authorization\_policy is 'false', and passing a value for var.kms\_key\_crn and/or var.backup\_encryption\_key\_crn. | `string` | `null` | no |
 | <a name="input_kms_encryption_enabled"></a> [kms\_encryption\_enabled](#input\_kms\_encryption\_enabled) | Set this to true to control the encryption keys used to encrypt the data that you store in IBM Cloud® Databases. If set to false, the data is encrypted by using randomly generated keys. For more info on Key Protect integration, see https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect. For more info on HPCS integration, see https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs | `bool` | `false` | no |

examples/complete/README.md

@@ -5,5 +5,4 @@ An end-to-end example that provisions the following infrastructure:
 - A resource group, if one is not passed in.
 - A Key Protect instance with a root key.
 - An instance of Databases for etcd with BYOK encryption and autoscaling.
-- Set 250 max connection for Databases for etcd instance.
 - Service credentials for the database instance.

examples/complete/main.tf

@@ -42,7 +42,4 @@ module "etcd_db" {
   tags                       = var.resource_tags
   access_tags                = var.access_tags
   service_credential_names   = var.service_credential_names
-  configuration = {
-    max_connections = 250
-  }
 }

main.tf

@@ -40,20 +40,17 @@ resource "ibm_iam_authorization_policy" "policy" {
 
 # Create etcd database
 resource "ibm_database" "etcd_db" {
-  depends_on        = [ibm_iam_authorization_policy.policy]
-  resource_group_id = var.resource_group_id
-  name              = var.name
-  service           = "databases-for-etcd"
-  location          = var.region
-  plan              = "standard" # Only standard plan is available for etcd
-  plan_validation   = var.plan_validation
-  version           = var.etcd_version
-  tags              = var.tags
-  adminpassword     = var.admin_pass
-  service_endpoints = var.service_endpoints
-  # remove elements with null values: see https://github.com/terraform-ibm-modules/terraform-ibm-icd-postgresql/issues/273
-  configuration = var.configuration != null ? jsonencode({ for k, v in var.configuration : k => v if v != null }) : null
-
+  depends_on                = [ibm_iam_authorization_policy.policy]
+  resource_group_id         = var.resource_group_id
+  name                      = var.name
+  service                   = "databases-for-etcd"
+  location                  = var.region
+  plan                      = "standard" # Only standard plan is available for etcd
+  plan_validation           = var.plan_validation
+  version                   = var.etcd_version
+  tags                      = var.tags
+  adminpassword             = var.admin_pass
+  service_endpoints         = var.service_endpoints
   key_protect_key           = var.kms_key_crn
   backup_encryption_key_crn = local.backup_encryption_key_crn
 

module-metadata.json

@@ -41,7 +41,7 @@
       "description": "Optional rules to allow the database to increase resources in response to usage. Only a single autoscaling block is allowed. Make sure you understand the effects of autoscaling, especially for production environments. See https://cloud.ibm.com/docs/databases-for-etcd?topic=databases-for-etcd-autoscaling in the IBM Cloud Docs.",
       "pos": {
         "filename": "variables.tf",
-        "line": 151
+        "line": 133
       }
     },
     "backup_encryption_key_crn": {
@@ -50,7 +50,7 @@
       "description": "The CRN of a Key Protect key, that you want to use for encrypting disk that holds deployment backups. Only used if var.kms_encryption_enabled is set to true. If no value passed, the value passed for the 'kms_key_crn' variable will be used. BYOK for backups is available only in US regions us-south and us-east, and eu-de. Only keys in the us-south and eu-de are durable to region failures. To ensure that your backups are available even if a region failure occurs, you must use a key from us-south or eu-de. Take note that Hyper Protect Crypto Services for IBM Cloud® Databases backups is not currently supported, so if no value is passed here, but a HPCS value is passed for var.kms_key_crn, databases backup encryption will use the default encryption keys.",
       "pos": {
         "filename": "variables.tf",
-        "line": 202
+        "line": 184
       }
     },
     "cbr_rules": {
@@ -67,19 +67,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 228
-      }
-    },
-    "configuration": {
-      "name": "configuration",
-      "type": "object({\n    max_connections            = optional(number)\n    max_prepared_transactions  = optional(number)\n    deadlock_timeout           = optional(number)\n    effective_io_concurrency   = optional(number)\n    max_replication_slots      = optional(number)\n    max_wal_senders            = optional(number)\n    shared_buffers             = optional(number)\n    synchronous_commit         = optional(string)\n    wal_level                  = optional(string)\n    archive_timeout            = optional(number)\n    log_min_duration_statement = optional(number)\n  })",
-      "description": "Database Configuration",
-      "source": [
-        "ibm_database.etcd_db.configuration"
-      ],
-      "pos": {
-        "filename": "variables.tf",
-        "line": 118
+        "line": 210
       }
     },
     "etcd_version": {
@@ -105,7 +93,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 218
+        "line": 200
       },
       "immutable": true,
       "computed": true
@@ -120,7 +108,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 182
+        "line": 164
       }
     },
     "kms_key_crn": {
@@ -132,7 +120,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 188
+        "line": 170
       },
       "immutable": true
     },
@@ -247,7 +235,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 136
+        "line": 118
       }
     },
     "service_endpoints": {
@@ -273,7 +261,7 @@
       "default": false,
       "pos": {
         "filename": "variables.tf",
-        "line": 212
+        "line": 194
       }
     },
     "tags": {
@@ -409,7 +397,6 @@
       "name": "etcd_db",
       "attributes": {
         "adminpassword": "admin_pass",
-        "configuration": "configuration",
         "key_protect_key": "kms_key_crn",
         "location": "region",
         "name": "name",
@@ -456,7 +443,7 @@
       },
       "pos": {
         "filename": "main.tf",
-        "line": 175
+        "line": 172
       }
     },
     "ibm_resource_tag.etcd_tag": {
@@ -472,7 +459,7 @@
       },
       "pos": {
         "filename": "main.tf",
-        "line": 124
+        "line": 121
       }
     }
   },
@@ -492,7 +479,7 @@
       },
       "pos": {
         "filename": "main.tf",
-        "line": 203
+        "line": 200
       }
     }
   },
@@ -571,7 +558,7 @@
       },
       "pos": {
         "filename": "main.tf",
-        "line": 135
+        "line": 132
       }
     }
   }

modules/fscloud/README.md

@@ -36,7 +36,6 @@ No resources.
 | <a name="input_admin_pass"></a> [admin\_pass](#input\_admin\_pass) | The password for the database administrator. If the admin password is null then the admin user ID cannot be accessed. More users can be specified in a user block. The admin password must be in the range of 10-32 characters. | `string` | `null` | no |
 | <a name="input_auto_scaling"></a> [auto\_scaling](#input\_auto\_scaling) | Optional rules to allow the database to increase resources in response to usage. Only a single autoscaling block is allowed. Make sure you understand the effects of autoscaling, especially for production environments. See https://cloud.ibm.com/docs/databases-for-etcd?topic=databases-for-etcd-autoscaling in the IBM Cloud Docs. | <pre>object({<br>    disk = object({<br>      capacity_enabled             = optional(bool, false)<br>      free_space_less_than_percent = optional(number, 10)<br>      io_above_percent             = optional(number, 90)<br>      io_enabled                   = optional(bool, false)<br>      io_over_period               = optional(string, "15m")<br>      rate_increase_percent        = optional(number, 10)<br>      rate_limit_mb_per_member     = optional(number, 3670016)<br>      rate_period_seconds          = optional(number, 900)<br>      rate_units                   = optional(string, "mb")<br>    })<br>    memory = object({<br>      io_above_percent         = optional(number, 90)<br>      io_enabled               = optional(bool, false)<br>      io_over_period           = optional(string, "15m")<br>      rate_increase_percent    = optional(number, 10)<br>      rate_limit_mb_per_member = optional(number, 114688)<br>      rate_period_seconds      = optional(number, 900)<br>      rate_units               = optional(string, "mb")<br>    })<br>  })</pre> | `null` | no |
 | <a name="input_cbr_rules"></a> [cbr\_rules](#input\_cbr\_rules) | (Optional, list) List of CBR rules to create | <pre>list(object({<br>    description = string<br>    account_id  = string<br>    rule_contexts = list(object({<br>      attributes = optional(list(object({<br>        name  = string<br>        value = string<br>    }))) }))<br>    enforcement_mode = string<br>  }))</pre> | `[]` | no |
-| <a name="input_configuration"></a> [configuration](#input\_configuration) | Database Configuration. | <pre>object({<br>    maxmemory                   = optional(number)<br>    maxmemory-policy            = optional(string)<br>    appendonly                  = optional(string)<br>    maxmemory-samples           = optional(number)<br>    stop-writes-on-bgsave-error = optional(string)<br>  })</pre> | `null` | no |
 | <a name="input_etcd_version"></a> [etcd\_version](#input\_etcd\_version) | Version of the etcd instance to provision. If no value passed, the current ICD preferred version is used. | `string` | `null` | no |
 | <a name="input_existing_kms_instance_guid"></a> [existing\_kms\_instance\_guid](#input\_existing\_kms\_instance\_guid) | The GUID of the Hyper Protect Crypto Services instance. | `string` | n/a | yes |
 | <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The root key CRN of the Hyper Protect Crypto Service (HPCS) to use for disk encryption. | `string` | n/a | yes |

modules/fscloud/main.tf

@@ -13,7 +13,6 @@ module "etcd_db" {
   cbr_rules                     = var.cbr_rules
   tags                          = var.tags
   access_tags                   = var.access_tags
-  configuration                 = var.configuration
   members                       = var.members
   member_memory_mb              = var.member_memory_mb
   admin_pass                    = var.admin_pass

modules/fscloud/variables.tf

@@ -24,18 +24,6 @@ variable "region" {
   default     = "us-south"
 }
 
-variable "configuration" {
-  description = "Database Configuration."
-  type = object({
-    maxmemory                   = optional(number)
-    maxmemory-policy            = optional(string)
-    appendonly                  = optional(string)
-    maxmemory-samples           = optional(number)
-    stop-writes-on-bgsave-error = optional(string)
-  })
-  default = null
-}
-
 variable "member_memory_mb" {
   type        = number
   description = "Allocated memory per-member. See the following doc for supported values: https://cloud.ibm.com/docs/databases-for-etcd?topic=databases-for-etcd-resources-scaling"

variables.tf

@@ -115,24 +115,6 @@ variable "access_tags" {
   }
 }
 
-variable "configuration" {
-  description = "Database Configuration"
-  type = object({
-    max_connections            = optional(number)
-    max_prepared_transactions  = optional(number)
-    deadlock_timeout           = optional(number)
-    effective_io_concurrency   = optional(number)
-    max_replication_slots      = optional(number)
-    max_wal_senders            = optional(number)
-    shared_buffers             = optional(number)
-    synchronous_commit         = optional(string)
-    wal_level                  = optional(string)
-    archive_timeout            = optional(number)
-    log_min_duration_statement = optional(number)
-  })
-  default = null
-}
-
 variable "service_credential_names" {
   description = "Map of name, role for service credentials that you want to create for the database"
   type        = map(string)