Skip to content

Commit 5182f8a

Browse files
authored
Merge branch 'main' into chore/sfs-sdk-migration
2 parents dce6a60 + 0d7331b commit 5182f8a

49 files changed

Lines changed: 645 additions & 628 deletions

Some content is hidden

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

.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: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,33 @@ require (
1212
github.com/hashicorp/terraform-plugin-go v0.30.0
1313
github.com/hashicorp/terraform-plugin-log v0.10.0
1414
github.com/hashicorp/terraform-plugin-testing v1.14.0
15-
github.com/stackitcloud/stackit-sdk-go/core v0.24.1
16-
github.com/stackitcloud/stackit-sdk-go/services/alb v0.12.1
17-
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.13.0
15+
github.com/stackitcloud/stackit-sdk-go/core v0.25.0
16+
github.com/stackitcloud/stackit-sdk-go/services/alb v0.14.1
17+
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
20-
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.0
20+
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.1
2121
github.com/stackitcloud/stackit-sdk-go/services/git v0.11.0
2222
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5
2323
github.com/stackitcloud/stackit-sdk-go/services/kms v1.6.0
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
3131
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0
3232
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.26.1
33-
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5
33+
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.6.2
3434
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.29.0
35-
github.com/stackitcloud/stackit-sdk-go/services/redis v0.27.3
35+
github.com/stackitcloud/stackit-sdk-go/services/redis v0.28.1
3636
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.0
37-
github.com/stackitcloud/stackit-sdk-go/services/scf v0.6.1
37+
github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0
3838
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3
39-
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8
39+
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.0
40+
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0
41+
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.0
4042
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0
4143
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
4244
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.4.1

go.sum

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -668,20 +668,22 @@ github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
668668
github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
669669
github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0=
670670
github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I=
671-
github.com/stackitcloud/stackit-sdk-go/core v0.24.1 h1:IrG0XBlJivUpXC4Y6TE+6FeSxNPs1JQXsero0ivwh0o=
672-
github.com/stackitcloud/stackit-sdk-go/core v0.24.1/go.mod h1:osMglDby4csGZ5sIfhNyYq1bS1TxIdPY88+skE/kkmI=
673-
github.com/stackitcloud/stackit-sdk-go/services/alb v0.12.1 h1:RKaxAymxlyxxE0Gta3yRuQWf07LnlcX+mfGnVB96NHA=
674-
github.com/stackitcloud/stackit-sdk-go/services/alb v0.12.1/go.mod h1:FHkV5L9vCQha+5MX+NdMdYjQIHXcLr95+bu1FN91QOM=
671+
github.com/stackitcloud/stackit-sdk-go/core v0.25.0 h1:ra3VEk684MNoq741g+xbZrKjZzhyztq5liUAwwew4DY=
672+
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.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=
677-
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.13.0 h1:iRJK2d3I2QqWp8hqhxlkCtQDNb7fwKHkik9ogmcx2o8=
678-
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.13.0/go.mod h1:URWWMIbvq4YgWdGYCbccr3eat4Y+0qRpufZsEAsvoLM=
677+
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.14.0 h1:6pxndY7vzu4/L2dpgHaXw3x0b6FZKEVVZMhi7/i0rAo=
678+
github.com/stackitcloud/stackit-sdk-go/services/cdn v1.14.0/go.mod h1:9880AP8tlxSQujlJN+txlcnHp9keC5cOP2EFzOIZjmg=
679679
github.com/stackitcloud/stackit-sdk-go/services/certificates v1.4.1 h1:RBY/mNR4H8Vd/7z0nky+AQNvoaZ16hvrGSuYi1YLLao=
680680
github.com/stackitcloud/stackit-sdk-go/services/certificates v1.4.1/go.mod h1:3R/RwYdBc1s6WZNhToWs0rBDropbNRM7okOAdjY3rpU=
681681
github.com/stackitcloud/stackit-sdk-go/services/dns v0.19.1 h1:VfszhFq/Snsd0LnflS8PbM0d9cG98hOFpamfjlcTnDQ=
682682
github.com/stackitcloud/stackit-sdk-go/services/dns v0.19.1/go.mod h1:gBv6YkB3Xf3c0ZXg2GwtWY8zExwGPF/Ag114XiiERxg=
683683
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.0 h1:lsOTEvItzrUerCzUodyyOy6pZ4QiSzwID7U20ZvZvHw=
684684
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.0/go.mod h1:CfqSEGCW0b5JlijCwtUT1kfjThmQ5jXX47TWrdD5rTU=
685+
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.1 h1:G21hx6vztR1Np+K+MXsK1td/CKbKHdLK89zvtH6OoKk=
686+
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.1/go.mod h1:qHuMB/qt7w1u5Xk3qzP3pJFXjTqPrtpM2bMhKpIvM3I=
685687
github.com/stackitcloud/stackit-sdk-go/services/git v0.11.0 h1:siKBCYl7BwR5S25Y4SwUAX6eFTXSCkQ+8JIQEqyKIXo=
686688
github.com/stackitcloud/stackit-sdk-go/services/git v0.11.0/go.mod h1:QKy74hhLVZKXItw3y+elF8s9QezFqpEsAUmaqvNDzYs=
687689
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5 h1:W57+XRa8wTLsi5CV9Tqa7mGgt/PvlRM//RurXSmvII8=
@@ -694,8 +696,8 @@ github.com/stackitcloud/stackit-sdk-go/services/logme v0.27.1 h1:6AaWxQNtOEvIvbt
694696
github.com/stackitcloud/stackit-sdk-go/services/logme v0.27.1/go.mod h1:qwpGNPgF7LmfodGPXcgv9uldeSSuFMNJkyD6QPqfiCI=
695697
github.com/stackitcloud/stackit-sdk-go/services/logs v0.7.1 h1:cuQA5dO8WSM0LBHR2FBpf+RgKH7/DE7+5NUPLxDpgPg=
696698
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=
699+
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.28.1 h1:ZcDYk4kjqZsw0zf4V4E3qIBemn1w2sS2xmq513tUlHA=
700+
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.28.1/go.mod h1:+vb1QGTPB1ot/se+MAkFUOxFAl7McSCJdjphtGWlzXc=
699701
github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.8.1 h1:qBPfWK6Xpi7eYFAZCOR4H2wkJqZMRadfAbBdJ4Qrktk=
700702
github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.8.1/go.mod h1:b8L6f68HZce01y+eZ1o7KTRAkgpWhggpvakAEwnxnCs=
701703
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.7.2 h1:ymhDgp6+RXBvmi9nugaVCi3MN0q2pC62SD+Nh5nTB84=
@@ -708,18 +710,22 @@ github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.26.1 h1:AO5Np67/w0
708710
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.26.1/go.mod h1:Reo2Nk3yiA686quUMrk0eKwzpzaAZ7KwmzHzScNdG8Q=
709711
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5 h1:H67e3KnHQx954yI8fuQmxXwRf/myqAdLg2KvxImp00g=
710712
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5/go.mod h1:xmAWk9eom8wznvLuLfm0F4xyeiBX8LaggXsKFmos+dw=
713+
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.6.2 h1:5Op07pEs6dcJxfi2UjT1645k1uMf1xMbY8/D3A797aA=
714+
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.6.2/go.mod h1:AqFWa9kddt2Wqe8k1Kw5FB1mlHG30K1FGsJx8dw/r1c=
711715
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.29.0 h1:I8NF8Q5nRj7/7qDI8Qm4oI0KCNQcOjE6kqyBdWcUoxk=
712716
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.29.0/go.mod h1:wk2Oz+7pxT9YF1h6elWzdlhU6V7GSQXcGixxlXxNe+U=
713-
github.com/stackitcloud/stackit-sdk-go/services/redis v0.27.3 h1:wZIGETPQ1aiJwzJMVjatdu/Kv+/yuKVOf5RaMWW9bpU=
714-
github.com/stackitcloud/stackit-sdk-go/services/redis v0.27.3/go.mod h1:jgWx29zvZP0R3tXAC/qWU5eBsPfLBJFP96mx9hwdFPM=
717+
github.com/stackitcloud/stackit-sdk-go/services/redis v0.28.1 h1:6loJq37rLpU84HY/rzmpZrBGPz2vKqhly8mUC8NcAu0=
718+
github.com/stackitcloud/stackit-sdk-go/services/redis v0.28.1/go.mod h1:tAZ7VeO1wZO0Fp6gO/j96LLwgN0QbOD5qlWp+Ah3Yps=
715719
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.0 h1:bT/qoghsdKvLomCay9Wj4Fu63lx0cD2zr23Fjqzgotc=
716720
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.0/go.mod h1:jiPIzF8lcm5Dx0TkDK2CBgeRBHSRUqwyX+z/zqo1bes=
717-
github.com/stackitcloud/stackit-sdk-go/services/scf v0.6.1 h1:ayfCRRVTVwFGQMfjmXaDhiLyif53ibTu7zNhUTnNh2w=
718-
github.com/stackitcloud/stackit-sdk-go/services/scf v0.6.1/go.mod h1:26fU2pMiIxUZ+Az5ux3vMtaVVzhK6md+lvW0s+ONVU0=
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=
721+
github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0 h1:ip9BODkeeDXB5Y2i5pfyIBX+VMmfUWlfIMvdQJitZyg=
722+
github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0/go.mod h1:JuJbNkydnm1OFGiRweiLyOUqR6prSOveJC14b1oG+Ok=
723+
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0 h1:6gDKTxdPzabtJ4cPzNgCgsT2+z8v80DSCx476HqzaXk=
724+
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0/go.mod h1:vSWUMTsMbtniEo1I+eCsjCOTODR4iproNAeqG3vr/4I=
721725
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8 h1:LLyANBzE8sQa0/49tQBqq4sVLhNgwdqCeQm76srJHWw=
722726
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8/go.mod h1:/bmg57XZu+bGczzcoumrukiGMPGzI2mOyTT4BVIQUBs=
727+
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.0 h1:OGAaEbuoxTZnsWbtFmhkvdvCCV/RpYuE3ALQXmRyOOc=
728+
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.0/go.mod h1:h2fhcXRiSFP9yJXY8eb37e+2PhMW11g1GB8LL/EQ1aU=
723729
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0 h1:4MYNb3VQjVnVPfJ9xhDbSQgoSkxQZJ0tsv9N7O43/RI=
724730
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0/go.mod h1:iVCh5xZW/DHBMnJW4Zrw8KMhQIBRAETcnTPi5bbcQIE=
725731
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 h1:l1EDIlXce2C8JcbBDHVa6nZ4SjPTqmnALTgrhms+NKI=

stackit/internal/services/postgresflex/database/datasource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
1818

1919
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
20-
"github.com/stackitcloud/stackit-sdk-go/services/postgresflex"
20+
postgresflex "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v2api"
2121
)
2222

2323
// Ensure the implementation satisfies the expected interfaces.

stackit/internal/services/postgresflex/database/resource.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
2424
"github.com/hashicorp/terraform-plugin-framework/types"
2525
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
26-
"github.com/stackitcloud/stackit-sdk-go/services/postgresflex"
26+
postgresflex "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v2api"
2727
)
2828

2929
// Ensure the implementation satisfies the expected interfaces.
@@ -215,7 +215,7 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
215215
return
216216
}
217217
// Create new database
218-
databaseResp, err := r.client.CreateDatabase(ctx, projectId, region, instanceId).CreateDatabasePayload(*payload).Execute()
218+
databaseResp, err := r.client.DefaultAPI.CreateDatabase(ctx, projectId, region, instanceId).CreateDatabasePayload(*payload).Execute()
219219
if err != nil {
220220
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating database", fmt.Sprintf("Calling API: %v", err))
221221
return
@@ -328,7 +328,7 @@ func (r *databaseResource) Delete(ctx context.Context, req resource.DeleteReques
328328
ctx = tflog.SetField(ctx, "region", region)
329329

330330
// Delete existing record set
331-
err := r.client.DeleteDatabase(ctx, projectId, region, instanceId, databaseId).Execute()
331+
err := r.client.DefaultAPI.DeleteDatabase(ctx, projectId, region, instanceId, databaseId).Execute()
332332
if err != nil {
333333
core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting database", fmt.Sprintf("Calling API: %v", err))
334334
}
@@ -390,7 +390,7 @@ func mapFields(databaseResp *postgresflex.InstanceDatabase, model *Model, region
390390
model.Region = types.StringValue(region)
391391

392392
if databaseResp.Options != nil {
393-
owner, ok := (*databaseResp.Options)["owner"]
393+
owner, ok := (databaseResp.Options)["owner"]
394394
if ok {
395395
ownerStr, ok := owner.(string)
396396
if !ok {
@@ -423,14 +423,14 @@ var errDatabaseNotFound = errors.New("database not found")
423423

424424
// The API does not have a GetDatabase endpoint, only ListDatabases
425425
func getDatabase(ctx context.Context, client *postgresflex.APIClient, projectId, region, instanceId, databaseId string) (*postgresflex.InstanceDatabase, error) {
426-
resp, err := client.ListDatabases(ctx, projectId, region, instanceId).Execute()
426+
resp, err := client.DefaultAPI.ListDatabases(ctx, projectId, region, instanceId).Execute()
427427
if err != nil {
428428
return nil, err
429429
}
430430
if resp == nil || resp.Databases == nil {
431431
return nil, fmt.Errorf("response is nil")
432432
}
433-
for _, database := range *resp.Databases {
433+
for _, database := range resp.Databases {
434434
if database.Id != nil && *database.Id == databaseId {
435435
return &database, nil
436436
}

stackit/internal/services/postgresflex/database/resource_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/google/go-cmp/cmp"
77
"github.com/hashicorp/terraform-plugin-framework/types"
8-
"github.com/stackitcloud/stackit-sdk-go/services/postgresflex"
8+
postgresflex "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v2api"
99
)
1010

1111
func TestMapFields(t *testing.T) {
@@ -39,7 +39,7 @@ func TestMapFields(t *testing.T) {
3939
&postgresflex.InstanceDatabase{
4040
Id: new("uid"),
4141
Name: new("dbname"),
42-
Options: &map[string]any{
42+
Options: map[string]any{
4343
"owner": "username",
4444
},
4545
},
@@ -60,7 +60,7 @@ func TestMapFields(t *testing.T) {
6060
&postgresflex.InstanceDatabase{
6161
Id: new("uid"),
6262
Name: new(""),
63-
Options: &map[string]any{
63+
Options: map[string]any{
6464
"owner": "",
6565
},
6666
},
@@ -95,7 +95,7 @@ func TestMapFields(t *testing.T) {
9595
&postgresflex.InstanceDatabase{
9696
Id: new(""),
9797
Name: new("dbname"),
98-
Options: &map[string]any{
98+
Options: map[string]any{
9999
"owner": "username",
100100
},
101101
},

stackit/internal/services/postgresflex/instance/datasource.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919

2020
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
2121
"github.com/hashicorp/terraform-plugin-framework/types"
22-
"github.com/stackitcloud/stackit-sdk-go/services/postgresflex"
23-
"github.com/stackitcloud/stackit-sdk-go/services/postgresflex/wait"
22+
postgresflex "github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v2api"
23+
"github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v2api/wait"
2424
)
2525

2626
// Ensure the implementation satisfies the expected interfaces.
@@ -124,7 +124,7 @@ func (r *instanceDataSource) Schema(_ context.Context, _ datasource.SchemaReques
124124
},
125125
},
126126
},
127-
"replicas": schema.Int64Attribute{
127+
"replicas": schema.Int32Attribute{
128128
Computed: true,
129129
},
130130
"storage": schema.SingleNestedAttribute{
@@ -167,7 +167,7 @@ func (r *instanceDataSource) Read(ctx context.Context, req datasource.ReadReques
167167
ctx = tflog.SetField(ctx, "project_id", projectId)
168168
ctx = tflog.SetField(ctx, "instance_id", instanceId)
169169
ctx = tflog.SetField(ctx, "region", region)
170-
instanceResp, err := r.client.GetInstance(ctx, projectId, region, instanceId).Execute()
170+
instanceResp, err := r.client.DefaultAPI.GetInstance(ctx, projectId, region, instanceId).Execute()
171171
if err != nil {
172172
utils.LogError(
173173
ctx,

0 commit comments

Comments
 (0)