Enable uploading custom rules in analysis (#239)

analysis/analysis_test.go

@@ -69,33 +69,10 @@ func TestApplicationAnalysis(t *testing.T) {
 			uniq.ApplicationName(&tc.Application)
 			assert.Should(t, RichClient.Application.Create(&tc.Application))
 
-			// Prepare custom rules.
-			for i := range tc.CustomRules {
-				r := &tc.CustomRules[i]
-				uniq.RuleSetName(r)
-				// ruleFiles := []api.File{}
-				rules := []api.Rule{}
-				for _, rule := range r.Rules {
-					ruleFile, err := RichClient.File.Put(rule.File.Name)
-					assert.Should(t, err)
-					rules = append(rules, api.Rule{
-						File: &api.Ref{
-							ID: ruleFile.ID,
-						},
-					})
-					// ruleFiles = append(ruleFiles, *ruleFile)
-				}
-				r.Rules = rules
-				assert.Should(t, RichClient.RuleSet.Create(r))
-			}
-
 			// Prepare and submit the analyze task.
 			// tc.Task.Addon = analyzerAddon
 			tc.Task.Application = &api.Ref{ID: tc.Application.ID}
 			taskData := AnalyzeDataDefault
-			//for _, r := range tc.CustomRules {
-			//	taskData.Rules = append(taskData.Rules, api.Ref{ID: r.ID, Name: r.Name})
-			//}
 			if len(tc.Sources) > 0 {
 				taskData.Sources = tc.Sources
 			}
@@ -105,8 +82,8 @@ func TestApplicationAnalysis(t *testing.T) {
 			if len(tc.Labels.Included) > 0 || len(tc.Labels.Excluded) > 0 {
 				taskData.Rules.Labels = tc.Labels
 			}
-			if tc.Rules.Path != "" { // TODO: better rules handling
-				taskData.Rules = tc.Rules
+			if tc.RulesPath != "" {
+				taskData.Rules.Path = tc.RulesPath
 			}
 			if tc.WithDeps == true {
 				taskData.Mode.WithDeps = true
@@ -122,10 +99,21 @@ func TestApplicationAnalysis(t *testing.T) {
 			tc.Task.Data = taskData
 			assert.Should(t, RichClient.Task.Create(&tc.Task))
 
+			bucketContent := RichClient.Bucket.Content(tc.Task.Bucket.ID)
+			dataDir := "data"
 			if tc.Artifact != "" {
 				// Upload binary file into the bucket
-				bucketContent := RichClient.Bucket.Content(tc.Task.Bucket.ID)
-				bucketContent.Put("data"+tc.Artifact, tc.Artifact)
+				bucketContent.Put(dataDir+tc.Artifact, tc.Artifact)
+			}
+
+			// Prepare custom rules.
+			for i := range tc.CustomRules {
+				r := &tc.CustomRules[i]
+				for _, rule := range r.Rules {
+					// Upload rule file into the application bucket
+					err := bucketContent.Put(dataDir+rule.File.Name, rule.File.Name)
+					assert.Should(t, err)
+				}
 			}
 
 			tc.Task.State = "Ready"

analysis/pkg.go

@@ -37,16 +37,16 @@ type TC struct {
 	CustomRules []api.RuleSet
 	Identities  []api.Identity
 	// Analysis parameters.
-	Task     api.Task
-	TaskData string
-	Sources  []string
-	Targets  []string
-	Labels   addon.Labels
-	Rules    addon.Rules
-	Scope    *addon.Scope
-	WithDeps bool
-	Binary   bool
-	Artifact string
+	Task      api.Task
+	TaskData  string
+	Sources   []string
+	Targets   []string
+	Labels    addon.Labels
+	RulesPath string
+	Scope     *addon.Scope
+	WithDeps  bool
+	Binary    bool
+	Artifact  string
 	// After-analysis assertions.
 	ReportContent map[string][]string
 	Analysis      api.Analysis