tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add proptools helper functions."

Browse source
This commit is contained in:
Liz Kammer 2022-01-12 13:23:33 +00:00 committed by Gerrit Code Review
commit c643dd96cd
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
proptools/extend.go
View file

@ -255,11 +255,7 @@ func extendPropertiesRecursive(dstValues []reflect.Value, srcValue reflect.Value
srcType := srcValue.Type()
for i, srcField := range typeFields(srcType) {
if srcField.PkgPath != "" {
// The field is not exported so just skip it.
continue
}
if HasTag(srcField, "blueprint", "mutated") {
if ShouldSkipProperty(srcField) {
continue
}
@ -305,7 +301,7 @@ func extendPropertiesRecursive(dstValues []reflect.Value, srcValue reflect.Value
if field.Name == srcField.Name {
dstField = field
ok = true
} else if field.Name == "BlueprintEmbed" || field.Anonymous {
} else if IsEmbedded(field) {
embeddedDstValue := dstValue.FieldByIndex(field.Index)
if isStructPtr(embeddedDstValue.Type()) {
if embeddedDstValue.IsNil() {
@ -541,6 +537,18 @@ func ExtendBasicType(dstFieldValue, srcFieldValue reflect.Value, order Order) {
}
}
// ShouldSkipProperty indicates whether a property should be skipped in processing.
func ShouldSkipProperty(structField reflect.StructField) bool {
return structField.PkgPath != "" || // The field is not exported so just skip it.
HasTag(structField, "blueprint", "mutated") // The field is not settable in a blueprint file
}
// IsEmbedded indicates whether a property is embedded. This is useful for determining nesting name
// as the name of the embedded field is _not_ used in blueprint files.
func IsEmbedded(structField reflect.StructField) bool {
return structField.Name == "BlueprintEmbed" || structField.Anonymous
}
type getStructEmptyError struct{}
func (getStructEmptyError) Error() string { return "interface containing nil pointer" }