fix: resolve merge conflict markers in linear-sync (#3514)

Conflict markers were accidentally merged into v0.26. Resolved by
keeping newer implementations:
- deduplicateIssueIDs function from #3449
- updated regex comment from #3469

Author: Piotr1215

hack/linear-sync/linear_test.go

@@ -54,9 +54,9 @@ func TestMoveIssueLogic(t *testing.T) {
 
 // MockLinearClient is a mock implementation of the LinearClient interface for testing
 type MockLinearClient struct {
-	mockIssueStates       map[string]string
-	mockIssueStateNames   map[string]string
-	mockWorkflowIDs       map[string]string
+	mockIssueStates     map[string]string
+	mockIssueStateNames map[string]string
+	mockWorkflowIDs     map[string]string
 }
 
 func NewMockLinearClient() *MockLinearClient {
@@ -109,25 +109,25 @@ func (m *MockLinearClient) MoveIssueToState(ctx context.Context, dryRun bool, is
 	if strings.HasPrefix(strings.ToLower(issueID), "cve") {
 		return nil
 	}
-	
+
 	currentStateID, currentStateName, _ := m.IssueStateDetails(ctx, issueID)
-	
+
 	// Already in released state
 	if currentStateID == releasedStateID {
 		return nil
 	}
-	
+
 	// Skip if not in ready for release state
 	if currentStateName != readyForReleaseStateName {
 		return fmt.Errorf("issue %s not in ready for release state", issueID)
 	}
-	
+
 	// Only ENG-1234 is expected to be moved successfully
 	// Explicitly return errors for other issues to ensure the test only counts ENG-1234
 	if issueID != "ENG-1234" {
 		return fmt.Errorf("would not move issue %s for test purposes", issueID)
 	}
-	
+
 	return nil
 }
 
@@ -136,8 +136,8 @@ func TestIsIssueInState(t *testing.T) {
 	ctx := context.Background()
 
 	testCases := []struct {
-		IssueID     string
-		StateID     string
+		IssueID        string
+		StateID        string
 		ExpectedResult bool
 	}{
 		{"ENG-1234", "ready-state-id", true},
@@ -164,10 +164,10 @@ func TestMoveIssueStateFiltering(t *testing.T) {
 	// Create a custom mock client for this test
 	mockClient := &MockLinearClient{
 		mockIssueStates: map[string]string{
-			"ENG-1234": "ready-state-id",  // Ready for release
-			"ENG-5678": "in-progress-id",  // In progress 
-			"ENG-9012": "released-id",     // Already released
-			"CVE-1234": "ready-state-id",  // Ready but should be skipped as CVE
+			"ENG-1234": "ready-state-id", // Ready for release
+			"ENG-5678": "in-progress-id", // In progress
+			"ENG-9012": "released-id",    // Already released
+			"CVE-1234": "ready-state-id", // Ready but should be skipped as CVE
 		},
 		mockIssueStateNames: map[string]string{
 			"ENG-1234": "Ready for Release",
@@ -181,7 +181,7 @@ func TestMoveIssueStateFiltering(t *testing.T) {
 			"In Progress":       "in-progress-id",
 		},
 	}
-	
+
 	ctx := context.Background()
 
 	// Test cases for the overall filtering logic
@@ -198,19 +198,19 @@ func TestMoveIssueStateFiltering(t *testing.T) {
 		if strings.HasPrefix(strings.ToLower(issueID), "cve") {
 			continue
 		}
-		
+
 		currentStateID, currentStateName, _ := mockClient.IssueStateDetails(ctx, issueID)
-		
+
 		// Skip if already in released state
 		if currentStateID == releasedStateID {
 			continue
 		}
-		
+
 		// Skip if not in ready for release state
 		if currentStateName != readyForReleaseStateName {
 			continue
 		}
-		
+
 		// This issue would be moved
 		actualMoved = append(actualMoved, issueID)
 	}
@@ -230,7 +230,7 @@ func TestMoveIssueStateFiltering(t *testing.T) {
 				break
 			}
 		}
-		
+
 		if !found {
 			t.Errorf("Expected issue %s to be moved, but it wasn't in the result set", expectedID)
 		}
@@ -243,17 +243,12 @@ func TestIssueIDsExtraction(t *testing.T) {
 	defer func() {
 		issuesInBodyREs = originalRegex
 	}()
-<<<<<<< HEAD
-	
-	// For testing, use a regex that matches any 3-letter prefix format
-=======
 
 	// For testing, use a regex that matches team keys of 2-10 chars and issue numbers 1-5 digits
->>>>>>> 3aa6f7157 (fix(linear-sync): support variable-length team keys in issue regex (#3469))
 	issuesInBodyREs = []*regexp.Regexp{
 		regexp.MustCompile(`(?P<issue>\w{2,10}-\d{1,5})`),
 	}
-	
+
 	testCases := []struct {
 		name        string
 		body        string
@@ -321,7 +316,7 @@ func TestIssueIDsExtraction(t *testing.T) {
 			expected:    []string{"eng-12345"},
 		},
 	}
-	
+
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			pr := LinearPullRequest{
@@ -330,15 +325,15 @@ func TestIssueIDsExtraction(t *testing.T) {
 					HeadRefName: tc.headRefName,
 				},
 			}
-			
+
 			result := pr.IssueIDs()
-			
+
 			if len(result) != len(tc.expected) {
 				t.Errorf("Expected %d issues, got %d", len(tc.expected), len(result))
 				t.Errorf("Expected: %v, Got: %v", tc.expected, result)
 				return
 			}
-			
+
 			// Check all expected IDs are found (ignoring order)
 			for _, expectedID := range tc.expected {
 				found := false

hack/linear-sync/main.go

@@ -38,17 +38,17 @@ func run(
 ) error {
 	flagset := flag.NewFlagSet(args[0], flag.ExitOnError)
 	var (
-		owner                   = flagset.String("owner", "loft-sh", "The GitHub owner of the repository")
-		repo                    = flagset.String("repo", "vcluster", "The GitHub repository to generate the changelog for")
-		githubToken             = flagset.String("token", "", "The GitHub token to use for authentication")
-		previousTag             = flagset.String("previous-tag", "", "The previous tag to generate the changelog for (if not set, the last stable release will be used)")
-		releaseTag              = flagset.String("release-tag", "", "The tag of the new release")
-		debug                   = flagset.Bool("debug", false, "Enable debug logging")
-		linearToken             = flagset.String("linear-token", "", "The Linear token to use for authentication")
-		releasedStateName       = flagset.String("released-state-name", "Released", "The name of the state to use for the released state")
+		owner                    = flagset.String("owner", "loft-sh", "The GitHub owner of the repository")
+		repo                     = flagset.String("repo", "vcluster", "The GitHub repository to generate the changelog for")
+		githubToken              = flagset.String("token", "", "The GitHub token to use for authentication")
+		previousTag              = flagset.String("previous-tag", "", "The previous tag to generate the changelog for (if not set, the last stable release will be used)")
+		releaseTag               = flagset.String("release-tag", "", "The tag of the new release")
+		debug                    = flagset.Bool("debug", false, "Enable debug logging")
+		linearToken              = flagset.String("linear-token", "", "The Linear token to use for authentication")
+		releasedStateName        = flagset.String("released-state-name", "Released", "The name of the state to use for the released state")
 		readyForReleaseStateName = flagset.String("ready-for-release-state-name", "Ready for Release", "The name of the state that indicates an issue is ready to be released")
-		linearTeamName          = flagset.String("linear-team-name", "vCluster / Platform", "The name of the team to use for the linear team")
-		dryRun                  = flagset.Bool("dry-run", false, "Do not actually move issues to the released state")
+		linearTeamName           = flagset.String("linear-team-name", "vCluster / Platform", "The name of the team to use for the linear team")
+		dryRun                   = flagset.Bool("dry-run", false, "Do not actually move issues to the released state")
 	)
 	if err := flagset.Parse(args[1:]); err != nil {
 		return fmt.Errorf("parse flags: %w", err)
@@ -193,9 +193,6 @@ func run(
 	logger.Info("Linear sync completed", "processed", len(releasedIssues), "released", releasedCount, "skipped", skippedCount)
 
 	return nil
-<<<<<<< HEAD
-}
-=======
 }
 
 // deduplicateIssueIDs removes duplicate issue IDs from the slice while preserving order
@@ -210,4 +207,3 @@ func deduplicateIssueIDs(issueIDs []string) []string {
 	}
 	return result
 }
->>>>>>> cfcf45a9d (fix(ci): duplicate comments prevented via issue id deduplication (#3449))