refactor: use IsRetriable interface for errors

venona/pkg/agent/agent_test.go

@@ -259,7 +259,7 @@ func Test_executeAgentTask(t *testing.T) {
 			a := &Agent{
 				log: logger.New(logger.Options{}),
 			}
-			err := a.executeAgentTask(tt.task)
+			err := a.executeAgentTask(context.Background(), tt.task)
 			if err != nil || tt.wantErr != "" {
 				assert.EqualError(t, err, tt.wantErr)
 			}

venona/pkg/errors/errors.go

@@ -0,0 +1,10 @@
+package errors
+
+type RetriableError interface {
+	IsRetriable() bool
+}
+
+func IsRetriable(err error) bool {
+	e, ok := err.(RetriableError)
+	return ok && e.IsRetriable()
+}

venona/pkg/kubernetes/kubernetes.go

@@ -42,8 +42,8 @@ const (
 type (
 	// Kubernetes API client
 	Kubernetes interface {
-		CreateResource(ctx context.Context, taskType task.Type, spec interface{}) *K8sError
-		DeleteResource(ctx context.Context, opts DeleteOptions) *K8sError
+		CreateResource(ctx context.Context, taskType task.Type, spec interface{}) error
+		DeleteResource(ctx context.Context, opts DeleteOptions) error
 	}
 
 	// Options for Kubernetes
@@ -76,7 +76,7 @@ type (
 
 	K8sError struct {
 		error
-		IsRetriable bool
+		isRetriable bool
 	}
 )
 
@@ -86,7 +86,11 @@ var (
 	removeFinalizersJsonPatch = []byte(`[{ "op": "remove", "path": "/metadata/finalizers" }]`)
 )
 
-func NewK8sError(err error, operation K8sOperation) *K8sError {
+func (e K8sError) IsRetriable() bool {
+	return e.isRetriable
+}
+
+func NewK8sError(err error, operation K8sOperation) error {
 	isNotRetriable := k8serrors.IsBadRequest(err) ||
 		k8serrors.IsForbidden(err) ||
 		k8serrors.IsMethodNotSupported(err) ||
@@ -99,7 +103,7 @@ func NewK8sError(err error, operation K8sOperation) *K8sError {
 
 	return &K8sError{
 		error:       err,
-		IsRetriable: !isNotRetriable,
+		isRetriable: !isNotRetriable,
 	}
 }
 
@@ -127,7 +131,7 @@ func New(opts Options) (Kubernetes, error) {
 	}, err
 }
 
-func (k kube) CreateResource(ctx context.Context, taskType task.Type, spec interface{}) *K8sError {
+func (k kube) CreateResource(ctx context.Context, taskType task.Type, spec interface{}) error {
 	start := time.Now()
 	bytes, err := json.Marshal(spec)
 	if err != nil {
@@ -170,7 +174,7 @@ func (k kube) CreateResource(ctx context.Context, taskType task.Type, spec inter
 	return nil
 }
 
-func (k kube) DeleteResource(ctx context.Context, opts DeleteOptions) *K8sError {
+func (k kube) DeleteResource(ctx context.Context, opts DeleteOptions) error {
 	start := time.Now()
 	switch opts.Kind {
 	case task.TypeDeletePVC:

venona/pkg/queue/queue.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/codefresh-io/go/venona/pkg/codefresh"
+	ierrors "github.com/codefresh-io/go/venona/pkg/errors"
 	"github.com/codefresh-io/go/venona/pkg/logger"
 	"github.com/codefresh-io/go/venona/pkg/metrics"
 	"github.com/codefresh-io/go/venona/pkg/monitoring"
@@ -185,15 +186,15 @@ func (wfq *wfQueueImpl) handleWorkflow(ctx context.Context, wf *workflow.Workflo
 	metrics.ObserveWorkflowMetrics(wf.Type, sinceCreation, inRunner, processed)
 }
 
-func (wfq *wfQueueImpl) reportTaskStatus(ctx context.Context, taskDef task.Task, err *runtime.HandleTaskError) {
+func (wfq *wfQueueImpl) reportTaskStatus(ctx context.Context, taskDef task.Task, err error) {
 	status := task.TaskStatus{
 		OccurredAt:     time.Now(),
 		StatusRevision: taskDef.Metadata.CurrentStatusRevision + 1,
 	}
 	if err != nil {
 		status.Status = task.StatusError
 		status.Reason = err.Error()
-		status.IsRetriable = err.IsRetriable
+		status.IsRetriable = ierrors.IsRetriable(err)
 	} else {
 		status.Status = task.StatusSuccess
 	}

venona/pkg/runtime/runtime.go

@@ -19,14 +19,15 @@ import (
 	"encoding/json"
 	"fmt"
 
+	ierrors "github.com/codefresh-io/go/venona/pkg/errors"
 	"github.com/codefresh-io/go/venona/pkg/kubernetes"
 	"github.com/codefresh-io/go/venona/pkg/task"
 )
 
 type (
 	// Runtime API client
 	Runtime interface {
-		HandleTask(ctx context.Context, t *task.Task) *HandleTaskError
+		HandleTask(ctx context.Context, t *task.Task) error
 	}
 
 	// Options for runtime
@@ -40,14 +41,18 @@ type (
 
 	HandleTaskError struct {
 		error
-		IsRetriable bool
+		isRetriable bool
 	}
 )
 
-func NewHandleTaskError(err error, isRetriable bool) *HandleTaskError {
+func (e HandleTaskError) IsRetriable() bool {
+	return e.isRetriable
+}
+
+func NewHandleTaskError(err error, isRetriable bool) error {
 	return &HandleTaskError{
 		error:       err,
-		IsRetriable: isRetriable,
+		isRetriable: isRetriable,
 	}
 }
 
@@ -58,12 +63,12 @@ func New(opts Options) Runtime {
 	}
 }
 
-func (r runtime) HandleTask(ctx context.Context, t *task.Task) *HandleTaskError {
+func (r runtime) HandleTask(ctx context.Context, t *task.Task) error {
 	switch t.Type {
 	case task.TypeCreatePVC, task.TypeCreatePod:
 		err := r.client.CreateResource(ctx, t.Type, t.Spec)
 		if err != nil {
-			return NewHandleTaskError(fmt.Errorf("failed creating resource: %w", err), err.IsRetriable) // TODO: Return already executed tasks in order to terminate them
+			return NewHandleTaskError(fmt.Errorf("failed creating resource: %w", err), ierrors.IsRetriable(err)) // TODO: Return already executed tasks in order to terminate them
 		}
 	case task.TypeDeletePVC, task.TypeDeletePod:
 		opts := kubernetes.DeleteOptions{}
@@ -78,7 +83,7 @@ func (r runtime) HandleTask(ctx context.Context, t *task.Task) *HandleTaskError
 		}
 
 		if err := r.client.DeleteResource(ctx, opts); err != nil {
-			return NewHandleTaskError(fmt.Errorf("failed deleting resource: %w", err), err.IsRetriable)
+			return NewHandleTaskError(fmt.Errorf("failed deleting resource: %w", err), ierrors.IsRetriable(err))
 		}
 	default:
 		return NewHandleTaskError(fmt.Errorf("unknown task type \"%s\"", t.Type), false)