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

engine: resources: Receive keys should match mcl, not golang

Browse Source 
The capitalization of these keys was wrong and they weren't getting
seen. Add a test as well.
This commit is contained in:
James Shubin
2024-01-19 18:52:31 -05:00
parent b670bb8d2c
commit 32916f9a6f
8 changed files with 65 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
engine/resources/test.go
View File

@@ -91,12 +91,13 @@ type TestRes struct {
// Func1 passes the value 42 to the input and returns a string.
Func1 func(int) string `lang:"func1" yaml:"func1"`
ValidateBool bool `lang:"validatebool" yaml:"validate_bool"` // set to true to cause a validate error
ValidateError string `lang:"validateerror" yaml:"validate_error"` // set to cause a validate error
AlwaysGroup bool `lang:"alwaysgroup" yaml:"always_group"` // set to true to cause auto grouping
CompareFail bool `lang:"comparefail" yaml:"compare_fail"` // will compare fail?
SendValue string `lang:"sendvalue" yaml:"send_value"` // what value should we send?
OnlyShow []string `lang:"onlyshow" yaml:"only_show"` // what values do we show?
ValidateBool bool `lang:"validatebool" yaml:"validate_bool"` // set to true to cause a validate error
ValidateError string `lang:"validateerror" yaml:"validate_error"` // set to cause a validate error
AlwaysGroup bool `lang:"alwaysgroup" yaml:"always_group"` // set to true to cause auto grouping
CompareFail bool `lang:"comparefail" yaml:"compare_fail"` // will compare fail?
SendValue string `lang:"sendvalue" yaml:"send_value"` // what value should we send?
ExpectRecv *[]string `lang:"expectrecv" yaml:"expect_recv"` // what keys should we expect from send/recv?
OnlyShow []string `lang:"onlyshow" yaml:"only_show"` // what values do we show?
// TODO: add more fun properties!
@@ -146,14 +147,20 @@ func (obj *TestRes) Watch(ctx context.Context) error {
// CheckApply method for Test resource. Does nothing, returns happy!
func (obj *TestRes) CheckApply(ctx context.Context, apply bool) (bool, error) {
expectRecv := []string{}
for key, val := range obj.init.Recv() {
obj.init.Logf("CheckApply: Received `%s`, changed: %t", key, val.Changed)
expectRecv = append(expectRecv, key)
}
if obj.init.Refresh() {
obj.init.Logf("Received a notification!")
}
if obj.ExpectRecv != nil && len(*obj.ExpectRecv) != len(expectRecv) {
return false, fmt.Errorf("the received keys differ from expected, got: %+v", expectRecv)
}
fakeLogf := func(format string, v ...interface{}) {
key := format[0:strings.LastIndex(format, ":")]
if len(obj.OnlyShow) == 0 || util.StrInList(key, obj.OnlyShow) {
@@ -372,6 +379,19 @@ func (obj *TestRes) Cmp(r engine.Res) error {
if obj.SendValue != res.SendValue {
return fmt.Errorf("the SendValue differs")
}
if (obj.ExpectRecv == nil) != (res.ExpectRecv == nil) { // xor
return fmt.Errorf("the ExpectRecv differs")
}
if obj.ExpectRecv != nil && res.ExpectRecv != nil {
if len(*obj.ExpectRecv) != len(*res.ExpectRecv) {
return fmt.Errorf("the length of ExpectRecv differs")
}
for i, x := range *obj.ExpectRecv {
if x != (*res.ExpectRecv)[i] {
return fmt.Errorf("the item at ExpectRecv index %d differs", i)
}
}
}
if len(obj.OnlyShow) != len(res.OnlyShow) {
return fmt.Errorf("the length of OnlyShow differs")
}