Skip to content

Commit 5f25a6f

Browse files
uibmuibm
committed
Merge branch 'master' into migration-PR-sdk-test-donot-delete
2 parents cb5a32a + faf3f00 commit 5f25a6f

File tree

203 files changed

+6132
-907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+6132
-907
lines changed

‎.github/workflows/go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: go
2121

2222
- name: Check out code into the Go module directory
23-
uses: actions/checkout@v4.2.2
23+
uses: actions/checkout@v5.0.0
2424

2525
- name: Get dependencies
2626
run: |

‎.github/workflows/issues.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
labelIssues:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4.2.2
9+
- uses: actions/checkout@v5.0.0
1010
- name: Apply Issue Labels
1111
uses: github/[email protected]
1212
with:

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
-
2222
name: Checkout
23-
uses: actions/checkout@v4.2.2
23+
uses: actions/checkout@v5.0.0
2424
-
2525
name: Unshallow
2626
run: git fetch --prune --unshallow

‎.secrets.baseline‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-07-09T15:43:07Z",
6+
"generated_at": "2025-08-10T14:26:04Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -934,15 +934,41 @@
934934
"hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
935935
"is_secret": false,
936936
"is_verified": false,
937-
"line_number": 2428,
937+
"line_number": 2411,
938938
"type": "Secret Keyword",
939939
"verified_result": null
940940
},
941941
{
942942
"hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
943943
"is_secret": false,
944944
"is_verified": false,
945-
"line_number": 2434,
945+
"line_number": 2417,
946+
"type": "Secret Keyword",
947+
"verified_result": null
948+
}
949+
],
950+
"ibm/service/apigateway/resource_ibm_api_gateway_endpoint_subscription.go": [
951+
{
952+
"hashed_secret": "a2a34b8bdbe4d81821c05f2467b5dcdfa72557b9",
953+
"is_secret": false,
954+
"is_verified": false,
955+
"line_number": 110,
956+
"type": "Secret Keyword",
957+
"verified_result": null
958+
},
959+
{
960+
"hashed_secret": "2d1782d8a065e113961a49011478089bf93115d9",
961+
"is_secret": false,
962+
"is_verified": false,
963+
"line_number": 115,
964+
"type": "Secret Keyword",
965+
"verified_result": null
966+
},
967+
{
968+
"hashed_secret": "ce1e10abfd561d0a80450a58ce9c4d620b46d39c",
969+
"is_secret": false,
970+
"is_verified": false,
971+
"line_number": 216,
946972
"type": "Secret Keyword",
947973
"verified_result": null
948974
}
@@ -5868,7 +5894,7 @@
58685894
}
58695895
]
58705896
},
5871-
"version": "0.13.1+ibm.62.dss",
5897+
"version": "0.13.1+ibm.61.dss",
58725898
"word_list": {
58735899
"file": null,
58745900
"hash": null

‎CHANGELOG.md‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,67 @@
1+
# 1.82.0-beta0 (August 21, 2025)
2+
3+
* Support for **App Configuration**
4+
* **Datasources**
5+
* `ibm_app_config_integrations`
6+
* `ibm_app_config_integration_en`
7+
* `ibm_app_config_integration_kms`
8+
* **Resources**
9+
* `ibm_app_config_integration_en`
10+
* `ibm_app_config_integration_kms`
11+
* Support for **Event Notifications**
12+
* **Datasources**
13+
* `ibm_en_pre_defined_template`
14+
* `ibm_en_pre_defined_templates`
15+
* `ibm_en_code_engine_template`
16+
* **Resources**
17+
* `ibm_en_code_engine_template`
18+
* Support for **VMware**
19+
* **Datasources**
20+
* `ibm_vmaas_transit_gateway_connection`
21+
* **Resources**
22+
* `ibm_vmaas_transit_gateway_connection`
23+
24+
## Enhancements
25+
26+
### Power Systems
27+
* Refactor Terraform errors to use new toolchain in available hosts and catalog images data sources ([6407](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6407))
28+
29+
### App Configuration
30+
* Addition of Integration Resources support ([6405](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6405))
31+
32+
### CD Tekton Pipeline
33+
* Add support for `ca-mon` region ([6402](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6402))
34+
35+
### Event Streams
36+
* Pre-defined templates and Code Engine templates support ([6398](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6398))
37+
38+
### MQ Service
39+
* Add ability to update user and app names ([6397](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6397))
40+
41+
### VMware
42+
* Transit Gateway support for Vmaas Terraform ([6377](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6377))
43+
44+
### CIS
45+
* Added rulesets ratelimit changes for custom rules ([6379](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6379))
46+
47+
### VPC Infrastructure
48+
* Added `storage_generation` attribute to `is_volume` ([6413](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6413))
49+
50+
### General
51+
* Bump `actions/checkout` from 4.2.2 to 5.0.0 ([6406](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6406))
52+
53+
## Bug Fixes
54+
55+
### Secrets Manager
56+
* Fix missing `secret_id` property ([6400](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6400))
57+
* Update docs - nested JSONs and fixes ([6356](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6356))
58+
59+
## Tests
60+
61+
### Secrets Manager
62+
* Optionally disable SM crypto key tests ([6408](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6408))
63+
64+
165
# 1.81.1 (August 6, 2025)
266

367
## Bug Fixes

‎examples/ibm-mqcloud/README.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Examples for MQaaS
1+
# Examples for MQ SaaS
22

3-
These examples illustrate how to use the resources and data sources associated with MQaaS.
3+
These examples illustrate how to use the resources and data sources associated with MQ SaaS.
44

55
The following resources are supported:
66
* ibm_mqcloud_queue_manager
@@ -33,7 +33,7 @@ $ terraform apply
3333

3434
Run `terraform destroy` when you don't need these resources.
3535

36-
## MQaaS resources
36+
## MQ SaaS resources
3737

3838
### Resource: ibm_mqcloud_queue_manager
3939

@@ -53,7 +53,7 @@ resource "ibm_mqcloud_queue_manager" "mqcloud_queue_manager_instance" {
5353
| Name | Description | Type | Required |
5454
|------|-------------|------|---------|
5555
| ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
56-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
56+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
5757
| name | A queue manager name conforming to MQ restrictions. | `string` | true |
5858
| display_name | A displayable name for the queue manager - limited only in length. | `string` | false |
5959
| location | The locations in which the queue manager could be deployed. | `string` | true |
@@ -89,7 +89,7 @@ resource "ibm_mqcloud_application" "mqcloud_application_instance" {
8989
| Name | Description | Type | Required |
9090
|------|-------------|------|---------|
9191
| ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
92-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
92+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
9393
| name | The name of the application - conforming to MQ rules. | `string` | true |
9494

9595
#### Outputs
@@ -115,7 +115,7 @@ resource "ibm_mqcloud_user" "mqcloud_user_instance" {
115115
| Name | Description | Type | Required |
116116
|------|-------------|------|---------|
117117
| ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
118-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
118+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
119119
| 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 |
120120
| email | The email of the user. | `string` | true |
121121

@@ -150,7 +150,7 @@ resource "ibm_mqcloud_keystore_certificate" "mqcloud_keystore_certificate_instan
150150
| Name | Description | Type | Required |
151151
|------|-------------|------|---------|
152152
| ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
153-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
153+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
154154
| queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
155155
| label | The label to use for the certificate to be uploaded. | `string` | true |
156156
| 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
190190
| Name | Description | Type | Required |
191191
|------|-------------|------|---------|
192192
| ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
193-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
193+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
194194
| queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
195195
| label | The label to use for the certificate to be uploaded. | `string` | true |
196196
| 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
227227
| Name | Description | Type | Required |
228228
|------|-------------|------|---------|
229229
| ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
230-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
230+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
231231
| trusted_profile | The CRN of the trusted profile to assume for this request. | `string` | false |
232232
| name | The name of the virtual private endpoint gateway, created by the user. | `string` | true |
233233
| 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
240240
| status | The lifecycle state of this virtual privage endpoint. |
241241
| virtual_private_endpoint_gateway_guid | The ID of the virtual private endpoint gateway which was allocated on creation. |
242242

243-
## MQaaS data sources
243+
## MQ SaaS data sources
244244

245245
### Data source: ibm_mqcloud_queue_manager_options
246246

@@ -254,7 +254,7 @@ data "ibm_mqcloud_queue_manager_options" "mqcloud_queue_manager_options_instance
254254

255255
| Name | Description | Type | Required |
256256
|------|-------------|------|---------|
257-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
257+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
258258

259259
#### Outputs
260260

@@ -278,7 +278,7 @@ data "ibm_mqcloud_queue_manager" "mqcloud_queue_manager_instance" {
278278

279279
| Name | Description | Type | Required |
280280
|------|-------------|------|---------|
281-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
281+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
282282
| name | A queue manager name conforming to MQ restrictions. | `string` | false |
283283

284284
#### Outputs
@@ -300,7 +300,7 @@ data "ibm_mqcloud_queue_manager_status" "mqcloud_queue_manager_status_instance"
300300

301301
| Name | Description | Type | Required |
302302
|------|-------------|------|---------|
303-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
303+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
304304
| queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
305305

306306
#### Outputs
@@ -322,7 +322,7 @@ data "ibm_mqcloud_application" "mqcloud_application_instance" {
322322

323323
| Name | Description | Type | Required |
324324
|------|-------------|------|---------|
325-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
325+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
326326
| name | The name of the application - conforming to MQ rules. | `string` | false |
327327

328328
#### Outputs
@@ -344,7 +344,7 @@ data "ibm_mqcloud_user" "mqcloud_user_instance" {
344344

345345
| Name | Description | Type | Required |
346346
|------|-------------|------|---------|
347-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
347+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
348348
| 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 |
349349

350350
#### Outputs
@@ -367,7 +367,7 @@ data "ibm_mqcloud_truststore_certificate" "mqcloud_truststore_certificate_instan
367367

368368
| Name | Description | Type | Required |
369369
|------|-------------|------|---------|
370-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
370+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
371371
| queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
372372
| label | Certificate label in queue manager store. | `string` | false |
373373

@@ -392,7 +392,7 @@ data "ibm_mqcloud_keystore_certificate" "mqcloud_keystore_certificate_instance"
392392

393393
| Name | Description | Type | Required |
394394
|------|-------------|------|---------|
395-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
395+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
396396
| queue_manager_id | The id of the queue manager to retrieve its full details. | `string` | true |
397397
| label | Certificate label in queue manager store. | `string` | false |
398398

@@ -417,7 +417,7 @@ data "ibm_mqcloud_virtual_private_endpoint_gateways" "mqcloud_virtual_private_en
417417

418418
| Name | Description | Type | Required |
419419
|------|-------------|------|---------|
420-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
420+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
421421
| trusted_profile | The CRN of the trusted profile to assume for this request. | `string` | false |
422422
| name | The name of the virtual private endpoint gateway, created by the user. | `string` | false |
423423

@@ -441,7 +441,7 @@ data "ibm_mqcloud_virtual_private_endpoint_gateway" "mqcloud_virtual_private_end
441441

442442
| Name | Description | Type | Required |
443443
|------|-------------|------|---------|
444-
| service_instance_guid | The GUID that uniquely identifies the MQaaS service instance. | `string` | true |
444+
| service_instance_guid | The GUID that uniquely identifies the MQ SaaS service instance. | `string` | true |
445445
| virtual_private_endpoint_gateway_guid | The id of the virtual private endpoint gateway. | `string` | true |
446446
| trusted_profile | The CRN of the trusted profile to assume for this request. | `string` | false |
447447

‎examples/ibm-mqcloud/main.tf‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ provider "ibm" {
55
// Provision mqcloud_queue_manager resource instance
66
resource "ibm_mqcloud_queue_manager" "mqcloud_queue_manager_instance" {
77
service_instance_guid = var.mqcloud_queue_manager_service_instance_guid
8-
name = var.mqcloud_queue_manager_name
9-
display_name = var.mqcloud_queue_manager_display_name
10-
location = var.mqcloud_queue_manager_location
11-
size = var.mqcloud_queue_manager_size
12-
version = var.mqcloud_queue_manager_version
8+
name = var.mqcloud_queue_manager_name
9+
display_name = var.mqcloud_queue_manager_display_name
10+
location = var.mqcloud_queue_manager_location
11+
size = var.mqcloud_queue_manager_size
12+
version = var.mqcloud_queue_manager_version
1313
}
1414

1515
// Provision mqcloud_application resource instance
1616
resource "ibm_mqcloud_application" "mqcloud_application_instance" {
1717
service_instance_guid = var.mqcloud_application_service_instance_guid
18-
name = var.mqcloud_application_name
18+
name = var.mqcloud_application_name
1919
}
2020

2121
// Provision mqcloud_user resource instance
2222
resource "ibm_mqcloud_user" "mqcloud_user_instance" {
2323
service_instance_guid = var.mqcloud_user_service_instance_guid
24-
name = var.mqcloud_user_name
25-
email = var.mqcloud_user_email
24+
name = var.mqcloud_user_name
25+
email = var.mqcloud_user_email
2626
}
2727

2828
// Provision mqcloud_keystore_certificate resource instance
@@ -32,8 +32,6 @@ resource "ibm_mqcloud_keystore_certificate" "mqcloud_keystore_certificate_instan
3232
label = var.mqcloud_keystore_certificate_label
3333
certificate_file = var.mqcloud_keystore_certificate_certificate_file
3434

35-
certificate_file = var.mqcloud_keystore_certificate_certificate_file
36-
3735
config {
3836
ams {
3937
channels {
@@ -46,9 +44,9 @@ resource "ibm_mqcloud_keystore_certificate" "mqcloud_keystore_certificate_instan
4644
// Provision mqcloud_truststore_certificate resource instance
4745
resource "ibm_mqcloud_truststore_certificate" "mqcloud_truststore_certificate_instance" {
4846
service_instance_guid = var.mqcloud_truststore_certificate_service_instance_guid
49-
queue_manager_id = var.mqcloud_truststore_certificate_queue_manager_id
50-
label = var.mqcloud_truststore_certificate_label
51-
certificate_file = var.mqcloud_truststore_certificate_certificate_file
47+
queue_manager_id = var.mqcloud_truststore_certificate_queue_manager_id
48+
label = var.mqcloud_truststore_certificate_label
49+
certificate_file = var.mqcloud_truststore_certificate_certificate_file
5250
}
5351

5452
// Provision mqcloud_virtual_private_endpoint_gateway resource instance

‎examples/ibm-mqcloud/variables.tf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ variable "mqcloud_keystore_certificate_certificate_file" {
8585
type = string
8686
default = "SGVsbG8gd29ybGQ="
8787
}
88+
variable "mqcloud_keystore_certificate_config_ams_channel_name" {
89+
description = "A channel's information that is configured with this certificate."
90+
type = string
91+
default = "CLOUD.APP.SVRCONN"
92+
}
8893

8994
variable "mqcloud_keystore_certificate_config_ams_channel_name" {
9095
description = "A channel's information that is configured with this certificate."

0 commit comments

Comments
 (0)