feat: more_tests (#85)

## 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>
Reviewed-on: #85

stackit/internal/services/postgresflexalpha/database/datasources_gen/database_data_source_gen.go

@@ -45,7 +45,7 @@ func DatabaseDataSourceSchema(ctx context.Context) schema.Schema {
 				MarkdownDescription: "The STACKIT project ID.",
 			},
 			"region": schema.StringAttribute{
-				Required:            true,
+				Optional:            true,
 				Description:         "The region which should be addressed",
 				MarkdownDescription: "The region which should be addressed",
 				Validators: []validator.String{

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

@@ -64,17 +64,21 @@ func mapResourceFields(source *v3alpha1api.GetDatabaseResponse, model *resourceM
 		return fmt.Errorf("model input is nil")
 	}
 
-	var databaseId int64
-	if model.Id.ValueInt64() != 0 {
-		databaseId = model.Id.ValueInt64()
+	var databaseID int64
+	if model.DatabaseId.ValueInt64() != 0 {
+		if source.Id != 0 {
+			if model.DatabaseId.ValueInt64() != int64(source.Id) {
+				return fmt.Errorf("retrieved ID does not match known ID")
+			}
+		}
+		databaseID = model.DatabaseId.ValueInt64()
 	} else if source.Id != 0 {
-		databaseId = int64(source.Id)
+		databaseID = int64(source.Id)
 	} else {
 		return fmt.Errorf("database id not present")
 	}
 
-	model.Id = types.Int64Value(databaseId)
-	model.DatabaseId = types.Int64Value(databaseId)
+	model.DatabaseId = types.Int64Value(databaseID)
 	model.Name = types.StringValue(source.GetName())
 	model.Owner = types.StringValue(cleanString(source.Owner))
 	return nil

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

@@ -160,7 +160,7 @@ func TestMapResourceFields(t *testing.T) {
 			},
 			expected: expected{
 				model: &resourceModel{
-					Id:         types.Int64Value(1),
+					Id:         types.StringNull(),
 					Name:       types.StringValue("my-db"),
 					Owner:      types.StringValue("my-owner"),
 					DatabaseId: types.Int64Value(1),

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

@@ -11,9 +11,9 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
-	"github.com/hashicorp/terraform-plugin-framework/resource/identityschema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
+	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
 	"github.com/stackitcloud/stackit-sdk-go/services/postgresflex/v3alpha1api"
 
 	"tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/stackit/internal/conversion"
@@ -30,11 +30,6 @@ var (
 	_ resource.ResourceWithConfigure   = &databaseResource{}
 	_ resource.ResourceWithImportState = &databaseResource{}
 	_ resource.ResourceWithModifyPlan  = &databaseResource{}
-	_ resource.ResourceWithIdentity    = &databaseResource{}
-
-	// Error message constants
-	extractErrorSummary = "extracting failed"
-	extractErrorMessage = "Extracting identity data: %v"
 )
 
 // NewDatabaseResource is a helper function to simplify the provider implementation.
@@ -45,14 +40,6 @@ func NewDatabaseResource() resource.Resource {
 // resourceModel describes the resource data model.
 type resourceModel = postgresflexalphaResGen.DatabaseModel
 
-// DatabaseResourceIdentityModel describes the resource's identity attributes.
-type DatabaseResourceIdentityModel struct {
-	ProjectID  types.String `tfsdk:"project_id"`
-	Region     types.String `tfsdk:"region"`
-	InstanceID types.String `tfsdk:"instance_id"`
-	DatabaseID types.Int64  `tfsdk:"database_id"`
-}
-
 // databaseResource is the resource implementation.
 type databaseResource struct {
 	client       *v3alpha1api.APIClient
@@ -138,30 +125,6 @@ func (r *databaseResource) Schema(ctx context.Context, _ resource.SchemaRequest,
 	resp.Schema = s
 }
 
-// IdentitySchema defines the schema for the resource's identity attributes.
-func (r *databaseResource) IdentitySchema(
-	_ context.Context,
-	_ resource.IdentitySchemaRequest,
-	response *resource.IdentitySchemaResponse,
-) {
-	response.IdentitySchema = identityschema.Schema{
-		Attributes: map[string]identityschema.Attribute{
-			"project_id": identityschema.StringAttribute{
-				RequiredForImport: true,
-			},
-			"region": identityschema.StringAttribute{
-				RequiredForImport: true,
-			},
-			"instance_id": identityschema.StringAttribute{
-				RequiredForImport: true,
-			},
-			"database_id": identityschema.Int64Attribute{
-				RequiredForImport: true,
-			},
-		},
-	}
-}
-
 // Create creates the resource and sets the initial Terraform state.
 func (r *databaseResource) Create(
 	ctx context.Context,
@@ -178,12 +141,12 @@ func (r *databaseResource) Create(
 
 	ctx = core.InitProviderContext(ctx)
 
-	projectId := model.ProjectId.ValueString()
+	projectID := model.ProjectId.ValueString()
 	region := model.Region.ValueString()
-	instanceId := model.InstanceId.ValueString()
+	instanceID := model.InstanceId.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)
 
 	// Generate API request body from model
@@ -200,9 +163,9 @@ func (r *databaseResource) Create(
 	// Create new database
 	databaseResp, err := r.client.DefaultAPI.CreateDatabaseRequest(
 		ctx,
-		projectId,
+		projectID,
 		region,
-		instanceId,
+		instanceID,
 	).CreateDatabaseRequestPayload(*payload).Execute()
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, funcErrorSummary, fmt.Sprintf("Calling API: %v", err))
@@ -219,23 +182,33 @@ func (r *databaseResource) Create(
 		)
 		return
 	}
-	databaseId := int64(*dbID)
-	ctx = tflog.SetField(ctx, "database_id", databaseId)
+	databaseID := int64(*dbID)
+	databaseIDString := strconv.Itoa(int(*dbID))
+
+	ctx = tflog.SetField(ctx, "database_id", databaseID)
 	ctx = core.LogResponse(ctx)
 
-	// Save identity into Terraform state
-	identity := DatabaseResourceIdentityModel{
-		ProjectID:  types.StringValue(projectId),
-		Region:     types.StringValue(region),
-		InstanceID: types.StringValue(instanceId),
-		DatabaseID: types.Int64Value(databaseId),
-	}
-	resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
+	model.DatabaseId = types.Int64Value(databaseID)
+	model.Id = utils.BuildInternalTerraformId(projectID, region, instanceID, databaseIDString)
 
-	database, err := postgresflexalphaWait.GetDatabaseByIdWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, region, databaseId).
+	// Set data returned by API in id
+	resp.Diagnostics.Append(
+		resp.State.SetAttribute(
+			ctx,
+			path.Root("database_id"),
+			databaseID,
+		)...,
+	)
+	// Set data returned by API in id
+	resp.Diagnostics.Append(
+		resp.State.SetAttribute(
+			ctx,
+			path.Root("id"),
+			model.Id,
+		)...,
+	)
+
+	database, err := postgresflexalphaWait.GetDatabaseByIdWaitHandler(ctx, r.client.DefaultAPI, projectID, instanceID, region, databaseID).
 		SetTimeout(15 * time.Minute).
 		SetSleepBeforeWait(15 * time.Second).
 		WaitWithContext(ctx)
@@ -284,17 +257,28 @@ func (r *databaseResource) Read(
 
 	ctx = core.InitProviderContext(ctx)
 
-	projectId := model.ProjectId.ValueString()
-	instanceId := model.InstanceId.ValueString()
+	projectID := model.ProjectId.ValueString()
+	instanceID := model.InstanceId.ValueString()
 	region := model.Region.ValueString()
-	databaseId := model.DatabaseId.ValueInt64()
+	databaseID := model.DatabaseId.ValueInt64()
 
-	ctx = tflog.SetField(ctx, "project_id", projectId)
-	ctx = tflog.SetField(ctx, "instance_id", instanceId)
+	databaseIDString := strconv.Itoa(int(databaseID))
+
+	ctx = tflog.SetField(ctx, "project_id", projectID)
+	ctx = tflog.SetField(ctx, "instance_id", instanceID)
 	ctx = tflog.SetField(ctx, "region", region)
-	ctx = tflog.SetField(ctx, "database_id", databaseId)
+	ctx = tflog.SetField(ctx, "database_id", databaseID)
 
-	databaseResp, err := postgresflexalphaWait.GetDatabaseByIdWaitHandler(ctx, r.client.DefaultAPI, projectId, instanceId, region, databaseId).
+	// Set data returned by API in id
+	resp.Diagnostics.Append(
+		resp.State.SetAttribute(
+			ctx,
+			path.Root("id"),
+			utils.BuildInternalTerraformId(projectID, region, instanceID, databaseIDString),
+		)...,
+	)
+
+	databaseResp, err := postgresflexalphaWait.GetDatabaseByIdWaitHandler(ctx, r.client.DefaultAPI, projectID, instanceID, region, databaseID).
 		SetTimeout(15 * time.Minute).
 		SetSleepBeforeWait(15 * time.Second).
 		WaitWithContext(ctx)
@@ -322,18 +306,6 @@ func (r *databaseResource) Read(
 		return
 	}
 
-	// Save identity into Terraform state
-	identity := DatabaseResourceIdentityModel{
-		ProjectID:  types.StringValue(projectId),
-		Region:     types.StringValue(region),
-		InstanceID: types.StringValue(instanceId),
-		DatabaseID: types.Int64Value(int64(databaseResp.GetId())),
-	}
-	resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-
 	// Set refreshed state
 	diags = resp.State.Set(ctx, model)
 	resp.Diagnostics.Append(diags...)
@@ -436,18 +408,6 @@ func (r *databaseResource) Update(
 		return
 	}
 
-	// Save identity into Terraform state
-	identity := DatabaseResourceIdentityModel{
-		ProjectID:  types.StringValue(projectId),
-		Region:     types.StringValue(region),
-		InstanceID: types.StringValue(instanceId),
-		DatabaseID: types.Int64Value(databaseId),
-	}
-	resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-
 	// Set state to fully populated data
 	resp.Diagnostics.Append(resp.State.Set(ctx, &model)...)
 	if resp.Diagnostics.HasError() {
@@ -469,38 +429,33 @@ func (r *databaseResource) Delete(
 		return
 	}
 
-	// Read identity data
-	var identityData DatabaseResourceIdentityModel
-	resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-
 	ctx = core.InitProviderContext(ctx)
 
-	projectId, region, instanceId, databaseId64, errExt := r.extractIdentityData(model, identityData)
-	if errExt != nil {
-		core.LogAndAddError(
-			ctx,
-			&resp.Diagnostics,
-			extractErrorSummary,
-			fmt.Sprintf(extractErrorMessage, errExt),
-		)
-	}
+	projectID := model.ProjectId.ValueString()
+	instanceID := model.InstanceId.ValueString()
+	region := model.Region.ValueString()
+	databaseID64 := model.DatabaseId.ValueInt64()
 
-	if databaseId64 > math.MaxInt32 {
+	if databaseID64 > math.MaxInt32 {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error in type conversion", "int value too large (databaseId)")
 		return
 	}
-	databaseId := int32(databaseId64) // nolint:gosec // check is performed above
-	ctx = tflog.SetField(ctx, "project_id", projectId)
-	ctx = tflog.SetField(ctx, "instance_id", instanceId)
+	databaseID := int32(databaseID64) // nolint:gosec // check is performed above
+	ctx = tflog.SetField(ctx, "project_id", projectID)
+	ctx = tflog.SetField(ctx, "instance_id", instanceID)
 	ctx = tflog.SetField(ctx, "region", region)
-	ctx = tflog.SetField(ctx, "database_id", databaseId)
+	ctx = tflog.SetField(ctx, "database_id", databaseID)
 
 	// Delete existing record set
-	err := r.client.DefaultAPI.DeleteDatabaseRequest(ctx, projectId, region, instanceId, databaseId).Execute()
+	err := r.client.DefaultAPI.DeleteDatabaseRequest(ctx, projectID, region, instanceID, databaseID).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 {
+			if oapiErr.StatusCode == 404 {
+				resp.State.RemoveResource(ctx)
+				return
+			}
+		}
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting database", fmt.Sprintf("Calling API: %v", err))
 	}
 
@@ -517,109 +472,44 @@ func (r *databaseResource) ImportState(
 	resp *resource.ImportStateResponse,
 ) {
 	ctx = core.InitProviderContext(ctx)
+	idParts := strings.Split(req.ID, core.Separator)
 
-	if req.ID != "" {
-		idParts := strings.Split(req.ID, core.Separator)
+	if len(idParts) != 4 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" || idParts[3] == "" {
+		core.LogAndAddError(
+			ctx, &resp.Diagnostics,
+			"Error importing database",
+			fmt.Sprintf(
+				"Expected import identifier with format [project_id],[region],[instance_id],[database_id], got %q",
+				req.ID,
+			),
+		)
+		return
+	}
 
-		if len(idParts) != 4 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" || idParts[3] == "" {
-			core.LogAndAddError(
-				ctx, &resp.Diagnostics,
-				"Error importing database",
-				fmt.Sprintf(
-					"Expected import identifier with format [project_id],[region],[instance_id],[database_id], got %q",
-					req.ID,
-				),
-			)
-			return
-		}
-
-		databaseId, err := strconv.ParseInt(idParts[3], 10, 64)
-		if err != nil {
-			core.LogAndAddError(
-				ctx,
-				&resp.Diagnostics,
-				"Error importing database",
-				fmt.Sprintf("Invalid database_id format: %q. It must be a valid integer.", idParts[3]),
-			)
-			return
-		}
-
-		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...)
-		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...)
-		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...)
-		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("database_id"), databaseId)...)
-
-		core.LogAndAddWarning(
+	databaseID, err := strconv.ParseInt(idParts[3], 10, 64)
+	if err != nil {
+		core.LogAndAddError(
 			ctx,
 			&resp.Diagnostics,
-			"Postgresflex database imported with empty password",
-			"The database password is not imported as it is only available upon creation of a new database. The password field will be empty.",
+			"Error importing database",
+			fmt.Sprintf("Invalid database_id format: %q. It must be a valid integer.", idParts[3]),
 		)
-
-		tflog.Info(ctx, "Postgres Flex database state imported")
-
 		return
 	}
 
-	// If no ID is provided, attempt to read identity attributes from the import configuration
-	var identityData DatabaseResourceIdentityModel
-	resp.Diagnostics.Append(req.Identity.Get(ctx, &identityData)...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
+	tfIDString := utils.BuildInternalTerraformId(idParts...).ValueString()
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("id"), tfIDString)...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("database_id"), databaseID)...)
 
-	projectId := identityData.ProjectID.ValueString()
-	region := identityData.Region.ValueString()
-	instanceId := identityData.InstanceID.ValueString()
-	databaseId := identityData.DatabaseID.ValueInt64()
-
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), projectId)...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), region)...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), instanceId)...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("database_id"), databaseId)...)
+	core.LogAndAddWarning(
+		ctx,
+		&resp.Diagnostics,
+		"Postgresflex database imported with empty password",
+		"The database password is not imported as it is only available upon creation of a new database. The password field will be empty.",
+	)
 
 	tflog.Info(ctx, "Postgres Flex database state imported")
 }
-
-// extractIdentityData extracts essential identifiers from the resource model, falling back to the identity model.
-func (r *databaseResource) extractIdentityData(
-	model resourceModel,
-	identity DatabaseResourceIdentityModel,
-) (projectId, region, instanceId string, databaseId int64, err error) {
-	if !model.DatabaseId.IsNull() && !model.DatabaseId.IsUnknown() {
-		databaseId = model.DatabaseId.ValueInt64()
-	} else {
-		if identity.DatabaseID.IsNull() || identity.DatabaseID.IsUnknown() {
-			return "", "", "", 0, fmt.Errorf("database_id not found in config")
-		}
-		databaseId = identity.DatabaseID.ValueInt64()
-	}
-
-	if !model.ProjectId.IsNull() && !model.ProjectId.IsUnknown() {
-		projectId = model.ProjectId.ValueString()
-	} else {
-		if identity.ProjectID.IsNull() || identity.ProjectID.IsUnknown() {
-			return "", "", "", 0, fmt.Errorf("project_id not found in config")
-		}
-		projectId = identity.ProjectID.ValueString()
-	}
-
-	if !model.Region.IsNull() && !model.Region.IsUnknown() {
-		region = r.providerData.GetRegionWithOverride(model.Region)
-	} else {
-		if identity.Region.IsNull() || identity.Region.IsUnknown() {
-			return "", "", "", 0, fmt.Errorf("region not found in config")
-		}
-		region = r.providerData.GetRegionWithOverride(identity.Region)
-	}
-
-	if !model.InstanceId.IsNull() && !model.InstanceId.IsUnknown() {
-		instanceId = model.InstanceId.ValueString()
-	} else {
-		if identity.InstanceID.IsNull() || identity.InstanceID.IsUnknown() {
-			return "", "", "", 0, fmt.Errorf("instance_id not found in config")
-		}
-		instanceId = identity.InstanceID.ValueString()
-	}
-	return projectId, region, instanceId, databaseId, nil
-}

stackit/internal/services/postgresflexalpha/database/resources_gen/database_resource_gen.go

@@ -20,7 +20,7 @@ func DatabaseResourceSchema(ctx context.Context) schema.Schema {
 				Description:         "The ID of the database.",
 				MarkdownDescription: "The ID of the database.",
 			},
-			"id": schema.Int64Attribute{
+			"id": schema.StringAttribute{
 				Computed:            true,
 				Description:         "The id of the database.",
 				MarkdownDescription: "The id of the database.",
@@ -65,7 +65,7 @@ func DatabaseResourceSchema(ctx context.Context) schema.Schema {
 
 type DatabaseModel struct {
 	DatabaseId types.Int64  `tfsdk:"database_id"`
-	Id         types.Int64  `tfsdk:"id"`
+	Id         types.String `tfsdk:"id"`
 	InstanceId types.String `tfsdk:"instance_id"`
 	Name       types.String `tfsdk:"name"`
 	Owner      types.String `tfsdk:"owner"`