stackit-dev-tools/terraform-provider-stackitprivatepreview
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

chore(terraform): use a util func to build internal terraform id (#869)

Browse source
This commit is contained in:
Ruben Hönle 2025-06-12 14:41:57 +02:00 • committed by GitHub
parent 801ef6033d
commit b313ef6a39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
72 changed files with 205 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

9
stackit/internal/services/serverbackup/schedule/resource.go
View file

@ -444,14 +444,9 @@ func mapFields(ctx context.Context, schedule *serverbackup.BackupSchedule, model
}
model.BackupScheduleId = types.Int64PointerValue(schedule.Id)
idParts := []string{
model.ProjectId.ValueString(),
region,
model.ServerId.ValueString(),
model.ID = utils.BuildInternalTerraformId(
model.ProjectId.ValueString(), region, model.ServerId.ValueString(),
strconv.FormatInt(model.BackupScheduleId.ValueInt64(), 10),
}
model.ID = types.StringValue(
strings.Join(idParts, core.Separator),
)
model.Name = types.StringPointerValue(schedule.Name)
model.Rrule = types.StringPointerValue(schedule.Rrule)

6
stackit/internal/services/serverbackup/schedule/schedules_datasource.go
View file

@ -4,7 +4,6 @@ import (
"context"
"fmt"
"net/http"
"strings"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
serverbackupUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/serverbackup/utils"
@ -223,10 +222,7 @@ func mapSchedulesDatasourceFields(ctx context.Context, schedules *serverbackup.G
projectId := model.ProjectId.ValueString()
serverId := model.ServerId.ValueString()
idParts := []string{projectId, region, serverId}
model.ID = types.StringValue(
strings.Join(idParts, core.Separator),
)
model.ID = utils.BuildInternalTerraformId(projectId, region, serverId)
model.Region = types.StringValue(region)
for _, schedule := range *schedules.Items {