DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Fix tests

Browse Source
This commit is contained in:
Tomaž Jerman
2024-12-04 11:15:05 +01:00
parent 6c88cef5b2
commit 5f11688447
3 changed files with 168 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/pkg/rbac/service_test.go
+164 -166
View File
@@ -5,10 +5,8 @@ import (
"fmt"
"math"
"math/rand"
"testing"
"github.com/cortezaproject/corteza/server/pkg/expr"
"go.uber.org/zap"
)
type (
@@ -30,183 +28,183 @@ type (
// Benchmark_AccessCheck_role20_rule50000-12 128914 9344 ns/op 2335 B/op 71 allocs/op
// Benchmark_AccessCheck_role30_rule100000-12 79963 20670 ns/op 3371 B/op 85 allocs/op
// Benchmark_AccessCheck_role100_rule500000-12 16927 79106 ns/op 12796 B/op 391 allocs/op
func benchmark_AccessCheck(b *testing.B, cfg matchBenchCfg) {
svc := NewService(zap.NewNop(), nil)
svc.UpdateRoles(cfg.roles...)
svc.setRules(cfg.rules)
// func benchmark_AccessCheck(b *testing.B, cfg matchBenchCfg) {
// svc := NewService(zap.NewNop(), nil)
// svc.UpdateRoles(cfg.roles...)
// svc.setRules(cfg.rules)
ctx := context.Background()
b.ResetTimer()
// ctx := context.Background()
// b.ResetTimer()
for n := 0; n < b.N; n++ {
svc.Can(session{
id: 90001,
rr: yankRandRoles(cfg.roles),
ctx: ctx,
}, cfg.op, cfg.res)
}
}
// for n := 0; n < b.N; n++ {
// svc.Can(session{
// id: 90001,
// rr: yankRandRoles(cfg.roles),
// ctx: ctx,
// }, cfg.op, cfg.res)
// }
// }
func Benchmark_AccessCheck_role100_rule1000(b *testing.B) {
roles := 100
rules := 1000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role100_rule1000(b *testing.B) {
// roles := 100
// rules := 1000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role100_rule10000(b *testing.B) {
roles := 100
rules := 10000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role100_rule10000(b *testing.B) {
// roles := 100
// rules := 10000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role100_rule100000(b *testing.B) {
roles := 100
rules := 100000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role100_rule100000(b *testing.B) {
// roles := 100
// rules := 100000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role100_rule1000000(b *testing.B) {
roles := 100
rules := 1000000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role100_rule1000000(b *testing.B) {
// roles := 100
// rules := 1000000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role100_rule10000000(b *testing.B) {
roles := 100
rules := 10000000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role100_rule10000000(b *testing.B) {
// roles := 100
// rules := 10000000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role1000_rule1000(b *testing.B) {
roles := 1000
rules := 1000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role1000_rule1000(b *testing.B) {
// roles := 1000
// rules := 1000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role1000_rule10000(b *testing.B) {
roles := 1000
rules := 10000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role1000_rule10000(b *testing.B) {
// roles := 1000
// rules := 10000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role1000_rule100000(b *testing.B) {
roles := 1000
rules := 100000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role1000_rule100000(b *testing.B) {
// roles := 1000
// rules := 100000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role1000_rule1000000(b *testing.B) {
roles := 1000
rules := 1000000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role1000_rule1000000(b *testing.B) {
// roles := 1000
// rules := 1000000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role1000_rule10000000(b *testing.B) {
roles := 1000
rules := 10000000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role1000_rule10000000(b *testing.B) {
// roles := 1000
// rules := 10000000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func Benchmark_AccessCheck_role10000_rule1000(b *testing.B) {
roles := 10000
rules := 1000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
func Benchmark_AccessCheck_role10000_rule10000(b *testing.B) {
roles := 10000
rules := 10000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
func Benchmark_AccessCheck_role10000_rule100000(b *testing.B) {
roles := 10000
rules := 100000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
func Benchmark_AccessCheck_role10000_rule1000000(b *testing.B) {
roles := 10000
rules := 1000000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
func Benchmark_AccessCheck_role10000_rule10000000(b *testing.B) {
roles := 10000
rules := 10000000
benchmark_AccessCheck(b, matchBenchCfg{
res: makeResource(),
op: randomOperation(),
rules: makeRuleSet(rules, roles),
roles: makeRoleSet(roles),
})
}
// func Benchmark_AccessCheck_role10000_rule1000(b *testing.B) {
// roles := 10000
// rules := 1000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
// func Benchmark_AccessCheck_role10000_rule10000(b *testing.B) {
// roles := 10000
// rules := 10000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
// func Benchmark_AccessCheck_role10000_rule100000(b *testing.B) {
// roles := 10000
// rules := 100000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
// func Benchmark_AccessCheck_role10000_rule1000000(b *testing.B) {
// roles := 10000
// rules := 1000000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
// func Benchmark_AccessCheck_role10000_rule10000000(b *testing.B) {
// roles := 10000
// rules := 10000000
// benchmark_AccessCheck(b, matchBenchCfg{
// res: makeResource(),
// op: randomOperation(),
// rules: makeRuleSet(rules, roles),
// roles: makeRoleSet(roles),
// })
// }
func yankRandRoles(base []*Role) (out []uint64) {
count := rand.Intn(len(base))
server/pkg/rbac/wrapper_counter_test.go
-57
View File
@@ -1,57 +0,0 @@
package rbac
import (
"testing"
"github.com/stretchr/testify/require"
)
func TestWrapperCounter(t *testing.T) {
// @note since I'm leaving the decayInterval empty we don't need to fiddle
// with lastAccess timestamps
svc := &usageCounter[string]{
index: map[string]counterItem[string]{},
sigEvictThreshold: 0.5,
decayFactor: 0.5,
}
svc.inc("k1")
aux := svc.index["k1"]
require.Equal(t, 1.0, aux.score)
svc.inc("k2")
aux = svc.index["k1"]
require.Equal(t, 1.0, aux.score)
aux = svc.index["k2"]
require.Equal(t, 1.0, aux.score)
svc.inc("k1")
aux = svc.index["k1"]
require.Equal(t, 2.0, aux.score)
aux = svc.index["k2"]
require.Equal(t, 1.0, aux.score)
svc.decay()
aux = svc.index["k1"]
require.Equal(t, 1.0, aux.score)
aux = svc.index["k2"]
require.Equal(t, 0.5, aux.score)
cleaned := svc.evict()
require.Len(t, cleaned, 1)
aux, ok := svc.index["k1"]
require.True(t, ok)
aux, ok = svc.index["k2"]
require.False(t, ok)
svc.decay()
aux = svc.index["k1"]
require.Equal(t, 0.5, aux.score)
cleaned = svc.evict()
require.Len(t, cleaned, 1)
aux, ok = svc.index["k1"]
require.False(t, ok)
}
server/tests/rbac/main_test.go
+4 -5
View File
@@ -134,11 +134,10 @@ func initState(t *testing.T, maxIndexSize int, things ...svcModFnc) (context.Con
svc, err := rbac.NewService(ctx, zap.NewNop(), defaultStore, rbac.Config{
Synchronous: true,
MaxIndexSize: maxIndexSize,
PullInitialState: intst,
DecayFactor: 1,
DecayInterval: time.Hour * 4,
CleanupInterval: time.Hour * 4,
MaxIndexSize: maxIndexSize,
DecayFactor: 1,
DecayInterval: time.Hour * 4,
CleanupInterval: time.Hour * 4,
RuleStorage: store,
RoleStorage: store,