fix logic of needsTag, update tests and CleanupTags

pkg/tagit/tagit.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os/exec"
+	"slices"
 	"strings"
 	"time"
 
@@ -103,13 +104,7 @@ func (t *TagIt) CleanupTags() error {
 	if err != nil {
 		return fmt.Errorf("error getting service: %w", err)
 	}
-	registration := t.copyServiceToRegistration(service)
-	updatedTags, tagged := t.excludeTagged(registration.Tags)
-	if tagged {
-		registration.Tags = updatedTags
-		return t.client.Agent().ServiceRegister(registration)
-	}
-	return nil
+	return t.updateConsulService(service, []string{})
 }
 
 // runScript runs a command and returns the output.
@@ -206,8 +201,10 @@ func (t *TagIt) needsTag(current []string, update []string) (updatedTags []strin
 	if len(diff) == 0 {
 		return nil, false
 	}
-
-	updatedTags, _ = t.excludeTagged(diff)
+	currentFiltered, _ := t.excludeTagged(current)
+	updatedTags = append(currentFiltered, update...)
+	slices.Sort(updatedTags)
+	updatedTags = slices.Compact(updatedTags)
 	return updatedTags, true
 }
 

pkg/tagit/tagit_test.go

@@ -145,7 +145,7 @@ func TestNeedsTag(t *testing.T) {
 			name:           "Update Needed",
 			current:        []string{"tag-tag1", "tag-tag2"},
 			update:         []string{"tag-tag1", "tag-tag2", "tag3"},
-			expectedTags:   []string{"tag3"},
+			expectedTags:   []string{"tag-tag1", "tag-tag2", "tag3"},
 			expectedShould: true,
 		},
 		{
@@ -166,7 +166,7 @@ func TestNeedsTag(t *testing.T) {
 			name:           "Mixed Changes",
 			current:        []string{"tag-tag1", "tag2", "tag4"},
 			update:         []string{"tag2", "tag3", "tag5"},
-			expectedTags:   []string{"tag4", "tag3", "tag5"},
+			expectedTags:   []string{"tag2", "tag3", "tag4", "tag5"},
 			expectedShould: true,
 		},
 	}
@@ -660,7 +660,7 @@ func TestCleanupTags(t *testing.T) {
 			},
 			tagPrefix:   "tag",
 			expectError: false,
-			expectTags:  []string{"prefix1", "prefix2", "other-tag"},
+			expectTags:  []string{"other-tag", "prefix1", "prefix2"},
 		},
 		{
 			name:      "Service Not Found",