Skip to content

Commit 1ce4422

Browse files
authored
Merge branch 'main' into gg/sqlserverflex-sdk-update
2 parents 2bf1d75 + e457a12 commit 1ce4422

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

.github/docs/contribution-guide/resource.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ func (r *barResource) Read(ctx context.Context, req resource.ReadRequest, resp *
263263
return
264264
}
265265

266-
readTimeout, diags := model.Timeouts.Create(ctx, core.DefaultOperationTimeout)
266+
readTimeout, diags := model.Timeouts.Read(ctx, core.DefaultOperationTimeout)
267267
resp.Diagnostics.Append(diags...)
268268
if resp.Diagnostics.HasError() {
269269
return
@@ -318,7 +318,7 @@ func (r *barResource) Delete(ctx context.Context, req resource.DeleteRequest, re
318318
}
319319

320320
waiterTimeout := wait.DeleteBarWaitHandler(ctx, r.client, projectId, region, barId).GetTimeout()
321-
deleteTimeout, diags := model.Timeouts.Create(ctx, waiterTimeout+core.DefaultTimeoutMargin)
321+
deleteTimeout, diags := model.Timeouts.Delete(ctx, waiterTimeout+core.DefaultTimeoutMargin)
322322
resp.Diagnostics.Append(diags...)
323323
if resp.Diagnostics.HasError() {
324324
return

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/hashicorp/terraform-plugin-log v0.10.0
1414
github.com/hashicorp/terraform-plugin-testing v1.14.0
1515
github.com/stackitcloud/stackit-sdk-go/core v0.25.0
16-
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.0
16+
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.1
1717
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.14.0
1818
github.com/stackitcloud/stackit-sdk-go/services/certificates v1.4.1
1919
github.com/stackitcloud/stackit-sdk-go/services/dns v0.19.1
@@ -24,7 +24,7 @@ require (
2424
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.12.0
2525
github.com/stackitcloud/stackit-sdk-go/services/logme v0.27.1
2626
github.com/stackitcloud/stackit-sdk-go/services/logs v0.7.1
27-
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.27.1
27+
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.28.1
2828
github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.8.1
2929
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.7.2
3030
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.7.0

go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -670,8 +670,8 @@ github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YE
670670
github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I=
671671
github.com/stackitcloud/stackit-sdk-go/core v0.25.0 h1:ra3VEk684MNoq741g+xbZrKjZzhyztq5liUAwwew4DY=
672672
github.com/stackitcloud/stackit-sdk-go/core v0.25.0/go.mod h1:WU1hhxnjXw2EV7CYa1nlEvNpMiRY6CvmIOaHuL3pOaA=
673-
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.0 h1:ibBsculyrtqb6GKkrP44V3A7HbW4NbzywehPAeiRlEU=
674-
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.0/go.mod h1:DlW5YgdOPqllDnxTL4Y3XAwrarfzHWkQfhDg5YIegXg=
673+
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.1 h1:hlos/aew02XKWtq1ss9EQh1UCzV1SXArYioew+WIv2M=
674+
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.1/go.mod h1:yYC61OsTtLZsrcq8l/JCI6MjvxLT4E2wMQj6LXc7prA=
675675
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0 h1:HxPgBu04j5tj6nfZ2r0l6v4VXC0/tYOGe4sA5Addra8=
676676
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0/go.mod h1:uYI9pHAA2g84jJN25ejFUxa0/JtfpPZqMDkctQ1BzJk=
677677
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.14.0 h1:6pxndY7vzu4/L2dpgHaXw3x0b6FZKEVVZMhi7/i0rAo=
@@ -694,8 +694,8 @@ github.com/stackitcloud/stackit-sdk-go/services/logme v0.27.1 h1:6AaWxQNtOEvIvbt
694694
github.com/stackitcloud/stackit-sdk-go/services/logme v0.27.1/go.mod h1:qwpGNPgF7LmfodGPXcgv9uldeSSuFMNJkyD6QPqfiCI=
695695
github.com/stackitcloud/stackit-sdk-go/services/logs v0.7.1 h1:cuQA5dO8WSM0LBHR2FBpf+RgKH7/DE7+5NUPLxDpgPg=
696696
github.com/stackitcloud/stackit-sdk-go/services/logs v0.7.1/go.mod h1:di3QDHwOlpa99dXRuGLcuyDCi0A+zlMtgzYi2okQMr8=
697-
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.27.1 h1:YK2HxO+Nffe5BTt8jtWUyyES3sarjIH1GWlrqRaa4Ec=
698-
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.27.1/go.mod h1:/8x9gLPt1ZqcAtyVP3dwqKA9FtdHMn5pcy1TSS5iSSg=
697+
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.28.1 h1:ZcDYk4kjqZsw0zf4V4E3qIBemn1w2sS2xmq513tUlHA=
698+
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.28.1/go.mod h1:+vb1QGTPB1ot/se+MAkFUOxFAl7McSCJdjphtGWlzXc=
699699
github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.8.1 h1:qBPfWK6Xpi7eYFAZCOR4H2wkJqZMRadfAbBdJ4Qrktk=
700700
github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.8.1/go.mod h1:b8L6f68HZce01y+eZ1o7KTRAkgpWhggpvakAEwnxnCs=
701701
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.7.2 h1:ymhDgp6+RXBvmi9nugaVCi3MN0q2pC62SD+Nh5nTB84=
@@ -716,8 +716,6 @@ github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.0 h1:bT/qo
716716
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.0/go.mod h1:jiPIzF8lcm5Dx0TkDK2CBgeRBHSRUqwyX+z/zqo1bes=
717717
github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0 h1:ip9BODkeeDXB5Y2i5pfyIBX+VMmfUWlfIMvdQJitZyg=
718718
github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0/go.mod h1:JuJbNkydnm1OFGiRweiLyOUqR6prSOveJC14b1oG+Ok=
719-
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3 h1:3hZSg3z+4AXa5LbR2Vl38VmSA83ABItE63E53LuyWv8=
720-
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3/go.mod h1:5unx5r0IgeFCtJDEgsWddtgKvYSw442FDNdhtfyJnQI=
721719
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0 h1:6gDKTxdPzabtJ4cPzNgCgsT2+z8v80DSCx476HqzaXk=
722720
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0/go.mod h1:vSWUMTsMbtniEo1I+eCsjCOTODR4iproNAeqG3vr/4I=
723721
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8 h1:LLyANBzE8sQa0/49tQBqq4sVLhNgwdqCeQm76srJHWw=

0 commit comments

Comments
 (0)