more refactoring

Author: lukaszcl

tools/flakeguard/cmd/createtickets.go tools/flakeguard/cmd/create_tickets.gotools/flakeguard/cmd/createtickets.go renamed to tools/flakeguard/cmd/create_tickets.go

@@ -11,12 +11,10 @@ import (
 	"time"
 
 	"github.com/andygrunwald/go-jira"
-	"github.com/briandowns/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/rs/zerolog/log"
 
-	// Import mapping and other utils
 	"github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard/jirautils"
 	"github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard/localdb"
 	"github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard/mapping"
@@ -176,7 +174,7 @@ Features:
 		} // End CSV processing loop
 
 		if len(tickets) == 0 {
-			log.Warn().Msg("No processable tickets found after filtering and validation.")
+			log.Warn().Msg("No new tickets to create found after filtering and validation.")
 			return nil
 		}
 
@@ -189,9 +187,6 @@ Features:
 
 		// 7) If Jira client exists, search for existing tickets online (for those without a key yet)
 		if client != nil {
-			s := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
-			s.Suffix = " Searching Jira for potentially existing tickets..."
-			s.Start()
 			processedCount := 0
 			totalToSearch := 0
 			for _, t := range tickets {
@@ -205,7 +200,6 @@ Features:
 				if t.ExistingJiraKey == "" { // Only search if we don't have a key from DB
 					key, searchErr := findExistingTicket(client, jiraSearchLabel, *t) // findExistingTicket needs definition
 					processedCount++
-					s.Suffix = fmt.Sprintf(" Searching Jira... (%d/%d)", processedCount, totalToSearch)
 					if searchErr != nil {
 						// Log non-fatal search error
 						log.Warn().Err(searchErr).Str("summary", t.Summary).Msg("Jira search failed for test")
@@ -223,8 +217,6 @@ Features:
 					}
 				}
 			}
-			s.Stop()
-			fmt.Println() // Newline after spinner
 		}
 
 		// 8) Create Bubble Tea model
@@ -447,8 +439,9 @@ h3. Action Items
 # *Investigate:* Review logs and test code to identify the root cause of the flakiness.
 # *Fix:* Implement the necessary code changes or infrastructure adjustments.
 # *Verify:* Run the test locally multiple times and monitor in CI to confirm stability.
+# *Unskip:* Once confirmed stable, remove any test skip markers to re-enable the test in the CI pipeline.
 # *Close Ticket:* Close this ticket once the test is confirmed stable.
-# *Guidance:* Refer to the team's [Flaky Test Guide|https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/tools/flakeguard/e2e-flaky-test-guide.md] (Update link if needed).
+# *Guidance:* Refer to the team's [Flaky Test Guide|https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/tools/flakeguard/e2e-flaky-test-guide.md].
 `,
 		pkgDisplay,
 		testNameDisplay,
@@ -858,7 +851,6 @@ func updateConfirm(m createModel) (tea.Model, tea.Cmd) {
 		assigneeForJira = t.AssigneeId
 		if userMapping, exists := m.userMap[t.AssigneeId]; exists {
 			pillarName = userMapping.PillarName
-			log.Debug().Str("assignee", t.AssigneeId).Str("pillar", pillarName).Msg("Found pillar name for assignee")
 		} else {
 			log.Warn().Str("assignee", t.AssigneeId).Msg("Assignee ID present but no matching entry in user_mapping.json found.")
 		}

tools/flakeguard/cmd/tickets.go tools/flakeguard/cmd/review_tickets.gotools/flakeguard/cmd/tickets.go renamed to tools/flakeguard/cmd/review_tickets.go

@@ -33,11 +33,10 @@ var (
 	userTestMappingPath string // Although not directly used for assignment here, load it for consistency/future use
 )
 
-// TicketsCmd ... (rest of the command definition remains the same)
-var TicketsCmd = &cobra.Command{
-	Use:   "tickets",
-	Short: "Manage tickets from flaky_test_db.json",
-	Long: `Interactively manage your tickets.
+var ReviewTicketsCmd = &cobra.Command{
+	Use:   "review-tickets",
+	Short: "Review tickets from --test-db-path",
+	Long: `Interactively review tickets from --test-db-path.
     
 Actions:
   [s] mark as skipped (and optionally post a comment to the Jira ticket)
@@ -246,14 +245,14 @@ func uniqueStrings(input []string) []string {
 }
 
 func init() {
-	TicketsCmd.Flags().StringVar(&ticketsJSONPath, "test-db-path", localdb.DefaultDBPath(), "Path to the JSON file containing tickets") // Use default path function
-	TicketsCmd.Flags().BoolVar(&jiraComment, "jira-comment", true, "If true, post a comment to the Jira ticket when marking as skipped/unskipped")
-	TicketsCmd.Flags().BoolVar(&ticketsDryRun, "dry-run", false, "If true, do not modify Jira tickets (comments, pillars) or save DB") // Updated help text
-	TicketsCmd.Flags().BoolVar(&hideSkipped, "hide-skipped", false, "If true, do not show tests already marked as skipped")
-	TicketsCmd.Flags().BoolVar(&missingPillars, "missing-pillars", false, "If true, only show tickets that have a Jira Key but no Pillar Name") // Updated help text
+	ReviewTicketsCmd.Flags().StringVar(&ticketsJSONPath, "test-db-path", localdb.DefaultDBPath(), "Path to the JSON file containing tickets") // Use default path function
+	ReviewTicketsCmd.Flags().BoolVar(&jiraComment, "jira-comment", true, "If true, post a comment to the Jira ticket when marking as skipped/unskipped")
+	ReviewTicketsCmd.Flags().BoolVar(&ticketsDryRun, "dry-run", false, "If true, do not modify Jira tickets (comments, pillars) or save DB") // Updated help text
+	ReviewTicketsCmd.Flags().BoolVar(&hideSkipped, "hide-skipped", false, "If true, do not show tests already marked as skipped")
+	ReviewTicketsCmd.Flags().BoolVar(&missingPillars, "missing-pillars", false, "If true, only show tickets that have a Jira Key but no Pillar Name") // Updated help text
 	// Make mapping paths consistent flags
-	TicketsCmd.Flags().StringVar(&userMappingPath, "user-mapping-path", "user_mapping.json", "Path to the JSON file containing user mapping (JiraUserID -> PillarName)")
-	TicketsCmd.Flags().StringVar(&userTestMappingPath, "user-test-mapping-path", "user_test_mapping.json", "Path to the JSON file containing user test mapping (Pattern -> JiraUserID)")
+	ReviewTicketsCmd.Flags().StringVar(&userMappingPath, "user-mapping-path", "user_mapping.json", "Path to the JSON file containing user mapping (JiraUserID -> PillarName)")
+	ReviewTicketsCmd.Flags().StringVar(&userTestMappingPath, "user-test-mapping-path", "user_test_mapping.json", "Path to the JSON file containing user test mapping (Pattern -> JiraUserID)")
 }
 
 // -------------------------

tools/flakeguard/jirautils/jira.go

@@ -112,15 +112,12 @@ func CreateTicketInJira(
 		// For a simple text field or select list (by value):
 		issueFields.Unknowns[pillarCustomFieldID] = map[string]interface{}{"value": pillarName}
 		// If it's a select list by ID, it would be map[string]interface{}{"id": "12345"}
-		log.Debug().Str("fieldId", pillarCustomFieldID).Str("value", pillarName).Msg("Adding pillar custom field")
 	}
 
 	issue := jira.Issue{
 		Fields: issueFields,
 	}
 
-	log.Debug().Interface("issuePayload", issue).Msg("Jira creation payload")
-
 	// Use context with the API call
 	createdIssue, resp, err := client.Issue.CreateWithContext(ctx, &issue)
 	if err != nil {
@@ -134,7 +131,6 @@ func CreateTicketInJira(
 		return "", fmt.Errorf("jira API returned success but issue object is nil")
 	}
 
-	log.Info().Str("key", createdIssue.Key).Str("id", createdIssue.ID).Msg("Jira issue created successfully")
 	return createdIssue.Key, nil
 }
 
@@ -147,19 +143,13 @@ func DeleteTicketInJira(client *jira.Client, issueKey string) error {
 		return fmt.Errorf("issue key cannot be empty")
 	}
 
-	log.Warn().Str("key", issueKey).Msg("Attempting to permanently delete Jira ticket")
-
 	resp, err := client.Issue.DeleteWithContext(context.Background(), issueKey)
 	if err != nil {
 		errMsg := ReadJiraErrorResponse(resp)
 		log.Error().Err(err).Str("key", issueKey).Str("responseBody", errMsg).Msg("Failed to delete Jira issue")
 		return fmt.Errorf("failed to delete issue %s: %w; response: %s", issueKey, err, errMsg)
 	}
 
-	// Check status code explicitly? Jira library might already handle non-2xx as errors.
-	// if resp.StatusCode != http.StatusNoContent { ... }
-
-	log.Info().Str("key", issueKey).Msg("Jira ticket deleted successfully")
 	return nil
 }
 

tools/flakeguard/main.go

@@ -43,7 +43,7 @@ func init() {
 	rootCmd.AddCommand(cmd.GenerateReportCmd)
 	rootCmd.AddCommand(cmd.GetGHArtifactLinkCmd)
 	rootCmd.AddCommand(cmd.SendToSplunkCmd)
-	rootCmd.AddCommand(cmd.TicketsCmd)
+	rootCmd.AddCommand(cmd.ReviewTicketsCmd)
 	rootCmd.AddCommand(cmd.CreateTicketsCmd)
 	rootCmd.AddCommand(cmd.SyncJiraCmd)
 }