fix: adjust to new generator and sdk use

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

@@ -16,7 +16,7 @@ import (
 	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/core"
 	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/utils"
 
-	sqlserverflexalphaPkg "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/sqlserverflexalpha"
+	sqlserverflexalphaPkg "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3alpha1api"
 	sqlserverflexalphaGen "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/database/datasources_gen"
 )
 
@@ -119,7 +119,7 @@ func (d *databaseDataSource) Read(ctx context.Context, req datasource.ReadReques
 
 	databaseName := data.DatabaseName.ValueString()
 
-	databaseResp, err := d.client.GetDatabaseRequest(ctx, projectId, region, instanceId, databaseName).Execute()
+	databaseResp, err := d.client.DefaultAPI.GetDatabaseRequest(ctx, projectId, region, instanceId, databaseName).Execute()
 	if err != nil {
 		handleReadError(ctx, &resp.Diagnostics, err, projectId, instanceId)
 		resp.State.RemoveResource(ctx)

stackit/internal/services/sqlserverflexalpha/database/mapper.go

@@ -5,8 +5,9 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-framework/types"
+	coreUtils "github.com/stackitcloud/stackit-sdk-go/core/utils"
 
-	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/sqlserverflexalpha"
+	sqlserverflexalpha "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3alpha1api"
 	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/utils"
 )
 
@@ -15,7 +16,7 @@ func mapFields(source *sqlserverflexalpha.GetDatabaseResponse, model *dataSource
 	if source == nil {
 		return fmt.Errorf("response is nil")
 	}
-	if source.Id == nil || *source.Id == 0 {
+	if source.Id == 0 {
 		return fmt.Errorf("id not present")
 	}
 	if model == nil {
@@ -25,8 +26,8 @@ func mapFields(source *sqlserverflexalpha.GetDatabaseResponse, model *dataSource
 	var databaseId int64
 	if model.Id.ValueInt64() != 0 {
 		databaseId = model.Id.ValueInt64()
-	} else if source.Id != nil {
-		databaseId = *source.Id
+	} else if source.Id != 0 {
+		databaseId = source.Id
 	} else {
 		return fmt.Errorf("database id not present")
 	}
@@ -38,7 +39,7 @@ func mapFields(source *sqlserverflexalpha.GetDatabaseResponse, model *dataSource
 	model.Region = types.StringValue(region)
 	model.ProjectId = types.StringValue(model.ProjectId.ValueString())
 	model.InstanceId = types.StringValue(model.InstanceId.ValueString())
-	model.CompatibilityLevel = types.Int64Value(source.GetCompatibilityLevel())
+	model.CompatibilityLevel = types.Int64Value(int64(source.GetCompatibilityLevel()))
 	model.CollationName = types.StringValue(source.GetCollationName())
 
 	model.TerraformId = utils.BuildInternalTerraformId(
@@ -56,7 +57,7 @@ func mapResourceFields(source *sqlserverflexalpha.GetDatabaseResponse, model *re
 	if source == nil {
 		return fmt.Errorf("response is nil")
 	}
-	if source.Id == nil || *source.Id == 0 {
+	if source.Id == 0 {
 		return fmt.Errorf("id not present")
 	}
 	if model == nil {
@@ -66,8 +67,8 @@ func mapResourceFields(source *sqlserverflexalpha.GetDatabaseResponse, model *re
 	var databaseId int64
 	if model.Id.ValueInt64() != 0 {
 		databaseId = model.Id.ValueInt64()
-	} else if source.Id != nil {
-		databaseId = *source.Id
+	} else if source.Id != 0 {
+		databaseId = source.Id
 	} else {
 		return fmt.Errorf("database id not present")
 	}
@@ -80,8 +81,8 @@ func mapResourceFields(source *sqlserverflexalpha.GetDatabaseResponse, model *re
 	model.ProjectId = types.StringValue(model.ProjectId.ValueString())
 	model.InstanceId = types.StringValue(model.InstanceId.ValueString())
 
-	model.Compatibility = types.Int64Value(source.GetCompatibilityLevel())
-	model.CompatibilityLevel = types.Int64Value(source.GetCompatibilityLevel())
+	model.Compatibility = types.Int64Value(int64(source.GetCompatibilityLevel()))
+	model.CompatibilityLevel = types.Int64Value(int64(source.GetCompatibilityLevel()))
 
 	model.Collation = types.StringValue(source.GetCollationName()) // it does not come back from api
 	model.CollationName = types.StringValue(source.GetCollationName())
@@ -96,9 +97,9 @@ func toCreatePayload(model *resourceModel) (*sqlserverflexalpha.CreateDatabaseRe
 	}
 
 	return &sqlserverflexalpha.CreateDatabaseRequestPayload{
-		Name:          model.Name.ValueStringPointer(),
-		Owner:         model.Owner.ValueStringPointer(),
+		Name:          model.Name.ValueString(),
+		Owner:         model.Owner.ValueString(),
 		Collation:     model.Collation.ValueStringPointer(),
-		Compatibility: model.Compatibility.ValueInt64Pointer(),
+		Compatibility: coreUtils.Ptr(int32(model.Compatibility.ValueInt64())),
 	}, nil
 }

stackit/internal/services/sqlserverflexalpha/database/mapper_test.go

@@ -5,9 +5,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/stackitcloud/stackit-sdk-go/core/utils"
-
-	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/sqlserverflexalpha"
+	sqlserverflexalpha "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3alpha1api"
 	datasource "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/sqlserverflexalpha/database/datasources_gen"
 )
 
@@ -31,11 +29,11 @@ func TestMapFields(t *testing.T) {
 			name: "should map fields correctly",
 			given: given{
 				source: &sqlserverflexalpha.GetDatabaseResponse{
-					Id:                 utils.Ptr(int64(1)),
-					Name:               utils.Ptr("my-db"),
-					CollationName:      utils.Ptr("collation"),
-					CompatibilityLevel: utils.Ptr(int64(150)),
-					Owner:              utils.Ptr("my-owner"),
+					Id:                 (int64(1)),
+					Name:               ("my-db"),
+					CollationName:      ("collation"),
+					CompatibilityLevel: (int32(150)),
+					Owner:              ("my-owner"),
 				},
 				model: &dataSourceModel{
 					DatabaseModel: datasource.DatabaseModel{
@@ -73,7 +71,7 @@ func TestMapFields(t *testing.T) {
 		{
 			name: "should fail on nil source ID",
 			given: given{
-				source: &sqlserverflexalpha.GetDatabaseResponse{Id: nil},
+				source: &sqlserverflexalpha.GetDatabaseResponse{Id: 0},
 				model:  &dataSourceModel{},
 			},
 			expected: expected{err: true},
@@ -81,7 +79,7 @@ func TestMapFields(t *testing.T) {
 		{
 			name: "should fail on nil model",
 			given: given{
-				source: &sqlserverflexalpha.GetDatabaseResponse{Id: utils.Ptr(int64(1))},
+				source: &sqlserverflexalpha.GetDatabaseResponse{Id: (int64(1))},
 				model:  nil,
 			},
 			expected: expected{err: true},
@@ -125,9 +123,9 @@ func TestMapResourceFields(t *testing.T) {
 			name: "should map fields correctly",
 			given: given{
 				source: &sqlserverflexalpha.GetDatabaseResponse{
-					Id:    utils.Ptr(int64(1)),
-					Name:  utils.Ptr("my-db"),
-					Owner: utils.Ptr("my-owner"),
+					Id:    (int64(1)),
+					Name:  ("my-db"),
+					Owner: ("my-owner"),
 				},
 				model: &resourceModel{
 					ProjectId:  types.StringValue("my-project"),
@@ -202,8 +200,8 @@ func TestToCreatePayload(t *testing.T) {
 			},
 			expected: expected{
 				payload: &sqlserverflexalpha.CreateDatabaseRequestPayload{
-					Name:  utils.Ptr("my-db"),
-					Owner: utils.Ptr("my-owner"),
+					Name:  ("my-db"),
+					Owner: ("my-owner"),
 				},
 			},
 		},

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

@@ -16,8 +16,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/stackitcloud/stackit-sdk-go/core/config"
 	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
+	coreUtils "github.com/stackitcloud/stackit-sdk-go/core/utils"
 
-	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/sqlserverflexalpha"
+	sqlserverflexalpha "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v3alpha1api"
 	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/conversion"
 	wait "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/wait/sqlserverflexalpha"
 
@@ -176,13 +177,13 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 	}
 
 	if !data.Compatibility.IsNull() && !data.Compatibility.IsUnknown() {
-		payLoad.Compatibility = data.Compatibility.ValueInt64Pointer()
+		payLoad.Compatibility = coreUtils.Ptr(int32(data.Compatibility.ValueInt64()))
 	}
 
-	payLoad.Name = data.Name.ValueStringPointer()
-	payLoad.Owner = data.Owner.ValueStringPointer()
+	payLoad.Name = data.Name.ValueString()
+	payLoad.Owner = data.Owner.ValueString()
 
-	createResp, err := r.client.CreateDatabaseRequest(ctx, projectId, region, instanceId).
+	createResp, err := r.client.DefaultAPI.CreateDatabaseRequest(ctx, projectId, region, instanceId).
 		CreateDatabaseRequestPayload(payLoad).
 		Execute()
 	if err != nil {
@@ -195,7 +196,7 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	if createResp == nil || createResp.Id == nil {
+	if createResp == nil || createResp.Id == 0 {
 		core.LogAndAddError(
 			ctx,
 			&resp.Diagnostics,
@@ -205,7 +206,7 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	databaseId := *createResp.Id
+	databaseId := createResp.Id
 
 	ctx = tflog.SetField(ctx, "database_id", databaseId)
 
@@ -226,7 +227,7 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 	// TODO: is this necessary to wait for the database-> API say 200 ?
 	waitResp, err := wait.CreateDatabaseWaitHandler(
 		ctx,
-		r.client,
+		r.client.DefaultAPI,
 		projectId,
 		instanceId,
 		region,
@@ -246,7 +247,7 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	if waitResp.Id == nil {
+	if waitResp.Id == 0 {
 		core.LogAndAddError(
 			ctx,
 			&resp.Diagnostics,
@@ -256,7 +257,7 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	if *waitResp.Id != databaseId {
+	if waitResp.Id != databaseId {
 		core.LogAndAddError(
 			ctx,
 			&resp.Diagnostics,
@@ -266,7 +267,7 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	if *waitResp.Owner != data.Owner.ValueString() {
+	if waitResp.Owner != data.Owner.ValueString() {
 		core.LogAndAddError(
 			ctx,
 			&resp.Diagnostics,
@@ -276,7 +277,7 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	if *waitResp.Name != data.Name.ValueString() {
+	if waitResp.Name != data.Name.ValueString() {
 		core.LogAndAddError(
 			ctx,
 			&resp.Diagnostics,
@@ -286,7 +287,7 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	database, err := r.client.GetDatabaseRequest(ctx, projectId, region, instanceId, databaseName).Execute()
+	database, err := r.client.DefaultAPI.GetDatabaseRequest(ctx, projectId, region, instanceId, databaseName).Execute()
 	if err != nil {
 		core.LogAndAddError(
 			ctx,
@@ -340,7 +341,7 @@ func (r *databaseResource) Read(ctx context.Context, req resource.ReadRequest, r
 	ctx = tflog.SetField(ctx, "region", region)
 	ctx = tflog.SetField(ctx, "database_name", databaseName)
 
-	databaseResp, err := r.client.GetDatabaseRequest(ctx, projectId, region, instanceId, databaseName).Execute()
+	databaseResp, err := r.client.DefaultAPI.GetDatabaseRequest(ctx, projectId, region, instanceId, databaseName).Execute()
 	if err != nil {
 		oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped
 		if (ok && oapiErr.StatusCode == http.StatusNotFound) || errors.Is(err, errDatabaseNotFound) {
@@ -420,7 +421,7 @@ func (r *databaseResource) Delete(ctx context.Context, req resource.DeleteReques
 	ctx = tflog.SetField(ctx, "database_name", databaseName)
 
 	// Delete existing record set
-	err := r.client.DeleteDatabaseRequestExecute(ctx, projectId, region, instanceId, databaseName)
+	err := r.client.DefaultAPI.DeleteDatabaseRequest(ctx, projectId, region, instanceId, databaseName).Execute()
 	if err != nil {
 		core.LogAndAddError(
 			ctx,