Skip to content

Commit dcf59a8

Browse files
GokceGKGokceGK
committed
chore(serviceenablement): switch to new SDK structure
1 parent 0d7331b commit dcf59a8

7 files changed

Lines changed: 17 additions & 28 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@ require (
3535
github.com/stackitcloud/stackit-sdk-go/services/redis v0.28.1
3636
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.0
3737
github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0
38-
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.14.3
39-
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.0
4038
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0
4139
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.0
4240
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0
4341
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
44-
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.4.1
42+
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.5.1
4543
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.6.3
4644
github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0
4745
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.6.1

‎go.sum‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,6 @@ github.com/stackitcloud/stackit-sdk-go/services/certificates v1.4.1 h1:RBY/mNR4H
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=
683-
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.0 h1:lsOTEvItzrUerCzUodyyOy6pZ4QiSzwID7U20ZvZvHw=
684-
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.0/go.mod h1:CfqSEGCW0b5JlijCwtUT1kfjThmQ5jXX47TWrdD5rTU=
685683
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.1 h1:G21hx6vztR1Np+K+MXsK1td/CKbKHdLK89zvtH6OoKk=
686684
github.com/stackitcloud/stackit-sdk-go/services/edge v0.8.1/go.mod h1:qHuMB/qt7w1u5Xk3qzP3pJFXjTqPrtpM2bMhKpIvM3I=
687685
github.com/stackitcloud/stackit-sdk-go/services/git v0.11.0 h1:siKBCYl7BwR5S25Y4SwUAX6eFTXSCkQ+8JIQEqyKIXo=
@@ -708,8 +706,6 @@ github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0 h1:LGwCvvS
708706
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0/go.mod h1:9KdrXC5JS30Ay3mR0adb3vNdhca+qxiy/cPF5P4wehQ=
709707
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.26.1 h1:AO5Np67/w0AUdhb6yk+CTXMzMkGdQPudmI8ryWp94fQ=
710708
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.26.1/go.mod h1:Reo2Nk3yiA686quUMrk0eKwzpzaAZ7KwmzHzScNdG8Q=
711-
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5 h1:H67e3KnHQx954yI8fuQmxXwRf/myqAdLg2KvxImp00g=
712-
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5/go.mod h1:xmAWk9eom8wznvLuLfm0F4xyeiBX8LaggXsKFmos+dw=
713709
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.6.2 h1:5Op07pEs6dcJxfi2UjT1645k1uMf1xMbY8/D3A797aA=
714710
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.6.2/go.mod h1:AqFWa9kddt2Wqe8k1Kw5FB1mlHG30K1FGsJx8dw/r1c=
715711
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.29.0 h1:I8NF8Q5nRj7/7qDI8Qm4oI0KCNQcOjE6kqyBdWcUoxk=
@@ -722,16 +718,14 @@ github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0 h1:ip9BODkeeDXB5Y2i5p
722718
github.com/stackitcloud/stackit-sdk-go/services/scf v0.7.0/go.mod h1:JuJbNkydnm1OFGiRweiLyOUqR6prSOveJC14b1oG+Ok=
723719
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0 h1:6gDKTxdPzabtJ4cPzNgCgsT2+z8v80DSCx476HqzaXk=
724720
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.17.0/go.mod h1:vSWUMTsMbtniEo1I+eCsjCOTODR4iproNAeqG3vr/4I=
725-
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8 h1:LLyANBzE8sQa0/49tQBqq4sVLhNgwdqCeQm76srJHWw=
726-
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.3.8/go.mod h1:/bmg57XZu+bGczzcoumrukiGMPGzI2mOyTT4BVIQUBs=
727721
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.0 h1:OGAaEbuoxTZnsWbtFmhkvdvCCV/RpYuE3ALQXmRyOOc=
728722
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.0/go.mod h1:h2fhcXRiSFP9yJXY8eb37e+2PhMW11g1GB8LL/EQ1aU=
729723
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0 h1:4MYNb3VQjVnVPfJ9xhDbSQgoSkxQZJ0tsv9N7O43/RI=
730724
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0/go.mod h1:iVCh5xZW/DHBMnJW4Zrw8KMhQIBRAETcnTPi5bbcQIE=
731725
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 h1:l1EDIlXce2C8JcbBDHVa6nZ4SjPTqmnALTgrhms+NKI=
732726
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0/go.mod h1:EXq8/J7t9p8zPmdIq+atuxyAbnQwxrQT18fI+Qpv98k=
733-
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.4.1 h1:HZnZju8yqpvRIs71PEk54Jov6p+jiKIIlN+J+4tvcL0=
734-
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.4.1/go.mod h1:wBxlGcNeQPIh1aS4xYqJuN2z6haSHRwzne6drN5ROfM=
727+
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.5.1 h1:Q/0UVLpcYJ+Sye5FWnASMyxmkXw7mPk5i5QFc+me5UU=
728+
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.5.1/go.mod h1:DaAUnOHgpL2tX0dejQzW/1b/sFxFhbnIx4PhjY+YuyA=
735729
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.6.3 h1:LEdPJ6f9pbrft+HlIIzRcCQog58b7UKVm4ObiOH8H4o=
736730
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.6.3/go.mod h1:qO2+XOzLy9rRTDo3IvXJd4uZsl6d1npa2cyQvaY4/Fw=
737731
github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0 h1:l1QjxW7sdE/6B6BZtHxbmus8XJdI9KDuXX3fwUa5fog=

‎stackit/internal/services/edgecloud/instance/resource.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
2121
edge "github.com/stackitcloud/stackit-sdk-go/services/edge/v1beta1api"
2222
edgewait "github.com/stackitcloud/stackit-sdk-go/services/edge/v1beta1api/wait"
23-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
24-
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"
23+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
24+
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"
2525

2626
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
2727
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
@@ -251,13 +251,13 @@ func (i *instanceResource) Create(ctx context.Context, req resource.CreateReques
251251
ctx = tflog.SetField(ctx, "region", region)
252252

253253
// If the service edge-cloud is not enabled, enable it
254-
err := i.enablementClient.EnableServiceRegional(ctx, region, projectId, utils.EdgecloudServiceId).Execute()
254+
err := i.enablementClient.DefaultAPI.EnableServiceRegional(ctx, region, projectId, utils.EdgecloudServiceId).Execute()
255255
if err != nil {
256256
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating instance", fmt.Sprintf("Calling API to enable edge-cloud: %v", err))
257257
return
258258
}
259259

260-
_, err = enablementWait.EnableServiceWaitHandler(ctx, i.enablementClient, region, projectId, utils.EdgecloudServiceId).WaitWithContext(ctx)
260+
_, err = enablementWait.EnableServiceWaitHandler(ctx, i.enablementClient.DefaultAPI, region, projectId, utils.EdgecloudServiceId).WaitWithContext(ctx)
261261
if err != nil {
262262
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating instance", fmt.Sprintf("Wait for edge-cloud enablement: %v", err))
263263
return

‎stackit/internal/services/modelserving/token/resource.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
2424
"github.com/stackitcloud/stackit-sdk-go/services/modelserving"
2525
"github.com/stackitcloud/stackit-sdk-go/services/modelserving/wait"
26-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
27-
serviceEnablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"
26+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
27+
serviceEnablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"
2828

2929
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
3030
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
@@ -247,7 +247,7 @@ func (r *tokenResource) Create(ctx context.Context, req resource.CreateRequest,
247247
ctx = tflog.SetField(ctx, "region", region)
248248

249249
// If AI model serving is not enabled, enable it
250-
err := r.serviceEnablementClient.EnableServiceRegional(ctx, region, projectId, utils.ModelServingServiceId).
250+
err := r.serviceEnablementClient.DefaultAPI.EnableServiceRegional(ctx, region, projectId, utils.ModelServingServiceId).
251251
Execute()
252252
if err != nil {
253253
var oapiErr *oapierror.GenericOpenAPIError
@@ -268,7 +268,7 @@ func (r *tokenResource) Create(ctx context.Context, req resource.CreateRequest,
268268
return
269269
}
270270

271-
_, err = serviceEnablementWait.EnableServiceWaitHandler(ctx, r.serviceEnablementClient, region, projectId, utils.ModelServingServiceId).
271+
_, err = serviceEnablementWait.EnableServiceWaitHandler(ctx, r.serviceEnablementClient.DefaultAPI, region, projectId, utils.ModelServingServiceId).
272272
WaitWithContext(ctx)
273273
if err != nil {
274274
core.LogAndAddError(

‎stackit/internal/services/serviceenablement/utils/util.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/hashicorp/terraform-plugin-framework/diag"
88
"github.com/stackitcloud/stackit-sdk-go/core/config"
9-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
9+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
1010

1111
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
1212
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
@@ -19,8 +19,6 @@ func ConfigureClient(ctx context.Context, providerData *core.ProviderData, diags
1919
}
2020
if providerData.ServiceEnablementCustomEndpoint != "" {
2121
apiClientConfigOptions = append(apiClientConfigOptions, config.WithEndpoint(providerData.ServiceEnablementCustomEndpoint))
22-
} else {
23-
apiClientConfigOptions = append(apiClientConfigOptions, config.WithRegion(providerData.GetRegion()))
2422
}
2523
apiClient, err := serviceenablement.NewAPIClient(apiClientConfigOptions...)
2624
if err != nil {

‎stackit/internal/services/serviceenablement/utils/util_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/hashicorp/terraform-plugin-framework/diag"
1010
sdkClients "github.com/stackitcloud/stackit-sdk-go/core/clients"
1111
"github.com/stackitcloud/stackit-sdk-go/core/config"
12-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
12+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
1313

1414
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
1515
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
@@ -47,7 +47,6 @@ func TestConfigureClient(t *testing.T) {
4747
expected: func() *serviceenablement.APIClient {
4848
apiClient, err := serviceenablement.NewAPIClient(
4949
utils.UserAgentConfigOption(testVersion),
50-
config.WithRegion("eu01"),
5150
)
5251
if err != nil {
5352
t.Errorf("error configuring client: %v", err)

‎stackit/internal/services/ske/cluster/resource.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
"github.com/hashicorp/terraform-plugin-log/tflog"
3434
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
3535
sdkUtils "github.com/stackitcloud/stackit-sdk-go/core/utils"
36-
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
37-
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"
36+
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
37+
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"
3838
"github.com/stackitcloud/stackit-sdk-go/services/ske"
3939
skeWait "github.com/stackitcloud/stackit-sdk-go/services/ske/wait"
4040
"golang.org/x/mod/semver"
@@ -768,13 +768,13 @@ func (r *clusterResource) Create(ctx context.Context, req resource.CreateRequest
768768
}
769769

770770
// If SKE functionality is not enabled, enable it
771-
err := r.enablementClient.EnableServiceRegional(ctx, region, projectId, utils.SKEServiceId).Execute()
771+
err := r.enablementClient.DefaultAPI.EnableServiceRegional(ctx, region, projectId, utils.SKEServiceId).Execute()
772772
if err != nil {
773773
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating cluster", fmt.Sprintf("Calling API to enable SKE: %v", err))
774774
return
775775
}
776776

777-
_, err = enablementWait.EnableServiceWaitHandler(ctx, r.enablementClient, region, projectId, utils.SKEServiceId).WaitWithContext(ctx)
777+
_, err = enablementWait.EnableServiceWaitHandler(ctx, r.enablementClient.DefaultAPI, region, projectId, utils.SKEServiceId).WaitWithContext(ctx)
778778
if err != nil {
779779
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating cluster", fmt.Sprintf("Wait for SKE enablement: %v", err))
780780
return

0 commit comments

Comments
 (0)