fix(robot): refresh stale cache on bare-metal name lookup miss

Author: guettli

hcloud/instances.go

@@ -49,12 +49,7 @@ type instances struct {
 var errServerNotFound = fmt.Errorf("server not found")
 
 func newInstances(client *hcloud.Client, robotClient robotclient.Client, addressFamily addressFamily, networkID int64) *instances {
-	return &instances{
-		client:        client,
-		robotClient:   robotClient,
-		addressFamily: addressFamily,
-		networkID:     networkID,
-	}
+	return &instances{client, robotClient, addressFamily, networkID}
 }
 
 // lookupServer attempts to locate the corresponding hcloud.Server or models.Server (robot server) for a given v1.Node.

hcloud/util.go

@@ -71,9 +71,10 @@ func getRobotServerByName(c robotclient.Client, node *corev1.Node) (server *mode
 		return nil, fmt.Errorf("%s: %w", op, err)
 	}
 
-	server = findRobotServerByName(serverList, string(node.Name))
-	if server != nil {
-		return server, nil
+	for i, s := range serverList {
+		if s.Name == node.Name {
+			return &serverList[i], nil
+		}
 	}
 
 	serverList, err = c.ServerGetListForceRefresh()
@@ -82,7 +83,13 @@ func getRobotServerByName(c robotclient.Client, node *corev1.Node) (server *mode
 		return nil, fmt.Errorf("%s: force refresh after cache miss: %w", op, err)
 	}
 
-	return findRobotServerByName(serverList, string(node.Name)), nil
+	for i, s := range serverList {
+		if s.Name == node.Name {
+			return &serverList[i], nil
+		}
+	}
+
+	return nil, nil
 }
 
 func getRobotServerByID(c robotclient.Client, id int, node *corev1.Node) (s *models.Server, e error) {
@@ -121,15 +128,6 @@ func getRobotServerByID(c robotclient.Client, id int, node *corev1.Node) (s *mod
 	return server, nil
 }
 
-func findRobotServerByName(serverList []models.Server, name string) *models.Server {
-	for i, s := range serverList {
-		if s.Name == name {
-			return &serverList[i]
-		}
-	}
-	return nil
-}
-
 func isHCloudServerByName(name string) bool {
 	return !strings.HasPrefix(name, hostNamePrefixRobot)
 }

internal/robot/client/cache/client.go

@@ -90,7 +90,7 @@ func NewCachedRobotClient(rootDir string, httpClient *http.Client, baseURL strin
 
 func (c *cacheRobotClient) ServerGet(id int) (*models.Server, error) {
 	if c.shouldSync() {
-		if _, err := c.sync(); err != nil {
+		if _, err := c.ServerGetListForceRefresh(); err != nil {
 			return nil, err
 		}
 	}
@@ -106,15 +106,32 @@ func (c *cacheRobotClient) ServerGet(id int) (*models.Server, error) {
 
 func (c *cacheRobotClient) ServerGetList() ([]models.Server, error) {
 	if c.shouldSync() {
-		return c.sync()
+		return c.ServerGetListForceRefresh()
 	}
 
 	return c.l, nil
 }
 
 // ServerGetListForceRefresh bypasses the timeout check and reloads the cache from Robot.
 func (c *cacheRobotClient) ServerGetListForceRefresh() ([]models.Server, error) {
-	return c.sync()
+	list, err := c.robotClient.ServerGetList()
+	if err != nil {
+		return list, err
+	}
+
+	// populate list
+	c.l = list
+
+	// 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()
+
+	return c.l, nil
 }
 
 func (c *cacheRobotClient) shouldSync() bool {
@@ -138,24 +155,3 @@ func (c *cacheRobotClient) SetCredentials(username, password string) error {
 	c.m = nil
 	return nil
 }
-
-func (c *cacheRobotClient) sync() ([]models.Server, error) {
-	list, err := c.robotClient.ServerGetList()
-	if err != nil {
-		return list, err
-	}
-
-	// populate list
-	c.l = list
-
-	// 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()
-
-	return c.l, nil
-}