luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

structs: Add more cache key tests

Browse source
This commit is contained in:
Daniel Nephin 2021-01-12 19:20:20 -05:00
parent 9d333309fe
commit 9de439f66a
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
agent/structs/config_entry_test.go
View file

@ -2216,3 +2216,25 @@ func requireContainsLower(t *testing.T, haystack, needle string) {
func intPointer(i int) *int { func intPointer(i int) *int {
return &i return &i
} }
func TestConfigEntryQuery_CacheInfoKey(t *testing.T) {
assertCacheInfoKeyIsComplete(t, &ConfigEntryQuery{}, nil)
}
func TestServiceConfigRequest_CacheInfoKey(t *testing.T) {
ignoredFields := map[string]bool{
"QueryOptions": true,
// TODO: should this be included in the key?
"MeshGateway": true,
// TODO: should this be included in the key?
"Mode": true,
}
assertCacheInfoKeyIsComplete(t, &ServiceConfigRequest{}, ignoredFields)
}
func TestDiscoveryChainRequest_CacheInfoKey(t *testing.T) {
ignoredFields := map[string]bool{
"QueryOptions": true,
}
assertCacheInfoKeyIsComplete(t, &DiscoveryChainRequest{}, ignoredFields)
}

9
agent/structs/structs_test.go
View file

@ -1588,15 +1588,15 @@ func TestStructs_validateMetaPair(t *testing.T) {
} }
} }
func TestDCSpecificRequestCacheInfoKey(t *testing.T) { func TestDCSpecificRequest_CacheInfoKey(t *testing.T) {
assertCacheInfoKeyIsComplete(t, &DCSpecificRequest{}, nil) assertCacheInfoKeyIsComplete(t, &DCSpecificRequest{}, nil)
} }
func TestNodeSpecificRequestCacheInfoKey(t *testing.T) { func TestNodeSpecificRequest_CacheInfoKey(t *testing.T) {
assertCacheInfoKeyIsComplete(t, &NodeSpecificRequest{}, nil) assertCacheInfoKeyIsComplete(t, &NodeSpecificRequest{}, nil)
} }
func TestServiceSpecificRequestCacheInfoKey(t *testing.T) { func TestServiceSpecificRequest_CacheInfoKey(t *testing.T) {
ignoredFields := map[string]bool{ ignoredFields := map[string]bool{
// TODO: should this filed be included? // TODO: should this filed be included?
"ServiceKind": true, "ServiceKind": true,
@ -1605,7 +1605,7 @@ func TestServiceSpecificRequestCacheInfoKey(t *testing.T) {
assertCacheInfoKeyIsComplete(t, &ServiceSpecificRequest{}, ignoredFields) assertCacheInfoKeyIsComplete(t, &ServiceSpecificRequest{}, ignoredFields)
} }
func TestServiceDumpRequestCacheInfoKey(t *testing.T) { func TestServiceDumpRequest_CacheInfoKey(t *testing.T) {
ignoredFields := map[string]bool{ ignoredFields := map[string]bool{
// ServiceKind is only included when UseServiceKind=true // ServiceKind is only included when UseServiceKind=true
"ServiceKind": true, "ServiceKind": true,
@ -1629,6 +1629,7 @@ var cacheInfoIgnoredFields = map[string]bool{
} }
func assertCacheInfoKeyIsComplete(t *testing.T, request cache.Request, ignoredFields map[string]bool) { func assertCacheInfoKeyIsComplete(t *testing.T, request cache.Request, ignoredFields map[string]bool) {
t.Helper()
fuzzer := fuzz.NewWithSeed(time.Now().UnixNano()) fuzzer := fuzz.NewWithSeed(time.Now().UnixNano())
fuzzer.Funcs(randQueryOptions) fuzzer.Funcs(randQueryOptions)
fuzzer.Fuzz(request) fuzzer.Fuzz(request)