Summary #13
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -33,6 +33,8 @@ func sendRepositoryDispatch(token string, msg *ScenarioProgressMessage) error { | |||||
| "overall_status": msg.OverallStatus, | ||||||
| "failed_count": msg.FailedCount, | ||||||
| "total_scenarios": msg.TotalScenarios, | ||||||
| "missing_tests_in_pr": msg.MissingTestsInPR, | ||||||
| "should_run_tests": msg.ShouldRunTests, | ||||||
| }, | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -64,8 +66,8 @@ func sendRepositoryDispatch(token string, msg *ScenarioProgressMessage) error { | |||||
| return fmt.Errorf("github API returned %d: %s", resp.StatusCode, string(respBody)) | ||||||
| } | ||||||
|
|
||||||
| log.Printf("repository_dispatch sent: repo=%s sha=%s run_id=%s overall_status=%s missing_tests_in_pr=%v should_run_tests=%v", | ||||||
| msg.Repository, msg.CommitSHA, msg.RunID, msg.OverallStatus, msg.MissingTestsInPR, msg.ShouldRunTests) | ||||||
|
There was a problem hiding this comment. The continuation line for this log.Printf call is indented with spaces instead of gofmt's tab indentation. Please run gofmt on the file to keep formatting consistent.
Suggested change
|
||||||
|
|
||||||
| return nil | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -80,17 +80,20 @@ type cmd struct { | |||||||||||
| } | ||||||||||||
|
|
||||||||||||
| type ScenarioProgressMessage struct { | ||||||||||||
| Status string `json:"status"` | ||||||||||||
| Scenario string `json:"scenario"` | ||||||||||||
| RunID string `json:"run_id"` | ||||||||||||
| Data string `json:"data"` | ||||||||||||
| TotalScenarios string `json:"total_scenarios"` | ||||||||||||
| Code string `json:"code"` | ||||||||||||
| OverallStatus string `json:"overall_status,omitempty"` | ||||||||||||
| FailedCount int64 `json:"failed_count,omitempty"` | ||||||||||||
| FailedScenarios []string `json:"failed_scenarios,omitempty"` | ||||||||||||
| CommitSHA string `json:"commit_sha,omitempty"` | ||||||||||||
| Repository string `json:"repository,omitempty"` | ||||||||||||
| RunURL string `json:"run_url,omitempty"` | ||||||||||||
| MissingTestsInPR bool `json:"missing_tests_in_pr,omitempty"` | ||||||||||||
| ShouldRunTests bool `json:"should_run_tests,omitempty"` | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| func runE(cmd *cobra.Command, args []string) error { | ||||||||||||
|
|
@@ -277,6 +280,9 @@ func filterScenariosByAffectedServices(files []string, affectedServices []string | |||||||||||
|
|
||||||||||||
| func distributePubsub(app *appctx, runID string, tagFilters []string, metadata map[string]interface{}, forceAll bool) bool { | ||||||||||||
| id := runID | ||||||||||||
| if metadata == nil { | ||||||||||||
| metadata = make(map[string]interface{}) | ||||||||||||
| } | ||||||||||||
| final := combineFilesAndDir() | ||||||||||||
| if !forceAll { | ||||||||||||
| affectedServices := extractAffectedServices(metadata) | ||||||||||||
|
|
@@ -296,11 +302,6 @@ func distributePubsub(app *appctx, runID string, tagFilters []string, metadata m | |||||||||||
|
|
||||||||||||
| metadata["total_scenarios"] = fmt.Sprintf("%d", len(filtered)) | ||||||||||||
|
|
||||||||||||
| for _, f := range filtered { | ||||||||||||
| nc := cmd{ | ||||||||||||
| Code: "process", | ||||||||||||
|
|
@@ -333,6 +334,9 @@ func distributeSQS(app *appctx, runID string, tagFilters []string, metadata map[ | |||||||||||
| } | ||||||||||||
|
|
||||||||||||
| id := runID | ||||||||||||
| if metadata == nil { | ||||||||||||
| metadata = make(map[string]interface{}) | ||||||||||||
| } | ||||||||||||
| final := combineFilesAndDir() | ||||||||||||
| if !forceAll { | ||||||||||||
| affectedServices := extractAffectedServices(metadata) | ||||||||||||
|
|
@@ -351,11 +355,6 @@ func distributeSQS(app *appctx, runID string, tagFilters []string, metadata map[ | |||||||||||
| log.Printf("distributing %d/%d scenarios matching tags %v", len(filtered), len(final), tagFilters) | ||||||||||||
| metadata["total_scenarios"] = fmt.Sprintf("%d", len(filtered)) | ||||||||||||
|
|
||||||||||||
| for _, f := range filtered { | ||||||||||||
| nc := cmd{ | ||||||||||||
| Code: "process", | ||||||||||||
|
|
@@ -381,19 +380,11 @@ func distributeSQS(app *appctx, runID string, tagFilters []string, metadata map[ | |||||||||||
| return true | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| type appctx struct { | ||||||||||||
| pub *lspubsub.PubsubPublisher // starter publisher topic | ||||||||||||
| rpub *lspubsub.PubsubPublisher // topic to publish reports | ||||||||||||
| mtx *sync.Mutex | ||||||||||||
| topicArn *string | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| // Our message processing callback. | ||||||||||||
|
|
@@ -498,58 +489,6 @@ func process(ctx any, data []byte) error { | |||||||||||
| Verbose: verbose, | ||||||||||||
| Metadata: c.Metadata, | ||||||||||||
| RunID: c.ID, | ||||||||||||
| }) | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
|
|
@@ -592,12 +531,25 @@ func handleScenarioCompletion(ctx any, data []byte) error { | |||||||||||
|
|
||||||||||||
| if msg.OverallStatus == "failure" || msg.FailedCount > 0 { | ||||||||||||
| color = "danger" | ||||||||||||
| title = "Test Run Complete (With Failures)" | ||||||||||||
| var sb strings.Builder | ||||||||||||
| fmt.Fprintf(&sb, "*Run Summary*\nTotal: %s\nPassed: %d\nFailed: %d", total, successCount, msg.FailedCount) | ||||||||||||
| if len(msg.FailedScenarios) > 0 { | ||||||||||||
| sb.WriteString("\n\n*Failed scenarios:*") | ||||||||||||
| for _, name := range msg.FailedScenarios { | ||||||||||||
| fmt.Fprintf(&sb, "\n• %v", name) | ||||||||||||
| } | ||||||||||||
| } | ||||||||||||
| if msg.RunURL != "" { | ||||||||||||
| fmt.Fprintf(&sb, "\n\n<%s|View run>", msg.RunURL) | ||||||||||||
| } | ||||||||||||
| text = sb.String() | ||||||||||||
| } else { | ||||||||||||
| title = "Test Run Complete" | ||||||||||||
| text = fmt.Sprintf("*Run Summary*\nTotal: %s\nPassed: %s\nFailed: 0", total, total) | ||||||||||||
| if msg.RunURL != "" { | ||||||||||||
| text += fmt.Sprintf("\n\n<%s|View run>", msg.RunURL) | ||||||||||||
| } | ||||||||||||
| } | ||||||||||||
jenn-if-err marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||
|
|
||||||||||||
| payload := SlackMessage{ | ||||||||||||
|
|
@@ -606,8 +558,9 @@ func handleScenarioCompletion(ctx any, data []byte) error { | |||||||||||
| Color: color, | ||||||||||||
| Title: title, | ||||||||||||
| Text: text, | ||||||||||||
| Footer: fmt.Sprintf("oops • run: %v", msg.RunID), | ||||||||||||
| Timestamp: time.Now().Unix(), | ||||||||||||
| MrkdwnIn: []string{"text"}, | ||||||||||||
| }, | ||||||||||||
| }, | ||||||||||||
| } | ||||||||||||
|
|
@@ -640,9 +593,7 @@ func run(ctx context.Context, done chan error) { | |||||||||||
| } | ||||||||||||
|
|
||||||||||||
| app := &appctx{ | ||||||||||||
| mtx: &sync.Mutex{}, | ||||||||||||
| } | ||||||||||||
| ctx0, cancelCtx0 := context.WithCancel(ctx) | ||||||||||||
| defer cancelCtx0() | ||||||||||||
|
|
@@ -721,7 +672,10 @@ func run(ctx context.Context, done chan error) { | |||||||||||
| } | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
|
Member
Author
There was a problem hiding this comment. @Ynah537 can I remove this? Start_all doesn't have githubtoken, if this is here then the code couldn't proceed.
Member
Author
There was a problem hiding this comment. It will still be safe since there is a githubtoken checker in the sendrepositorydispatch |
||||||||||||
| if scenariopubsub != "" && pubsub != "" { | ||||||||||||
|
There was a problem hiding this comment. The progress listener now starts even when
Suggested change
|
||||||||||||
| if githubtoken == "" { | ||||||||||||
| log.Printf("WARNING: githubtoken is empty; scenario progress listener will run, but GitHub repository_dispatch will be skipped") | ||||||||||||
| } | ||||||||||||
| log.Printf("starting scenario progress listener on %v", scenariopubsub) | ||||||||||||
|
|
||||||||||||
| _, st, err := lspubsub.GetPublisher(project, scenariopubsub) | ||||||||||||
|
|
@@ -742,8 +696,6 @@ func run(ctx context.Context, done chan error) { | |||||||||||
| log.Fatalf("listener for scenario progress failed: %v", err) | ||||||||||||
| } | ||||||||||||
| }() | ||||||||||||
| } | ||||||||||||
|
There was a problem hiding this comment. The progress listener now starts even when |
||||||||||||
|
|
||||||||||||
| <-ctx.Done() | ||||||||||||
|
|
||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -399,11 +399,22 @@ func doScenario(in *doScenarioInput) error { | |
| attr["pubsub"] = pubsub | ||
| } | ||
| if in.Metadata != nil { | ||
| for _, key := range []string{ | ||
| "pr_number", "branch", "commit_sha", "actor", | ||
| "trigger_type", "run_url", "repository", "workflow", "total_scenarios", | ||
| } { | ||
| if v, ok := in.Metadata[key].(string); ok && v != "" { | ||
| attr[key] = v | ||
| } | ||
| } | ||
| if ta, ok := in.Metadata["test_analysis"].(map[string]interface{}); ok { | ||
| for _, key := range []string{"missing_tests_in_pr", "should_run_tests"} { | ||
| if v, ok := ta[key].(bool); ok { | ||
| attr[key] = fmt.Sprintf("%v", v) | ||
| } | ||
| } | ||
| } | ||
|
Comment on lines
+410
to
+416
There was a problem hiding this comment. Converting booleans via |
||
|
|
||
| if b, err := json.Marshal(in.Metadata); err == nil { | ||
| attr["metadata"] = string(b) | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.