Merge branch 'master' into migration-PR-sdk-test-donot-delete

Author: uibm

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-09-10T10:45:53Z",
+  "generated_at": "2025-09-16T08:11:13Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -517,6 +517,16 @@
         "verified_result": null
       }
     ],
+    "examples/ibm-db2/main.tf": [
+      {
+        "hashed_secret": "a72bbcb46048bc597b5d0ae17aef962773429c1e",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 26,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
     "examples/ibm-direct-link-provider/terraform.tfvars": [
       {
         "hashed_secret": "55518b11e5013893f3b9f074209da1e3d4b2a6e7",
@@ -944,15 +954,15 @@
         "hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 2462,
+        "line_number": 2463,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 2468,
+        "line_number": 2469,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -2795,6 +2805,44 @@
         "verified_result": null
       }
     ],
+    "ibm/service/db2/data_source_ibm_db2_list_users.go": [
+      {
+        "hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 86,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
+      {
+        "hashed_secret": "2c7d1e61c036dc18b2e9b3e6392c8e59c8437f23",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 225,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "ibm/service/db2/data_source_ibm_db2_list_users_test.go": [
+      {
+        "hashed_secret": "7380498ba3ddc3b9c17fd968d76935a7587a625d",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 61,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "ibm/service/db2/resource_ibm_db2_instance_test.go": [
+      {
+        "hashed_secret": "a72bbcb46048bc597b5d0ae17aef962773429c1e",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 500,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
     "ibm/service/directlink/resource_ibm_dl_provider_gateway_test.go": [
       {
         "hashed_secret": "a184c8ba0974f2e1da4ca1d71f54e1cf40604335",
@@ -5112,11 +5160,19 @@
       }
     ],
     "website/docs/r/db2_instance.html.markdown": [
+      {
+        "hashed_secret": "a72bbcb46048bc597b5d0ae17aef962773429c1e",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 83,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
       {
         "hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 272,
+        "line_number": 354,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -5936,7 +5992,7 @@
       }
     ]
   },
-  "version": "0.13.1+ibm.61.dss",
+  "version": "0.13.1+ibm.62.dss",
   "word_list": {
     "file": null,
     "hash": null

examples/ibm-db2/main.tf

@@ -17,14 +17,38 @@ resource "ibm_db2" "db2_instance" {
   disk_encryption_key_crn      = "none"
   oracle_compatibility         = "no"
 
+// user configuration required for create and update
+#  users_config {
+#    id = "test-user"
+#    iam = "false"
+#    ibmid = "test-ibm-id"
+#    name =  "test_user"
+#    password =  "dEkMc43@gfAPl!867^dSbu"
+#    role =  "bluuser"
+#    email = "[email protected]"
+#    locked = "no"
+#    authentication {
+#      method = "internal"
+#     policy_id = "Default"
+#    }
+#  }
+
+// allowed list of ip address
+#  allowlist_config {
+#   ip_addresses {
+#      address     = "127.0.0.32"
+#      description = "A sample IP address"
+#    }
+#  }
+
   autoscale_config {
     auto_scaling_enabled          = "true"
     auto_scaling_threshold        = "60"
     auto_scaling_over_time_period = "15"
     auto_scaling_pause_limit      = "70"
     auto_scaling_allow_plan_limit = "true"
   }
-  // custom_setting_config {
+// custom_setting_config {
 //     db {
 //       act_sortmem_limit    = "NONE"
 //       alt_collate          = "IDENTITY_16BIT"
@@ -219,4 +243,9 @@ resource "ibm_db2" "db2_instance" {
 //DataSource reading backups of Db2 instance
 # data "ibm_db2_backup" "Db2-kj-test-pub" {
 #  deployment_id = "crn%3Av1%3Astaging%3Apublic%3Adashdb-for-transactions%3Aus-south%3Aa%2Fe7e3e87b512f474381c0684a5ecbba03%3A5d673016-3dbf-428c-8e59-e6ab82028b53%3A%3A"
-# }
+# }
+
+// Db2 SaaS List Users
+#data "ibm_db2_users" "db2_list_users" {
+#  x_deployment_id = "crn:v1:staging:public:dashdb-for-transactions:us-south:a/081cc8d873fc41268d721af06b1f81e2:f03f761b-9a01-4bb5-a06b-57dab66ff8c9::"
+#}

examples/ibm-mqcloud/README.md

@@ -96,6 +96,7 @@ resource "ibm_mqcloud_application" "mqcloud_application_instance" {
 
 | Name | Description |
 |------|-------------|
+| iam_service_id | The IAM ID of the application. |
 | create_api_key_uri | The URI to create a new apikey for the application. |
 | href | The URL for this application. |
 | application_id | The ID of the application which was allocated on creation, and can be used for delete calls. |
@@ -123,6 +124,9 @@ resource "ibm_mqcloud_user" "mqcloud_user_instance" {
 
 | Name | Description |
 |------|-------------|
+| iam_service_id | The IAM ID of the user. |
+| roles | A list of roles the user has. |
+| iam_managed | Indicates whether the user is managed by IAM. |
 | href | The URL for the user details. |
 | user_id | The ID of the user which was allocated on creation, and can be used for delete calls. |
 

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/IBM/appconfiguration-go-admin-sdk v0.5.1
 	github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f
 	github.com/IBM/cloud-databases-go-sdk v0.8.0
-	github.com/IBM/cloud-db2-go-sdk v0.2.3
+	github.com/IBM/cloud-db2-go-sdk v0.2.4
 	github.com/IBM/cloudant-go-sdk v0.8.0
 	github.com/IBM/code-engine-go-sdk v0.0.0-20241217191651-e1821f8c58c3
 	github.com/IBM/configuration-aggregator-go-sdk v0.0.2
@@ -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.3.0
+	github.com/IBM/mqcloud-go-sdk v0.4.0
 	github.com/IBM/networking-go-sdk v0.51.12
 	github.com/IBM/platform-services-go-sdk v0.86.1
 	github.com/IBM/project-go-sdk v0.3.5
@@ -38,7 +38,7 @@ require (
 	github.com/IBM/secrets-manager-go-sdk/v2 v2.0.15
 	github.com/IBM/vmware-go-sdk v0.1.5
 	github.com/IBM/vpc-beta-go-sdk v0.8.0
-	github.com/IBM/vpc-go-sdk v0.71.1
+	github.com/IBM/vpc-go-sdk v0.72.0
 	github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
 	github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2
 	github.com/akamai/AkamaiOPEN-edgegrid-golang/v5 v5.0.0
@@ -232,8 +232,6 @@ replace github.com/softlayer/softlayer-go v1.0.3 => github.com/IBM-Cloud/softlay
 // add sdk changes.
 replace github.com/portworx/sched-ops v0.0.0-20200831185134-3e8010dc7056 => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 // required by rook v1.7
 
-replace github.com/IBM/vpc-go-sdk v0.71.1 => ./common/github.com/IBM/vpc-go-sdk
-
 replace github.com/hashicorp/consul/api v1.1.0 => github.com/hashicorp/consul/api v1.30.0
 
 replace github.com/hashicorp/vault => github.com/hashicorp/vault v1.18.2

go.sum

@@ -104,8 +104,8 @@ github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f h1:4c1
 github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f/go.mod h1:d22kTYY7RYBWcQlZpqrSdshpB/lJ16viWS5Sbjtlc8s=
 github.com/IBM/cloud-databases-go-sdk v0.8.0 h1:uMFqhnc/roVTzfCaUsJ23eaHKjChhGpM1F7Mpxik0bo=
 github.com/IBM/cloud-databases-go-sdk v0.8.0/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc=
-github.com/IBM/cloud-db2-go-sdk v0.2.3 h1:R+8uFXSZFOsBDC7nKqW9DgyGgT9Pop589ziUIaw2Tek=
-github.com/IBM/cloud-db2-go-sdk v0.2.3/go.mod h1:jEJMNXX2KOE+Hhk3M8CBq0qi9CZ0eRK36xmhuBPSiNA=
+github.com/IBM/cloud-db2-go-sdk v0.2.4 h1:kCiFoKav2FVrZqukoSAp0ivH8xBZDYipFBNkiyAXDw0=
+github.com/IBM/cloud-db2-go-sdk v0.2.4/go.mod h1:U1E6eRDEL5zWTE+aP9zWRC1DyaXB29a0kkTvhlCT9Wc=
 github.com/IBM/cloudant-go-sdk v0.8.0 h1:XzaqZFy5fm1Q9+iK52X5zRW39SHaahT9pf5SRgVTsTY=
 github.com/IBM/cloudant-go-sdk v0.8.0/go.mod h1:zDGBs8ideVtn9MehXbIQNI3852B68BsMtKJvq3iPn/Q=
 github.com/IBM/code-engine-go-sdk v0.0.0-20241217191651-e1821f8c58c3 h1:bNopmSDZEmWf+Q4ZqwnT3LY7vNt7S3oVH3PXTZHuLmE=
@@ -145,8 +145,8 @@ github.com/IBM/logs-go-sdk v0.4.0 h1:CyUjm19EUtcJjf4mxsj6Rc7gkZDT8JEY5rLUIz8Eoag
 github.com/IBM/logs-go-sdk v0.4.0/go.mod h1:yv/GCXC4/p+MZEeXl4xjZAOMvDAVRwu61WyHZFKFXQM=
 github.com/IBM/logs-router-go-sdk v1.0.8 h1:MU1TdYNdVbvVTUXeqeYPItu6BoiSV/NMN49ySqE7WIY=
 github.com/IBM/logs-router-go-sdk v1.0.8/go.mod h1:tCN2vFgu5xG0ob9iJcxi5M4bJ6mWmu3nhmRPnvlwev0=
-github.com/IBM/mqcloud-go-sdk v0.3.0 h1:zuRe+lu6IwIzsBsmoVKZT4JgX+GxH5PJG06r5y5Xnh4=
-github.com/IBM/mqcloud-go-sdk v0.3.0/go.mod h1:7zigCUz6k3eRrNE8KOcDkY72oPppEmoQifF+SB0NPRM=
+github.com/IBM/mqcloud-go-sdk v0.4.0 h1:BuZNXA6iYEg5OEPr13CMGrhH0ew4rH/4L56b1nFtA10=
+github.com/IBM/mqcloud-go-sdk v0.4.0/go.mod h1:7zigCUz6k3eRrNE8KOcDkY72oPppEmoQifF+SB0NPRM=
 github.com/IBM/networking-go-sdk v0.51.12 h1:2qv6neG8msFR1dtf9v+rbaC2gIkw9HnzohvQpgVye5w=
 github.com/IBM/networking-go-sdk v0.51.12/go.mod h1:TAXWyBUk3C3R7aS1m84EfKdnDcBMZMAClwLfDj/SYZc=
 github.com/IBM/platform-services-go-sdk v0.86.1 h1:ngBpaXvUF3gmLvbU1Z4lX1wowOSYgGoKBEBaR/urt30=
@@ -169,12 +169,8 @@ github.com/IBM/vmware-go-sdk v0.1.5 h1:aQbwcJBceaaauuIoJ0OJn+ttwjb+QTX6XV9Jbrdpj
 github.com/IBM/vmware-go-sdk v0.1.5/go.mod h1:OyQKRInGGsBaOyE5LIZCqH7b1DZ01BvIYa8BgGy+wWo=
 github.com/IBM/vpc-beta-go-sdk v0.8.0 h1:cEPpv4iw3Ba5W2d0AWg3TIbKeJ8y1nPuUuibR5Jt9eE=
 github.com/IBM/vpc-beta-go-sdk v0.8.0/go.mod h1:hORgIyTFRzXrZIK9IohaWmCRBBlYiDRagsufi7M6akE=
-github.com/IBM/vpc-go-sdk v0.70.1 h1:6NsbRkiA5gDNxe7cjNx8Pi1j9s0PlhwNQj29wsKZxAo=
-github.com/IBM/vpc-go-sdk v0.70.1/go.mod h1:K3vVlje72PYE3ZRt1iouE+jSIq+vCyYzT1HiFC06hUA=
-github.com/IBM/vpc-go-sdk v0.71.0 h1:e7Y/KDKQMeYEHDIFb/wMGMRRFBI0dht8mVh1vnKRL8U=
-github.com/IBM/vpc-go-sdk v0.71.0/go.mod h1:K3vVlje72PYE3ZRt1iouE+jSIq+vCyYzT1HiFC06hUA=
-github.com/IBM/vpc-go-sdk v0.71.1 h1:SP5/uQs5JDb1QRvSJ1QC2BzE+BHEMq4jd2+JEcRuieE=
-github.com/IBM/vpc-go-sdk v0.71.1/go.mod h1:K3vVlje72PYE3ZRt1iouE+jSIq+vCyYzT1HiFC06hUA=
+github.com/IBM/vpc-go-sdk v0.72.0 h1:3Pj7nNuYmlaRPiMyC/5Uro3+5hzNBM6v2Lrq5UABBkQ=
+github.com/IBM/vpc-go-sdk v0.72.0/go.mod h1:K3vVlje72PYE3ZRt1iouE+jSIq+vCyYzT1HiFC06hUA=
 github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56 h1:vuquMR410psHNax14XKNWa0Ae/kYgWJcXi0IFuX60N0=
 github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56/go.mod h1:Zb3OT4l0mf7P/GOs2w2Ilj5sdm5Whoq3pa24dAEBHFc=
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=

ibm/provider/provider.go

@@ -363,6 +363,7 @@ func Provider() *schema.Provider {
 			"ibm_db2_autoscale":                             db2.DataSourceIbmDb2Autoscale(),
 			"ibm_db2_backup":                                db2.DataSourceIbmDb2Backup(),
 			"ibm_db2_tuneable_param":                        db2.DataSourceIbmDb2TuneableParam(),
+			"ibm_db2_users":                                 db2.DataSourceIbmDb2Users(),
 			"ibm_compute_bare_metal":                        classicinfrastructure.DataSourceIBMComputeBareMetal(),
 			"ibm_compute_image_template":                    classicinfrastructure.DataSourceIBMComputeImageTemplate(),
 			"ibm_compute_placement_group":                   classicinfrastructure.DataSourceIBMComputePlacementGroup(),