...

Author: guettli

hcloud/cloud_test.go

@@ -34,6 +34,7 @@ import (
 	"github.com/syself/hetzner-cloud-controller-manager/internal/annotation"
 	"github.com/syself/hetzner-cloud-controller-manager/internal/credentials"
 	"github.com/syself/hetzner-cloud-controller-manager/internal/hcops"
+	robotclient "github.com/syself/hetzner-cloud-controller-manager/internal/robot/client"
 	hrobot "github.com/syself/hrobot-go"
 	"github.com/syself/hrobot-go/models"
 	corev1 "k8s.io/api/core/v1"
@@ -44,7 +45,15 @@ type testEnv struct {
 	Server      *httptest.Server
 	Mux         *http.ServeMux
 	Client      *hcloud.Client
-	RobotClient hrobot.RobotClient
+	RobotClient robotclient.Client
+}
+
+type testRobotClient struct {
+	hrobot.RobotClient
+}
+
+func (c testRobotClient) ServerGetListForceRefresh() ([]models.Server, error) {
+	return c.ServerGetList()
 }
 
 func (env *testEnv) Teardown() {
@@ -70,7 +79,7 @@ func newTestEnv() testEnv {
 		Server:      server,
 		Mux:         mux,
 		Client:      client,
-		RobotClient: robotClient,
+		RobotClient: testRobotClient{RobotClient: robotClient},
 	}
 }
 

hcloud/util.go

@@ -35,10 +35,6 @@ import (
 // youngRobotServerLookupWindow limits forced Robot refreshes to newly created nodes.
 var youngRobotServerLookupWindow = 10 * time.Minute
 
-type robotServerListForceRefreshClient interface {
-	ServerGetListForceRefresh() ([]models.Server, error)
-}
-
 func getHCloudServerByName(ctx context.Context, c *hcloud.Client, name string) (*hcloud.Server, error) {
 	const op = "hcloud/getServerByName"
 	metrics.OperationCalled.WithLabelValues(op).Inc()
@@ -85,12 +81,7 @@ func getRobotServerByName(c robotclient.Client, node *corev1.Node) (server *mode
 		return server, nil
 	}
 
-	forceRefreshClient, ok := c.(robotServerListForceRefreshClient)
-	if !ok {
-		return nil, nil
-	}
-
-	serverList, err = forceRefreshClient.ServerGetListForceRefresh()
+	serverList, err = c.ServerGetListForceRefresh()
 	if err != nil {
 		hcops.HandleRateLimitExceededError(err, node)
 		return nil, fmt.Errorf("%s: refresh for young node: %w", op, err)

internal/mocks/robot.go

@@ -14,6 +14,10 @@ func (m *RobotClient) ServerGetList() ([]models.Server, error) {
 	return getRobotServers(args, 0), args.Error(1)
 }
 
+func (m *RobotClient) ServerGetListForceRefresh() ([]models.Server, error) {
+	return m.ServerGetList()
+}
+
 func (m *RobotClient) SetCredentials(_, _ string) error {
 	args := m.Called()
 	return args.Error(3)

internal/robot/client/interface.go

@@ -5,5 +5,6 @@ import "github.com/syself/hrobot-go/models"
 type Client interface {
 	ServerGet(id int) (*models.Server, error)
 	ServerGetList() ([]models.Server, error)
+	ServerGetListForceRefresh() ([]models.Server, error)
 	SetCredentials(username, password string) error
 }