Add error handling for invalid labels to AddInstance() (#195)

* Add error handling for invalid labels to AddInstance() * fix to use const type
whywaita · Mar 14, 2024 · 257d0b4 · 257d0b4
1 parent 907a272
commit 257d0b4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/pkg/shoes/shoes.go b/pkg/shoes/shoes.go
@@ -13,6 +13,8 @@ import (
 	"github.com/whywaita/myshoes/pkg/datastore"
 
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 // GetClient retrieve ShoesClient use shoes-plugin
@@ -88,6 +90,10 @@ func (c *GRPCClient) AddInstance(ctx context.Context, runnerName, setupScript st
 	}
 	resp, err := c.client.AddInstance(ctx, req)
 	if err != nil {
+		// will delete a job if labels of a job are invalid
+		if stat, _ := status.FromError(err); stat.Code() == codes.InvalidArgument {
+			return "", "", "", datastore.ResourceTypeUnknown, err
+		}
 		return "", "", "", datastore.ResourceTypeUnknown, fmt.Errorf("failed to AddInstance: %w", err)
 	}
 

diff --git a/pkg/starter/starter.go b/pkg/starter/starter.go
@@ -14,6 +14,8 @@ import (
 
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/sync/semaphore"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	"github.com/google/go-github/v47/github"
 	uuid "github.com/satori/go.uuid"
@@ -198,6 +200,18 @@ func (s *Starter) ProcessJob(ctx context.Context, job datastore.Job) error {
 	if err != nil {
 		logger.Logf(false, "failed to bung (target ID: %s, job ID: %s): %+v\n", job.TargetID, job.UUID, err)
 
+		if stat, _ := status.FromError(err); stat.Code() == codes.InvalidArgument {
+			if err := s.ds.DeleteJob(ctx, job.UUID); err != nil {
+				logger.Logf(false, "failed to delete job: %+v\n", err)
+
+				if err := datastore.UpdateTargetStatus(ctx, s.ds, job.TargetID, datastore.TargetStatusErr, fmt.Sprintf("job id: %s", job.UUID)); err != nil {
+					return fmt.Errorf("failed to update target status (target ID: %s, job ID: %s): %w", job.TargetID, job.UUID, err)
+				}
+
+				return fmt.Errorf("failed to delete job: %w", err)
+			}
+		}
+
 		if err := datastore.UpdateTargetStatus(ctx, s.ds, job.TargetID, datastore.TargetStatusErr, fmt.Sprintf("failed to create an instance (job ID: %s)", job.UUID)); err != nil {
 			return fmt.Errorf("failed to update target status (target ID: %s, job ID: %s): %w", job.TargetID, job.UUID, err)
 		}
@@ -288,6 +302,9 @@ func (s *Starter) bung(ctx context.Context, job datastore.Job, target datastore.
 
 	cloudID, ipAddress, shoesType, resourceType, err := client.AddInstance(ctx, runnerName, script, target.ResourceType, labels)
 	if err != nil {
+		if stat, _ := status.FromError(err); stat.Code() == codes.InvalidArgument {
+			return "", "", "", datastore.ResourceTypeUnknown, err
+		}
 		return "", "", "", datastore.ResourceTypeUnknown, fmt.Errorf("failed to add instance: %w", err)
 	}