Skip to content

Commit ae308c2

Browse files
uibmuibm
committed
Merge branch 'master' into vnip2-sdk
2 parents db2abe7 + 61a6083 commit ae308c2

File tree

75 files changed

+2080
-381
lines changed

Some content is hidden

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

75 files changed

+2080
-381
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/[email protected].0
23+
uses: actions/[email protected].1
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/[email protected].0
9+
- uses: actions/[email protected].1
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/[email protected].0
23+
uses: actions/[email protected].1
2424
-
2525
name: Unshallow
2626
run: git fetch --prune --unshallow

‎.secrets.baseline‎

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
"files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2023-09-19T16:31:40Z",
6+
"generated_at": "2023-10-06T11:01:49Z",
77
"plugins_used": [
8-
{
9-
"name": "AWSKeyDetector"
10-
},
118
{
129
"name": "ArtifactoryDetector"
1310
},
@@ -21,12 +18,6 @@
2118
{
2219
"name": "BasicAuthDetector"
2320
},
24-
{
25-
"name": "BoxDetector"
26-
},
27-
{
28-
"name": "CloudantDetector"
29-
},
3021
{
3122
"ghe_instance": "github.ibm.com",
3223
"name": "GheDetector"
@@ -51,9 +42,6 @@
5142
"keyword_exclude": null,
5243
"name": "KeywordDetector"
5344
},
54-
{
55-
"name": "MailchimpDetector"
56-
},
5745
{
5846
"name": "NpmDetector"
5947
},
@@ -68,12 +56,6 @@
6856
},
6957
{
7058
"name": "SquareOAuthDetector"
71-
},
72-
{
73-
"name": "StripeDetector"
74-
},
75-
{
76-
"name": "TwilioKeyDetector"
7759
}
7860
],
7961
"results": {
@@ -742,23 +724,23 @@
742724
"hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
743725
"is_secret": false,
744726
"is_verified": false,
745-
"line_number": 353,
727+
"line_number": 355,
746728
"type": "Secret Keyword",
747729
"verified_result": null
748730
},
749731
{
750732
"hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
751733
"is_secret": false,
752734
"is_verified": false,
753-
"line_number": 359,
735+
"line_number": 361,
754736
"type": "Secret Keyword",
755737
"verified_result": null
756738
},
757739
{
758740
"hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
759741
"is_secret": false,
760742
"is_verified": false,
761-
"line_number": 1065,
743+
"line_number": 1072,
762744
"type": "Base64 High Entropy String",
763745
"verified_result": null
764746
}
@@ -846,15 +828,15 @@
846828
"hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
847829
"is_secret": false,
848830
"is_verified": false,
849-
"line_number": 1763,
831+
"line_number": 1766,
850832
"type": "Secret Keyword",
851833
"verified_result": null
852834
},
853835
{
854836
"hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
855837
"is_secret": false,
856838
"is_verified": false,
857-
"line_number": 1769,
839+
"line_number": 1772,
858840
"type": "Secret Keyword",
859841
"verified_result": null
860842
}
@@ -3014,15 +2996,15 @@
30142996
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
30152997
"is_secret": false,
30162998
"is_verified": false,
3017-
"line_number": 177,
2999+
"line_number": 181,
30183000
"type": "Secret Keyword",
30193001
"verified_result": null
30203002
},
30213003
{
30223004
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
30233005
"is_secret": false,
30243006
"is_verified": false,
3025-
"line_number": 317,
3007+
"line_number": 308,
30263008
"type": "Secret Keyword",
30273009
"verified_result": null
30283010
}
@@ -3070,15 +3052,15 @@
30703052
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
30713053
"is_secret": false,
30723054
"is_verified": false,
3073-
"line_number": 189,
3055+
"line_number": 193,
30743056
"type": "Secret Keyword",
30753057
"verified_result": null
30763058
},
30773059
{
30783060
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
30793061
"is_secret": false,
30803062
"is_verified": false,
3081-
"line_number": 345,
3063+
"line_number": 335,
30823064
"type": "Secret Keyword",
30833065
"verified_result": null
30843066
}
@@ -3088,15 +3070,15 @@
30883070
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
30893071
"is_secret": false,
30903072
"is_verified": false,
3091-
"line_number": 227,
3073+
"line_number": 231,
30923074
"type": "Secret Keyword",
30933075
"verified_result": null
30943076
},
30953077
{
30963078
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
30973079
"is_secret": false,
30983080
"is_verified": false,
3099-
"line_number": 420,
3081+
"line_number": 410,
31003082
"type": "Secret Keyword",
31013083
"verified_result": null
31023084
}
@@ -3142,15 +3124,15 @@
31423124
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
31433125
"is_secret": false,
31443126
"is_verified": false,
3145-
"line_number": 292,
3127+
"line_number": 296,
31463128
"type": "Secret Keyword",
31473129
"verified_result": null
31483130
},
31493131
{
31503132
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
31513133
"is_secret": false,
31523134
"is_verified": false,
3153-
"line_number": 489,
3135+
"line_number": 479,
31543136
"type": "Secret Keyword",
31553137
"verified_result": null
31563138
}
@@ -3272,15 +3254,15 @@
32723254
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
32733255
"is_secret": false,
32743256
"is_verified": false,
3275-
"line_number": 154,
3257+
"line_number": 158,
32763258
"type": "Secret Keyword",
32773259
"verified_result": null
32783260
},
32793261
{
32803262
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
32813263
"is_secret": false,
32823264
"is_verified": false,
3283-
"line_number": 283,
3265+
"line_number": 274,
32843266
"type": "Secret Keyword",
32853267
"verified_result": null
32863268
}
@@ -4201,14 +4183,6 @@
42014183
"line_number": 24,
42024184
"type": "Secret Keyword",
42034185
"verified_result": null
4204-
},
4205-
{
4206-
"hashed_secret": "69d7a780b792608707bd8579c295cb5028505f0b",
4207-
"is_secret": false,
4208-
"is_verified": false,
4209-
"line_number": 24,
4210-
"type": "Box Credentials",
4211-
"verified_result": null
42124186
}
42134187
],
42144188
"website/docs/r/en_destination_ios.html.markdown": [
@@ -4758,7 +4732,7 @@
47584732
}
47594733
]
47604734
},
4761-
"version": "0.13.1+ibm.52.dss",
4735+
"version": "0.13.1+ibm.61.dss",
47624736
"word_list": {
47634737
"file": null,
47644738
"hash": null

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 1.58.1 (Oct 04, 2023)
2+
3+
Bug Fixes
4+
* Timing issue while destroying Key Protect resources ([4837](https://github.com/IBM-Cloud/terraform-provider-ibm/issues/4837))
5+
* ibm_cos_bucket data lookup is throwing NoSuchWebsiteConfiguration in new version 1.58.0 ([4838](https://github.com/IBM-Cloud/terraform-provider-ibm/issues/4838))
6+
* Metrics router and atracker: Updated platform-services-go-sdk to fetch Madrid endpoint ([4830](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4830))
17
# 1.58.0 (Sep 29, 2023)
28

39
Features

‎examples/ibm-is-ng/main.tf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,20 @@ data "ibm_is_backup_policy_plan" "is_backup_policy_plan" {
11431143
name = "my-backup-policy-plan"
11441144
}
11451145

1146+
//backup policies for enterprise
1147+
1148+
resource "ibm_is_backup_policy" "ent-baas-example" {
1149+
match_user_tags = ["tag1"]
1150+
name = "example-enterprise-backup-policy"
1151+
scope {
1152+
crn = "crn:v1:bluemix:public:is:us-south:a/123456::reservation:7187-ba49df72-37b8-43ac-98da-f8e029de0e63"
1153+
}
1154+
}
1155+
1156+
data "ibm_is_backup_policy" "enterprise_backup" {
1157+
name = ibm_is_backup_policy.ent-baas-example.name
1158+
}
1159+
11461160
// Vpn Server
11471161
resource "ibm_is_vpn_server" "is_vpn_server" {
11481162
certificate_crn = var.is_certificate_crn

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
3030
github.com/IBM/scc-go-sdk/v5 v5.1.2
3131
github.com/IBM/schematics-go-sdk v0.2.1
32-
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.0
32+
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.1
3333
github.com/IBM/vpc-beta-go-sdk v0.6.0
3434
github.com/IBM/vpc-go-sdk v0.42.0
3535
github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
@@ -54,7 +54,7 @@ require (
5454
github.com/pkg/errors v0.9.1
5555
github.com/rook/rook v1.11.4
5656
github.com/softlayer/softlayer-go v1.0.3
57-
golang.org/x/crypto v0.11.0
57+
golang.org/x/crypto v0.14.0
5858
gopkg.in/yaml.v3 v3.0.1
5959
gotest.tools v2.2.0+incompatible
6060
k8s.io/api v0.26.3
@@ -198,11 +198,11 @@ require (
198198
github.com/zclconf/go-cty v1.11.0 // indirect
199199
go.mongodb.org/mongo-driver v1.11.6 // indirect
200200
go.uber.org/ratelimit v0.2.0 // indirect
201-
golang.org/x/net v0.12.0 // indirect
201+
golang.org/x/net v0.17.0 // indirect
202202
golang.org/x/oauth2 v0.7.0 // indirect
203-
golang.org/x/sys v0.10.0 // indirect
204-
golang.org/x/term v0.10.0 // indirect
205-
golang.org/x/text v0.11.0 // indirect
203+
golang.org/x/sys v0.13.0 // indirect
204+
golang.org/x/term v0.13.0 // indirect
205+
golang.org/x/text v0.13.0 // indirect
206206
golang.org/x/time v0.3.0 // indirect
207207
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
208208
google.golang.org/appengine v1.6.7 // indirect

‎go.sum‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ github.com/IBM/scc-go-sdk/v5 v5.1.2 h1:9axGtNlP3bHhoE9yJgCuc+g5/VdyhYqfhZ5oS3ovC
166166
github.com/IBM/scc-go-sdk/v5 v5.1.2/go.mod h1:YtAVlzq10bwR82QX4ZavhDIwa1s85RuVO9N/KmXVcuk=
167167
github.com/IBM/schematics-go-sdk v0.2.1 h1:byATysGD+Z1k/wdtNqQmKALcAPjgSLuSyzcabh1jRAw=
168168
github.com/IBM/schematics-go-sdk v0.2.1/go.mod h1:Tw2OSAPdpC69AxcwoyqcYYaGTTW6YpERF9uNEU+BFRQ=
169-
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.0 h1:Lx4Bvim/MfoHEYR+n312bty5DirAJypBGGS9YZo3zCw=
170-
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.0/go.mod h1:jagqWmjZ0zUEqh5jdGB42ApSQS40fu2LWw6pdg8JJko=
169+
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.1 h1:0Ouu31RsuOLdH26oNsnPErEjctWTplLEIXxwExnTZT0=
170+
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.1/go.mod h1:jagqWmjZ0zUEqh5jdGB42ApSQS40fu2LWw6pdg8JJko=
171171
github.com/IBM/vpc-beta-go-sdk v0.6.0 h1:wfM3AcW3zOM3xsRtZ+EA6+sESlGUjQ6Yf4n5QQyz4uc=
172172
github.com/IBM/vpc-beta-go-sdk v0.6.0/go.mod h1:fzHDAQIqH/5yJmYsKodKHLcqxMDT+yfH6vZjdiw8CQA=
173173
github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
@@ -1699,8 +1699,9 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
16991699
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
17001700
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
17011701
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
1702-
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
17031702
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
1703+
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
1704+
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
17041705
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
17051706
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
17061707
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1824,8 +1825,9 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
18241825
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
18251826
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
18261827
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
1827-
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
18281828
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
1829+
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
1830+
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
18291831
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
18301832
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
18311833
golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1968,8 +1970,9 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19681970
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19691971
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19701972
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1971-
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
19721973
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1974+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
1975+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19731976
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
19741977
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
19751978
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -1981,8 +1984,9 @@ golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
19811984
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
19821985
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
19831986
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
1984-
golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
19851987
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
1988+
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
1989+
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
19861990
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
19871991
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
19881992
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2000,8 +2004,9 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
20002004
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
20012005
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
20022006
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
2003-
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
20042007
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
2008+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
2009+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
20052010
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
20062011
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
20072012
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎ibm/acctest/acctest.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ var (
6868
UpdatedCertCRN string
6969
SecretCRN string
7070
SecretCRN2 string
71+
EnterpriseCRN string
7172
InstanceCRN string
7273
SecretGroupID string
7374
RegionName string
@@ -1444,6 +1445,11 @@ func init() {
14441445
fmt.Println("[WARN] Set the environment variable IES_API_KEY for testing Event streams targets, the tests will fail if this is not set")
14451446
}
14461447

1448+
EnterpriseCRN = os.Getenv("ENTERPRISE_CRN")
1449+
if EnterpriseCRN == "" {
1450+
fmt.Println("[WARN] Set the environment variable ENTERPRISE_CRN for testing enterprise backup policy, the tests will fail if this is not set")
1451+
}
1452+
14471453
CeResourceGroupID = os.Getenv("IBM_CODE_ENGINE_RESOURCE_GROUP_ID")
14481454
if CeResourceGroupID == "" {
14491455
CeResourceGroupID = ""

‎ibm/service/kms/resource_ibm_kms_key_rings.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ func resourceIBMKmsKeyRingDelete(d *schema.ResourceData, meta interface{}) error
153153
err = kpAPI.DeleteKeyRing(context.Background(), id[0], kp.WithForce(force_delete))
154154
if err != nil {
155155
kpError := err.(*kp.Error)
156-
if kpError.StatusCode == 404 {
156+
// Key ring deletion used to occur by silencing the 409 failed deletion and allowing instance deletion to clean it up
157+
// Will be deprecated in the future in favor of force_delete flag
158+
if kpError.StatusCode == 404 || kpError.StatusCode == 409 {
157159
return nil
158160
} else {
159161
return fmt.Errorf(" failed to Destroy key ring with error: %s", err)

0 commit comments

Comments
 (0)