Skip to content

Commit 7038e92

Browse files
shreyasms07shreyasms07
committed
Merge branch 'master' into GEN4_GRAPHITE
2 parents 136d579 + 1f2bcf1 commit 7038e92

File tree

47 files changed

+840
-118
lines changed

Some content is hidden

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

47 files changed

+840
-118
lines changed

‎.secrets.baseline‎

Lines changed: 58 additions & 32 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-19T09:28:12Z",
6+
"generated_at": "2025-10-02T08:57:25Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -622,7 +622,7 @@
622622
"hashed_secret": "4fe2c50d3e572f60977cb06e8995a5d7c368758d",
623623
"is_secret": false,
624624
"is_verified": false,
625-
"line_number": 282,
625+
"line_number": 287,
626626
"type": "Hex High Entropy String",
627627
"verified_result": null
628628
}
@@ -642,7 +642,7 @@
642642
"hashed_secret": "06d988e96c3d9325c9fbc7c0ef3c6c0f2b4eb8e7",
643643
"is_secret": false,
644644
"is_verified": false,
645-
"line_number": 43,
645+
"line_number": 44,
646646
"type": "Secret Keyword",
647647
"verified_result": null
648648
}
@@ -842,31 +842,31 @@
842842
"hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
843843
"is_secret": false,
844844
"is_verified": false,
845-
"line_number": 545,
845+
"line_number": 548,
846846
"type": "Secret Keyword",
847847
"verified_result": null
848848
},
849849
{
850850
"hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
851851
"is_secret": false,
852852
"is_verified": false,
853-
"line_number": 551,
853+
"line_number": 554,
854854
"type": "Secret Keyword",
855855
"verified_result": null
856856
},
857857
{
858858
"hashed_secret": "165722fe6dd0ec0afbeefb51c8258a177497956b",
859859
"is_secret": false,
860860
"is_verified": false,
861-
"line_number": 843,
861+
"line_number": 846,
862862
"type": "Hex High Entropy String",
863863
"verified_result": null
864864
},
865865
{
866866
"hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
867867
"is_secret": false,
868868
"is_verified": false,
869-
"line_number": 1509,
869+
"line_number": 1529,
870870
"type": "Base64 High Entropy String",
871871
"verified_result": null
872872
}
@@ -876,47 +876,47 @@
876876
"hashed_secret": "9184b0c38101bf24d78b2bb0d044deb1d33696fc",
877877
"is_secret": false,
878878
"is_verified": false,
879-
"line_number": 146,
879+
"line_number": 148,
880880
"type": "Secret Keyword",
881881
"verified_result": null
882882
},
883883
{
884884
"hashed_secret": "c427f185ddcb2440be9b77c8e45f1cd487a2e790",
885885
"is_secret": false,
886886
"is_verified": false,
887-
"line_number": 1594,
887+
"line_number": 1562,
888888
"type": "Base64 High Entropy String",
889889
"verified_result": null
890890
},
891891
{
892-
"hashed_secret": "1f7e33de15e22de9d2eaf502df284ed25ca40018",
892+
"hashed_secret": "1f614c2eb6b3da22d89bd1b9fd47d7cb7c8fc670",
893893
"is_secret": false,
894894
"is_verified": false,
895-
"line_number": 1669,
895+
"line_number": 3766,
896896
"type": "Secret Keyword",
897897
"verified_result": null
898898
},
899899
{
900-
"hashed_secret": "1f614c2eb6b3da22d89bd1b9fd47d7cb7c8fc670",
900+
"hashed_secret": "7abfce65b8504403afc25c9790f358d513dfbcc6",
901901
"is_secret": false,
902902
"is_verified": false,
903-
"line_number": 3782,
903+
"line_number": 3779,
904904
"type": "Secret Keyword",
905905
"verified_result": null
906906
},
907907
{
908-
"hashed_secret": "7abfce65b8504403afc25c9790f358d513dfbcc6",
908+
"hashed_secret": "1f7e33de15e22de9d2eaf502df284ed25ca40018",
909909
"is_secret": false,
910910
"is_verified": false,
911-
"line_number": 3795,
911+
"line_number": 3826,
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": 3837,
919+
"line_number": 3846,
920920
"type": "Secret Keyword",
921921
"verified_result": null
922922
}
@@ -954,15 +954,15 @@
954954
"hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
955955
"is_secret": false,
956956
"is_verified": false,
957-
"line_number": 2463,
957+
"line_number": 2490,
958958
"type": "Secret Keyword",
959959
"verified_result": null
960960
},
961961
{
962962
"hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
963963
"is_secret": false,
964964
"is_verified": false,
965-
"line_number": 2469,
965+
"line_number": 2496,
966966
"type": "Secret Keyword",
967967
"verified_result": null
968968
}
@@ -3594,7 +3594,7 @@
35943594
"hashed_secret": "a2277f800807615d59cc7925271ea2c54de5fb96",
35953595
"is_secret": false,
35963596
"is_verified": false,
3597-
"line_number": 1388,
3597+
"line_number": 1431,
35983598
"type": "Secret Keyword",
35993599
"verified_result": null
36003600
}
@@ -3700,15 +3700,15 @@
37003700
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
37013701
"is_secret": false,
37023702
"is_verified": false,
3703-
"line_number": 73,
3703+
"line_number": 74,
37043704
"type": "Secret Keyword",
37053705
"verified_result": null
37063706
},
37073707
{
37083708
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
37093709
"is_secret": false,
37103710
"is_verified": false,
3711-
"line_number": 601,
3711+
"line_number": 602,
37123712
"type": "Secret Keyword",
37133713
"verified_result": null
37143714
}
@@ -3736,15 +3736,15 @@
37363736
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
37373737
"is_secret": false,
37383738
"is_verified": false,
3739-
"line_number": 66,
3739+
"line_number": 67,
37403740
"type": "Secret Keyword",
37413741
"verified_result": null
37423742
},
37433743
{
37443744
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
37453745
"is_secret": false,
37463746
"is_verified": false,
3747-
"line_number": 170,
3747+
"line_number": 171,
37483748
"type": "Secret Keyword",
37493749
"verified_result": null
37503750
}
@@ -3772,15 +3772,15 @@
37723772
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
37733773
"is_secret": false,
37743774
"is_verified": false,
3775-
"line_number": 67,
3775+
"line_number": 68,
37763776
"type": "Secret Keyword",
37773777
"verified_result": null
37783778
},
37793779
{
37803780
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
37813781
"is_secret": false,
37823782
"is_verified": false,
3783-
"line_number": 885,
3783+
"line_number": 886,
37843784
"type": "Secret Keyword",
37853785
"verified_result": null
37863786
}
@@ -3790,15 +3790,15 @@
37903790
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
37913791
"is_secret": false,
37923792
"is_verified": false,
3793-
"line_number": 76,
3793+
"line_number": 77,
37943794
"type": "Secret Keyword",
37953795
"verified_result": null
37963796
},
37973797
{
37983798
"hashed_secret": "cf82ffec7623dc7b6f0931140a5b5bae30f5cc69",
37993799
"is_secret": false,
38003800
"is_verified": false,
3801-
"line_number": 618,
3801+
"line_number": 619,
38023802
"type": "Secret Keyword",
38033803
"verified_result": null
38043804
}
@@ -3808,15 +3808,15 @@
38083808
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
38093809
"is_secret": false,
38103810
"is_verified": false,
3811-
"line_number": 67,
3811+
"line_number": 68,
38123812
"type": "Secret Keyword",
38133813
"verified_result": null
38143814
},
38153815
{
38163816
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
38173817
"is_secret": false,
38183818
"is_verified": false,
3819-
"line_number": 312,
3819+
"line_number": 313,
38203820
"type": "Secret Keyword",
38213821
"verified_result": null
38223822
}
@@ -3826,7 +3826,7 @@
38263826
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
38273827
"is_secret": false,
38283828
"is_verified": false,
3829-
"line_number": 731,
3829+
"line_number": 736,
38303830
"type": "Secret Keyword",
38313831
"verified_result": null
38323832
}
@@ -4769,6 +4769,16 @@
47694769
"verified_result": null
47704770
}
47714771
],
4772+
"website/docs/d/pi_network_peer_route_filter.html.markdown": [
4773+
{
4774+
"hashed_secret": "e22a2c86b8cfdb254165910934051a52ba2e3c06",
4775+
"is_secret": false,
4776+
"is_verified": false,
4777+
"line_number": 19,
4778+
"type": "Base64 High Entropy String",
4779+
"verified_result": null
4780+
}
4781+
],
47724782
"website/docs/d/sm_public_certificate_configuration_ca_lets_encrypt.html.markdown": [
47734783
{
47744784
"hashed_secret": "1348b145fa1a555461c1b790a2f66614781091e9",
@@ -4805,6 +4815,22 @@
48054815
"line_number": 206,
48064816
"type": "Secret Keyword",
48074817
"verified_result": null
4818+
},
4819+
{
4820+
"hashed_secret": "cca04aa5bbf459bb406df2c401738966138d0dba",
4821+
"is_secret": false,
4822+
"is_verified": false,
4823+
"line_number": 222,
4824+
"type": "Secret Keyword",
4825+
"verified_result": null
4826+
},
4827+
{
4828+
"hashed_secret": "5e9b97965aa8f82caad07bb66151c2dafb4ab322",
4829+
"is_secret": false,
4830+
"is_verified": false,
4831+
"line_number": 224,
4832+
"type": "Secret Keyword",
4833+
"verified_result": null
48084834
}
48094835
],
48104836
"website/docs/r/account_settings_template.html.markdown": [
@@ -5450,15 +5476,15 @@
54505476
"hashed_secret": "13ef22c6a31093830639f12a9feb34a8acd9c34f",
54515477
"is_secret": false,
54525478
"is_verified": false,
5453-
"line_number": 36,
5479+
"line_number": 33,
54545480
"type": "Hex High Entropy String",
54555481
"verified_result": null
54565482
},
54575483
{
54585484
"hashed_secret": "b93b47a3e2ea958f8ca87a70ebc9ad0f4d5ffa45",
54595485
"is_secret": false,
54605486
"is_verified": false,
5461-
"line_number": 56,
5487+
"line_number": 53,
54625488
"type": "Hex High Entropy String",
54635489
"verified_result": null
54645490
}

‎examples/ibm-project/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ resource "ibm_project" "project_instance" {
2929
destroy_on_delete = true
3030
monitoring_enabled = true
3131
auto_deploy = true
32+
auto_deploy_mode = "auto_approval"
3233
}
3334
}
3435

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/IBM-Cloud/power-go-client v1.13.0
99
github.com/IBM/appconfiguration-go-admin-sdk v0.5.1
1010
github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f
11-
github.com/IBM/cloud-databases-go-sdk v0.8.0
11+
github.com/IBM/cloud-databases-go-sdk v0.8.1
1212
github.com/IBM/cloud-db2-go-sdk v0.2.4
1313
github.com/IBM/cloudant-go-sdk v0.8.0
1414
github.com/IBM/code-engine-go-sdk v0.0.0-20241217191651-e1821f8c58c3
@@ -31,7 +31,7 @@ require (
3131
github.com/IBM/mqcloud-go-sdk v0.4.0
3232
github.com/IBM/networking-go-sdk v0.51.12
3333
github.com/IBM/platform-services-go-sdk v0.87.0
34-
github.com/IBM/project-go-sdk v0.3.8
34+
github.com/IBM/project-go-sdk v0.3.9
3535
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
3636
github.com/IBM/sarama v1.45.0
3737
github.com/IBM/scc-go-sdk/v5 v5.5.3

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ github.com/IBM/appconfiguration-go-admin-sdk v0.5.1 h1:EAotl3yQ/u5u/uBryySJMm0CO
101101
github.com/IBM/appconfiguration-go-admin-sdk v0.5.1/go.mod h1:ikqhyFenxA/QgGh4vItBNjPes0NcI+teRof+z7pzLYM=
102102
github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f h1:4c1kqY4GqmkQ+tO03rneDb74Tv7BhTj8jDiDB1p8mdM=
103103
github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f/go.mod h1:d22kTYY7RYBWcQlZpqrSdshpB/lJ16viWS5Sbjtlc8s=
104-
github.com/IBM/cloud-databases-go-sdk v0.8.0 h1:uMFqhnc/roVTzfCaUsJ23eaHKjChhGpM1F7Mpxik0bo=
105-
github.com/IBM/cloud-databases-go-sdk v0.8.0/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc=
104+
github.com/IBM/cloud-databases-go-sdk v0.8.1 h1:ULQ5L8V/9z79/qS185LqbIK2LD4kMtk3Hdhp4lFMVcw=
105+
github.com/IBM/cloud-databases-go-sdk v0.8.1/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc=
106106
github.com/IBM/cloud-db2-go-sdk v0.2.4 h1:kCiFoKav2FVrZqukoSAp0ivH8xBZDYipFBNkiyAXDw0=
107107
github.com/IBM/cloud-db2-go-sdk v0.2.4/go.mod h1:U1E6eRDEL5zWTE+aP9zWRC1DyaXB29a0kkTvhlCT9Wc=
108108
github.com/IBM/cloudant-go-sdk v0.8.0 h1:XzaqZFy5fm1Q9+iK52X5zRW39SHaahT9pf5SRgVTsTY=
@@ -128,8 +128,8 @@ github.com/IBM/go-sdk-core/v5 v5.6.3/go.mod h1:tt/B9rxLkRtglE7pvqLuYikgCXaZFL3bt
128128
github.com/IBM/go-sdk-core/v5 v5.9.5/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE=
129129
github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2ywAPwW4VJjdI=
130130
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
131-
github.com/IBM/go-sdk-core/v5 v5.19.0 h1:YN2S5JUvq/EwYulmcNFwgyYBxZhVWl9nkY22H7Hpghw=
132-
github.com/IBM/go-sdk-core/v5 v5.19.0/go.mod h1:deZO1J5TSlU69bCnl/YV7nPxFZA2UEaup7cq/7ZTOgw=
131+
github.com/IBM/go-sdk-core/v5 v5.20.1 h1:dzeyifh1kfRLw8VfAIIS5okZYuqLTqplPZP/Kcsgdlo=
132+
github.com/IBM/go-sdk-core/v5 v5.20.1/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
133133
github.com/IBM/go-sdk-core/v5 v5.21.0 h1:DUnYhvC4SoC8T84rx5omnhY3+xcQg/Whyoa3mDPIMkk=
134134
github.com/IBM/go-sdk-core/v5 v5.21.0/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
135135
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3 h1:9TZHocmCfgmF8TGVrpP1kFyQbjcqLNW7+bM07lefpKQ=
@@ -155,8 +155,8 @@ github.com/IBM/networking-go-sdk v0.51.12 h1:2qv6neG8msFR1dtf9v+rbaC2gIkw9Hnzohv
155155
github.com/IBM/networking-go-sdk v0.51.12/go.mod h1:TAXWyBUk3C3R7aS1m84EfKdnDcBMZMAClwLfDj/SYZc=
156156
github.com/IBM/platform-services-go-sdk v0.87.0 h1:hLx/I7n7cb1CyAXdb2qypmCoFiYuxh2g50qN8OGnEQc=
157157
github.com/IBM/platform-services-go-sdk v0.87.0/go.mod h1:aGD045m6I8pfcB77wft8w2cHqWOJjcM3YSSV55BX0Js=
158-
github.com/IBM/project-go-sdk v0.3.8 h1:RPu4vrNHLrs1+csKMI/TWXCgJMf23la8IM2OBd+zb1o=
159-
github.com/IBM/project-go-sdk v0.3.8/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo=
158+
github.com/IBM/project-go-sdk v0.3.9 h1:D/UfMMn+vMQyvYf9EfocV6HrD3HcVpeIVoUSjNKuROo=
159+
github.com/IBM/project-go-sdk v0.3.9/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo=
160160
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 h1:NPUhkoOCRuv3OFWt19PmwjXGGTKlvmbuPg9fUrBUNe4=
161161
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5/go.mod h1:b07XHUVh0XYnQE9s2mqgjYST1h9buaQNqN4EcKhOsX0=
162162
github.com/IBM/sarama v1.45.0 h1:IzeBevTn809IJ/dhNKhP5mpxEXTmELuezO2tgHD9G5E=

‎ibm/service/cos/resource_ibm_cos_bucket.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"context"
88
"fmt"
99
"log"
10+
"os"
1011
"regexp"
1112
"strings"
1213
"time"
@@ -1791,7 +1792,13 @@ func parseBucketId(id string, info string) string {
17911792
if info == "endpointType" {
17921793
s := strings.Split(meta, ":")
17931794
if len(s) > 2 {
1794-
return strings.Split(meta, ":")[2]
1795+
eType := strings.Split(meta, ":")[2]
1796+
// This changes is only for Schematics
1797+
schET := os.Getenv("IBMCLOUD_ENV_SCH_COS_ENDPOINT_OVERRIDE")
1798+
if eType != "" && eType == "private" && schET != "" {
1799+
return schET
1800+
}
1801+
return eType
17951802
}
17961803
return ""
17971804

0 commit comments

Comments
 (0)