diff --git a/go.mod b/go.mod index 94d7ab230..aa4b90a0b 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.0 github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0 github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 - github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.4.1 + github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.5.1 github.com/stackitcloud/stackit-sdk-go/services/sfs v0.6.3 github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0 github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.6.1 diff --git a/go.sum b/go.sum index 080ac54be..086561f14 100644 --- a/go.sum +++ b/go.sum @@ -724,8 +724,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0 h1:4MYNb3VQj github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.0/go.mod h1:iVCh5xZW/DHBMnJW4Zrw8KMhQIBRAETcnTPi5bbcQIE= github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 h1:l1EDIlXce2C8JcbBDHVa6nZ4SjPTqmnALTgrhms+NKI= github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0/go.mod h1:EXq8/J7t9p8zPmdIq+atuxyAbnQwxrQT18fI+Qpv98k= -github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.4.1 h1:HZnZju8yqpvRIs71PEk54Jov6p+jiKIIlN+J+4tvcL0= -github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.4.1/go.mod h1:wBxlGcNeQPIh1aS4xYqJuN2z6haSHRwzne6drN5ROfM= +github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.5.1 h1:Q/0UVLpcYJ+Sye5FWnASMyxmkXw7mPk5i5QFc+me5UU= +github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.5.1/go.mod h1:DaAUnOHgpL2tX0dejQzW/1b/sFxFhbnIx4PhjY+YuyA= github.com/stackitcloud/stackit-sdk-go/services/sfs v0.6.3 h1:LEdPJ6f9pbrft+HlIIzRcCQog58b7UKVm4ObiOH8H4o= github.com/stackitcloud/stackit-sdk-go/services/sfs v0.6.3/go.mod h1:qO2+XOzLy9rRTDo3IvXJd4uZsl6d1npa2cyQvaY4/Fw= github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0 h1:l1QjxW7sdE/6B6BZtHxbmus8XJdI9KDuXX3fwUa5fog= diff --git a/stackit/internal/services/edgecloud/instance/resource.go b/stackit/internal/services/edgecloud/instance/resource.go index 0c24b8cdc..ce4d1e016 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 ba0d8fc04..3436517f0 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 ae96243c1..d19b40f57 100644 --- a/stackit/internal/services/ske/cluster/resource.go +++ b/stackit/internal/services/ske/cluster/resource.go @@ -33,8 +33,8 @@ 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" "github.com/stackitcloud/stackit-sdk-go/services/ske" skeWait "github.com/stackitcloud/stackit-sdk-go/services/ske/wait" "golang.org/x/mod/semver" @@ -768,13 +768,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