docs.

Author: guettli

hcloud/util.go

@@ -30,6 +30,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
+// robotServerListForceRefreshClient is implemented by Robot clients that can
+// bypass their cache timeout and reload the server list immediately.
 type robotServerListForceRefreshClient interface {
 	ServerGetListForceRefresh() ([]models.Server, error)
 }
@@ -81,6 +83,7 @@ func getRobotServerByName(c robotclient.Client, node *corev1.Node) (server *mode
 		}
 	}
 
+	// Only the cached Robot client can bypass its timeout and reload immediately.
 	forceRefreshClient, ok := c.(robotServerListForceRefreshClient)
 	if !ok {
 		return nil, nil

internal/robot/client/cache/client.go

@@ -90,9 +90,22 @@ func NewCachedRobotClient(rootDir string, httpClient *http.Client, baseURL strin
 
 func (c *cacheRobotClient) ServerGet(id int) (*models.Server, error) {
 	if c.shouldSync() {
-		if _, err := c.ServerGetListForceRefresh(); err != nil {
+		list, err := c.robotClient.ServerGetList()
+		if err != nil {
 			return nil, err
 		}
+
+		// populate list
+		c.l = list
+
+		// remove all entries from map and populate it freshly
+		c.m = make(map[int]*models.Server)
+		for i, server := range list {
+			c.m[server.ServerNumber] = &list[i]
+		}
+
+		// set time of last update
+		c.lastUpdate = time.Now()
 	}
 
 	server, found := c.m[id]
@@ -106,34 +119,33 @@ func (c *cacheRobotClient) ServerGet(id int) (*models.Server, error) {
 
 func (c *cacheRobotClient) ServerGetList() ([]models.Server, error) {
 	if c.shouldSync() {
-		return c.ServerGetListForceRefresh()
-	}
-
-	return c.l, nil
-}
+		list, err := c.robotClient.ServerGetList()
+		if err != nil {
+			return list, err
+		}
 
-// ServerGetListForceRefresh bypasses the timeout check and reloads the cache from Robot.
-func (c *cacheRobotClient) ServerGetListForceRefresh() ([]models.Server, error) {
-	list, err := c.robotClient.ServerGetList()
-	if err != nil {
-		return list, err
-	}
+		// populate list
+		c.l = list
 
-	// populate list
-	c.l = list
+		// remove all entries from map and populate it freshly
+		c.m = make(map[int]*models.Server)
+		for i, server := range list {
+			c.m[server.ServerNumber] = &list[i]
+		}
 
-	// remove all entries from map and repopulate it from the current list
-	c.m = make(map[int]*models.Server)
-	for i, server := range list {
-		c.m[server.ServerNumber] = &list[i]
+		// set time of last update
+		c.lastUpdate = time.Now()
 	}
 
-	// set time of last update
-	c.lastUpdate = time.Now()
-
 	return c.l, nil
 }
 
+// ServerGetListForceRefresh invalidates the current cache and reloads the list from Robot.
+func (c *cacheRobotClient) ServerGetListForceRefresh() ([]models.Server, error) {
+	c.m = nil
+	return c.ServerGetList()
+}
+
 func (c *cacheRobotClient) shouldSync() bool {
 	// map is nil means we have no cached value yet
 	if c.m == nil {