fix: add client-side timeouts to hcloud and robot clients (#1058)

Author: lukasmetzner

hcloud/cloud.go

@@ -19,8 +19,10 @@ package hcloud
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"os"
 	"strings"
+	"time"
 
 	hrobot "github.com/syself/hrobot-go"
 	corev1 "k8s.io/api/core/v1"
@@ -39,7 +41,8 @@ import (
 )
 
 const (
-	providerName = "hcloud"
+	providerName     = "hcloud"
+	apiClientTimeout = 15 * time.Second
 )
 
 // providerVersion is set by the build process using -ldflags -X.
@@ -70,6 +73,11 @@ func NewCloud(cidr string) (cloudprovider.Interface, error) {
 	opts := []hcloud.ClientOption{
 		hcloud.WithToken(cfg.HCloudClient.Token),
 		hcloud.WithApplication("hcloud-cloud-controller", providerVersion),
+		hcloud.WithHTTPClient(
+			&http.Client{
+				Timeout: apiClientTimeout,
+			},
+		),
 	}
 
 	// start metrics server if enabled (enabled by default)
@@ -89,7 +97,13 @@ func NewCloud(cidr string) (cloudprovider.Interface, error) {
 
 	var robotClient robot.Client
 	if cfg.Robot.Enabled {
-		c := hrobot.NewBasicAuthClient(cfg.Robot.User, cfg.Robot.Password)
+		c := hrobot.NewBasicAuthClientWithCustomHttpClient(
+			cfg.Robot.User,
+			cfg.Robot.Password,
+			&http.Client{
+				Timeout: apiClientTimeout,
+			},
+		)
 
 		robotClient = robot.NewRateLimitedClient(
 			cfg.Robot.RateLimitWaitTime,
@@ -120,7 +134,7 @@ func NewCloud(cidr string) (cloudprovider.Interface, error) {
 	}
 
 	// Validate that the provided token works, and we have network connectivity to the Hetzner Cloud API
-	_, _, err = client.Server.List(context.Background(), hcloud.ServerListOpts{})
+	_, _, err = client.Location.List(context.Background(), hcloud.LocationListOpts{})
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", op, err)
 	}

hcloud/cloud_test.go

@@ -91,12 +91,8 @@ func TestNewCloud(t *testing.T) {
 		"HCLOUD_METRICS_ENABLED", "false",
 	)
 	defer resetEnv()
-	env.Mux.HandleFunc("/servers", func(w http.ResponseWriter, _ *http.Request) {
-		json.NewEncoder(w).Encode(
-			schema.ServerListResponse{
-				Servers: []schema.Server{},
-			},
-		)
+	env.Mux.HandleFunc("/locations", func(w http.ResponseWriter, _ *http.Request) {
+		json.NewEncoder(w).Encode(schema.LocationListResponse{Locations: []schema.Location{}})
 	})
 
 	_, err := NewCloud(DefaultClusterCIDR)
@@ -113,7 +109,7 @@ func TestNewCloudConnectionNotPossible(t *testing.T) {
 
 	_, err := NewCloud(DefaultClusterCIDR)
 	assert.EqualError(t, err,
-		`hcloud/newCloud: Get "http://127.0.0.1:4711/v1/servers?": dial tcp 127.0.0.1:4711: connect: connection refused`)
+		`hcloud/newCloud: Get "http://127.0.0.1:4711/v1/locations?": dial tcp 127.0.0.1:4711: connect: connection refused`)
 }
 
 func TestNewCloudInvalidToken(t *testing.T) {
@@ -126,7 +122,7 @@ func TestNewCloudInvalidToken(t *testing.T) {
 		"HCLOUD_METRICS_ENABLED", "false",
 	)
 	defer resetEnv()
-	env.Mux.HandleFunc("/servers", func(w http.ResponseWriter, _ *http.Request) {
+	env.Mux.HandleFunc("/locations", func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusUnauthorized)
 		json.NewEncoder(w).Encode(
@@ -155,34 +151,8 @@ func TestCloud(t *testing.T) {
 		"ROBOT_PASSWORD", "pass123",
 	)
 	defer resetEnv()
-	env.Mux.HandleFunc("/servers", func(w http.ResponseWriter, _ *http.Request) {
-		json.NewEncoder(w).Encode(
-			schema.ServerListResponse{
-				Servers: []schema.Server{
-					{
-						ID:              1,
-						Name:            "test",
-						Status:          "running",
-						Created:         time.Time{},
-						PublicNet:       schema.ServerPublicNet{},
-						PrivateNet:      nil,
-						ServerType:      schema.ServerType{},
-						IncludedTraffic: 0,
-						OutgoingTraffic: nil,
-						IngoingTraffic:  nil,
-						BackupWindow:    nil,
-						RescueEnabled:   false,
-						ISO:             nil,
-						Locked:          false,
-						Datacenter:      schema.Datacenter{},
-						Image:           nil,
-						Protection:      schema.ServerProtection{},
-						Labels:          nil,
-						Volumes:         nil,
-					},
-				},
-			},
-		)
+	env.Mux.HandleFunc("/locations", func(w http.ResponseWriter, _ *http.Request) {
+		json.NewEncoder(w).Encode(schema.LocationListResponse{Locations: []schema.Location{}})
 	})
 	env.Mux.HandleFunc("/networks/1", func(w http.ResponseWriter, _ *http.Request) {
 		json.NewEncoder(w).Encode(