✨ Analysis Issue labels (#325)

Updates models and API to replace analysis ruleset (source, target)
technologies with issue labels. Instead of filtering on technologies in
the ruleset metadata, filtering is done on issue label match.
As a result, the AnalysisRuleSet and AnalysisTechnology models and API
resources can be removed.

Removes AnalysisDependency.Type - not needed by tackle.
Adds label and selector support to analysis deps.
Adds RuleSet.Labels (as related to RuleBundles). The RuleSet.Metadata
will be removed with the seeding
[PR](#323).

Adds model.intersect() method to help construct `intersect` queries
needed for AND filters. Refit the tag query to use the method.

closes #308 
closes #313 
closes #314

Requires: konveyor/analyzer-lsp#146 (and likely
1 more)

---------

Signed-off-by: Jeff Ortel <[email protected]>

Author: jortel

api/analysis.go

@@ -109,24 +109,84 @@ func (f *Filter) Resource(r string) (filter Filter) {
 
 //
 // Where applies (root) fields to the where clause.
-func (f *Filter) Where(in *gorm.DB) (out *gorm.DB) {
+func (f *Filter) Where(in *gorm.DB, selector ...string) (out *gorm.DB) {
 	out = in
+	fs := FieldSelector(selector)
 	for _, p := range f.predicates {
 		field := Field{p}
-		fr := field.Resource()
-		if fr == "" {
+		if fs.Match(&field) {
 			out = out.Where(field.SQL())
 		}
 	}
 	return
 }
 
+//
+// Delete specified fields.
+func (f *Filter) Delete(name string) (found bool) {
+	var wanted []Predicate
+	for _, p := range f.predicates {
+		if strings.ToLower(p.Field.Value) != name {
+			wanted = append(wanted, p)
+		} else {
+			found = true
+		}
+	}
+	f.predicates = wanted
+	return
+}
+
 //
 // Empty returns true when the filter has no predicates.
 func (f *Filter) Empty() bool {
 	return len(f.predicates) == 0
 }
 
+//
+// FieldSelector fields.
+// fields with '+' prefix are included.
+// fields with '-' prefix are excluded.
+// Fields scoped to a resource are excluded.
+// An empty selector includes ALL.
+type FieldSelector []string
+
+//
+// Match fields by qualified name.
+func (r FieldSelector) Match(f *Field) (m bool) {
+	if f.Resource() != "" {
+		return
+	}
+	if len(r) == 0 {
+		m = true
+		return
+	}
+	included := make(map[string]byte)
+	excluded := make(map[string]byte)
+	for _, s := range r {
+		s = strings.ToLower(s)
+		if s != "" {
+			switch s[0] {
+			case '-':
+				excluded[s[1:]] = 0
+			case '+':
+				included[s[1:]] = 0
+			default:
+				included[s] = 0
+			}
+		}
+	}
+	name := strings.ToLower(f.Field.Value)
+	if _, found := excluded[name]; found {
+		return
+	}
+	if len(included) == 0 {
+		m = true
+		return
+	}
+	_, m = included[name]
+	return
+}
+
 //
 // Field predicate.
 type Field struct {

api/filter/filter.go

@@ -294,3 +294,49 @@ func TestValidation(t *testing.T) {
 		})
 	g.Expect(err).ToNot(gomega.BeNil())
 }
+
+func TestFieldSelector(t *testing.T) {
+	g := gomega.NewGomegaWithT(t)
+	field := func(name string) (f *Field) {
+		f = &Field{}
+		f.Field.Value = name
+		return
+	}
+	selector := FieldSelector{
+		"zero",
+		"-one",
+		"-two",
+	}
+	g.Expect(selector.Match(field("zero"))).To(gomega.BeTrue())
+	g.Expect(selector.Match(field("one"))).ToNot(gomega.BeTrue())
+	g.Expect(selector.Match(field("two"))).ToNot(gomega.BeTrue())
+	g.Expect(selector.Match(field("unknown"))).ToNot(gomega.BeTrue())
+
+	selector = FieldSelector{
+		"-one",
+		"-two",
+	}
+	g.Expect(selector.Match(field("Zero"))).To(gomega.BeTrue())
+	g.Expect(selector.Match(field("unknown"))).To(gomega.BeTrue())
+	g.Expect(selector.Match(field("one"))).ToNot(gomega.BeTrue())
+	g.Expect(selector.Match(field("two"))).ToNot(gomega.BeTrue())
+
+	selector = FieldSelector{
+		"one",
+		"two",
+	}
+	g.Expect(selector.Match(field("one"))).To(gomega.BeTrue())
+	g.Expect(selector.Match(field("two"))).To(gomega.BeTrue())
+	g.Expect(selector.Match(field("unknown"))).ToNot(gomega.BeTrue())
+
+	selector = FieldSelector{}
+	g.Expect(selector.Match(field("one"))).To(gomega.BeTrue())
+	g.Expect(selector.Match(field("two"))).To(gomega.BeTrue())
+
+	selector = FieldSelector{
+		"resource.one",
+		"two",
+	}
+	g.Expect(selector.Match(field("two"))).To(gomega.BeTrue())
+	g.Expect(selector.Match(field("resource.one"))).ToNot(gomega.BeTrue())
+}

api/filter/filter_test.go

@@ -292,7 +292,7 @@ type RuleSet struct {
 	Resource
 	Name        string      `json:"name,omitempty"`
 	Description string      `json:"description,omitempty"`
-	Metadata    interface{} `json:"metadata,omitempty"`
+	Labels      interface{} `json:"labels,omitempty"`
 	File        *Ref        `json:"file,omitempty"`
 }
 
@@ -301,7 +301,7 @@ type RuleSet struct {
 func (r *RuleSet) With(m *model.RuleSet) {
 	r.Resource.With(&m.Model)
 	r.Name = m.Name
-	_ = json.Unmarshal(m.Metadata, &r.Metadata)
+	_ = json.Unmarshal(m.Labels, &r.Labels)
 	r.File = r.refPtr(m.FileID, m.File)
 }
 
@@ -311,8 +311,8 @@ func (r *RuleSet) Model() (m *model.RuleSet) {
 	m = &model.RuleSet{}
 	m.ID = r.ID
 	m.Name = r.Name
-	if r.Metadata != nil {
-		m.Metadata, _ = json.Marshal(r.Metadata)
+	if r.Labels != nil {
+		m.Labels, _ = json.Marshal(r.Labels)
 	}
 	m.FileID = r.idPtr(r.File)
 	return

api/rulebundle.go

@@ -10,19 +10,10 @@ dir=`dirname $0`
 cd ${dir}
 
 ./settings.sh
-./tag.sh
 ./identity.sh
 ./job-function.sh
 ./stakeholder-group.sh
 ./stakeholder.sh
 ./business-service.sh
 ./application.sh
-./task.sh
-./taskgroup.sh
-./bucket.sh
 ./review.sh
-./proxy.sh
-./applicationtags.sh
-./analysis.sh
-./analysis.sh
-./analysis.sh

hack/add/all.sh

@@ -12,52 +12,40 @@ echo " RuleSets: ${nRuleSet}"
 echo " Issues: ${nIssue}"
 
 #
-# RuleSets
+# Issues
 #
 echo -n "---
-rulesets:
+issues:
 " > ${file}
 for r in $(seq 1 ${nRuleSet})
-do 
-echo -n "- name: Main${r}
-  description: Testing.
-  technologies:
-  - name: TechA-${r}
-  - name: TechB-${r}
-  - name: TechC-${r}
-  - name: TechS-${r}
-    source: true
-  issues:
-" >> ${file}
-#
-# Issues
-#
+do
 for i in $(seq 1 ${nIssue})
 do
-echo -n "  - ruleid: Rule-${i}
-    name: Rule-${i}-Violated
-    description: This is a test ${r}/${i}.
-    category: warning
-    effort: 10
-    labels:
-    - RULESET-${r}
-    - RULE-${i}
-    incidents:
-    - uri: http://thing.com/file:1
-      message: Thing happend line:1
-      facts:
-        factA: 1.A
-        factB: 1.B
-    - uri: http://thing.com/file:2
-      message: Thing happend line:2
-      facts:
-        factA: 1.C
-        factB: 1.D
-    - uri: http://thing.com/file:3
-      message: Thing happend line:3
-      facts:
-        factA: 1.E
-        factB: 1.F
+echo -n "- ruleset: ruleSet-${r}
+  rule: rule-${i}
+  name: Rule-${i}-Violated
+  description: This is a test ${r}/${i}.
+  category: warning
+  effort: 10
+  labels:
+  - konveyor.io/target=RULESET-${r}
+  - konveyor.io/source=RULE-${i}
+  incidents:
+  - uri: http://thing.com/file:1
+    message: Thing happend line:1
+    facts:
+      factA: 1.A
+      factB: 1.B
+  - uri: http://thing.com/file:2
+    message: Thing happend line:2
+    facts:
+      factA: 1.C
+      factB: 1.D
+  - uri: http://thing.com/file:3
+    message: Thing happend line:3
+    facts:
+      factA: 1.E
+      factB: 1.F
 " >> ${file}
 done
 done