summaryrefslogtreecommitdiff
path: root/internal/discovery/discovery.go
diff options
context:
space:
mode:
authorJeroen Wijenbergh <jeroen.wijenbergh@geant.org>2026-02-20 12:32:00 +0100
committerJeroen Wijenbergh <jeroen.wijenbergh@geant.org>2026-02-20 15:00:55 +0100
commit72357b7f945a5d25339d3df4d6bd225a30b2601f (patch)
treebab4b6d0c2ab15996403f60fff2aa0cda537b351 /internal/discovery/discovery.go
parent7672fee6707ba133fc6cea5b8e69db72f432deb0 (diff)
Building: Remove release tag
As we now have the discovery JSON files in the repo, it makes no sense to conditionally embed the files. Just always embed them
Diffstat (limited to 'internal/discovery/discovery.go')
-rw-r--r--internal/discovery/discovery.go17
1 files changed, 11 insertions, 6 deletions
diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go
index 93b5f4e..95b84a0 100644
--- a/internal/discovery/discovery.go
+++ b/internal/discovery/discovery.go
@@ -15,10 +15,19 @@ import (
"codeberg.org/eduVPN/eduvpn-common/internal/levenshtein"
"codeberg.org/eduVPN/eduvpn-common/internal/verify"
discotypes "codeberg.org/eduVPN/eduvpn-common/types/discovery"
+
+ _ "embed"
)
-// HasCache denotes whether or not we have an embedded cache available
-var HasCache bool
+// eServers are the embedded server list
+//
+//go:embed server_list.json
+var eServers []byte
+
+// eOrganizations are the embedded organizations
+//
+//go:embed organization_list.json
+var eOrganizations []byte
// Organizations are the list of organizations from https://disco.eduvpn.org/v2/organization_list.json
type Organizations struct {
@@ -426,10 +435,6 @@ func (discovery *Discovery) UpdateOrganizations(other Organizations) {
// Fill makes sure that the cache is filled with the embedded discovery
func (discovery *Discovery) Fill() error {
- if !HasCache {
- return nil
- }
-
discovery.mu.Lock()
defer discovery.mu.Unlock()