registered runner name is runner name

whywaita · Dec 28, 2021 · 085102a · 085102a
1 parent d67b287
commit 085102a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/starter/starter.go b/pkg/starter/starter.go
@@ -169,8 +169,9 @@ func (s *Starter) processJob(ctx context.Context, job datastore.Job) error {
 		return fmt.Errorf("failed to bung (target ID: %s, job ID: %s): %w", job.TargetID, job.UUID, err)
 	}
 
+	runnerName := runner.ToName(job.UUID.String())
 	if config.Config.Strict {
-		if err := s.checkRegisteredRunner(ctx, cloudID, *target); err != nil {
+		if err := s.checkRegisteredRunner(ctx, runnerName, *target); err != nil {
 			logger.Logf(false, "failed to check to register runner (target ID: %s, job ID: %s): %+v\n", job.TargetID, job.UUID, err)
 
 			if err := deleteInstance(ctx, cloudID); err != nil {
@@ -264,7 +265,7 @@ func deleteInstance(ctx context.Context, cloudID string) error {
 }
 
 // checkRegisteredRunner check to register runner to GitHub
-func (s *Starter) checkRegisteredRunner(ctx context.Context, cloudID string, target datastore.Target) error {
+func (s *Starter) checkRegisteredRunner(ctx context.Context, runnerName string, target datastore.Target) error {
 	client, err := gh.NewClient(ctx, target.GitHubToken, target.GHEDomain.String)
 	if err != nil {
 		return fmt.Errorf("failed to create github client: %w", err)
@@ -284,15 +285,15 @@ func (s *Starter) checkRegisteredRunner(ctx context.Context, cloudID string, tar
 			// timeout
 			return fmt.Errorf("faied to to check existing runner in GitHub: timeout in %s", runner.MustRunningTime)
 		case <-ticker.C:
-			if _, err := gh.ExistGitHubRunner(cctx, client, owner, repo, cloudID); err == nil {
+			if _, err := gh.ExistGitHubRunner(cctx, client, owner, repo, runnerName); err == nil {
 				// success to register runner to GitHub
 				return nil
 			} else if !errors.Is(err, gh.ErrNotFound) {
 				// not retryable error
 				return fmt.Errorf("failed to check existing runner in GitHub: %w", err)
 			}
 			count++
-			logger.Logf(true, "%s is not found in GitHub, will retry... (second: %ds)", cloudID, count)
+			logger.Logf(true, "%s is not found in GitHub, will retry... (second: %ds)", runnerName, count)
 		}
 	}
 }