tests

Author: ValyaB

internal/actions/check_node_deleted.go

@@ -9,6 +9,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"k8s.io/client-go/kubernetes"
 
+	"fmt"
 	"github.com/castai/cluster-controller/internal/castai"
 	"github.com/castai/cluster-controller/internal/waitext"
 )
@@ -52,6 +53,10 @@ func (h *CheckNodeDeletedHandler) Handle(ctx context.Context, action *castai.Clu
 		"provider_id":    req.ProviderId,
 		ActionIDLogField: action.ID,
 	})
+	if req.NodeName == "" {
+		return fmt.Errorf("node name is empty %w", errAction)
+	}
+
 	log.Info("checking if node is deleted")
 
 	boff := waitext.NewConstantBackoff(h.cfg.retryWait)

internal/actions/check_node_deleted_test.go

@@ -6,13 +6,13 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 
 	"github.com/castai/cluster-controller/internal/castai"
-	"github.com/stretchr/testify/require"
 )
 
 func TestCheckNodeDeletedHandler_Handle(t *testing.T) {
@@ -37,6 +37,13 @@ func TestCheckNodeDeletedHandler_Handle(t *testing.T) {
 			},
 			wantErr: errAction,
 		},
+		{
+			name: "empty node name",
+			args: args{
+				action: newActionCheckNodeDeleted("", nodeID, providerID),
+			},
+			wantErr: errAction,
+		},
 		{
 			name: "nodeID is not matching",
 			args: args{

internal/actions/check_node_status.go

@@ -2,6 +2,7 @@ package actions
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"reflect"
 	"time"
@@ -13,7 +14,6 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/typed/core/v1"
 
-	"errors"
 	"github.com/castai/cluster-controller/internal/castai"
 	"github.com/castai/cluster-controller/internal/waitext"
 )
@@ -50,6 +50,9 @@ func (h *CheckNodeStatusHandler) Handle(ctx context.Context, action *castai.Clus
 		ActionIDLogField: action.ID,
 	})
 
+	if req.NodeName == "" {
+		return fmt.Errorf("node name is empty %w", errAction)
+	}
 	switch req.NodeStatus {
 	case castai.ActionCheckNodeStatus_READY:
 		log.Info("checking node ready")

internal/actions/check_node_status_test.go

@@ -2,6 +2,8 @@ package actions
 
 import (
 	"context"
+	"testing"
+
 	"github.com/google/uuid"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
@@ -13,7 +15,6 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/kubernetes/fake"
 	k8stest "k8s.io/client-go/testing"
-	"testing"
 
 	"github.com/castai/cluster-controller/internal/castai"
 )
@@ -52,7 +53,6 @@ func TestCheckNodeStatusHandler_Handle_Deleted(t *testing.T) {
 		args    args
 		wantErr error
 	}{
-
 		{
 			name:    "action is nil",
 			wantErr: errAction,
@@ -303,6 +303,13 @@ func TestCheckNodeStatusHandler_Handle_Ready(t *testing.T) {
 			name:    "action is nil",
 			wantErr: errAction,
 		},
+		{
+			name: "empty node name",
+			args: args{
+				action: newActionCheckNodeStatus("", nodeID, providerID, castai.ActionCheckNodeStatus_READY, lo.ToPtr(int32(1))),
+			},
+			wantErr: errAction,
+		},
 		{
 			name: "return error when ctx timeout",
 			args: args{

internal/actions/delete_node_handler.go

@@ -65,6 +65,10 @@ func (h *DeleteNodeHandler) Handle(ctx context.Context, action *castai.ClusterAc
 	})
 	log.Info("deleting kubernetes node")
 
+	if req.NodeName == "" {
+		return fmt.Errorf("node name is empty %w", errAction)
+	}
+
 	b := waitext.NewConstantBackoff(h.cfg.deleteRetryWait)
 	err := waitext.Retry(
 		ctx,

internal/actions/delete_node_handler_test.go

@@ -159,3 +159,11 @@ func TestDeleteNodeHandler(t *testing.T) {
 		r.Len(va.Items, 0)
 	})
 }
+
+//{
+//name: "empty node name",
+//args: args{
+//action: newActionCheckNodeStatus("", nodeID, providerID, castai.ActionCheckNodeStatus_READY, lo.ToPtr(int32(1))),
+//},
+//wantErr: errAction,
+//},

internal/actions/drain_node_handler.go

@@ -91,7 +91,7 @@ func (h *DrainNodeHandler) Handle(ctx context.Context, action *castai.ClusterAct
 		ActionIDLogField: action.ID,
 	})
 
-	if req.NodeID == "" && req.ProviderId == "" {
+	if req.NodeName == "" || req.NodeID == "" && req.ProviderId == "" {
 		return fmt.Errorf("node ID and provider ID are empty %w", errAction)
 	}
 

internal/actions/kubernetes_helpers_test.go

@@ -85,6 +85,54 @@ func Test_isNodeIDProviderIDValid(t *testing.T) {
 				providerID: "provider-id-456",
 			},
 		},
+		{
+			name: "node ID and provider ID are empty at Node spec",
+			args: args{
+				node: &v1.Node{
+					ObjectMeta: metav1.ObjectMeta{
+						Labels: map[string]string{},
+					},
+					Spec: v1.NodeSpec{
+						ProviderID: "",
+					},
+				},
+				nodeID:     "node-id-123",
+				providerID: "provider-id-456",
+			},
+			wantErr: errNodeDoesNotMatch,
+		},
+		{
+			name: "node ID is empty at Node spec and Provider is matching",
+			args: args{
+				node: &v1.Node{
+					ObjectMeta: metav1.ObjectMeta{
+						Labels: map[string]string{},
+					},
+					Spec: v1.NodeSpec{
+						ProviderID: "provider-id-456",
+					},
+				},
+				nodeID:     "node-id-123",
+				providerID: "provider-id-456",
+			},
+		},
+		{
+			name: "provider ID is empty at Node spec and NodeID is matching",
+			args: args{
+				node: &v1.Node{
+					ObjectMeta: metav1.ObjectMeta{
+						Labels: map[string]string{
+							castai.LabelNodeID: "node-id-123",
+						},
+					},
+					Spec: v1.NodeSpec{
+						ProviderID: "",
+					},
+				},
+				nodeID:     "node-id-123",
+				providerID: "provider-id-456",
+			},
+		},
 		{
 			name: "node ID and provider ID matches",
 			args: args{