feat(MQSaaS): Add ability to update user and app names (IBM-Cloud#6397)

Signed-off-by: Jess McCreery <[email protected]>

Author: jessm12

examples/ibm-mqcloud/README.md

@@ -1,6 +1,6 @@
-# Examples for MQaaS
+# Examples for MQ SaaS
 
-These examples illustrate how to use the resources and data sources associated with MQaaS.
+These examples illustrate how to use the resources and data sources associated with MQ SaaS.
 
 The following resources are supported:
 * ibm_mqcloud_queue_manager
@@ -33,7 +33,7 @@ $ terraform apply
 
 Run `terraform destroy` when you don't need these resources.
 
-## MQaaS resources
+## MQ SaaS resources
 
 ### Resource: ibm_mqcloud_queue_manager
 
@@ -53,7 +53,7 @@ resource "ibm_mqcloud_queue_manager" "mqcloud_queue_manager_instance" {
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
 | ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | name | A queue manager name conforming to MQ restrictions. | `string` | true |
 | display_name | A displayable name for the queue manager - limited only in length. | `string` | false |
 | location | The locations in which the queue manager could be deployed. | `string` | true |
@@ -89,7 +89,7 @@ resource "ibm_mqcloud_application" "mqcloud_application_instance" {
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
 | ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | name | The name of the application - conforming to MQ rules. | `string` | true |
 
 #### Outputs
@@ -115,7 +115,7 @@ resource "ibm_mqcloud_user" "mqcloud_user_instance" {
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
 | ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | name | The shortname of the user that will be used as the IBM MQ administrator in interactions with a queue manager for this service instance. | `string` | true |
 | email | The email of the user. | `string` | true |
 
@@ -150,7 +150,7 @@ resource "ibm_mqcloud_keystore_certificate" "mqcloud_keystore_certificate_instan
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
 | ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
 | label | The label to use for the certificate to be uploaded. | `string` | true |
 | certificate_file | The filename and path of the certificate to be uploaded. | `base64-encoded string` | true |
@@ -190,7 +190,7 @@ resource "ibm_mqcloud_truststore_certificate" "mqcloud_truststore_certificate_in
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
 | ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
 | label | The label to use for the certificate to be uploaded. | `string` | true |
 | certificate_file | The filename and path of the certificate to be uploaded. | `base64-encoded string` | true |
@@ -227,7 +227,7 @@ resource "ibm_mqcloud_virtual_private_endpoint_gateway" "mqcloud_virtual_private
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
 | ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | trusted_profile | The CRN of the trusted profile to assume for this request. | `string` | false |
 | name | The name of the virtual private endpoint gateway, created by the user. | `string` | true |
 | target_crn | The CRN of the reserved capacity service instance the user is trying to connect to. | `string` | true |
@@ -240,7 +240,7 @@ resource "ibm_mqcloud_virtual_private_endpoint_gateway" "mqcloud_virtual_private
 | status | The lifecycle state of this virtual privage endpoint. |
 | virtual_private_endpoint_gateway_guid | The ID of the virtual private endpoint gateway which was allocated on creation. |
 
-## MQaaS data sources
+## MQ SaaS data sources
 
 ### Data source: ibm_mqcloud_queue_manager_options
 
@@ -254,7 +254,7 @@ data "ibm_mqcloud_queue_manager_options" "mqcloud_queue_manager_options_instance
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 
 #### Outputs
 
@@ -278,7 +278,7 @@ data "ibm_mqcloud_queue_manager" "mqcloud_queue_manager_instance" {
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | name | A queue manager name conforming to MQ restrictions. | `string` | false |
 
 #### Outputs
@@ -300,7 +300,7 @@ data "ibm_mqcloud_queue_manager_status" "mqcloud_queue_manager_status_instance"
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
 
 #### Outputs
@@ -322,7 +322,7 @@ data "ibm_mqcloud_application" "mqcloud_application_instance" {
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | name | The name of the application - conforming to MQ rules. | `string` | false |
 
 #### Outputs
@@ -344,7 +344,7 @@ data "ibm_mqcloud_user" "mqcloud_user_instance" {
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | name | The shortname of the user that will be used as the IBM MQ administrator in interactions with a queue manager for this service instance. | `string` | false |
 
 #### Outputs
@@ -367,7 +367,7 @@ data "ibm_mqcloud_truststore_certificate" "mqcloud_truststore_certificate_instan
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
 | label | Certificate label in queue manager store. | `string` | false |
 
@@ -392,7 +392,7 @@ data "ibm_mqcloud_keystore_certificate" "mqcloud_keystore_certificate_instance"
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
 | label | Certificate label in queue manager store. | `string` | false |
 
@@ -417,7 +417,7 @@ data "ibm_mqcloud_virtual_private_endpoint_gateways" "mqcloud_virtual_private_en
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | trusted_profile | The CRN of the trusted profile to assume for this request. | `string` | false |
 | name | The name of the virtual private endpoint gateway, created by the user. | `string` | false |
 
@@ -441,7 +441,7 @@ data "ibm_mqcloud_virtual_private_endpoint_gateway" "mqcloud_virtual_private_end
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
+| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
 | virtual_private_endpoint_gateway_guid | The id of the virtual private endpoint gateway. | `string` | true |
 | trusted_profile | The CRN of the trusted profile to assume for this request. | `string` | false |
 

examples/ibm-mqcloud/main.tf

@@ -5,24 +5,24 @@ provider "ibm" {
 // Provision mqcloud_queue_manager resource instance
 resource "ibm_mqcloud_queue_manager" "mqcloud_queue_manager_instance" {
   service_instance_guid = var.mqcloud_queue_manager_service_instance_guid
-  name = var.mqcloud_queue_manager_name
-  display_name = var.mqcloud_queue_manager_display_name
-  location = var.mqcloud_queue_manager_location
-  size = var.mqcloud_queue_manager_size
-  version = var.mqcloud_queue_manager_version
+  name                  = var.mqcloud_queue_manager_name
+  display_name          = var.mqcloud_queue_manager_display_name
+  location              = var.mqcloud_queue_manager_location
+  size                  = var.mqcloud_queue_manager_size
+  version               = var.mqcloud_queue_manager_version
 }
 
 // Provision mqcloud_application resource instance
 resource "ibm_mqcloud_application" "mqcloud_application_instance" {
   service_instance_guid = var.mqcloud_application_service_instance_guid
-  name = var.mqcloud_application_name
+  name                  = var.mqcloud_application_name
 }
 
 // Provision mqcloud_user resource instance
 resource "ibm_mqcloud_user" "mqcloud_user_instance" {
   service_instance_guid = var.mqcloud_user_service_instance_guid
-  name = var.mqcloud_user_name
-  email = var.mqcloud_user_email
+  name                  = var.mqcloud_user_name
+  email                 = var.mqcloud_user_email
 }
 
 // Provision mqcloud_keystore_certificate resource instance
@@ -32,8 +32,6 @@ resource "ibm_mqcloud_keystore_certificate" "mqcloud_keystore_certificate_instan
   label                 = var.mqcloud_keystore_certificate_label
   certificate_file      = var.mqcloud_keystore_certificate_certificate_file
 
-  certificate_file      = var.mqcloud_keystore_certificate_certificate_file
-
   config {
     ams {
       channels {
@@ -46,9 +44,9 @@ resource "ibm_mqcloud_keystore_certificate" "mqcloud_keystore_certificate_instan
 // Provision mqcloud_truststore_certificate resource instance
 resource "ibm_mqcloud_truststore_certificate" "mqcloud_truststore_certificate_instance" {
   service_instance_guid = var.mqcloud_truststore_certificate_service_instance_guid
-  queue_manager_id = var.mqcloud_truststore_certificate_queue_manager_id
-  label = var.mqcloud_truststore_certificate_label
-  certificate_file = var.mqcloud_truststore_certificate_certificate_file
+  queue_manager_id      = var.mqcloud_truststore_certificate_queue_manager_id
+  label                 = var.mqcloud_truststore_certificate_label
+  certificate_file      = var.mqcloud_truststore_certificate_certificate_file
 }
 
 // Provision mqcloud_virtual_private_endpoint_gateway resource instance

examples/ibm-mqcloud/variables.tf

@@ -85,6 +85,11 @@ variable "mqcloud_keystore_certificate_certificate_file" {
   type        = string
   default     = "SGVsbG8gd29ybGQ="
 }
+variable "mqcloud_keystore_certificate_config_ams_channel_name" {
+  description = "A channel's information that is configured with this certificate."
+  type        = string
+  default     = "CLOUD.APP.SVRCONN"
+}
 
 variable "mqcloud_keystore_certificate_config_ams_channel_name" {
   description = "A channel's information that is configured with this certificate."

go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/IBM/keyprotect-go-client v0.15.1
 	github.com/IBM/logs-go-sdk v0.4.0
 	github.com/IBM/logs-router-go-sdk v1.0.8
-	github.com/IBM/mqcloud-go-sdk v0.2.0
+	github.com/IBM/mqcloud-go-sdk v0.3.0
 	github.com/IBM/networking-go-sdk v0.51.9
 	github.com/IBM/platform-services-go-sdk v0.84.4
 	github.com/IBM/project-go-sdk v0.3.5
@@ -60,7 +60,7 @@ require (
 	github.com/rook/rook/pkg/apis v0.0.0-20250619203122-80563e28b685
 	github.com/softlayer/softlayer-go v1.0.3
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/crypto v0.38.0
+	golang.org/x/crypto v0.40.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.33.2
@@ -201,15 +201,15 @@ require (
 	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/mod v0.25.0 // indirect
+	golang.org/x/net v0.42.0 // indirect
 	golang.org/x/oauth2 v0.27.0 // indirect
-	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
 	golang.org/x/sys v0.34.0 // indirect
-	golang.org/x/term v0.32.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/term v0.33.0 // indirect
+	golang.org/x/text v0.27.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	golang.org/x/tools v0.26.0 // indirect
+	golang.org/x/tools v0.34.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
 	google.golang.org/grpc v1.67.1 // indirect