lint, update test

mirceanton · Jan 17, 2025 · f8ce333 · f8ce333
1 parent 650d8cb
commit f8ce333
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git a/internal/mikrotik/client_test.go b/internal/mikrotik/client_test.go
@@ -24,7 +24,9 @@ func TestNewMikrotikClient(t *testing.T) {
 		SkipTLSVerify: true,
 	}
 
-	client, err := NewMikrotikClient(config)
+	defaults := &MikrotikDefaults{}
+
+	client, err := NewMikrotikClient(config, defaults)
 	if err != nil {
 		t.Fatalf("Expected no error, got %v", err)
 	}
@@ -103,6 +105,7 @@ func TestGetSystemInfo(t *testing.T) {
 	testCases := []struct {
 		name          string
 		config        MikrotikConnectionConfig
+		defaults      MikrotikDefaults
 		expectedError bool
 	}{
 		{
@@ -113,6 +116,7 @@ func TestGetSystemInfo(t *testing.T) {
 				Password:      mockPassword,
 				SkipTLSVerify: true,
 			},
+			defaults:      MikrotikDefaults{},
 			expectedError: false,
 		},
 		{
@@ -123,6 +127,7 @@ func TestGetSystemInfo(t *testing.T) {
 				Password:      "wrongpass",
 				SkipTLSVerify: true,
 			},
+			defaults:      MikrotikDefaults{},
 			expectedError: true,
 		},
 		{
@@ -133,6 +138,7 @@ func TestGetSystemInfo(t *testing.T) {
 				Password:      mockPassword,
 				SkipTLSVerify: true,
 			},
+			defaults:      MikrotikDefaults{},
 			expectedError: true,
 		},
 		{
@@ -143,6 +149,7 @@ func TestGetSystemInfo(t *testing.T) {
 				Password:      "wrongpass",
 				SkipTLSVerify: true,
 			},
+			defaults:      MikrotikDefaults{},
 			expectedError: true,
 		},
 		{
@@ -153,6 +160,7 @@ func TestGetSystemInfo(t *testing.T) {
 				Password:      "",
 				SkipTLSVerify: true,
 			},
+			defaults:      MikrotikDefaults{},
 			expectedError: true,
 		},
 	}
@@ -161,8 +169,9 @@ func TestGetSystemInfo(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			config := &tc.config
+			defaults := &tc.defaults
 
-			client, err := NewMikrotikClient(config)
+			client, err := NewMikrotikClient(config, defaults)
 			if err != nil {
 				t.Fatalf("Failed to create client: %v", err)
 			}
@@ -396,8 +405,8 @@ func TestCreateDNSRecord(t *testing.T) {
 				Password:      mockPassword,
 				SkipTLSVerify: true,
 			}
-
-			client, err := NewMikrotikClient(config)
+			defaults := &MikrotikDefaults{}
+			client, err := NewMikrotikClient(config, defaults)
 			if err != nil {
 				t.Fatalf("Failed to create client: %v", err)
 			}
@@ -610,7 +619,8 @@ func TestDeleteDNSRecord(t *testing.T) {
 				Password:      mockPassword,
 				SkipTLSVerify: true,
 			}
-			client, err := NewMikrotikClient(config)
+			defaults := &MikrotikDefaults{}
+			client, err := NewMikrotikClient(config, defaults)
 			if err != nil {
 				t.Fatalf("Failed to create client: %v", err)
 			}
@@ -724,7 +734,8 @@ func TestGetAllDNSRecords(t *testing.T) {
 				Password:      mockPassword,
 				SkipTLSVerify: true,
 			}
-			client, err := NewMikrotikClient(config)
+			defaults := &MikrotikDefaults{}
+			client, err := NewMikrotikClient(config, defaults)
 			if err != nil {
 				t.Fatalf("Failed to create client: %v", err)
 			}

diff --git a/internal/mikrotik/provider.go b/internal/mikrotik/provider.go
@@ -3,6 +3,7 @@ package mikrotik
 import (
 	"context"
 	"fmt"
+
 	log "github.com/sirupsen/logrus"
 	"sigs.k8s.io/external-dns/endpoint"
 	"sigs.k8s.io/external-dns/plan"

diff --git a/internal/mikrotik/provider_test.go b/internal/mikrotik/provider_test.go
@@ -324,14 +324,24 @@ func TestContains(t *testing.T) {
 	}
 }
 
-func TestCleanupChanges(t *testing.T) {
+func TestChanges(t *testing.T) {
+	mikrotikProvider := &MikrotikProvider{
+		client: &MikrotikApiClient{
+			&MikrotikDefaults{},
+			nil,
+			nil,
+		},
+	}
+
 	tests := []struct {
 		name            string
+		provider        *MikrotikProvider
 		inputChanges    *plan.Changes
 		expectedChanges *plan.Changes
 	}{
 		{
-			name: "Multiple matching records - all should be cleaned up",
+			name:     "Multiple matching records - all should be cleaned up",
+			provider: mikrotikProvider,
 			inputChanges: &plan.Changes{
 				UpdateOld: []*endpoint.Endpoint{
 					{
@@ -381,7 +391,8 @@ func TestCleanupChanges(t *testing.T) {
 			expectedChanges: &plan.Changes{},
 		},
 		{
-			name: "Some matching, some different - only partial cleanup",
+			name:     "Some matching, some different - only partial cleanup",
+			provider: mikrotikProvider,
 			inputChanges: &plan.Changes{
 				UpdateOld: []*endpoint.Endpoint{
 					{
@@ -444,7 +455,8 @@ func TestCleanupChanges(t *testing.T) {
 			},
 		},
 		{
-			name: "Different comments across multiple records - no cleanup",
+			name:     "Different comments across multiple records - no cleanup",
+			provider: mikrotikProvider,
 			inputChanges: &plan.Changes{
 				UpdateOld: []*endpoint.Endpoint{
 					{
@@ -520,7 +532,7 @@ func TestCleanupChanges(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			outputChanges := cleanupChanges(tt.inputChanges)
+			outputChanges := tt.provider.changes(tt.inputChanges)
 
 			if len(outputChanges.UpdateOld) != len(tt.expectedChanges.UpdateOld) {
 				t.Errorf("Expected UpdateOld length %d, got %d", len(tt.expectedChanges.UpdateOld), len(outputChanges.UpdateOld))