Add check of invalid label in rescue

Author: whywaita

pkg/gh/label.go

@@ -0,0 +1,18 @@
+package gh
+
+import "strings"
+
+// IsRequestedMyshoesLabel checks if the job has appropriate labels for myshoes
+func IsRequestedMyshoesLabel(labels []string) bool {
+	// Accept dependabot runner in GHES
+	if len(labels) == 1 && strings.EqualFold(labels[0], "dependabot") {
+		return true
+	}
+
+	for _, label := range labels {
+		if strings.EqualFold(label, "myshoes") || strings.EqualFold(label, "self-hosted") {
+			return true
+		}
+	}
+	return false
+}

pkg/starter/scripts.go

@@ -46,7 +46,6 @@ func (s *Starter) getSetupScript(ctx context.Context, targetScope, runnerName st
 
 func (s *Starter) getSetupRawScript(ctx context.Context, targetScope, runnerName string) (string, error) {
 	runnerUser := config.Config.RunnerUser
-	githubURL := config.Config.GitHubURL
 
 	targetRunnerVersion := s.runnerVersion
 	if strings.EqualFold(s.runnerVersion, "latest") {
@@ -77,9 +76,7 @@ func (s *Starter) getSetupRawScript(ctx context.Context, targetScope, runnerName
 	}
 
 	var labels []string
-	if githubURL != "" && githubURL != "https://github.com" {
-		labels = append(labels, "dependabot")
-	}
+	labels = append(labels, "dependabot")
 
 	v := templateCreateLatestRunnerOnceValue{
 		Scope:                   targetScope,

pkg/starter/starter.go

@@ -483,6 +483,13 @@ func enqueueRescueRun(ctx context.Context, pendingRun datastore.PendingWorkflowR
 			continue
 		}
 
+		// Check if the job has appropriate labels for myshoes
+		if !gh.IsRequestedMyshoesLabel(job.Labels) {
+			logger.Logf(true, "skip rescue job because it doesn't have myshoes labels: (repo: %s, gh_run_id: %d, gh_job_id: %d, labels: %v)",
+				fullName, pendingRun.WorkflowRun.GetID(), job.GetID(), job.Labels)
+			continue
+		}
+
 		// Get installation ID from target scope
 		installationID, err := gh.IsInstalledGitHubApp(ctx, target.Scope)
 		if err != nil {

pkg/web/webhook.go

@@ -194,7 +194,7 @@ func receiveWorkflowJobWebhook(ctx context.Context, event *github.WorkflowJobEve
 	repoURL := repo.GetHTMLURL()
 
 	labels := event.GetWorkflowJob().Labels
-	if !isRequestedMyshoesLabel(labels) {
+	if !gh.IsRequestedMyshoesLabel(labels) {
 		// is not request myshoes, So will be ignored
 		logger.Logf(true, "label \"myshoes\" is not found in labels, so ignore (labels: %s)", labels)
 		return nil
@@ -221,16 +221,3 @@ func receiveWorkflowJobWebhook(ctx context.Context, event *github.WorkflowJobEve
 	return nil
 }
 
-func isRequestedMyshoesLabel(labels []string) bool {
-	// Accept dependabot runner in GHES
-	if len(labels) == 1 && strings.EqualFold(labels[0], "dependabot") {
-		return true
-	}
-
-	for _, label := range labels {
-		if strings.EqualFold(label, "myshoes") || strings.EqualFold(label, "self-hosted") {
-			return true
-		}
-	}
-	return false
-}