Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of issensitive must return unknown for unknown args without sensitive into v1.10 #36014

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Backport of issensitive must return unknown for unknown args without sensitive into v1.10 #36014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions internal/lang/funcs/sensitive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,14 @@ var IssensitiveFunc = function.New(&function.Spec{
return cty.Bool, nil
},
Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) {
s := args[0].HasMark(marks.Sensitive)
return cty.BoolVal(s), nil
switch v := args[0]; {
case v.HasMark(marks.Sensitive):
return cty.True, nil
case !v.IsKnown():
return cty.UnknownVal(cty.Bool), nil
default:
return cty.False, nil
}
},
})

Expand Down
20 changes: 10 additions & 10 deletions internal/lang/funcs/sensitive_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,47 +166,47 @@ func TestNonsensitive(t *testing.T) {
func TestIssensitive(t *testing.T) {
tests := []struct {
Input cty.Value
Sensitive bool
Sensitive cty.Value
WantErr string
}{
{
cty.NumberIntVal(1).Mark(marks.Sensitive),
true,
cty.True,
``,
},
{
cty.NumberIntVal(1),
false,
cty.False,
``,
},
{
cty.DynamicVal.Mark(marks.Sensitive),
true,
cty.True,
``,
},
{
cty.UnknownVal(cty.String).Mark(marks.Sensitive),
true,
cty.True,
``,
},
{
cty.NullVal(cty.EmptyObject).Mark(marks.Sensitive),
true,
cty.True,
``,
},
{
cty.NullVal(cty.String),
false,
cty.False,
``,
},
{
cty.DynamicVal,
false,
cty.UnknownVal(cty.Bool),
``,
},
{
cty.UnknownVal(cty.String),
false,
cty.UnknownVal(cty.Bool),
``,
},
}
Expand All @@ -227,7 +227,7 @@ func TestIssensitive(t *testing.T) {
t.Fatalf("unexpected error: %s", err)
}

if (got.True() && !test.Sensitive) || (got.False() && test.Sensitive) {
if !got.RawEquals(test.Sensitive) {
t.Errorf("wrong result \ngot: %#v\nwant: %#v", got, test.Sensitive)
}
})
Expand Down
Loading