chore(): increase test coverage and update dependencies

internal/hetzner/hetzneragent.go

@@ -3,7 +3,6 @@ package hetzner
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -40,6 +39,8 @@ runcmd:
 - [ sh, -xc, "cd /root; docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; docker compose up -d" ]
 `
 
+var refreshNodeInfo = RefreshNodeInfo
+
 type UserDataConfig struct {
 	Image     string
 	EnvConfig map[string]interface{}
@@ -60,12 +61,12 @@ func generateConfig(cfg *config.Config, name string, agentToken string) (string,
 	}
 	tmpl, err := template.New("userdata").Parse(USER_DATA_TEMPLATE)
 	if err != nil {
-		return "", errors.New(fmt.Sprintf("Errors in userdata template: %s", err.Error()))
+		return "", fmt.Errorf("Errors in userdata template: %s", err.Error())
 	}
 	var buf bytes.Buffer
 	err = tmpl.Execute(&buf, &config)
 	if err != nil {
-		return "", errors.New(fmt.Sprintf("Could not render userdata template: %s", err.Error()))
+		return "", fmt.Errorf("Could not render userdata template: %s", err.Error())
 	}
 	return buf.String(), nil
 }
@@ -113,7 +114,7 @@ func CreateNewAgent(cfg *config.Config, woodpeckerAgent *models.Agent) (*hcloud.
 	})
 
 	if err != nil {
-		return nil, errors.New(fmt.Sprintf("Could not create new Agent: %s", err.Error()))
+		return nil, fmt.Errorf("Could not create new Agent: %s", err.Error())
 	}
 
 	log.WithFields(log.Fields{
@@ -127,7 +128,7 @@ func ListAgents(cfg *config.Config) ([]hcloud.Server, error) {
 	client := hcloud.NewClient(hcloud.WithToken(cfg.HcloudToken))
 	allServers, err := client.Server.All(context.Background())
 	if err != nil {
-		return nil, errors.New(fmt.Sprintf("Could not query Server list: %s", err.Error()))
+		return nil, fmt.Errorf("Could not query Server list: %s", err.Error())
 	}
 	myServers := []hcloud.Server{}
 	for _, server := range allServers {
@@ -161,7 +162,7 @@ func DecomNode(cfg *config.Config, server *hcloud.Server) (int64, error) {
 	}).Debugf("Deleting %s node", server.Name)
 	_, _, err := client.Server.DeleteWithResult(context.Background(), server)
 	if err != nil {
-		return woodpeckerAgentID, errors.New(fmt.Sprintf("Could not delete Agent: %s", err.Error()))
+		return woodpeckerAgentID, fmt.Errorf("Could not delete Agent: %s", err.Error())
 	}
 	return woodpeckerAgentID, nil
 }
@@ -170,16 +171,16 @@ func RefreshNodeInfo(cfg *config.Config, serverID int) (*hcloud.Server, error) {
 	client := hcloud.NewClient(hcloud.WithToken(cfg.HcloudToken))
 	server, _, err := client.Server.GetByID(context.Background(), serverID)
 	if err != nil {
-		return nil, errors.New(fmt.Sprintf("Could not refresh server info: %s", err.Error()))
+		return nil, fmt.Errorf("Could not refresh server info: %s", err.Error())
 	}
 	return server, nil
 }
 
 func CheckRuntime(cfg *config.Config, server *hcloud.Server) (time.Time, error) {
-	server, err := RefreshNodeInfo(cfg, server.ID)
+	server, err := refreshNodeInfo(cfg, server.ID)
 	now := time.Now()
 	if err != nil {
-		return time.Time{}, errors.New(fmt.Sprintf("Could not check Runtime: %s", err.Error()))
+		return time.Time{}, fmt.Errorf("Could not check Runtime: %s", err.Error())
 	}
 	return server.Created.Add(time.Duration(now.Minute())), nil
 }

internal/hetzner/hetzneragent_test.go

@@ -1,9 +1,12 @@
 package hetzner
 
 import (
+	"strings"
 	"testing"
+	"time"
 
 	"git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/config"
+	"github.com/hetznercloud/hcloud-go/hcloud"
 )
 
 func TestGenerateUserData(t *testing.T) {
@@ -54,3 +57,78 @@ runcmd:
 		t.Errorf("got:\n%v\n, wanted:\n%v", got, wanted)
 	}
 }
+
+func TestGenerateUserData_MultipleCases(t *testing.T) {
+	base := config.Config{
+		WoodpeckerGrpc:          "grpc-test.woodpecker.test.tld:443",
+		WoodpeckerLabelSelector: "uploadfilter24.eu/instance-role=WoodpeckerTest",
+		WoodpeckerAgentVersion:  "latest",
+	}
+
+	cases := []struct {
+		name         string
+		cfg          config.Config
+		agentName    string
+		agentToken   string
+		wantContains []string
+	}{
+		{
+			name:       "basic",
+			cfg:        base,
+			agentName:  "test-instance",
+			agentToken: "Geheim1!",
+			wantContains: []string{
+				"image: woodpeckerci/woodpecker-agent:latest",
+				"- WOODPECKER_AGENT_SECRET=Geheim1!",
+				"- WOODPECKER_FILTER_LABELS=uploadfilter24.eu/instance-role=WoodpeckerTest",
+				"- WOODPECKER_SERVER=grpc-test.woodpecker.test.tld:443",
+			},
+		},
+		{
+			name:       "empty token",
+			cfg:        base,
+			agentName:  "no-token",
+			agentToken: "",
+			wantContains: []string{
+				"image: woodpeckerci/woodpecker-agent:latest",
+				"- WOODPECKER_AGENT_SECRET=",
+				"- WOODPECKER_HOSTNAME=no-token",
+			},
+		},
+	}
+
+	for _, tc := range cases {
+		got, err := generateConfig(&tc.cfg, tc.agentName, tc.agentToken)
+		if err != nil {
+			t.Fatalf("%s: generateConfig returned error: %v", tc.name, err)
+		}
+		for _, want := range tc.wantContains {
+			if !strings.Contains(got, want) {
+				t.Errorf("%s: expected generated userdata to contain %q, got:\n%s", tc.name, want, got)
+			}
+		}
+	}
+}
+
+func TestCheckRuntime_MockedRefresh(t *testing.T) {
+	// Mock refreshNodeInfo to return a server with a known Created time
+	orig := refreshNodeInfo
+	defer func() { refreshNodeInfo = orig }()
+
+	created := time.Date(2020, 1, 2, 3, 4, 5, 0, time.UTC)
+	refreshNodeInfo = func(cfg *config.Config, serverID int) (*hcloud.Server, error) {
+		return &hcloud.Server{Created: created}, nil
+	}
+
+	cfg := config.Config{}
+	// Capture minute before call to avoid flakiness across minute boundary
+	minute := time.Now().Minute()
+	got, err := CheckRuntime(&cfg, &hcloud.Server{ID: 123})
+	if err != nil {
+		t.Fatalf("CheckRuntime returned error: %v", err)
+	}
+	want := created.Add(time.Duration(minute))
+	if !got.Equal(want) {
+		t.Fatalf("unexpected runtime: got %v, want %v", got, want)
+	}
+}