sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 08:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move StoreKind under own StoreConfig configuration and rename to Engine (#1219)

Browse Source 
* Move StoreKind under own StoreConfig configuration parameter

* Rename StoreKind option to Engine

* Rename StoreKind internal methods and types to Engine

* Add template engine value test

---------

Co-authored-by: Maycon Santos <mlsmaycon@gmail.com>
This commit is contained in:
Yury Gargay
2023-10-16 11:19:39 +02:00
committed by GitHub
parent 32880c56a4
commit 46f5f148da
14 changed files with 62 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
management/server/metrics/selfhosted.go
View File

@@ -48,7 +48,7 @@ type properties map[string]interface{}
// DataSource metric data source
type DataSource interface {
GetAllAccounts() []*server.Account
GetStoreKind() server.StoreKind
GetStoreEngine() server.StoreEngine
}
// ConnManager peer connection manager that holds state for current active connections
@@ -296,7 +296,7 @@ func (w *Worker) generateProperties() properties {
metricsProperties["max_active_peer_version"] = maxActivePeerVersion
metricsProperties["ui_clients"] = uiClient
metricsProperties["idp_manager"] = w.idpManager
metricsProperties["store_kind"] = w.dataSource.GetStoreKind()
metricsProperties["store_engine"] = w.dataSource.GetStoreEngine()
for protocol, count := range rulesProtocol {
metricsProperties["rules_protocol_"+protocol] = count

10
management/server/metrics/selfhosted_test.go
View File

@@ -151,9 +151,9 @@ func (mockDatasource) GetAllAccounts() []*server.Account {
}
}
// GetStoreKind returns FileStoreKind
func (mockDatasource) GetStoreKind() server.StoreKind {
return server.FileStoreKind
// GetStoreEngine returns FileStoreEngine
func (mockDatasource) GetStoreEngine() server.StoreEngine {
return server.FileStoreEngine
}
// TestGenerateProperties tests and validate the properties generation by using the mockDatasource for the Worker.generateProperties
@@ -242,7 +242,7 @@ func TestGenerateProperties(t *testing.T) {
t.Errorf("expected 2 user_peers, got %d", properties["user_peers"])
}
if properties["store_kind"] != server.FileStoreKind {
t.Errorf("expected JsonFile, got %s", properties["store_kind"])
if properties["store_engine"] != server.FileStoreEngine {
t.Errorf("expected JsonFile, got %s", properties["store_engine"])
}
}