fix: builder and sdk changes (#81)

## Description

<!-- **Please link some issue here describing what you are trying to achieve.**

In case there is no issue present for your PR, please consider creating one.
At least please give us some description what you are trying to achieve and why your change is needed. -->

relates to #1234

## Checklist

- [ ] Issue was linked above
- [ ] Code format was applied: `make fmt`
- [ ] Examples were added / adjusted (see `examples/` directory)
- [x] Docs are up-to-date: `make generate-docs` (will be checked by CI)
- [ ] Unit tests got implemented or updated
- [ ] Acceptance tests got implemented or updated (see e.g. [here](f5f99d1709/stackit/internal/services/dns/dns_acc_test.go))
- [x] Unit tests are passing: `make test` (will be checked by CI)
- [x] No linter issues: `make lint` (will be checked by CI)

Co-authored-by: Marcel S. Henselin <marcel.henselin@stackit.cloud>
Co-authored-by: marcel.henselin <marcel.henselin@stackit.cloud>
Reviewed-on: #81

stackit/internal/services/postgresflexalpha/instance/resource.go

@@ -14,8 +14,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
+	coreUtils "github.com/stackitcloud/stackit-sdk-go/core/utils"
+	"github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api"
 
-	postgresflex "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/postgresflexalpha"
 	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/conversion"
 	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/core"
 	postgresflexalpha "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/services/postgresflexalpha/instance/resources_gen"
@@ -50,7 +51,7 @@ type InstanceResourceIdentityModel struct {
 
 // instanceResource is the resource implementation.
 type instanceResource struct {
-	client       *postgresflex.APIClient
+	client       *v3alpha1api.APIClient
 	providerData core.ProviderData
 }
 
@@ -195,9 +196,9 @@ func (r *instanceResource) Create(
 
 	ctx = core.InitProviderContext(ctx)
 
-	projectId := model.ProjectId.ValueString()
+	projectID := model.ProjectId.ValueString()
 	region := model.Region.ValueString()
-	ctx = tflog.SetField(ctx, "project_id", projectId)
+	ctx = tflog.SetField(ctx, "project_id", projectID)
 	ctx = tflog.SetField(ctx, "region", region)
 
 	var netAcl []string
@@ -207,17 +208,13 @@ func (r *instanceResource) Create(
 		return
 	}
 
-	if model.Replicas.ValueInt64() > math.MaxInt32 {
-		resp.Diagnostics.AddError("invalid int32 value", "provided int64 value does not fit into int32")
-		return
-	}
-	replVal := int32(model.Replicas.ValueInt64()) // nolint:gosec // check is performed above
+	replVal := model.Replicas.ValueInt64() // nolint:gosec // check is performed above
 	payload := modelToCreateInstancePayload(netAcl, model, replVal)
 
 	// Create new instance
-	createResp, err := r.client.CreateInstanceRequest(
+	createResp, err := r.client.DefaultAPI.CreateInstanceRequest(
 		ctx,
-		projectId,
+		projectID,
 		region,
 	).CreateInstanceRequestPayload(payload).Execute()
 	if err != nil {
@@ -226,7 +223,7 @@ func (r *instanceResource) Create(
 	}
 
 	ctx = core.LogResponse(ctx)
-	instanceId, ok := createResp.GetIdOk()
+	instanceID, ok := createResp.GetIdOk()
 	if !ok {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "error creating instance", "could not find instance id in response")
 		return
@@ -234,16 +231,16 @@ func (r *instanceResource) Create(
 
 	// Set data returned by API in identity
 	identity := InstanceResourceIdentityModel{
-		ProjectID:  types.StringValue(projectId),
+		ProjectID:  types.StringValue(projectID),
 		Region:     types.StringValue(region),
-		InstanceID: types.StringValue(instanceId),
+		InstanceID: types.StringPointerValue(instanceID),
 	}
 	resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	waitResp, err := wait.CreateInstanceWaitHandler(ctx, r.client, projectId, region, instanceId).
+	waitResp, err := wait.CreateInstanceWaitHandler(ctx, r.client.DefaultAPI, projectID, region, *instanceID).
 		WaitWithContext(ctx)
 	if err != nil {
 		core.LogAndAddError(
@@ -276,37 +273,35 @@ func (r *instanceResource) Create(
 }
 
 func modelToCreateInstancePayload(
-	netAcl []string,
+	netACL []string,
 	model postgresflexalpha.InstanceModel,
-	replVal int32,
-) postgresflex.CreateInstanceRequestPayload {
-	var enc *postgresflex.InstanceEncryption
+	replVal int64,
+) v3alpha1api.CreateInstanceRequestPayload {
+	var enc *v3alpha1api.InstanceEncryption
 	if !model.Encryption.IsNull() && !model.Encryption.IsUnknown() {
-		enc = &postgresflex.InstanceEncryption{
-			KekKeyId:       model.Encryption.KekKeyId.ValueStringPointer(),
-			KekKeyRingId:   model.Encryption.KekKeyRingId.ValueStringPointer(),
-			KekKeyVersion:  model.Encryption.KekKeyVersion.ValueStringPointer(),
-			ServiceAccount: model.Encryption.ServiceAccount.ValueStringPointer(),
+		enc = &v3alpha1api.InstanceEncryption{
+			KekKeyId:       model.Encryption.KekKeyId.ValueString(),
+			KekKeyRingId:   model.Encryption.KekKeyRingId.ValueString(),
+			KekKeyVersion:  model.Encryption.KekKeyVersion.ValueString(),
+			ServiceAccount: model.Encryption.ServiceAccount.ValueString(),
 		}
 	}
-	payload := postgresflex.CreateInstanceRequestPayload{
-		BackupSchedule: model.BackupSchedule.ValueStringPointer(),
+	payload := v3alpha1api.CreateInstanceRequestPayload{
+		BackupSchedule: model.BackupSchedule.ValueString(),
 		Encryption:     enc,
-		FlavorId:       model.FlavorId.ValueStringPointer(),
-		Name:           model.Name.ValueStringPointer(),
-		Network: &postgresflex.InstanceNetworkCreate{
-			AccessScope: postgresflex.InstanceNetworkGetAccessScopeAttributeType(
-				model.Network.AccessScope.ValueStringPointer(),
-			),
-			Acl: &netAcl,
+		FlavorId:       model.FlavorId.ValueString(),
+		Name:           model.Name.ValueString(),
+		Network: v3alpha1api.InstanceNetworkCreate{
+			AccessScope: (*v3alpha1api.InstanceNetworkAccessScope)(model.Network.AccessScope.ValueStringPointer()),
+			Acl:         netACL,
 		},
-		Replicas:      postgresflex.CreateInstanceRequestPayloadGetReplicasAttributeType(&replVal),
-		RetentionDays: model.RetentionDays.ValueInt64Pointer(),
-		Storage: &postgresflex.StorageCreate{
-			PerformanceClass: model.Storage.PerformanceClass.ValueStringPointer(),
-			Size:             model.Storage.Size.ValueInt64Pointer(),
+		Replicas:      v3alpha1api.Replicas(replVal),           //nolint:gosec // TODO
+		RetentionDays: int32(model.RetentionDays.ValueInt64()), //nolint:gosec // TODO
+		Storage: v3alpha1api.StorageCreate{
+			PerformanceClass: model.Storage.PerformanceClass.ValueString(),
+			Size:             int32(model.Storage.Size.ValueInt64()), //nolint:gosec // TODO
 		},
-		Version: model.Version.ValueStringPointer(),
+		Version: model.Version.ValueString(),
 	}
 	return payload
 }
@@ -347,7 +342,7 @@ func (r *instanceResource) Read(
 	ctx = tflog.SetField(ctx, "instance_id", instanceId)
 	ctx = tflog.SetField(ctx, "region", region)
 
-	instanceResp, err := r.client.GetInstanceRequest(ctx, projectId, region, instanceId).Execute()
+	instanceResp, err := r.client.DefaultAPI.GetInstanceRequest(ctx, projectId, region, instanceId).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 {
@@ -366,7 +361,7 @@ func (r *instanceResource) Read(
 		return
 	}
 	if !model.InstanceId.IsUnknown() && !model.InstanceId.IsNull() {
-		if respInstanceID != instanceId {
+		if *respInstanceID != instanceId {
 			core.LogAndAddError(
 				ctx,
 				&resp.Diagnostics,
@@ -431,47 +426,56 @@ func (r *instanceResource) Update(
 		return
 	}
 
-	projectId := identityData.ProjectID.ValueString()
-	instanceId := identityData.InstanceID.ValueString()
+	projectID := identityData.ProjectID.ValueString()
+	instanceID := identityData.InstanceID.ValueString()
 	region := model.Region.ValueString()
-	ctx = tflog.SetField(ctx, "project_id", projectId)
-	ctx = tflog.SetField(ctx, "instance_id", instanceId)
+	ctx = tflog.SetField(ctx, "project_id", projectID)
+	ctx = tflog.SetField(ctx, "instance_id", instanceID)
 	ctx = tflog.SetField(ctx, "region", region)
 
-	var netAcl []string
-	diag := model.Network.Acl.ElementsAs(ctx, &netAcl, false)
+	var netACL []string
+	diag := model.Network.Acl.ElementsAs(ctx, &netACL, false)
 	resp.Diagnostics.Append(diags...)
 	if diag.HasError() {
 		return
 	}
 
 	if model.Replicas.ValueInt64() > math.MaxInt32 {
-		resp.Diagnostics.AddError("invalid int32 value", "provided int64 value does not fit into int32")
+		core.LogAndAddError(ctx, &resp.Diagnostics, "UPDATE", "replicas value too large for int32")
 		return
 	}
-	replInt32 := int32(model.Replicas.ValueInt64()) // nolint:gosec // check is performed above
 
-	payload := postgresflex.UpdateInstanceRequestPayload{
-		BackupSchedule: model.BackupSchedule.ValueStringPointer(),
-		FlavorId:       model.FlavorId.ValueStringPointer(),
-		Name:           model.Name.ValueStringPointer(),
-		Network: &postgresflex.InstanceNetworkUpdate{
-			Acl: &netAcl,
+	if model.RetentionDays.ValueInt64() > math.MaxInt32 {
+		core.LogAndAddError(ctx, &resp.Diagnostics, "UPDATE", "retention_days value too large for int32")
+		return
+	}
+
+	if model.Storage.Size.ValueInt64() > math.MaxInt32 {
+		core.LogAndAddError(ctx, &resp.Diagnostics, "UPDATE", "storage.size value too large for int32")
+		return
+	}
+
+	payload := v3alpha1api.UpdateInstanceRequestPayload{
+		BackupSchedule: model.BackupSchedule.ValueString(),
+		FlavorId:       model.FlavorId.ValueString(),
+		Name:           model.Name.ValueString(),
+		Network: v3alpha1api.InstanceNetworkUpdate{
+			Acl: netACL,
 		},
-		Replicas:      postgresflex.UpdateInstanceRequestPayloadGetReplicasAttributeType(&replInt32),
-		RetentionDays: model.RetentionDays.ValueInt64Pointer(),
-		Storage: &postgresflex.StorageUpdate{
-			Size: model.Storage.Size.ValueInt64Pointer(),
+		Replicas:      v3alpha1api.Replicas(model.Replicas.ValueInt64()), //nolint:gosec // checked above
+		RetentionDays: int32(model.RetentionDays.ValueInt64()),           //nolint:gosec // checked above
+		Storage: v3alpha1api.StorageUpdate{
+			Size: coreUtils.Ptr(int32(model.Storage.Size.ValueInt64())), //nolint:gosec // checked above
 		},
-		Version: model.Version.ValueStringPointer(),
+		Version: model.Version.ValueString(),
 	}
 
 	// Update existing instance
-	err := r.client.UpdateInstanceRequest(
+	err := r.client.DefaultAPI.UpdateInstanceRequest(
 		ctx,
-		projectId,
+		projectID,
 		region,
-		instanceId,
+		instanceID,
 	).UpdateInstanceRequestPayload(payload).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating instance", err.Error())
@@ -482,10 +486,10 @@ func (r *instanceResource) Update(
 
 	waitResp, err := wait.PartialUpdateInstanceWaitHandler(
 		ctx,
-		r.client,
-		projectId,
+		r.client.DefaultAPI,
+		projectID,
 		region,
-		instanceId,
+		instanceID,
 	).WaitWithContext(ctx)
 	if err != nil {
 		core.LogAndAddError(
@@ -540,7 +544,7 @@ func (r *instanceResource) Delete(
 	ctx = tflog.SetField(ctx, "region", region)
 
 	// Delete existing instance
-	err := r.client.DeleteInstanceRequest(ctx, projectId, region, instanceId).Execute()
+	err := r.client.DefaultAPI.DeleteInstanceRequest(ctx, projectId, region, instanceId).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting instance", fmt.Sprintf("Calling API: %v", err))
 		return
@@ -548,7 +552,7 @@ func (r *instanceResource) Delete(
 
 	ctx = core.LogResponse(ctx)
 
-	_, err = r.client.GetInstanceRequest(ctx, projectId, region, instanceId).Execute()
+	_, err = r.client.DefaultAPI.GetInstanceRequest(ctx, projectId, region, instanceId).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 {