use new util func in resources found during code review

Author: rubenhoenle

stackit/internal/services/cdn/customdomain/resource.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils"
+
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
 	cdnUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/cdn/utils"
 
@@ -274,9 +276,7 @@ func mapCustomDomainFields(customDomain *cdn.CustomDomain, model *CustomDomainMo
 		return fmt.Errorf("Status missing in response")
 	}
 
-	id := model.ProjectId.ValueString() + core.Separator + model.DistributionId.ValueString() + core.Separator + *customDomain.Name
-
-	model.ID = types.StringValue(id)
+	model.ID = utils.BuildInternalTerraformId(model.ProjectId.ValueString(), model.DistributionId.ValueString(), *customDomain.Name)
 	model.Status = types.StringValue(string(*customDomain.Status))
 
 	customDomainErrors := []attr.Value{}

stackit/internal/services/cdn/distribution/resource.go

@@ -447,9 +447,7 @@ func mapFields(distribution *cdn.Distribution, model *Model) error {
 		return fmt.Errorf("Status missing in response")
 	}
 
-	id := *distribution.ProjectId + core.Separator + *distribution.Id
-
-	model.ID = types.StringValue(id)
+	model.ID = utils.BuildInternalTerraformId(*distribution.ProjectId, *distribution.Id)
 	model.DistributionId = types.StringValue(*distribution.Id)
 	model.ProjectId = types.StringValue(*distribution.ProjectId)
 	model.Status = types.StringValue(string(distribution.GetStatus()))

stackit/internal/services/iaas/publicipranges/datasource.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"sort"
-	"strings"
 
 	"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
 	iaasUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/iaas/utils"
@@ -175,8 +174,7 @@ func mapPublicIpRanges(_ context.Context, publicIpRanges *[]iaas.PublicNetwork,
 	// Sort to prevent unnecessary recreation of dependent resources due to order changes.
 	sort.Strings(apiIpRanges)
 
-	modelId := strings.Join(apiIpRanges, ",")
-	model.Id = types.StringValue(modelId)
+	model.Id = utils.BuildInternalTerraformId(apiIpRanges...)
 
 	var ipRangesList []attr.Value
 	for _, cidr := range apiIpRanges {