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

Jump to bottom

Allow case insensitive prop typecheck on traversal #11266

Merged
merged 1 commit into from Nov 8, 2022
Merged

Allow case insensitive prop typecheck on traversal #11266

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog/pending/20221108--pkg--allow-case-insensitive-prop-typecheck-on-traversal.yaml
View file
Open in desktop
@@ -0,0 +1,4 @@
changes:
- type: feat
scope: programgen
description: More programs can be converted to Pulumi when using `pulumi convert`, provider bridging, and conversion tools by allowing property accesses and field names to fall back to a case insensitive lookup.
18 changes: 18 additions & 0 deletions pkg/codegen/hcl2/model/type_object.go
View file
Open in desktop
Expand Up @@ -72,9 +72,27 @@ func (t *ObjectType) Traverse(traverser hcl.Traverser) (Traversable, hcl.Diagnos
keyString, err := convert.Convert(key, cty.String)
contract.Assert(err == nil)

propertiesLower := make(map[string]string)
for p := range t.Properties {
propertiesLower[strings.ToLower(p)] = p
}

propertyName := keyString.AsString()
propertyType, hasProperty := t.Properties[propertyName]
if !hasProperty {
propertyNameLower := strings.ToLower(propertyName)
if propertyNameOrig, ok := propertiesLower[propertyNameLower]; ok {
propertyType = t.Properties[propertyNameOrig]
rng := traverser.SourceRange()
return propertyType, hcl.Diagnostics{
{
Severity: hcl.DiagWarning,
Subject: &rng,
Summary: "Found matching case-insensitive property",
Detail: fmt.Sprintf("Matched %s with %s", propertyName, propertyNameOrig),
},
}
}
aq17 marked this conversation as resolved.
Show resolved Hide resolved
props := make([]string, 0, len(t.Properties))
for k := range t.Properties {
props = append(props, k)
Expand Down
2 changes: 2 additions & 0 deletions pkg/codegen/hcl2/model/type_test.go
View file
Open in desktop
Expand Up @@ -508,6 +508,8 @@ func TestObjectType(t *testing.T) {
testTraverse(t, typ, hcl.TraverseAttr{Name: "bar"}, IntType, false)
testTraverse(t, typ, hcl.TraverseAttr{Name: "baz"}, NumberType, false)
testTraverse(t, typ, hcl.TraverseAttr{Name: "qux"}, NewOptionalType(BoolType), false)
// test case-insensitive attribute
testTraverse(t, typ, hcl.TraverseAttr{Name: "Qux"}, NewOptionalType(BoolType), true)
testTraverse(t, typ, hcl.TraverseIndex{Key: cty.StringVal("foo")}, BoolType, false)
testTraverse(t, typ, hcl.TraverseIndex{Key: cty.StringVal("bar")}, IntType, false)
testTraverse(t, typ, hcl.TraverseIndex{Key: cty.StringVal("baz")}, NumberType, false)
Expand Down