checkpoint

Signed-off-by: Jeff Ortel <jortel@redhat.com>

cmd/rules.go

@@ -33,12 +33,12 @@ var LvRegex = regexp.MustCompile(`(\D+)(\d(?:[\d\.]*\d)?)([\+-])?$`)
 
 // Rules settings.
 type Rules struct {
-	Path         string          `json:"path"`
-	Repository   *api.Repository `json:"repository"`
-	Identity     *api.Ref        `json:"identity"`
-	Labels       Labels          `json:"labels"`
-	repositories []string
-	rules        []string
+	Path       string          `json:"path"`
+	Repository *api.Repository `json:"repository"`
+	Identity   *api.Ref        `json:"identity"`
+	Labels     Labels          `json:"labels"`
+	rules      []string
+	extract    []string
 }
 
 // Build assets.
@@ -59,7 +59,7 @@ func (r *Rules) Build() (err error) {
 	if err != nil {
 		return
 	}
-	err = r.Labels.extract(r.repositories)
+	err = r.Labels.extract(r.extract)
 	if err != nil {
 		return
 	}
@@ -106,9 +106,14 @@ func (r *Rules) addFiles() (err error) {
 			return
 		}
 	}
+	n := 0
 	for _, ent := range entries {
 		p := path.Join(ruleDir, ent.Name())
 		r.append(p)
+		n++
+	}
+	if n > 0 {
+		r.extract = append(r.extract, ruleDir)
 	}
 	return
 }
@@ -239,9 +244,7 @@ func (r *Rules) addRuleSetRepository(ruleset *api.RuleSet) (err error) {
 		return
 	}
 	ruleDir := path.Join(rootDir, ruleset.Repository.Path)
-	r.repositories = append(
-		r.repositories,
-		ruleDir)
+	r.extract = append(r.extract, ruleDir)
 	r.append(ruleDir)
 	return
 }
@@ -274,9 +277,7 @@ func (r *Rules) addRepository() (err error) {
 		return
 	}
 	ruleDir := path.Join(rootDir, r.Repository.Path)
-	r.repositories = append(
-		r.repositories,
-		ruleDir)
+	r.extract = append(r.extract, ruleDir)
 	r.append(ruleDir)
 	return
 }
@@ -442,18 +443,6 @@ func (r *Labels) extract(paths []string) (err error) {
 		}
 		return
 	}
-	addUnique := func(extracted ...string) (added []string) {
-		for _, s := range extracted {
-			for _, included := range r.Included {
-				if included == s {
-					return
-				}
-			}
-			added = append(added, s)
-			r.Included = append(r.Included, s)
-		}
-		return
-	}
 	ruleSelector := RuleSelector{Included: r.Included}
 	selector := ruleSelector.String()
 	if selector == "" {
@@ -464,7 +453,7 @@ func (r *Labels) extract(paths []string) (err error) {
 		if err != nil {
 			return
 		}
-		added := addUnique(extracted...)
+		added := r.addIncluded(extracted...)
 		addon.Log.Info(
 			"Extracted labels added.",
 			"ruleDir",
@@ -475,6 +464,20 @@ func (r *Labels) extract(paths []string) (err error) {
 	return
 }
 
+// addIncluded uniquely adds labels to the included set.
+func (r *Labels) addIncluded(extracted ...string) (added []string) {
+	for _, s := range extracted {
+		for _, included := range r.Included {
+			if included == s {
+				return
+			}
+		}
+		added = append(added, s)
+		r.Included = append(r.Included, s)
+	}
+	return
+}
+
 // RuleSetMap is a map of labels mapped to ruleSets with those labels.
 type RuleSetMap map[string][]api.RuleSet
 

hack/task.sh

@@ -23,6 +23,7 @@ data:
       excluded: []
       included:
         - konveyor.io/target=cloud-readiness
+        - konveyor.io/repository:ruleset=29
     path: ""
     tags:
       excluded: []