Revert ":ghost: Tasking find refs"

api/application.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"sort"
 	"strings"
@@ -10,7 +11,7 @@ import (
 	"github.com/konveyor/tackle2-hub/assessment"
 	"github.com/konveyor/tackle2-hub/metrics"
 	"github.com/konveyor/tackle2-hub/model"
-	"github.com/konveyor/tackle2-hub/trigger"
+	tasking "github.com/konveyor/tackle2-hub/task"
 	"gorm.io/gorm/clause"
 )
 
@@ -249,20 +250,11 @@ func (h ApplicationHandler) Create(ctx *gin.Context) {
 		return
 	}
 
-	rtx := WithContext(ctx)
-	tr := trigger.Application{
-		Trigger: trigger.Trigger{
-			TaskManager: rtx.TaskManager,
-			Client:      rtx.Client,
-			DB:          h.DB(ctx),
-		},
-	}
-	err = tr.Created(m)
+	err = h.discover(ctx, m)
 	if err != nil {
 		_ = ctx.Error(err)
 		return
 	}
-
 	h.Respond(ctx, http.StatusCreated, r)
 }
 
@@ -388,20 +380,11 @@ func (h ApplicationHandler) Update(ctx *gin.Context) {
 		}
 	}
 
-	rtx := WithContext(ctx)
-	tr := trigger.Application{
-		Trigger: trigger.Trigger{
-			TaskManager: rtx.TaskManager,
-			Client:      rtx.Client,
-			DB:          h.DB(ctx),
-		},
-	}
-	err = tr.Updated(m)
+	err = h.discover(ctx, m)
 	if err != nil {
 		_ = ctx.Error(err)
 		return
 	}
-
 	h.Status(ctx, http.StatusNoContent)
 }
 
@@ -1091,6 +1074,31 @@ func (h ApplicationHandler) AssessmentCreate(ctx *gin.Context) {
 	h.Respond(ctx, http.StatusCreated, r)
 }
 
+// discover an application's language and frameworks by launching discovery tasks.
+func (h ApplicationHandler) discover(ctx *gin.Context, application *model.Application) (err error) {
+	rtx := WithContext(ctx)
+	db := h.DB(ctx)
+	for _, kind := range Settings.Hub.Discovery.Tasks {
+		t := Task{}
+		t.Kind = kind
+		t.Name = fmt.Sprintf("%s-%s", application.Name, kind)
+		ref := Ref{ID: application.ID}
+		t.Application = &ref
+		t.State = tasking.Ready
+		taskHandler := TaskHandler{}
+		err = taskHandler.FindRefs(rtx.Client, &t)
+		if err != nil {
+			return
+		}
+		task := tasking.Task{Task: t.Model()}
+		err = rtx.TaskManager.Create(db, &task)
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
 // Application REST resource.
 type Application struct {
 	Resource        `yaml:",inline"`

api/base.go

@@ -250,6 +250,47 @@ func (h *BaseHandler) Attachment(ctx *gin.Context, name string) {
 		attachment)
 }
 
+// Merge maps B into A.
+// The B map is the authority.
+func (h *BaseHandler) Merge(a, b map[string]any) (out map[string]any) {
+	if a == nil {
+		a = map[string]any{}
+	}
+	if b == nil {
+		b = map[string]any{}
+	}
+	out = map[string]any{}
+	for k, v := range a {
+		out[k] = v
+		if bv, found := b[k]; found {
+			out[k] = bv
+			if av, cast := v.(map[string]any); cast {
+				if bv, cast := bv.(map[string]any); cast {
+					out[k] = h.Merge(av, bv)
+				} else {
+					out[k] = bv
+				}
+			}
+		}
+	}
+	for k, v := range b {
+		if _, found := a[k]; !found {
+			out[k] = v
+		}
+	}
+
+	return
+}
+
+// AsMap returns the object as a map.
+func (h *BaseHandler) AsMap(object any) (mp map[string]any, isMap bool) {
+	b, _ := json.Marshal(object)
+	mp = make(map[string]any)
+	err := json.Unmarshal(b, &mp)
+	isMap = err == nil
+	return
+}
+
 // REST resource.
 type Resource struct {
 	ID         uint      `json:"id,omitempty" yaml:"id,omitempty"`

api/identity.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/konveyor/tackle2-hub/model"
-	"github.com/konveyor/tackle2-hub/trigger"
 	"gorm.io/gorm/clause"
 )
 
@@ -208,18 +207,13 @@ func (h IdentityHandler) Update(ctx *gin.Context) {
 		return
 	}
 
-	rtx := WithContext(ctx)
-	tr := trigger.Identity{
-		Trigger: trigger.Trigger{
-			TaskManager: rtx.TaskManager,
-			Client:      rtx.Client,
-			DB:          h.DB(ctx),
-		},
-	}
-	err = tr.Updated(m)
-	if err != nil {
-		_ = ctx.Error(err)
-		return
+	appHandler := ApplicationHandler{}
+	for i := range m.Applications {
+		err = appHandler.discover(ctx, &m.Applications[i])
+		if err != nil {
+			_ = ctx.Error(err)
+			return
+		}
 	}
 
 	h.Status(ctx, http.StatusNoContent)

api/task.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -11,12 +12,15 @@ import (
 
 	"github.com/gin-gonic/gin"
 	qf "github.com/konveyor/tackle2-hub/api/filter"
+	crd "github.com/konveyor/tackle2-hub/k8s/api/tackle/v1alpha2"
 	"github.com/konveyor/tackle2-hub/model"
 	"github.com/konveyor/tackle2-hub/tar"
 	tasking "github.com/konveyor/tackle2-hub/task"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
+	k8serr "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/utils/strings/slices"
+	k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 // Routes
@@ -289,6 +293,11 @@ func (h TaskHandler) Create(ctx *gin.Context) {
 		return
 	}
 	rtx := WithContext(ctx)
+	err = h.FindRefs(rtx.Client, r)
+	if err != nil {
+		_ = ctx.Error(err)
+		return
+	}
 	task := &tasking.Task{}
 	task.With(r.Model())
 	task.CreateUser = h.BaseHandler.CurrentUser(ctx)
@@ -327,7 +336,7 @@ func (h TaskHandler) Delete(ctx *gin.Context) {
 // @description Update a task.
 // @tags tasks
 // @accept json
-// @success 200
+// @success 202
 // @router /tasks/{id} [put]
 // @param id path int true "Task ID"
 // @param task body Task true "Task data"
@@ -364,17 +373,15 @@ func (h TaskHandler) Update(ctx *gin.Context) {
 		return
 	}
 
-	r.With(m)
-
-	h.Respond(ctx, http.StatusOK, r)
+	h.Status(ctx, http.StatusAccepted)
 }
 
 // Submit godoc
 // @summary Submit a task.
 // @description Patch and submit a task.
 // @tags tasks
 // @accept json
-// @success 200
+// @success 202
 // @router /tasks/{id}/submit [put]
 // @param id path int true "Task ID"
 // @param task body Task false "Task data (optional)"
@@ -610,6 +617,82 @@ func (h TaskHandler) GetAttached(ctx *gin.Context) {
 	}
 }
 
+// FindRefs find referenced resources.
+// - addon
+// - extensions
+// - kind
+// - priority
+// The priority is defaulted to the kind as needed.
+func (h *TaskHandler) FindRefs(client k8sclient.Client, r *Task) (err error) {
+	if r.Addon != "" {
+		addon := &crd.Addon{}
+		name := r.Addon
+		err = client.Get(
+			context.TODO(),
+			k8sclient.ObjectKey{
+				Name:      name,
+				Namespace: Settings.Hub.Namespace,
+			},
+			addon)
+		if err != nil {
+			if k8serr.IsNotFound(err) {
+				err = &BadRequestError{
+					Reason: "Addon: " + name + " not found",
+				}
+			}
+			return
+		}
+	}
+	for _, name := range r.Extensions {
+		ext := &crd.Extension{}
+		err = client.Get(
+			context.TODO(),
+			k8sclient.ObjectKey{
+				Name:      name,
+				Namespace: Settings.Hub.Namespace,
+			},
+			ext)
+		if err != nil {
+			if k8serr.IsNotFound(err) {
+				err = &BadRequestError{
+					Reason: "Extension: " + name + " not found",
+				}
+			}
+			return
+		}
+	}
+	if r.Kind != "" {
+		kind := &crd.Task{}
+		name := r.Kind
+		err = client.Get(
+			context.TODO(),
+			k8sclient.ObjectKey{
+				Name:      name,
+				Namespace: Settings.Hub.Namespace,
+			},
+			kind)
+		if err != nil {
+			if k8serr.IsNotFound(err) {
+				err = &BadRequestError{
+					Reason: "Task: " + name + " not found",
+				}
+			}
+			return
+		}
+		if r.Priority == 0 {
+			r.Priority = kind.Spec.Priority
+		}
+		mA, castA := h.AsMap(kind.Spec.Data)
+		mB, castB := r.Data.(map[string]any)
+		if castA && castB {
+			r.Data = h.Merge(mA, mB)
+		} else {
+			r.Data = mA
+		}
+	}
+	return
+}
+
 // TTL time-to-live.
 type TTL model.TTL
 

api/taskgroup.go

@@ -450,11 +450,12 @@ func (h *TaskGroupHandler) findRefs(ctx *gin.Context, r *TaskGroup) (err error)
 		if r.Priority == 0 {
 			r.Priority = kind.Spec.Priority
 		}
-		data := model.Data{Any: r.Data}
-		other := model.Data{Any: kind.Data()}
-		merged := data.Merge(other)
-		if !merged {
-			r.Data = other.Any
+		mA, castA := h.AsMap(kind.Spec.Data)
+		mB, castB := r.Data.(map[string]any)
+		if castA && castB {
+			r.Data = h.Merge(mA, mB)
+		} else {
+			r.Data = mA
 		}
 	}
 	return
@@ -471,9 +472,14 @@ func (h *TaskGroupHandler) Propagate(m *model.TaskGroup) (err error) {
 		task.Policy = m.Policy
 		task.State = m.State
 		task.SetBucket(m.BucketID)
-		merged := task.Data.Merge(m.Data)
-		if !merged {
-			task.Data = m.Data
+		if m.Data.Any != nil {
+			mA, castA := m.Data.Any.(map[string]any)
+			mB, castB := task.Data.Any.(map[string]any)
+			if castA && castB {
+				task.Data.Any = h.Merge(mA, mB)
+			} else {
+				task.Data.Any = m.Data
+			}
 		}
 	}
 

cmd/main.go

@@ -124,6 +124,10 @@ func main() {
 				return
 			}
 		}()
+		err = Settings.FindDiscoveryTasks()
+		if err != nil {
+			return
+		}
 	}
 	//
 	// k8s client.