various: reduce file I/O & pre-parse CIDRs

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I288c299d35fdc833c802e22682f14b8e6a6a6964
This commit is contained in:
raf 2026-03-07 12:12:37 +03:00
commit 0f38a062e9
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
2 changed files with 66 additions and 52 deletions

View file

@ -25,18 +25,23 @@ type versionInfo struct {
BuildDate string `json:"buildDate"`
}
func getVersionInfo() versionInfo {
data, err := os.ReadFile("version.json")
if err != nil {
return versionInfo{}
}
var v versionInfo
if err := json.Unmarshal(data, &v); err != nil {
return versionInfo{}
}
return v
}
func getVersion() string {
if version != "" {
return version
}
data, err := os.ReadFile("version.json")
if err != nil {
return "dev"
}
var v versionInfo
if err := json.Unmarshal(data, &v); err != nil {
return "dev"
}
v := getVersionInfo()
if v.Version != "" {
return v.Version
}
@ -47,14 +52,7 @@ func getCommit() string {
if commit != "" {
return commit
}
data, err := os.ReadFile("version.json")
if err != nil {
return "none"
}
var v versionInfo
if err := json.Unmarshal(data, &v); err != nil {
return "none"
}
v := getVersionInfo()
if v.Commit != "" {
return v.Commit
}