feat: updated the queue_manager_version input to allow no value to be passed, meaning it will default to the current latest (#81)

Author: shemau

README.md

@@ -86,7 +86,6 @@ module "mq_on_cloud" {
   queue_manager_display_name = "queue-manager"
   queue_manager_name         = "qm"
   queue_manager_size         = "xsmall"
-  queue_manager_version      = "9.4.0_3"
 
   applications = {
     "application" = {
@@ -180,7 +179,7 @@ No resources.
 | <a name="input_queue_manager_location"></a> [queue\_manager\_location](#input\_queue\_manager\_location) | The location in which the queue manager will be deployed. Defaults to using the first location in the created service instance | `string` | `null` | no |
 | <a name="input_queue_manager_name"></a> [queue\_manager\_name](#input\_queue\_manager\_name) | A queue manager name conforming to MQ restrictions. 1 to 48 characters matching regular expression '/^[a-zA-Z0-9.\_]*$/' . | `string` | n/a | yes |
 | <a name="input_queue_manager_size"></a> [queue\_manager\_size](#input\_queue\_manager\_size) | The queue manager deployment sizes. Valid values are `xsmall`, `small`, `medium`, `large` . | `string` | `"xsmall"` | no |
-| <a name="input_queue_manager_version"></a> [queue\_manager\_version](#input\_queue\_manager\_version) | The MQ version of the queue manager. | `string` | n/a | yes |
+| <a name="input_queue_manager_version"></a> [queue\_manager\_version](#input\_queue\_manager\_version) | The MQ version of the queue manager. If null, use the latest available | `string` | `null` | no |
 | <a name="input_region"></a> [region](#input\_region) | The region to provision the MQ on Cloud instance to. | `string` | n/a | yes |
 | <a name="input_resource_group_id"></a> [resource\_group\_id](#input\_resource\_group\_id) | The ID of the resource group to provision the MQ on Cloud instance to. | `string` | n/a | yes |
 | <a name="input_subscription_id"></a> [subscription\_id](#input\_subscription\_id) | An MQ on Cloud subscsription plan id for customers who have purchased a subscription through an IBM sales representative | `string` | `null` | no |

common-dev-assets

@@ -32,7 +32,6 @@ module "mq_on_cloud" {
   queue_manager_display_name = "${var.prefix}-qm-display"
   queue_manager_name         = "${local.prefix}_qm"
   queue_manager_size         = "xsmall"
-  queue_manager_version      = "9.4.0_3"
 
   applications = {
     "app-${local.prefix}" = {

examples/advanced/main.tf

@@ -20,6 +20,8 @@ locals {
   prefix        = local.prefix_split[local.prefix_offest]
 }
 
+# tflint 0.55.1 has an issue https://github.com/terraform-linters/tflint/issues/2243
+# Remove certificate features until it is resolved
 module "mq_on_cloud" {
   source            = "../.."
   resource_group_id = module.resource_group.resource_group_id
@@ -33,7 +35,7 @@ module "mq_on_cloud" {
   queue_manager_display_name = "${var.prefix}-qm-display"
   queue_manager_name         = "${local.prefix}_qm"
   queue_manager_size         = "xsmall"
-  queue_manager_version      = "9.4.0_3"
+  queue_manager_version      = "9.4.1_2" # Pinned to current version
 
   applications = {
     "app-${local.prefix}" = {
@@ -46,17 +48,17 @@ module "mq_on_cloud" {
       email = "user-1@example.com"
     }
   }
-  keystore_certificates = var.keystore_certificate == null ? {} : {
-    "${var.prefix}-ks-cert" = {
-      certificate = var.keystore_certificate
-      label       = "ks_cert_1"
-    }
-  }
-  truststore_certificates = var.truststore_certificate == null ? {} : {
-    "${var.prefix}-ts-cert" = {
-      certificate = var.truststore_certificate
-      label       = "ts_cert_1"
-    }
-  }
+  #keystore_certificates = var.keystore_certificate == null ? {} : {
+  #  "${var.prefix}-ks-cert" = {
+  #    certificate = var.keystore_certificate
+  #    label       = "ks_cert_1"
+  #  }
+  #}
+  #truststore_certificates = var.truststore_certificate == null ? {} : {
+  #  "${var.prefix}-ts-cert" = {
+  #    certificate = var.truststore_certificate
+  #    label       = "ts_cert_1"
+  #  }
+  #}
 
 }

examples/basic/main.tf

@@ -44,16 +44,18 @@ variable "subscription_id" {
   default     = null
 }
 
-variable "keystore_certificate" {
-  type        = string
-  description = "Base64 encoded string containing keystore certificate"
-  default     = null
-  sensitive   = true
-}
-
-variable "truststore_certificate" {
-  type        = string
-  description = "Base64 encoded string containing truststore certificate"
-  default     = null
-  sensitive   = true
-}
+# tflint 0.55.1 has an issue https://github.com/terraform-linters/tflint/issues/2243
+# Remove certificate features until it is resolved
+#variable "keystore_certificate" {
+#  type        = string
+#  description = "Base64 encoded string containing keystore certificate"
+#  default     = null
+#  sensitive   = true
+#}
+
+#variable "truststore_certificate" {
+#  type        = string
+#  default     = null
+#  description = "Base64 encoded string containing truststore certificate"
+#  sensitive   = true
+#}

examples/basic/variables.tf

@@ -50,8 +50,7 @@
             ],
             "configuration" : [
               {
-                "key": "ibmcloud_api_key",
-                "required": true
+                "key": "ibmcloud_api_key"
               },
               {
                 "key": "use_existing_resource_group"
@@ -126,6 +125,9 @@
               {
                 "key": "existing_secrets_manager_crn"
               },
+              {
+                "key": "secrets_manager_endpoint_type"
+              },
               {
                 "key": "existing_secret_group_id"
               },

ibm_catalog.json

@@ -13,7 +13,6 @@ module "queue_manager" {
   name                  = "qm"
   service_instance_crn  = "crn:<...>" # MQ on Cloud deployment instance crn
   size                  = "xsmall"
-  queue_manager_version = "9.4.0_3"
 }
 ```
 
@@ -35,6 +34,7 @@ No modules.
 | Name | Type |
 |------|------|
 | [ibm_mqcloud_queue_manager.mqcloud_queue_manager](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/resources/mqcloud_queue_manager) | resource |
+| [ibm_mqcloud_queue_manager_options.options](https://registry.terraform.io/providers/ibm-cloud/ibm/latest/docs/data-sources/mqcloud_queue_manager_options) | data source |
 
 ### Inputs
 
@@ -43,7 +43,7 @@ No modules.
 | <a name="input_display_name"></a> [display\_name](#input\_display\_name) | A displayable name for the queue manager. | `string` | n/a | yes |
 | <a name="input_location"></a> [location](#input\_location) | The locations in which the queue manager would be deployed. | `string` | n/a | yes |
 | <a name="input_name"></a> [name](#input\_name) | A queue manager name conforming to MQ restrictions. 1 to 48 characters matching regular expression '/^[a-zA-Z0-9.\_]*$/' . | `string` | n/a | yes |
-| <a name="input_queue_manager_version"></a> [queue\_manager\_version](#input\_queue\_manager\_version) | The MQ version of the queue manager. | `string` | `"9.4.0_3"` | no |
+| <a name="input_queue_manager_version"></a> [queue\_manager\_version](#input\_queue\_manager\_version) | The MQ version of the queue manager. If no value set, use the latest available | `string` | `null` | no |
 | <a name="input_service_instance_crn"></a> [service\_instance\_crn](#input\_service\_instance\_crn) | The CRN that uniquely identifies the MQ on Cloud deployment service instance. | `string` | n/a | yes |
 | <a name="input_size"></a> [size](#input\_size) | The queue manager deployment sizes. Valid values are `xsmall`, `small`, `medium`, `large`. | `string` | `"xsmall"` | no |
 

modules/queue-manager/README.md

@@ -10,11 +10,19 @@ locals {
   existing_mq_deployment_guid = length(local.split_deployment_crn) >= 8 ? local.split_deployment_crn[7] : null
 }
 
+data "ibm_mqcloud_queue_manager_options" "options" {
+  service_instance_guid = local.existing_mq_deployment_guid
+}
+
+locals {
+  queue_manager_version = var.queue_manager_version == null ? data.ibm_mqcloud_queue_manager_options.options.latest_version : var.queue_manager_version
+}
+
 resource "ibm_mqcloud_queue_manager" "mqcloud_queue_manager" {
   display_name          = var.display_name
   location              = var.location
   name                  = var.name
   service_instance_guid = local.existing_mq_deployment_guid
   size                  = var.size
-  version               = var.queue_manager_version
+  version               = local.queue_manager_version
 }

modules/queue-manager/main.tf

@@ -19,9 +19,9 @@ variable "name" {
 
 # version is reserved attribute on modules
 variable "queue_manager_version" {
-  description = "The MQ version of the queue manager."
+  description = "The MQ version of the queue manager. If no value set, use the latest available"
   type        = string
-  default     = "9.4.0_3"
+  default     = null
 }
 
 variable "service_instance_crn" {

modules/queue-manager/variables.tf

@@ -154,12 +154,14 @@ data "ibm_mqcloud_truststore_certificate" "root_ca_certificate" {
 
 module "experimental_certificate" {
   source           = "../../modules/experimental-certificate"
+  depends_on       = [module.experimental_connection]
   ibmcloud_api_key = var.ibmcloud_api_key
   href             = data.ibm_mqcloud_truststore_certificate.certificate[0].trust_store[0].href
 }
 
 module "experimental_certificate_root" {
   source           = "../../modules/experimental-certificate"
+  depends_on       = [module.experimental_certificate]
   ibmcloud_api_key = var.ibmcloud_api_key
   href             = data.ibm_mqcloud_truststore_certificate.root_ca_certificate[0].trust_store[0].href
 }