From 72357b7f945a5d25339d3df4d6bd225a30b2601f Mon Sep 17 00:00:00 2001 From: Jeroen Wijenbergh Date: Fri, 20 Feb 2026 12:32:00 +0100 Subject: 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 --- internal/discovery/discovery.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'internal/discovery/discovery.go') 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() -- cgit v1.2.3