Disable caching the registry (#1115)

Signed-off-by: Radoslav Dimitrov <[email protected]>

Author: rdimitrov

pkg/registry/provider_embedded.go

@@ -5,17 +5,13 @@ import (
 	"encoding/json"
 	"fmt"
 	"strings"
-	"sync"
 )
 
 //go:embed data/registry.json
 var embeddedRegistryFS embed.FS
 
 // EmbeddedRegistryProvider provides registry data from embedded JSON files
 type EmbeddedRegistryProvider struct {
-	registry     *Registry
-	registryOnce sync.Once
-	registryErr  error
 }
 
 // NewEmbeddedRegistryProvider creates a new embedded registry provider
@@ -24,26 +20,23 @@ func NewEmbeddedRegistryProvider() *EmbeddedRegistryProvider {
 }
 
 // GetRegistry returns the embedded registry data
-func (p *EmbeddedRegistryProvider) GetRegistry() (*Registry, error) {
-	p.registryOnce.Do(func() {
-		data, err := embeddedRegistryFS.ReadFile("data/registry.json")
-		if err != nil {
-			p.registryErr = fmt.Errorf("failed to read embedded registry data: %w", err)
-			return
-		}
+func (*EmbeddedRegistryProvider) GetRegistry() (*Registry, error) {
+	data, err := embeddedRegistryFS.ReadFile("data/registry.json")
+	if err != nil {
+		return nil, fmt.Errorf("failed to read embedded registry data: %w", err)
+	}
 
-		p.registry, p.registryErr = parseRegistryData(data)
-		if p.registryErr != nil {
-			return
-		}
+	registry, err := parseRegistryData(data)
+	if err != nil {
+		return nil, err
+	}
 
-		// Set name field on each server based on map key
-		for name, server := range p.registry.Servers {
-			server.Name = name
-		}
-	})
+	// Set name field on each server based on map key
+	for name, server := range registry.Servers {
+		server.Name = name
+	}
 
-	return p.registry, p.registryErr
+	return registry, nil
 }
 
 // GetServer returns a specific server by name

pkg/registry/provider_remote.go

@@ -5,7 +5,6 @@ import (
 	"io"
 	"net/http"
 	"strings"
-	"sync"
 
 	"github.com/stacklok/toolhive/pkg/networking"
 )
@@ -14,9 +13,6 @@ import (
 type RemoteRegistryProvider struct {
 	registryURL    string
 	allowPrivateIp bool
-	registry       *Registry
-	registryOnce   sync.Once
-	registryErr    error
 }
 
 // NewRemoteRegistryProvider creates a new remote registry provider
@@ -29,46 +25,41 @@ func NewRemoteRegistryProvider(registryURL string, allowPrivateIp bool) *RemoteR
 
 // GetRegistry returns the remote registry data
 func (p *RemoteRegistryProvider) GetRegistry() (*Registry, error) {
-	p.registryOnce.Do(func() {
-		client, err := networking.NewHttpClientBuilder().
-			WithPrivateIPs(p.allowPrivateIp).
-			Build()
-		if err != nil {
-			p.registryErr = fmt.Errorf("failed to build http client: %w", err)
-			return
-		}
-		resp, err := client.Get(p.registryURL)
-		if err != nil {
-			p.registryErr = fmt.Errorf("failed to fetch registry data from URL %s: %w", p.registryURL, err)
-			return
-		}
-		defer resp.Body.Close()
+	client, err := networking.NewHttpClientBuilder().
+		WithPrivateIPs(p.allowPrivateIp).
+		Build()
+	if err != nil {
+		return nil, fmt.Errorf("failed to build http client: %w", err)
+	}
 
-		// Check if the response status code is OK
-		if resp.StatusCode != http.StatusOK {
-			p.registryErr = fmt.Errorf("response status code from URL %s not OK: status code %d", p.registryURL, resp.StatusCode)
-			return
-		}
+	resp, err := client.Get(p.registryURL)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch registry data from URL %s: %w", p.registryURL, err)
+	}
+	defer resp.Body.Close()
 
-		// Read the response body
-		data, err := io.ReadAll(resp.Body)
-		if err != nil {
-			p.registryErr = fmt.Errorf("failed to read registry data from response body: %w", err)
-			return
-		}
+	// Check if the response status code is OK
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("response status code from URL %s not OK: status code %d", p.registryURL, resp.StatusCode)
+	}
 
-		p.registry, p.registryErr = parseRegistryData(data)
-		if p.registryErr != nil {
-			return
-		}
+	// Read the response body
+	data, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read registry data from response body: %w", err)
+	}
 
-		// Set name field on each server based on map key
-		for name, server := range p.registry.Servers {
-			server.Name = name
-		}
-	})
+	registry, err := parseRegistryData(data)
+	if err != nil {
+		return nil, err
+	}
+
+	// Set name field on each server based on map key
+	for name, server := range registry.Servers {
+		server.Name = name
+	}
 
-	return p.registry, p.registryErr
+	return registry, nil
 }
 
 // GetServer returns a specific server by name