jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-25 01:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in unmarkDeepWithPathsDeprecated (#3105)

Browse Source 
Signed-off-by: James Humphries <james@james-humphries.co.uk>
Signed-off-by: James Humphries <James@james-humphries.co.uk>
Co-authored-by: Andrei Ciobanu <andrei.ciobanu@opentofu.org>
This commit is contained in:
James Humphries
2025-08-06 15:40:19 +01:00
committed by GitHub
parent 823579f9e0
commit c5fd93482a
7 changed files with 280 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/lang/marks/marks.go
View File

@@ -10,9 +10,10 @@ import (
"strings"
"github.com/hashicorp/hcl/v2"
"github.com/zclconf/go-cty/cty"
"github.com/opentofu/opentofu/internal/addrs"
"github.com/opentofu/opentofu/internal/tfdiags"
"github.com/zclconf/go-cty/cty"
)
// valueMarks allow creating strictly typed values for use as cty.Value marks.
@@ -188,13 +189,16 @@ func ExtractDeprecatedDiagnosticsWithExpr(val cty.Value, expr hcl.Expression) (c
return val, diags
}
// unmarkDeepWithPathsDeprecated removes all deprecation marks from a value and returns them separately.
// It returns both the input value with all deprecation marks removed whilst preserving other marks, and a slice of PathValueMarks where marks were removed.
func unmarkDeepWithPathsDeprecated(val cty.Value) (cty.Value, []cty.PathValueMarks) {
unmarked, pathMarks := val.UnmarkDeepWithPaths()
var deprecationMarks []cty.PathValueMarks
var filteredPathMarks []cty.PathValueMarks
// Locate deprecationMarks and filter them out
for i, pm := range pathMarks {
for _, pm := range pathMarks {
deprecationPM := cty.PathValueMarks{
Path: pm.Path,
Marks: make(cty.ValueMarks),
@@ -206,16 +210,15 @@ func unmarkDeepWithPathsDeprecated(val cty.Value) (cty.Value, []cty.PathValueMar
continue
}
// Remove mark from value marks
// Remove deprecated mark from value marks
delete(pm.Marks, m)
// Add mark to deprecation marks
// Add mark to deprecation marks to keep track of what we're removing
deprecationPM.Marks[m] = struct{}{}
}
// Remove empty path to not break caller code expectations.
if len(pm.Marks) == 0 {
pathMarks = append(pathMarks[:i], pathMarks[i+1:]...)
if len(pm.Marks) > 0 {
filteredPathMarks = append(filteredPathMarks, pm)
}
if len(deprecationPM.Marks) != 0 {
@@ -223,7 +226,7 @@ func unmarkDeepWithPathsDeprecated(val cty.Value) (cty.Value, []cty.PathValueMar
}
}
return unmarked.MarkWithPaths(pathMarks), deprecationMarks
return unmarked.MarkWithPaths(filteredPathMarks), deprecationMarks
}
func RemoveDeepDeprecated(val cty.Value) cty.Value {