fix: change identity handling for user & database (#50)

## 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)

Reviewed-on: #50
Reviewed-by: Marcel_Henselin <marcel.henselin@stackit.cloud>
Co-authored-by: Andre Harms <andre.harms@stackit.cloud>
Co-committed-by: Andre Harms <andre.harms@stackit.cloud>

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

@@ -69,7 +69,7 @@ func (r *databaseResource) Metadata(
 //go:embed planModifiers.yaml
 var modifiersFileByte []byte
 
-func (r *databaseResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
+func (r *databaseResource) Schema(ctx context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
 
 	s := sqlserverflexbetaResGen.DatabaseResourceSchema(ctx)
 
@@ -160,23 +160,16 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 		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 := identityData.ProjectID.ValueString()
-	region := identityData.Region.ValueString()
-	instanceId := identityData.InstanceID.ValueString()
+	projectId := data.ProjectId.ValueString()
+	region := data.Region.ValueString()
+	instanceId := data.InstanceId.ValueString()
 	ctx = tflog.SetField(ctx, "project_id", projectId)
 	ctx = tflog.SetField(ctx, "region", region)
 	ctx = tflog.SetField(ctx, "instance_id", instanceId)
 
-	databaseName := identityData.DatabaseName.ValueString()
+	databaseName := data.Name.ValueString()
 	ctx = tflog.SetField(ctx, "database_name", databaseName)
 
 	payLoad := sqlserverflexbeta.CreateDatabaseRequestPayload{
@@ -215,6 +208,18 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 
 	ctx = core.LogResponse(ctx)
 
+	// Set data returned by API in identity
+	identity := DatabaseResourceIdentityModel{
+		ProjectID:    types.StringValue(projectId),
+		Region:       types.StringValue(region),
+		InstanceID:   types.StringValue(instanceId),
+		DatabaseName: types.StringValue(databaseName),
+	}
+	resp.Diagnostics.Append(resp.Identity.Set(ctx, identity)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	// TODO: is this neccessary to wait for the database-> API say 200 ?
 	/*waitResp, err := wait.CreateDatabaseWaitHandler(
 		ctx,
@@ -301,18 +306,6 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	// Set data returned by API in identity
-	identity := DatabaseResourceIdentityModel{
-		ProjectID:    types.StringValue(projectId),
-		Region:       types.StringValue(region),
-		InstanceID:   types.StringValue(instanceId),
-		DatabaseName: types.StringValue(databaseName),
-	}
-	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, data)...)
 	if resp.Diagnostics.HasError() {
@@ -381,9 +374,20 @@ func (r *databaseResource) Read(ctx context.Context, req resource.ReadRequest, r
 		return
 	}
 
+	// Save identity into Terraform state
+	identity := DatabaseResourceIdentityModel{
+		ProjectID:    types.StringValue(projectId),
+		Region:       types.StringValue(region),
+		InstanceID:   types.StringValue(instanceId),
+		DatabaseName: types.StringValue(databaseName),
+	}
+	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...)
+	resp.Diagnostics.Append(resp.State.Set(ctx, &model)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
@@ -391,7 +395,7 @@ func (r *databaseResource) Read(ctx context.Context, req resource.ReadRequest, r
 	tflog.Info(ctx, "sqlserverflexbeta.Database read")
 }
 
-func (r *databaseResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+func (r *databaseResource) Update(ctx context.Context, _ resource.UpdateRequest, resp *resource.UpdateResponse) {
 	// TODO: Check update api endpoint - not available at the moment, so return an error for now
 	core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating database", "Database can't be updated")
 }
@@ -436,6 +440,7 @@ func (r *databaseResource) Delete(ctx context.Context, req resource.DeleteReques
 	}
 
 	ctx = core.LogResponse(ctx)
+	resp.State.RemoveResource(ctx)
 
 	tflog.Info(ctx, "sqlserverflexbeta.Database deleted")
 }
@@ -453,13 +458,13 @@ func (r *databaseResource) ModifyPlan(
 		return
 	}
 
-	var configModel sqlserverflexbetaResGen.DatabaseModel
+	var configModel resourceModel
 	resp.Diagnostics.Append(req.Config.Get(ctx, &configModel)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	var planModel sqlserverflexbetaResGen.DatabaseModel
+	var planModel resourceModel
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &planModel)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -562,8 +567,8 @@ func (r *databaseResource) extractIdentityData(
 	model resourceModel,
 	identity DatabaseResourceIdentityModel,
 ) (projectId, region, instanceId, databaseName string, err error) {
-	if !model.DatabaseName.IsNull() && !model.DatabaseName.IsUnknown() {
-		databaseName = model.DatabaseName.ValueString()
+	if !model.Name.IsNull() && !model.Name.IsUnknown() {
+		databaseName = model.Name.ValueString()
 	} else {
 		if identity.DatabaseName.IsNull() || identity.DatabaseName.IsUnknown() {
 			return "", "", "", "", fmt.Errorf("database_name not found in config")

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

@@ -160,7 +160,7 @@ func (r *instanceResource) ModifyPlan(
 	if req.Plan.Raw.IsNull() {
 		return
 	}
-	var planModel sqlserverflexbetaResGen.InstanceModel
+	var planModel resourceModel
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &planModel)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -334,6 +334,7 @@ func (r *instanceResource) Read(ctx context.Context, req resource.ReadRequest, r
 		return
 	}
 
+	// Save identity into Terraform state
 	identity := InstanceResourceIdentityModel{
 		ProjectID:  types.StringValue(projectId),
 		Region:     types.StringValue(region),
@@ -346,6 +347,9 @@ func (r *instanceResource) Read(ctx context.Context, req resource.ReadRequest, r
 
 	// Save updated data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
 
 	tflog.Info(ctx, "sqlserverflexbeta.Instance read")
 }
@@ -433,6 +437,9 @@ func (r *instanceResource) Update(ctx context.Context, req resource.UpdateReques
 
 	// Save updated data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
 
 	tflog.Info(ctx, "sqlserverflexbeta.Instance updated")
 }

stackit/internal/services/sqlserverflexbeta/user/mapper.go

@@ -165,7 +165,7 @@ func mapFieldsCreate(userResp *sqlserverflexbeta.CreateUserResponse, model *reso
 // toCreatePayload converts a resourceModel to an API CreateUserRequestPayload.
 func toCreatePayload(
 	model *resourceModel,
-	roles []sqlserverflexbeta.UserRole,
+	roles []string,
 ) (*sqlserverflexbeta.CreateUserRequestPayload, error) {
 	if model == nil {
 		return nil, fmt.Errorf("nil model")

stackit/internal/services/sqlserverflexbeta/user/mapper_test.go

@@ -42,7 +42,7 @@ func TestMapDataSourceFields(t *testing.T) {
 			"simple_values",
 			&sqlserverflexbeta.GetUserResponse{
 
-				Roles: &[]sqlserverflexbeta.UserRole{
+				Roles: &[]string{
 					"role_1",
 					"role_2",
 					"",
@@ -81,7 +81,7 @@ func TestMapDataSourceFields(t *testing.T) {
 			"null_fields_and_int_conversions",
 			&sqlserverflexbeta.GetUserResponse{
 				Id:       utils.Ptr(int64(1)),
-				Roles:    &[]sqlserverflexbeta.UserRole{},
+				Roles:    &[]string{},
 				Username: nil,
 				Host:     nil,
 				Port:     utils.Ptr(int64(2123456789)),
@@ -182,7 +182,7 @@ func TestMapFieldsCreate(t *testing.T) {
 			"simple_values",
 			&sqlserverflexbeta.CreateUserResponse{
 				Id: utils.Ptr(int64(2)),
-				Roles: &[]sqlserverflexbeta.UserRole{
+				Roles: &[]string{
 					"role_1",
 					"role_2",
 					"",
@@ -223,7 +223,7 @@ func TestMapFieldsCreate(t *testing.T) {
 			"null_fields_and_int_conversions",
 			&sqlserverflexbeta.CreateUserResponse{
 				Id:       utils.Ptr(int64(3)),
-				Roles:    &[]sqlserverflexbeta.UserRole{},
+				Roles:    &[]string{},
 				Username: nil,
 				Password: utils.Ptr(""),
 				Host:     nil,
@@ -331,7 +331,7 @@ func TestMapFields(t *testing.T) {
 		{
 			"simple_values",
 			&sqlserverflexbeta.GetUserResponse{
-				Roles: &[]sqlserverflexbeta.UserRole{
+				Roles: &[]string{
 					"role_1",
 					"role_2",
 					"",
@@ -366,7 +366,7 @@ func TestMapFields(t *testing.T) {
 			"null_fields_and_int_conversions",
 			&sqlserverflexbeta.GetUserResponse{
 				Id:       utils.Ptr(int64(1)),
-				Roles:    &[]sqlserverflexbeta.UserRole{},
+				Roles:    &[]string{},
 				Username: nil,
 				Host:     nil,
 				Port:     utils.Ptr(int64(2123456789)),
@@ -437,16 +437,16 @@ func TestToCreatePayload(t *testing.T) {
 	tests := []struct {
 		description string
 		input       *resourceModel
-		inputRoles  []sqlserverflexbeta.UserRole
+		inputRoles  []string
 		expected    *sqlserverflexbeta.CreateUserRequestPayload
 		isValid     bool
 	}{
 		{
 			"default_values",
 			&resourceModel{},
-			[]sqlserverflexbeta.UserRole{},
+			[]string{},
 			&sqlserverflexbeta.CreateUserRequestPayload{
-				Roles:    &[]sqlserverflexbeta.UserRole{},
+				Roles:    &[]string{},
 				Username: nil,
 			},
 			true,
@@ -456,12 +456,12 @@ func TestToCreatePayload(t *testing.T) {
 			&resourceModel{
 				Username: types.StringValue("username"),
 			},
-			[]sqlserverflexbeta.UserRole{
+			[]string{
 				"role_1",
 				"role_2",
 			},
 			&sqlserverflexbeta.CreateUserRequestPayload{
-				Roles: &[]sqlserverflexbeta.UserRole{
+				Roles: &[]string{
 					"role_1",
 					"role_2",
 				},
@@ -474,11 +474,11 @@ func TestToCreatePayload(t *testing.T) {
 			&resourceModel{
 				Username: types.StringNull(),
 			},
-			[]sqlserverflexbeta.UserRole{
+			[]string{
 				"",
 			},
 			&sqlserverflexbeta.CreateUserRequestPayload{
-				Roles: &[]sqlserverflexbeta.UserRole{
+				Roles: &[]string{
 					"",
 				},
 				Username: nil,
@@ -488,7 +488,7 @@ func TestToCreatePayload(t *testing.T) {
 		{
 			"nil_model",
 			nil,
-			[]sqlserverflexbeta.UserRole{},
+			[]string{},
 			nil,
 			false,
 		},
@@ -497,9 +497,9 @@ func TestToCreatePayload(t *testing.T) {
 			&resourceModel{
 				Username: types.StringValue("username"),
 			},
-			[]sqlserverflexbeta.UserRole{},
+			[]string{},
 			&sqlserverflexbeta.CreateUserRequestPayload{
-				Roles:    &[]sqlserverflexbeta.UserRole{},
+				Roles:    &[]string{},
 				Username: utils.Ptr("username"),
 			},
 			true,

stackit/internal/services/sqlserverflexbeta/user/resource.go

@@ -177,7 +177,7 @@ func (r *userResource) Create(
 	ctx = tflog.SetField(ctx, "instance_id", instanceId)
 	ctx = tflog.SetField(ctx, "region", region)
 
-	var roles []sqlserverflexbeta.UserRole
+	var roles []string
 	if !model.Roles.IsNull() && !model.Roles.IsUnknown() {
 		diags = model.Roles.ElementsAs(ctx, &roles, false)
 		resp.Diagnostics.Append(diags...)
@@ -292,6 +292,18 @@ func (r *userResource) Read(
 		return
 	}
 
+	// Set data returned by API in identity
+	identity := UserResourceIdentityModel{
+		ProjectID:  types.StringValue(projectId),
+		Region:     types.StringValue(region),
+		InstanceID: types.StringValue(instanceId),
+		UserID:     types.Int64Value(userId),
+	}
+	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...)
@@ -350,6 +362,8 @@ func (r *userResource) Delete(
 
 	ctx = core.LogResponse(ctx)
 
+	resp.State.RemoveResource(ctx)
+
 	tflog.Info(ctx, "SQLServer Flex user deleted")
 }
 

stackit/internal/services/sqlserverflexbeta/user/resources_gen/user_resource_gen.go

@@ -66,8 +66,8 @@ func UserResourceSchema(ctx context.Context) schema.Schema {
 			"roles": schema.ListAttribute{
 				ElementType:         types.StringType,
 				Required:            true,
-				Description:         "A list containing the user roles for the instance.",
-				MarkdownDescription: "A list containing the user roles for the instance.",
+				Description:         "A list containing the user roles for the instance. A list with the valid user roles can be retrieved using the List Roles endpoint.",
+				MarkdownDescription: "A list containing the user roles for the instance. A list with the valid user roles can be retrieved using the List Roles endpoint.",
 			},
 			"status": schema.StringAttribute{
 				Computed:            true,