Skip to content

Commit 688a84c

Browse files
michaelkadmichaelkad
authored
Merge branch 'master' into networking-update-id-args
2 parents 81aaa1a + 018e288 commit 688a84c

33 files changed

+5262
-1177
lines changed

‎.secrets.baseline‎

Lines changed: 64 additions & 22 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-09-16T08:11:13Z",
6+
"generated_at": "2025-09-19T09:28:12Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -884,39 +884,39 @@
884884
"hashed_secret": "c427f185ddcb2440be9b77c8e45f1cd487a2e790",
885885
"is_secret": false,
886886
"is_verified": false,
887-
"line_number": 1574,
887+
"line_number": 1594,
888888
"type": "Base64 High Entropy String",
889889
"verified_result": null
890890
},
891891
{
892892
"hashed_secret": "1f7e33de15e22de9d2eaf502df284ed25ca40018",
893893
"is_secret": false,
894894
"is_verified": false,
895-
"line_number": 1641,
895+
"line_number": 1669,
896896
"type": "Secret Keyword",
897897
"verified_result": null
898898
},
899899
{
900900
"hashed_secret": "1f614c2eb6b3da22d89bd1b9fd47d7cb7c8fc670",
901901
"is_secret": false,
902902
"is_verified": false,
903-
"line_number": 3754,
903+
"line_number": 3782,
904904
"type": "Secret Keyword",
905905
"verified_result": null
906906
},
907907
{
908908
"hashed_secret": "7abfce65b8504403afc25c9790f358d513dfbcc6",
909909
"is_secret": false,
910910
"is_verified": false,
911-
"line_number": 3767,
911+
"line_number": 3795,
912912
"type": "Secret Keyword",
913913
"verified_result": null
914914
},
915915
{
916916
"hashed_secret": "0c2d85bf9a9b1579b16f220a4ea8c3d62b2e24b1",
917917
"is_secret": false,
918918
"is_verified": false,
919-
"line_number": 3809,
919+
"line_number": 3837,
920920
"type": "Secret Keyword",
921921
"verified_result": null
922922
}
@@ -3682,15 +3682,15 @@
36823682
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
36833683
"is_secret": false,
36843684
"is_verified": false,
3685-
"line_number": 489,
3685+
"line_number": 569,
36863686
"type": "Secret Keyword",
36873687
"verified_result": null
36883688
},
36893689
{
36903690
"hashed_secret": "cf82ffec7623dc7b6f0931140a5b5bae30f5cc69",
36913691
"is_secret": false,
36923692
"is_verified": false,
3693-
"line_number": 1063,
3693+
"line_number": 1237,
36943694
"type": "Secret Keyword",
36953695
"verified_result": null
36963696
}
@@ -3700,7 +3700,15 @@
37003700
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
37013701
"is_secret": false,
37023702
"is_verified": false,
3703-
"line_number": 66,
3703+
"line_number": 73,
3704+
"type": "Secret Keyword",
3705+
"verified_result": null
3706+
},
3707+
{
3708+
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
3709+
"is_secret": false,
3710+
"is_verified": false,
3711+
"line_number": 601,
37043712
"type": "Secret Keyword",
37053713
"verified_result": null
37063714
}
@@ -3710,15 +3718,15 @@
37103718
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
37113719
"is_secret": false,
37123720
"is_verified": false,
3713-
"line_number": 128,
3721+
"line_number": 129,
37143722
"type": "Secret Keyword",
37153723
"verified_result": null
37163724
},
37173725
{
37183726
"hashed_secret": "cf82ffec7623dc7b6f0931140a5b5bae30f5cc69",
37193727
"is_secret": false,
37203728
"is_verified": false,
3721-
"line_number": 308,
3729+
"line_number": 341,
37223730
"type": "Secret Keyword",
37233731
"verified_result": null
37243732
}
@@ -3728,7 +3736,15 @@
37283736
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
37293737
"is_secret": false,
37303738
"is_verified": false,
3731-
"line_number": 62,
3739+
"line_number": 66,
3740+
"type": "Secret Keyword",
3741+
"verified_result": null
3742+
},
3743+
{
3744+
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
3745+
"is_secret": false,
3746+
"is_verified": false,
3747+
"line_number": 170,
37323748
"type": "Secret Keyword",
37333749
"verified_result": null
37343750
}
@@ -3738,15 +3754,15 @@
37383754
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
37393755
"is_secret": false,
37403756
"is_verified": false,
3741-
"line_number": 281,
3757+
"line_number": 348,
37423758
"type": "Secret Keyword",
37433759
"verified_result": null
37443760
},
37453761
{
37463762
"hashed_secret": "cf82ffec7623dc7b6f0931140a5b5bae30f5cc69",
37473763
"is_secret": false,
37483764
"is_verified": false,
3749-
"line_number": 1507,
3765+
"line_number": 1681,
37503766
"type": "Secret Keyword",
37513767
"verified_result": null
37523768
}
@@ -3756,7 +3772,15 @@
37563772
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
37573773
"is_secret": false,
37583774
"is_verified": false,
3759-
"line_number": 63,
3775+
"line_number": 67,
3776+
"type": "Secret Keyword",
3777+
"verified_result": null
3778+
},
3779+
{
3780+
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
3781+
"is_secret": false,
3782+
"is_verified": false,
3783+
"line_number": 885,
37603784
"type": "Secret Keyword",
37613785
"verified_result": null
37623786
}
@@ -3766,15 +3790,15 @@
37663790
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
37673791
"is_secret": false,
37683792
"is_verified": false,
3769-
"line_number": 77,
3793+
"line_number": 76,
37703794
"type": "Secret Keyword",
37713795
"verified_result": null
37723796
},
37733797
{
37743798
"hashed_secret": "cf82ffec7623dc7b6f0931140a5b5bae30f5cc69",
37753799
"is_secret": false,
37763800
"is_verified": false,
3777-
"line_number": 520,
3801+
"line_number": 618,
37783802
"type": "Secret Keyword",
37793803
"verified_result": null
37803804
}
@@ -3784,7 +3808,25 @@
37843808
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
37853809
"is_secret": false,
37863810
"is_verified": false,
3787-
"line_number": 64,
3811+
"line_number": 67,
3812+
"type": "Secret Keyword",
3813+
"verified_result": null
3814+
},
3815+
{
3816+
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
3817+
"is_secret": false,
3818+
"is_verified": false,
3819+
"line_number": 312,
3820+
"type": "Secret Keyword",
3821+
"verified_result": null
3822+
}
3823+
],
3824+
"ibm/service/project/resource_ibm_project_test.go": [
3825+
{
3826+
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
3827+
"is_secret": false,
3828+
"is_verified": false,
3829+
"line_number": 731,
37883830
"type": "Secret Keyword",
37893831
"verified_result": null
37903832
}
@@ -4234,15 +4276,15 @@
42344276
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
42354277
"is_secret": false,
42364278
"is_verified": false,
4237-
"line_number": 214,
4279+
"line_number": 210,
42384280
"type": "Secret Keyword",
42394281
"verified_result": null
42404282
},
42414283
{
42424284
"hashed_secret": "108b310facc1a193833fc2971fd83081f775ea0c",
42434285
"is_secret": false,
42444286
"is_verified": false,
4245-
"line_number": 444,
4287+
"line_number": 400,
42464288
"type": "Secret Keyword",
42474289
"verified_result": null
42484290
}
@@ -4298,7 +4340,7 @@
42984340
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
42994341
"is_secret": false,
43004342
"is_verified": false,
4301-
"line_number": 302,
4343+
"line_number": 298,
43024344
"type": "Secret Keyword",
43034345
"verified_result": null
43044346
}
@@ -4450,7 +4492,7 @@
44504492
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
44514493
"is_secret": false,
44524494
"is_verified": false,
4453-
"line_number": 127,
4495+
"line_number": 125,
44544496
"type": "Secret Keyword",
44554497
"verified_result": null
44564498
}

‎examples/ibm-project/README.md‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,22 @@ resource "ibm_project_config" "project_config_instance" {
4949
| Name | Description |
5050
|------|-------------|
5151
| version | The version of the configuration. |
52-
| is_draft | The flag that indicates whether the version of the configuration is draft, or active. |
5352
| needs_attention_state | The needs attention state of a configuration. |
5453
| created_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
5554
| modified_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
56-
| last_saved_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
5755
| outputs | The outputs of a Schematics template property. |
58-
| project | The project that is referenced by this resource. |
56+
| references | The resolved references that are used by the configuration. |
5957
| state | The state of the configuration. |
58+
| state_code | Computed state code clarifying the prerequisites for validation for the configuration. |
59+
| config_error | The error from config actions. |
60+
| href | A Url. |
61+
| is_draft | The flag that indicates whether the version of the configuration is draft, or active. |
62+
| last_saved_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
63+
| project | The project that is referenced by this resource. |
6064
| update_available | The flag that indicates whether a configuration update is available. |
6165
| template_id | The stack definition identifier. |
6266
| member_of | The stack config parent of which this configuration is a member of. |
63-
| href | A URL. |
6467
| deployment_model | The configuration type. |
65-
| state_code | Computed state code clarifying the prerequisites for validation for the configuration. |
6668
| approved_version | A summary of a project configuration version. |
6769
| deployed_version | A summary of a project configuration version. |
6870
| project_config_id | The ID of the configuration. If this parameter is empty, an ID is automatically created for the configuration. |
@@ -93,10 +95,10 @@ resource "ibm_project" "project_instance" {
9395
| crn | An IBM Cloud resource name that uniquely identifies a resource. |
9496
| created_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
9597
| cumulative_needs_attention_view | The cumulative list of needs attention items for a project. If the view is successfully retrieved, an empty or nonempty array is returned. |
96-
| cumulative_needs_attention_view_error | A value of `true` indicates that the fetch of the needs attention items failed. This property only exists if there was an error when you retrieved the cumulative needs attention view. |
98+
| cumulative_needs_attention_view_error | A value of `true` indicates that the fetch of the needs attention items failed. This property only exists if there was an error while retrieving the cumulative needs attention view. |
9799
| resource_group_id | The resource group ID where the project's data and tools are created. |
98100
| state | The project status value. |
99-
| href | A URL. |
101+
| href | A Url. |
100102
| event_notifications_crn | The CRN of the Event Notifications instance if one is connected to this project. |
101103
| configs | The project configurations. These configurations are only included in the response of creating a project if a configuration array is specified in the request payload. |
102104
| environments | The project environment. These environments are only included in the response if project environments were created on the project. |
@@ -126,7 +128,7 @@ resource "ibm_project_environment" "project_environment_instance" {
126128
| created_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
127129
| target_account | The target account ID derived from the authentication block values. The target account exists only if the environment currently has an authorization block. |
128130
| modified_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
129-
| href | A URL. |
131+
| href | A Url. |
130132
| project_environment_id | The environment ID as a friendly name. |
131133

132134
## Projects API data sources
@@ -152,21 +154,23 @@ data "ibm_project_config" "project_config_instance" {
152154
| Name | Description |
153155
|------|-------------|
154156
| version | The version of the configuration. |
155-
| is_draft | The flag that indicates whether the version of the configuration is draft, or active. |
156157
| needs_attention_state | The needs attention state of a configuration. |
157158
| created_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
158159
| modified_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
159-
| last_saved_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
160160
| outputs | The outputs of a Schematics template property. |
161+
| references | The resolved references that are used by the configuration. |
162+
| state | The state of the configuration. |
163+
| state_code | Computed state code clarifying the prerequisites for validation for the configuration. |
164+
| config_error | The error from config actions. |
165+
| href | A Url. |
166+
| is_draft | The flag that indicates whether the version of the configuration is draft, or active. |
167+
| last_saved_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
161168
| project | The project that is referenced by this resource. |
162169
| schematics | A Schematics workspace that is associated to a project configuration, with scripts. |
163-
| state | The state of the configuration. |
164170
| update_available | The flag that indicates whether a configuration update is available. |
165171
| template_id | The stack definition identifier. |
166172
| member_of | The stack config parent of which this configuration is a member of. |
167-
| href | A URL. |
168173
| deployment_model | The configuration type. |
169-
| state_code | Computed state code clarifying the prerequisites for validation for the configuration. |
170174
| definition | |
171175
| approved_version | A summary of a project configuration version. |
172176
| deployed_version | A summary of a project configuration version. |
@@ -192,11 +196,11 @@ data "ibm_project" "project_instance" {
192196
| crn | An IBM Cloud resource name that uniquely identifies a resource. |
193197
| created_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
194198
| cumulative_needs_attention_view | The cumulative list of needs attention items for a project. If the view is successfully retrieved, an empty or nonempty array is returned. |
195-
| cumulative_needs_attention_view_error | A value of `true` indicates that the fetch of the needs attention items failed. This property only exists if there was an error when you retrieved the cumulative needs attention view. |
199+
| cumulative_needs_attention_view_error | A value of `true` indicates that the fetch of the needs attention items failed. This property only exists if there was an error while retrieving the cumulative needs attention view. |
196200
| location | The IBM Cloud location where a resource is deployed. |
197201
| resource_group_id | The resource group ID where the project's data and tools are created. |
198202
| state | The project status value. |
199-
| href | A URL. |
203+
| href | A Url. |
200204
| resource_group | The resource group name where the project's data and tools are created. |
201205
| event_notifications_crn | The CRN of the Event Notifications instance if one is connected to this project. |
202206
| configs | The project configurations. These configurations are only included in the response of creating a project if a configuration array is specified in the request payload. |
@@ -227,7 +231,7 @@ data "ibm_project_environment" "project_environment_instance" {
227231
| created_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
228232
| target_account | The target account ID derived from the authentication block values. The target account exists only if the environment currently has an authorization block. |
229233
| modified_at | A date and time value in the format YYYY-MM-DDTHH:mm:ssZ or YYYY-MM-DDTHH:mm:ss.sssZ to match the date and time format as specified by RFC 3339. |
230-
| href | A URL. |
234+
| href | A Url. |
231235
| definition | The environment definition. |
232236

233237
## Assumptions

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/IBM/mqcloud-go-sdk v0.4.0
3030
github.com/IBM/networking-go-sdk v0.51.12
3131
github.com/IBM/platform-services-go-sdk v0.87.0
32-
github.com/IBM/project-go-sdk v0.3.5
32+
github.com/IBM/project-go-sdk v0.3.8
3333
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
3434
github.com/IBM/sarama v1.45.0
3535
github.com/IBM/scc-go-sdk/v5 v5.5.3
@@ -38,7 +38,7 @@ require (
3838
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.15
3939
github.com/IBM/vmware-go-sdk v0.1.5
4040
github.com/IBM/vpc-beta-go-sdk v0.8.0
41-
github.com/IBM/vpc-go-sdk v0.72.0
41+
github.com/IBM/vpc-go-sdk v0.73.0
4242
github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
4343
github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2
4444
github.com/akamai/AkamaiOPEN-edgegrid-golang/v5 v5.0.0

‎go.sum‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ github.com/IBM/networking-go-sdk v0.51.12 h1:2qv6neG8msFR1dtf9v+rbaC2gIkw9Hnzohv
151151
github.com/IBM/networking-go-sdk v0.51.12/go.mod h1:TAXWyBUk3C3R7aS1m84EfKdnDcBMZMAClwLfDj/SYZc=
152152
github.com/IBM/platform-services-go-sdk v0.87.0 h1:hLx/I7n7cb1CyAXdb2qypmCoFiYuxh2g50qN8OGnEQc=
153153
github.com/IBM/platform-services-go-sdk v0.87.0/go.mod h1:aGD045m6I8pfcB77wft8w2cHqWOJjcM3YSSV55BX0Js=
154-
github.com/IBM/project-go-sdk v0.3.5 h1:L+YClFUa14foS0B/hOOY9n7sIdsT5/XQicnXOyJSpyM=
155-
github.com/IBM/project-go-sdk v0.3.5/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo=
154+
github.com/IBM/project-go-sdk v0.3.8 h1:RPu4vrNHLrs1+csKMI/TWXCgJMf23la8IM2OBd+zb1o=
155+
github.com/IBM/project-go-sdk v0.3.8/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo=
156156
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 h1:NPUhkoOCRuv3OFWt19PmwjXGGTKlvmbuPg9fUrBUNe4=
157157
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5/go.mod h1:b07XHUVh0XYnQE9s2mqgjYST1h9buaQNqN4EcKhOsX0=
158158
github.com/IBM/sarama v1.45.0 h1:IzeBevTn809IJ/dhNKhP5mpxEXTmELuezO2tgHD9G5E=
@@ -171,6 +171,8 @@ github.com/IBM/vpc-beta-go-sdk v0.8.0 h1:cEPpv4iw3Ba5W2d0AWg3TIbKeJ8y1nPuUuibR5J
171171
github.com/IBM/vpc-beta-go-sdk v0.8.0/go.mod h1:hORgIyTFRzXrZIK9IohaWmCRBBlYiDRagsufi7M6akE=
172172
github.com/IBM/vpc-go-sdk v0.72.0 h1:3Pj7nNuYmlaRPiMyC/5Uro3+5hzNBM6v2Lrq5UABBkQ=
173173
github.com/IBM/vpc-go-sdk v0.72.0/go.mod h1:K3vVlje72PYE3ZRt1iouE+jSIq+vCyYzT1HiFC06hUA=
174+
github.com/IBM/vpc-go-sdk v0.73.0 h1:gMVR6NSzw8Y7pCkcDa92+heQTzu5X64q8bnBBpLJpFE=
175+
github.com/IBM/vpc-go-sdk v0.73.0/go.mod h1:K3vVlje72PYE3ZRt1iouE+jSIq+vCyYzT1HiFC06hUA=
174176
github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56 h1:vuquMR410psHNax14XKNWa0Ae/kYgWJcXi0IFuX60N0=
175177
github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56/go.mod h1:Zb3OT4l0mf7P/GOs2w2Ilj5sdm5Whoq3pa24dAEBHFc=
176178
github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=

0 commit comments

Comments
 (0)