Skip to content

chore(serviceenablement): switch to new SDK structure #1398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubenhoenle merged 13 commits into from
May 5, 2026
Merged

chore(serviceenablement): switch to new SDK structure #1398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dcf59a8
chore(serviceenablement): switch to new SDK structure
GokceGK Apr 20, 2026
f9c539f
Merge branch 'main' into service-enablement-sdk-update
GokceGK Apr 21, 2026
ad0793d
Merge branch 'main' into service-enablement-sdk-update
GokceGK Apr 21, 2026
4729992
Merge branch 'main' into service-enablement-sdk-update
GokceGK Apr 21, 2026
630eee1
Merge branch 'main' into service-enablement-sdk-update
GokceGK Apr 21, 2026
df1317c
Merge branch 'main' into service-enablement-sdk-update
GokceGK Apr 21, 2026
9e38d9e
Merge branch 'main' into service-enablement-sdk-update
GokceGK Apr 29, 2026
b63c94a
fix linter issues
GokceGK Apr 29, 2026
ae4c1a7
migrate ske_test to new service enablement sdk structure
GokceGK Apr 29, 2026
6745e47
Merge branch 'main' into service-enablement-sdk-update
GokceGK May 4, 2026
e0f9002
fix linter issues
GokceGK May 4, 2026
f8226f1
Merge branch 'main' into service-enablement-sdk-update
rubenhoenle May 4, 2026
d903dfb
Merge branch 'main' into service-enablement-sdk-update
GokceGK May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions stackit/internal/services/edgecloud/instance/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
edge "github.com/stackitcloud/stackit-sdk-go/services/edge/v1beta1api"
edgewait "github.com/stackitcloud/stackit-sdk-go/services/edge/v1beta1api/wait"
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"

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

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

_, err = enablementWait.EnableServiceWaitHandler(ctx, i.enablementClient, region, projectId, utils.EdgecloudServiceId).WaitWithContext(ctx)
_, err = enablementWait.EnableServiceWaitHandler(ctx, i.enablementClient.DefaultAPI, region, projectId, utils.EdgecloudServiceId).WaitWithContext(ctx)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating instance", fmt.Sprintf("Wait for edge-cloud enablement: %v", err))
return
Expand Down
9 changes: 5 additions & 4 deletions stackit/internal/services/modelserving/token/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-log/tflog"
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"

modelserving "github.com/stackitcloud/stackit-sdk-go/services/modelserving/v1api"
"github.com/stackitcloud/stackit-sdk-go/services/modelserving/v1api/wait"
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
serviceEnablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
serviceEnablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"

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

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

_, err = serviceEnablementWait.EnableServiceWaitHandler(ctx, r.serviceEnablementClient, region, projectId, utils.ModelServingServiceId).
_, err = serviceEnablementWait.EnableServiceWaitHandler(ctx, r.serviceEnablementClient.DefaultAPI, region, projectId, utils.ModelServingServiceId).
WaitWithContext(ctx)
if err != nil {
core.LogAndAddError(
Expand Down
4 changes: 1 addition & 3 deletions stackit/internal/services/serviceenablement/utils/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

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

"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
Expand All @@ -19,8 +19,6 @@ func ConfigureClient(ctx context.Context, providerData *core.ProviderData, diags
}
if providerData.ServiceEnablementCustomEndpoint != "" {
apiClientConfigOptions = append(apiClientConfigOptions, config.WithEndpoint(providerData.ServiceEnablementCustomEndpoint))
} else {
apiClientConfigOptions = append(apiClientConfigOptions, config.WithRegion(providerData.GetRegion()))
}
apiClient, err := serviceenablement.NewAPIClient(apiClientConfigOptions...)
if err != nil {
Expand Down
3 changes: 1 addition & 2 deletions stackit/internal/services/serviceenablement/utils/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/diag"
sdkClients "github.com/stackitcloud/stackit-sdk-go/core/clients"
"github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"

"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
Expand Down Expand Up @@ -47,7 +47,6 @@ func TestConfigureClient(t *testing.T) {
expected: func() *serviceenablement.APIClient {
apiClient, err := serviceenablement.NewAPIClient(
utils.UserAgentConfigOption(testVersion),
config.WithRegion("eu01"),
)
if err != nil {
t.Errorf("error configuring client: %v", err)
Expand Down
10 changes: 6 additions & 4 deletions stackit/internal/services/ske/cluster/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ import (
"github.com/hashicorp/terraform-plugin-log/tflog"
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
sdkUtils "github.com/stackitcloud/stackit-sdk-go/core/utils"
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait"

serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
enablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"
legacySke "github.com/stackitcloud/stackit-sdk-go/services/ske"
ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api"
skeWait "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api/wait"

"golang.org/x/mod/semver"

"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
Expand Down Expand Up @@ -854,13 +856,13 @@ func (r *clusterResource) Create(ctx context.Context, req resource.CreateRequest
}

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

_, err = enablementWait.EnableServiceWaitHandler(ctx, r.enablementClient, region, projectId, utils.SKEServiceId).WaitWithContext(ctx)
_, err = enablementWait.EnableServiceWaitHandler(ctx, r.enablementClient.DefaultAPI, region, projectId, utils.SKEServiceId).WaitWithContext(ctx)
if err != nil {
core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating cluster", fmt.Sprintf("Wait for SKE enablement: %v", err))
return
Expand Down
12 changes: 7 additions & 5 deletions stackit/internal/services/ske/ske_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import (
"github.com/google/uuid"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-testing/plancheck"
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"

serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api"
serviceenablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait"
legacySke "github.com/stackitcloud/stackit-sdk-go/services/ske"
ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api"

Expand Down Expand Up @@ -61,14 +63,14 @@ resource "stackit_ske_cluster" "cluster" {
testutil.MockResponse{
Description: "service enablement request",
ToJsonBody: serviceenablement.ServiceStatus{
State: new(serviceenablement.SERVICESTATUSSTATE_ENABLED),
State: new(serviceenablementWait.SERVICESTATUSSTATE_ENABLED),
},
StatusCode: http.StatusOK,
},
testutil.MockResponse{
Description: "service enablement wait handler",
ToJsonBody: serviceenablement.ServiceStatus{
State: new(serviceenablement.SERVICESTATUSSTATE_ENABLED),
State: new(serviceenablementWait.SERVICESTATUSSTATE_ENABLED),
Error: nil,
},
StatusCode: http.StatusOK,
Expand Down Expand Up @@ -256,14 +258,14 @@ resource "stackit_ske_cluster" "cluster" {
testutil.MockResponse{
Description: "service enablement request",
ToJsonBody: serviceenablement.ServiceStatus{
State: new(serviceenablement.SERVICESTATUSSTATE_ENABLED),
State: new(serviceenablementWait.SERVICESTATUSSTATE_ENABLED),
},
StatusCode: http.StatusOK,
},
testutil.MockResponse{
Description: "service enablement wait handler",
ToJsonBody: serviceenablement.ServiceStatus{
State: new(serviceenablement.SERVICESTATUSSTATE_ENABLED),
State: new(serviceenablementWait.SERVICESTATUSSTATE_ENABLED),
Error: nil,
},
StatusCode: http.StatusOK,
Expand Down
Loading