lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: util: Refactor code for future changes

Browse Source 
This makes things a bit cleaner and easier to follow and accepts future
patches easier.
This commit is contained in:
James Shubin
2023-11-12 15:26:44 -05:00
parent efc5237265
commit cb6b8a9670
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
engine/util/util.go
View File

@@ -148,7 +148,8 @@ func StructTagToFieldName(stptr interface{}) (map[string]string, error) {
// StructFieldCompat returns whether a send struct and key is compatible with a // StructFieldCompat returns whether a send struct and key is compatible with a
// recv struct and key. This inputs must both be a ptr to a string, and a valid // recv struct and key. This inputs must both be a ptr to a string, and a valid
// key that can be found in the struct tag. // key that can be found in the struct tag. The (1) first values are for send,
// and the (2) second values are for recv.
// TODO: add a bool to decide if *string to string or string to *string is okay. // TODO: add a bool to decide if *string to string or string to *string is okay.
func StructFieldCompat(st1 interface{}, key1 string, st2 interface{}, key2 string) error { func StructFieldCompat(st1 interface{}, key1 string, st2 interface{}, key2 string) error {
m1, err := StructTagToFieldName(st1) m1, err := StructTagToFieldName(st1)
@@ -179,14 +180,6 @@ func StructFieldCompat(st1 interface{}, key1 string, st2 interface{}, key2 strin
value2 := obj2.FieldByName(k2) value2 := obj2.FieldByName(k2)
kind2 := value2.Kind() kind2 := value2.Kind()
if kind1 != kind2 {
return fmt.Errorf("kind mismatch between %s and %s", kind1, kind2)
}
if t1, t2 := value1.Type(), value2.Type(); t1 != t2 {
return fmt.Errorf("type mismatch between %s and %s", t1, t2)
}
if !value2.CanSet() { // if we can't set, then this is pointless! if !value2.CanSet() { // if we can't set, then this is pointless!
return fmt.Errorf("can't set") return fmt.Errorf("can't set")
} }
@@ -199,6 +192,14 @@ func StructFieldCompat(st1 interface{}, key1 string, st2 interface{}, key2 strin
return fmt.Errorf("can't interface the recv") return fmt.Errorf("can't interface the recv")
} }
if kind1 != kind2 {
return fmt.Errorf("kind mismatch between %s and %s", kind1, kind2)
}
if t1, t2 := value1.Type(), value2.Type(); t1 != t2 {
return fmt.Errorf("type mismatch between %s and %s", t1, t2)
}
return nil return nil
} }