diff --git a/stackit/internal/services/edgecloud/instance/resource.go b/stackit/internal/services/edgecloud/instance/resource.go index 01f4df3d0..00c55137d 100644 --- a/stackit/internal/services/edgecloud/instance/resource.go +++ b/stackit/internal/services/edgecloud/instance/resource.go @@ -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" @@ -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 diff --git a/stackit/internal/services/modelserving/token/resource.go b/stackit/internal/services/modelserving/token/resource.go index cab3a0052..b0d30a2a6 100644 --- a/stackit/internal/services/modelserving/token/resource.go +++ b/stackit/internal/services/modelserving/token/resource.go @@ -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" @@ -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 @@ -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( diff --git a/stackit/internal/services/serviceenablement/utils/util.go b/stackit/internal/services/serviceenablement/utils/util.go index e24cb63d8..777bb13cc 100644 --- a/stackit/internal/services/serviceenablement/utils/util.go +++ b/stackit/internal/services/serviceenablement/utils/util.go @@ -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" @@ -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 { diff --git a/stackit/internal/services/serviceenablement/utils/util_test.go b/stackit/internal/services/serviceenablement/utils/util_test.go index 9ee08b6ed..3135cdb1b 100644 --- a/stackit/internal/services/serviceenablement/utils/util_test.go +++ b/stackit/internal/services/serviceenablement/utils/util_test.go @@ -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" @@ -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) diff --git a/stackit/internal/services/ske/cluster/resource.go b/stackit/internal/services/ske/cluster/resource.go index 12a9580a5..d9bfc7c09 100644 --- a/stackit/internal/services/ske/cluster/resource.go +++ b/stackit/internal/services/ske/cluster/resource.go @@ -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" @@ -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 diff --git a/stackit/internal/services/ske/ske_test.go b/stackit/internal/services/ske/ske_test.go index 97eae4e62..838931fff 100644 --- a/stackit/internal/services/ske/ske_test.go +++ b/stackit/internal/services/ske/ske_test.go @@ -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" @@ -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, @@ -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,